Diff of the two buildlogs:

--
--- b1/build.log	2024-11-14 19:21:21.157794485 +0000
+++ b2/build.log	2024-11-14 19:54:02.072739743 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Wed Dec 17 13:30:20 -12 2025
-I: pbuilder-time-stamp: 1766021420
+I: Current time: Fri Nov 15 09:21:26 +14 2024
+I: pbuilder-time-stamp: 1731612086
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz]
 I: copying local configuration
@@ -27,53 +27,85 @@
 dpkg-source: info: unpacking git_2.45.2-1.debian.tar.xz
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/3380/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/10630/tmp/hooks/D01_modify_environment starting
+debug: Running on infom07-i386.
+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 Nov 14 19:21 /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/10630/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/10630/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='i386'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=6 '
-  DISTRIBUTION='trixie'
-  HOME='/root'
-  HOST_ARCH='i386'
+  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]="32" [3]="1" [4]="release" [5]="i686-pc-linux-gnu")
+  BASH_VERSION='5.2.32(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=i386
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=5 '
+  DIRSTACK=()
+  DISTRIBUTION=trixie
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=i686
+  HOST_ARCH=i386
   IFS=' 	
   '
-  INVOCATION_ID='14f36b07efa247f7b8bd24b5eea709b0'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  LD_LIBRARY_PATH='/usr/lib/libeatmydata'
-  LD_PRELOAD='libeatmydata.so'
-  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='3380'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=0ea50b9e7cd148cba046849f2df04d0c
+  LANG=C
+  LANGUAGE=de_CH:de
+  LC_ALL=C
+  LD_LIBRARY_PATH=/usr/lib/libeatmydata
+  LD_PRELOAD=libeatmydata.so
+  MACHTYPE=i686-pc-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=10630
   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.Se3nkV6g/pbuilderrc_gOQ9 --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.Se3nkV6g/b1 --logfile b1/build.log git_2.45.2-1.dsc'
-  SUDO_GID='111'
-  SUDO_UID='104'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
+  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.Se3nkV6g/pbuilderrc_rCCK --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.Se3nkV6g/b2 --logfile b2/build.log git_2.45.2-1.dsc'
+  SUDO_GID=111
+  SUDO_UID=104
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
 I: uname -a
-  Linux infom08-i386 6.10.11+bpo-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.10.11-1~bpo12+1 (2024-10-03) x86_64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-27-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.115-1 (2024-11-01) x86_64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Aug  4  2024 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/3380/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Aug  4 21:30 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/10630/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -310,7 +342,7 @@
 Get: 149 http://deb.debian.org/debian trixie/main i386 tcl i386 8.6.14 [4028 B]
 Get: 150 http://deb.debian.org/debian trixie/main i386 unzip i386 6.0-28 [166 kB]
 Get: 151 http://deb.debian.org/debian trixie/main i386 xmlto i386 0.0.28-3.1 [27.3 kB]
-Fetched 58.8 MB in 2s (24.1 MB/s)
+Fetched 58.8 MB in 1s (81.0 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libpython3.12-minimal:i386.
 (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 ... 19958 files and directories currently installed.)
@@ -812,8 +844,8 @@
 Setting up tzdata (2024b-3) ...
 
 Current default time zone: 'Etc/UTC'
-Local time is now:      Thu Dec 18 01:30:49 UTC 2025.
-Universal Time is now:  Thu Dec 18 01:30:49 UTC 2025.
+Local time is now:      Thu Nov 14 19:22:32 UTC 2024.
+Universal Time is now:  Thu Nov 14 19:22:32 UTC 2024.
 Run 'dpkg-reconfigure tzdata' if you wish to change it.
 
 Setting up liberror-perl (0.17029-2) ...
@@ -953,7 +985,11 @@
 fakeroot is already the newest version (1.36-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.45.2/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../git_2.45.2-1_source.changes
+I: user script /srv/workspace/pbuilder/10630/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for trixie
+I: user script /srv/workspace/pbuilder/10630/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/git-2.45.2/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../git_2.45.2-1_source.changes
 dpkg-buildpackage: info: source package git
 dpkg-buildpackage: info: source version 1:2.45.2-1
 dpkg-buildpackage: info: source distribution unstable
@@ -1014,7 +1050,7 @@
 rm -f t/helper/test-fake-ssh t/helper/test-tool
 rm -f oss-fuzz/fuzz-commit-graph oss-fuzz/fuzz-config oss-fuzz/fuzz-date oss-fuzz/fuzz-pack-headers oss-fuzz/fuzz-pack-idx
 rm -f abspath.sp add-interactive.sp add-patch.sp advice.sp alias.sp alloc.sp apply.sp archive-tar.sp archive-zip.sp archive.sp attr.sp base85.sp bisect.sp blame.sp blob.sp bloom.sp branch.sp bulk-checkin.sp bundle-uri.sp bundle.sp cache-tree.sp cbtree.sp chdir-notify.sp checkout.sp chunk-format.sp color.sp column.sp combine-diff.sp commit-graph.sp commit-reach.sp commit.sp compat/nonblock.sp compat/obstack.sp compat/terminal.sp compat/zlib-uncompress2.sp config.sp connect.sp connected.sp convert.sp copy.sp credential.sp csum-file.sp ctype.sp date.sp decorate.sp delta-islands.sp diagnose.sp diff-delta.sp diff-merges.sp diff-lib.sp diff-no-index.sp diff.sp diffcore-break.sp diffcore-delta.sp diffcore-order.sp diffcore-pickaxe.sp diffcore-rename.sp diffcore-rotate.sp dir-iterator.sp dir.sp editor.sp entry.sp environment.sp ewah/bitmap.sp ewah/ewah_bitmap.sp ewah/ewah_io.sp ewah/ewah_rlw.sp exec-cmd.sp fetch-negotiator.sp fetch-pack.sp fmt-merge-msg.sp fsck.sp fsmonitor.sp fsmonitor-ipc.sp fsmonitor-settings.sp gettext.sp git-zlib.sp gpg-interface.sp graph.sp grep.sp hash-lookup.sp hashmap.sp help.sp hex.sp hex-ll.sp hook.sp ident.sp json-writer.sp kwset.sp levenshtein.sp line-log.sp line-range.sp linear-assignment.sp list-objects-filter-options.sp list-objects-filter.sp list-objects.sp lockfile.sp log-tree.sp loose.sp ls-refs.sp mailinfo.sp mailmap.sp match-trees.sp mem-pool.sp merge-blobs.sp merge-ll.sp merge-ort.sp merge-ort-wrappers.sp merge-recursive.sp merge.sp midx.sp midx-write.sp name-hash.sp negotiator/default.sp negotiator/noop.sp negotiator/skipping.sp notes-cache.sp notes-merge.sp notes-utils.sp notes.sp object-file-convert.sp object-file.sp object-name.sp object.sp oid-array.sp oidmap.sp oidset.sp oidtree.sp pack-bitmap-write.sp pack-bitmap.sp pack-check.sp pack-mtimes.sp pack-objects.sp pack-revindex.sp pack-write.sp packfile.sp pager.sp parallel-checkout.sp parse.sp parse-options-cb.sp parse-options.sp patch-delta.sp patch-ids.sp path.sp pathspec.sp pkt-line.sp preload-index.sp pretty.sp prio-queue.sp progress.sp promisor-remote.sp prompt.sp protocol.sp protocol-caps.sp prune-packed.sp quote.sp range-diff.sp reachable.sp read-cache.sp rebase-interactive.sp rebase.sp ref-filter.sp reflog-walk.sp reflog.sp refs.sp refs/debug.sp refs/files-backend.sp refs/reftable-backend.sp refs/iterator.sp refs/packed-backend.sp refs/ref-cache.sp refspec.sp remote.sp replace-object.sp repo-settings.sp repository.sp rerere.sp reset.sp resolve-undo.sp revision.sp run-command.sp send-pack.sp sequencer.sp serve.sp server-info.sp setup.sp shallow.sp sideband.sp sigchain.sp sparse-index.sp split-index.sp stable-qsort.sp statinfo.sp strbuf.sp streaming.sp string-list.sp strmap.sp strvec.sp sub-process.sp submodule-config.sp submodule.sp symlinks.sp tag.sp tempfile.sp thread-utils.sp tmp-objdir.sp trace.sp trace2.sp trace2/tr2_cfg.sp trace2/tr2_cmd_name.sp trace2/tr2_ctr.sp trace2/tr2_dst.sp trace2/tr2_sid.sp trace2/tr2_sysenv.sp trace2/tr2_tbuf.sp trace2/tr2_tgt_event.sp trace2/tr2_tgt_normal.sp trace2/tr2_tgt_perf.sp trace2/tr2_tls.sp trace2/tr2_tmr.sp trailer.sp transport-helper.sp transport.sp tree-diff.sp tree-walk.sp tree.sp unpack-trees.sp upload-pack.sp url.sp urlmatch.sp usage.sp userdiff.sp utf8.sp varint.sp version.sp versioncmp.sp walker.sp wildmatch.sp worktree.sp wrapper.sp write-or-die.sp ws.sp wt-status.sp xdiff-interface.sp unix-socket.sp unix-stream-server.sp compat/simple-ipc/ipc-shared.sp compat/simple-ipc/ipc-unix-socket.sp sha1dc_git.sp sha1dc/sha1.sp sha1dc/ubc_check.sp sha256/block/sha256.sp compat/linux/procinfo.sp compat/fopen.sp compat/strlcpy.sp compat/qsort_s.sp builtin/add.sp builtin/am.sp builtin/annotate.sp builtin/apply.sp builtin/archive.sp builtin/bisect.sp builtin/blame.sp builtin/branch.sp builtin/bugreport.sp builtin/bundle.sp builtin/cat-file.sp builtin/check-attr.sp builtin/check-ignore.sp builtin/check-mailmap.sp builtin/check-ref-format.sp builtin/checkout--worker.sp builtin/checkout-index.sp builtin/checkout.sp builtin/clean.sp builtin/clone.sp builtin/column.sp builtin/commit-graph.sp builtin/commit-tree.sp builtin/commit.sp builtin/config.sp builtin/count-objects.sp builtin/credential-cache--daemon.sp builtin/credential-cache.sp builtin/credential-store.sp builtin/credential.sp builtin/describe.sp builtin/diagnose.sp builtin/diff-files.sp builtin/diff-index.sp builtin/diff-tree.sp builtin/diff.sp builtin/difftool.sp builtin/fast-export.sp builtin/fast-import.sp builtin/fetch-pack.sp builtin/fetch.sp builtin/fmt-merge-msg.sp builtin/for-each-ref.sp builtin/for-each-repo.sp builtin/fsck.sp builtin/fsmonitor--daemon.sp builtin/gc.sp builtin/get-tar-commit-id.sp builtin/grep.sp builtin/hash-object.sp builtin/help.sp builtin/hook.sp builtin/index-pack.sp builtin/init-db.sp builtin/interpret-trailers.sp builtin/log.sp builtin/ls-files.sp builtin/ls-remote.sp builtin/ls-tree.sp builtin/mailinfo.sp builtin/mailsplit.sp builtin/merge-base.sp builtin/merge-file.sp builtin/merge-index.sp builtin/merge-ours.sp builtin/merge-recursive.sp builtin/merge-tree.sp builtin/merge.sp builtin/mktag.sp builtin/mktree.sp builtin/multi-pack-index.sp builtin/mv.sp builtin/name-rev.sp builtin/notes.sp builtin/pack-objects.sp builtin/pack-redundant.sp builtin/pack-refs.sp builtin/patch-id.sp builtin/prune-packed.sp builtin/prune.sp builtin/pull.sp builtin/push.sp builtin/range-diff.sp builtin/read-tree.sp builtin/rebase.sp builtin/receive-pack.sp builtin/reflog.sp builtin/remote-ext.sp builtin/remote-fd.sp builtin/remote.sp builtin/repack.sp builtin/replace.sp builtin/replay.sp builtin/rerere.sp builtin/reset.sp builtin/rev-list.sp builtin/rev-parse.sp builtin/revert.sp builtin/rm.sp builtin/send-pack.sp builtin/shortlog.sp builtin/show-branch.sp builtin/show-index.sp builtin/show-ref.sp builtin/sparse-checkout.sp builtin/stash.sp builtin/stripspace.sp builtin/submodule--helper.sp builtin/symbolic-ref.sp builtin/tag.sp builtin/unpack-file.sp builtin/unpack-objects.sp builtin/update-index.sp builtin/update-ref.sp builtin/update-server-info.sp builtin/upload-archive.sp builtin/upload-pack.sp builtin/var.sp builtin/verify-commit.sp builtin/verify-pack.sp builtin/verify-tag.sp builtin/worktree.sp builtin/write-tree.sp common-main.sp git.sp scalar.sp daemon.sp http-backend.sp imap-send.sp sh-i18n--envsubst.sp shell.sp http-fetch.sp http-push.sp t/helper/test-fake-ssh.sp t/helper/test-tool.sp t/helper/test-advise.sp t/helper/test-bitmap.sp t/helper/test-bloom.sp t/helper/test-bundle-uri.sp t/helper/test-cache-tree.sp t/helper/test-chmtime.sp t/helper/test-config.sp t/helper/test-crontab.sp t/helper/test-csprng.sp t/helper/test-date.sp t/helper/test-delete-gpgsig.sp t/helper/test-delta.sp t/helper/test-dir-iterator.sp t/helper/test-drop-caches.sp t/helper/test-dump-cache-tree.sp t/helper/test-dump-fsmonitor.sp t/helper/test-dump-split-index.sp t/helper/test-dump-untracked-cache.sp t/helper/test-env-helper.sp t/helper/test-example-decorate.sp t/helper/test-find-pack.sp t/helper/test-fsmonitor-client.sp t/helper/test-genrandom.sp t/helper/test-genzeros.sp t/helper/test-getcwd.sp t/helper/test-hash-speed.sp t/helper/test-hash.sp t/helper/test-hashmap.sp t/helper/test-hexdump.sp t/helper/test-json-writer.sp t/helper/test-lazy-init-name-hash.sp t/helper/test-match-trees.sp t/helper/test-mergesort.sp t/helper/test-mktemp.sp t/helper/test-oid-array.sp t/helper/test-oidmap.sp t/helper/test-oidtree.sp t/helper/test-online-cpus.sp t/helper/test-pack-mtimes.sp t/helper/test-parse-options.sp t/helper/test-parse-pathspec-file.sp t/helper/test-partial-clone.sp t/helper/test-path-utils.sp t/helper/test-pcre2-config.sp t/helper/test-pkt-line.sp t/helper/test-proc-receive.sp t/helper/test-progress.sp t/helper/test-reach.sp t/helper/test-read-cache.sp t/helper/test-read-graph.sp t/helper/test-read-midx.sp t/helper/test-ref-store.sp t/helper/test-reftable.sp t/helper/test-regex.sp t/helper/test-rot13-filter.sp t/helper/test-repository.sp t/helper/test-revision-walking.sp t/helper/test-run-command.sp t/helper/test-scrap-cache-tree.sp t/helper/test-serve-v2.sp t/helper/test-sha1.sp t/helper/test-sha256.sp t/helper/test-sigchain.sp t/helper/test-simple-ipc.sp t/helper/test-strcmp-offset.sp t/helper/test-string-list.sp t/helper/test-submodule-config.sp t/helper/test-submodule-nested-repo-config.sp t/helper/test-submodule.sp t/helper/test-subprocess.sp t/helper/test-trace2.sp t/helper/test-truncate.sp t/helper/test-urlmatch-normalization.sp t/helper/test-userdiff.sp t/helper/test-wildmatch.sp t/helper/test-windows-named-pipe.sp t/helper/test-write-cache.sp t/helper/test-xml-encode.sp xdiff/xdiffi.sp xdiff/xemit.sp xdiff/xhistogram.sp xdiff/xmerge.sp xdiff/xpatience.sp xdiff/xprepare.sp xdiff/xutils.sp oss-fuzz/dummy-cmd-main.sp oss-fuzz/fuzz-commit-graph.sp oss-fuzz/fuzz-config.sp oss-fuzz/fuzz-date.sp oss-fuzz/fuzz-pack-headers.sp oss-fuzz/fuzz-pack-idx.sp reftable/basics.sp reftable/error.sp reftable/block.sp reftable/blocksource.sp reftable/iter.sp reftable/publicbasics.sp reftable/merged.sp reftable/pq.sp reftable/reader.sp reftable/record.sp reftable/refname.sp reftable/generic.sp reftable/stack.sp reftable/tree.sp reftable/writer.sp reftable/basics_test.sp reftable/block_test.sp reftable/dump.sp reftable/merged_test.sp reftable/pq_test.sp reftable/record_test.sp reftable/readwrite_test.sp reftable/refname_test.sp reftable/stack_test.sp reftable/test_framework.sp reftable/tree_test.sp t/unit-tests/t-basic.sp t/unit-tests/t-mem-pool.sp t/unit-tests/t-strbuf.sp t/unit-tests/t-ctype.sp t/unit-tests/t-prio-queue.sp t/unit-tests/test-lib.sp http.sp http-walker.sp remote-curl.sp
-rm -f tree.hcc notes.hcc trace.hcc merge-ort-wrappers.hcc promisor-remote.hcc rerere.hcc object-file.hcc write-or-die.hcc object.hcc kwset.hcc fsck.hcc line-range.hcc hashmap.hcc sub-process.hcc apply.hcc object-file-convert.hcc run-command.hcc entry.hcc symlinks.hcc refs/refs-internal.hcc refs/packed-backend.hcc refs/ref-cache.hcc alias.hcc list-objects-filter-options.hcc reftable/tree.hcc reftable/iter.hcc reftable/reftable-merged.hcc reftable/writer.hcc reftable/blocksource.hcc reftable/reftable-error.hcc reftable/record.hcc reftable/block.hcc reftable/reftable-reader.hcc reftable/generic.hcc reftable/reftable-generic.hcc reftable/reftable-tests.hcc reftable/reftable-blocksource.hcc reftable/test_framework.hcc reftable/merged.hcc reftable/refname.hcc reftable/reader.hcc reftable/reftable-record.hcc reftable/constants.hcc reftable/reftable-writer.hcc reftable/reftable-iterator.hcc reftable/reftable-stack.hcc reftable/reftable-malloc.hcc reftable/stack.hcc reftable/basics.hcc reftable/system.hcc reftable/pq.hcc midx.hcc pretty.hcc fsmonitor-ll.hcc object-name.hcc pkt-line.hcc base85.hcc diagnose.hcc config.hcc progress.hcc linear-assignment.hcc git-compat-util.hcc parallel-checkout.hcc tree-walk.hcc merge-recursive.hcc reflog.hcc pack-objects.hcc refspec.hcc connected.hcc pack.hcc unix-socket.hcc reflog-walk.hcc archive.hcc blame.hcc hash.hcc loose.hcc ewah/ewok_rlw.hcc ewah/ewok.hcc sha1dc/sha1.hcc sha1dc/ubc_check.hcc pack-mtimes.hcc wildmatch.hcc unpack-trees.hcc delta.hcc tag.hcc setup.hcc fsmonitor-ipc.hcc oid-array.hcc pathspec.hcc reachable.hcc url.hcc line-log.hcc read-cache-ll.hcc replace-object.hcc commit-slab.hcc cache-tree.hcc trace2.hcc blob.hcc oidmap.hcc shortlog.hcc add-interactive.hcc exec-cmd.hcc diff.hcc rebase.hcc builtin.hcc khash.hcc parse.hcc bisect.hcc convert.hcc commit.hcc unix-stream-server.hcc prio-queue.hcc environment.hcc transport-internal.hcc t/unit-tests/test-lib.hcc t/helper/test-tool.hcc t/helper/test-tool-utils.hcc pager.hcc help.hcc reset.hcc ws.hcc diffcore.hcc json-writer.hcc read-cache.hcc refs.hcc streaming.hcc dir.hcc submodule.hcc fsmonitor-path-utils.hcc ident.hcc hook.hcc match-trees.hcc fsmonitor.hcc sha256/block/sha256.hcc submodule-config.hcc versioncmp.hcc fsmonitor--daemon.hcc csum-file.hcc urlmatch.hcc server-info.hcc ls-refs.hcc branch.hcc strvec.hcc packfile.hcc walker.hcc tmp-objdir.hcc resolve-undo.hcc pack-revindex.hcc alloc.hcc list-objects-filter.hcc date.hcc bundle.hcc http.hcc name-hash.hcc hash-lookup.hcc hash-ll.hcc sideband.hcc userdiff.hcc path.hcc range-diff.hcc graph.hcc object-store-ll.hcc tar.hcc mem-pool.hcc log-tree.hcc wt-status.hcc fetch-negotiator.hcc fetch-pack.hcc protocol.hcc abspath.hcc mailmap.hcc worktree.hcc oidtree.hcc attr.hcc shallow.hcc remote.hcc trailer.hcc protocol-caps.hcc oidset.hcc merge-blobs.hcc editor.hcc commit-slab-decl.hcc commit-reach.hcc copy.hcc commit-graph.hcc version.hcc pack-bitmap.hcc merge.hcc levenshtein.hcc notes-merge.hcc quote.hcc decorate.hcc merge-ll.hcc sparse-index.hcc statinfo.hcc chunk-format.hcc mergesort.hcc list.hcc checkout.hcc grep.hcc transport.hcc git-curl-compat.hcc diff-merges.hcc object-store.hcc trace2/tr2_sysenv.hcc trace2/tr2_cfg.hcc trace2/tr2_dst.hcc trace2/tr2_tgt.hcc trace2/tr2_tmr.hcc trace2/tr2_tls.hcc trace2/tr2_cmd_name.hcc trace2/tr2_tbuf.hcc trace2/tr2_ctr.hcc trace2/tr2_sid.hcc iterator.hcc prompt.hcc banned.hcc strmap.hcc serve.hcc mailinfo.hcc simple-ipc.hcc strbuf.hcc patch-ids.hcc gettext.hcc bloom.hcc chdir-notify.hcc fmt-merge-msg.hcc bulk-checkin.hcc credential.hcc merge-ort.hcc negotiator/default.hcc negotiator/skipping.hcc negotiator/noop.hcc tempfile.hcc send-pack.hcc wrapper.hcc sigchain.hcc gpg-interface.hcc hex-ll.hcc column.hcc lockfile.hcc rebase-interactive.hcc notes-cache.hcc cbtree.hcc repository.hcc git-zlib.hcc varint.hcc block-sha1/sha1.hcc sane-ctype.hcc dir-iterator.hcc upload-pack.hcc sequencer.hcc list-objects.hcc parse-options.hcc bundle-uri.hcc split-index.hcc preload-index.hcc sha1dc_git.hcc string-list.hcc revision.hcc hex.hcc delta-islands.hcc fsmonitor-settings.hcc thread-utils.hcc connect.hcc advice.hcc xdiff-interface.hcc utf8.hcc prune-packed.hcc notes-utils.hcc commit-slab-impl.hcc color.hcc ref-filter.hcc
+rm -f bulk-checkin.hcc pack-bitmap.hcc t/helper/test-tool.hcc t/helper/test-tool-utils.hcc t/unit-tests/test-lib.hcc fmt-merge-msg.hcc ls-refs.hcc hashmap.hcc refs/packed-backend.hcc refs/ref-cache.hcc refs/refs-internal.hcc commit-reach.hcc prio-queue.hcc entry.hcc gettext.hcc list.hcc object-name.hcc ident.hcc hook.hcc checkout.hcc parallel-checkout.hcc revision.hcc date.hcc reachable.hcc notes-cache.hcc diff-merges.hcc trace2.hcc sane-ctype.hcc sideband.hcc symlinks.hcc commit-graph.hcc gpg-interface.hcc parse.hcc http.hcc mailmap.hcc oidtree.hcc notes.hcc url.hcc json-writer.hcc editor.hcc builtin.hcc transport-internal.hcc attr.hcc fsmonitor-path-utils.hcc fetch-pack.hcc prune-packed.hcc object-file-convert.hcc diff.hcc branch.hcc notes-utils.hcc xdiff-interface.hcc preload-index.hcc wt-status.hcc oidmap.hcc trailer.hcc path.hcc server-info.hcc wrapper.hcc line-log.hcc tag.hcc strvec.hcc rerere.hcc unpack-trees.hcc convert.hcc mem-pool.hcc bundle-uri.hcc kwset.hcc reflog-walk.hcc negotiator/skipping.hcc negotiator/default.hcc negotiator/noop.hcc abspath.hcc git-zlib.hcc pretty.hcc string-list.hcc streaming.hcc walker.hcc pack-revindex.hcc color.hcc submodule.hcc hex-ll.hcc protocol-caps.hcc versioncmp.hcc match-trees.hcc loose.hcc lockfile.hcc version.hcc alloc.hcc bundle.hcc pack-mtimes.hcc list-objects-filter.hcc object-store.hcc send-pack.hcc merge-ort.hcc repository.hcc parse-options.hcc diffcore.hcc apply.hcc sha1dc_git.hcc rebase.hcc iterator.hcc oidset.hcc packfile.hcc resolve-undo.hcc alias.hcc simple-ipc.hcc delta-islands.hcc dir-iterator.hcc hash-lookup.hcc oid-array.hcc hash-ll.hcc quote.hcc wildmatch.hcc block-sha1/sha1.hcc blame.hcc fsmonitor-settings.hcc shortlog.hcc patch-ids.hcc write-or-die.hcc mailinfo.hcc line-range.hcc linear-assignment.hcc hex.hcc base85.hcc blob.hcc object-file.hcc connected.hcc chdir-notify.hcc tree-walk.hcc progress.hcc reflog.hcc merge-recursive.hcc sha256/block/sha256.hcc environment.hcc name-hash.hcc merge-ll.hcc list-objects.hcc cbtree.hcc sigchain.hcc levenshtein.hcc strmap.hcc commit.hcc cache-tree.hcc fsck.hcc graph.hcc merge-blobs.hcc tmp-objdir.hcc list-objects-filter-options.hcc trace2/tr2_sysenv.hcc trace2/tr2_tgt.hcc trace2/tr2_tmr.hcc trace2/tr2_cfg.hcc trace2/tr2_tbuf.hcc trace2/tr2_dst.hcc trace2/tr2_ctr.hcc trace2/tr2_cmd_name.hcc trace2/tr2_tls.hcc trace2/tr2_sid.hcc dir.hcc sha1dc/sha1.hcc sha1dc/ubc_check.hcc commit-slab.hcc midx.hcc userdiff.hcc ewah/ewok.hcc ewah/ewok_rlw.hcc connect.hcc csum-file.hcc delta.hcc fsmonitor.hcc commit-slab-decl.hcc hash.hcc ws.hcc submodule-config.hcc tree.hcc banned.hcc merge.hcc replace-object.hcc unix-stream-server.hcc bisect.hcc pathspec.hcc refspec.hcc git-compat-util.hcc thread-utils.hcc tempfile.hcc ref-filter.hcc copy.hcc pack-objects.hcc protocol.hcc prompt.hcc column.hcc serve.hcc run-command.hcc urlmatch.hcc statinfo.hcc shallow.hcc strbuf.hcc worktree.hcc advice.hcc utf8.hcc promisor-remote.hcc trace.hcc add-interactive.hcc diagnose.hcc setup.hcc commit-slab-impl.hcc khash.hcc config.hcc sparse-index.hcc fsmonitor-ipc.hcc read-cache.hcc notes-merge.hcc unix-socket.hcc merge-ort-wrappers.hcc pager.hcc upload-pack.hcc rebase-interactive.hcc bloom.hcc object.hcc varint.hcc reset.hcc fsmonitor--daemon.hcc fsmonitor-ll.hcc help.hcc grep.hcc transport.hcc refs.hcc git-curl-compat.hcc tar.hcc pack.hcc chunk-format.hcc remote.hcc mergesort.hcc sub-process.hcc fetch-negotiator.hcc archive.hcc log-tree.hcc range-diff.hcc credential.hcc reftable/generic.hcc reftable/reftable-record.hcc reftable/reftable-reader.hcc reftable/constants.hcc reftable/reftable-stack.hcc reftable/writer.hcc reftable/block.hcc reftable/reftable-error.hcc reftable/pq.hcc reftable/reader.hcc reftable/blocksource.hcc reftable/basics.hcc reftable/reftable-tests.hcc reftable/reftable-merged.hcc reftable/stack.hcc reftable/reftable-blocksource.hcc reftable/system.hcc reftable/refname.hcc reftable/test_framework.hcc reftable/reftable-malloc.hcc reftable/iter.hcc reftable/tree.hcc reftable/reftable-iterator.hcc reftable/merged.hcc reftable/reftable-generic.hcc reftable/record.hcc reftable/reftable-writer.hcc split-index.hcc decorate.hcc read-cache-ll.hcc sequencer.hcc pkt-line.hcc object-store-ll.hcc exec-cmd.hcc
 rm -f -r bin-wrappers ./.depend builtin/.depend compat/.depend compat/linux/.depend compat/simple-ipc/.depend ewah/.depend negotiator/.depend oss-fuzz/.depend refs/.depend reftable/.depend sha1dc/.depend sha256/block/.depend t/helper/.depend t/unit-tests/.depend trace2/.depend xdiff/.depend compile_commands compile_commands.json
 rm -f -r po/build/
 rm -f *.pyc *.pyo */*.pyc */*.pyo command-list.h config-list.h hook-list.h TAGS tags cscope*
@@ -1104,19 +1140,19 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o oss-fuzz/fuzz-config.o -c -MF oss-fuzz/.depend/fuzz-config.o.d -MQ oss-fuzz/fuzz-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-config.c
+gcc -o oss-fuzz/fuzz-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o oss-fuzz/fuzz-commit-graph.o -c -MF oss-fuzz/.depend/fuzz-commit-graph.o.d -MQ oss-fuzz/fuzz-commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-commit-graph.c
+gcc -o oss-fuzz/fuzz-date.o -c -MF oss-fuzz/.depend/fuzz-date.o.d -MQ oss-fuzz/fuzz-date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o oss-fuzz/fuzz-pack-idx.o -c -MF oss-fuzz/.depend/fuzz-pack-idx.o.d -MQ oss-fuzz/fuzz-pack-idx.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-pack-idx.c
+gcc -o oss-fuzz/fuzz-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o oss-fuzz/fuzz-pack-headers.o -c -MF oss-fuzz/.depend/fuzz-pack-headers.o.d -MQ oss-fuzz/fuzz-pack-headers.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o oss-fuzz/fuzz-date.o -c -MF oss-fuzz/.depend/fuzz-date.o.d -MQ oss-fuzz/fuzz-date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  oss-fuzz/fuzz-date.c
+gcc -o oss-fuzz/fuzz-pack-idx.o -c -MF oss-fuzz/.depend/fuzz-pack-idx.o.d -MQ oss-fuzz/fuzz-pack-idx.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
     * new link flags
@@ -1131,31 +1167,25 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o alloc.o -c -MF ./.depend/alloc.o.d -MQ alloc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o alias.o -c -MF ./.depend/alias.o.d -MQ alias.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o daemon.o -c -MF ./.depend/daemon.o.d -MQ daemon.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o archive-tar.o -c -MF ./.depend/archive-tar.o.d -MQ archive-tar.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-    * new prefix flags
+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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o add-interactive.o -c -MF ./.depend/add-interactive.o.d -MQ add-interactive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o base85.o -c -MF ./.depend/base85.o.d -MQ base85.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o archive-zip.o -c -MF ./.depend/archive-zip.o.d -MQ archive-zip.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+    * new prefix flags
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o blob.o -c -MF ./.depend/blob.o.d -MQ blob.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o add-patch.o -c -MF ./.depend/add-patch.o.d -MQ add-patch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1164,7 +1194,10 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o bisect.o -c -MF ./.depend/bisect.o.d -MQ bisect.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o blob.o -c -MF ./.depend/blob.o.d -MQ blob.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o bloom.o -c -MF ./.depend/bloom.o.d -MQ bloom.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1176,46 +1209,46 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o bundle.o -c -MF ./.depend/bundle.o.d -MQ bundle.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o bundle-uri.o -c -MF ./.depend/bundle-uri.o.d -MQ bundle-uri.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o cbtree.o -c -MF ./.depend/cbtree.o.d -MQ cbtree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o chdir-notify.o -c -MF ./.depend/chdir-notify.o.d -MQ chdir-notify.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o checkout.o -c -MF ./.depend/checkout.o.d -MQ checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o chunk-format.o -c -MF ./.depend/chunk-format.o.d -MQ chunk-format.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o color.o -c -MF ./.depend/color.o.d -MQ color.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o cache-tree.o -c -MF ./.depend/cache-tree.o.d -MQ cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o column.o -c -MF ./.depend/column.o.d -MQ column.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o blame.o -c -MF ./.depend/blame.o.d -MQ blame.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o compat/nonblock.o -c -MF compat/.depend/nonblock.o.d -MQ compat/nonblock.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o compat/obstack.o -c -MF compat/.depend/obstack.o.d -MQ compat/obstack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o compat/terminal.o -c -MF compat/.depend/terminal.o.d -MQ compat/terminal.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o compat/zlib-uncompress2.o -c -MF compat/.depend/zlib-uncompress2.o.d -MQ compat/zlib-uncompress2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  compat/zlib-uncompress2.c
+gcc -o compat/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o commit-reach.o -c -MF ./.depend/commit-reach.o.d -MQ commit-reach.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1224,7 +1257,10 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o apply.o -c -MF ./.depend/apply.o.d -MQ apply.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o compat/terminal.o -c -MF compat/.depend/terminal.o.d -MQ compat/terminal.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o connected.o -c -MF ./.depend/connected.o.d -MQ connected.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1233,63 +1269,63 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o connect.o -c -MF ./.depend/connect.o.d -MQ connect.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o copy.o -c -MF ./.depend/copy.o.d -MQ copy.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o connect.o -c -MF ./.depend/connect.o.d -MQ connect.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  connect.c
+gcc -o commit-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o csum-file.o -c -MF ./.depend/csum-file.o.d -MQ csum-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o ctype.o -c -MF ./.depend/ctype.o.d -MQ ctype.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o commit-graph.o -c -MF ./.depend/commit-graph.o.d -MQ commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o decorate.o -c -MF ./.depend/decorate.o.d -MQ decorate.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o credential.o -c -MF ./.depend/credential.o.d -MQ credential.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o diagnose.o -c -MF ./.depend/diagnose.o.d -MQ diagnose.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o diff-delta.o -c -MF ./.depend/diff-delta.o.d -MQ diff-delta.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o diff-merges.o -c -MF ./.depend/diff-merges.o.d -MQ diff-merges.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o convert.o -c -MF ./.depend/convert.o.d -MQ convert.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o delta-islands.o -c -MF ./.depend/delta-islands.o.d -MQ delta-islands.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o diff-no-index.o -c -MF ./.depend/diff-no-index.o.d -MQ diff-no-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o diffcore-break.o -c -MF ./.depend/diffcore-break.o.d -MQ diffcore-break.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diffcore-break.c
+gcc -o diff-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o config.o -c -MF ./.depend/config.o.d -MQ config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DETC_GITCONFIG='"/etc/gitconfig"' config.c
+gcc -o 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o date.o -c -MF ./.depend/date.o.d -MQ date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o diff-lib.o -c -MF ./.depend/diff-lib.o.d -MQ diff-lib.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  diff-lib.c
+gcc -o diffcore-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o diffcore-order.o -c -MF ./.depend/diffcore-order.o.d -MQ diffcore-order.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o config.o -c -MF ./.depend/config.o.d -MQ config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o diffcore-pickaxe.o -c -MF ./.depend/diffcore-pickaxe.o.d -MQ diffcore-pickaxe.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
@@ -1305,46 +1341,49 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o ewah/bitmap.o -c -MF ewah/.depend/bitmap.o.d -MQ ewah/bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o entry.o -c -MF ./.depend/entry.o.d -MQ entry.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o ewah/ewah_bitmap.o -c -MF ewah/.depend/ewah_bitmap.o.d -MQ ewah/ewah_bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o ewah/ewah_rlw.o -c -MF ewah/.depend/ewah_rlw.o.d -MQ ewah/ewah_rlw.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o diffcore-rename.o -c -MF ./.depend/diffcore-rename.o.d -MQ diffcore-rename.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o fetch-negotiator.o -c -MF ./.depend/fetch-negotiator.o.d -MQ fetch-negotiator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o exec-cmd.o -c -MF ./.depend/exec-cmd.o.d -MQ exec-cmd.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o fsmonitor-ipc.o -c -MF ./.depend/fsmonitor-ipc.o.d -MQ fsmonitor-ipc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o fsmonitor-settings.o -c -MF ./.depend/fsmonitor-settings.o.d -MQ fsmonitor-settings.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o fmt-merge-msg.o -c -MF ./.depend/fmt-merge-msg.o.d -MQ fmt-merge-msg.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  fmt-merge-msg.c
+gcc -o 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o gettext.o -c -MF ./.depend/gettext.o.d -MQ gettext.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DGIT_LOCALE_PATH='"share/locale"' gettext.c
+gcc -o fsmonitor-settings.o -c -MF ./.depend/fsmonitor-settings.o.d -MQ fsmonitor-settings.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o fsck.o -c -MF ./.depend/fsck.o.d -MQ fsck.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o git-zlib.o -c -MF ./.depend/git-zlib.o.d -MQ git-zlib.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1353,21 +1392,18 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o hash-lookup.o -c -MF ./.depend/hash-lookup.o.d -MQ hash-lookup.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o gpg-interface.o -c -MF ./.depend/gpg-interface.o.d -MQ gpg-interface.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-/bin/sh ./generate-cmdlist.sh \
-	 \
-	command-list.txt >command-list.h
+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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o graph.o -c -MF ./.depend/graph.o.d -MQ graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  graph.c
+gcc -o 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o hashmap.o -c -MF ./.depend/hashmap.o.d -MQ hashmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+/bin/sh ./generate-cmdlist.sh \
+	 \
+	command-list.txt >command-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o hex.o -c -MF ./.depend/hex.o.d -MQ hex.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1376,7 +1412,7 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o dir.o -c -MF ./.depend/dir.o.d -MQ dir.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o hook.o -c -MF ./.depend/hook.o.d -MQ hook.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1385,46 +1421,49 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o json-writer.o -c -MF ./.depend/json-writer.o.d -MQ json-writer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o levenshtein.o -c -MF ./.depend/levenshtein.o.d -MQ levenshtein.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o line-range.o -c -MF ./.depend/line-range.o.d -MQ line-range.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o ident.o -c -MF ./.depend/ident.o.d -MQ ident.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o line-range.o -c -MF ./.depend/line-range.o.d -MQ line-range.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o linear-assignment.o -c -MF ./.depend/linear-assignment.o.d -MQ linear-assignment.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o list-objects-filter.o -c -MF ./.depend/list-objects-filter.o.d -MQ list-objects-filter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o list-objects-filter-options.o -c -MF ./.depend/list-objects-filter-options.o.d -MQ list-objects-filter-options.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o lockfile.o -c -MF ./.depend/lockfile.o.d -MQ lockfile.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o kwset.o -c -MF ./.depend/kwset.o.d -MQ kwset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o list-objects.o -c -MF ./.depend/list-objects.o.d -MQ list-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o loose.o -c -MF ./.depend/loose.o.d -MQ loose.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o line-log.o -c -MF ./.depend/line-log.o.d -MQ line-log.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o mailmap.o -c -MF ./.depend/mailmap.o.d -MQ mailmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o match-trees.o -c -MF ./.depend/match-trees.o.d -MQ match-trees.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1433,22 +1472,19 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o merge-blobs.o -c -MF ./.depend/merge-blobs.o.d -MQ merge-blobs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o log-tree.o -c -MF ./.depend/log-tree.o.d -MQ log-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o merge-ll.o -c -MF ./.depend/merge-ll.o.d -MQ merge-ll.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o diff.o -c -MF ./.depend/diff.o.d -MQ diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o merge.o -c -MF ./.depend/merge.o.d -MQ merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o merge-ort-wrappers.o -c -MF ./.depend/merge-ort-wrappers.o.d -MQ merge-ort-wrappers.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o mailinfo.o -c -MF ./.depend/mailinfo.o.d -MQ mailinfo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1460,181 +1496,181 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o negotiator/noop.o -c -MF negotiator/.depend/noop.o.d -MQ negotiator/noop.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o notes-cache.o -c -MF ./.depend/notes-cache.o.d -MQ notes-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o notes-utils.o -c -MF ./.depend/notes-utils.o.d -MQ notes-utils.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o midx-write.o -c -MF ./.depend/midx-write.o.d -MQ midx-write.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o object-file-convert.o -c -MF ./.depend/object-file-convert.o.d -MQ object-file-convert.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o notes-merge.o -c -MF ./.depend/notes-merge.o.d -MQ notes-merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o object.o -c -MF ./.depend/object.o.d -MQ object.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o merge-recursive.o -c -MF ./.depend/merge-recursive.o.d -MQ merge-recursive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o notes.o -c -MF ./.depend/notes.o.d -MQ notes.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o oid-array.o -c -MF ./.depend/oid-array.o.d -MQ oid-array.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o oidmap.o -c -MF ./.depend/oidmap.o.d -MQ oidmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o merge-recursive.o -c -MF ./.depend/merge-recursive.o.d -MQ merge-recursive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o object-name.o -c -MF ./.depend/object-name.o.d -MQ object-name.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o oidtree.o -c -MF ./.depend/oidtree.o.d -MQ oidtree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o oidset.o -c -MF ./.depend/oidset.o.d -MQ oidset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o pack-check.o -c -MF ./.depend/pack-check.o.d -MQ pack-check.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o pack-mtimes.o -c -MF ./.depend/pack-mtimes.o.d -MQ pack-mtimes.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o merge-ort.o -c -MF ./.depend/merge-ort.o.d -MQ merge-ort.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o pack-objects.o -c -MF ./.depend/pack-objects.o.d -MQ pack-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o pack-bitmap-write.o -c -MF ./.depend/pack-bitmap-write.o.d -MQ pack-bitmap-write.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o pager.o -c -MF ./.depend/pager.o.d -MQ pager.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -DPAGER_ENV='"LESS=FRX LV=-c"' pager.c
+gcc -o pack-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o pack-write.o -c -MF ./.depend/pack-write.o.d -MQ pack-write.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o pack-revindex.o -c -MF ./.depend/pack-revindex.o.d -MQ pack-revindex.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o object-file.o -c -MF ./.depend/object-file.o.d -MQ object-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o parse.o -c -MF ./.depend/parse.o.d -MQ parse.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  parse.c
+gcc -o pack-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o parse-options-cb.o -c -MF ./.depend/parse-options-cb.o.d -MQ parse-options-cb.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o parallel-checkout.o -c -MF ./.depend/parallel-checkout.o.d -MQ parallel-checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o patch-delta.o -c -MF ./.depend/patch-delta.o.d -MQ patch-delta.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o pack-bitmap.o -c -MF ./.depend/pack-bitmap.o.d -MQ pack-bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o patch-ids.o -c -MF ./.depend/patch-ids.o.d -MQ patch-ids.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o packfile.o -c -MF ./.depend/packfile.o.d -MQ packfile.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o parse-options.o -c -MF ./.depend/parse-options.o.d -MQ parse-options.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o preload-index.o -c -MF ./.depend/preload-index.o.d -MQ preload-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o pkt-line.o -c -MF ./.depend/pkt-line.o.d -MQ pkt-line.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o prio-queue.o -c -MF ./.depend/prio-queue.o.d -MQ prio-queue.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o pathspec.o -c -MF ./.depend/pathspec.o.d -MQ pathspec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  pathspec.c
+gcc -o path.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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o path.o -c -MF ./.depend/path.o.d -MQ path.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o progress.o -c -MF ./.depend/progress.o.d -MQ progress.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o prompt.o -c -MF ./.depend/prompt.o.d -MQ prompt.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o prune-packed.o -c -MF ./.depend/prune-packed.o.d -MQ prune-packed.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o protocol.o -c -MF ./.depend/protocol.o.d -MQ protocol.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o promisor-remote.o -c -MF ./.depend/promisor-remote.o.d -MQ promisor-remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o prune-packed.o -c -MF ./.depend/prune-packed.o.d -MQ prune-packed.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o protocol-caps.o -c -MF ./.depend/protocol-caps.o.d -MQ protocol-caps.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reachable.o -c -MF ./.depend/reachable.o.d -MQ reachable.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o rebase-interactive.o -c -MF ./.depend/rebase-interactive.o.d -MQ rebase-interactive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o quote.o -c -MF ./.depend/quote.o.d -MQ quote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o rebase.o -c -MF ./.depend/rebase.o.d -MQ rebase.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o range-diff.o -c -MF ./.depend/range-diff.o.d -MQ range-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reflog-walk.o -c -MF ./.depend/reflog-walk.o.d -MQ reflog-walk.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o refs/iterator.o -c -MF refs/.depend/iterator.o.d -MQ refs/iterator.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o refs/reftable-backend.o -c -MF refs/.depend/reftable-backend.o.d -MQ refs/reftable-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o read-cache.o -c -MF ./.depend/read-cache.o.d -MQ read-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o refs/files-backend.o -c -MF refs/.depend/files-backend.o.d -MQ refs/files-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o refs.o -c -MF ./.depend/refs.o.d -MQ refs.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  refs/ref-cache.c
+gcc -o refs/packed-backend.o -c -MF refs/.depend/packed-backend.o.d -MQ refs/packed-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o ref-filter.o -c -MF ./.depend/ref-filter.o.d -MQ ref-filter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1643,13 +1679,16 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o refs/reftable-backend.o -c -MF refs/.depend/reftable-backend.o.d -MQ refs/reftable-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o refspec.o -c -MF ./.depend/refspec.o.d -MQ refspec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reset.o -c -MF ./.depend/reset.o.d -MQ reset.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1658,19 +1697,19 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o repository.o -c -MF ./.depend/repository.o.d -MQ repository.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o send-pack.o -c -MF ./.depend/send-pack.o.d -MQ send-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o serve.o -c -MF ./.depend/serve.o.d -MQ serve.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o rerere.o -c -MF ./.depend/rerere.o.d -MQ rerere.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  rerere.c
+gcc -o serve.o -c -MF ./.depend/serve.o.d -MQ serve.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o run-command.o -c -MF ./.depend/run-command.o.d -MQ run-command.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o server-info.o -c -MF ./.depend/server-info.o.d -MQ server-info.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1685,28 +1724,25 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o split-index.o -c -MF ./.depend/split-index.o.d -MQ split-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o remote.o -c -MF ./.depend/remote.o.d -MQ remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o stable-qsort.o -c -MF ./.depend/stable-qsort.o.d -MQ stable-qsort.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o sparse-index.o -c -MF ./.depend/sparse-index.o.d -MQ sparse-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o statinfo.o -c -MF ./.depend/statinfo.o.d -MQ statinfo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o setup.o -c -MF ./.depend/setup.o.d -MQ setup.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o streaming.o -c -MF ./.depend/streaming.o.d -MQ streaming.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o string-list.o -c -MF ./.depend/string-list.o.d -MQ string-list.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o strvec.o -c -MF ./.depend/strvec.o.d -MQ strvec.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1715,34 +1751,37 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o string-list.o -c -MF ./.depend/string-list.o.d -MQ string-list.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o symlinks.o -c -MF ./.depend/symlinks.o.d -MQ symlinks.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o revision.o -c -MF ./.depend/revision.o.d -MQ revision.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o submodule-config.o -c -MF ./.depend/submodule-config.o.d -MQ submodule-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o thread-utils.o -c -MF ./.depend/thread-utils.o.d -MQ thread-utils.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o tag.o -c -MF ./.depend/tag.o.d -MQ tag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o tempfile.o -c -MF ./.depend/tempfile.o.d -MQ tempfile.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o tmp-objdir.o -c -MF ./.depend/tmp-objdir.o.d -MQ tmp-objdir.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o strbuf.o -c -MF ./.depend/strbuf.o.d -MQ strbuf.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trace.o -c -MF ./.depend/trace.o.d -MQ trace.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace.c
+gcc -o trace2.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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o trace2/tr2_cfg.o -c -MF trace2/.depend/tr2_cfg.o.d -MQ trace2/tr2_cfg.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1751,55 +1790,55 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trace2/tr2_ctr.o -c -MF trace2/.depend/tr2_ctr.o.d -MQ trace2/tr2_ctr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o submodule.o -c -MF ./.depend/submodule.o.d -MQ submodule.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o trace2/tr2_sid.o -c -MF trace2/.depend/tr2_sid.o.d -MQ trace2/tr2_sid.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trace2/tr2_sysenv.o -c -MF trace2/.depend/tr2_sysenv.o.d -MQ trace2/tr2_sysenv.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_sysenv.c
+gcc -o trace2/tr2_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trace2.o -c -MF ./.depend/trace2.o.d -MQ trace2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2.c
+gcc -o trace2/tr2_sysenv.o -c -MF trace2/.depend/tr2_sysenv.o.d -MQ trace2/tr2_sysenv.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o trace2/tr2_dst.o -c -MF trace2/.depend/tr2_dst.o.d -MQ trace2/tr2_dst.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trace2/tr2_tbuf.o -c -MF trace2/.depend/tr2_tbuf.o.d -MQ trace2/tr2_tbuf.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tbuf.c
+gcc -o trace2/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trace2/tr2_tmr.o -c -MF trace2/.depend/tr2_tmr.o.d -MQ trace2/tr2_tmr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tmr.c
+gcc -o trace2/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o trace2/tr2_tgt_normal.o -c -MF trace2/.depend/tr2_tgt_normal.o.d -MQ trace2/tr2_tgt_normal.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trace2/tr2_tls.o -c -MF trace2/.depend/tr2_tls.o.d -MQ trace2/tr2_tls.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tls.c
+gcc -o trace2/tr2_tgt_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trace2/tr2_tgt_event.o -c -MF trace2/.depend/tr2_tgt_event.o.d -MQ trace2/tr2_tgt_event.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  trace2/tr2_tgt_event.c
+gcc -o trace2/tr2_tmr.o -c -MF trace2/.depend/tr2_tmr.o.d -MQ trace2/tr2_tmr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trace2/tr2_tgt_perf.o -c -MF trace2/.depend/tr2_tgt_perf.o.d -MQ trace2/tr2_tgt_perf.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o tree-diff.o -c -MF ./.depend/tree-diff.o.d -MQ tree-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o tree.o -c -MF ./.depend/tree.o.d -MQ tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o trailer.o -c -MF ./.depend/trailer.o.d -MQ trailer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o transport-helper.o -c -MF ./.depend/transport-helper.o.d -MQ transport-helper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o transport.o -c -MF ./.depend/transport.o.d -MQ transport.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o tree-walk.o -c -MF ./.depend/tree-walk.o.d -MQ tree-walk.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1808,118 +1847,118 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o urlmatch.o -c -MF ./.depend/urlmatch.o.d -MQ urlmatch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o usage.o -c -MF ./.depend/usage.o.d -MQ usage.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o userdiff.o -c -MF ./.depend/userdiff.o.d -MQ userdiff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o urlmatch.o -c -MF ./.depend/urlmatch.o.d -MQ urlmatch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o varint.o -c -MF ./.depend/varint.o.d -MQ varint.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o sequencer.o -c -MF ./.depend/sequencer.o.d -MQ sequencer.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o versioncmp.o -c -MF ./.depend/versioncmp.o.d -MQ versioncmp.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o upload-pack.o -c -MF ./.depend/upload-pack.o.d -MQ upload-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o walker.o -c -MF ./.depend/walker.o.d -MQ walker.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o utf8.o -c -MF ./.depend/utf8.o.d -MQ utf8.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o wildmatch.o -c -MF ./.depend/wildmatch.o.d -MQ wildmatch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o write-or-die.o -c -MF ./.depend/write-or-die.o.d -MQ write-or-die.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o worktree.o -c -MF ./.depend/worktree.o.d -MQ worktree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o ws.o -c -MF ./.depend/ws.o.d -MQ ws.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o wrapper.o -c -MF ./.depend/wrapper.o.d -MQ wrapper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o unix-socket.o -c -MF ./.depend/unix-socket.o.d -MQ unix-socket.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o unpack-trees.o -c -MF ./.depend/unpack-trees.o.d -MQ unpack-trees.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o compat/simple-ipc/ipc-shared.o -c -MF compat/simple-ipc/.depend/ipc-shared.o.d -MQ compat/simple-ipc/ipc-shared.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o worktree.o -c -MF ./.depend/worktree.o.d -MQ worktree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o sha1dc_git.o -c -MF ./.depend/sha1dc_git.o.d -MQ sha1dc_git.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o compat/linux/procinfo.o -c -MF compat/linux/.depend/procinfo.o.d -MQ compat/linux/procinfo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o compat/simple-ipc/ipc-unix-socket.o -c -MF compat/simple-ipc/.depend/ipc-unix-socket.o.d -MQ compat/simple-ipc/ipc-unix-socket.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o compat/fopen.o -c -MF compat/.depend/fopen.o.d -MQ compat/fopen.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o compat/strlcpy.o -c -MF compat/.depend/strlcpy.o.d -MQ compat/strlcpy.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o sha1dc/ubc_check.o -c -MF sha1dc/.depend/ubc_check.o.d -MQ sha1dc/ubc_check.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o compat/qsort_s.o -c -MF compat/.depend/qsort_s.o.d -MQ compat/qsort_s.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o sha256/block/sha256.o -c -MF sha256/block/.depend/sha256.o.d -MQ sha256/block/sha256.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o xdiff/xemit.o -c -MF xdiff/.depend/xemit.o.d -MQ xdiff/xemit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o sha1dc/ubc_check.o -c -MF sha1dc/.depend/ubc_check.o.d -MQ sha1dc/ubc_check.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o sha1dc/sha1.o -c -MF sha1dc/.depend/sha1.o.d -MQ sha1dc/sha1.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o xdiff/xdiffi.o -c -MF xdiff/.depend/xdiffi.o.d -MQ xdiff/xdiffi.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o xdiff/xpatience.o -c -MF xdiff/.depend/xpatience.o.d -MQ xdiff/xpatience.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o xdiff/xprepare.o -c -MF xdiff/.depend/xprepare.o.d -MQ xdiff/xprepare.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/basics.o -c -MF reftable/.depend/basics.o.d -MQ reftable/basics.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reftable/error.o -c -MF reftable/.depend/error.o.d -MQ reftable/error.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o wt-status.o -c -MF ./.depend/wt-status.o.d -MQ wt-status.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o xdiff/xmerge.o -c -MF xdiff/.depend/xmerge.o.d -MQ xdiff/xmerge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reftable/blocksource.o -c -MF reftable/.depend/blocksource.o.d -MQ reftable/blocksource.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1931,19 +1970,16 @@
 gcc -o reftable/publicbasics.o -c -MF reftable/.depend/publicbasics.o.d -MQ reftable/publicbasics.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  reftable/publicbasics.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/block.o -c -MF reftable/.depend/block.o.d -MQ reftable/block.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reftable/merged.o -c -MF reftable/.depend/merged.o.d -MQ reftable/merged.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reftable/pq.o -c -MF reftable/.depend/pq.o.d -MQ reftable/pq.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/generic.o -c -MF reftable/.depend/generic.o.d -MQ reftable/generic.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/generic.c
+gcc -o reftable/refname.o -c -MF reftable/.depend/refname.o.d -MQ reftable/refname.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/refname.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/refname.o -c -MF reftable/.depend/refname.o.d -MQ reftable/refname.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/refname.c
+gcc -o reftable/generic.o -c -MF reftable/.depend/generic.o.d -MQ reftable/generic.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/generic.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reftable/tree.o -c -MF reftable/.depend/tree.o.d -MQ reftable/tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1958,6 +1994,9 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o sh-i18n--envsubst.o -c -MF ./.depend/sh-i18n--envsubst.o.d -MQ sh-i18n--envsubst.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o http-backend.o -c -MF ./.depend/http-backend.o.d -MQ http-backend.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
@@ -1967,7 +2006,7 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o sh-i18n--envsubst.o -c -MF ./.depend/sh-i18n--envsubst.o.d -MQ sh-i18n--envsubst.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o http-fetch.o -c -MF ./.depend/http-fetch.o.d -MQ http-fetch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -1979,10 +2018,10 @@
     * new perl-specific parameters
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-    * new Python interpreter location
+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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o imap-send.o -c -MF ./.depend/imap-send.o.d -MQ imap-send.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
+    * new Python interpreter location
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-instaweb.sh >git-instaweb+ && \
@@ -1990,10 +2029,10 @@
 mv git-instaweb+ git-instaweb
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o http-walker.o -c -MF ./.depend/http-walker.o.d -MQ http-walker.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/add.o -c -MF builtin/.depend/add.o.d -MQ builtin/add.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o git.o -c -MF ./.depend/git.o.d -MQ git.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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
@@ -2002,75 +2041,75 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/apply.o -c -MF builtin/.depend/apply.o.d -MQ builtin/apply.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/archive.o -c -MF builtin/.depend/archive.o.d -MQ builtin/archive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o http-push.o -c -MF ./.depend/http-push.o.d -MQ http-push.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  http-push.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 /bin/sh ./generate-hooklist.sh >hook-list.h
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o http.o -c -MF ./.depend/http.o.d -MQ http.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/bundle.o -c -MF builtin/.depend/bundle.o.d -MQ builtin/bundle.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/bisect.o -c -MF builtin/.depend/bisect.o.d -MQ builtin/bisect.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/cat-file.o -c -MF builtin/.depend/cat-file.o.d -MQ builtin/cat-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/cat-file.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/am.o -c -MF builtin/.depend/am.o.d -MQ builtin/am.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/am.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/blame.o -c -MF builtin/.depend/blame.o.d -MQ builtin/blame.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/checkout--worker.o -c -MF builtin/.depend/checkout--worker.o.d -MQ builtin/checkout--worker.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/checkout--worker.c
+gcc -o builtin/check-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/check-mailmap.o -c -MF builtin/.depend/check-mailmap.o.d -MQ builtin/check-mailmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/check-ref-format.o -c -MF builtin/.depend/check-ref-format.o.d -MQ builtin/check-ref-format.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/check-ignore.o -c -MF builtin/.depend/check-ignore.o.d -MQ builtin/check-ignore.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/check-ignore.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/branch.o -c -MF builtin/.depend/branch.o.d -MQ builtin/branch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/branch.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/column.c
+gcc -o builtin/checkout-index.o -c -MF builtin/.depend/checkout-index.o.d -MQ builtin/checkout-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/checkout-index.o -c -MF builtin/.depend/checkout-index.o.d -MQ builtin/checkout-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/commit-graph.o -c -MF builtin/.depend/commit-graph.o.d -MQ builtin/commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/commit-tree.o -c -MF builtin/.depend/commit-tree.o.d -MQ builtin/commit-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/clean.o -c -MF builtin/.depend/clean.o.d -MQ builtin/clean.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/clean.c
+gcc -o builtin/commit-graph.o -c -MF builtin/.depend/commit-graph.o.d -MQ builtin/commit-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/count-objects.o -c -MF builtin/.depend/count-objects.o.d -MQ builtin/count-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o builtin/config.o -c -MF builtin/.depend/config.o.d -MQ builtin/config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/clone.o -c -MF builtin/.depend/clone.o.d -MQ builtin/clone.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
@@ -2080,67 +2119,64 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/credential.o -c -MF builtin/.depend/credential.o.d -MQ builtin/credential.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/checkout.o -c -MF builtin/.depend/checkout.o.d -MQ builtin/checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/credential-store.o -c -MF builtin/.depend/credential-store.o.d -MQ builtin/credential-store.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/config.o -c -MF builtin/.depend/config.o.d -MQ builtin/config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/config.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/diagnose.o -c -MF builtin/.depend/diagnose.o.d -MQ builtin/diagnose.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/diagnose.c
+gcc -o builtin/credential-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/diff-index.o -c -MF builtin/.depend/diff-index.o.d -MQ builtin/diff-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/diff-files.o -c -MF builtin/.depend/diff-files.o.d -MQ builtin/diff-files.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/commit.o -c -MF builtin/.depend/commit.o.d -MQ builtin/commit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/commit.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/diff-tree.o -c -MF builtin/.depend/diff-tree.o.d -MQ builtin/diff-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/fetch-pack.o -c -MF builtin/.depend/fetch-pack.o.d -MQ builtin/fetch-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch-pack.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/diff.o -c -MF builtin/.depend/diff.o.d -MQ builtin/diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/fmt-merge-msg.o -c -MF builtin/.depend/fmt-merge-msg.o.d -MQ builtin/fmt-merge-msg.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/describe.o -c -MF builtin/.depend/describe.o.d -MQ builtin/describe.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/describe.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/for-each-ref.o -c -MF builtin/.depend/for-each-ref.o.d -MQ builtin/for-each-ref.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/for-each-repo.o -c -MF builtin/.depend/for-each-repo.o.d -MQ builtin/for-each-repo.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/for-each-repo.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/fsmonitor--daemon.o -c -MF builtin/.depend/fsmonitor--daemon.o.d -MQ builtin/fsmonitor--daemon.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/fast-export.o -c -MF builtin/.depend/fast-export.o.d -MQ builtin/fast-export.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/get-tar-commit-id.o -c -MF builtin/.depend/get-tar-commit-id.o.d -MQ builtin/get-tar-commit-id.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/hash-object.o -c -MF builtin/.depend/hash-object.o.d -MQ builtin/hash-object.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/hash-object.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/fsck.o -c -MF builtin/.depend/fsck.o.d -MQ builtin/fsck.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 /bin/sh ./generate-configlist.sh >config-list.h
@@ -2149,34 +2185,34 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/fetch.o -c -MF builtin/.depend/fetch.o.d -MQ builtin/fetch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fetch.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/interpret-trailers.o -c -MF builtin/.depend/interpret-trailers.o.d -MQ builtin/interpret-trailers.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/interpret-trailers.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/grep.o -c -MF builtin/.depend/grep.o.d -MQ builtin/grep.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/gc.o -c -MF builtin/.depend/gc.o.d -MQ builtin/gc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/gc.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/ls-remote.o -c -MF builtin/.depend/ls-remote.o.d -MQ builtin/ls-remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/ls-tree.o -c -MF builtin/.depend/ls-tree.o.d -MQ builtin/ls-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/ls-tree.c
+gcc -o builtin/ls-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/ls-files.o -c -MF builtin/.depend/ls-files.o.d -MQ builtin/ls-files.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/merge-base.o -c -MF builtin/.depend/merge-base.o.d -MQ builtin/merge-base.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-base.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/mailsplit.o -c -MF builtin/.depend/mailsplit.o.d -MQ builtin/mailsplit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
@@ -2185,37 +2221,40 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/merge-ours.o -c -MF builtin/.depend/merge-ours.o.d -MQ builtin/merge-ours.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/merge-index.o -c -MF builtin/.depend/merge-index.o.d -MQ builtin/merge-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-index.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/merge-file.o -c -MF builtin/.depend/merge-file.o.d -MQ builtin/merge-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-file.c
+gcc -o builtin/merge-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o builtin/merge-index.o -c -MF builtin/.depend/merge-index.o.d -MQ builtin/merge-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/merge-recursive.o -c -MF builtin/.depend/merge-recursive.o.d -MQ builtin/merge-recursive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/fast-import.o -c -MF builtin/.depend/fast-import.o.d -MQ builtin/fast-import.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/fast-import.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/mktag.o -c -MF builtin/.depend/mktag.o.d -MQ builtin/mktag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/multi-pack-index.o -c -MF builtin/.depend/multi-pack-index.o.d -MQ builtin/multi-pack-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/multi-pack-index.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/mktree.o -c -MF builtin/.depend/mktree.o.d -MQ builtin/mktree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/merge-tree.o -c -MF builtin/.depend/merge-tree.o.d -MQ builtin/merge-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/merge-tree.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/mv.o -c -MF builtin/.depend/mv.o.d -MQ builtin/mv.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/log.o -c -MF builtin/.depend/log.o.d -MQ builtin/log.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/name-rev.o -c -MF builtin/.depend/name-rev.o.d -MQ builtin/name-rev.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
@@ -2224,61 +2263,58 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/merge.o -c -MF builtin/.depend/merge.o.d -MQ builtin/merge.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/prune-packed.o -c -MF builtin/.depend/prune-packed.o.d -MQ builtin/prune-packed.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune-packed.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/patch-id.o -c -MF builtin/.depend/patch-id.o.d -MQ builtin/patch-id.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/patch-id.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/prune.o -c -MF builtin/.depend/prune.o.d -MQ builtin/prune.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/prune.c
+gcc -o builtin/patch-id.o -c -MF builtin/.depend/patch-id.o.d -MQ builtin/patch-id.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/range-diff.o -c -MF builtin/.depend/range-diff.o.d -MQ builtin/range-diff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/pack-redundant.o -c -MF builtin/.depend/pack-redundant.o.d -MQ builtin/pack-redundant.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/pack-redundant.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/read-tree.o -c -MF builtin/.depend/read-tree.o.d -MQ builtin/read-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/pull.o -c -MF builtin/.depend/pull.o.d -MQ builtin/pull.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/push.o -c -MF builtin/.depend/push.o.d -MQ builtin/push.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/remote-fd.o -c -MF builtin/.depend/remote-fd.o.d -MQ builtin/remote-fd.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/remote-ext.o -c -MF builtin/.depend/remote-ext.o.d -MQ builtin/remote-ext.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/reflog.o -c -MF builtin/.depend/reflog.o.d -MQ builtin/reflog.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/replace.o -c -MF builtin/.depend/replace.o.d -MQ builtin/replace.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/replace.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/rebase.o -c -MF builtin/.depend/rebase.o.d -MQ builtin/rebase.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/receive-pack.o -c -MF builtin/.depend/receive-pack.o.d -MQ builtin/receive-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/repack.o -c -MF builtin/.depend/repack.o.d -MQ builtin/repack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/rerere.o -c -MF builtin/.depend/rerere.o.d -MQ builtin/rerere.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/remote.o -c -MF builtin/.depend/remote.o.d -MQ builtin/remote.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
@@ -2293,61 +2329,67 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/rev-list.o -c -MF builtin/.depend/rev-list.o.d -MQ builtin/rev-list.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rev-list.c
+gcc -o builtin/rm.o -c -MF builtin/.depend/rm.o.d -MQ builtin/rm.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/send-pack.o -c -MF builtin/.depend/send-pack.o.d -MQ builtin/send-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/rm.o -c -MF builtin/.depend/rm.o.d -MQ builtin/rm.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/show-index.o -c -MF builtin/.depend/show-index.o.d -MQ builtin/show-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/shortlog.o -c -MF builtin/.depend/shortlog.o.d -MQ builtin/shortlog.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o builtin/rev-parse.o -c -MF builtin/.depend/rev-parse.o.d -MQ builtin/rev-parse.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/show-ref.o -c -MF builtin/.depend/show-ref.o.d -MQ builtin/show-ref.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/stripspace.o -c -MF builtin/.depend/stripspace.o.d -MQ builtin/stripspace.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/rev-parse.o -c -MF builtin/.depend/rev-parse.o.d -MQ builtin/rev-parse.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/rev-parse.c
+gcc -o builtin/show-branch.o -c -MF builtin/.depend/show-branch.o.d -MQ builtin/show-branch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o builtin/sparse-checkout.o -c -MF builtin/.depend/sparse-checkout.o.d -MQ builtin/sparse-checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/symbolic-ref.o -c -MF builtin/.depend/symbolic-ref.o.d -MQ builtin/symbolic-ref.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/show-branch.o -c -MF builtin/.depend/show-branch.o.d -MQ builtin/show-branch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/sparse-checkout.o -c -MF builtin/.depend/sparse-checkout.o.d -MQ builtin/sparse-checkout.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/unpack-file.o -c -MF builtin/.depend/unpack-file.o.d -MQ builtin/unpack-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/unpack-objects.o -c -MF builtin/.depend/unpack-objects.o.d -MQ builtin/unpack-objects.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/tag.o -c -MF builtin/.depend/tag.o.d -MQ builtin/tag.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/tag.c
+gcc -o builtin/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/update-ref.o -c -MF builtin/.depend/update-ref.o.d -MQ builtin/update-ref.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/stash.o -c -MF builtin/.depend/stash.o.d -MQ builtin/stash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/update-server-info.o -c -MF builtin/.depend/update-server-info.o.d -MQ builtin/update-server-info.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  builtin/update-server-info.c
+gcc -o builtin/upload-archive.o -c -MF builtin/.depend/upload-archive.o.d -MQ builtin/upload-archive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/upload-pack.o -c -MF builtin/.depend/upload-pack.o.d -MQ builtin/upload-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/upload-archive.o -c -MF builtin/.depend/upload-archive.o.d -MQ builtin/upload-archive.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o builtin/verify-commit.o -c -MF builtin/.depend/verify-commit.o.d -MQ builtin/verify-commit.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
@@ -2363,24 +2405,21 @@
 mv git-mergetool--lib+ git-mergetool--lib
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/verify-pack.o -c -MF builtin/.depend/verify-pack.o.d -MQ builtin/verify-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-sh-i18n.sh >git-sh-i18n+ && \
+mv git-sh-i18n+ git-sh-i18n
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-sh-setup.sh >git-sh-setup+ && \
 mv git-sh-setup+ git-sh-setup
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-sh-i18n.sh >git-sh-i18n+ && \
-mv git-sh-i18n+ git-sh-i18n
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/update-index.o -c -MF builtin/.depend/update-index.o.d -MQ builtin/update-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/write-tree.o -c -MF builtin/.depend/write-tree.o.d -MQ builtin/write-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o version.o -c -MF ./.depend/version.o.d -MQ version.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_VERSION="2.45.2"' '-DGIT_USER_AGENT="git/2.45.2"' '-DGIT_BUILT_FROM_COMMIT=""' version.c
+gcc -o help.o -c -MF ./.depend/help.o.d -MQ help.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f xdiff/lib.a && ar rcs xdiff/lib.a xdiff/xdiffi.o xdiff/xemit.o xdiff/xhistogram.o xdiff/xmerge.o xdiff/xpatience.o xdiff/xprepare.o xdiff/xutils.o
@@ -2394,6 +2433,9 @@
 mv git-difftool--helper+ git-difftool--helper
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o version.o -c -MF ./.depend/version.o.d -MQ version.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' '-DGIT_VERSION="2.45.2"' '-DGIT_USER_AGENT="git/2.45.2"' '-DGIT_BUILT_FROM_COMMIT=""' version.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-filter-branch.sh >git-filter-branch+ && \
 chmod +x git-filter-branch+ && \
 mv git-filter-branch+ git-filter-branch
@@ -2419,11 +2461,17 @@
 mv git-mergetool+ git-mergetool
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o attr.o -c -MF ./.depend/attr.o.d -MQ attr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-quiltimport.sh >git-quiltimport+ && \
 chmod +x git-quiltimport+ && \
 mv git-quiltimport+ git-quiltimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o scalar.o -c -MF ./.depend/scalar.o.d -MQ scalar.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' -e 's|@SHELL_PATH@|/bin/sh|' -e 's|@@DIFF@@|diff|' -e 's|@@LOCALEDIR@@|/usr/share/locale|g' -e 's/@@USE_GETTEXT_SCHEME@@//g' -e '/^# @@BROKEN_PATH_FIX@@$/d' -e 's|@@GITWEBDIR@@|/usr/share/gitweb|g' -e 's|@@PERL@@|/usr/bin/perl|g' -e 's|@@PAGER_ENV@@|LESS=FRX LV=-c|g' git-request-pull.sh >git-request-pull+ && \
 chmod +x git-request-pull+ && \
 mv git-request-pull+ git-request-pull
@@ -2452,6 +2500,9 @@
 mv GIT-PERL-HEADER+ GIT-PERL-HEADER
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o builtin/submodule--helper.o -c -MF builtin/.depend/submodule--helper.o.d -MQ builtin/submodule--helper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
 sed -e '1s|#!.*python|#!/usr/bin/python3|' \
     git-p4.py >git-p4+ && \
@@ -2459,12 +2510,6 @@
 mv git-p4+ git-p4
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o scalar.o -c -MF ./.depend/scalar.o.d -MQ scalar.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
@@ -2501,9 +2546,6 @@
 mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o help.o -c -MF ./.depend/help.o.d -MQ help.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
@@ -2516,6 +2558,9 @@
 mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f libgit.a && ar rcs libgit.a abspath.o add-interactive.o add-patch.o advice.o alias.o alloc.o apply.o archive-tar.o archive-zip.o archive.o attr.o base85.o bisect.o blame.o blob.o bloom.o branch.o bulk-checkin.o bundle-uri.o bundle.o cache-tree.o cbtree.o chdir-notify.o checkout.o chunk-format.o color.o column.o combine-diff.o commit-graph.o commit-reach.o commit.o compat/nonblock.o compat/obstack.o compat/terminal.o compat/zlib-uncompress2.o config.o connect.o connected.o convert.o copy.o credential.o csum-file.o ctype.o date.o decorate.o delta-islands.o diagnose.o diff-delta.o diff-merges.o diff-lib.o diff-no-index.o diff.o diffcore-break.o diffcore-delta.o diffcore-order.o diffcore-pickaxe.o diffcore-rename.o diffcore-rotate.o dir-iterator.o dir.o editor.o entry.o environment.o ewah/bitmap.o ewah/ewah_bitmap.o ewah/ewah_io.o ewah/ewah_rlw.o exec-cmd.o fetch-negotiator.o fetch-pack.o fmt-merge-msg.o fsck.o fsmonitor.o fsmonitor-ipc.o fsmonitor-settings.o gettext.o git-zlib.o gpg-interface.o graph.o grep.o hash-lookup.o hashmap.o help.o hex.o hex-ll.o hook.o ident.o json-writer.o kwset.o levenshtein.o line-log.o line-range.o linear-assignment.o list-objects-filter-options.o list-objects-filter.o list-objects.o lockfile.o log-tree.o loose.o ls-refs.o mailinfo.o mailmap.o match-trees.o mem-pool.o merge-blobs.o merge-ll.o merge-ort.o merge-ort-wrappers.o merge-recursive.o merge.o midx.o midx-write.o name-hash.o negotiator/default.o negotiator/noop.o negotiator/skipping.o notes-cache.o notes-merge.o notes-utils.o notes.o object-file-convert.o object-file.o object-name.o object.o oid-array.o oidmap.o oidset.o oidtree.o pack-bitmap-write.o pack-bitmap.o pack-check.o pack-mtimes.o pack-objects.o pack-revindex.o pack-write.o packfile.o pager.o parallel-checkout.o parse.o parse-options-cb.o parse-options.o patch-delta.o patch-ids.o path.o pathspec.o pkt-line.o preload-index.o pretty.o prio-queue.o progress.o promisor-remote.o prompt.o protocol.o protocol-caps.o prune-packed.o 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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
 sed -e '1{' \
     -e '	s|#!.*perl|#!/usr/bin/perl|' \
@@ -2523,9 +2568,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-svn.perl >git-svn+ && \
-chmod +x git-svn+ && \
-mv git-svn+ git-svn
+    git-send-email.perl >git-send-email+ && \
+chmod +x git-send-email+ && \
+mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
@@ -2535,50 +2580,37 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-send-email.perl >git-send-email+ && \
-chmod +x git-send-email+ && \
-mv git-send-email+ git-send-email
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/worktree.o -c -MF builtin/.depend/worktree.o.d -MQ builtin/worktree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+    git-svn.perl >git-svn+ && \
+chmod +x git-svn+ && \
+mv git-svn+ git-svn
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o attr.o -c -MF ./.depend/attr.o.d -MQ attr.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/submodule--helper.o -c -MF builtin/.depend/submodule--helper.o.d -MQ builtin/submodule--helper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f libgit.a && ar rcs libgit.a abspath.o add-interactive.o add-patch.o advice.o alias.o alloc.o apply.o archive-tar.o archive-zip.o archive.o attr.o base85.o bisect.o blame.o blob.o bloom.o branch.o bulk-checkin.o bundle-uri.o bundle.o cache-tree.o cbtree.o chdir-notify.o checkout.o chunk-format.o color.o column.o combine-diff.o commit-graph.o commit-reach.o commit.o compat/nonblock.o compat/obstack.o compat/terminal.o compat/zlib-uncompress2.o config.o connect.o connected.o convert.o copy.o credential.o csum-file.o ctype.o date.o decorate.o delta-islands.o diagnose.o diff-delta.o diff-merges.o diff-lib.o diff-no-index.o diff.o diffcore-break.o diffcore-delta.o diffcore-order.o diffcore-pickaxe.o diffcore-rename.o diffcore-rotate.o dir-iterator.o dir.o editor.o entry.o environment.o ewah/bitmap.o ewah/ewah_bitmap.o ewah/ewah_io.o ewah/ewah_rlw.o exec-cmd.o fetch-negotiator.o fetch-pack.o fmt-merge-msg.o fsck.o fsmonitor.o fsmonitor-ipc.o fsmonitor-settings.o gettext.o git-zlib.o gpg-interface.o graph.o grep.o hash-lookup.o hashmap.o help.o hex.o hex-ll.o hook.o ident.o json-writer.o kwset.o levenshtein.o line-log.o line-range.o linear-assignment.o list-objects-filter-options.o list-objects-filter.o list-objects.o lockfile.o log-tree.o loose.o ls-refs.o mailinfo.o mailmap.o match-trees.o mem-pool.o merge-blobs.o merge-ll.o merge-ort.o merge-ort-wrappers.o merge-recursive.o merge.o midx.o midx-write.o name-hash.o negotiator/default.o negotiator/noop.o negotiator/skipping.o notes-cache.o notes-merge.o notes-utils.o notes.o object-file-convert.o object-file.o object-name.o object.o oid-array.o oidmap.o oidset.o oidtree.o pack-bitmap-write.o pack-bitmap.o pack-check.o pack-mtimes.o pack-objects.o pack-revindex.o pack-write.o packfile.o pager.o parallel-checkout.o parse.o parse-options-cb.o parse-options.o patch-delta.o patch-ids.o path.o pathspec.o pkt-line.o preload-index.o pretty.o prio-queue.o progress.o promisor-remote.o prompt.o protocol.o protocol-caps.o prune-packed.o quote.o range-diff.o reachable.o read-cache.o rebase-interactive.o rebase.o ref-filter.o reflog-walk.o reflog.o refs.o refs/debug.o refs/files-backend.o refs/reftable-backend.o refs/iterator.o refs/packed-backend.o refs/ref-cache.o refspec.o remote.o replace-object.o repo-settings.o repository.o rerere.o reset.o resolve-undo.o revision.o run-command.o send-pack.o sequencer.o serve.o server-info.o setup.o shallow.o sideband.o sigchain.o sparse-index.o split-index.o stable-qsort.o statinfo.o strbuf.o streaming.o string-list.o strmap.o strvec.o sub-process.o submodule-config.o submodule.o symlinks.o tag.o tempfile.o thread-utils.o tmp-objdir.o trace.o trace2.o trace2/tr2_cfg.o trace2/tr2_cmd_name.o trace2/tr2_ctr.o trace2/tr2_dst.o trace2/tr2_sid.o trace2/tr2_sysenv.o trace2/tr2_tbuf.o trace2/tr2_tgt_event.o trace2/tr2_tgt_normal.o trace2/tr2_tgt_perf.o trace2/tr2_tls.o trace2/tr2_tmr.o trailer.o transport-helper.o transport.o tree-diff.o tree-walk.o tree.o unpack-trees.o upload-pack.o url.o urlmatch.o usage.o userdiff.o utf8.o varint.o version.o versioncmp.o walker.o wildmatch.o worktree.o wrapper.o write-or-die.o ws.o wt-status.o xdiff-interface.o unix-socket.o unix-stream-server.o compat/simple-ipc/ipc-shared.o compat/simple-ipc/ipc-unix-socket.o sha1dc_git.o sha1dc/sha1.o sha1dc/ubc_check.o sha256/block/sha256.o compat/linux/procinfo.o compat/fopen.o compat/strlcpy.o compat/qsort_s.o
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o builtin/help.o -c -MF builtin/.depend/help.o.d -MQ builtin/help.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 -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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"' -o git-http-fetch -Wl,-z,relro  http.o http-walker.o http-fetch.o common-main.o \
 	-lcurl libgit.a xdiff/lib.a reftable/libreftable.a libgit.a -lpcre2-8 -lz -lpthread -lrt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
@@ -2605,6 +2637,10 @@
 cp git-remote-http git-remote-ftps
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/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.45.2'
@@ -2651,18 +2687,18 @@
 cp git git-blame
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-branch && \
-ln git git-branch 2>/dev/null || \
-ln -s git git-branch 2>/dev/null || \
-cp git git-branch
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-bugreport && \
 ln git git-bugreport 2>/dev/null || \
 ln -s git git-bugreport 2>/dev/null || \
 cp git git-bugreport
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-branch && \
+ln git git-branch 2>/dev/null || \
+ln -s git git-branch 2>/dev/null || \
+cp git git-branch
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-bundle && \
 ln git git-bundle 2>/dev/null || \
 ln -s git git-bundle 2>/dev/null || \
@@ -2711,12 +2747,6 @@
 cp git git-checkout-index
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-checkout && \
-ln git git-checkout 2>/dev/null || \
-ln -s git git-checkout 2>/dev/null || \
-cp git git-checkout
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-clean && \
 ln git git-clean 2>/dev/null || \
 ln -s git git-clean 2>/dev/null || \
@@ -2729,6 +2759,12 @@
 cp git git-clone
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-checkout && \
+ln git git-checkout 2>/dev/null || \
+ln -s git git-checkout 2>/dev/null || \
+cp git git-checkout
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-column && \
 ln git git-column 2>/dev/null || \
 ln -s git git-column 2>/dev/null || \
@@ -2855,24 +2891,18 @@
 cp git git-fetch
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-fmt-merge-msg && \
-ln git git-fmt-merge-msg 2>/dev/null || \
-ln -s git git-fmt-merge-msg 2>/dev/null || \
-cp git git-fmt-merge-msg
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-for-each-ref && \
-ln git git-for-each-ref 2>/dev/null || \
-ln -s git git-for-each-ref 2>/dev/null || \
-cp git git-for-each-ref
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-for-each-repo && \
 ln git git-for-each-repo 2>/dev/null || \
 ln -s git git-for-each-repo 2>/dev/null || \
 cp git git-for-each-repo
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-fmt-merge-msg && \
+ln git git-fmt-merge-msg 2>/dev/null || \
+ln -s git git-fmt-merge-msg 2>/dev/null || \
+cp git git-fmt-merge-msg
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-fsck && \
 ln git git-fsck 2>/dev/null || \
 ln -s git git-fsck 2>/dev/null || \
@@ -2885,6 +2915,12 @@
 cp git git-fsmonitor--daemon
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-for-each-ref && \
+ln git git-for-each-ref 2>/dev/null || \
+ln -s git git-for-each-ref 2>/dev/null || \
+cp git git-for-each-ref
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-gc && \
 ln git git-gc 2>/dev/null || \
 ln -s git git-gc 2>/dev/null || \
@@ -2915,36 +2951,36 @@
 cp git git-help
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-hook && \
-ln git git-hook 2>/dev/null || \
-ln -s git git-hook 2>/dev/null || \
-cp git git-hook
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-index-pack && \
 ln git git-index-pack 2>/dev/null || \
 ln -s git git-index-pack 2>/dev/null || \
 cp git git-index-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-init-db && \
-ln git git-init-db 2>/dev/null || \
-ln -s git git-init-db 2>/dev/null || \
-cp git git-init-db
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-interpret-trailers && \
 ln git git-interpret-trailers 2>/dev/null || \
 ln -s git git-interpret-trailers 2>/dev/null || \
 cp git git-interpret-trailers
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-hook && \
+ln git git-hook 2>/dev/null || \
+ln -s git git-hook 2>/dev/null || \
+cp git git-hook
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-log && \
 ln git git-log 2>/dev/null || \
 ln -s git git-log 2>/dev/null || \
 cp git git-log
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-init-db && \
+ln git git-init-db 2>/dev/null || \
+ln -s git git-init-db 2>/dev/null || \
+cp git git-init-db
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-ls-files && \
 ln git git-ls-files 2>/dev/null || \
 ln -s git git-ls-files 2>/dev/null || \
@@ -2957,12 +2993,6 @@
 cp git git-ls-remote
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-ls-tree && \
-ln git git-ls-tree 2>/dev/null || \
-ln -s git git-ls-tree 2>/dev/null || \
-cp git git-ls-tree
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-mailinfo && \
 ln git git-mailinfo 2>/dev/null || \
 ln -s git git-mailinfo 2>/dev/null || \
@@ -2975,10 +3005,10 @@
 cp git git-mailsplit
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-merge-base && \
-ln git git-merge-base 2>/dev/null || \
-ln -s git git-merge-base 2>/dev/null || \
-cp git git-merge-base
+rm -f git-ls-tree && \
+ln git git-ls-tree 2>/dev/null || \
+ln -s git git-ls-tree 2>/dev/null || \
+cp git git-ls-tree
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-merge-file && \
@@ -2987,6 +3017,12 @@
 cp git git-merge-file
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-merge-base && \
+ln git git-merge-base 2>/dev/null || \
+ln -s git git-merge-base 2>/dev/null || \
+cp git git-merge-base
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-merge-index && \
 ln git git-merge-index 2>/dev/null || \
 ln -s git git-merge-index 2>/dev/null || \
@@ -3041,12 +3077,6 @@
 cp git git-mv
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-name-rev && \
-ln git git-name-rev 2>/dev/null || \
-ln -s git git-name-rev 2>/dev/null || \
-cp git git-name-rev
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-notes && \
 ln git git-notes 2>/dev/null || \
 ln -s git git-notes 2>/dev/null || \
@@ -3059,6 +3089,12 @@
 cp git git-pack-objects
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-name-rev && \
+ln git git-name-rev 2>/dev/null || \
+ln -s git git-name-rev 2>/dev/null || \
+cp git git-name-rev
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-pack-redundant && \
 ln git git-pack-redundant 2>/dev/null || \
 ln -s git git-pack-redundant 2>/dev/null || \
@@ -3143,18 +3179,18 @@
 cp git git-remote-fd
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-repack && \
-ln git git-repack 2>/dev/null || \
-ln -s git git-repack 2>/dev/null || \
-cp git git-repack
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-remote && \
 ln git git-remote 2>/dev/null || \
 ln -s git git-remote 2>/dev/null || \
 cp git git-remote
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-repack && \
+ln git git-repack 2>/dev/null || \
+ln -s git git-repack 2>/dev/null || \
+cp git git-repack
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-replace && \
 ln git git-replace 2>/dev/null || \
 ln -s git git-replace 2>/dev/null || \
@@ -3179,6 +3215,12 @@
 cp git git-reset
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-rev-list && \
 ln git git-rev-list 2>/dev/null || \
 ln -s git git-rev-list 2>/dev/null || \
@@ -3191,24 +3233,12 @@
 cp git git-rev-parse
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-rm && \
 ln git git-rm 2>/dev/null || \
 ln -s git git-rm 2>/dev/null || \
 cp git git-rm
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-shortlog && \
 ln git git-shortlog 2>/dev/null || \
 ln -s git git-shortlog 2>/dev/null || \
@@ -3221,18 +3251,18 @@
 cp git git-show-branch
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-show-ref && \
 ln git git-show-ref 2>/dev/null || \
 ln -s git git-show-ref 2>/dev/null || \
 cp git git-show-ref
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-sparse-checkout && \
 ln git git-sparse-checkout 2>/dev/null || \
 ln -s git git-sparse-checkout 2>/dev/null || \
@@ -3245,28 +3275,28 @@
 cp git git-stash
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-stripspace && \
-ln git git-stripspace 2>/dev/null || \
-ln -s git git-stripspace 2>/dev/null || \
-cp git git-stripspace
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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-stripspace && \
+ln git git-stripspace 2>/dev/null || \
+ln -s git git-stripspace 2>/dev/null || \
+cp git git-stripspace
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-tag && \
@@ -3275,6 +3305,12 @@
 cp git git-tag
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-unpack-objects && \
 ln git git-unpack-objects 2>/dev/null || \
 ln -s git git-unpack-objects 2>/dev/null || \
@@ -3299,18 +3335,18 @@
 cp git git-update-server-info
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-upload-archive && \
-ln git git-upload-archive 2>/dev/null || \
-ln -s git git-upload-archive 2>/dev/null || \
-cp git git-upload-archive
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-upload-pack && \
 ln git git-upload-pack 2>/dev/null || \
 ln -s git git-upload-pack 2>/dev/null || \
 cp git git-upload-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-upload-archive && \
+ln git git-upload-archive 2>/dev/null || \
+ln -s git git-upload-archive 2>/dev/null || \
+cp git git-upload-archive
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-var && \
 ln git git-var 2>/dev/null || \
 ln -s git git-var 2>/dev/null || \
@@ -3329,42 +3365,42 @@
 cp git git-verify-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-verify-tag && \
-ln git git-verify-tag 2>/dev/null || \
-ln -s git git-verify-tag 2>/dev/null || \
-cp git git-verify-tag
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-worktree && \
-ln git git-worktree 2>/dev/null || \
-ln -s git git-worktree 2>/dev/null || \
-cp git git-worktree
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-write-tree && \
 ln git git-write-tree 2>/dev/null || \
 ln -s git git-write-tree 2>/dev/null || \
 cp git git-write-tree
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-format-patch && \
+ln git git-format-patch 2>/dev/null || \
+ln -s git git-format-patch 2>/dev/null || \
+cp git git-format-patch
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-verify-tag && \
+ln git git-verify-tag 2>/dev/null || \
+ln -s git git-verify-tag 2>/dev/null || \
+cp git git-verify-tag
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-cherry && \
 ln git git-cherry 2>/dev/null || \
 ln -s git git-cherry 2>/dev/null || \
 cp git git-cherry
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-worktree && \
+ln git git-worktree 2>/dev/null || \
+ln -s git git-worktree 2>/dev/null || \
+cp git git-worktree
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-cherry-pick && \
 ln git git-cherry-pick 2>/dev/null || \
 ln -s git git-cherry-pick 2>/dev/null || \
 cp git git-cherry-pick
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-format-patch && \
-ln git git-format-patch 2>/dev/null || \
-ln -s git git-format-patch 2>/dev/null || \
-cp git git-format-patch
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-fsck-objects && \
 ln git git-fsck-objects 2>/dev/null || \
 ln -s git git-fsck-objects 2>/dev/null || \
@@ -3407,29 +3443,29 @@
 cp git git-stage
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-switch && \
-ln git git-switch 2>/dev/null || \
-ln -s git git-switch 2>/dev/null || \
-cp git git-switch
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-rm -f git-version && \
-ln git git-version 2>/dev/null || \
-ln -s git git-version 2>/dev/null || \
-cp git git-version
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f git-whatchanged && \
 ln git git-whatchanged 2>/dev/null || \
 ln -s git git-whatchanged 2>/dev/null || \
 cp git git-whatchanged
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-switch && \
+ln git git-switch 2>/dev/null || \
+ln -s git git-switch 2>/dev/null || \
+cp git git-switch
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+rm -f git-version && \
+ln git git-version 2>/dev/null || \
+ln -s git git-version 2>/dev/null || \
+cp git git-version
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 /usr/bin/make -C git-gui  gitexecdir='/usr/lib/git-core' all
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
 GITGUI_VERSION = 0.21.GITGUI
@@ -3438,22 +3474,22 @@
     * new locations or Tcl/Tk interpreter
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
-msgfmt --statistics --tcl -l el -d po/ po/el.po 
-381 translated messages, 4 fuzzy translations, 6 untranslated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
 msgfmt --statistics --tcl -l de -d po/ po/de.po 
 579 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
-msgfmt --statistics --tcl -l fr -d po/ po/fr.po 
-520 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
 msgfmt --statistics --tcl -l bg -d po/ po/bg.po 
 565 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
+msgfmt --statistics --tcl -l el -d po/ po/el.po 
+381 translated messages, 4 fuzzy translations, 6 untranslated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
+msgfmt --statistics --tcl -l fr -d po/ po/fr.po 
+520 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
 msgfmt --statistics --tcl -l hu -d po/ po/hu.po 
 514 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
@@ -3478,10 +3514,18 @@
 550 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
+msgfmt --statistics --tcl -l ru -d po/ po/ru.po 
+579 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
 msgfmt --statistics --tcl -l sv -d po/ po/sv.po 
 547 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
+msgfmt --statistics --tcl -l vi -d po/ po/vi.po 
+543 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/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.45.2/git-gui'
@@ -3499,14 +3543,6 @@
 mv git-gui+ git-gui
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
-msgfmt --statistics --tcl -l ru -d po/ po/ru.po 
-579 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/git-gui'
-msgfmt --statistics --tcl -l vi -d po/ po/vi.po 
-543 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/git-gui'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/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 \
@@ -3525,16 +3561,16 @@
     * new Tcl/Tk interpreter location
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
-Generating catalog po/ca.msg
-msgfmt --statistics --tcl po/ca.po -l ca -d po/
-307 translated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
 Generating catalog po/bg.msg
 msgfmt --statistics --tcl po/bg.po -l bg -d po/
 317 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
+Generating catalog po/ca.msg
+msgfmt --statistics --tcl po/ca.po -l ca -d po/
+307 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
 Generating catalog po/de.msg
 msgfmt --statistics --tcl po/de.po -l de -d po/
 307 translated messages.
@@ -3545,38 +3581,33 @@
 184 translated messages, 46 fuzzy translations, 77 untranslated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
-Generating catalog po/hu.msg
-msgfmt --statistics --tcl po/hu.po -l hu -d po/
-277 translated messages, 18 fuzzy translations, 12 untranslated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
 Generating catalog po/fr.msg
 msgfmt --statistics --tcl po/fr.po -l fr -d po/
 311 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
+Generating catalog po/hu.msg
+msgfmt --statistics --tcl po/hu.po -l hu -d po/
+277 translated messages, 18 fuzzy translations, 12 untranslated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/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.45.2/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
-Generating catalog po/pt_br.msg
-msgfmt --statistics --tcl po/pt_br.po -l pt_br -d po/
-279 translated messages, 16 fuzzy translations, 12 untranslated messages.
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
 Generating catalog po/ja.msg
 msgfmt --statistics --tcl po/ja.po -l ja -d po/
 311 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
-Generating catalog po/pt_pt.msg
-msgfmt --statistics --tcl po/pt_pt.po -l pt_pt -d po/
-311 translated messages.
+Generating catalog po/pt_br.msg
+msgfmt --statistics --tcl po/pt_br.po -l pt_br -d po/
+279 translated messages, 16 fuzzy translations, 12 untranslated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
-Generating catalog po/sv.msg
-msgfmt --statistics --tcl po/sv.po -l sv -d po/
+Generating catalog po/pt_pt.msg
+msgfmt --statistics --tcl po/pt_pt.po -l pt_pt -d po/
 311 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
@@ -3585,6 +3616,11 @@
 317 translated messages.
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
+Generating catalog po/sv.msg
+msgfmt --statistics --tcl po/sv.po -l sv -d po/
+311 translated messages.
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/gitk-git'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/gitk-git'
 Generating catalog po/vi.msg
 msgfmt --statistics --tcl po/vi.po -l vi -d po/
 307 translated messages.
@@ -3625,7 +3661,7 @@
 date >boilerplates.made
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-msgfmt --check -o po/build/locale/el/LC_MESSAGES/git.mo po/el.po
+msgfmt --check -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 msgfmt --check -o po/build/locale/ca/LC_MESSAGES/git.mo po/ca.po
@@ -3634,48 +3670,48 @@
 msgfmt --check -o po/build/locale/de/LC_MESSAGES/git.mo po/de.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-msgfmt --check -o po/build/locale/es/LC_MESSAGES/git.mo po/es.po
+msgfmt --check -o po/build/locale/el/LC_MESSAGES/git.mo po/el.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 msgfmt --check -o po/build/locale/is/LC_MESSAGES/git.mo po/is.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-msgfmt --check -o po/build/locale/fr/LC_MESSAGES/git.mo po/fr.po
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 msgfmt --check -o po/build/locale/bg/LC_MESSAGES/git.mo po/bg.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-msgfmt --check -o po/build/locale/ko/LC_MESSAGES/git.mo po/ko.po
+msgfmt --check -o po/build/locale/fr/LC_MESSAGES/git.mo po/fr.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-msgfmt --check -o po/build/locale/id/LC_MESSAGES/git.mo po/id.po
+msgfmt --check -o po/build/locale/it/LC_MESSAGES/git.mo po/it.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-msgfmt --check -o po/build/locale/ru/LC_MESSAGES/git.mo po/ru.po
+msgfmt --check -o po/build/locale/id/LC_MESSAGES/git.mo po/id.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-msgfmt --check -o po/build/locale/it/LC_MESSAGES/git.mo po/it.po
+msgfmt --check -o po/build/locale/ko/LC_MESSAGES/git.mo po/ko.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 msgfmt --check -o po/build/locale/pt_PT/LC_MESSAGES/git.mo po/pt_PT.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-msgfmt --check -o po/build/locale/pl/LC_MESSAGES/git.mo po/pl.po
+msgfmt --check -o po/build/locale/ru/LC_MESSAGES/git.mo po/ru.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-msgfmt --check -o po/build/locale/tr/LC_MESSAGES/git.mo po/tr.po
+msgfmt --check -o po/build/locale/pl/LC_MESSAGES/git.mo po/pl.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 msgfmt --check -o po/build/locale/sv/LC_MESSAGES/git.mo po/sv.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 msgfmt --check -o po/build/locale/uk/LC_MESSAGES/git.mo po/uk.po
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+msgfmt --check -o po/build/locale/vi/LC_MESSAGES/git.mo po/vi.po
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
@@ -3810,24 +3846,24 @@
 gcc -o reftable/basics_test.o -c -MF reftable/.depend/basics_test.o.d -MQ reftable/basics_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/pq_test.o -c -MF reftable/.depend/pq_test.o.d -MQ reftable/pq_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reftable/block_test.o -c -MF reftable/.depend/block_test.o.d -MQ reftable/block_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/refname_test.o -c -MF reftable/.depend/refname_test.o.d -MQ reftable/refname_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/refname_test.c
+gcc -o reftable/merged_test.o -c -MF reftable/.depend/merged_test.o.d -MQ reftable/merged_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/test_framework.o -c -MF reftable/.depend/test_framework.o.d -MQ reftable/test_framework.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/test_framework.c
+gcc -o reftable/pq_test.o -c -MF reftable/.depend/pq_test.o.d -MQ reftable/pq_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/merged_test.o -c -MF reftable/.depend/merged_test.o.d -MQ reftable/merged_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
+gcc -o reftable/refname_test.o -c -MF reftable/.depend/refname_test.o.d -MQ reftable/refname_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/refname_test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reftable/record_test.o -c -MF reftable/.depend/record_test.o.d -MQ reftable/record_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o reftable/test_framework.o -c -MF reftable/.depend/test_framework.o.d -MQ reftable/test_framework.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/test_framework.c
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o reftable/tree_test.o -c -MF reftable/.depend/tree_test.o.d -MQ reftable/tree_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
@@ -3837,10 +3873,10 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-bitmap.o -c -MF t/helper/.depend/test-bitmap.o.d -MQ t/helper/test-bitmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-bitmap.c
+gcc -o t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-bloom.o -c -MF t/helper/.depend/test-bloom.o.d -MQ t/helper/test-bloom.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-bundle-uri.o -c -MF t/helper/.depend/test-bundle-uri.o.d -MQ t/helper/test-bundle-uri.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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
@@ -3852,46 +3888,43 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-crontab.o -c -MF t/helper/.depend/test-crontab.o.d -MQ t/helper/test-crontab.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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 reftable/readwrite_test.o -c -MF reftable/.depend/readwrite_test.o.d -MQ reftable/readwrite_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/readwrite_test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-csprng.o -c -MF t/helper/.depend/test-csprng.o.d -MQ t/helper/test-csprng.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/readwrite_test.o -c -MF reftable/.depend/readwrite_test.o.d -MQ reftable/readwrite_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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/readwrite_test.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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-config.o -c -MF t/helper/.depend/test-config.o.d -MQ t/helper/test-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-date.o -c -MF t/helper/.depend/test-date.o.d -MQ t/helper/test-date.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-date.c
+gcc -o t/helper/test-delete-gpgsig.o -c -MF t/helper/.depend/test-delete-gpgsig.o.d -MQ t/helper/test-delete-gpgsig.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-delta.o -c -MF t/helper/.depend/test-delta.o.d -MQ t/helper/test-delta.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-delete-gpgsig.o -c -MF t/helper/.depend/test-delete-gpgsig.o.d -MQ t/helper/test-delete-gpgsig.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-dump-fsmonitor.o -c -MF t/helper/.depend/test-dump-fsmonitor.o.d -MQ t/helper/test-dump-fsmonitor.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-dump-cache-tree.o -c -MF t/helper/.depend/test-dump-cache-tree.o.d -MQ t/helper/test-dump-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-cache-tree.c
+gcc -o t/helper/test-dump-split-index.o -c -MF t/helper/.depend/test-dump-split-index.o.d -MQ t/helper/test-dump-split-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-split-index.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-dump-split-index.o -c -MF t/helper/.depend/test-dump-split-index.o.d -MQ t/helper/test-dump-split-index.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-dump-split-index.c
+gcc -o reftable/stack_test.o -c -MF reftable/.depend/stack_test.o.d -MQ reftable/stack_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o reftable/stack_test.o -c -MF reftable/.depend/stack_test.o.d -MQ reftable/stack_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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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_test.c
+gcc -o t/helper/test-dump-cache-tree.o -c -MF t/helper/.depend/test-dump-cache-tree.o.d -MQ t/helper/test-dump-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-env-helper.o -c -MF t/helper/.depend/test-env-helper.o.d -MQ t/helper/test-env-helper.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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
@@ -3900,16 +3933,19 @@
 gcc -o t/helper/test-example-decorate.o -c -MF t/helper/.depend/test-example-decorate.o.d -MQ t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-decorate.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-fsmonitor-client.o -c -MF t/helper/.depend/test-fsmonitor-client.o.d -MQ t/helper/test-fsmonitor-client.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-genrandom.o -c -MF t/helper/.depend/test-genrandom.o.d -MQ t/helper/test-genrandom.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-find-pack.o -c -MF t/helper/.depend/test-find-pack.o.d -MQ t/helper/test-find-pack.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-find-pack.c
+gcc -o t/helper/test-genzeros.o -c -MF t/helper/.depend/test-genzeros.o.d -MQ t/helper/test-genzeros.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-getcwd.o -c -MF t/helper/.depend/test-getcwd.o.d -MQ t/helper/test-getcwd.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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
@@ -3918,31 +3954,31 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-hash.o -c -MF t/helper/.depend/test-hash.o.d -MQ t/helper/test-hash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash.c
+gcc -o t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hexdump.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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
+gcc -o t/helper/test-hash.o -c -MF t/helper/.depend/test-hash.o.d -MQ t/helper/test-hash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hash.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-match-trees.o -c -MF t/helper/.depend/test-match-trees.o.d -MQ t/helper/test-match-trees.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-mktemp.o -c -MF t/helper/.depend/test-mktemp.o.d -MQ t/helper/test-mktemp.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-mktemp.c
+gcc -o t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-lazy-init-name-hash.o -c -MF t/helper/.depend/test-lazy-init-name-hash.o.d -MQ t/helper/test-lazy-init-name-hash.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-oid-array.o -c -MF t/helper/.depend/test-oid-array.o.d -MQ t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-oid-array.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-hashmap.o -c -MF t/helper/.depend/test-hashmap.o.d -MQ t/helper/test-hashmap.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-hashmap.c
+gcc -o t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-oid-array.o -c -MF t/helper/.depend/test-oid-array.o.d -MQ t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-oid-array.c
+gcc -o t/helper/test-oidmap.o -c -MF t/helper/.depend/test-oidmap.o.d -MQ t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-oidmap.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-oidmap.o -c -MF t/helper/.depend/test-oidmap.o.d -MQ t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-oidmap.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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-online-cpus.o -c -MF t/helper/.depend/test-online-cpus.o.d -MQ t/helper/test-online-cpus.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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
@@ -3954,10 +3990,10 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-parse-pathspec-file.o -c -MF t/helper/.depend/test-parse-pathspec-file.o.d -MQ t/helper/test-parse-pathspec-file.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-mergesort.o -c -MF t/helper/.depend/test-mergesort.o.d -MQ t/helper/test-mergesort.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-partial-clone.o -c -MF t/helper/.depend/test-partial-clone.o.d -MQ t/helper/test-partial-clone.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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
@@ -3969,55 +4005,58 @@
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-progress.o -c -MF t/helper/.depend/test-progress.o.d -MQ t/helper/test-progress.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-parse-options.o -c -MF t/helper/.depend/test-parse-options.o.d -MQ t/helper/test-parse-options.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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
+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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-read-cache.o -c -MF t/helper/.depend/test-read-cache.o.d -MQ t/helper/test-read-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-reach.o -c -MF t/helper/.depend/test-reach.o.d -MQ t/helper/test-reach.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-path-utils.o -c -MF t/helper/.depend/test-path-utils.o.d -MQ t/helper/test-path-utils.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-read-graph.o -c -MF t/helper/.depend/test-read-graph.o.d -MQ t/helper/test-read-graph.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o t/helper/test-reach.o -c -MF t/helper/.depend/test-reach.o.d -MQ t/helper/test-reach.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-read-midx.o -c -MF t/helper/.depend/test-read-midx.o.d -MQ t/helper/test-read-midx.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-reftable.o -c -MF t/helper/.depend/test-reftable.o.d -MQ t/helper/test-reftable.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o t/helper/test-ref-store.o -c -MF t/helper/.depend/test-ref-store.o.d -MQ t/helper/test-ref-store.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-regex.o -c -MF t/helper/.depend/test-regex.o.d -MQ t/helper/test-regex.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-repository.o -c -MF t/helper/.depend/test-repository.o.d -MQ t/helper/test-repository.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-revision-walking.o -c -MF t/helper/.depend/test-revision-walking.o.d -MQ t/helper/test-revision-walking.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-scrap-cache-tree.o -c -MF t/helper/.depend/test-scrap-cache-tree.o.d -MQ t/helper/test-scrap-cache-tree.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-ref-store.o -c -MF t/helper/.depend/test-ref-store.o.d -MQ t/helper/test-ref-store.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-rot13-filter.o -c -MF t/helper/.depend/test-rot13-filter.o.d -MQ t/helper/test-rot13-filter.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-serve-v2.o -c -MF t/helper/.depend/test-serve-v2.o.d -MQ t/helper/test-serve-v2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-sha1.o -c -MF t/helper/.depend/test-sha1.o.d -MQ t/helper/test-sha1.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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
@@ -4029,34 +4068,37 @@
 gcc -o t/helper/test-strcmp-offset.o -c -MF t/helper/.depend/test-strcmp-offset.o.d -MQ t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-strcmp-offset.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-run-command.o -c -MF t/helper/.depend/test-run-command.o.d -MQ t/helper/test-run-command.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-run-command.c
+gcc -o t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-submodule-config.o -c -MF t/helper/.depend/test-submodule-config.o.d -MQ t/helper/test-submodule-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o t/helper/test-submodule.o -c -MF t/helper/.depend/test-submodule.o.d -MQ t/helper/test-submodule.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-submodule-nested-repo-config.o -c -MF t/helper/.depend/test-submodule-nested-repo-config.o.d -MQ t/helper/test-submodule-nested-repo-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-string-list.o -c -MF t/helper/.depend/test-string-list.o.d -MQ t/helper/test-string-list.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-string-list.c
+gcc -o t/helper/test-submodule-config.o -c -MF t/helper/.depend/test-submodule-config.o.d -MQ t/helper/test-submodule-config.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/helper/test-subprocess.o -c -MF t/helper/.depend/test-subprocess.o.d -MQ t/helper/test-subprocess.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-submodule.o -c -MF t/helper/.depend/test-submodule.o.d -MQ t/helper/test-submodule.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-submodule.c
+gcc -o t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-simple-ipc.o -c -MF t/helper/.depend/test-simple-ipc.o.d -MQ t/helper/test-simple-ipc.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-simple-ipc.c
+gcc -o t/helper/test-urlmatch-normalization.o -c -MF t/helper/.depend/test-urlmatch-normalization.o.d -MQ t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-urlmatch-normalization.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-truncate.o -c -MF t/helper/.depend/test-truncate.o.d -MQ t/helper/test-truncate.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-urlmatch-normalization.o -c -MF t/helper/.depend/test-urlmatch-normalization.o.d -MQ t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-urlmatch-normalization.c
+gcc -o t/helper/test-userdiff.o -c -MF t/helper/.depend/test-userdiff.o.d -MQ t/helper/test-userdiff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-userdiff.o -c -MF t/helper/.depend/test-userdiff.o.d -MQ t/helper/test-userdiff.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-userdiff.c
+gcc -o t/helper/test-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4071,16 +4113,19 @@
 chmod +x bin-wrappers/scalar
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o t/helper/test-trace2.o -c -MF t/helper/.depend/test-trace2.o.d -MQ t/helper/test-trace2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.45.2|' \
      -e 's|@@PROG@@|git-receive-pack|' < wrap-for-bin.sh > bin-wrappers/git-receive-pack && \
 chmod +x bin-wrappers/git-receive-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-windows-named-pipe.o -c -MF t/helper/.depend/test-windows-named-pipe.o.d -MQ t/helper/test-windows-named-pipe.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-wildmatch.o -c -MF t/helper/.depend/test-wildmatch.o.d -MQ t/helper/test-wildmatch.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-wildmatch.c
+sed -e '1s|#!.*/sh|#!/bin/sh|' \
+     -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.45.2|' \
+     -e 's|@@PROG@@|git-shell|' < wrap-for-bin.sh > bin-wrappers/git-shell && \
+chmod +x bin-wrappers/git-shell
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4089,10 +4134,7 @@
 chmod +x bin-wrappers/git-upload-archive
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-sed -e '1s|#!.*/sh|#!/bin/sh|' \
-     -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.45.2|' \
-     -e 's|@@PROG@@|git-shell|' < wrap-for-bin.sh > bin-wrappers/git-shell && \
-chmod +x bin-wrappers/git-shell
+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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
@@ -4101,6 +4143,9 @@
 chmod +x bin-wrappers/git-upload-pack
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc -o t/helper/test-xml-encode.o -c -MF t/helper/.depend/test-xml-encode.o.d -MQ t/helper/test-xml-encode.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 sed -e '1s|#!.*/sh|#!/bin/sh|' \
      -e 's|@@BUILD_DIR@@|/build/reproducible-path/git-2.45.2|' \
      -e 's|@@PROG@@|git-cvsserver|' < wrap-for-bin.sh > bin-wrappers/git-cvsserver && \
@@ -4119,47 +4164,38 @@
 chmod +x bin-wrappers/test-tool
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-write-cache.o -c -MF t/helper/.depend/test-write-cache.o.d -MQ t/helper/test-write-cache.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-trace2.o -c -MF t/helper/.depend/test-trace2.o.d -MQ t/helper/test-trace2.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/helper/test-xml-encode.o -c -MF t/helper/.depend/test-xml-encode.o.d -MQ t/helper/test-xml-encode.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/helper/test-xml-encode.c
+gcc -o t/unit-tests/t-basic.o -c -MF t/unit-tests/.depend/t-basic.o.d -MQ t/unit-tests/t-basic.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-basic.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/unit-tests/t-mem-pool.o -c -MF t/unit-tests/.depend/t-mem-pool.o.d -MQ t/unit-tests/t-mem-pool.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/unit-tests/t-basic.o -c -MF t/unit-tests/.depend/t-basic.o.d -MQ t/unit-tests/t-basic.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-basic.c
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f reftable/libreftable_test.a && ar rcs reftable/libreftable_test.a reftable/basics_test.o reftable/block_test.o reftable/dump.o reftable/merged_test.o reftable/pq_test.o reftable/record_test.o reftable/readwrite_test.o reftable/refname_test.o reftable/stack_test.o reftable/test_framework.o reftable/tree_test.o
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/unit-tests/t-strbuf.o -c -MF t/unit-tests/.depend/t-strbuf.o.d -MQ t/unit-tests/t-strbuf.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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
+gcc -o t/unit-tests/t-ctype.o -c -MF t/unit-tests/.depend/t-ctype.o.d -MQ t/unit-tests/t-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-ctype.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/unit-tests/t-prio-queue.o -c -MF t/unit-tests/.depend/t-prio-queue.o.d -MQ t/unit-tests/t-prio-queue.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-prio-queue.c
+gcc -o t/unit-tests/t-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -DHAVE_GETDELIM '-DPROCFS_EXECUTABLE_PATH="/proc/self/exe"' -DFREAD_READS_DIRECTORIES -DNO_STRLCPY -DDEFAULT_EDITOR='"editor"' -DDEFAULT_PAGER='"pager"' -DSHELL_PATH='"/bin/sh"'  t/unit-tests/t-strbuf.c
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc -o t/unit-tests/test-lib.o -c -MF t/unit-tests/.depend/test-lib.o.d -MQ t/unit-tests/test-lib.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc -o t/unit-tests/t-ctype.o -c -MF t/unit-tests/.depend/t-ctype.o.d -MQ t/unit-tests/t-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.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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-ctype.c
+gcc -o t/unit-tests/t-prio-queue.o -c -MF t/unit-tests/.depend/t-prio-queue.o.d -MQ t/unit-tests/t-prio-queue.o -MMD -MP   -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_RANGE -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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 reftable/libreftable_test.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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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-basic -Wl,-z,relro  \
 	t/unit-tests/t-basic.o t/unit-tests/test-lib.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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2'
@@ -4167,14 +4203,14 @@
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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-decorate.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-oid-array.o t/helper/test-oidmap.o t/helper/test-oidtree.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-strcmp-offset.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-urlmatch-normalization.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 libgit.a xdiff/lib.a reftable/libreftable.a reftable/libreftable_test.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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
-gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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-ctype -Wl,-z,relro  \
 	t/unit-tests/t-ctype.o t/unit-tests/test-lib.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.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
+gcc  -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/git-2.45.2=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -I. -DHAVE_SYSINFO -DGIT_HOST_CPU="\"i686\"" -DUSE_LIBPCRE2 -DHAVE_ALLOCA_H  -DUSE_CURL_FOR_IMAP_SEND -DNO_OPENSSL -DSUPPORTS_SIMPLE_IPC -DSHA1_DC -DSHA1DC_NO_STANDARD_INCLUDES -DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 -DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"git-compat-util.h\"" -DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\"" -DSHA256_BLK  -DHAVE_PATHS_H -DHAVE_DEV_TTY -DHAVE_CLOCK_GETTIME -DHAVE_CLOCK_MONOTONIC -DHAVE_SYNC_FILE_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 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.45.2'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 rm -f gitweb/static/gitweb.js gitweb/static/gitweb.js+ && \
 cat gitweb/static/js/lib/common-lib.js gitweb/static/js/lib/datetime.js gitweb/static/js/lib/cookies.js gitweb/static/js/javascript-detection.js gitweb/static/js/adjust-timezone.js gitweb/static/js/blame_incremental.js >gitweb/static/gitweb.js+ && \
 mv gitweb/static/gitweb.js+ gitweb/static/gitweb.js
@@ -4224,6 +4260,7 @@
 cmds-purehelpers.txt
 cmds-foreignscminterface.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: 'GIT-VERSION-FILE' is up to date.
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
 /bin/sh -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=diff && \
@@ -4237,7 +4274,6 @@
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 /usr/bin/perl ./build-docdep.perl >doc.dep 
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: 'GIT-VERSION-FILE' is up to date.
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: git: No such file or directory
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -4247,7 +4283,9 @@
     * new asciidoc flags
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-'/bin/sh' ./howto-index.sh howto/coordinate-embargoed-releases.txt howto/keep-canonical-history-correct.txt howto/maintain-git.txt howto/new-command.txt howto/rebase-from-internal-branch.txt howto/rebuild-from-update-hook.txt howto/recover-corrupted-blob-object.txt howto/recover-corrupted-object-harder.txt howto/revert-a-faulty-merge.txt howto/revert-branch-rebase.txt howto/separating-topic-branches.txt howto/setup-git-server-over-http.txt howto/update-hook-example.txt howto/use-git-daemon.txt howto/using-merge-subtree.txt howto/using-signed-tag-in-pull-request.txt >howto-index.txt
+\
+sed -e '1,/^$/d' howto/new-command.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/new-command.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 git-tools.txt
@@ -4259,18 +4297,11 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
-sed -e '1,/^$/d' howto/new-command.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/new-command.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-\
 sed -e '1,/^$/d' howto/using-merge-subtree.txt | \
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/using-merge-subtree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-\
-sed -e '1,/^$/d' howto/update-hook-example.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/update-hook-example.html
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 git-bisect-lk2009.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
@@ -4284,13 +4315,21 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
-sed -e '1,/^$/d' howto/separating-topic-branches.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/separating-topic-branches.html
+sed -e '1,/^$/d' howto/setup-git-server-over-http.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/setup-git-server-over-http.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+'/bin/sh' ./howto-index.sh howto/coordinate-embargoed-releases.txt howto/keep-canonical-history-correct.txt howto/maintain-git.txt howto/new-command.txt howto/rebase-from-internal-branch.txt howto/rebuild-from-update-hook.txt howto/recover-corrupted-blob-object.txt howto/recover-corrupted-object-harder.txt howto/revert-a-faulty-merge.txt howto/revert-branch-rebase.txt howto/separating-topic-branches.txt howto/setup-git-server-over-http.txt howto/update-hook-example.txt howto/use-git-daemon.txt howto/using-merge-subtree.txt howto/using-signed-tag-in-pull-request.txt >howto-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
-sed -e '1,/^$/d' howto/setup-git-server-over-http.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/setup-git-server-over-http.html
+sed -e '1,/^$/d' howto/update-hook-example.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/update-hook-example.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+\
+sed -e '1,/^$/d' howto/separating-topic-branches.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/separating-topic-branches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
@@ -4303,7 +4342,9 @@
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/revert-a-faulty-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 git-bisect-lk2009.txt
+\
+sed -e '1,/^$/d' howto/rebuild-from-update-hook.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
@@ -4312,29 +4353,24 @@
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
-sed -e '1,/^$/d' howto/rebuild-from-update-hook.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/rebuild-from-update-hook.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-\
 sed -e '1,/^$/d' howto/rebase-from-internal-branch.txt | \
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-\
-sed -e '1,/^$/d' howto/keep-canonical-history-correct.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/keep-canonical-history-correct.html
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/api-error-handling.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
-sed -e '1,/^$/d' howto/maintain-git.txt | \
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/maintain-git.html
+sed -e '1,/^$/d' howto/keep-canonical-history-correct.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/api-merge.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/api-error-handling.txt
+\
+sed -e '1,/^$/d' howto/maintain-git.txt | \
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 - >howto/maintain-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 \
@@ -4348,55 +4384,55 @@
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/api-parse-options.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-cp SubmittingPatches SubmittingPatches.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 ReviewingGuidelines.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 ReviewingGuidelines.txt
+cp SubmittingPatches SubmittingPatches.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 ToolsForGit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d book -o user-manual.xml user-manual.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/api-trace2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/bitmap-format.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 MyFirstContribution.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 MyFirstObjectWalk.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 ToolsForGit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 MyFirstContribution.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 MyFirstObjectWalk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/long-running-process-protocol.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/bitmap-format.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/bundle-uri.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/long-running-process-protocol.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/multi-pack-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/pack-heuristics.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/hash-function-transition.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/parallel-checkout.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/bundle-uri.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/racy-git.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/pack-heuristics.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/hash-function-transition.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/partial-clone.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/partial-clone.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/racy-git.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/scalar.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/parallel-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/send-pack-pipeline.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/scalar.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/shallow.txt
@@ -4405,37 +4441,37 @@
 cd technical && '/bin/sh' ./api-index.sh
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/trivial-merge.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d book -o user-manual.xml user-manual.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/send-pack-pipeline.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -o everyday.html everyday.txto
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -o git-remote-helpers.html git-remote-helpers.txto
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/reftable.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/unit-tests.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/trivial-merge.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/reftable.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -o git-remote-helpers.html git-remote-helpers.txto
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-add.xml git-add.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-am.xml git-am.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-apply.xml git-apply.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-annotate.xml git-annotate.txt
+TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/unit-tests.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-archimport.xml git-archimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-apply.xml git-apply.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-annotate.xml git-annotate.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-am.xml git-am.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-archive.xml git-archive.txt
@@ -4447,37 +4483,31 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-bugreport.xml git-bugreport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-blame.xml git-blame.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-bundle.xml git-bundle.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-branch.xml git-branch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-blame.xml git-blame.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-attr.xml git-check-attr.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-branch.xml git-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-citool.xml git-citool.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cherry.xml git-cherry.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.txt
@@ -4486,76 +4516,85 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-clean.xml git-clean.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cherry.xml git-cherry.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-checkout.xml git-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-column.xml git-column.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-citool.xml git-citool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-column.xml git-column.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-commit-tree.xml git-commit-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-clone.xml git-clone.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-clone.xml git-clone.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-commit.xml git-commit.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-commit.xml git-commit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-credential.xml git-credential.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cvsexportcommit.xml git-cvsexportcommit.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cvsimport.xml git-cvsimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-daemon.xml git-daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-daemon.xml git-daemon.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-describe.xml git-describe.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cvsserver.xml git-cvsserver.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-difftool.xml git-difftool.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff-files.xml git-diff-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-difftool.xml git-difftool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff.xml git-diff.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff.xml git-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
@@ -4564,64 +4603,61 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fetch.xml git-fetch.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fetch.xml git-fetch.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-gc.xml git-gc.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-config.xml git-config.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fsck.xml git-fsck.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fsck.xml git-fsck.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-gc.xml git-gc.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-gui.xml git-gui.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-grep.xml git-grep.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-gui.xml git-gui.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-help.xml git-help.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-hook.xml git-hook.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-help.xml git-help.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-push.xml git-http-push.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-imap-send.xml git-imap-send.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-push.xml git-http-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-init-db.xml git-init-db.txt
@@ -4630,43 +4666,43 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-instaweb.xml git-instaweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-init.xml git-init.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-init.xml git-init.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-files.xml git-ls-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-config.xml git-config.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-file.xml git-merge-file.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-index.xml git-merge-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-index.xml git-merge-index.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-file.xml git-merge-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.txt
@@ -4678,10 +4714,7 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mktag.xml git-mktag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mktree.xml git-mktree.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-log.xml git-log.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mv.xml git-mv.txt
@@ -4690,37 +4723,40 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge.xml git-merge.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mktree.xml git-mktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-notes.xml git-notes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge.xml git-merge.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-patch-id.xml git-patch-id.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-p4.xml git-p4.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-prune.xml git-prune.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-patch-id.xml git-patch-id.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-prune-packed.xml git-prune-packed.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-log.xml git-log.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-p4.xml git-p4.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-quiltimport.xml git-quiltimport.txt
@@ -4729,10 +4765,10 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-range-diff.xml git-range-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pull.xml git-pull.txt
@@ -4744,25 +4780,25 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-push.xml git-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote.xml git-remote.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rebase.xml git-rebase.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-replace.xml git-replace.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote.xml git-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-repack.xml git-repack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rebase.xml git-rebase.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-replace.xml git-replace.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rerere.xml git-rerere.txt
@@ -4771,25 +4807,28 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-reset.xml git-reset.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-replay.xml git-replay.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-restore.xml git-restore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-revert.xml git-revert.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-replay.xml git-replay.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rm.xml git-rm.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rm.xml git-rm.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n.xml git-sh-i18n.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-send-email.xml git-send-email.txt
@@ -4798,18 +4837,18 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-shell.xml git-shell.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-show-index.xml git-show-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-show-branch.xml git-show-branch.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rev-list.xml git-rev-list.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -4819,70 +4858,67 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-stage.xml git-stage.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-stash.xml git-stash.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-status.xml git-status.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-stash.xml git-stash.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-status.xml git-status.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-submodule.xml git-submodule.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-switch.xml git-switch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-submodule.xml git-submodule.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-tag.xml git-tag.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-svn.xml git-svn.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-svn.xml git-svn.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-tag.xml git-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-show.xml git-show.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-show.xml git-show.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-index.xml git-update-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-upload-archive.xml git-upload-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-var.xml git-var.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-var.xml git-var.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-version.xml git-version.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-verify-pack.xml git-verify-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-index.xml git-update-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-verify-tag.xml git-verify-tag.txt
@@ -4891,16 +4927,19 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-whatchanged.xml git-whatchanged.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-web--browse.xml git-web--browse.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-write-tree.xml git-write-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-web--browse.xml git-web--browse.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-worktree.xml git-worktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitk.xml gitk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-worktree.xml git-worktree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitweb.xml gitweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o scalar.xml scalar.txt
@@ -4912,43 +4951,40 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitweb.xml gitweb.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitattributes.xml gitattributes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-commit-graph.xml gitformat-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-index.xml gitformat-index.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitattributes.xml gitattributes.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-index.xml gitformat-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git.xml git.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitignore.xml gitignore.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitmailmap.xml gitmailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitmodules.xml gitmodules.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git.xml git.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o githooks.xml githooks.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o githooks.xml githooks.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitmodules.xml gitmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitignore.xml gitignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.txt
@@ -4960,16 +4996,13 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcli.xml gitcli.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcli.xml gitcli.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.txt
@@ -4978,67 +5011,67 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o giteveryday.xml giteveryday.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitfaq.xml gitfaq.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitfaq.xml gitfaq.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o giteveryday.xml giteveryday.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitglossary.xml gitglossary.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitrevisions.xml gitrevisions.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitglossary.xml gitglossary.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gittutorial.xml gittutorial.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-annotate.html git-annotate.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitworkflows.xml gitworkflows.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-add.html git-add.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-am.html git-am.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-apply.html git-apply.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-add.html git-add.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitworkflows.xml gitworkflows.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-apply.html git-apply.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-am.html git-am.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-archimport.html git-archimport.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-annotate.html git-annotate.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-archive.html git-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-bugreport.html git-bugreport.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-blame.html git-blame.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-bisect.html git-bisect.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-archimport.html git-archimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-blame.html git-blame.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-bisect.html git-bisect.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-branch.html git-branch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-bugreport.html git-bugreport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-bundle.html git-bundle.txt
@@ -5047,33 +5080,36 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-check-attr.html git-check-attr.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-check-ignore.html git-check-ignore.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-check-mailmap.html git-check-mailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cat-file.html git-cat-file.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-checkout-index.html git-checkout-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-check-mailmap.html git-check-mailmap.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-branch.html git-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-check-ref-format.html git-check-ref-format.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-check-ignore.html git-check-ignore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-checkout-index.html git-checkout-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-check-ref-format.html git-check-ref-format.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cherry.html git-cherry.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cat-file.html git-cat-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-citool.html git-citool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cherry-pick.html git-cherry-pick.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cherry.html git-cherry.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-clean.html git-clean.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cherry-pick.html git-cherry-pick.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-checkout.html git-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -5083,28 +5119,25 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-commit-graph.html git-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-commit-tree.html git-commit-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-clone.html git-clone.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-count-objects.html git-count-objects.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-commit-tree.html git-commit-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-credential-cache--daemon.html git-credential-cache--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-clone.html git-clone.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-count-objects.html git-count-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-credential-cache.html git-credential-cache.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-commit.html git-commit.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cvsexportcommit.html git-cvsexportcommit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-credential-store.html git-credential-store.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-credential-store.html git-credential-store.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-commit.html git-commit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-credential.html git-credential.txt
@@ -5113,10 +5146,7 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cvsimport.html git-cvsimport.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-describe.html git-describe.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-diagnose.html git-diagnose.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cvsexportcommit.html git-cvsexportcommit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-cvsserver.html git-cvsserver.txt
@@ -5125,10 +5155,10 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-daemon.html git-daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-difftool.html git-difftool.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-diagnose.html git-diagnose.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-fast-export.html git-fast-export.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-describe.html git-describe.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-diff-files.html git-diff-files.txt
@@ -5137,16 +5167,22 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-diff-index.html git-diff-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-difftool.html git-difftool.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-fast-export.html git-fast-export.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-diff.html git-diff.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-fetch-pack.html git-fetch-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-fmt-merge-msg.html git-fmt-merge-msg.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-diff-tree.html git-diff-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-diff-tree.html git-diff-tree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-fmt-merge-msg.html git-fmt-merge-msg.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-filter-branch.html git-filter-branch.txt
@@ -5161,25 +5197,22 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-fetch.html git-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-for-each-ref.html git-for-each-ref.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-config.html git-config.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-fsck-objects.html git-fsck-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-get-tar-commit-id.html git-get-tar-commit-id.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-for-each-ref.html git-for-each-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-fsmonitor--daemon.html git-fsmonitor--daemon.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-gc.html git-gc.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-fsck.html git-fsck.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-gui.html git-gui.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-get-tar-commit-id.html git-get-tar-commit-id.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-format-patch.html git-format-patch.txt
@@ -5188,22 +5221,28 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-grep.html git-grep.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-hook.html git-hook.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-gc.html git-gc.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-gui.html git-gui.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-hash-object.html git-hash-object.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-hook.html git-hook.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-help.html git-help.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-http-backend.html git-http-backend.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-http-fetch.html git-http-fetch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-http-push.html git-http-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-http-fetch.html git-http-fetch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-http-backend.html git-http-backend.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-imap-send.html git-imap-send.txt
@@ -5212,40 +5251,34 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-init-db.html git-init-db.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-init.html git-init.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-index-pack.html git-index-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-instaweb.html git-instaweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-init.html git-init.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-ls-files.html git-ls-files.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-interpret-trailers.html git-interpret-trailers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-ls-files.html git-ls-files.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-ls-remote.html git-ls-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-config.html git-config.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-ls-tree.html git-ls-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-mailsplit.html git-mailsplit.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-mailinfo.html git-mailinfo.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-base.html git-merge-base.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-mailsplit.html git-mailsplit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-maintenance.html git-maintenance.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-base.html git-merge-base.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-file.html git-merge-file.txt
@@ -5254,6 +5287,9 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-index.html git-merge-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-maintenance.html git-maintenance.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-merge-one-file.html git-merge-one-file.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -5269,10 +5305,10 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-mergetool.html git-mergetool.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-mktree.html git-mktree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-mv.html git-mv.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-mv.html git-mv.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-mktree.html git-mktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-multi-pack-index.html git-multi-pack-index.txt
@@ -5290,25 +5326,25 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-redundant.html git-pack-redundant.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-objects.html git-pack-objects.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-refs.html git-pack-refs.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-refs.html git-pack-refs.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-pack-objects.html git-pack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-p4.html git-p4.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-prune-packed.html git-prune-packed.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-log.html git-log.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-prune.html git-prune.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-prune-packed.html git-prune-packed.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-log.html git-log.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-patch-id.html git-patch-id.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-patch-id.html git-patch-id.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-prune.html git-prune.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-quiltimport.html git-quiltimport.txt
@@ -5320,16 +5356,16 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-read-tree.html git-read-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-receive-pack.html git-receive-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-push.html git-push.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-reflog.html git-reflog.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-pull.html git-pull.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-receive-pack.html git-receive-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-push.html git-push.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-pull.html git-pull.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-remote-ext.html git-remote-ext.txt
@@ -5341,6 +5377,9 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-remote.html git-remote.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-repack.html git-repack.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-replace.html git-replace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -5350,55 +5389,55 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-rebase.html git-rebase.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-repack.html git-repack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-restore.html git-restore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-rerere.html git-rerere.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-restore.html git-restore.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-reset.html git-reset.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-reset.html git-reset.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-rm.html git-rm.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-revert.html git-revert.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-rm.html git-rm.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-replay.html git-replay.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-send-pack.html git-send-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-i18n--envsubst.html git-sh-i18n--envsubst.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-replay.html git-replay.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-send-pack.html git-send-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-rev-parse.html git-rev-parse.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-rev-list.html git-rev-list.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-i18n--envsubst.html git-sh-i18n--envsubst.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-rev-parse.html git-rev-parse.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-i18n.html git-sh-i18n.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-send-email.html git-send-email.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-shell.html git-shell.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-sh-setup.html git-sh-setup.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-show-index.html git-show-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-send-email.html git-send-email.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-show-branch.html git-show-branch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-shortlog.html git-shortlog.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-shell.html git-shell.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-show-index.html git-show-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-rev-list.html git-rev-list.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-show-branch.html git-show-branch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-show-ref.html git-show-ref.txt
@@ -5407,19 +5446,16 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-stage.html git-stage.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-shortlog.html git-shortlog.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-sparse-checkout.html git-sparse-checkout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-status.html git-status.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-stripspace.html git-stripspace.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-stash.html git-stash.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-stripspace.html git-stripspace.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-status.html git-status.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-symbolic-ref.html git-symbolic-ref.txt
@@ -5428,52 +5464,52 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-submodule.html git-submodule.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-switch.html git-switch.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-show.html git-show.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-unpack-file.html git-unpack-file.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-svn.html git-svn.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-tag.html git-tag.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-switch.html git-switch.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-unpack-objects.html git-unpack-objects.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-svn.html git-svn.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-unpack-file.html git-unpack-file.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-update-ref.html git-update-ref.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-update-server-info.html git-update-server-info.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-show.html git-show.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-update-index.html git-update-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-update-ref.html git-update-ref.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-tag.html git-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-upload-archive.html git-upload-archive.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-update-index.html git-update-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-commit.html git-verify-commit.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-upload-pack.html git-upload-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-version.html git-version.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-commit.html git-verify-commit.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-upload-pack.html git-upload-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-var.html git-var.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-tag.html git-verify-tag.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-version.html git-version.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-pack.html git-verify-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-pack.html git-verify-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-verify-tag.html git-verify-tag.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-whatchanged.html git-whatchanged.txt
@@ -5485,40 +5521,37 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-write-tree.html git-write-tree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitk.html gitk.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-worktree.html git-worktree.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git-worktree.html git-worktree.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitk.html gitk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o scalar.html scalar.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-bundle.html gitformat-bundle.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitweb.html gitweb.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitweb.html gitweb.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-bundle.html gitformat-bundle.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-chunk.html gitformat-chunk.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-index.html gitformat-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-commit-graph.html gitformat-commit-graph.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-index.html gitformat-index.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-chunk.html gitformat-chunk.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitattributes.html gitattributes.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-signature.html gitformat-signature.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-pack.html gitformat-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitformat-signature.html gitformat-signature.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitignore.html gitignore.txt
@@ -5527,13 +5560,16 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitmodules.html gitmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o githooks.html githooks.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-common.html gitprotocol-common.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitmailmap.html gitmailmap.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o git.html git.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-common.html gitprotocol-common.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o githooks.html githooks.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-capabilities.html gitprotocol-capabilities.txt
@@ -5542,10 +5578,10 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-http.html gitprotocol-http.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-pack.html gitprotocol-pack.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitrepository-layout.html gitrepository-layout.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitrepository-layout.html gitrepository-layout.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-pack.html gitprotocol-pack.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitcli.html gitcli.txt
@@ -5554,16 +5590,16 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitprotocol-v2.html gitprotocol-v2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitcredentials.html gitcredentials.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitweb.conf.html gitweb.conf.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitcvs-migration.html gitcvs-migration.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitcredentials.html gitcredentials.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitweb.conf.html gitweb.conf.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitdiffcore.html gitdiffcore.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o giteveryday.html giteveryday.txt
@@ -5578,79 +5614,79 @@
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitcore-tutorial.html gitcore-tutorial.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitrevisions.html gitrevisions.txt
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitsubmodules.html gitsubmodules.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gittutorial-2.html gittutorial-2.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gittutorial.html gittutorial.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitremote-helpers.html gitremote-helpers.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitglossary.html gitglossary.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitrevisions.html gitrevisions.txt
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 howto-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc -a git-relative-html-prefix=../ -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 technical/api-index.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitworkflows.html gitworkflows.txt
+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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gittutorial.html gittutorial.txt
+TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 -d manpage -o gitworkflows.html gitworkflows.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 TZ=UTC asciidoc  -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b xhtml11 SubmittingPatches.txt
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/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 git-add.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-add.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-annotate.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-archive.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-archimport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-archive.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-blame.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bisect.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-bisect.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-attr.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ignore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-ignore.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-check-attr.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5659,91 +5695,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-check-ref-format.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-checkout.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-checkout-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry-pick.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clean.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry-pick.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-clean.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-commit-graph.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-count-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-store.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsexportcommit.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential-cache.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-credential.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsexportcommit.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-describe.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-diagnose.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-config.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fast-export.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-diff-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-fast-export.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-difftool.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-fetch-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5752,9 +5791,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-fmt-merge-msg.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -5764,13 +5800,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-for-each-repo.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fsck-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-format-patch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5779,10 +5815,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-gc.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-format-patch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-grep.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5791,34 +5830,31 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-hash-object.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-backend.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-http-fetch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-backend.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-index-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-imap-send.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-init-db.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-index-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-init-db.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5827,13 +5863,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-ls-files.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-remote.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-interpret-trailers.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-remote.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-interpret-trailers.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5845,16 +5881,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-merge-base.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-maintenance.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5863,43 +5896,46 @@
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mergetool--lib.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-one-file.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-mergetool--lib.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mktree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-notes.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-redundant.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-p4.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-pack-refs.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-refs.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-redundant.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-p4.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-objects.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5911,19 +5947,22 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-pull.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-range-diff.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-push.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-quiltimport.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-push.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-read-tree.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-read-tree.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-range-diff.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5938,9 +5977,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-remote-fd.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -5950,40 +5986,40 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replace.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-request-pull.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-replay.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rerere.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reset.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-rm.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-send-email.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-rev-parse.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-rev-list.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-send-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -5995,10 +6031,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-shell.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show-branch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -6007,10 +6043,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-shortlog.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-show.xml
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -6019,55 +6061,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-stripspace.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-submodule.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-switch.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-submodule.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-tag.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-svn.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-update-server-info.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-index.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-server-info.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-ref.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-archive.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-commit.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-verify-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-upload-pack.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -6076,60 +6112,60 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-version.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-web--browse.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitk.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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 git.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-chunk.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitattributes.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-bundle.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitattributes.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-commit-graph.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-commit-graph.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-chunk.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+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.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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 githooks.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitignore.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -6148,10 +6184,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 gitrepository-layout.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-v2.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitcli.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-v2.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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
@@ -6181,13 +6217,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 gitglossary.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitsubmodules.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitremote-helpers.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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
@@ -6252,9 +6288,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-send-email.perl >git-send-email+ && \
-chmod +x git-send-email+ && \
-mv git-send-email+ git-send-email
+    git-cvsexportcommit.perl >git-cvsexportcommit+ && \
+chmod +x git-cvsexportcommit+ && \
+mv git-cvsexportcommit+ git-cvsexportcommit
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
@@ -6264,9 +6300,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-cvsexportcommit.perl >git-cvsexportcommit+ && \
-chmod +x git-cvsexportcommit+ && \
-mv git-cvsexportcommit+ git-cvsexportcommit
+    git-cvsserver.perl >git-cvsserver+ && \
+chmod +x git-cvsserver+ && \
+mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
@@ -6288,9 +6324,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-cvsserver.perl >git-cvsserver+ && \
-chmod +x git-cvsserver+ && \
-mv git-cvsserver+ git-cvsserver
+    git-send-email.perl >git-send-email+ && \
+chmod +x git-send-email+ && \
+mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
@@ -6323,56 +6359,6 @@
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 GIT_TEST_EXT_CHAIN_LINT=0 && export GIT_TEST_EXT_CHAIN_LINT && /usr/bin/make aggregate-results-and-cleanup
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0005-signals.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0005-signals/.git/
-expecting success of 0005.1 'sigchain works': 
-	{ test-tool sigchain >actual; ret=$?; } &&
-	{
-		# Signal death by raise() on Windows acts like exit(3),
-		# regardless of the signal number. So we must allow that
-		# as well as the normal signal check.
-		test_match_signal 15 "$ret" ||
-		test "$ret" = 3
-	} &&
-	test_cmp expect actual
-
-Terminated
-ok 1 - sigchain works
-
-expecting success of 0005.2 'signals are propagated using shell convention': 
-	# we use exec here to avoid any sub-shell interpretation
-	# of the exit code
-	git config alias.sigterm "!exec test-tool sigchain" &&
-	test_expect_code 143 git sigterm
-
-three
-two
-one
-error: exec test-tool sigchain died of signal 15
-ok 2 - signals are propagated using shell convention
-
-expecting success of 0005.3 'create blob': 
-	test-tool genrandom foo 16384 >file &&
-	git add file
-
-ok 3 - create blob
-
-expecting success of 0005.4 'a constipated git dies with SIGPIPE': 
-	OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) &&
-	test_match_signal 13 "$OUT"
-
-ok 4 - a constipated git dies with SIGPIPE
-
-expecting success of 0005.5 'a constipated git dies with SIGPIPE even if parent ignores it': 
-	OUT=$( ((trap "" PIPE && large_git; echo $? 1>&3) | :) 3>&1 ) &&
-	test_match_signal 13 "$OUT"
-
-ok 5 - a constipated git dies with SIGPIPE even if parent ignores it
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0004-unwritable.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0004-unwritable/.git/
 expecting success of 0004.1 'setup': 
@@ -6518,6 +6504,56 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0005-signals.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0005-signals/.git/
+expecting success of 0005.1 'sigchain works': 
+	{ test-tool sigchain >actual; ret=$?; } &&
+	{
+		# Signal death by raise() on Windows acts like exit(3),
+		# regardless of the signal number. So we must allow that
+		# as well as the normal signal check.
+		test_match_signal 15 "$ret" ||
+		test "$ret" = 3
+	} &&
+	test_cmp expect actual
+
+Terminated
+ok 1 - sigchain works
+
+expecting success of 0005.2 'signals are propagated using shell convention': 
+	# we use exec here to avoid any sub-shell interpretation
+	# of the exit code
+	git config alias.sigterm "!exec test-tool sigchain" &&
+	test_expect_code 143 git sigterm
+
+three
+two
+one
+error: exec test-tool sigchain died of signal 15
+ok 2 - signals are propagated using shell convention
+
+expecting success of 0005.3 'create blob': 
+	test-tool genrandom foo 16384 >file &&
+	git add file
+
+ok 3 - create blob
+
+expecting success of 0005.4 'a constipated git dies with SIGPIPE': 
+	OUT=$( ((large_git; echo $? 1>&3) | :) 3>&1 ) &&
+	test_match_signal 13 "$OUT"
+
+ok 4 - a constipated git dies with SIGPIPE
+
+expecting success of 0005.5 'a constipated git dies with SIGPIPE even if parent ignores it': 
+	OUT=$( ((trap "" PIPE && large_git; echo $? 1>&3) | :) 3>&1 ) &&
+	test_match_signal 13 "$OUT"
+
+ok 5 - a constipated git dies with SIGPIPE even if parent ignores it
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0002-gitfile.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0002-gitfile/.git/
 expecting success of 0002.1 'initial setup': 
@@ -6707,41 +6743,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@infom08-i386.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@infom08-i386.debian.net>) not allowed
-ok 3 - requested identities are strict
+second user <pbuilder2@infom07-i386.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': 
 	(
@@ -7665,272 +7669,6 @@
 1..100
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0011-hashmap.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0011-hashmap/.git/
-expecting success of 0011.1 'put': 
-
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-put foobarfrotz value4
-size" "NULL
-NULL
-NULL
-NULL
-64 4"
-
-
-ok 1 - put
-
-expecting success of 0011.2 'put (case insensitive)': 
-
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-size" "NULL
-NULL
-NULL
-64 3" ignorecase
-
-
-ok 2 - put (case insensitive)
-
-expecting success of 0011.3 'replace': 
-
-test_hashmap "put key1 value1
-put key1 value2
-put fooBarFrotz value3
-put fooBarFrotz value4
-size" "NULL
-value1
-NULL
-value3
-64 2"
-
-
-ok 3 - replace
-
-expecting success of 0011.4 'replace (case insensitive)': 
-
-test_hashmap "put key1 value1
-put Key1 value2
-put fooBarFrotz value3
-put foobarfrotz value4
-size" "NULL
-value1
-NULL
-value3
-64 2" ignorecase
-
-
-ok 4 - replace (case insensitive)
-
-expecting success of 0011.5 'get': 
-
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-put foobarfrotz value4
-get key1
-get key2
-get fooBarFrotz
-get notInMap" "NULL
-NULL
-NULL
-NULL
-value1
-value2
-value3
-NULL"
-
-
-ok 5 - get
-
-expecting success of 0011.6 'get (case insensitive)': 
-
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-get Key1
-get keY2
-get foobarfrotz
-get notInMap" "NULL
-NULL
-NULL
-value1
-value2
-value3
-NULL" ignorecase
-
-
-ok 6 - get (case insensitive)
-
-expecting success of 0011.7 'add': 
-
-test_hashmap "add key1 value1
-add key1 value2
-add fooBarFrotz value3
-add fooBarFrotz value4
-get key1
-get fooBarFrotz
-get notInMap" "value2
-value1
-value4
-value3
-NULL"
-
-
-ok 7 - add
-
-expecting success of 0011.8 'add (case insensitive)': 
-
-test_hashmap "add key1 value1
-add Key1 value2
-add fooBarFrotz value3
-add foobarfrotz value4
-get key1
-get Foobarfrotz
-get notInMap" "value2
-value1
-value4
-value3
-NULL" ignorecase
-
-
-ok 8 - add (case insensitive)
-
-expecting success of 0011.9 'remove': 
-
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-remove key1
-remove key2
-remove notInMap
-size" "NULL
-NULL
-NULL
-value1
-value2
-NULL
-64 1"
-
-
-ok 9 - remove
-
-expecting success of 0011.10 'remove (case insensitive)': 
-
-test_hashmap "put key1 value1
-put key2 value2
-put fooBarFrotz value3
-remove Key1
-remove keY2
-remove notInMap
-size" "NULL
-NULL
-NULL
-value1
-value2
-NULL
-64 1" ignorecase
-
-
-ok 10 - remove (case insensitive)
-
-expecting success of 0011.11 'iterate': 
-	test-tool hashmap >actual.raw <<-\EOF &&
-	put key1 value1
-	put key2 value2
-	put fooBarFrotz value3
-	iterate
-	EOF
-
-	cat >expect <<-\EOF &&
-	NULL
-	NULL
-	NULL
-	fooBarFrotz value3
-	key1 value1
-	key2 value2
-	EOF
-
-	sort <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 11 - iterate
-
-expecting success of 0011.12 'iterate (case insensitive)': 
-	test-tool hashmap ignorecase >actual.raw <<-\EOF &&
-	put key1 value1
-	put key2 value2
-	put fooBarFrotz value3
-	iterate
-	EOF
-
-	cat >expect <<-\EOF &&
-	NULL
-	NULL
-	NULL
-	fooBarFrotz value3
-	key1 value1
-	key2 value2
-	EOF
-
-	sort <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 12 - iterate (case insensitive)
-
-expecting success of 0011.13 'grow / shrink': 
-
-	rm -f in &&
-	rm -f expect &&
-	for n in $(test_seq 51)
-	do
-		echo put key$n value$n >> in &&
-		echo NULL >> expect || return 1
-	done &&
-	echo size >> in &&
-	echo 64 51 >> expect &&
-	echo put key52 value52 >> in &&
-	echo NULL >> expect &&
-	echo size >> in &&
-	echo 256 52 >> expect &&
-	for n in $(test_seq 12)
-	do
-		echo remove key$n >> in &&
-		echo value$n >> expect || return 1
-	done &&
-	echo size >> in &&
-	echo 256 40 >> expect &&
-	echo remove key40 >> in &&
-	echo value40 >> expect &&
-	echo size >> in &&
-	echo 64 39 >> expect &&
-	test-tool hashmap <in >out &&
-	test_cmp expect out
-
-
-ok 13 - grow / shrink
-
-expecting success of 0011.14 'string interning': 
-
-test_hashmap "intern value1
-intern Value1
-intern value2
-intern value2
-" "value1
-Value1
-value2
-value2"
-
-
-ok 14 - string interning
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0001-init.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0001-init/.git/
 expecting success of 0001.1 'plain': 
@@ -8761,69 +8499,270 @@
 1..69
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0013-sha1dc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0013-sha1dc/.git/
-checking prerequisite: SHA1_IS_SHA1DC
+*** t0011-hashmap.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0011-hashmap/.git/
+expecting success of 0011.1 'put': 
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1_IS_SHA1DC" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1_IS_SHA1DC" &&test-tool sha1-is-sha1dc
-)
-prerequisite SHA1_IS_SHA1DC ok
-expecting success of 0013.1 'test-sha1 detects shattered pdf': 
-	test_must_fail test-tool sha1 <"$TEST_DATA/shattered-1.pdf" 2>err &&
-	test_grep collision err &&
-	grep 38762cf7f55934b34d179ae6a4c80cadccbb7f0a err
+test_hashmap "put key1 value1
+put key2 value2
+put fooBarFrotz value3
+put foobarfrotz value4
+size" "NULL
+NULL
+NULL
+NULL
+64 4"
 
-fatal: SHA-1 appears to be part of a collision attack: 38762cf7f55934b34d179ae6a4c80cadccbb7f0a
-fatal: SHA-1 appears to be part of a collision attack: 38762cf7f55934b34d179ae6a4c80cadccbb7f0a
-ok 1 - test-sha1 detects shattered pdf
 
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0014-alias.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0014-alias/.git/
-expecting success of 0014.1 'nested aliases - internal execution': 
-	git config alias.nested-internal-1 nested-internal-2 &&
-	git config alias.nested-internal-2 status &&
-	git nested-internal-1 >output &&
-	test_grep "^On branch " output
+ok 1 - put
 
-On branch master
-ok 1 - nested aliases - internal execution
+expecting success of 0011.2 'put (case insensitive)': 
 
-expecting success of 0014.2 'nested aliases - mixed execution': 
-	git config alias.nested-external-1 nested-external-2 &&
-	git config alias.nested-external-2 "!git nested-external-3" &&
-	git config alias.nested-external-3 status &&
-	git nested-external-1 >output &&
-	test_grep "^On branch " output
+test_hashmap "put key1 value1
+put key2 value2
+put fooBarFrotz value3
+size" "NULL
+NULL
+NULL
+64 3" ignorecase
 
-On branch master
-ok 2 - nested aliases - mixed execution
 
-expecting success of 0014.3 'looping aliases - internal execution': 
-	git config alias.loop-internal-1 loop-internal-2 &&
-	git config alias.loop-internal-2 loop-internal-3 &&
-	git config alias.loop-internal-3 loop-internal-2 &&
-	test_must_fail git loop-internal-1 2>output &&
-	test_grep "^fatal: alias loop detected: expansion of" output
+ok 2 - put (case insensitive)
 
-fatal: alias loop detected: expansion of 'loop-internal-1' does not terminate:
-ok 3 - looping aliases - internal execution
+expecting success of 0011.3 'replace': 
 
-expecting success of 0014.4 'run-command formats empty args properly': 
-    test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw &&
-    sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual &&
-    echo "git-frotz a '' b ' ' c" >expect &&
-    test_cmp expect actual
+test_hashmap "put key1 value1
+put key1 value2
+put fooBarFrotz value3
+put fooBarFrotz value4
+size" "NULL
+value1
+NULL
+value3
+64 2"
 
-ok 4 - run-command formats empty args properly
 
-# passed all 4 test(s)
-1..4
+ok 3 - replace
+
+expecting success of 0011.4 'replace (case insensitive)': 
+
+test_hashmap "put key1 value1
+put Key1 value2
+put fooBarFrotz value3
+put foobarfrotz value4
+size" "NULL
+value1
+NULL
+value3
+64 2" ignorecase
+
+
+ok 4 - replace (case insensitive)
+
+expecting success of 0011.5 'get': 
+
+test_hashmap "put key1 value1
+put key2 value2
+put fooBarFrotz value3
+put foobarfrotz value4
+get key1
+get key2
+get fooBarFrotz
+get notInMap" "NULL
+NULL
+NULL
+NULL
+value1
+value2
+value3
+NULL"
+
+
+ok 5 - get
+
+expecting success of 0011.6 'get (case insensitive)': 
+
+test_hashmap "put key1 value1
+put key2 value2
+put fooBarFrotz value3
+get Key1
+get keY2
+get foobarfrotz
+get notInMap" "NULL
+NULL
+NULL
+value1
+value2
+value3
+NULL" ignorecase
+
+
+ok 6 - get (case insensitive)
+
+expecting success of 0011.7 'add': 
+
+test_hashmap "add key1 value1
+add key1 value2
+add fooBarFrotz value3
+add fooBarFrotz value4
+get key1
+get fooBarFrotz
+get notInMap" "value2
+value1
+value4
+value3
+NULL"
+
+
+ok 7 - add
+
+expecting success of 0011.8 'add (case insensitive)': 
+
+test_hashmap "add key1 value1
+add Key1 value2
+add fooBarFrotz value3
+add foobarfrotz value4
+get key1
+get Foobarfrotz
+get notInMap" "value2
+value1
+value4
+value3
+NULL" ignorecase
+
+
+ok 8 - add (case insensitive)
+
+expecting success of 0011.9 'remove': 
+
+test_hashmap "put key1 value1
+put key2 value2
+put fooBarFrotz value3
+remove key1
+remove key2
+remove notInMap
+size" "NULL
+NULL
+NULL
+value1
+value2
+NULL
+64 1"
+
+
+ok 9 - remove
+
+expecting success of 0011.10 'remove (case insensitive)': 
+
+test_hashmap "put key1 value1
+put key2 value2
+put fooBarFrotz value3
+remove Key1
+remove keY2
+remove notInMap
+size" "NULL
+NULL
+NULL
+value1
+value2
+NULL
+64 1" ignorecase
+
+
+ok 10 - remove (case insensitive)
+
+expecting success of 0011.11 'iterate': 
+	test-tool hashmap >actual.raw <<-\EOF &&
+	put key1 value1
+	put key2 value2
+	put fooBarFrotz value3
+	iterate
+	EOF
+
+	cat >expect <<-\EOF &&
+	NULL
+	NULL
+	NULL
+	fooBarFrotz value3
+	key1 value1
+	key2 value2
+	EOF
+
+	sort <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 11 - iterate
+
+expecting success of 0011.12 'iterate (case insensitive)': 
+	test-tool hashmap ignorecase >actual.raw <<-\EOF &&
+	put key1 value1
+	put key2 value2
+	put fooBarFrotz value3
+	iterate
+	EOF
+
+	cat >expect <<-\EOF &&
+	NULL
+	NULL
+	NULL
+	fooBarFrotz value3
+	key1 value1
+	key2 value2
+	EOF
+
+	sort <actual.raw >actual &&
+	test_cmp expect actual
+
+ok 12 - iterate (case insensitive)
+
+expecting success of 0011.13 'grow / shrink': 
+
+	rm -f in &&
+	rm -f expect &&
+	for n in $(test_seq 51)
+	do
+		echo put key$n value$n >> in &&
+		echo NULL >> expect || return 1
+	done &&
+	echo size >> in &&
+	echo 64 51 >> expect &&
+	echo put key52 value52 >> in &&
+	echo NULL >> expect &&
+	echo size >> in &&
+	echo 256 52 >> expect &&
+	for n in $(test_seq 12)
+	do
+		echo remove key$n >> in &&
+		echo value$n >> expect || return 1
+	done &&
+	echo size >> in &&
+	echo 256 40 >> expect &&
+	echo remove key40 >> in &&
+	echo value40 >> expect &&
+	echo size >> in &&
+	echo 64 39 >> expect &&
+	test-tool hashmap <in >out &&
+	test_cmp expect out
+
+
+ok 13 - grow / shrink
+
+expecting success of 0011.14 'string interning': 
+
+test_hashmap "intern value1
+intern Value1
+intern value2
+intern value2
+" "value1
+Value1
+value2
+value2"
+
+
+ok 14 - string interning
+
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0003-attributes.sh ***
@@ -9618,6 +9557,252 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0013-sha1dc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0013-sha1dc/.git/
+checking prerequisite: SHA1_IS_SHA1DC
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1_IS_SHA1DC" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1_IS_SHA1DC" &&test-tool sha1-is-sha1dc
+)
+prerequisite SHA1_IS_SHA1DC ok
+expecting success of 0013.1 'test-sha1 detects shattered pdf': 
+	test_must_fail test-tool sha1 <"$TEST_DATA/shattered-1.pdf" 2>err &&
+	test_grep collision err &&
+	grep 38762cf7f55934b34d179ae6a4c80cadccbb7f0a err
+
+fatal: SHA-1 appears to be part of a collision attack: 38762cf7f55934b34d179ae6a4c80cadccbb7f0a
+fatal: SHA-1 appears to be part of a collision attack: 38762cf7f55934b34d179ae6a4c80cadccbb7f0a
+ok 1 - test-sha1 detects shattered pdf
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0014-alias.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0014-alias/.git/
+expecting success of 0014.1 'nested aliases - internal execution': 
+	git config alias.nested-internal-1 nested-internal-2 &&
+	git config alias.nested-internal-2 status &&
+	git nested-internal-1 >output &&
+	test_grep "^On branch " output
+
+On branch master
+ok 1 - nested aliases - internal execution
+
+expecting success of 0014.2 'nested aliases - mixed execution': 
+	git config alias.nested-external-1 nested-external-2 &&
+	git config alias.nested-external-2 "!git nested-external-3" &&
+	git config alias.nested-external-3 status &&
+	git nested-external-1 >output &&
+	test_grep "^On branch " output
+
+On branch master
+ok 2 - nested aliases - mixed execution
+
+expecting success of 0014.3 'looping aliases - internal execution': 
+	git config alias.loop-internal-1 loop-internal-2 &&
+	git config alias.loop-internal-2 loop-internal-3 &&
+	git config alias.loop-internal-3 loop-internal-2 &&
+	test_must_fail git loop-internal-1 2>output &&
+	test_grep "^fatal: alias loop detected: expansion of" output
+
+fatal: alias loop detected: expansion of 'loop-internal-1' does not terminate:
+ok 3 - looping aliases - internal execution
+
+expecting success of 0014.4 'run-command formats empty args properly': 
+    test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw &&
+    sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual &&
+    echo "git-frotz a '' b ' ' c" >expect &&
+    test_cmp expect actual
+
+ok 4 - run-command formats empty args properly
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0010-racy-git.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0010-racy-git/.git/
+expecting success of 0010.1 'Racy git trial #0 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 1 - Racy git trial #0 part A
+
+expecting success of 0010.2 'Racy git trial #0 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 2 - Racy git trial #0 part B
+
+expecting success of 0010.3 'Racy git trial #1 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 3 - Racy git trial #1 part A
+
+expecting success of 0010.4 'Racy git trial #1 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 4 - Racy git trial #1 part B
+
+expecting success of 0010.5 'Racy git trial #2 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 5 - Racy git trial #2 part A
+
+expecting success of 0010.6 'Racy git trial #2 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 6 - Racy git trial #2 part B
+
+expecting success of 0010.7 'Racy git trial #3 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 7 - Racy git trial #3 part A
+
+expecting success of 0010.8 'Racy git trial #3 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 8 - Racy git trial #3 part B
+
+expecting success of 0010.9 'Racy git trial #4 part A': 
+		rm -f .git/index &&
+		echo frotz >infocom &&
+		git update-index --add infocom &&
+		echo xyzzy >infocom &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 9 - Racy git trial #4 part A
+
+expecting success of 0010.10 'Racy git trial #4 part B': 
+		echo xyzzy >cornerstone &&
+		git update-index --add cornerstone &&
+
+		git diff-files -p >out &&
+		test_file_not_empty out
+	
+ok 10 - Racy git trial #4 part B
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0015-hash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0015-hash/.git/
+expecting success of 0015.1 'test basic SHA-1 hash values': 
+	test-tool sha1 </dev/null >actual &&
+	grep da39a3ee5e6b4b0d3255bfef95601890afd80709 actual &&
+	printf "a" | test-tool sha1 >actual &&
+	grep 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 actual &&
+	printf "abc" | test-tool sha1 >actual &&
+	grep a9993e364706816aba3e25717850c26c9cd0d89d actual &&
+	printf "message digest" | test-tool sha1 >actual &&
+	grep c12252ceda8be8994d5fa0290a47231c1d16aae3 actual &&
+	printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha1 >actual &&
+	grep 32d10c7b8cf96570ca04ce37f2a19d84240d3a89 actual &&
+	perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" |
+		test-tool sha1 >actual &&
+	grep 34aa973cd4c4daa4f61eeb2bdbad27316534016f actual &&
+	printf "blob 0\0" | test-tool sha1 >actual &&
+	grep e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 actual &&
+	printf "blob 3\0abc" | test-tool sha1 >actual &&
+	grep f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f actual &&
+	printf "tree 0\0" | test-tool sha1 >actual &&
+	grep 4b825dc642cb6eb9a060e54bf8d69288fbee4904 actual
+
+da39a3ee5e6b4b0d3255bfef95601890afd80709
+86f7e437faa5a7fce15d1ddcb9eaeaea377667b8
+a9993e364706816aba3e25717850c26c9cd0d89d
+c12252ceda8be8994d5fa0290a47231c1d16aae3
+32d10c7b8cf96570ca04ce37f2a19d84240d3a89
+34aa973cd4c4daa4f61eeb2bdbad27316534016f
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f
+4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ok 1 - test basic SHA-1 hash values
+
+expecting success of 0015.2 'test basic SHA-256 hash values': 
+	test-tool sha256 </dev/null >actual &&
+	grep e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 actual &&
+	printf "a" | test-tool sha256 >actual &&
+	grep ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb actual &&
+	printf "abc" | test-tool sha256 >actual &&
+	grep ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad actual &&
+	printf "message digest" | test-tool sha256 >actual &&
+	grep f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650 actual &&
+	printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha256 >actual &&
+	grep 71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73 actual &&
+	# Try to exercise the chunking code by turning autoflush on.
+	perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" |
+		test-tool sha256 >actual &&
+	grep cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0 actual &&
+	perl -e "$| = 1; print q{abcdefghijklmnopqrstuvwxyz} for 1..100000;" |
+		test-tool sha256 >actual &&
+	grep e406ba321ca712ad35a698bf0af8d61fc4dc40eca6bdcea4697962724ccbde35 actual &&
+	printf "blob 0\0" | test-tool sha256 >actual &&
+	grep 473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813 actual &&
+	printf "blob 3\0abc" | test-tool sha256 >actual &&
+	grep c1cf6e465077930e88dc5136641d402f72a229ddd996f627d60e9639eaba35a6 actual &&
+	printf "tree 0\0" | test-tool sha256 >actual &&
+	grep 6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321 actual
+
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb
+ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad
+f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650
+71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73
+cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0
+e406ba321ca712ad35a698bf0af8d61fc4dc40eca6bdcea4697962724ccbde35
+473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813
+c1cf6e465077930e88dc5136641d402f72a229ddd996f627d60e9639eaba35a6
+6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321
+ok 2 - test basic SHA-256 hash values
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0016-oidmap.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0016-oidmap/.git/
 expecting success of 0016.1 'setup': 
@@ -9741,81 +9926,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0015-hash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0015-hash/.git/
-expecting success of 0015.1 'test basic SHA-1 hash values': 
-	test-tool sha1 </dev/null >actual &&
-	grep da39a3ee5e6b4b0d3255bfef95601890afd80709 actual &&
-	printf "a" | test-tool sha1 >actual &&
-	grep 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8 actual &&
-	printf "abc" | test-tool sha1 >actual &&
-	grep a9993e364706816aba3e25717850c26c9cd0d89d actual &&
-	printf "message digest" | test-tool sha1 >actual &&
-	grep c12252ceda8be8994d5fa0290a47231c1d16aae3 actual &&
-	printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha1 >actual &&
-	grep 32d10c7b8cf96570ca04ce37f2a19d84240d3a89 actual &&
-	perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" |
-		test-tool sha1 >actual &&
-	grep 34aa973cd4c4daa4f61eeb2bdbad27316534016f actual &&
-	printf "blob 0\0" | test-tool sha1 >actual &&
-	grep e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 actual &&
-	printf "blob 3\0abc" | test-tool sha1 >actual &&
-	grep f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f actual &&
-	printf "tree 0\0" | test-tool sha1 >actual &&
-	grep 4b825dc642cb6eb9a060e54bf8d69288fbee4904 actual
-
-da39a3ee5e6b4b0d3255bfef95601890afd80709
-86f7e437faa5a7fce15d1ddcb9eaeaea377667b8
-a9993e364706816aba3e25717850c26c9cd0d89d
-c12252ceda8be8994d5fa0290a47231c1d16aae3
-32d10c7b8cf96570ca04ce37f2a19d84240d3a89
-34aa973cd4c4daa4f61eeb2bdbad27316534016f
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-f2ba8f84ab5c1bce84a7b441cb1959cfc7093b7f
-4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 1 - test basic SHA-1 hash values
-
-expecting success of 0015.2 'test basic SHA-256 hash values': 
-	test-tool sha256 </dev/null >actual &&
-	grep e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 actual &&
-	printf "a" | test-tool sha256 >actual &&
-	grep ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb actual &&
-	printf "abc" | test-tool sha256 >actual &&
-	grep ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad actual &&
-	printf "message digest" | test-tool sha256 >actual &&
-	grep f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650 actual &&
-	printf "abcdefghijklmnopqrstuvwxyz" | test-tool sha256 >actual &&
-	grep 71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73 actual &&
-	# Try to exercise the chunking code by turning autoflush on.
-	perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;" |
-		test-tool sha256 >actual &&
-	grep cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0 actual &&
-	perl -e "$| = 1; print q{abcdefghijklmnopqrstuvwxyz} for 1..100000;" |
-		test-tool sha256 >actual &&
-	grep e406ba321ca712ad35a698bf0af8d61fc4dc40eca6bdcea4697962724ccbde35 actual &&
-	printf "blob 0\0" | test-tool sha256 >actual &&
-	grep 473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813 actual &&
-	printf "blob 3\0abc" | test-tool sha256 >actual &&
-	grep c1cf6e465077930e88dc5136641d402f72a229ddd996f627d60e9639eaba35a6 actual &&
-	printf "tree 0\0" | test-tool sha256 >actual &&
-	grep 6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321 actual
-
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb
-ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad
-f7846f55cf23e14eebeab5b4e1550cad5b509e3348fbc4efa3a1413d393cb650
-71c480df93d6ae2f1efad1447c66c9525e316218cf51fc8d9ed832f2daf18b73
-cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0
-e406ba321ca712ad35a698bf0af8d61fc4dc40eca6bdcea4697962724ccbde35
-473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813
-c1cf6e465077930e88dc5136641d402f72a229ddd996f627d60e9639eaba35a6
-6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321
-ok 2 - test basic SHA-256 hash values
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0017-env-helper.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0017-env-helper/.git/
 expecting success of 0017.1 'test-tool env-helper usage': 
@@ -14888,48 +14998,6 @@
 1..173
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0022-crlf-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0022-crlf-rename/.git/
-expecting success of 0022.1 'setup': 
-
-	cat "$TEST_DIRECTORY"/t0022-crlf-rename.sh >sample &&
-	git add sample &&
-
-	test_tick &&
-	git commit -m Initial &&
-
-	append_cr <"$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
-	git add elpmas &&
-	rm -f sample &&
-
-	test_tick &&
-	git commit -a -m Second
-
-
-[master (root-commit) d48b93e] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 34 insertions(+)
- create mode 100644 sample
-[master 42002cb] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 34 insertions(+), 34 deletions(-)
- rename sample => elpmas (94%)
-ok 1 - setup
-
-expecting success of 0022.2 'diff -M': 
-
-	git diff-tree -M -r --name-status HEAD^ HEAD >tmp &&
-	sed -e "s/R[0-9]*/RNUM/" tmp >actual &&
-	echo "RNUM	sample	elpmas" >expect &&
-	test_cmp expect actual
-
-
-ok 2 - diff -M
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0020-crlf.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0020-crlf/.git/
 expecting success of 0020.1 'setup': 
@@ -15449,6 +15517,79 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0022-crlf-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0022-crlf-rename/.git/
+expecting success of 0022.1 'setup': 
+
+	cat "$TEST_DIRECTORY"/t0022-crlf-rename.sh >sample &&
+	git add sample &&
+
+	test_tick &&
+	git commit -m Initial &&
+
+	append_cr <"$TEST_DIRECTORY"/t0022-crlf-rename.sh >elpmas &&
+	git add elpmas &&
+	rm -f sample &&
+
+	test_tick &&
+	git commit -a -m Second
+
+
+[master (root-commit) d48b93e] Initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 34 insertions(+)
+ create mode 100644 sample
+[master 42002cb] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 34 insertions(+), 34 deletions(-)
+ rename sample => elpmas (94%)
+ok 1 - setup
+
+expecting success of 0022.2 'diff -M': 
+
+	git diff-tree -M -r --name-status HEAD^ HEAD >tmp &&
+	sed -e "s/R[0-9]*/RNUM/" tmp >actual &&
+	echo "RNUM	sample	elpmas" >expect &&
+	test_cmp expect actual
+
+
+ok 2 - diff -M
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0023-crlf-am.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0023-crlf-am/.git/
+expecting success of 0023.1 'setup': 
+
+	git config core.autocrlf true &&
+	echo foo >bar &&
+	git add bar &&
+	test_tick &&
+	git commit -m initial
+
+
+warning: in the working copy of 'bar', LF will be replaced by CRLF the next time Git touches it
+[master (root-commit) 1adb513] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+ok 1 - setup
+
+expecting success of 0023.2 'am': 
+
+	git am -3 <patchfile &&
+	git diff-files --name-status --exit-code
+
+
+Applying: test1
+ok 2 - am
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0024-crlf-archive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0024-crlf-archive/.git/
 expecting success of 0024.1 'setup': 
@@ -15541,35 +15682,52 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0023-crlf-am.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0023-crlf-am/.git/
-expecting success of 0023.1 'setup': 
-
-	git config core.autocrlf true &&
-	echo foo >bar &&
-	git add bar &&
-	test_tick &&
+*** t0025-crlf-renormalize.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0025-crlf-renormalize/.git/
+expecting success of 0025.1 'setup': 
+	git config core.autocrlf false &&
+	printf "LINEONE\nLINETWO\nLINETHREE\n" >LF.txt &&
+	printf "LINEONE\r\nLINETWO\r\nLINETHREE\r\n" >CRLF.txt &&
+	printf "LINEONE\r\nLINETWO\nLINETHREE\n" >CRLF_mix_LF.txt &&
+	git add . &&
 	git commit -m initial
 
-
-warning: in the working copy of 'bar', LF will be replaced by CRLF the next time Git touches it
-[master (root-commit) 1adb513] initial
+[master (root-commit) 98c48e8] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
+ 3 files changed, 9 insertions(+)
+ create mode 100644 CRLF.txt
+ create mode 100644 CRLF_mix_LF.txt
+ create mode 100644 LF.txt
 ok 1 - setup
 
-expecting success of 0023.2 'am': 
+expecting success of 0025.2 'renormalize CRLF in repo': 
+	echo "*.txt text=auto" >.gitattributes &&
+	git add --renormalize "*.txt" &&
+	cat >expect <<-\EOF &&
+	i/lf w/crlf attr/text=auto CRLF.txt
+	i/lf w/lf attr/text=auto LF.txt
+	i/lf w/mixed attr/text=auto CRLF_mix_LF.txt
+	EOF
+	git ls-files --eol >tmp &&
+	sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+	sort >actual &&
+	test_cmp expect actual
 
-	git am -3 <patchfile &&
-	git diff-files --name-status --exit-code
+ok 2 - renormalize CRLF in repo
 
+expecting success of 0025.3 'ignore-errors not mistaken for renormalize': 
+	git reset --hard &&
+	echo "*.txt text=auto" >.gitattributes &&
+	git ls-files --eol >expect &&
+	git add --ignore-errors "*.txt" &&
+	git ls-files --eol >actual &&
+	test_cmp expect actual
 
-Applying: test1
-ok 2 - am
+HEAD is now at 98c48e8 initial
+ok 3 - ignore-errors not mistaken for renormalize
 
-# passed all 2 test(s)
-1..2
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0026-eol-config.sh ***
@@ -15664,509 +15822,1776 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0025-crlf-renormalize.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0025-crlf-renormalize/.git/
-expecting success of 0025.1 'setup': 
-	git config core.autocrlf false &&
-	printf "LINEONE\nLINETWO\nLINETHREE\n" >LF.txt &&
-	printf "LINEONE\r\nLINETWO\r\nLINETHREE\r\n" >CRLF.txt &&
-	printf "LINEONE\r\nLINETWO\nLINETHREE\n" >CRLF_mix_LF.txt &&
-	git add . &&
-	git commit -m initial
-
-[master (root-commit) 98c48e8] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 9 insertions(+)
- create mode 100644 CRLF.txt
- create mode 100644 CRLF_mix_LF.txt
- create mode 100644 LF.txt
-ok 1 - setup
+*** t0028-working-tree-encoding.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0028-working-tree-encoding/.git/
+expecting success of 0028.1 'setup test files': 
+	git config core.eol lf &&
 
-expecting success of 0025.2 'renormalize CRLF in repo': 
-	echo "*.txt text=auto" >.gitattributes &&
-	git add --renormalize "*.txt" &&
-	cat >expect <<-\EOF &&
-	i/lf w/crlf attr/text=auto CRLF.txt
-	i/lf w/lf attr/text=auto LF.txt
-	i/lf w/mixed attr/text=auto CRLF_mix_LF.txt
-	EOF
-	git ls-files --eol >tmp &&
-	sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-	sort >actual &&
-	test_cmp expect actual
+	text="hallo there!\ncan you read me?" &&
+	echo "*.utf16 text working-tree-encoding=utf-16" >.gitattributes &&
+	echo "*.utf16lebom text working-tree-encoding=UTF-16LE-BOM" >>.gitattributes &&
+	printf "$text" >test.utf8.raw &&
+	printf "$text" | write_utf16 >test.utf16.raw &&
+	printf "$text" | write_utf32 >test.utf32.raw &&
+	printf "\377\376"                         >test.utf16lebom.raw &&
+	printf "$text" | iconv -f UTF-8 -t UTF-16LE >>test.utf16lebom.raw &&
 
-ok 2 - renormalize CRLF in repo
+	# Line ending tests
+	printf "one\ntwo\nthree\n" >lf.utf8.raw &&
+	printf "one\r\ntwo\r\nthree\r\n" >crlf.utf8.raw &&
 
-expecting success of 0025.3 'ignore-errors not mistaken for renormalize': 
-	git reset --hard &&
-	echo "*.txt text=auto" >.gitattributes &&
-	git ls-files --eol >expect &&
-	git add --ignore-errors "*.txt" &&
-	git ls-files --eol >actual &&
-	test_cmp expect actual
+	# BOM tests
+	printf "\0a\0b\0c"                         >nobom.utf16be.raw &&
+	printf "a\0b\0c\0"                         >nobom.utf16le.raw &&
+	printf "\376\377\0a\0b\0c"                 >bebom.utf16be.raw &&
+	printf "\377\376a\0b\0c\0"                 >lebom.utf16le.raw &&
+	printf "\0\0\0a\0\0\0b\0\0\0c"             >nobom.utf32be.raw &&
+	printf "a\0\0\0b\0\0\0c\0\0\0"             >nobom.utf32le.raw &&
+	printf "\0\0\376\377\0\0\0a\0\0\0b\0\0\0c" >bebom.utf32be.raw &&
+	printf "\377\376\0\0a\0\0\0b\0\0\0c\0\0\0" >lebom.utf32le.raw &&
 
-HEAD is now at 98c48e8 initial
-ok 3 - ignore-errors not mistaken for renormalize
+	# Add only UTF-16 file, we will add the UTF-32 file later
+	cp test.utf16.raw test.utf16 &&
+	cp test.utf32.raw test.utf32 &&
+	cp test.utf16lebom.raw test.utf16lebom &&
+	git add .gitattributes test.utf16 test.utf16lebom &&
+	git commit -m initial
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0008-ignores.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0008-ignores/.git/
-expecting success of 0008.1 'setup': 
-	init_vars &&
-	mkdir -p a/b/ignored-dir a/submodule b &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s b a/symlink
-	fi &&
-	(
-		cd a/submodule &&
-		git init &&
-		echo a >a &&
-		git add a &&
-		git commit -m"commit in submodule"
-	) &&
-	git add a/submodule &&
-	cat <<-\EOF >.gitignore &&
-		one
-		ignored-*
-		top-level-dir/
-	EOF
-	for dir in . a
-	do
-		: >$dir/not-ignored &&
-		: >$dir/ignored-and-untracked &&
-		: >$dir/ignored-but-in-index || return 1
-	done &&
-	git add -f ignored-but-in-index a/ignored-but-in-index &&
-	cat <<-\EOF >a/.gitignore &&
-		two*
-		*three
-	EOF
-	cat <<-\EOF >a/b/.gitignore &&
-		four
-		five
-		# this comment should affect the line numbers
-		six
-		ignored-dir/
-		# and so should this blank line:
+checking prerequisite: NO_UTF16_BOM
 
-		!on*
-		!two
-	EOF
-	echo "seven" >a/b/ignored-dir/.gitignore &&
-	test -n "$HOME" &&
-	cat <<-\EOF >"$global_excludes" &&
-		globalone
-		!globaltwo
-		globalthree
-	EOF
-	mkdir .git/info &&
-	cat <<-\EOF >.git/info/exclude
-		per-repo
-	EOF
+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
 
-checking prerequisite: SYMLINKS
+)
+prerequisite NO_UTF16_BOM not satisfied
+checking prerequisite: NO_UTF32_BOM
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF32_BOM" &&
 (
-	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-NO_UTF32_BOM" &&
+	test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12
 
 )
-prerequisite SYMLINKS ok
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0008-ignores/a/submodule/.git/
-[master (root-commit) d93acdf] commit in submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-warning: adding embedded git repository: a/submodule
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> a/submodule
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached a/submodule
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-ok 1 - setup
-
-expecting success of 0008.2 '. corner-case': 
-		expect "$expect" &&
-		eval "$code"
-	
-ok 2 - . corner-case
+prerequisite NO_UTF32_BOM not satisfied
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
 
-expecting success of 0008.3 '. corner-case with -q': 
-			expect '' &&
-			
-	test_check_ignore . 1
+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 ?
 
-		
-ok 3 - . corner-case with -q
+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  
 
-expecting success of 0008.4 '. corner-case with --quiet': 
-			expect '' &&
-			
-	test_check_ignore . 1
+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 ?
 
-		
-ok 4 - . corner-case with --quiet
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
 
-expecting success of 0008.5 '. corner-case with -v': 
-				expect '' &&
-				
-	test_check_ignore . 1
+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 ?
 
-			
-ok 5 - . corner-case with -v
+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  
 
-expecting success of 0008.6 '. corner-case with -v -n': 
-				expect '::	.' &&
-				
-	test_check_ignore . 1
+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 ?
 
-			
-ok 6 - . corner-case with -v -n
+[main (root-commit) dfb2bb8] initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 6 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 test.utf16
+ create mode 100644 test.utf16lebom
+ok 1 - setup test files
 
-expecting success of 0008.7 '. corner-case with -v --non-matching': 
-				expect '::	.' &&
-				
-	test_check_ignore . 1
+expecting success of 0028.2 'ensure UTF-8 is stored in Git': 
+	test_when_finished "rm -f test.utf16.git" &&
 
-			
-ok 7 - . corner-case with -v --non-matching
+	git cat-file -p :test.utf16 >test.utf16.git &&
+	test_cmp_bin test.utf8.raw test.utf16.git
 
-expecting success of 0008.8 '. corner-case with --verbose': 
-				expect '' &&
-				
-	test_check_ignore . 1
+ok 2 - ensure UTF-8 is stored in Git
 
-			
-ok 8 - . corner-case with --verbose
+expecting success of 0028.3 're-encode to UTF-16 on checkout': 
+	test_when_finished "rm -f test.utf16.raw" &&
 
-expecting success of 0008.9 '. corner-case with --verbose -n': 
-				expect '::	.' &&
-				
-	test_check_ignore . 1
+	rm test.utf16 &&
+	git checkout test.utf16 &&
+	test_cmp_bin test.utf16.raw test.utf16
 
-			
-ok 9 - . corner-case with --verbose -n
+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  
 
-expecting success of 0008.10 '. corner-case with --verbose --non-matching': 
-				expect '::	.' &&
-				
-	test_check_ignore . 1
+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 ?
 
-			
-ok 10 - . corner-case with --verbose --non-matching
+ok 3 - re-encode to UTF-16 on checkout
 
-expecting success of 0008.11 'empty command line': 
-		expect "$expect" &&
-		eval "$code"
-	
-fatal: no path specified
-ok 11 - empty command line
+expecting success of 0028.4 're-encode to UTF-16-LE-BOM on checkout': 
+	rm test.utf16lebom &&
+	git checkout test.utf16lebom &&
+	test_cmp_bin test.utf16lebom.raw test.utf16lebom
 
-expecting success of 0008.12 'empty command line with -q': 
-			expect '' &&
-			
-	test_check_ignore "" 128 &&
-	stderr_contains "fatal: no path specified"
+Updated 1 path from the index
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
 
-		
-fatal: no path specified
-ok 12 - empty command line with -q
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
-expecting success of 0008.13 'empty command line with --quiet': 
-			expect '' &&
-			
-	test_check_ignore "" 128 &&
-	stderr_contains "fatal: no path specified"
+ok 4 - re-encode to UTF-16-LE-BOM on checkout
 
-		
-fatal: no path specified
-ok 13 - empty command line with --quiet
+expecting success of 0028.5 'check $GIT_DIR/info/attributes support': 
+	test_when_finished "rm -f test.utf32.git" &&
+	test_when_finished "git reset --hard HEAD" &&
 
-expecting success of 0008.14 'empty command line with -v': 
-				expect '' &&
-				
-	test_check_ignore "" 128 &&
-	stderr_contains "fatal: no path specified"
+	mkdir .git/info &&
+	echo "*.utf32 text working-tree-encoding=utf-32" >.git/info/attributes &&
+	git add test.utf32 &&
 
-			
-fatal: no path specified
-ok 14 - empty command line with -v
+	git cat-file -p :test.utf32 >test.utf32.git &&
+	test_cmp_bin test.utf8.raw test.utf32.git
 
-expecting success of 0008.15 'empty command line with -v -n': 
-				expect '' &&
-				
-	test_check_ignore "" 128 &&
-	stderr_contains "fatal: no path specified"
+source (test.utf32, considered utf-32):
+|  0: ff   |  1: fe   |  2:  0   |  3:  0   |  4: 68 h |  5:  0   |  6:  0   |  7:  0  
+|  8: 61 a |  9:  0   | 10:  0   | 11:  0   | 12: 6c l | 13:  0   | 14:  0   | 15:  0  
+| 16: 6c l | 17:  0   | 18:  0   | 19:  0   | 20: 6f o | 21:  0   | 22:  0   | 23:  0  
+| 24: 20   | 25:  0   | 26:  0   | 27:  0   | 28: 74 t | 29:  0   | 30:  0   | 31:  0  
+| 32: 68 h | 33:  0   | 34:  0   | 35:  0   | 36: 65 e | 37:  0   | 38:  0   | 39:  0  
+| 40: 72 r | 41:  0   | 42:  0   | 43:  0   | 44: 65 e | 45:  0   | 46:  0   | 47:  0  
+| 48: 21 ! | 49:  0   | 50:  0   | 51:  0   | 52:  a   | 53:  0   | 54:  0   | 55:  0  
+| 56: 63 c | 57:  0   | 58:  0   | 59:  0   | 60: 61 a | 61:  0   | 62:  0   | 63:  0  
+| 64: 6e n | 65:  0   | 66:  0   | 67:  0   | 68: 20   | 69:  0   | 70:  0   | 71:  0  
+| 72: 79 y | 73:  0   | 74:  0   | 75:  0   | 76: 6f o | 77:  0   | 78:  0   | 79:  0  
+| 80: 75 u | 81:  0   | 82:  0   | 83:  0   | 84: 20   | 85:  0   | 86:  0   | 87:  0  
+| 88: 72 r | 89:  0   | 90:  0   | 91:  0   | 92: 65 e | 93:  0   | 94:  0   | 95:  0  
+| 96: 61 a | 97:  0   | 98:  0   | 99:  0   | 100: 64 d | 101:  0   | 102:  0   | 103:  0  
+| 104: 20   | 105:  0   | 106:  0   | 107:  0   | 108: 6d m | 109:  0   | 110:  0   | 111:  0  
+| 112: 65 e | 113:  0   | 114:  0   | 115:  0   | 116: 3f ? | 117:  0   | 118:  0   | 119:  0  
 
-			
-fatal: no path specified
-ok 15 - empty command line with -v -n
+destination (test.utf32, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
-expecting success of 0008.16 'empty command line with -v --non-matching': 
-				expect '' &&
-				
-	test_check_ignore "" 128 &&
-	stderr_contains "fatal: no path specified"
+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  
 
-			
-fatal: no path specified
-ok 16 - empty command line with -v --non-matching
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
-expecting success of 0008.17 'empty command line with --verbose': 
-				expect '' &&
-				
-	test_check_ignore "" 128 &&
-	stderr_contains "fatal: no path specified"
+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  
 
-			
-fatal: no path specified
-ok 17 - empty command line with --verbose
+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 ?
 
-expecting success of 0008.18 'empty command line with --verbose -n': 
-				expect '' &&
-				
-	test_check_ignore "" 128 &&
-	stderr_contains "fatal: no path specified"
+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  
 
-			
-fatal: no path specified
-ok 18 - empty command line with --verbose -n
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
-expecting success of 0008.19 'empty command line with --verbose --non-matching': 
-				expect '' &&
-				
-	test_check_ignore "" 128 &&
-	stderr_contains "fatal: no path specified"
+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  
 
-			
-fatal: no path specified
-ok 19 - empty command line with --verbose --non-matching
+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 ?
 
-expecting success of 0008.20 '--stdin with empty STDIN': 
-		expect "$expect" &&
-		eval "$code"
-	
-ok 20 - --stdin with empty STDIN
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
 
-expecting success of 0008.21 '--stdin with empty STDIN with -q': 
-			expect '' &&
-			
-	test_check_ignore "--stdin" 1 </dev/null &&
-	test_stderr ""
+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 ?
 
-		
-ok 21 - --stdin with empty STDIN with -q
+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  
 
-expecting success of 0008.22 '--stdin with empty STDIN with --quiet': 
-			expect '' &&
-			
-	test_check_ignore "--stdin" 1 </dev/null &&
-	test_stderr ""
+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 ?
 
-		
-ok 22 - --stdin with empty STDIN with --quiet
+HEAD is now at dfb2bb8 initial
+ok 5 - check $GIT_DIR/info/attributes support
 
-expecting success of 0008.23 '--stdin with empty STDIN with -v': 
-				expect '' &&
-				
-	test_check_ignore "--stdin" 1 </dev/null &&
-	test_stderr ""
+expecting success of 0028.6 'check prohibited UTF-16 BOM': 
+		test_when_finished "git reset --hard HEAD" &&
 
-			
-ok 23 - --stdin with empty STDIN with -v
+		echo "*.utf${i}be text working-tree-encoding=utf-${i}be" >>.gitattributes &&
+		echo "*.utf${i}le text working-tree-encoding=utf-${i}LE" >>.gitattributes &&
 
-expecting success of 0008.24 '--stdin with empty STDIN with -v -n': 
-				expect '' &&
-				
-	test_check_ignore "--stdin" 1 </dev/null &&
-	test_stderr ""
+		# Here we add a UTF-16 (resp. UTF-32) files with BOM (big/little-endian)
+		# but we tell Git to treat it as UTF-16BE/UTF-16LE (resp. UTF-32).
+		# In these cases the BOM is prohibited.
+		cp bebom.utf${i}be.raw bebom.utf${i}be &&
+		test_must_fail git add bebom.utf${i}be 2>err.out &&
+		test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
+		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
 
-			
-ok 24 - --stdin with empty STDIN with -v -n
+		cp lebom.utf${i}le.raw lebom.utf${i}be &&
+		test_must_fail git add lebom.utf${i}be 2>err.out &&
+		test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
+		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
 
-expecting success of 0008.25 '--stdin with empty STDIN with -v --non-matching': 
-				expect '' &&
-				
-	test_check_ignore "--stdin" 1 </dev/null &&
-	test_stderr ""
+		cp bebom.utf${i}be.raw bebom.utf${i}le &&
+		test_must_fail git add bebom.utf${i}le 2>err.out &&
+		test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
+		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
 
-			
-ok 25 - --stdin with empty STDIN with -v --non-matching
+		cp lebom.utf${i}le.raw lebom.utf${i}le &&
+		test_must_fail git add lebom.utf${i}le 2>err.out &&
+		test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
+		test_grep "use UTF-${i} as working-tree-encoding" err.out
+	
+fatal: BOM is prohibited in 'bebom.utf16be' if encoded as utf-16be
+hint: The file 'bebom.utf16be' contains a byte order mark (BOM). Please use UTF-16 as working-tree-encoding.
+fatal: BOM is prohibited in 'lebom.utf16be' if encoded as utf-16be
+hint: The file 'lebom.utf16be' contains a byte order mark (BOM). Please use UTF-16 as working-tree-encoding.
+fatal: BOM is prohibited in 'bebom.utf16le' if encoded as utf-16LE
+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  
 
-expecting success of 0008.26 '--stdin with empty STDIN with --verbose': 
-				expect '' &&
-				
-	test_check_ignore "--stdin" 1 </dev/null &&
-	test_stderr ""
+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 ?
 
-			
-ok 26 - --stdin with empty STDIN with --verbose
+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  
 
-expecting success of 0008.27 '--stdin with empty STDIN with --verbose -n': 
-				expect '' &&
-				
-	test_check_ignore "--stdin" 1 </dev/null &&
-	test_stderr ""
+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 ?
 
-			
-ok 27 - --stdin with empty STDIN with --verbose -n
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
 
-expecting success of 0008.28 '--stdin with empty STDIN with --verbose --non-matching': 
-				expect '' &&
-				
-	test_check_ignore "--stdin" 1 </dev/null &&
-	test_stderr ""
+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 ?
 
-			
-ok 28 - --stdin with empty STDIN with --verbose --non-matching
+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  
 
-expecting success of 0008.29 '-q with multiple args': 
-	expect "" &&
-	test_check_ignore "-q one two" 128 &&
-	stderr_contains "fatal: --quiet is only valid with a single pathname"
+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 ?
 
-fatal: --quiet is only valid with a single pathname
-ok 29 - -q with multiple args
+HEAD is now at dfb2bb8 initial
+ok 6 - check prohibited UTF-16 BOM
 
-expecting success of 0008.30 '--quiet with multiple args': 
-	expect "" &&
-	test_check_ignore "--quiet one two" 128 &&
-	stderr_contains "fatal: --quiet is only valid with a single pathname"
+expecting success of 0028.7 'check required UTF-16 BOM': 
+		test_when_finished "git reset --hard HEAD" &&
 
-fatal: --quiet is only valid with a single pathname
-ok 30 - --quiet with multiple args
+		echo "*.utf${i} text working-tree-encoding=utf-${i}" >>.gitattributes &&
 
-expecting success of 0008.31 '-q -v': 
-			expect '' &&
-			test_check_ignore '-q -v foo' 128 &&
-			stderr_contains 'fatal: cannot have both --quiet and --verbose'
-		
-fatal: cannot have both --quiet and --verbose
-ok 31 - -q -v
+		cp nobom.utf${i}be.raw nobom.utf${i} &&
+		test_must_fail git add nobom.utf${i} 2>err.out &&
+		test_grep "fatal: BOM is required .* utf-${i}" err.out &&
+		test_grep "use UTF-${i}BE or UTF-${i}LE" err.out &&
 
-expecting success of 0008.32 '--quiet -v': 
-			expect '' &&
-			test_check_ignore '--quiet -v foo' 128 &&
-			stderr_contains 'fatal: cannot have both --quiet and --verbose'
-		
-fatal: cannot have both --quiet and --verbose
-ok 32 - --quiet -v
+		cp nobom.utf${i}le.raw nobom.utf${i} &&
+		test_must_fail git add nobom.utf${i} 2>err.out &&
+		test_grep "fatal: BOM is required .* utf-${i}" err.out &&
+		test_grep "use UTF-${i}BE or UTF-${i}LE" err.out
+	
+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.
+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  
 
-expecting success of 0008.33 '-q --verbose': 
-			expect '' &&
-			test_check_ignore '-q --verbose foo' 128 &&
-			stderr_contains 'fatal: cannot have both --quiet and --verbose'
-		
-fatal: cannot have both --quiet and --verbose
-ok 33 - -q --verbose
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
-expecting success of 0008.34 '--quiet --verbose': 
-			expect '' &&
-			test_check_ignore '--quiet --verbose foo' 128 &&
-			stderr_contains 'fatal: cannot have both --quiet and --verbose'
-		
-fatal: cannot have both --quiet and --verbose
-ok 34 - --quiet --verbose
+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  
 
-expecting success of 0008.35 '--quiet with multiple args': 
-	expect "" &&
-	test_check_ignore "--quiet one two" 128 &&
-	stderr_contains "fatal: --quiet is only valid with a single pathname"
+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 ?
 
-fatal: --quiet is only valid with a single pathname
-ok 35 - --quiet with multiple args
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
 
-expecting success of 0008.36 'erroneous use of --': 
-		expect "$expect" &&
-		eval "$code"
-	
-fatal: no path specified
-ok 36 - erroneous use of --
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
 
-expecting success of 0008.37 'erroneous use of -- with -q': 
-			expect '' &&
-			
-	test_check_ignore "--" 128 &&
-	stderr_contains "fatal: no path specified"
+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  
 
-		
-fatal: no path specified
-ok 37 - erroneous use of -- with -q
+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 ?
 
-expecting success of 0008.38 'erroneous use of -- with --quiet': 
-			expect '' &&
-			
-	test_check_ignore "--" 128 &&
-	stderr_contains "fatal: no path specified"
+HEAD is now at dfb2bb8 initial
+ok 7 - check required UTF-16 BOM
 
-		
-fatal: no path specified
-ok 38 - erroneous use of -- with --quiet
+expecting success of 0028.8 'eol conversion for UTF-16 encoded files on checkout': 
+		test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" &&
+		test_when_finished "git reset --hard HEAD^" &&
 
-expecting success of 0008.39 'erroneous use of -- with -v': 
-				expect '' &&
-				
-	test_check_ignore "--" 128 &&
-	stderr_contains "fatal: no path specified"
+		write_utf${i} <lf.utf8.raw >lf.utf${i}.raw &&
+		write_utf${i} <crlf.utf8.raw >crlf.utf${i}.raw &&
+		cp crlf.utf${i}.raw eol.utf${i} &&
 
-			
-fatal: no path specified
-ok 39 - erroneous use of -- with -v
+		cat >expectIndexLF <<-EOF &&
+			i/lf    w/-text attr/text             	eol.utf${i}
+		EOF
 
-expecting success of 0008.40 'erroneous use of -- with -v -n': 
-				expect '' &&
-				
-	test_check_ignore "--" 128 &&
-	stderr_contains "fatal: no path specified"
+		git add eol.utf${i} &&
+		git commit -m eol &&
 
-			
-fatal: no path specified
-ok 40 - erroneous use of -- with -v -n
+		# UTF-${i} with CRLF (Windows line endings)
+		rm eol.utf${i} &&
+		git -c core.eol=crlf checkout eol.utf${i} &&
+		test_cmp_bin crlf.utf${i}.raw eol.utf${i} &&
 
-expecting success of 0008.41 'erroneous use of -- with -v --non-matching': 
-				expect '' &&
-				
-	test_check_ignore "--" 128 &&
-	stderr_contains "fatal: no path specified"
+		# Although the file has CRLF in the working tree,
+		# ensure LF in the index
+		git ls-files --eol eol.utf${i} >actual &&
+		test_cmp expectIndexLF actual &&
 
-			
-fatal: no path specified
-ok 41 - erroneous use of -- with -v --non-matching
+		# UTF-${i} with LF (Unix line endings)
+		rm eol.utf${i} &&
+		git -c core.eol=lf checkout eol.utf${i} &&
+		test_cmp_bin lf.utf${i}.raw eol.utf${i} &&
 
-expecting success of 0008.42 'erroneous use of -- with --verbose': 
-				expect '' &&
-				
-	test_check_ignore "--" 128 &&
-	stderr_contains "fatal: no path specified"
+		# The file LF in the working tree, ensure LF in the index
+		git ls-files --eol eol.utf${i} >actual &&
+		test_cmp expectIndexLF actual
+	
+checking prerequisite: NO_UTF16_BOM
 
-			
-fatal: no path specified
-ok 42 - erroneous use of -- with --verbose
+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 0008.43 'erroneous use of -- with --verbose -n': 
-				expect '' &&
-				
-	test_check_ignore "--" 128 &&
-	stderr_contains "fatal: no path specified"
+)
+prerequisite NO_UTF16_BOM not satisfied
+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  
 
-			
-fatal: no path specified
-ok 43 - erroneous use of -- with --verbose -n
+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  
+
+warning: in the working copy of 'eol.utf16', CRLF will be replaced by LF the next time Git touches it
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16lebom, considered UTF-16LE-BOM):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16lebom, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (eol.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 6f o |  3:  0   |  4: 6e n |  5:  0   |  6: 65 e |  7:  0  
+|  8:  d   |  9:  0   | 10:  a   | 11:  0   | 12: 74 t | 13:  0   | 14: 77 w | 15:  0  
+| 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.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16lebom, considered UTF-16LE-BOM):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16lebom, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+[main 85a4f33] eol
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 eol.utf16
+Updated 1 path from the index
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16lebom, considered UTF-16LE-BOM):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16lebom, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+Updated 1 path from the index
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16lebom, considered UTF-16LE-BOM):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16lebom, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16lebom, considered UTF-16LE-BOM):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16lebom, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16lebom, considered UTF-16LE-BOM):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16lebom, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+HEAD is now at dfb2bb8 initial
+ok 8 - eol conversion for UTF-16 encoded files on checkout
+
+expecting success of 0028.9 'check prohibited UTF-32 BOM': 
+		test_when_finished "git reset --hard HEAD" &&
+
+		echo "*.utf${i}be text working-tree-encoding=utf-${i}be" >>.gitattributes &&
+		echo "*.utf${i}le text working-tree-encoding=utf-${i}LE" >>.gitattributes &&
+
+		# Here we add a UTF-16 (resp. UTF-32) files with BOM (big/little-endian)
+		# but we tell Git to treat it as UTF-16BE/UTF-16LE (resp. UTF-32).
+		# In these cases the BOM is prohibited.
+		cp bebom.utf${i}be.raw bebom.utf${i}be &&
+		test_must_fail git add bebom.utf${i}be 2>err.out &&
+		test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
+		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
+
+		cp lebom.utf${i}le.raw lebom.utf${i}be &&
+		test_must_fail git add lebom.utf${i}be 2>err.out &&
+		test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
+		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
+
+		cp bebom.utf${i}be.raw bebom.utf${i}le &&
+		test_must_fail git add bebom.utf${i}le 2>err.out &&
+		test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
+		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
+
+		cp lebom.utf${i}le.raw lebom.utf${i}le &&
+		test_must_fail git add lebom.utf${i}le 2>err.out &&
+		test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
+		test_grep "use UTF-${i} as working-tree-encoding" err.out
+	
+fatal: BOM is prohibited in 'bebom.utf32be' if encoded as utf-32be
+hint: The file 'bebom.utf32be' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
+fatal: BOM is prohibited in 'lebom.utf32be' if encoded as utf-32be
+hint: The file 'lebom.utf32be' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
+fatal: BOM is prohibited in 'bebom.utf32le' if encoded as utf-32LE
+hint: The file 'bebom.utf32le' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
+fatal: BOM is prohibited in 'lebom.utf32le' if encoded as utf-32LE
+hint: The file 'lebom.utf32le' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16lebom, considered UTF-16LE-BOM):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16lebom, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16, considered utf-16):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+source (test.utf16lebom, considered UTF-16LE-BOM):
+|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
+|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
+| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
+| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
+| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
+| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
+| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
+| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+
+destination (test.utf16lebom, considered UTF-8):
+|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
+|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
+| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
+| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+
+HEAD is now at dfb2bb8 initial
+ok 9 - check prohibited UTF-32 BOM
+
+expecting success of 0028.10 'check required UTF-32 BOM': 
+		test_when_finished "git reset --hard HEAD" &&
+
+		echo "*.utf${i} text working-tree-encoding=utf-${i}" >>.gitattributes &&
+
+		cp nobom.utf${i}be.raw nobom.utf${i} &&
+		test_must_fail git add nobom.utf${i} 2>err.out &&
+		test_grep "fatal: BOM is required .* utf-${i}" err.out &&
+		test_grep "use UTF-${i}BE or UTF-${i}LE" err.out &&
+
+		cp nobom.utf${i}le.raw nobom.utf${i} &&
+		test_must_fail git add nobom.utf${i} 2>err.out &&
+		test_grep "fatal: BOM is required .* utf-${i}" err.out &&
+		test_grep "use UTF-${i}BE or UTF-${i}LE" err.out
+	
+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.
+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.
+HEAD is now at dfb2bb8 initial
+ok 10 - check required UTF-32 BOM
+
+expecting success of 0028.11 'eol conversion for UTF-32 encoded files on checkout': 
+		test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" &&
+		test_when_finished "git reset --hard HEAD^" &&
+
+		write_utf${i} <lf.utf8.raw >lf.utf${i}.raw &&
+		write_utf${i} <crlf.utf8.raw >crlf.utf${i}.raw &&
+		cp crlf.utf${i}.raw eol.utf${i} &&
+
+		cat >expectIndexLF <<-EOF &&
+			i/lf    w/-text attr/text             	eol.utf${i}
+		EOF
+
+		git add eol.utf${i} &&
+		git commit -m eol &&
+
+		# UTF-${i} with CRLF (Windows line endings)
+		rm eol.utf${i} &&
+		git -c core.eol=crlf checkout eol.utf${i} &&
+		test_cmp_bin crlf.utf${i}.raw eol.utf${i} &&
+
+		# Although the file has CRLF in the working tree,
+		# ensure LF in the index
+		git ls-files --eol eol.utf${i} >actual &&
+		test_cmp expectIndexLF actual &&
+
+		# UTF-${i} with LF (Unix line endings)
+		rm eol.utf${i} &&
+		git -c core.eol=lf checkout eol.utf${i} &&
+		test_cmp_bin lf.utf${i}.raw eol.utf${i} &&
+
+		# The file LF in the working tree, ensure LF in the index
+		git ls-files --eol eol.utf${i} >actual &&
+		test_cmp expectIndexLF actual
+	
+checking prerequisite: NO_UTF32_BOM
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF32_BOM" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF32_BOM" &&
+	test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12
+
+)
+prerequisite NO_UTF32_BOM not satisfied
+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  
+
+warning: in the working copy of 'eol.utf32', CRLF will be replaced by LF the next time Git touches it
+source (eol.utf32, considered utf-32):
+|  0: ff   |  1: fe   |  2:  0   |  3:  0   |  4: 6f o |  5:  0   |  6:  0   |  7:  0  
+|  8: 6e n |  9:  0   | 10:  0   | 11:  0   | 12: 65 e | 13:  0   | 14:  0   | 15:  0  
+| 16:  d   | 17:  0   | 18:  0   | 19:  0   | 20:  a   | 21:  0   | 22:  0   | 23:  0  
+| 24: 74 t | 25:  0   | 26:  0   | 27:  0   | 28: 77 w | 29:  0   | 30:  0   | 31:  0  
+| 32: 6f o | 33:  0   | 34:  0   | 35:  0   | 36:  d   | 37:  0   | 38:  0   | 39:  0  
+| 40:  a   | 41:  0   | 42:  0   | 43:  0   | 44: 74 t | 45:  0   | 46:  0   | 47:  0  
+| 48: 68 h | 49:  0   | 50:  0   | 51:  0   | 52: 72 r | 53:  0   | 54:  0   | 55:  0  
+| 56: 65 e | 57:  0   | 58:  0   | 59:  0   | 60: 65 e | 61:  0   | 62:  0   | 63:  0  
+| 64:  d   | 65:  0   | 66:  0   | 67:  0   | 68:  a   | 69:  0   | 70:  0   | 71:  0  
+
+destination (eol.utf32, considered UTF-8):
+|  0: 6f o |  1: 6e n |  2: 65 e |  3:  d   |  4:  a   |  5: 74 t |  6: 77 w |  7: 6f o
+|  8:  d   |  9:  a   | 10: 74 t | 11: 68 h | 12: 72 r | 13: 65 e | 14: 65 e | 15:  d  
+| 16:  a  
+
+[main 674dc3f] eol
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 eol.utf32
+Updated 1 path from the index
+Updated 1 path from the index
+HEAD is now at dfb2bb8 initial
+ok 11 - eol conversion for UTF-32 encoded files on checkout
+
+expecting success of 0028.12 'check unsupported encodings': 
+	test_when_finished "git reset --hard HEAD" &&
+
+	echo "*.set text working-tree-encoding" >.gitattributes &&
+	printf "set" >t.set &&
+	test_must_fail git add t.set 2>err.out &&
+	test_grep "true/false are no valid working-tree-encodings" err.out &&
+
+	echo "*.unset text -working-tree-encoding" >.gitattributes &&
+	printf "unset" >t.unset &&
+	git add t.unset &&
+
+	echo "*.empty text working-tree-encoding=" >.gitattributes &&
+	printf "empty" >t.empty &&
+	git add t.empty &&
+
+	echo "*.garbage text working-tree-encoding=garbage" >.gitattributes &&
+	printf "garbage" >t.garbage &&
+	test_must_fail git add t.garbage 2>err.out &&
+	test_grep "failed to encode" err.out
+
+fatal: true/false are no valid working-tree-encodings
+fatal: failed to encode 't.garbage' from garbage to UTF-8
+HEAD is now at dfb2bb8 initial
+ok 12 - check unsupported encodings
+
+expecting success of 0028.13 'error if encoding round trip is not the same during refresh': 
+	BEFORE_STATE=$(git rev-parse HEAD) &&
+	test_when_finished "git reset --hard $BEFORE_STATE" &&
+
+	# Add and commit a UTF-16 file but skip the "working-tree-encoding"
+	# filter. Consequently, the in-repo representation is UTF-16 and not
+	# UTF-8. This simulates a Git version that has no working tree encoding
+	# support.
+	echo "*.utf16le text working-tree-encoding=utf-16le" >.gitattributes &&
+	echo "hallo" >nonsense.utf16le &&
+	TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16le) &&
+	git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16le &&
+	COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
+	git update-ref refs/heads/main $COMMIT &&
+
+	test_must_fail git checkout HEAD^ 2>err.out &&
+	test_grep "error: .* overwritten by checkout:" err.out
+
+error: Your local changes to the following files would be overwritten by checkout:
+HEAD is now at dfb2bb8 initial
+ok 13 - error if encoding round trip is not the same during refresh
+
+expecting success of 0028.14 'error if encoding garbage is already in Git': 
+	BEFORE_STATE=$(git rev-parse HEAD) &&
+	test_when_finished "git reset --hard $BEFORE_STATE" &&
+
+	# Skip the UTF-16 filter for the added file
+	# This simulates a Git version that has no checkoutEncoding support
+	cp nobom.utf16be.raw nonsense.utf16 &&
+	TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16) &&
+	git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16 &&
+	COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
+	git update-ref refs/heads/main $COMMIT &&
+
+	git diff 2>err.out &&
+	test_grep "error: BOM is required" err.out
+
+error: BOM is required in 'nonsense.utf16' if encoded as utf-16
+error: BOM is required in 'nonsense.utf16' if encoded as utf-16
+HEAD is now at dfb2bb8 initial
+ok 14 - error if encoding garbage is already in Git
+
+checking prerequisite: ICONV_SHIFT_JIS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ICONV_SHIFT_JIS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-ICONV_SHIFT_JIS" &&
+	iconv -f UTF-8 -t SHIFT-JIS </dev/null
+
+)
+prerequisite ICONV_SHIFT_JIS ok
+expecting success of 0028.15 'check roundtrip encoding': 
+	test_when_finished "rm -f roundtrip.shift roundtrip.utf16" &&
+	test_when_finished "git reset --hard HEAD" &&
+
+	text="hallo there!\nroundtrip test here!" &&
+	printf "$text" | iconv -f UTF-8 -t SHIFT-JIS >roundtrip.shift &&
+	printf "$text" | write_utf16 >roundtrip.utf16 &&
+	echo "*.shift text working-tree-encoding=SHIFT-JIS" >>.gitattributes &&
+
+	# SHIFT-JIS encoded files are round-trip checked by default...
+	GIT_TRACE=1 git add .gitattributes roundtrip.shift 2>&1 |
+		grep "Checking roundtrip encoding for SHIFT-JIS" &&
+	git reset &&
+
+	# ... unless we overwrite the Git config!
+	! GIT_TRACE=1 git -c core.checkRoundtripEncoding=garbage \
+		add .gitattributes roundtrip.shift 2>&1 |
+		grep "Checking roundtrip encoding for SHIFT-JIS" &&
+	git reset &&
+
+	# UTF-16 encoded files should not be round-trip checked by default...
+	! GIT_TRACE=1 git add roundtrip.utf16 2>&1 |
+		grep "Checking roundtrip encoding for UTF-16" &&
+	git reset &&
+
+	# ... unless we tell Git to check it!
+	GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-16, UTF-32" \
+		add roundtrip.utf16 2>&1 |
+		grep "Checking roundtrip encoding for utf-16" &&
+	git reset &&
+
+	# ... unless we tell Git to check it!
+	# (here we also check that the casing of the encoding is irrelevant)
+	GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-32, utf-16" \
+		add roundtrip.utf16 2>&1 |
+		grep "Checking roundtrip encoding for utf-16" &&
+	git reset
+
+Checking roundtrip encoding for SHIFT-JIS...
+Unstaged changes after reset:
+M	.gitattributes
+Unstaged changes after reset:
+M	.gitattributes
+Unstaged changes after reset:
+M	.gitattributes
+Checking roundtrip encoding for utf-16...
+Unstaged changes after reset:
+M	.gitattributes
+Checking roundtrip encoding for utf-16...
+Unstaged changes after reset:
+M	.gitattributes
+HEAD is now at dfb2bb8 initial
+ok 15 - check roundtrip encoding
+
+expecting success of 0028.16 'Commit UTF-8, checkout UTF-8': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	
+[main 7887505] Test data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.commit_utf8_checkout_UTF-8
+ok 16 - Commit UTF-8, checkout UTF-8
+
+expecting success of 0028.17 'Commit UTF-8, checkout UTF-16LE': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	
+[main dd0bb11] Test data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.commit_utf8_checkout_UTF-16LE
+ok 17 - Commit UTF-8, checkout UTF-16LE
+
+expecting success of 0028.18 'Commit UTF-8, checkout UTF-16BE': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	
+[main ccf08f2] Test data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.commit_utf8_checkout_UTF-16BE
+ok 18 - Commit UTF-8, checkout UTF-16BE
+
+expecting success of 0028.19 'Commit UTF-8, checkout UTF-16LE-BOM': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	
+[main bb82fa0] Test data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.commit_utf8_checkout_UTF-16LE-BOM
+ok 19 - Commit UTF-8, checkout UTF-16LE-BOM
+
+expecting success of 0028.20 'Commit UTF-8, checkout UTF-16BE-BOM': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	
+[main 434b0e2] Test data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.commit_utf8_checkout_UTF-16BE-BOM
+ok 20 - Commit UTF-8, checkout UTF-16BE-BOM
+
+expecting success of 0028.21 'Commit UTF-8, checkout UTF-32LE': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	
+[main 4ebb4c9] Test data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.commit_utf8_checkout_UTF-32LE
+ok 21 - Commit UTF-8, checkout UTF-32LE
+
+expecting success of 0028.22 'Commit UTF-8, checkout UTF-32BE': 
+		test_when_finished "git checkout HEAD -- .gitattributes" &&
+
+		test_ext="commit_utf8_checkout_$encoding" &&
+		test_file="test.$test_ext" &&
+
+		# Commit as UTF-8
+		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
+		printf "$orig_string" >$test_file &&
+		git add $test_file &&
+		git commit -m "Test data" &&
+
+		# Checkout in tested encoding
+		rm $test_file &&
+		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
+		git checkout HEAD -- $test_file &&
+
+		# Test
+		printf $expect_bytes >$test_file.raw &&
+		test_cmp_bin $test_file.raw $test_file
+	
+[main bfde51e] Test data
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test.commit_utf8_checkout_UTF-32BE
+ok 22 - Commit UTF-8, checkout UTF-32BE
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0029-core-unsetenvvars.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0029-core-unsetenvvars/.git/
+1..0 # SKIP skipping Windows-specific tests
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0008-ignores.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0008-ignores/.git/
+expecting success of 0008.1 'setup': 
+	init_vars &&
+	mkdir -p a/b/ignored-dir a/submodule b &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s b a/symlink
+	fi &&
+	(
+		cd a/submodule &&
+		git init &&
+		echo a >a &&
+		git add a &&
+		git commit -m"commit in submodule"
+	) &&
+	git add a/submodule &&
+	cat <<-\EOF >.gitignore &&
+		one
+		ignored-*
+		top-level-dir/
+	EOF
+	for dir in . a
+	do
+		: >$dir/not-ignored &&
+		: >$dir/ignored-and-untracked &&
+		: >$dir/ignored-but-in-index || return 1
+	done &&
+	git add -f ignored-but-in-index a/ignored-but-in-index &&
+	cat <<-\EOF >a/.gitignore &&
+		two*
+		*three
+	EOF
+	cat <<-\EOF >a/b/.gitignore &&
+		four
+		five
+		# this comment should affect the line numbers
+		six
+		ignored-dir/
+		# and so should this blank line:
+
+		!on*
+		!two
+	EOF
+	echo "seven" >a/b/ignored-dir/.gitignore &&
+	test -n "$HOME" &&
+	cat <<-\EOF >"$global_excludes" &&
+		globalone
+		!globaltwo
+		globalthree
+	EOF
+	mkdir .git/info &&
+	cat <<-\EOF >.git/info/exclude
+		per-repo
+	EOF
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0008-ignores/a/submodule/.git/
+[master (root-commit) d93acdf] commit in submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+warning: adding embedded git repository: a/submodule
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> a/submodule
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached a/submodule
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+ok 1 - setup
+
+expecting success of 0008.2 '. corner-case': 
+		expect "$expect" &&
+		eval "$code"
+	
+ok 2 - . corner-case
+
+expecting success of 0008.3 '. corner-case with -q': 
+			expect '' &&
+			
+	test_check_ignore . 1
+
+		
+ok 3 - . corner-case with -q
+
+expecting success of 0008.4 '. corner-case with --quiet': 
+			expect '' &&
+			
+	test_check_ignore . 1
+
+		
+ok 4 - . corner-case with --quiet
+
+expecting success of 0008.5 '. corner-case with -v': 
+				expect '' &&
+				
+	test_check_ignore . 1
+
+			
+ok 5 - . corner-case with -v
+
+expecting success of 0008.6 '. corner-case with -v -n': 
+				expect '::	.' &&
+				
+	test_check_ignore . 1
+
+			
+ok 6 - . corner-case with -v -n
+
+expecting success of 0008.7 '. corner-case with -v --non-matching': 
+				expect '::	.' &&
+				
+	test_check_ignore . 1
+
+			
+ok 7 - . corner-case with -v --non-matching
+
+expecting success of 0008.8 '. corner-case with --verbose': 
+				expect '' &&
+				
+	test_check_ignore . 1
+
+			
+ok 8 - . corner-case with --verbose
+
+expecting success of 0008.9 '. corner-case with --verbose -n': 
+				expect '::	.' &&
+				
+	test_check_ignore . 1
+
+			
+ok 9 - . corner-case with --verbose -n
+
+expecting success of 0008.10 '. corner-case with --verbose --non-matching': 
+				expect '::	.' &&
+				
+	test_check_ignore . 1
+
+			
+ok 10 - . corner-case with --verbose --non-matching
+
+expecting success of 0008.11 'empty command line': 
+		expect "$expect" &&
+		eval "$code"
+	
+fatal: no path specified
+ok 11 - empty command line
+
+expecting success of 0008.12 'empty command line with -q': 
+			expect '' &&
+			
+	test_check_ignore "" 128 &&
+	stderr_contains "fatal: no path specified"
+
+		
+fatal: no path specified
+ok 12 - empty command line with -q
+
+expecting success of 0008.13 'empty command line with --quiet': 
+			expect '' &&
+			
+	test_check_ignore "" 128 &&
+	stderr_contains "fatal: no path specified"
+
+		
+fatal: no path specified
+ok 13 - empty command line with --quiet
+
+expecting success of 0008.14 'empty command line with -v': 
+				expect '' &&
+				
+	test_check_ignore "" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 14 - empty command line with -v
+
+expecting success of 0008.15 'empty command line with -v -n': 
+				expect '' &&
+				
+	test_check_ignore "" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 15 - empty command line with -v -n
+
+expecting success of 0008.16 'empty command line with -v --non-matching': 
+				expect '' &&
+				
+	test_check_ignore "" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 16 - empty command line with -v --non-matching
+
+expecting success of 0008.17 'empty command line with --verbose': 
+				expect '' &&
+				
+	test_check_ignore "" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 17 - empty command line with --verbose
+
+expecting success of 0008.18 'empty command line with --verbose -n': 
+				expect '' &&
+				
+	test_check_ignore "" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 18 - empty command line with --verbose -n
+
+expecting success of 0008.19 'empty command line with --verbose --non-matching': 
+				expect '' &&
+				
+	test_check_ignore "" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 19 - empty command line with --verbose --non-matching
+
+expecting success of 0008.20 '--stdin with empty STDIN': 
+		expect "$expect" &&
+		eval "$code"
+	
+ok 20 - --stdin with empty STDIN
+
+expecting success of 0008.21 '--stdin with empty STDIN with -q': 
+			expect '' &&
+			
+	test_check_ignore "--stdin" 1 </dev/null &&
+	test_stderr ""
+
+		
+ok 21 - --stdin with empty STDIN with -q
+
+expecting success of 0008.22 '--stdin with empty STDIN with --quiet': 
+			expect '' &&
+			
+	test_check_ignore "--stdin" 1 </dev/null &&
+	test_stderr ""
+
+		
+ok 22 - --stdin with empty STDIN with --quiet
+
+expecting success of 0008.23 '--stdin with empty STDIN with -v': 
+				expect '' &&
+				
+	test_check_ignore "--stdin" 1 </dev/null &&
+	test_stderr ""
+
+			
+ok 23 - --stdin with empty STDIN with -v
+
+expecting success of 0008.24 '--stdin with empty STDIN with -v -n': 
+				expect '' &&
+				
+	test_check_ignore "--stdin" 1 </dev/null &&
+	test_stderr ""
+
+			
+ok 24 - --stdin with empty STDIN with -v -n
+
+expecting success of 0008.25 '--stdin with empty STDIN with -v --non-matching': 
+				expect '' &&
+				
+	test_check_ignore "--stdin" 1 </dev/null &&
+	test_stderr ""
+
+			
+ok 25 - --stdin with empty STDIN with -v --non-matching
+
+expecting success of 0008.26 '--stdin with empty STDIN with --verbose': 
+				expect '' &&
+				
+	test_check_ignore "--stdin" 1 </dev/null &&
+	test_stderr ""
+
+			
+ok 26 - --stdin with empty STDIN with --verbose
+
+expecting success of 0008.27 '--stdin with empty STDIN with --verbose -n': 
+				expect '' &&
+				
+	test_check_ignore "--stdin" 1 </dev/null &&
+	test_stderr ""
+
+			
+ok 27 - --stdin with empty STDIN with --verbose -n
+
+expecting success of 0008.28 '--stdin with empty STDIN with --verbose --non-matching': 
+				expect '' &&
+				
+	test_check_ignore "--stdin" 1 </dev/null &&
+	test_stderr ""
+
+			
+ok 28 - --stdin with empty STDIN with --verbose --non-matching
+
+expecting success of 0008.29 '-q with multiple args': 
+	expect "" &&
+	test_check_ignore "-q one two" 128 &&
+	stderr_contains "fatal: --quiet is only valid with a single pathname"
+
+fatal: --quiet is only valid with a single pathname
+ok 29 - -q with multiple args
+
+expecting success of 0008.30 '--quiet with multiple args': 
+	expect "" &&
+	test_check_ignore "--quiet one two" 128 &&
+	stderr_contains "fatal: --quiet is only valid with a single pathname"
+
+fatal: --quiet is only valid with a single pathname
+ok 30 - --quiet with multiple args
+
+expecting success of 0008.31 '-q -v': 
+			expect '' &&
+			test_check_ignore '-q -v foo' 128 &&
+			stderr_contains 'fatal: cannot have both --quiet and --verbose'
+		
+fatal: cannot have both --quiet and --verbose
+ok 31 - -q -v
+
+expecting success of 0008.32 '--quiet -v': 
+			expect '' &&
+			test_check_ignore '--quiet -v foo' 128 &&
+			stderr_contains 'fatal: cannot have both --quiet and --verbose'
+		
+fatal: cannot have both --quiet and --verbose
+ok 32 - --quiet -v
+
+expecting success of 0008.33 '-q --verbose': 
+			expect '' &&
+			test_check_ignore '-q --verbose foo' 128 &&
+			stderr_contains 'fatal: cannot have both --quiet and --verbose'
+		
+fatal: cannot have both --quiet and --verbose
+ok 33 - -q --verbose
+
+expecting success of 0008.34 '--quiet --verbose': 
+			expect '' &&
+			test_check_ignore '--quiet --verbose foo' 128 &&
+			stderr_contains 'fatal: cannot have both --quiet and --verbose'
+		
+fatal: cannot have both --quiet and --verbose
+ok 34 - --quiet --verbose
+
+expecting success of 0008.35 '--quiet with multiple args': 
+	expect "" &&
+	test_check_ignore "--quiet one two" 128 &&
+	stderr_contains "fatal: --quiet is only valid with a single pathname"
+
+fatal: --quiet is only valid with a single pathname
+ok 35 - --quiet with multiple args
+
+expecting success of 0008.36 'erroneous use of --': 
+		expect "$expect" &&
+		eval "$code"
+	
+fatal: no path specified
+ok 36 - erroneous use of --
+
+expecting success of 0008.37 'erroneous use of -- with -q': 
+			expect '' &&
+			
+	test_check_ignore "--" 128 &&
+	stderr_contains "fatal: no path specified"
+
+		
+fatal: no path specified
+ok 37 - erroneous use of -- with -q
+
+expecting success of 0008.38 'erroneous use of -- with --quiet': 
+			expect '' &&
+			
+	test_check_ignore "--" 128 &&
+	stderr_contains "fatal: no path specified"
+
+		
+fatal: no path specified
+ok 38 - erroneous use of -- with --quiet
+
+expecting success of 0008.39 'erroneous use of -- with -v': 
+				expect '' &&
+				
+	test_check_ignore "--" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 39 - erroneous use of -- with -v
+
+expecting success of 0008.40 'erroneous use of -- with -v -n': 
+				expect '' &&
+				
+	test_check_ignore "--" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 40 - erroneous use of -- with -v -n
+
+expecting success of 0008.41 'erroneous use of -- with -v --non-matching': 
+				expect '' &&
+				
+	test_check_ignore "--" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 41 - erroneous use of -- with -v --non-matching
+
+expecting success of 0008.42 'erroneous use of -- with --verbose': 
+				expect '' &&
+				
+	test_check_ignore "--" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 42 - erroneous use of -- with --verbose
+
+expecting success of 0008.43 'erroneous use of -- with --verbose -n': 
+				expect '' &&
+				
+	test_check_ignore "--" 128 &&
+	stderr_contains "fatal: no path specified"
+
+			
+fatal: no path specified
+ok 43 - erroneous use of -- with --verbose -n
 
 expecting success of 0008.44 'erroneous use of -- with --verbose --non-matching': 
 				expect '' &&
@@ -19082,9 +20507,1567 @@
 1..396
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0029-core-unsetenvvars.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0029-core-unsetenvvars/.git/
-1..0 # SKIP skipping Windows-specific tests
+*** t0032-reftable-unittest.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0032-reftable-unittest/.git/
+expecting success of 0032.1 'unittests': 
+	TMPDIR=$(pwd) && export TMPDIR &&
+	test-tool reftable
+
+running test_common_prefix
+running test_parse_names_normal
+running test_parse_names_drop_empty
+running test_binsearch
+running test_names_length
+running test_reftable_log_record_equal
+running test_reftable_log_record_roundtrip
+running test_reftable_ref_record_roundtrip
+running test_varint_roundtrip
+running test_key_roundtrip
+running test_common_prefix
+running test_reftable_obj_record_roundtrip
+running test_reftable_index_record_roundtrip
+running test_u24_roundtrip
+running test_block_read_write
+running test_tree
+running test_pq
+running test_log_zlib_corruption
+running test_corrupt_table
+running test_corrupt_table_empty
+running test_log_write_read
+running test_write_key_order
+running test_table_read_write_seek_linear_sha256
+running test_log_buffer_size
+running test_table_write_small_table
+running test_buffer
+running test_table_read_api
+running test_table_read_write_sequential
+running test_table_read_write_seek_linear
+running test_table_read_write_seek_index
+running test_table_refs_for_no_index
+running test_table_refs_for_obj_index
+running test_write_empty_key
+running test_write_empty_table
+running test_log_overflow
+running test_write_object_id_length
+running test_write_object_id_min_length
+running test_write_multiple_indices
+running test_write_multi_level_index
+running test_merged_logs
+running test_merged_between
+running test_merged
+running test_default_write_opts
+running test_empty_add
+running test_names_equal
+running test_parse_names
+running test_read_file
+running test_reflog_expire
+running test_reftable_stack_add
+running test_reftable_stack_add_one
+running test_reftable_stack_auto_compaction
+running test_reftable_stack_add_performs_auto_compaction
+running test_reftable_stack_compaction_concurrent
+running test_reftable_stack_compaction_concurrent_clean
+running test_reftable_stack_hash_id
+running test_reftable_stack_lock_failure
+running test_reftable_stack_log_normalize
+running test_reftable_stack_tombstone
+running test_reftable_stack_transaction_api
+running test_reftable_stack_transaction_api_performs_auto_compaction
+running test_reftable_stack_auto_compaction_fails_gracefully
+running test_reftable_stack_update_index_check
+running test_reftable_stack_uptodate
+running test_reftable_stack_validate_refname
+running test_suggest_compaction_segment
+running test_suggest_compaction_segment_nothing
+running test_conflict
+testing print coverage:
+
+'g': log{refs/heads/master(42) han-wen <hanwen@google.com> 1577123507 0100
+0202020202020202020202020202020202020202 => 0101010101010101010101010101010101010101
+
+test
+}
+testing print coverage:
+
+'g': log{refs/heads/master(22) delete
+testing print coverage:
+
+'g': log{branch(33)  <> 0 0000
+0404040404040404040404040404040404040404 => 0303030303030303030303030303030303030303
+
+
+}
+testing print coverage:
+
+'r': ref{refs/heads/master(0) delete}
+testing print coverage:
+
+'r': ref{refs/heads/master(0) val 1 0100000000000000000000000000000000000000}
+testing print coverage:
+
+'r': ref{refs/heads/master(0) val 2 0100000000000000000000000000000000000000(T 0201000000000000000000000000000000000000)}
+testing print coverage:
+
+'r': ref{refs/heads/master(0) => target}
+testing print coverage:
+
+'o': prefix 0102030400 (len 5), offsets [1 2 3 ]
+testing print coverage:
+
+'o': prefix 0102030400 (len 5), offsets [1 2 3 4 500 600 700 800 9000 ]
+testing print coverage:
+
+'o': prefix 0102030400 (len 5), offsets []
+testing print coverage:
+
+'i': "refs/heads/master" 42
+testing print functionality:
+ref{HEAD(1) => master}
+ok 1 - unittests
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0033-safe-directory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/.git/
+expecting success of 0033.1 'safe.directory is not set': 
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
+ok 1 - safe.directory is not set
+
+expecting success of 0033.2 'safe.directory on the command line': 
+	git -c safe.directory="$(pwd)" status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 2 - safe.directory on the command line
+
+expecting success of 0033.3 'safe.directory in the environment': 
+	env GIT_CONFIG_COUNT=1 \
+	    GIT_CONFIG_KEY_0="safe.directory" \
+	    GIT_CONFIG_VALUE_0="$(pwd)" \
+	    git status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 3 - safe.directory in the environment
+
+expecting success of 0033.4 'safe.directory in GIT_CONFIG_PARAMETERS': 
+	env GIT_CONFIG_PARAMETERS="${SQ}safe.directory${SQ}=${SQ}$(pwd)${SQ}" \
+	    git status
+
+On branch master
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 4 - safe.directory in GIT_CONFIG_PARAMETERS
+
+expecting success of 0033.5 'ignoring safe.directory in repo config': 
+	(
+		unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
+		git config safe.directory "$(pwd)"
+	) &&
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
+ok 5 - ignoring safe.directory in repo config
+
+expecting success of 0033.6 'safe.directory does not match': 
+	git config --global safe.directory bogus &&
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
+ok 6 - safe.directory does not match
+
+expecting success of 0033.7 'path exist as different key': 
+	git config --global foo.bar "$(pwd)" &&
+	expect_rejected_dir
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
+ok 7 - path exist as different key
+
+expecting success of 0033.8 'safe.directory matches': 
+	git config --global --add safe.directory "$(pwd)" &&
+	git status
+
+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
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
+ok 9 - safe.directory matches, but is reset
+
+expecting success of 0033.10 'safe.directory=*': 
+	git config --global --add safe.directory "*" &&
+	git status
+
+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
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
+ok 11 - safe.directory=*, but is reset
+
+expecting success of 0033.12 'safe.directory in included file': 
+	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 12 - safe.directory in included file
+
+expecting success of 0033.13 '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.45.2/t/trash directory.t0033-safe-directory/source/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into 'target'...
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/source/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/source/.git'
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 13 - local clone of unowned repo refused in unsafe directory
+
+expecting success of 0033.14 '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.45.2/t/trash directory.t0033-safe-directory/source/.git/
+[master (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into 'target'...
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/source/.git'
+To add an exception for this directory, call:
+
+	git config --global --add safe.directory '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/source/.git'
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+Cloning into 'target'...
+done.
+ok 14 - local clone of unowned repo accepted in safe directory
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0021-conversion.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/.git/
+expecting success of 0021.1 'setup': 
+	git config filter.rot13.smudge ./rot13.sh &&
+	git config filter.rot13.clean ./rot13.sh &&
+
+	{
+	    echo "*.t filter=rot13" &&
+	    echo "*.i ident"
+	} >.gitattributes &&
+
+	{
+	    echo a b c d e f g h i j k l m &&
+	    echo n o p q r s t u v w x y z &&
+	    echo '$Id$'
+	} >test &&
+	cat test >test.t &&
+	cat test >test.o &&
+	cat test >test.i &&
+	git add test test.t test.i &&
+	rm -f test test.t test.i &&
+	git checkout -- test test.t test.i &&
+
+	echo "content-test2" >test2.o &&
+	echo "content-test3 - filename with special characters" >"test3 'sq',\$x=.o"
+
+ok 1 - setup
+
+expecting success of 0021.2 'check': 
+
+	test_cmp test.o test &&
+	test_cmp test.o test.t &&
+
+	# ident should be stripped in the repository
+	git diff --raw --exit-code :test :test.i &&
+	id=$(git rev-parse --verify :test) &&
+	embedded=$(sed -ne "$script" test.i) &&
+	test "z$id" = "z$embedded" &&
+
+	git cat-file blob :test.t >test.r &&
+
+	./rot13.sh <test.o >test.t &&
+	test_cmp test.r test.t
+
+ok 2 - check
+
+expecting success of 0021.3 'expanded_in_repo': 
+	cat >expanded-keywords.0 <<-\EOF &&
+	File with expanded keywords
+	$Id$
+	$Id:$
+	$Id: 0000000000000000000000000000000000000000 $
+	$Id: NoSpaceAtEnd$
+	$Id:NoSpaceAtFront $
+	$Id:NoSpaceAtEitherEnd$
+	$Id: NoTerminatingSymbol
+	$Id: Foreign Commit With Spaces $
+	EOF
+
+	{
+		cat expanded-keywords.0 &&
+		printf "\$Id: NoTerminatingSymbolAtEOF"
+	} >expanded-keywords &&
+	cat expanded-keywords >expanded-keywords-crlf &&
+	git add expanded-keywords expanded-keywords-crlf &&
+	git commit -m "File with keywords expanded" &&
+	id=$(git rev-parse --verify :expanded-keywords) &&
+
+	cat >expected-output.0 <<-EOF &&
+	File with expanded keywords
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: $id \$
+	\$Id: NoTerminatingSymbol
+	\$Id: Foreign Commit With Spaces \$
+	EOF
+	{
+		cat expected-output.0 &&
+		printf "\$Id: NoTerminatingSymbolAtEOF"
+	} >expected-output &&
+	{
+		append_cr <expected-output.0 &&
+		printf "\$Id: NoTerminatingSymbolAtEOF"
+	} >expected-output-crlf &&
+	{
+		echo "expanded-keywords ident" &&
+		echo "expanded-keywords-crlf ident text eol=crlf"
+	} >>.gitattributes &&
+
+	rm -f expanded-keywords expanded-keywords-crlf &&
+
+	git checkout -- expanded-keywords &&
+	test_cmp expected-output expanded-keywords &&
+
+	git checkout -- expanded-keywords-crlf &&
+	test_cmp expected-output-crlf expanded-keywords-crlf
+
+[main (root-commit) bf31399] File with keywords expanded
+ Author: A U Thor <author@example.com>
+ 5 files changed, 29 insertions(+)
+ create mode 100644 expanded-keywords
+ create mode 100644 expanded-keywords-crlf
+ create mode 100644 test
+ create mode 100644 test.i
+ create mode 100644 test.t
+ok 3 - expanded_in_repo
+
+expecting success of 0021.4 'filter shell-escaped filenames': 
+	cat >argc.sh <<-EOF &&
+	#!$SHELL_PATH
+	cat >/dev/null
+	echo argc: \$# "\$@"
+	EOF
+	normal=name-no-magic &&
+	special="name  with 'sq' and \$x" &&
+	echo some test text >"$normal" &&
+	echo some test text >"$special" &&
+	git add "$normal" "$special" &&
+	git commit -q -m "add files" &&
+	echo "name* filter=argc" >.gitattributes &&
+
+	# delete the files and check them out again, using a smudge filter
+	# that will count the args and echo the command-line back to us
+	test_config filter.argc.smudge "sh ./argc.sh %f" &&
+	rm "$normal" "$special" &&
+	git checkout -- "$normal" "$special" &&
+
+	# make sure argc.sh counted the right number of args
+	echo "argc: 1 $normal" >expect &&
+	test_cmp expect "$normal" &&
+	echo "argc: 1 $special" >expect &&
+	test_cmp expect "$special" &&
+
+	# do the same thing, but with more args in the filter expression
+	test_config filter.argc.smudge "sh ./argc.sh %f --my-extra-arg" &&
+	rm "$normal" "$special" &&
+	git checkout -- "$normal" "$special" &&
+
+	# make sure argc.sh counted the right number of args
+	echo "argc: 2 $normal --my-extra-arg" >expect &&
+	test_cmp expect "$normal" &&
+	echo "argc: 2 $special --my-extra-arg" >expect &&
+	test_cmp expect "$special" &&
+	:
+
+ok 4 - filter shell-escaped filenames
+
+expecting success of 0021.5 'required filter should filter data': 
+	test_config filter.required.smudge ./rot13.sh &&
+	test_config filter.required.clean ./rot13.sh &&
+	test_config filter.required.required true &&
+
+	echo "*.r filter=required" >.gitattributes &&
+
+	cat test.o >test.r &&
+	git add test.r &&
+
+	rm -f test.r &&
+	git checkout -- test.r &&
+	test_cmp test.o test.r &&
+
+	./rot13.sh <test.o >expected &&
+	git cat-file blob :test.r >actual &&
+	test_cmp expected actual
+
+ok 5 - required filter should filter data
+
+expecting success of 0021.6 'required filter smudge failure': 
+	test_config filter.failsmudge.smudge false &&
+	test_config filter.failsmudge.clean cat &&
+	test_config filter.failsmudge.required true &&
+
+	echo "*.fs filter=failsmudge" >.gitattributes &&
+
+	echo test >test.fs &&
+	git add test.fs &&
+	rm -f test.fs &&
+	test_must_fail git checkout -- test.fs
+
+error: external filter 'false' failed 1
+error: external filter 'false' failed
+fatal: test.fs: smudge filter failsmudge failed
+ok 6 - required filter smudge failure
+
+expecting success of 0021.7 'required filter clean failure': 
+	test_config filter.failclean.smudge cat &&
+	test_config filter.failclean.clean false &&
+	test_config filter.failclean.required true &&
+
+	echo "*.fc filter=failclean" >.gitattributes &&
+
+	echo test >test.fc &&
+	test_must_fail git add test.fc
+
+error: external filter 'false' failed 1
+error: external filter 'false' failed
+fatal: test.fc: clean filter 'failclean' failed
+ok 7 - required filter clean failure
+
+expecting success of 0021.8 'required filter with absent clean field': 
+	test_config filter.absentclean.smudge cat &&
+	test_config filter.absentclean.required true &&
+
+	echo "*.ac filter=absentclean" >.gitattributes &&
+
+	echo test >test.ac &&
+	test_must_fail git add test.ac 2>stderr &&
+	test_grep "fatal: test.ac: clean filter .absentclean. failed" stderr
+
+fatal: test.ac: clean filter 'absentclean' failed
+ok 8 - required filter with absent clean field
+
+expecting success of 0021.9 'required filter with absent smudge field': 
+	test_config filter.absentsmudge.clean cat &&
+	test_config filter.absentsmudge.required true &&
+
+	echo "*.as filter=absentsmudge" >.gitattributes &&
+
+	echo test >test.as &&
+	git add test.as &&
+	rm -f test.as &&
+	test_must_fail git checkout -- test.as 2>stderr &&
+	test_grep "fatal: test.as: smudge filter absentsmudge failed" stderr
+
+fatal: test.as: smudge filter absentsmudge failed
+ok 9 - required filter with absent smudge field
+
+expecting success of 0021.10 'filtering large input to small output should use little memory': 
+	test_config filter.devnull.clean "cat >/dev/null" &&
+	test_config filter.devnull.required true &&
+	for i in $(test_seq 1 30); do printf "%1048576d" 1 || return 1; done >30MB &&
+	echo "30MB filter=devnull" >.gitattributes &&
+	GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB
+
+ok 10 - filtering large input to small output should use little memory
+
+expecting success of 0021.11 'filter that does not read is fine': 
+	test-tool genrandom foo $((128 * 1024 + 1)) >big &&
+	echo "big filter=epipe" >.gitattributes &&
+	test_config filter.epipe.clean "echo xyzzy" &&
+	git add big &&
+	git cat-file blob :big >actual &&
+	echo xyzzy >expect &&
+	test_cmp expect actual
+
+ok 11 - filter that does not read is fine
+
+checking prerequisite: EXPENSIVE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
+
+)
+prerequisite EXPENSIVE not satisfied
+ok 12 # skip filter large file (missing EXPENSIVE)
+
+expecting success of 0021.13 'filter: clean empty file': 
+	test_config filter.in-repo-header.clean  "echo cleaned && cat" &&
+	test_config filter.in-repo-header.smudge "sed 1d" &&
+
+	echo "empty-in-worktree    filter=in-repo-header" >>.gitattributes &&
+	>empty-in-worktree &&
+
+	echo cleaned >expected &&
+	git add empty-in-worktree &&
+	git show :empty-in-worktree >actual &&
+	test_cmp expected actual
+
+ok 13 - filter: clean empty file
+
+expecting success of 0021.14 'filter: smudge empty file': 
+	test_config filter.empty-in-repo.clean "cat >/dev/null" &&
+	test_config filter.empty-in-repo.smudge "echo smudged && cat" &&
+
+	echo "empty-in-repo filter=empty-in-repo" >>.gitattributes &&
+	echo dead data walking >empty-in-repo &&
+	git add empty-in-repo &&
+
+	echo smudged >expected &&
+	git checkout-index --prefix=filtered- empty-in-repo &&
+	test_cmp expected filtered-empty-in-repo
+
+ok 14 - filter: smudge empty file
+
+expecting success of 0021.15 'disable filter with empty override': 
+	test_config_global filter.disable.smudge false &&
+	test_config_global filter.disable.clean false &&
+	test_config filter.disable.smudge false &&
+	test_config filter.disable.clean false &&
+
+	echo "*.disable filter=disable" >.gitattributes &&
+
+	echo test >test.disable &&
+	git -c filter.disable.clean= add test.disable 2>err &&
+	test_must_be_empty err &&
+	rm -f test.disable &&
+	git -c filter.disable.smudge= checkout -- test.disable 2>err &&
+	test_must_be_empty err
+
+ok 15 - disable filter with empty override
+
+expecting success of 0021.16 'diff does not reuse worktree files that need cleaning': 
+	test_config filter.counter.clean "echo . >>count; sed s/^/clean:/" &&
+	echo "file filter=counter" >.gitattributes &&
+	test_commit one file &&
+	test_commit two file &&
+
+	>count &&
+	git diff-tree -p HEAD &&
+	test_line_count = 0 count
+
+[main 2e1b3a0] one
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+)
+ create mode 100644 30MB
+ create mode 100644 big
+ create mode 100644 empty-in-repo
+ create mode 100644 empty-in-worktree
+ create mode 100644 file
+ create mode 100644 test.as
+ create mode 100644 test.disable
+ create mode 100644 test.fs
+ create mode 100644 test.r
+[main 5763447] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+57634479428deffd4cbb8230d4ff66a3801fc1be
+diff --git a/file b/file
+index e4a1655..0c54b7b 100644
+--- a/file
++++ b/file
+@@ -1 +1 @@
+-clean:one
++clean:two
+ok 16 - diff does not reuse worktree files that need cleaning
+
+expecting success of 0021.17 'required process filter should filter data': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	test_config_global filter.protocol.required true &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+		git add . &&
+		git commit -m "test commit 1" &&
+		git branch empty-branch &&
+
+		cp "$TEST_ROOT/test.o" test.r &&
+		cp "$TEST_ROOT/test2.o" test2.r &&
+		mkdir testsubdir &&
+		cp "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r" &&
+		>test4-empty.r &&
+
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		S3=$(test_file_size "testsubdir/test3 'sq',\$x=.r") &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		M3=$(git hash-object "testsubdir/test3 'sq',\$x=.r") &&
+		EMPTY=$(git hash-object /dev/null) &&
+
+		filter_git add . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean test.r $S [OK] -- OUT: $S . [OK]
+			IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK]
+			IN: clean test4-empty.r 0 [OK] -- OUT: 0  [OK]
+			IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_count expected.log debug.log &&
+
+		git commit -m "test commit 2" &&
+		MAIN=$(git rev-parse --verify main) &&
+		META="ref=refs/heads/main treeish=$MAIN" &&
+		rm -f test2.r "testsubdir/test3 'sq',\$x=.r" &&
+
+		filter_git checkout --quiet --no-progress . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		# Make sure that the file appears dirty, so checkout below has to
+		# run the configured filter.
+		touch test.r &&
+		filter_git checkout --quiet --no-progress empty-branch &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean test.r $S [OK] -- OUT: $S . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		filter_git checkout --quiet --no-progress main &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 56d459b] test commit 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 .gitattributes
+[main 9ea74df] test commit 2
+ Author: A U Thor <author@example.com>
+ 4 files changed, 5 insertions(+)
+ create mode 100644 test.r
+ create mode 100644 test2.r
+ create mode 100644 test4-empty.r
+ create mode 100644 testsubdir/test3 'sq',$x=.r
+ok 17 - required process filter should filter data
+
+expecting success of 0021.18 'required process filter should filter data for various subcommands': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	test_config_global filter.protocol.required true &&
+	(
+		cd repo &&
+
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		S3=$(test_file_size "testsubdir/test3 'sq',\$x=.r") &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		M3=$(git hash-object "testsubdir/test3 'sq',\$x=.r") &&
+		EMPTY=$(git hash-object /dev/null) &&
+
+		MAIN=$(git rev-parse --verify main) &&
+
+		cp "$TEST_ROOT/test.o" test5.r &&
+		git add test5.r &&
+		git commit -m "test commit 3" &&
+		git checkout empty-branch &&
+		filter_git rebase --onto empty-branch main^^ main &&
+		MAIN2=$(git rev-parse --verify main) &&
+		META="ref=refs/heads/main treeish=$MAIN2" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		git reset --hard empty-branch &&
+		filter_git reset --hard $MAIN &&
+		META="treeish=$MAIN" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		git branch old-main $MAIN &&
+		git reset --hard empty-branch &&
+		filter_git reset --hard old-main &&
+		META="ref=refs/heads/old-main treeish=$MAIN" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		git checkout -b merge empty-branch &&
+		git branch -f main $MAIN2 &&
+		filter_git merge main &&
+		META="treeish=$MAIN2" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		filter_git archive main >/dev/null &&
+		META="ref=refs/heads/main treeish=$MAIN2" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		TREE="$(git rev-parse $MAIN2^{tree})" &&
+		filter_git archive $TREE >/dev/null &&
+		META="treeish=$TREE" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log
+	)
+
+[main 07631f7] test commit 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 test5.r
+Switched to branch 'empty-branch'
+Current branch main is up to date.
+HEAD is now at 56d459b test commit 1
+HEAD is now at 9ea74df test commit 2
+HEAD is now at 56d459b test commit 1
+HEAD is now at 9ea74df test commit 2
+Switched to a new branch 'merge'
+Updating 56d459b..07631f7
+Fast-forward
+ test.r                      | 3 +++
+ test2.r                     | 1 +
+ test4-empty.r               | 0
+ test5.r                     | 3 +++
+ testsubdir/test3 'sq',$x=.r | 1 +
+ 5 files changed, 8 insertions(+)
+ create mode 100644 test.r
+ create mode 100644 test2.r
+ create mode 100644 test4-empty.r
+ create mode 100644 test5.r
+ create mode 100644 testsubdir/test3 'sq',$x=.r
+ok 18 - required process filter should filter data for various subcommands
+
+expecting success of 0021.19 'required process filter takes precedence': 
+	test_config_global filter.protocol.clean false &&
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean" &&
+	test_config_global filter.protocol.required true &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+		cp "$TEST_ROOT/test.o" test.r &&
+		S=$(test_file_size test.r) &&
+
+		# Check that the process filter is invoked here
+		filter_git add . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean test.r $S [OK] -- OUT: $S . [OK]
+			STOP
+		EOF
+		test_cmp_count expected.log debug.log
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+ok 19 - required process filter takes precedence
+
+expecting success of 0021.20 'required process filter should be used only for "clean" operation only': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean" &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+		cp "$TEST_ROOT/test.o" test.r &&
+		S=$(test_file_size test.r) &&
+
+		filter_git add . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean test.r $S [OK] -- OUT: $S . [OK]
+			STOP
+		EOF
+		test_cmp_count expected.log debug.log &&
+
+		rm test.r &&
+
+		filter_git checkout --quiet --no-progress . &&
+		# If the filter would be used for "smudge", too, we would see
+		# "IN: smudge test.r 57 [OK] -- OUT: 57 . [OK]" here
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+ok 20 - required process filter should be used only for "clean" operation only
+
+expecting success of 0021.21 'required process filter should process multiple packets': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	test_config_global filter.protocol.required true &&
+
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		# Generate data requiring 1, 2, 3 packets
+		S=65516 && # PKTLINE_DATA_MAXLEN -> Maximal size of a packet
+		generate_random_characters $(($S    )) 1pkt_1__.file &&
+		generate_random_characters $(($S  +1)) 2pkt_1+1.file &&
+		generate_random_characters $(($S*2-1)) 2pkt_2-1.file &&
+		generate_random_characters $(($S*2  )) 2pkt_2__.file &&
+		generate_random_characters $(($S*2+1)) 3pkt_2+1.file &&
+
+		for FILE in "$TEST_ROOT"/*.file
+		do
+			cp "$FILE" . &&
+			rot13.sh <"$FILE" >"$FILE.rot13" || return 1
+		done &&
+
+		echo "*.file filter=protocol" >.gitattributes &&
+		filter_git add *.file .gitattributes &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: clean 1pkt_1__.file $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
+			IN: clean 2pkt_1+1.file $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
+			IN: clean 2pkt_2-1.file $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
+			IN: clean 2pkt_2__.file $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
+			IN: clean 3pkt_2+1.file $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
+			STOP
+		EOF
+		test_cmp_count expected.log debug.log &&
+
+		M1="blob=$(git hash-object 1pkt_1__.file)" &&
+		M2="blob=$(git hash-object 2pkt_1+1.file)" &&
+		M3="blob=$(git hash-object 2pkt_2-1.file)" &&
+		M4="blob=$(git hash-object 2pkt_2__.file)" &&
+		M5="blob=$(git hash-object 3pkt_2+1.file)" &&
+		rm -f *.file debug.log &&
+
+		filter_git checkout --quiet --no-progress -- *.file &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge 1pkt_1__.file $M1 $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
+			IN: smudge 2pkt_1+1.file $M2 $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
+			IN: smudge 2pkt_2-1.file $M3 $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
+			IN: smudge 2pkt_2__.file $M4 $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
+			IN: smudge 3pkt_2+1.file $M5 $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		for FILE in *.file
+		do
+			test_cmp_committed_rot13 "$TEST_ROOT/$FILE" $FILE || return 1
+		done
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+ok 21 - required process filter should process multiple packets
+
+expecting success of 0021.22 'required process filter with clean error should fail': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	test_config_global filter.protocol.required true &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+
+		cp "$TEST_ROOT/test.o" test.r &&
+		echo "this is going to fail" >clean-write-fail.r &&
+		echo "content-test3-subdir" >test3.r &&
+
+		test_must_fail git add .
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+fatal: clean write error
+error: external filter 'test-tool rot13-filter --log=debug.log clean smudge' failed
+fatal: clean-write-fail.r: clean filter 'protocol' failed
+ok 22 - required process filter with clean error should fail
+
+expecting success of 0021.23 'process filter should restart after unexpected write failure': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+
+		cp "$TEST_ROOT/test.o" test.r &&
+		cp "$TEST_ROOT/test2.o" test2.r &&
+		echo "this is going to fail" >smudge-write-fail.o &&
+		cp smudge-write-fail.o smudge-write-fail.r &&
+
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		SF=$(test_file_size smudge-write-fail.r) &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		MF=$(git hash-object smudge-write-fail.r) &&
+		rm -f debug.log &&
+
+		git add . &&
+		rm -f *.r &&
+
+		rm -f debug.log &&
+		git checkout --quiet --no-progress . 2>git-stderr.log &&
+
+		grep "smudge write error" git-stderr.log &&
+		test_grep "error: external filter" git-stderr.log &&
+
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge smudge-write-fail.r blob=$MF $SF [OK] -- [WRITE FAIL]
+			START
+			init handshake complete
+			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
+
+		# Smudge failed
+		! test_cmp smudge-write-fail.o smudge-write-fail.r &&
+		rot13.sh <smudge-write-fail.o >expected &&
+		git cat-file blob :smudge-write-fail.r >actual &&
+		test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+fatal: smudge write error
+error: external filter 'test-tool rot13-filter --log=debug.log clean smudge' failed
+--- smudge-write-fail.o	2024-11-14 19:26:14.587680085 +0000
++++ smudge-write-fail.r	2024-11-14 19:26:14.895683227 +0000
+@@ -1 +1 @@
+-this is going to fail
++guvf vf tbvat gb snvy
+ok 23 - process filter should restart after unexpected write failure
+
+expecting success of 0021.24 'process filter should not be restarted if it signals an error': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+
+		cp "$TEST_ROOT/test.o" test.r &&
+		cp "$TEST_ROOT/test2.o" test2.r &&
+		echo "this will cause an error" >error.o &&
+		cp error.o error.r &&
+
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		SE=$(test_file_size error.r) &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		ME=$(git hash-object error.r) &&
+		rm -f debug.log &&
+
+		git add . &&
+		rm -f *.r &&
+
+		filter_git checkout --quiet --no-progress . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge error.r blob=$ME $SE [OK] -- [ERROR]
+			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
+		test_cmp error.o error.r
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+ok 24 - process filter should not be restarted if it signals an error
+
+expecting success of 0021.25 'process filter abort stops processing of all further files': 
+	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+
+		cp "$TEST_ROOT/test.o" test.r &&
+		cp "$TEST_ROOT/test2.o" test2.r &&
+		echo "error this blob and all future blobs" >abort.o &&
+		cp abort.o abort.r &&
+
+		M="blob=$(git hash-object abort.r)" &&
+		rm -f debug.log &&
+		SA=$(test_file_size abort.r) &&
+
+		git add . &&
+		rm -f *.r &&
+
+
+		# Note: This test assumes that Git filters files in alphabetical
+		# order ("abort.r" before "test.r").
+		filter_git checkout --quiet --no-progress . &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge abort.r $M $SA [OK] -- [ABORT]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		test_cmp "$TEST_ROOT/test.o" test.r &&
+		test_cmp "$TEST_ROOT/test2.o" test2.r &&
+		test_cmp abort.o abort.r
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+ok 25 - process filter abort stops processing of all further files
+
+expecting success of 0021.26 'invalid process filter must fail (and not hang!)': 
+	test_config_global filter.protocol.process cat &&
+	test_config_global filter.protocol.required true &&
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+
+		echo "*.r filter=protocol" >.gitattributes &&
+
+		cp "$TEST_ROOT/test.o" test.r &&
+		test_must_fail git add . 2>git-stderr.log &&
+		grep "expected git-filter-server" git-stderr.log
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+error: Unexpected line 'git-filter-client', expected git-filter-server
+ok 26 - invalid process filter must fail (and not hang!)
+
+expecting success of 0021.27 'delayed checkout in process filter': 
+	test_config_global filter.a.process "test-tool rot13-filter --log=a.log clean smudge delay" &&
+	test_config_global filter.a.required true &&
+	test_config_global filter.b.process "test-tool rot13-filter --log=b.log clean smudge delay" &&
+	test_config_global filter.b.required true &&
+
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		echo "*.a filter=a" >.gitattributes &&
+		echo "*.b filter=b" >>.gitattributes &&
+		cp "$TEST_ROOT/test.o" test.a &&
+		cp "$TEST_ROOT/test.o" test-delay10.a &&
+		cp "$TEST_ROOT/test.o" test-delay11.a &&
+		cp "$TEST_ROOT/test.o" test-delay20.a &&
+		cp "$TEST_ROOT/test.o" test-delay10.b &&
+		git add . &&
+		git commit -m "test commit"
+	) &&
+
+	S=$(test_file_size "$TEST_ROOT/test.o") &&
+	PM="ref=refs/heads/main treeish=$(git -C repo rev-parse --verify main) " &&
+	M="${PM}blob=$(git -C repo rev-parse --verify main:test.a)" &&
+	cat >a.exp <<-EOF &&
+		START
+		init handshake complete
+		IN: smudge test.a $M $S [OK] -- OUT: $S . [OK]
+		IN: smudge test-delay10.a $M $S [OK] -- [DELAYED]
+		IN: smudge test-delay11.a $M $S [OK] -- [DELAYED]
+		IN: smudge test-delay20.a $M $S [OK] -- [DELAYED]
+		IN: list_available_blobs test-delay10.a test-delay11.a [OK]
+		IN: smudge test-delay10.a $M 0 [OK] -- OUT: $S . [OK]
+		IN: smudge test-delay11.a $M 0 [OK] -- OUT: $S . [OK]
+		IN: list_available_blobs test-delay20.a [OK]
+		IN: smudge test-delay20.a $M 0 [OK] -- OUT: $S . [OK]
+		IN: list_available_blobs [OK]
+		STOP
+	EOF
+	cat >b.exp <<-EOF &&
+		START
+		init handshake complete
+		IN: smudge test-delay10.b $M $S [OK] -- [DELAYED]
+		IN: list_available_blobs test-delay10.b [OK]
+		IN: smudge test-delay10.b $M 0 [OK] -- OUT: $S . [OK]
+		IN: list_available_blobs [OK]
+		STOP
+	EOF
+
+	rm -rf repo-cloned &&
+	filter_git clone repo repo-cloned &&
+	test_cmp_count a.exp repo-cloned/a.log &&
+	test_cmp_count b.exp repo-cloned/b.log &&
+
+	(
+		cd repo-cloned &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b &&
+
+		rm *.a *.b &&
+		filter_git checkout . &&
+		# We are not checking out a ref here, so filter out ref metadata.
+		sed -e "s!$PM!!" ../a.exp >a.exp.filtered &&
+		sed -e "s!$PM!!" ../b.exp >b.exp.filtered &&
+		test_cmp_count a.exp.filtered a.log &&
+		test_cmp_count b.exp.filtered b.log &&
+
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a &&
+		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 27d7fe8] test commit
+ Author: A U Thor <author@example.com>
+ 6 files changed, 17 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 test-delay10.a
+ create mode 100644 test-delay10.b
+ create mode 100644 test-delay11.a
+ create mode 100644 test-delay20.a
+ create mode 100644 test.a
+Cloning into 'repo-cloned'...
+done.
+Updated 5 paths from the index
+ok 27 - delayed checkout in process filter
+
+expecting success of 0021.28 'missing file in delayed checkout': 
+	test_config_global filter.bug.process "test-tool rot13-filter --log=bug.log clean smudge delay" &&
+	test_config_global filter.bug.required true &&
+
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		echo "*.a filter=bug" >.gitattributes &&
+		cp "$TEST_ROOT/test.o" missing-delay.a &&
+		git add . &&
+		git commit -m "test commit"
+	) &&
+
+	rm -rf repo-cloned &&
+	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
+	grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 5567259] test commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 missing-delay.a
+error: 'missing-delay.a' was not filtered properly
+ok 28 - missing file in delayed checkout
+
+expecting success of 0021.29 'invalid file in delayed checkout': 
+	test_config_global filter.bug.process "test-tool rot13-filter --log=bug.log clean smudge delay" &&
+	test_config_global filter.bug.required true &&
+
+	rm -rf repo &&
+	mkdir repo &&
+	(
+		cd repo &&
+		git init &&
+		echo "*.a filter=bug" >.gitattributes &&
+		cp "$TEST_ROOT/test.o" invalid-delay.a &&
+		cp "$TEST_ROOT/test.o" unfiltered &&
+		git add . &&
+		git commit -m "test commit"
+	) &&
+
+	rm -rf repo-cloned &&
+	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
+	grep "error: external filter .* signaled that .unfiltered. is now available although it has not been delayed earlier" git-stderr.log
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 636012f] test commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 7 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 invalid-delay.a
+ create mode 100644 unfiltered
+error: external filter 'test-tool rot13-filter --log=bug.log clean smudge delay' signaled that 'unfiltered' is now available although it has not been delayed earlier
+ok 29 - invalid file in delayed checkout
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+checking prerequisite: CASE_INSENSITIVE_FS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+	echo good >CamelCase &&
+	echo bad >camelcase &&
+	test "$(cat CamelCase)" != good
+
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 30 # skip delayed checkout with case-collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
+
+checking prerequisite: UTF8_NFD_TO_NFC
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+	# check whether FS converts nfd unicode to nfc
+	auml=$(printf "\303\244")
+	aumlcdiar=$(printf "\141\314\210")
+	>"$auml" &&
+	test -f "$aumlcdiar"
+
+)
+prerequisite UTF8_NFD_TO_NFC not satisfied
+ok 31 # skip delayed checkout with utf-8-collision don't write to the wrong place (missing UTF8_NFD_TO_NFC of SYMLINKS,UTF8_NFD_TO_NFC)
+
+ok 32 # skip delayed checkout with submodule collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
+
+expecting success of 0021.33 'setup for progress tests': 
+	git init progress &&
+	(
+		cd progress &&
+		git config filter.delay.process "test-tool rot13-filter --log=delay-progress.log clean smudge delay" &&
+		git config filter.delay.required true &&
+
+		echo "*.a filter=delay" >.gitattributes &&
+		touch test-delay10.a &&
+		git add . &&
+		git commit -m files
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/progress/.git/
+[main (root-commit) 36dc8bf] files
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 .gitattributes
+ create mode 100644 test-delay10.a
+ok 33 - setup for progress tests
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
+prerequisite TTY ok
+expecting success of 0021.34 'delayed checkout shows progress by default on tty (pathspec checkout)': 
+		test_delayed_checkout_progress test_terminal git checkout $opt
+	
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
+ok 34 - delayed checkout shows progress by default on tty (pathspec checkout)
+
+expecting success of 0021.35 'delayed checkout ommits progress on non-tty (pathspec checkout)': 
+		test_delayed_checkout_progress ! git checkout $opt
+	
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+ok 35 - delayed checkout ommits progress on non-tty (pathspec checkout)
+
+expecting success of 0021.36 'delayed checkout ommits progress with --quiet (pathspec checkout)': 
+		test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt
+	
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+ok 36 - delayed checkout ommits progress with --quiet (pathspec checkout)
+
+expecting success of 0021.37 'delayed checkout honors --[no]-progress (pathspec checkout)': 
+		test_delayed_checkout_progress ! test_terminal git checkout --no-progress $opt &&
+		test_delayed_checkout_progress test_terminal git checkout --quiet --progress $opt
+	
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
+ok 37 - delayed checkout honors --[no]-progress (pathspec checkout)
+
+expecting success of 0021.38 'delayed checkout shows progress by default on tty (branch checkout)': 
+		test_delayed_checkout_progress test_terminal git checkout $opt
+	
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
+ok 38 - delayed checkout shows progress by default on tty (branch checkout)
+
+expecting success of 0021.39 'delayed checkout ommits progress on non-tty (branch checkout)': 
+		test_delayed_checkout_progress ! git checkout $opt
+	
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+ok 39 - delayed checkout ommits progress on non-tty (branch checkout)
+
+expecting success of 0021.40 'delayed checkout ommits progress with --quiet (branch checkout)': 
+		test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt
+	
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+ok 40 - delayed checkout ommits progress with --quiet (branch checkout)
+
+expecting success of 0021.41 'delayed checkout honors --[no]-progress (branch checkout)': 
+		test_delayed_checkout_progress ! test_terminal git checkout --no-progress $opt &&
+		test_delayed_checkout_progress test_terminal git checkout --quiet --progress $opt
+	
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
+Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
+ok 41 - delayed checkout honors --[no]-progress (branch checkout)
+
+expecting success of 0021.42 'delayed checkout correctly reports the number of updated entries': 
+	rm -rf repo &&
+	git init repo &&
+	(
+		cd repo &&
+		git config filter.delay.process "test-tool rot13-filter --log=delayed.log clean smudge delay" &&
+		git config filter.delay.required true &&
+
+		echo "*.a filter=delay" >.gitattributes &&
+		echo a >test-delay10.a &&
+		echo a >test-delay11.a &&
+		git add . &&
+		git commit -m files &&
+
+		rm *.a &&
+		git checkout . 2>err &&
+		grep "IN: smudge test-delay10.a .* \\[DELAYED\\]" delayed.log &&
+		grep "IN: smudge test-delay11.a .* \\[DELAYED\\]" delayed.log &&
+		grep "Updated 2 paths from the index" err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
+[main (root-commit) 6d52fcb] files
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 test-delay10.a
+ create mode 100644 test-delay11.a
+IN: smudge test-delay10.a blob=8ba3a16384aacc37d01564b28401755ce8053f51 2 [OK] -- [DELAYED]
+IN: smudge test-delay11.a blob=8ba3a16384aacc37d01564b28401755ce8053f51 2 [OK] -- [DELAYED]
+Updated 2 paths from the index
+ok 42 - delayed checkout correctly reports the number of updated entries
+
+# passed all 42 test(s)
+1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0000-basic.sh ***
@@ -19832,7 +22815,7 @@
 
 	grep "echo trace" lazy-prereq-and-tracing/err
 
-+ echo trace
+++ echo trace
 ok 44 - subtest: lazy prereqs do not turn off tracing
 
 expecting success of 0000.45 'subtest: tests clean up after themselves': 
@@ -20382,2238 +23365,630 @@
 1..92
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0028-working-tree-encoding.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0028-working-tree-encoding/.git/
-expecting success of 0028.1 'setup test files': 
-	git config core.eol lf &&
-
-	text="hallo there!\ncan you read me?" &&
-	echo "*.utf16 text working-tree-encoding=utf-16" >.gitattributes &&
-	echo "*.utf16lebom text working-tree-encoding=UTF-16LE-BOM" >>.gitattributes &&
-	printf "$text" >test.utf8.raw &&
-	printf "$text" | write_utf16 >test.utf16.raw &&
-	printf "$text" | write_utf32 >test.utf32.raw &&
-	printf "\377\376"                         >test.utf16lebom.raw &&
-	printf "$text" | iconv -f UTF-8 -t UTF-16LE >>test.utf16lebom.raw &&
+*** t0034-root-safe-directory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0034-root-safe-directory/.git/
+1..0 # SKIP You must set env var GIT_TEST_ALLOW_SUDO=YES in order to run this test
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0030-stripspace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0030-stripspace/.git/
+expecting success of 0030.1 'long lines without spaces should be unchanged': 
+	echo "$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-	# Line ending tests
-	printf "one\ntwo\nthree\n" >lf.utf8.raw &&
-	printf "one\r\ntwo\r\nthree\r\n" >crlf.utf8.raw &&
+	echo "$ttt$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-	# BOM tests
-	printf "\0a\0b\0c"                         >nobom.utf16be.raw &&
-	printf "a\0b\0c\0"                         >nobom.utf16le.raw &&
-	printf "\376\377\0a\0b\0c"                 >bebom.utf16be.raw &&
-	printf "\377\376a\0b\0c\0"                 >lebom.utf16le.raw &&
-	printf "\0\0\0a\0\0\0b\0\0\0c"             >nobom.utf32be.raw &&
-	printf "a\0\0\0b\0\0\0c\0\0\0"             >nobom.utf32le.raw &&
-	printf "\0\0\376\377\0\0\0a\0\0\0b\0\0\0c" >bebom.utf32be.raw &&
-	printf "\377\376\0\0a\0\0\0b\0\0\0c\0\0\0" >lebom.utf32le.raw &&
+	echo "$ttt$ttt$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-	# Add only UTF-16 file, we will add the UTF-32 file later
-	cp test.utf16.raw test.utf16 &&
-	cp test.utf32.raw test.utf32 &&
-	cp test.utf16lebom.raw test.utf16lebom &&
-	git add .gitattributes test.utf16 test.utf16lebom &&
-	git commit -m initial
+	echo "$ttt$ttt$ttt$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual
 
-checking prerequisite: NO_UTF16_BOM
+ok 1 - long lines without spaces should be unchanged
 
-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 0030.2 'lines with spaces at the beginning should be unchanged': 
+	echo "$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-)
-prerequisite NO_UTF16_BOM not satisfied
-checking prerequisite: NO_UTF32_BOM
+	echo "$sss$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF32_BOM" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF32_BOM" &&
-	test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12
+	echo "$sss$sss$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual
 
-)
-prerequisite NO_UTF32_BOM not satisfied
-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  
+ok 2 - lines with spaces at the beginning should be unchanged
 
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+expecting success of 0030.3 'lines with intermediate spaces should be unchanged': 
+	echo "$ttt$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual &&
 
-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  
+	echo "$ttt$sss$sss$ttt" >expect &&
+	git stripspace <expect >actual &&
+	test_cmp expect actual
 
-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 ?
+ok 3 - lines with intermediate spaces should be unchanged
 
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+expecting success of 0030.4 'consecutive blank lines should be unified': 
+	printf "$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-[main (root-commit) dfb2bb8] initial
- Author: A U Thor <author@example.com>
- 3 files changed, 6 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 test.utf16
- create mode 100644 test.utf16lebom
-ok 1 - setup test files
+	printf "$ttt\n\n$ttt$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0028.2 'ensure UTF-8 is stored in Git': 
-	test_when_finished "rm -f test.utf16.git" &&
+	printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-	git cat-file -p :test.utf16 >test.utf16.git &&
-	test_cmp_bin test.utf8.raw test.utf16.git
+	printf "$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-ok 2 - ensure UTF-8 is stored in Git
+	printf "$ttt$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-expecting success of 0028.3 're-encode to UTF-16 on checkout': 
-	test_when_finished "rm -f test.utf16.raw" &&
+	printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-	rm test.utf16 &&
-	git checkout test.utf16 &&
-	test_cmp_bin test.utf16.raw test.utf16
+	printf "$ttt\n\n$ttt\n" > expect &&
+	printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt\n\n$ttt$ttt\n" > expect &&
+	printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
+	printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual
 
-ok 3 - re-encode to UTF-16 on checkout
+ok 4 - consecutive blank lines should be unified
 
-expecting success of 0028.4 're-encode to UTF-16-LE-BOM on checkout': 
-	rm test.utf16lebom &&
-	git checkout test.utf16lebom &&
-	test_cmp_bin test.utf16lebom.raw test.utf16lebom
+expecting success of 0030.5 'only consecutive blank lines should be completely removed': 
+	printf "\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-Updated 1 path from the index
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+	printf "\n\n\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-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 ?
+	printf "$sss\n$sss\n$sss\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-ok 4 - re-encode to UTF-16-LE-BOM on checkout
+	printf "$sss$sss\n$sss\n\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-expecting success of 0028.5 'check $GIT_DIR/info/attributes support': 
-	test_when_finished "rm -f test.utf32.git" &&
-	test_when_finished "git reset --hard HEAD" &&
+	printf "\n$sss\n$sss$sss\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-	mkdir .git/info &&
-	echo "*.utf32 text working-tree-encoding=utf-32" >.git/info/attributes &&
-	git add test.utf32 &&
+	printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-	git cat-file -p :test.utf32 >test.utf32.git &&
-	test_cmp_bin test.utf8.raw test.utf32.git
+	printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-source (test.utf32, considered utf-32):
-|  0: ff   |  1: fe   |  2:  0   |  3:  0   |  4: 68 h |  5:  0   |  6:  0   |  7:  0  
-|  8: 61 a |  9:  0   | 10:  0   | 11:  0   | 12: 6c l | 13:  0   | 14:  0   | 15:  0  
-| 16: 6c l | 17:  0   | 18:  0   | 19:  0   | 20: 6f o | 21:  0   | 22:  0   | 23:  0  
-| 24: 20   | 25:  0   | 26:  0   | 27:  0   | 28: 74 t | 29:  0   | 30:  0   | 31:  0  
-| 32: 68 h | 33:  0   | 34:  0   | 35:  0   | 36: 65 e | 37:  0   | 38:  0   | 39:  0  
-| 40: 72 r | 41:  0   | 42:  0   | 43:  0   | 44: 65 e | 45:  0   | 46:  0   | 47:  0  
-| 48: 21 ! | 49:  0   | 50:  0   | 51:  0   | 52:  a   | 53:  0   | 54:  0   | 55:  0  
-| 56: 63 c | 57:  0   | 58:  0   | 59:  0   | 60: 61 a | 61:  0   | 62:  0   | 63:  0  
-| 64: 6e n | 65:  0   | 66:  0   | 67:  0   | 68: 20   | 69:  0   | 70:  0   | 71:  0  
-| 72: 79 y | 73:  0   | 74:  0   | 75:  0   | 76: 6f o | 77:  0   | 78:  0   | 79:  0  
-| 80: 75 u | 81:  0   | 82:  0   | 83:  0   | 84: 20   | 85:  0   | 86:  0   | 87:  0  
-| 88: 72 r | 89:  0   | 90:  0   | 91:  0   | 92: 65 e | 93:  0   | 94:  0   | 95:  0  
-| 96: 61 a | 97:  0   | 98:  0   | 99:  0   | 100: 64 d | 101:  0   | 102:  0   | 103:  0  
-| 104: 20   | 105:  0   | 106:  0   | 107:  0   | 108: 6d m | 109:  0   | 110:  0   | 111:  0  
-| 112: 65 e | 113:  0   | 114:  0   | 115:  0   | 116: 3f ? | 117:  0   | 118:  0   | 119:  0  
+	printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual &&
+	test_must_be_empty actual
 
-destination (test.utf32, 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 ?
+ok 5 - only consecutive blank lines should be completely removed
 
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+expecting success of 0030.6 'consecutive blank lines at the beginning should be removed': 
+	printf "$ttt\n" > expect &&
+	printf "\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt\n" > expect &&
+	printf "\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt$ttt\n" > expect &&
+	printf "\n\n\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt$ttt$ttt\n" > expect &&
+	printf "\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt$ttt$ttt$ttt\n" > expect &&
+	printf "\n\n\n$ttt$ttt$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt\n" > expect &&
 
-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  
+	printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual
 
-HEAD is now at dfb2bb8 initial
-ok 5 - check $GIT_DIR/info/attributes support
+ok 6 - consecutive blank lines at the beginning should be removed
 
-expecting success of 0028.6 'check prohibited UTF-16 BOM': 
-		test_when_finished "git reset --hard HEAD" &&
+expecting success of 0030.7 'consecutive blank lines at the end should be removed': 
+	printf "$ttt\n" > expect &&
+	printf "$ttt\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		echo "*.utf${i}be text working-tree-encoding=utf-${i}be" >>.gitattributes &&
-		echo "*.utf${i}le text working-tree-encoding=utf-${i}LE" >>.gitattributes &&
+	printf "$ttt\n" > expect &&
+	printf "$ttt\n\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		# Here we add a UTF-16 (resp. UTF-32) files with BOM (big/little-endian)
-		# but we tell Git to treat it as UTF-16BE/UTF-16LE (resp. UTF-32).
-		# In these cases the BOM is prohibited.
-		cp bebom.utf${i}be.raw bebom.utf${i}be &&
-		test_must_fail git add bebom.utf${i}be 2>err.out &&
-		test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
-		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
+	printf "$ttt$ttt\n" > expect &&
+	printf "$ttt$ttt\n\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		cp lebom.utf${i}le.raw lebom.utf${i}be &&
-		test_must_fail git add lebom.utf${i}be 2>err.out &&
-		test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
-		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
+	printf "$ttt$ttt$ttt\n" > expect &&
+	printf "$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		cp bebom.utf${i}be.raw bebom.utf${i}le &&
-		test_must_fail git add bebom.utf${i}le 2>err.out &&
-		test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
-		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
+	printf "$ttt$ttt$ttt$ttt\n" > expect &&
+	printf "$ttt$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		cp lebom.utf${i}le.raw lebom.utf${i}le &&
-		test_must_fail git add lebom.utf${i}le 2>err.out &&
-		test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
-		test_grep "use UTF-${i} as working-tree-encoding" err.out
-	
-fatal: BOM is prohibited in 'bebom.utf16be' if encoded as utf-16be
-hint: The file 'bebom.utf16be' contains a byte order mark (BOM). Please use UTF-16 as working-tree-encoding.
-fatal: BOM is prohibited in 'lebom.utf16be' if encoded as utf-16be
-hint: The file 'lebom.utf16be' contains a byte order mark (BOM). Please use UTF-16 as working-tree-encoding.
-fatal: BOM is prohibited in 'bebom.utf16le' if encoded as utf-16LE
-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  
+	printf "$ttt\n" > expect &&
 
-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 ?
+	printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual &&
+	test_cmp expect actual
 
-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 ?
+ok 7 - consecutive blank lines at the end should be removed
 
-HEAD is now at dfb2bb8 initial
-ok 6 - check prohibited UTF-16 BOM
+expecting success of 0030.8 'text without newline at end should end with newline': 
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$ttt"
 
-expecting success of 0028.7 'check required UTF-16 BOM': 
-		test_when_finished "git reset --hard HEAD" &&
+ok 8 - text without newline at end should end with newline
 
-		echo "*.utf${i} text working-tree-encoding=utf-${i}" >>.gitattributes &&
+expecting success of 0030.9 'text plus spaces without newline at end should end with newline': 
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss$sss" &&
+	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss$sss"
 
-		cp nobom.utf${i}be.raw nobom.utf${i} &&
-		test_must_fail git add nobom.utf${i} 2>err.out &&
-		test_grep "fatal: BOM is required .* utf-${i}" err.out &&
-		test_grep "use UTF-${i}BE or UTF-${i}LE" err.out &&
+ok 9 - text plus spaces without newline at end should end with newline
 
-		cp nobom.utf${i}le.raw nobom.utf${i} &&
-		test_must_fail git add nobom.utf${i} 2>err.out &&
-		test_grep "fatal: BOM is required .* utf-${i}" err.out &&
-		test_grep "use UTF-${i}BE or UTF-${i}LE" err.out
-	
-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.
-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  
+expecting success of 0030.10 'text plus spaces without newline at end should not show spaces': 
+	printf "$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$ttt$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	printf "$ttt$sss$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null
 
-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 ?
+ok 10 - text plus spaces without newline at end should not show spaces
 
-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  
+expecting success of 0030.11 'text plus spaces without newline should show the correct lines': 
+	printf "$ttt\n" >expect &&
+	printf "$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt\n" >expect &&
+	printf "$ttt$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt\n" >expect &&
+	printf "$ttt$sss$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt$ttt\n" >expect &&
+	printf "$ttt$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt$ttt\n" >expect &&
+	printf "$ttt$ttt$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt$ttt$ttt\n" >expect &&
+	printf "$ttt$ttt$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual
 
-HEAD is now at dfb2bb8 initial
-ok 7 - check required UTF-16 BOM
+ok 11 - text plus spaces without newline should show the correct lines
 
-expecting success of 0028.8 'eol conversion for UTF-16 encoded files on checkout': 
-		test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" &&
-		test_when_finished "git reset --hard HEAD^" &&
+expecting success of 0030.12 'text plus spaces at end should not show spaces': 
+	echo "$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$ttt$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null &&
+	echo "$ttt$sss$sss$sss" | git stripspace >tmp &&
+	! grep "  " tmp >/dev/null
 
-		write_utf${i} <lf.utf8.raw >lf.utf${i}.raw &&
-		write_utf${i} <crlf.utf8.raw >crlf.utf${i}.raw &&
-		cp crlf.utf${i}.raw eol.utf${i} &&
+ok 12 - text plus spaces at end should not show spaces
 
-		cat >expectIndexLF <<-EOF &&
-			i/lf    w/-text attr/text             	eol.utf${i}
-		EOF
+expecting success of 0030.13 'text plus spaces at end should be cleaned and newline must remain': 
+	echo "$ttt" >expect &&
+	echo "$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		git add eol.utf${i} &&
-		git commit -m eol &&
+	echo "$ttt" >expect &&
+	echo "$ttt$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		# UTF-${i} with CRLF (Windows line endings)
-		rm eol.utf${i} &&
-		git -c core.eol=crlf checkout eol.utf${i} &&
-		test_cmp_bin crlf.utf${i}.raw eol.utf${i} &&
+	echo "$ttt" >expect &&
+	echo "$ttt$sss$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		# Although the file has CRLF in the working tree,
-		# ensure LF in the index
-		git ls-files --eol eol.utf${i} >actual &&
-		test_cmp expectIndexLF actual &&
+	echo "$ttt$ttt" >expect &&
+	echo "$ttt$ttt$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		# UTF-${i} with LF (Unix line endings)
-		rm eol.utf${i} &&
-		git -c core.eol=lf checkout eol.utf${i} &&
-		test_cmp_bin lf.utf${i}.raw eol.utf${i} &&
+	echo "$ttt$ttt" >expect &&
+	echo "$ttt$ttt$sss$sss" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-		# The file LF in the working tree, ensure LF in the index
-		git ls-files --eol eol.utf${i} >actual &&
-		test_cmp expectIndexLF actual
-	
-checking prerequisite: NO_UTF16_BOM
+	echo "$ttt$ttt$ttt" >expect &&
+	echo "$ttt$ttt$ttt$sss" | git stripspace >actual &&
+	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
+ok 13 - text plus spaces at end should be cleaned and newline must remain
 
-)
-prerequisite NO_UTF16_BOM not satisfied
-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  
+expecting success of 0030.14 'spaces with newline at end should be replaced with empty string': 
+	echo | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-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  
+	echo "$sss" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-warning: in the working copy of 'eol.utf16', CRLF will be replaced by LF the next time Git touches it
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+	echo "$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-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 ?
+	echo "$sss$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-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  
+	echo "$sss$sss$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual
 
-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 ?
+ok 14 - spaces with newline at end should be replaced with empty string
 
-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  
+expecting success of 0030.15 'spaces without newline at end should not show spaces': 
+	printf "" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null &&
+	printf "$sss" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null &&
+	printf "$sss$sss" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null &&
+	printf "$sss$sss$sss" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null &&
+	printf "$sss$sss$sss$sss" | git stripspace >tmp &&
+	! grep " " tmp >/dev/null
 
-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  
+ok 15 - spaces without newline at end should not show spaces
 
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+expecting success of 0030.16 'spaces without newline at end should be replaced with empty string': 
+	printf "" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-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 ?
+	printf "$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-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  
+	printf "$sss$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual &&
 
-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 ?
+	printf "$sss$sss$sss$sss" | git stripspace >actual &&
+	test_must_be_empty actual
 
-[main 85a4f33] eol
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 eol.utf16
-Updated 1 path from the index
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+ok 16 - spaces without newline at end should be replaced with empty string
 
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
+expecting success of 0030.17 'consecutive text lines should be unchanged': 
+	printf "$ttt$ttt\n$ttt\n" >expect &&
+	printf "$ttt$ttt\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt\n$ttt$ttt\n$ttt\n" >expect &&
+	printf "$ttt\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" >expect &&
+	printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-Updated 1 path from the index
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+	printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" >expect &&
+	printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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 ?
+	printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" >expect &&
+	printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual &&
 
-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  
+	printf "$ttt\n$ttt$ttt\n\n$ttt\n" >expect &&
+	printf "$ttt\n$ttt$ttt\n\n$ttt\n" | git stripspace >actual &&
+	test_cmp expect actual
 
-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 ?
+ok 17 - consecutive text lines should be unchanged
 
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+expecting success of 0030.18 'strip comments, too': 
+	test ! -z "$(echo "# comment" | git stripspace)" &&
+	test -z "$(echo "# comment" | git stripspace -s)"
 
-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 ?
+ok 18 - strip comments, too
 
-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  
+expecting success of 0030.19 'strip comments with changed comment char': 
+	test ! -z "$(echo "; comment" | git -c core.commentchar=";" stripspace)" &&
+	test -z "$(echo "; comment" | git -c core.commentchar=";" stripspace -s)"
 
-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 ?
+ok 19 - strip comments with changed comment char
 
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+expecting success of 0030.20 'strip comments with changed comment string': 
+	test ! -z "$(echo "// comment" | git -c core.commentchar=// stripspace)" &&
+	test -z "$(echo "// comment" | git -c core.commentchar="//" stripspace -s)"
 
-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 ?
+ok 20 - strip comments with changed comment string
 
-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  
+expecting success of 0030.21 'newline as commentchar is forbidden': 
+	test_must_fail git -c core.commentChar="$LF" stripspace -s 2>err &&
+	grep "core.commentchar cannot contain newline" err
 
-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: core.commentchar cannot contain newline
+ok 21 - newline as commentchar is forbidden
 
-HEAD is now at dfb2bb8 initial
-ok 8 - eol conversion for UTF-16 encoded files on checkout
+expecting success of 0030.22 'empty commentchar is forbidden': 
+	test_must_fail git -c core.commentchar= stripspace -s 2>err &&
+	grep "core.commentchar must have at least one character" err
 
-expecting success of 0028.9 'check prohibited UTF-32 BOM': 
-		test_when_finished "git reset --hard HEAD" &&
+error: core.commentchar must have at least one character
+ok 22 - empty commentchar is forbidden
 
-		echo "*.utf${i}be text working-tree-encoding=utf-${i}be" >>.gitattributes &&
-		echo "*.utf${i}le text working-tree-encoding=utf-${i}LE" >>.gitattributes &&
+expecting success of 0030.23 '-c with single line': 
+	printf "# foo\n" >expect &&
+	printf "foo" | git stripspace -c >actual &&
+	test_cmp expect actual
 
-		# Here we add a UTF-16 (resp. UTF-32) files with BOM (big/little-endian)
-		# but we tell Git to treat it as UTF-16BE/UTF-16LE (resp. UTF-32).
-		# In these cases the BOM is prohibited.
-		cp bebom.utf${i}be.raw bebom.utf${i}be &&
-		test_must_fail git add bebom.utf${i}be 2>err.out &&
-		test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
-		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
+ok 23 - -c with single line
 
-		cp lebom.utf${i}le.raw lebom.utf${i}be &&
-		test_must_fail git add lebom.utf${i}be 2>err.out &&
-		test_grep "fatal: BOM is prohibited .* utf-${i}be" err.out &&
-		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
+expecting success of 0030.24 '-c with single line followed by empty line': 
+	printf "# foo\n#\n" >expect &&
+	printf "foo\n\n" | git stripspace -c >actual &&
+	test_cmp expect actual
 
-		cp bebom.utf${i}be.raw bebom.utf${i}le &&
-		test_must_fail git add bebom.utf${i}le 2>err.out &&
-		test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
-		test_grep "use UTF-${i} as working-tree-encoding" err.out &&
+ok 24 - -c with single line followed by empty line
 
-		cp lebom.utf${i}le.raw lebom.utf${i}le &&
-		test_must_fail git add lebom.utf${i}le 2>err.out &&
-		test_grep "fatal: BOM is prohibited .* utf-${i}LE" err.out &&
-		test_grep "use UTF-${i} as working-tree-encoding" err.out
-	
-fatal: BOM is prohibited in 'bebom.utf32be' if encoded as utf-32be
-hint: The file 'bebom.utf32be' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
-fatal: BOM is prohibited in 'lebom.utf32be' if encoded as utf-32be
-hint: The file 'lebom.utf32be' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
-fatal: BOM is prohibited in 'bebom.utf32le' if encoded as utf-32LE
-hint: The file 'bebom.utf32le' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
-fatal: BOM is prohibited in 'lebom.utf32le' if encoded as utf-32LE
-hint: The file 'lebom.utf32le' contains a byte order mark (BOM). Please use UTF-32 as working-tree-encoding.
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+expecting success of 0030.25 '-c with newline only': 
+	printf "#\n" >expect &&
+	printf "\n" | git stripspace -c >actual &&
+	test_cmp expect actual
 
-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 ?
+ok 25 - -c with newline only
 
-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  
+expecting success of 0030.26 '--comment-lines with single line': 
+	printf "# foo\n" >expect &&
+	printf "foo" | git stripspace -c >actual &&
+	test_cmp expect actual
 
-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 ?
+ok 26 - --comment-lines with single line
 
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+expecting success of 0030.27 '-c with changed comment char': 
+	printf "; foo\n" >expect &&
+	printf "foo" | git -c core.commentchar=";" stripspace -c >actual &&
+	test_cmp expect actual
 
-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 ?
+ok 27 - -c with changed comment char
 
-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  
+expecting success of 0030.28 '-c with comment char defined in .git/config': 
+	test_config core.commentchar = &&
+	printf "= foo\n" >expect &&
+	rm -fr sub &&
+	mkdir sub &&
+	printf "foo" | git -C sub stripspace -c >actual &&
+	test_cmp expect actual
 
-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 ?
+ok 28 - -c with comment char defined in .git/config
 
-HEAD is now at dfb2bb8 initial
-ok 9 - check prohibited UTF-32 BOM
+expecting success of 0030.29 '-c outside git repository': 
+	printf "# foo\n" >expect &&
+	printf "foo" | nongit git stripspace -c >actual &&
+	test_cmp expect actual
 
-expecting success of 0028.10 'check required UTF-32 BOM': 
-		test_when_finished "git reset --hard HEAD" &&
+ok 29 - -c outside git repository
 
-		echo "*.utf${i} text working-tree-encoding=utf-${i}" >>.gitattributes &&
+expecting success of 0030.30 'avoid SP-HT sequence in commented line': 
+	printf "#\tone\n#\n# two\n" >expect &&
+	printf "\tone\n\ntwo\n" | git stripspace -c >actual &&
+	test_cmp expect actual
 
-		cp nobom.utf${i}be.raw nobom.utf${i} &&
-		test_must_fail git add nobom.utf${i} 2>err.out &&
-		test_grep "fatal: BOM is required .* utf-${i}" err.out &&
-		test_grep "use UTF-${i}BE or UTF-${i}LE" err.out &&
+ok 30 - avoid SP-HT sequence in commented line
 
-		cp nobom.utf${i}le.raw nobom.utf${i} &&
-		test_must_fail git add nobom.utf${i} 2>err.out &&
-		test_grep "fatal: BOM is required .* utf-${i}" err.out &&
-		test_grep "use UTF-${i}BE or UTF-${i}LE" err.out
-	
-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.
-fatal: BOM is required in 'nobom.utf32' if encoded as utf-32
-hint: The file 'nobom.utf32' is missing a byte order mark (BOM). Please use UTF-32BE or UTF-32LE (depending on the byte order) as working-tree-encoding.
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+# passed all 30 test(s)
+1..30
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0041-usage.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0041-usage/.git/
+expecting success of 0041.1 'setup ': 
+	test_commit "v1.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 ?
+[main (root-commit) 843b676] v1.0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 v1.0.t
+ok 1 - setup 
 
-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  
+expecting success of 0041.2 'tag --contains <existent_tag>': 
+	git tag --contains "v1.0" >actual 2>actual.err &&
+	grep "v1.0" actual &&
+	test_line_count = 0 actual.err
 
-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 ?
+v1.0
+ok 2 - tag --contains <existent_tag>
 
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+expecting success of 0041.3 'tag --contains <inexistent_tag>': 
+	test_must_fail git tag --contains "notag" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
 
-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 ?
+error: malformed object name notag
+ok 3 - tag --contains <inexistent_tag>
 
-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  
+expecting success of 0041.4 'tag --no-contains <existent_tag>': 
+	git tag --no-contains "v1.0" >actual 2>actual.err  &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
 
-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 ?
+ok 4 - tag --no-contains <existent_tag>
 
-HEAD is now at dfb2bb8 initial
-ok 10 - check required UTF-32 BOM
+expecting success of 0041.5 'tag --no-contains <inexistent_tag>': 
+	test_must_fail git tag --no-contains "notag" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
 
-expecting success of 0028.11 'eol conversion for UTF-32 encoded files on checkout': 
-		test_when_finished "rm -f crlf.utf${i}.raw lf.utf${i}.raw" &&
-		test_when_finished "git reset --hard HEAD^" &&
+error: malformed object name notag
+ok 5 - tag --no-contains <inexistent_tag>
 
-		write_utf${i} <lf.utf8.raw >lf.utf${i}.raw &&
-		write_utf${i} <crlf.utf8.raw >crlf.utf${i}.raw &&
-		cp crlf.utf${i}.raw eol.utf${i} &&
+expecting success of 0041.6 'tag usage error': 
+	test_must_fail git tag --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "usage" actual.err
 
-		cat >expectIndexLF <<-EOF &&
-			i/lf    w/-text attr/text             	eol.utf${i}
-		EOF
+usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
+ok 6 - tag usage error
 
-		git add eol.utf${i} &&
-		git commit -m eol &&
+expecting success of 0041.7 'branch --contains <existent_commit>': 
+	git branch --contains "main" >actual 2>actual.err &&
+	test_grep "main" actual &&
+	test_line_count = 0 actual.err
 
-		# UTF-${i} with CRLF (Windows line endings)
-		rm eol.utf${i} &&
-		git -c core.eol=crlf checkout eol.utf${i} &&
-		test_cmp_bin crlf.utf${i}.raw eol.utf${i} &&
+* main
+ok 7 - branch --contains <existent_commit>
 
-		# Although the file has CRLF in the working tree,
-		# ensure LF in the index
-		git ls-files --eol eol.utf${i} >actual &&
-		test_cmp expectIndexLF actual &&
+expecting success of 0041.8 'branch --contains <inexistent_commit>': 
+	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
 
-		# UTF-${i} with LF (Unix line endings)
-		rm eol.utf${i} &&
-		git -c core.eol=lf checkout eol.utf${i} &&
-		test_cmp_bin lf.utf${i}.raw eol.utf${i} &&
+error: malformed object name nocommit
+ok 8 - branch --contains <inexistent_commit>
 
-		# The file LF in the working tree, ensure LF in the index
-		git ls-files --eol eol.utf${i} >actual &&
-		test_cmp expectIndexLF actual
-	
-checking prerequisite: NO_UTF32_BOM
+expecting success of 0041.9 'branch --no-contains <existent_commit>': 
+	git branch --no-contains "main" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF32_BOM" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NO_UTF32_BOM" &&
-	test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12
+ok 9 - branch --no-contains <existent_commit>
 
-)
-prerequisite NO_UTF32_BOM not satisfied
-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  
+expecting success of 0041.10 'branch --no-contains <inexistent_commit>': 
+	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
 
-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  
+error: malformed object name nocommit
+ok 10 - branch --no-contains <inexistent_commit>
 
-warning: in the working copy of 'eol.utf32', CRLF will be replaced by LF the next time Git touches it
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
+expecting success of 0041.11 'branch usage error': 
+	test_must_fail git branch --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "usage" actual.err
 
-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 ?
+usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
+ok 11 - branch usage error
 
-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.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-[main 674dc3f] eol
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 eol.utf32
-Updated 1 path from the index
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-Updated 1 path from the index
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-HEAD is now at dfb2bb8 initial
-ok 11 - eol conversion for UTF-32 encoded files on checkout
-
-expecting success of 0028.12 'check unsupported encodings': 
-	test_when_finished "git reset --hard HEAD" &&
-
-	echo "*.set text working-tree-encoding" >.gitattributes &&
-	printf "set" >t.set &&
-	test_must_fail git add t.set 2>err.out &&
-	test_grep "true/false are no valid working-tree-encodings" err.out &&
-
-	echo "*.unset text -working-tree-encoding" >.gitattributes &&
-	printf "unset" >t.unset &&
-	git add t.unset &&
-
-	echo "*.empty text working-tree-encoding=" >.gitattributes &&
-	printf "empty" >t.empty &&
-	git add t.empty &&
-
-	echo "*.garbage text working-tree-encoding=garbage" >.gitattributes &&
-	printf "garbage" >t.garbage &&
-	test_must_fail git add t.garbage 2>err.out &&
-	test_grep "failed to encode" err.out
-
-fatal: true/false are no valid working-tree-encodings
-fatal: failed to encode 't.garbage' from garbage to UTF-8
-HEAD is now at dfb2bb8 initial
-ok 12 - check unsupported encodings
-
-expecting success of 0028.13 'error if encoding round trip is not the same during refresh': 
-	BEFORE_STATE=$(git rev-parse HEAD) &&
-	test_when_finished "git reset --hard $BEFORE_STATE" &&
-
-	# Add and commit a UTF-16 file but skip the "working-tree-encoding"
-	# filter. Consequently, the in-repo representation is UTF-16 and not
-	# UTF-8. This simulates a Git version that has no working tree encoding
-	# support.
-	echo "*.utf16le text working-tree-encoding=utf-16le" >.gitattributes &&
-	echo "hallo" >nonsense.utf16le &&
-	TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16le) &&
-	git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16le &&
-	COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
-	git update-ref refs/heads/main $COMMIT &&
-
-	test_must_fail git checkout HEAD^ 2>err.out &&
-	test_grep "error: .* overwritten by checkout:" err.out
-
-error: Your local changes to the following files would be overwritten by checkout:
-HEAD is now at dfb2bb8 initial
-ok 13 - error if encoding round trip is not the same during refresh
-
-expecting success of 0028.14 'error if encoding garbage is already in Git': 
-	BEFORE_STATE=$(git rev-parse HEAD) &&
-	test_when_finished "git reset --hard $BEFORE_STATE" &&
-
-	# Skip the UTF-16 filter for the added file
-	# This simulates a Git version that has no checkoutEncoding support
-	cp nobom.utf16be.raw nonsense.utf16 &&
-	TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16) &&
-	git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16 &&
-	COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
-	git update-ref refs/heads/main $COMMIT &&
-
-	git diff 2>err.out &&
-	test_grep "error: BOM is required" err.out
-
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-error: BOM is required in 'nonsense.utf16' if encoded as utf-16
-error: BOM is required in 'nonsense.utf16' if encoded as utf-16
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-HEAD is now at dfb2bb8 initial
-ok 14 - error if encoding garbage is already in Git
-
-checking prerequisite: ICONV_SHIFT_JIS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ICONV_SHIFT_JIS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-ICONV_SHIFT_JIS" &&
-	iconv -f UTF-8 -t SHIFT-JIS </dev/null
-
-)
-prerequisite ICONV_SHIFT_JIS ok
-expecting success of 0028.15 'check roundtrip encoding': 
-	test_when_finished "rm -f roundtrip.shift roundtrip.utf16" &&
-	test_when_finished "git reset --hard HEAD" &&
-
-	text="hallo there!\nroundtrip test here!" &&
-	printf "$text" | iconv -f UTF-8 -t SHIFT-JIS >roundtrip.shift &&
-	printf "$text" | write_utf16 >roundtrip.utf16 &&
-	echo "*.shift text working-tree-encoding=SHIFT-JIS" >>.gitattributes &&
-
-	# SHIFT-JIS encoded files are round-trip checked by default...
-	GIT_TRACE=1 git add .gitattributes roundtrip.shift 2>&1 |
-		grep "Checking roundtrip encoding for SHIFT-JIS" &&
-	git reset &&
-
-	# ... unless we overwrite the Git config!
-	! GIT_TRACE=1 git -c core.checkRoundtripEncoding=garbage \
-		add .gitattributes roundtrip.shift 2>&1 |
-		grep "Checking roundtrip encoding for SHIFT-JIS" &&
-	git reset &&
-
-	# UTF-16 encoded files should not be round-trip checked by default...
-	! GIT_TRACE=1 git add roundtrip.utf16 2>&1 |
-		grep "Checking roundtrip encoding for UTF-16" &&
-	git reset &&
-
-	# ... unless we tell Git to check it!
-	GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-16, UTF-32" \
-		add roundtrip.utf16 2>&1 |
-		grep "Checking roundtrip encoding for utf-16" &&
-	git reset &&
-
-	# ... unless we tell Git to check it!
-	# (here we also check that the casing of the encoding is irrelevant)
-	GIT_TRACE=1 git -c core.checkRoundtripEncoding="UTF-32, utf-16" \
-		add roundtrip.utf16 2>&1 |
-		grep "Checking roundtrip encoding for utf-16" &&
-	git reset
-
-Checking roundtrip encoding for SHIFT-JIS...
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-Unstaged changes after reset:
-M	.gitattributes
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-Unstaged changes after reset:
-M	.gitattributes
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-Unstaged changes after reset:
-M	.gitattributes
-Checking roundtrip encoding for utf-16...
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-Unstaged changes after reset:
-M	.gitattributes
-Checking roundtrip encoding for utf-16...
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-Unstaged changes after reset:
-M	.gitattributes
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16, considered utf-16):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-source (test.utf16lebom, considered UTF-16LE-BOM):
-|  0: ff   |  1: fe   |  2: 68 h |  3:  0   |  4: 61 a |  5:  0   |  6: 6c l |  7:  0  
-|  8: 6c l |  9:  0   | 10: 6f o | 11:  0   | 12: 20   | 13:  0   | 14: 74 t | 15:  0  
-| 16: 68 h | 17:  0   | 18: 65 e | 19:  0   | 20: 72 r | 21:  0   | 22: 65 e | 23:  0  
-| 24: 21 ! | 25:  0   | 26:  a   | 27:  0   | 28: 63 c | 29:  0   | 30: 61 a | 31:  0  
-| 32: 6e n | 33:  0   | 34: 20   | 35:  0   | 36: 79 y | 37:  0   | 38: 6f o | 39:  0  
-| 40: 75 u | 41:  0   | 42: 20   | 43:  0   | 44: 72 r | 45:  0   | 46: 65 e | 47:  0  
-| 48: 61 a | 49:  0   | 50: 64 d | 51:  0   | 52: 20   | 53:  0   | 54: 6d m | 55:  0  
-| 56: 65 e | 57:  0   | 58: 3f ? | 59:  0  
-
-destination (test.utf16lebom, considered UTF-8):
-|  0: 68 h |  1: 61 a |  2: 6c l |  3: 6c l |  4: 6f o |  5: 20   |  6: 74 t |  7: 68 h
-|  8: 65 e |  9: 72 r | 10: 65 e | 11: 21 ! | 12:  a   | 13: 63 c | 14: 61 a | 15: 6e n
-| 16: 20   | 17: 79 y | 18: 6f o | 19: 75 u | 20: 20   | 21: 72 r | 22: 65 e | 23: 61 a
-| 24: 64 d | 25: 20   | 26: 6d m | 27: 65 e | 28: 3f ?
-
-HEAD is now at dfb2bb8 initial
-ok 15 - check roundtrip encoding
-
-expecting success of 0028.16 'Commit UTF-8, checkout UTF-8': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
-
-		test_ext="commit_utf8_checkout_$encoding" &&
-		test_file="test.$test_ext" &&
-
-		# Commit as UTF-8
-		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
-		printf "$orig_string" >$test_file &&
-		git add $test_file &&
-		git commit -m "Test data" &&
-
-		# Checkout in tested encoding
-		rm $test_file &&
-		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
-		git checkout HEAD -- $test_file &&
-
-		# Test
-		printf $expect_bytes >$test_file.raw &&
-		test_cmp_bin $test_file.raw $test_file
-	
-[main 7887505] Test data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.commit_utf8_checkout_UTF-8
-ok 16 - Commit UTF-8, checkout UTF-8
-
-expecting success of 0028.17 'Commit UTF-8, checkout UTF-16LE': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
-
-		test_ext="commit_utf8_checkout_$encoding" &&
-		test_file="test.$test_ext" &&
-
-		# Commit as UTF-8
-		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
-		printf "$orig_string" >$test_file &&
-		git add $test_file &&
-		git commit -m "Test data" &&
-
-		# Checkout in tested encoding
-		rm $test_file &&
-		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
-		git checkout HEAD -- $test_file &&
-
-		# Test
-		printf $expect_bytes >$test_file.raw &&
-		test_cmp_bin $test_file.raw $test_file
-	
-[main dd0bb11] Test data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.commit_utf8_checkout_UTF-16LE
-ok 17 - Commit UTF-8, checkout UTF-16LE
-
-expecting success of 0028.18 'Commit UTF-8, checkout UTF-16BE': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
-
-		test_ext="commit_utf8_checkout_$encoding" &&
-		test_file="test.$test_ext" &&
-
-		# Commit as UTF-8
-		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
-		printf "$orig_string" >$test_file &&
-		git add $test_file &&
-		git commit -m "Test data" &&
-
-		# Checkout in tested encoding
-		rm $test_file &&
-		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
-		git checkout HEAD -- $test_file &&
-
-		# Test
-		printf $expect_bytes >$test_file.raw &&
-		test_cmp_bin $test_file.raw $test_file
-	
-[main ccf08f2] Test data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.commit_utf8_checkout_UTF-16BE
-ok 18 - Commit UTF-8, checkout UTF-16BE
-
-expecting success of 0028.19 'Commit UTF-8, checkout UTF-16LE-BOM': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
-
-		test_ext="commit_utf8_checkout_$encoding" &&
-		test_file="test.$test_ext" &&
-
-		# Commit as UTF-8
-		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
-		printf "$orig_string" >$test_file &&
-		git add $test_file &&
-		git commit -m "Test data" &&
-
-		# Checkout in tested encoding
-		rm $test_file &&
-		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
-		git checkout HEAD -- $test_file &&
-
-		# Test
-		printf $expect_bytes >$test_file.raw &&
-		test_cmp_bin $test_file.raw $test_file
-	
-[main bb82fa0] Test data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.commit_utf8_checkout_UTF-16LE-BOM
-ok 19 - Commit UTF-8, checkout UTF-16LE-BOM
-
-expecting success of 0028.20 'Commit UTF-8, checkout UTF-16BE-BOM': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
-
-		test_ext="commit_utf8_checkout_$encoding" &&
-		test_file="test.$test_ext" &&
-
-		# Commit as UTF-8
-		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
-		printf "$orig_string" >$test_file &&
-		git add $test_file &&
-		git commit -m "Test data" &&
-
-		# Checkout in tested encoding
-		rm $test_file &&
-		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
-		git checkout HEAD -- $test_file &&
-
-		# Test
-		printf $expect_bytes >$test_file.raw &&
-		test_cmp_bin $test_file.raw $test_file
-	
-[main 434b0e2] Test data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.commit_utf8_checkout_UTF-16BE-BOM
-ok 20 - Commit UTF-8, checkout UTF-16BE-BOM
-
-expecting success of 0028.21 'Commit UTF-8, checkout UTF-32LE': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
-
-		test_ext="commit_utf8_checkout_$encoding" &&
-		test_file="test.$test_ext" &&
-
-		# Commit as UTF-8
-		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
-		printf "$orig_string" >$test_file &&
-		git add $test_file &&
-		git commit -m "Test data" &&
-
-		# Checkout in tested encoding
-		rm $test_file &&
-		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
-		git checkout HEAD -- $test_file &&
-
-		# Test
-		printf $expect_bytes >$test_file.raw &&
-		test_cmp_bin $test_file.raw $test_file
-	
-[main 4ebb4c9] Test data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.commit_utf8_checkout_UTF-32LE
-ok 21 - Commit UTF-8, checkout UTF-32LE
-
-expecting success of 0028.22 'Commit UTF-8, checkout UTF-32BE': 
-		test_when_finished "git checkout HEAD -- .gitattributes" &&
-
-		test_ext="commit_utf8_checkout_$encoding" &&
-		test_file="test.$test_ext" &&
-
-		# Commit as UTF-8
-		echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
-		printf "$orig_string" >$test_file &&
-		git add $test_file &&
-		git commit -m "Test data" &&
-
-		# Checkout in tested encoding
-		rm $test_file &&
-		echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
-		git checkout HEAD -- $test_file &&
-
-		# Test
-		printf $expect_bytes >$test_file.raw &&
-		test_cmp_bin $test_file.raw $test_file
-	
-[main bfde51e] Test data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.commit_utf8_checkout_UTF-32BE
-ok 22 - Commit UTF-8, checkout UTF-32BE
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0033-safe-directory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/.git/
-expecting success of 0033.1 'safe.directory is not set': 
-	expect_rejected_dir
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
-ok 1 - safe.directory is not set
-
-expecting success of 0033.2 'safe.directory on the command line': 
-	git -c safe.directory="$(pwd)" status
-
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 2 - safe.directory on the command line
-
-expecting success of 0033.3 'safe.directory in the environment': 
-	env GIT_CONFIG_COUNT=1 \
-	    GIT_CONFIG_KEY_0="safe.directory" \
-	    GIT_CONFIG_VALUE_0="$(pwd)" \
-	    git status
-
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 3 - safe.directory in the environment
-
-expecting success of 0033.4 'safe.directory in GIT_CONFIG_PARAMETERS': 
-	env GIT_CONFIG_PARAMETERS="${SQ}safe.directory${SQ}=${SQ}$(pwd)${SQ}" \
-	    git status
-
-On branch master
-
-No commits yet
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	err
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 4 - safe.directory in GIT_CONFIG_PARAMETERS
-
-expecting success of 0033.5 'ignoring safe.directory in repo config': 
-	(
-		unset GIT_TEST_ASSUME_DIFFERENT_OWNER &&
-		git config safe.directory "$(pwd)"
-	) &&
-	expect_rejected_dir
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
-ok 5 - ignoring safe.directory in repo config
-
-expecting success of 0033.6 'safe.directory does not match': 
-	git config --global safe.directory bogus &&
-	expect_rejected_dir
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
-ok 6 - safe.directory does not match
-
-expecting success of 0033.7 'path exist as different key': 
-	git config --global foo.bar "$(pwd)" &&
-	expect_rejected_dir
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
-ok 7 - path exist as different key
-
-expecting success of 0033.8 'safe.directory matches': 
-	git config --global --add safe.directory "$(pwd)" &&
-	git status
-
-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
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
-ok 9 - safe.directory matches, but is reset
-
-expecting success of 0033.10 'safe.directory=*': 
-	git config --global --add safe.directory "*" &&
-	git status
-
-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
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory'
-ok 11 - safe.directory=*, but is reset
-
-expecting success of 0033.12 'safe.directory in included file': 
-	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 12 - safe.directory in included file
-
-expecting success of 0033.13 '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.45.2/t/trash directory.t0033-safe-directory/source/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into 'target'...
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/source/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/source/.git'
-fatal: Could not read from remote repository.
-
-Please make sure you have the correct access rights
-and the repository exists.
-ok 13 - local clone of unowned repo refused in unsafe directory
-
-expecting success of 0033.14 '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.45.2/t/trash directory.t0033-safe-directory/source/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into 'target'...
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/source/.git'
-To add an exception for this directory, call:
-
-	git config --global --add safe.directory '/build/reproducible-path/git-2.45.2/t/trash directory.t0033-safe-directory/source/.git'
-fatal: Could not read from remote repository.
-
-Please make sure you have the correct access rights
-and the repository exists.
-Cloning into 'target'...
-done.
-ok 14 - local clone of unowned repo accepted in safe directory
-
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0010-racy-git.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0010-racy-git/.git/
-expecting success of 0010.1 'Racy git trial #0 part A': 
-		rm -f .git/index &&
-		echo frotz >infocom &&
-		git update-index --add infocom &&
-		echo xyzzy >infocom &&
-
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 1 - Racy git trial #0 part A
-
-expecting success of 0010.2 'Racy git trial #0 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
-
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 2 - Racy git trial #0 part B
-
-expecting success of 0010.3 'Racy git trial #1 part A': 
-		rm -f .git/index &&
-		echo frotz >infocom &&
-		git update-index --add infocom &&
-		echo xyzzy >infocom &&
-
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 3 - Racy git trial #1 part A
-
-expecting success of 0010.4 'Racy git trial #1 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
-
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 4 - Racy git trial #1 part B
-
-expecting success of 0010.5 'Racy git trial #2 part A': 
-		rm -f .git/index &&
-		echo frotz >infocom &&
-		git update-index --add infocom &&
-		echo xyzzy >infocom &&
-
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 5 - Racy git trial #2 part A
-
-expecting success of 0010.6 'Racy git trial #2 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+expecting success of 0041.12 'for-each-ref --contains <existent_object>': 
+	git for-each-ref --contains "main" >actual 2>actual.err &&
+	test_line_count = 2 actual &&
+	test_line_count = 0 actual.err
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 6 - Racy git trial #2 part B
+ok 12 - for-each-ref --contains <existent_object>
 
-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 0041.13 'for-each-ref --contains <inexistent_object>': 
+	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 7 - Racy git trial #3 part A
+error: malformed object name noobject
+ok 13 - for-each-ref --contains <inexistent_object>
 
-expecting success of 0010.8 'Racy git trial #3 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+expecting success of 0041.14 'for-each-ref --no-contains <existent_object>': 
+	git for-each-ref --no-contains "main" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_line_count = 0 actual.err
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 8 - Racy git trial #3 part B
+ok 14 - for-each-ref --no-contains <existent_object>
 
-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 0041.15 'for-each-ref --no-contains <inexistent_object>': 
+	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "error" actual.err &&
+	test_grep ! "usage" actual.err
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 9 - Racy git trial #4 part A
+error: malformed object name noobject
+ok 15 - for-each-ref --no-contains <inexistent_object>
 
-expecting success of 0010.10 'Racy git trial #4 part B': 
-		echo xyzzy >cornerstone &&
-		git update-index --add cornerstone &&
+expecting success of 0041.16 'for-each-ref usage error': 
+	test_must_fail git for-each-ref --noopt >actual 2>actual.err &&
+	test_line_count = 0 actual &&
+	test_grep "usage" actual.err
 
-		git diff-files -p >out &&
-		test_file_not_empty out
-	
-ok 10 - Racy git trial #4 part B
+usage: git for-each-ref [<options>] [<pattern>]
+ok 16 - for-each-ref usage error
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0034-root-safe-directory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0034-root-safe-directory/.git/
-1..0 # SKIP You must set env var GIT_TEST_ALLOW_SUDO=YES in order to run this test
+# passed all 16 test(s)
+1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0035-safe-bare-repository.sh ***
@@ -22652,7 +24027,7 @@
 	expect_accepted_implicit -C outer-repo/bare-repo
 
 .
-01:32:22.709128 setup.c:1440                 | d0 | main                     | data         |     |  0.000799 |  0.000799 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+19:26:22.315912 setup.c:1440                 | d0 | main                     | data         |     |  0.000658 |  0.000658 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 2 - safe.bareRepository unset
 
 expecting success of 0035.3 'safe.bareRepository=all': 
@@ -22660,7 +24035,7 @@
 	expect_accepted_implicit -C outer-repo/bare-repo
 
 .
-01:32:22.716897 setup.c:1440                 | d0 | main                     | data         |     |  0.000742 |  0.000742 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+19:26:22.395801 setup.c:1440                 | d0 | main                     | data         |     |  0.000554 |  0.000554 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 3 - safe.bareRepository=all
 
 expecting success of 0035.4 'safe.bareRepository=explicit': 
@@ -22668,7 +24043,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-01:32:22.727730 setup.c:1440                 | d0 | main                     | data         |     |  0.000757 |  0.000757 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+19:26:22.523775 setup.c:1440                 | d0 | main                     | data         |     |  0.000586 |  0.000586 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 4 - safe.bareRepository=explicit
 
 expecting success of 0035.5 'safe.bareRepository in the repository': 
@@ -22680,7 +24055,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-01:32:22.754677 setup.c:1440                 | d0 | main                     | data         |     |  0.000774 |  0.000774 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+19:26:22.637134 setup.c:1440                 | d0 | main                     | data         |     |  0.000574 |  0.000574 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 5 - safe.bareRepository in the repository
 
 expecting success of 0035.6 'safe.bareRepository on the command line': 
@@ -22689,7 +24064,7 @@
 		-c safe.bareRepository=all
 
 .
-01:32:22.777726 setup.c:1440                 | d0 | main                     | data         |     |  0.000728 |  0.000728 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+19:26:22.738940 setup.c:1440                 | d0 | main                     | data         |     |  0.000571 |  0.000571 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 6 - safe.bareRepository on the command line
 
 expecting success of 0035.7 'safe.bareRepository in included file': 
@@ -22701,7 +24076,7 @@
 	expect_rejected -C outer-repo/bare-repo
 
 fatal: cannot use bare repository '/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo' (safe.bareRepository is 'explicit')
-01:32:22.803631 setup.c:1440                 | d0 | main                     | data         |     |  0.000774 |  0.000774 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
+19:26:22.797421 setup.c:1440                 | d0 | main                     | data         |     |  0.000765 |  0.000765 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/bare-repo
 ok 7 - safe.bareRepository in included file
 
 expecting success of 0035.8 'no trace when GIT_DIR is explicitly provided': 
@@ -22714,655 +24089,34 @@
 	expect_accepted_implicit -C outer-repo/.git
 
 .
-01:32:22.817022 setup.c:1440                 | d0 | main                     | data         |     |  0.001058 |  0.001058 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+19:26:22.920298 setup.c:1440                 | d0 | main                     | data         |     |  0.000680 |  0.000680 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
 ok 9 - no trace when "bare repository" is .git
 
 expecting success of 0035.10 'no trace when "bare repository" is a subdir of .git': 
 	expect_accepted_implicit -C outer-repo/.git/objects
 
 /build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
-01:32:22.823190 setup.c:1440                 | d0 | main                     | data         |     |  0.000724 |  0.000724 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
+19:26:22.979952 setup.c:1440                 | d0 | main                     | data         |     |  0.000637 |  0.000637 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git
 ok 10 - no trace when "bare repository" is a subdir of .git
 
 expecting success of 0035.11 'no trace in $GIT_DIR of secondary worktree': 
 	expect_accepted_implicit -C outer-repo/.git/worktrees/outer-secondary
 
 .
-01:32:22.828791 setup.c:1440                 | d0 | main                     | data         |     |  0.000853 |  0.000853 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/worktrees/outer-secondary
+19:26:23.054529 setup.c:1440                 | d0 | main                     | data         |     |  0.001831 |  0.001831 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/worktrees/outer-secondary
 ok 11 - no trace in $GIT_DIR of secondary worktree
 
 expecting success of 0035.12 'no trace in $GIT_DIR of a submodule': 
 	expect_accepted_implicit -C outer-repo/.git/modules/subn
 
 .
-01:32:22.834240 setup.c:1440                 | d0 | main                     | data         |     |  0.000723 |  0.000723 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/modules/subn
+19:26:23.099818 setup.c:1440                 | d0 | main                     | data         |     |  0.000605 |  0.000605 | setup        | implicit-bare-repository:/build/reproducible-path/git-2.45.2/t/trash directory.t0035-safe-bare-repository/outer-repo/.git/modules/subn
 ok 12 - no trace in $GIT_DIR of a submodule
 
 # passed all 12 test(s)
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0041-usage.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0041-usage/.git/
-expecting success of 0041.1 'setup ': 
-	test_commit "v1.0"
-
-[main (root-commit) 843b676] v1.0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 v1.0.t
-ok 1 - setup 
-
-expecting success of 0041.2 'tag --contains <existent_tag>': 
-	git tag --contains "v1.0" >actual 2>actual.err &&
-	grep "v1.0" actual &&
-	test_line_count = 0 actual.err
-
-v1.0
-ok 2 - tag --contains <existent_tag>
-
-expecting success of 0041.3 'tag --contains <inexistent_tag>': 
-	test_must_fail git tag --contains "notag" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
-
-error: malformed object name notag
-ok 3 - tag --contains <inexistent_tag>
-
-expecting success of 0041.4 'tag --no-contains <existent_tag>': 
-	git tag --no-contains "v1.0" >actual 2>actual.err  &&
-	test_line_count = 0 actual &&
-	test_line_count = 0 actual.err
-
-ok 4 - tag --no-contains <existent_tag>
-
-expecting success of 0041.5 'tag --no-contains <inexistent_tag>': 
-	test_must_fail git tag --no-contains "notag" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
-
-error: malformed object name notag
-ok 5 - tag --no-contains <inexistent_tag>
-
-expecting success of 0041.6 'tag usage error': 
-	test_must_fail git tag --noopt >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "usage" actual.err
-
-usage: git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]
-ok 6 - tag usage error
-
-expecting success of 0041.7 'branch --contains <existent_commit>': 
-	git branch --contains "main" >actual 2>actual.err &&
-	test_grep "main" actual &&
-	test_line_count = 0 actual.err
-
-* main
-ok 7 - branch --contains <existent_commit>
-
-expecting success of 0041.8 'branch --contains <inexistent_commit>': 
-	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
-
-error: malformed object name nocommit
-ok 8 - branch --contains <inexistent_commit>
-
-expecting success of 0041.9 'branch --no-contains <existent_commit>': 
-	git branch --no-contains "main" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_line_count = 0 actual.err
-
-ok 9 - branch --no-contains <existent_commit>
-
-expecting success of 0041.10 'branch --no-contains <inexistent_commit>': 
-	test_must_fail git branch --no-contains "nocommit" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
-
-error: malformed object name nocommit
-ok 10 - branch --no-contains <inexistent_commit>
-
-expecting success of 0041.11 'branch usage error': 
-	test_must_fail git branch --noopt >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "usage" actual.err
-
-usage: git branch [<options>] [-r | -a] [--merged] [--no-merged]
-ok 11 - branch usage error
-
-expecting success of 0041.12 'for-each-ref --contains <existent_object>': 
-	git for-each-ref --contains "main" >actual 2>actual.err &&
-	test_line_count = 2 actual &&
-	test_line_count = 0 actual.err
-
-ok 12 - for-each-ref --contains <existent_object>
-
-expecting success of 0041.13 'for-each-ref --contains <inexistent_object>': 
-	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
-
-error: malformed object name noobject
-ok 13 - for-each-ref --contains <inexistent_object>
-
-expecting success of 0041.14 'for-each-ref --no-contains <existent_object>': 
-	git for-each-ref --no-contains "main" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_line_count = 0 actual.err
-
-ok 14 - for-each-ref --no-contains <existent_object>
-
-expecting success of 0041.15 'for-each-ref --no-contains <inexistent_object>': 
-	test_must_fail git for-each-ref --no-contains "noobject" >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "error" actual.err &&
-	test_grep ! "usage" actual.err
-
-error: malformed object name noobject
-ok 15 - for-each-ref --no-contains <inexistent_object>
-
-expecting success of 0041.16 'for-each-ref usage error': 
-	test_must_fail git for-each-ref --noopt >actual 2>actual.err &&
-	test_line_count = 0 actual &&
-	test_grep "usage" actual.err
-
-usage: git for-each-ref [<options>] [<pattern>]
-ok 16 - for-each-ref usage error
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0030-stripspace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0030-stripspace/.git/
-expecting success of 0030.1 'long lines without spaces should be unchanged': 
-	echo "$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual &&
-
-	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$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual
-
-ok 1 - long lines without spaces should be unchanged
-
-expecting success of 0030.2 'lines with spaces at the beginning should be unchanged': 
-	echo "$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual &&
-
-	echo "$sss$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual &&
-
-	echo "$sss$sss$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual
-
-ok 2 - lines with spaces at the beginning should be unchanged
-
-expecting success of 0030.3 'lines with intermediate spaces should be unchanged': 
-	echo "$ttt$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual &&
-
-	echo "$ttt$sss$sss$ttt" >expect &&
-	git stripspace <expect >actual &&
-	test_cmp expect actual
-
-ok 3 - lines with intermediate spaces should be unchanged
-
-expecting success of 0030.4 'consecutive blank lines should be unified': 
-	printf "$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt$ttt$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n$ttt$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt$ttt$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n$ttt\n" > expect &&
-	printf "$ttt\n\t\n \n\n  \t\t\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n$ttt$ttt\n" > expect &&
-	printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n$ttt$ttt$ttt\n" > expect &&
-	printf "$ttt\n\t\n \n\n  \t\t\n$ttt$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual
-
-ok 4 - consecutive blank lines should be unified
-
-expecting success of 0030.5 'only consecutive blank lines should be completely removed': 
-	printf "\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "\n\n\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "$sss\n$sss\n$sss\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "$sss$sss\n$sss\n\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "\n$sss\n$sss$sss\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "$sss$sss$sss$sss\n\n\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "\n$sss$sss$sss$sss\n\n" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "\n\n$sss$sss$sss$sss\n" | git stripspace >actual &&
-	test_must_be_empty actual
-
-ok 5 - only consecutive blank lines should be completely removed
-
-expecting success of 0030.6 'consecutive blank lines at the beginning should be removed': 
-	printf "$ttt\n" > expect &&
-	printf "\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n" > expect &&
-	printf "\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt\n" > expect &&
-	printf "\n\n\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt$ttt\n" > expect &&
-	printf "\n\n\n$ttt$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt$ttt$ttt\n" > expect &&
-	printf "\n\n\n$ttt$ttt$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n" > expect &&
-
-	printf "$sss\n$sss\n$sss\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "\n$sss\n$sss$sss\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$sss$sss\n$sss\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$sss$sss$sss\n\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "\n$sss$sss$sss\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "\n\n$sss$sss$sss\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual
-
-ok 6 - consecutive blank lines at the beginning should be removed
-
-expecting success of 0030.7 'consecutive blank lines at the end should be removed': 
-	printf "$ttt\n" > expect &&
-	printf "$ttt\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n" > expect &&
-	printf "$ttt\n\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt\n" > expect &&
-	printf "$ttt$ttt\n\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt$ttt\n" > expect &&
-	printf "$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt$ttt$ttt\n" > expect &&
-	printf "$ttt$ttt$ttt$ttt\n\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n" > expect &&
-
-	printf "$ttt\n$sss\n$sss\n$sss\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n$sss\n$sss$sss\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n$sss$sss\n$sss\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n$sss$sss$sss\n\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n$sss$sss$sss\n\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n\n\n$sss$sss$sss\n" | git stripspace >actual &&
-	test_cmp expect actual
-
-ok 7 - consecutive blank lines at the end should be removed
-
-expecting success of 0030.8 'text without newline at end should end with newline': 
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$ttt"
-
-ok 8 - text without newline at end should end with newline
-
-expecting success of 0030.9 'text plus spaces without newline at end should end with newline': 
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$ttt$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$ttt$sss$sss" &&
-	test_stdout_line_count -gt 0 printf_git_stripspace "$ttt$sss$sss$sss"
-
-ok 9 - text plus spaces without newline at end should end with newline
-
-expecting success of 0030.10 'text plus spaces without newline at end should not show spaces': 
-	printf "$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$ttt$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	printf "$ttt$sss$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null
-
-ok 10 - text plus spaces without newline at end should not show spaces
-
-expecting success of 0030.11 'text plus spaces without newline should show the correct lines': 
-	printf "$ttt\n" >expect &&
-	printf "$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n" >expect &&
-	printf "$ttt$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n" >expect &&
-	printf "$ttt$sss$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt\n" >expect &&
-	printf "$ttt$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt\n" >expect &&
-	printf "$ttt$ttt$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt$ttt\n" >expect &&
-	printf "$ttt$ttt$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual
-
-ok 11 - text plus spaces without newline should show the correct lines
-
-expecting success of 0030.12 'text plus spaces at end should not show spaces': 
-	echo "$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$ttt$ttt$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$ttt$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null &&
-	echo "$ttt$sss$sss$sss" | git stripspace >tmp &&
-	! grep "  " tmp >/dev/null
-
-ok 12 - text plus spaces at end should not show spaces
-
-expecting success of 0030.13 'text plus spaces at end should be cleaned and newline must remain': 
-	echo "$ttt" >expect &&
-	echo "$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	echo "$ttt" >expect &&
-	echo "$ttt$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	echo "$ttt" >expect &&
-	echo "$ttt$sss$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	echo "$ttt$ttt" >expect &&
-	echo "$ttt$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	echo "$ttt$ttt" >expect &&
-	echo "$ttt$ttt$sss$sss" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	echo "$ttt$ttt$ttt" >expect &&
-	echo "$ttt$ttt$ttt$sss" | git stripspace >actual &&
-	test_cmp expect actual
-
-ok 13 - text plus spaces at end should be cleaned and newline must remain
-
-expecting success of 0030.14 'spaces with newline at end should be replaced with empty string': 
-	echo | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	echo "$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	echo "$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	echo "$sss$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	echo "$sss$sss$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual
-
-ok 14 - spaces with newline at end should be replaced with empty string
-
-expecting success of 0030.15 'spaces without newline at end should not show spaces': 
-	printf "" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null &&
-	printf "$sss" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null &&
-	printf "$sss$sss" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null &&
-	printf "$sss$sss$sss" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null &&
-	printf "$sss$sss$sss$sss" | git stripspace >tmp &&
-	! grep " " tmp >/dev/null
-
-ok 15 - spaces without newline at end should not show spaces
-
-expecting success of 0030.16 'spaces without newline at end should be replaced with empty string': 
-	printf "" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "$sss$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual &&
-
-	printf "$sss$sss$sss$sss" | git stripspace >actual &&
-	test_must_be_empty actual
-
-ok 16 - spaces without newline at end should be replaced with empty string
-
-expecting success of 0030.17 'consecutive text lines should be unchanged': 
-	printf "$ttt$ttt\n$ttt\n" >expect &&
-	printf "$ttt$ttt\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n$ttt$ttt\n$ttt\n" >expect &&
-	printf "$ttt\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" >expect &&
-	printf "$ttt\n$ttt\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" >expect &&
-	printf "$ttt\n$ttt\n\n$ttt$ttt\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" >expect &&
-	printf "$ttt$ttt\n\n$ttt\n$ttt$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual &&
-
-	printf "$ttt\n$ttt$ttt\n\n$ttt\n" >expect &&
-	printf "$ttt\n$ttt$ttt\n\n$ttt\n" | git stripspace >actual &&
-	test_cmp expect actual
-
-ok 17 - consecutive text lines should be unchanged
-
-expecting success of 0030.18 'strip comments, too': 
-	test ! -z "$(echo "# comment" | git stripspace)" &&
-	test -z "$(echo "# comment" | git stripspace -s)"
-
-ok 18 - strip comments, too
-
-expecting success of 0030.19 'strip comments with changed comment char': 
-	test ! -z "$(echo "; comment" | git -c core.commentchar=";" stripspace)" &&
-	test -z "$(echo "; comment" | git -c core.commentchar=";" stripspace -s)"
-
-ok 19 - strip comments with changed comment char
-
-expecting success of 0030.20 'strip comments with changed comment string': 
-	test ! -z "$(echo "// comment" | git -c core.commentchar=// stripspace)" &&
-	test -z "$(echo "// comment" | git -c core.commentchar="//" stripspace -s)"
-
-ok 20 - strip comments with changed comment string
-
-expecting success of 0030.21 'newline as commentchar is forbidden': 
-	test_must_fail git -c core.commentChar="$LF" stripspace -s 2>err &&
-	grep "core.commentchar cannot contain newline" err
-
-error: core.commentchar cannot contain newline
-ok 21 - newline as commentchar is forbidden
-
-expecting success of 0030.22 'empty commentchar is forbidden': 
-	test_must_fail git -c core.commentchar= stripspace -s 2>err &&
-	grep "core.commentchar must have at least one character" err
-
-error: core.commentchar must have at least one character
-ok 22 - empty commentchar is forbidden
-
-expecting success of 0030.23 '-c with single line': 
-	printf "# foo\n" >expect &&
-	printf "foo" | git stripspace -c >actual &&
-	test_cmp expect actual
-
-ok 23 - -c with single line
-
-expecting success of 0030.24 '-c with single line followed by empty line': 
-	printf "# foo\n#\n" >expect &&
-	printf "foo\n\n" | git stripspace -c >actual &&
-	test_cmp expect actual
-
-ok 24 - -c with single line followed by empty line
-
-expecting success of 0030.25 '-c with newline only': 
-	printf "#\n" >expect &&
-	printf "\n" | git stripspace -c >actual &&
-	test_cmp expect actual
-
-ok 25 - -c with newline only
-
-expecting success of 0030.26 '--comment-lines with single line': 
-	printf "# foo\n" >expect &&
-	printf "foo" | git stripspace -c >actual &&
-	test_cmp expect actual
-
-ok 26 - --comment-lines with single line
-
-expecting success of 0030.27 '-c with changed comment char': 
-	printf "; foo\n" >expect &&
-	printf "foo" | git -c core.commentchar=";" stripspace -c >actual &&
-	test_cmp expect actual
-
-ok 27 - -c with changed comment char
-
-expecting success of 0030.28 '-c with comment char defined in .git/config': 
-	test_config core.commentchar = &&
-	printf "= foo\n" >expect &&
-	rm -fr sub &&
-	mkdir sub &&
-	printf "foo" | git -C sub stripspace -c >actual &&
-	test_cmp expect actual
-
-ok 28 - -c with comment char defined in .git/config
-
-expecting success of 0030.29 '-c outside git repository': 
-	printf "# foo\n" >expect &&
-	printf "foo" | nongit git stripspace -c >actual &&
-	test_cmp expect actual
-
-ok 29 - -c outside git repository
-
-expecting success of 0030.30 'avoid SP-HT sequence in commented line': 
-	printf "#\tone\n#\n# two\n" >expect &&
-	printf "\tone\n\ntwo\n" | git stripspace -c >actual &&
-	test_cmp expect actual
-
-ok 30 - avoid SP-HT sequence in commented line
-
-# passed all 30 test(s)
-1..30
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0051-windows-named-pipe.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0051-windows-named-pipe/.git/
 1..0 # SKIP skipping Windows-specific tests
@@ -24360,1241 +25114,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0021-conversion.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/.git/
-expecting success of 0021.1 'setup': 
-	git config filter.rot13.smudge ./rot13.sh &&
-	git config filter.rot13.clean ./rot13.sh &&
-
-	{
-	    echo "*.t filter=rot13" &&
-	    echo "*.i ident"
-	} >.gitattributes &&
-
-	{
-	    echo a b c d e f g h i j k l m &&
-	    echo n o p q r s t u v w x y z &&
-	    echo '$Id$'
-	} >test &&
-	cat test >test.t &&
-	cat test >test.o &&
-	cat test >test.i &&
-	git add test test.t test.i &&
-	rm -f test test.t test.i &&
-	git checkout -- test test.t test.i &&
-
-	echo "content-test2" >test2.o &&
-	echo "content-test3 - filename with special characters" >"test3 'sq',\$x=.o"
-
-ok 1 - setup
-
-expecting success of 0021.2 'check': 
-
-	test_cmp test.o test &&
-	test_cmp test.o test.t &&
-
-	# ident should be stripped in the repository
-	git diff --raw --exit-code :test :test.i &&
-	id=$(git rev-parse --verify :test) &&
-	embedded=$(sed -ne "$script" test.i) &&
-	test "z$id" = "z$embedded" &&
-
-	git cat-file blob :test.t >test.r &&
-
-	./rot13.sh <test.o >test.t &&
-	test_cmp test.r test.t
-
-ok 2 - check
-
-expecting success of 0021.3 'expanded_in_repo': 
-	cat >expanded-keywords.0 <<-\EOF &&
-	File with expanded keywords
-	$Id$
-	$Id:$
-	$Id: 0000000000000000000000000000000000000000 $
-	$Id: NoSpaceAtEnd$
-	$Id:NoSpaceAtFront $
-	$Id:NoSpaceAtEitherEnd$
-	$Id: NoTerminatingSymbol
-	$Id: Foreign Commit With Spaces $
-	EOF
-
-	{
-		cat expanded-keywords.0 &&
-		printf "\$Id: NoTerminatingSymbolAtEOF"
-	} >expanded-keywords &&
-	cat expanded-keywords >expanded-keywords-crlf &&
-	git add expanded-keywords expanded-keywords-crlf &&
-	git commit -m "File with keywords expanded" &&
-	id=$(git rev-parse --verify :expanded-keywords) &&
-
-	cat >expected-output.0 <<-EOF &&
-	File with expanded keywords
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: $id \$
-	\$Id: NoTerminatingSymbol
-	\$Id: Foreign Commit With Spaces \$
-	EOF
-	{
-		cat expected-output.0 &&
-		printf "\$Id: NoTerminatingSymbolAtEOF"
-	} >expected-output &&
-	{
-		append_cr <expected-output.0 &&
-		printf "\$Id: NoTerminatingSymbolAtEOF"
-	} >expected-output-crlf &&
-	{
-		echo "expanded-keywords ident" &&
-		echo "expanded-keywords-crlf ident text eol=crlf"
-	} >>.gitattributes &&
-
-	rm -f expanded-keywords expanded-keywords-crlf &&
-
-	git checkout -- expanded-keywords &&
-	test_cmp expected-output expanded-keywords &&
-
-	git checkout -- expanded-keywords-crlf &&
-	test_cmp expected-output-crlf expanded-keywords-crlf
-
-[main (root-commit) bf31399] File with keywords expanded
- Author: A U Thor <author@example.com>
- 5 files changed, 29 insertions(+)
- create mode 100644 expanded-keywords
- create mode 100644 expanded-keywords-crlf
- create mode 100644 test
- create mode 100644 test.i
- create mode 100644 test.t
-ok 3 - expanded_in_repo
-
-expecting success of 0021.4 'filter shell-escaped filenames': 
-	cat >argc.sh <<-EOF &&
-	#!$SHELL_PATH
-	cat >/dev/null
-	echo argc: \$# "\$@"
-	EOF
-	normal=name-no-magic &&
-	special="name  with 'sq' and \$x" &&
-	echo some test text >"$normal" &&
-	echo some test text >"$special" &&
-	git add "$normal" "$special" &&
-	git commit -q -m "add files" &&
-	echo "name* filter=argc" >.gitattributes &&
-
-	# delete the files and check them out again, using a smudge filter
-	# that will count the args and echo the command-line back to us
-	test_config filter.argc.smudge "sh ./argc.sh %f" &&
-	rm "$normal" "$special" &&
-	git checkout -- "$normal" "$special" &&
-
-	# make sure argc.sh counted the right number of args
-	echo "argc: 1 $normal" >expect &&
-	test_cmp expect "$normal" &&
-	echo "argc: 1 $special" >expect &&
-	test_cmp expect "$special" &&
-
-	# do the same thing, but with more args in the filter expression
-	test_config filter.argc.smudge "sh ./argc.sh %f --my-extra-arg" &&
-	rm "$normal" "$special" &&
-	git checkout -- "$normal" "$special" &&
-
-	# make sure argc.sh counted the right number of args
-	echo "argc: 2 $normal --my-extra-arg" >expect &&
-	test_cmp expect "$normal" &&
-	echo "argc: 2 $special --my-extra-arg" >expect &&
-	test_cmp expect "$special" &&
-	:
-
-ok 4 - filter shell-escaped filenames
-
-expecting success of 0021.5 'required filter should filter data': 
-	test_config filter.required.smudge ./rot13.sh &&
-	test_config filter.required.clean ./rot13.sh &&
-	test_config filter.required.required true &&
-
-	echo "*.r filter=required" >.gitattributes &&
-
-	cat test.o >test.r &&
-	git add test.r &&
-
-	rm -f test.r &&
-	git checkout -- test.r &&
-	test_cmp test.o test.r &&
-
-	./rot13.sh <test.o >expected &&
-	git cat-file blob :test.r >actual &&
-	test_cmp expected actual
-
-ok 5 - required filter should filter data
-
-expecting success of 0021.6 'required filter smudge failure': 
-	test_config filter.failsmudge.smudge false &&
-	test_config filter.failsmudge.clean cat &&
-	test_config filter.failsmudge.required true &&
-
-	echo "*.fs filter=failsmudge" >.gitattributes &&
-
-	echo test >test.fs &&
-	git add test.fs &&
-	rm -f test.fs &&
-	test_must_fail git checkout -- test.fs
-
-error: external filter 'false' failed 1
-error: external filter 'false' failed
-fatal: test.fs: smudge filter failsmudge failed
-ok 6 - required filter smudge failure
-
-expecting success of 0021.7 'required filter clean failure': 
-	test_config filter.failclean.smudge cat &&
-	test_config filter.failclean.clean false &&
-	test_config filter.failclean.required true &&
-
-	echo "*.fc filter=failclean" >.gitattributes &&
-
-	echo test >test.fc &&
-	test_must_fail git add test.fc
-
-error: external filter 'false' failed 1
-error: external filter 'false' failed
-fatal: test.fc: clean filter 'failclean' failed
-ok 7 - required filter clean failure
-
-expecting success of 0021.8 'required filter with absent clean field': 
-	test_config filter.absentclean.smudge cat &&
-	test_config filter.absentclean.required true &&
-
-	echo "*.ac filter=absentclean" >.gitattributes &&
-
-	echo test >test.ac &&
-	test_must_fail git add test.ac 2>stderr &&
-	test_grep "fatal: test.ac: clean filter .absentclean. failed" stderr
-
-fatal: test.ac: clean filter 'absentclean' failed
-ok 8 - required filter with absent clean field
-
-expecting success of 0021.9 'required filter with absent smudge field': 
-	test_config filter.absentsmudge.clean cat &&
-	test_config filter.absentsmudge.required true &&
-
-	echo "*.as filter=absentsmudge" >.gitattributes &&
-
-	echo test >test.as &&
-	git add test.as &&
-	rm -f test.as &&
-	test_must_fail git checkout -- test.as 2>stderr &&
-	test_grep "fatal: test.as: smudge filter absentsmudge failed" stderr
-
-fatal: test.as: smudge filter absentsmudge failed
-ok 9 - required filter with absent smudge field
-
-expecting success of 0021.10 'filtering large input to small output should use little memory': 
-	test_config filter.devnull.clean "cat >/dev/null" &&
-	test_config filter.devnull.required true &&
-	for i in $(test_seq 1 30); do printf "%1048576d" 1 || return 1; done >30MB &&
-	echo "30MB filter=devnull" >.gitattributes &&
-	GIT_MMAP_LIMIT=1m GIT_ALLOC_LIMIT=1m git add 30MB
-
-ok 10 - filtering large input to small output should use little memory
-
-expecting success of 0021.11 'filter that does not read is fine': 
-	test-tool genrandom foo $((128 * 1024 + 1)) >big &&
-	echo "big filter=epipe" >.gitattributes &&
-	test_config filter.epipe.clean "echo xyzzy" &&
-	git add big &&
-	git cat-file blob :big >actual &&
-	echo xyzzy >expect &&
-	test_cmp expect actual
-
-ok 11 - filter that does not read is fine
-
-checking prerequisite: EXPENSIVE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
-
-)
-prerequisite EXPENSIVE not satisfied
-ok 12 # skip filter large file (missing EXPENSIVE)
-
-expecting success of 0021.13 'filter: clean empty file': 
-	test_config filter.in-repo-header.clean  "echo cleaned && cat" &&
-	test_config filter.in-repo-header.smudge "sed 1d" &&
-
-	echo "empty-in-worktree    filter=in-repo-header" >>.gitattributes &&
-	>empty-in-worktree &&
-
-	echo cleaned >expected &&
-	git add empty-in-worktree &&
-	git show :empty-in-worktree >actual &&
-	test_cmp expected actual
-
-ok 13 - filter: clean empty file
-
-expecting success of 0021.14 'filter: smudge empty file': 
-	test_config filter.empty-in-repo.clean "cat >/dev/null" &&
-	test_config filter.empty-in-repo.smudge "echo smudged && cat" &&
-
-	echo "empty-in-repo filter=empty-in-repo" >>.gitattributes &&
-	echo dead data walking >empty-in-repo &&
-	git add empty-in-repo &&
-
-	echo smudged >expected &&
-	git checkout-index --prefix=filtered- empty-in-repo &&
-	test_cmp expected filtered-empty-in-repo
-
-ok 14 - filter: smudge empty file
-
-expecting success of 0021.15 'disable filter with empty override': 
-	test_config_global filter.disable.smudge false &&
-	test_config_global filter.disable.clean false &&
-	test_config filter.disable.smudge false &&
-	test_config filter.disable.clean false &&
-
-	echo "*.disable filter=disable" >.gitattributes &&
-
-	echo test >test.disable &&
-	git -c filter.disable.clean= add test.disable 2>err &&
-	test_must_be_empty err &&
-	rm -f test.disable &&
-	git -c filter.disable.smudge= checkout -- test.disable 2>err &&
-	test_must_be_empty err
-
-ok 15 - disable filter with empty override
-
-expecting success of 0021.16 'diff does not reuse worktree files that need cleaning': 
-	test_config filter.counter.clean "echo . >>count; sed s/^/clean:/" &&
-	echo "file filter=counter" >.gitattributes &&
-	test_commit one file &&
-	test_commit two file &&
-
-	>count &&
-	git diff-tree -p HEAD &&
-	test_line_count = 0 count
-
-[main 2e1b3a0] one
- Author: A U Thor <author@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 30MB
- create mode 100644 big
- create mode 100644 empty-in-repo
- create mode 100644 empty-in-worktree
- create mode 100644 file
- create mode 100644 test.as
- create mode 100644 test.disable
- create mode 100644 test.fs
- create mode 100644 test.r
-[main 5763447] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-57634479428deffd4cbb8230d4ff66a3801fc1be
-diff --git a/file b/file
-index e4a1655..0c54b7b 100644
---- a/file
-+++ b/file
-@@ -1 +1 @@
--clean:one
-+clean:two
-ok 16 - diff does not reuse worktree files that need cleaning
-
-expecting success of 0021.17 'required process filter should filter data': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	test_config_global filter.protocol.required true &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-		git add . &&
-		git commit -m "test commit 1" &&
-		git branch empty-branch &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		cp "$TEST_ROOT/test2.o" test2.r &&
-		mkdir testsubdir &&
-		cp "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r" &&
-		>test4-empty.r &&
-
-		S=$(test_file_size test.r) &&
-		S2=$(test_file_size test2.r) &&
-		S3=$(test_file_size "testsubdir/test3 'sq',\$x=.r") &&
-		M=$(git hash-object test.r) &&
-		M2=$(git hash-object test2.r) &&
-		M3=$(git hash-object "testsubdir/test3 'sq',\$x=.r") &&
-		EMPTY=$(git hash-object /dev/null) &&
-
-		filter_git add . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean test.r $S [OK] -- OUT: $S . [OK]
-			IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK]
-			IN: clean test4-empty.r 0 [OK] -- OUT: 0  [OK]
-			IN: clean testsubdir/test3 'sq',\$x=.r $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_count expected.log debug.log &&
-
-		git commit -m "test commit 2" &&
-		MAIN=$(git rev-parse --verify main) &&
-		META="ref=refs/heads/main treeish=$MAIN" &&
-		rm -f test2.r "testsubdir/test3 'sq',\$x=.r" &&
-
-		filter_git checkout --quiet --no-progress . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		# Make sure that the file appears dirty, so checkout below has to
-		# run the configured filter.
-		touch test.r &&
-		filter_git checkout --quiet --no-progress empty-branch &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean test.r $S [OK] -- OUT: $S . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		filter_git checkout --quiet --no-progress main &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test3 'sq',\$x=.o" "testsubdir/test3 'sq',\$x=.r"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 56d459b] test commit 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 .gitattributes
-[main 9ea74df] test commit 2
- Author: A U Thor <author@example.com>
- 4 files changed, 5 insertions(+)
- create mode 100644 test.r
- create mode 100644 test2.r
- create mode 100644 test4-empty.r
- create mode 100644 testsubdir/test3 'sq',$x=.r
-ok 17 - required process filter should filter data
-
-expecting success of 0021.18 'required process filter should filter data for various subcommands': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	test_config_global filter.protocol.required true &&
-	(
-		cd repo &&
-
-		S=$(test_file_size test.r) &&
-		S2=$(test_file_size test2.r) &&
-		S3=$(test_file_size "testsubdir/test3 'sq',\$x=.r") &&
-		M=$(git hash-object test.r) &&
-		M2=$(git hash-object test2.r) &&
-		M3=$(git hash-object "testsubdir/test3 'sq',\$x=.r") &&
-		EMPTY=$(git hash-object /dev/null) &&
-
-		MAIN=$(git rev-parse --verify main) &&
-
-		cp "$TEST_ROOT/test.o" test5.r &&
-		git add test5.r &&
-		git commit -m "test commit 3" &&
-		git checkout empty-branch &&
-		filter_git rebase --onto empty-branch main^^ main &&
-		MAIN2=$(git rev-parse --verify main) &&
-		META="ref=refs/heads/main treeish=$MAIN2" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		git reset --hard empty-branch &&
-		filter_git reset --hard $MAIN &&
-		META="treeish=$MAIN" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		git branch old-main $MAIN &&
-		git reset --hard empty-branch &&
-		filter_git reset --hard old-main &&
-		META="ref=refs/heads/old-main treeish=$MAIN" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		git checkout -b merge empty-branch &&
-		git branch -f main $MAIN2 &&
-		filter_git merge main &&
-		META="treeish=$MAIN2" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		filter_git archive main >/dev/null &&
-		META="ref=refs/heads/main treeish=$MAIN2" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		TREE="$(git rev-parse $MAIN2^{tree})" &&
-		filter_git archive $TREE >/dev/null &&
-		META="treeish=$TREE" &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
-			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge testsubdir/test3 'sq',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log
-	)
-
-[main 07631f7] test commit 3
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 test5.r
-Switched to branch 'empty-branch'
-Current branch main is up to date.
-HEAD is now at 56d459b test commit 1
-HEAD is now at 9ea74df test commit 2
-HEAD is now at 56d459b test commit 1
-HEAD is now at 9ea74df test commit 2
-Switched to a new branch 'merge'
-Updating 56d459b..07631f7
-Fast-forward
- test.r                      | 3 +++
- test2.r                     | 1 +
- test4-empty.r               | 0
- test5.r                     | 3 +++
- testsubdir/test3 'sq',$x=.r | 1 +
- 5 files changed, 8 insertions(+)
- create mode 100644 test.r
- create mode 100644 test2.r
- create mode 100644 test4-empty.r
- create mode 100644 test5.r
- create mode 100644 testsubdir/test3 'sq',$x=.r
-ok 18 - required process filter should filter data for various subcommands
-
-expecting success of 0021.19 'required process filter takes precedence': 
-	test_config_global filter.protocol.clean false &&
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean" &&
-	test_config_global filter.protocol.required true &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-		cp "$TEST_ROOT/test.o" test.r &&
-		S=$(test_file_size test.r) &&
-
-		# Check that the process filter is invoked here
-		filter_git add . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean test.r $S [OK] -- OUT: $S . [OK]
-			STOP
-		EOF
-		test_cmp_count expected.log debug.log
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-ok 19 - required process filter takes precedence
-
-expecting success of 0021.20 'required process filter should be used only for "clean" operation only': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean" &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-		cp "$TEST_ROOT/test.o" test.r &&
-		S=$(test_file_size test.r) &&
-
-		filter_git add . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean test.r $S [OK] -- OUT: $S . [OK]
-			STOP
-		EOF
-		test_cmp_count expected.log debug.log &&
-
-		rm test.r &&
-
-		filter_git checkout --quiet --no-progress . &&
-		# If the filter would be used for "smudge", too, we would see
-		# "IN: smudge test.r 57 [OK] -- OUT: 57 . [OK]" here
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-ok 20 - required process filter should be used only for "clean" operation only
-
-expecting success of 0021.21 'required process filter should process multiple packets': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	test_config_global filter.protocol.required true &&
-
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		# Generate data requiring 1, 2, 3 packets
-		S=65516 && # PKTLINE_DATA_MAXLEN -> Maximal size of a packet
-		generate_random_characters $(($S    )) 1pkt_1__.file &&
-		generate_random_characters $(($S  +1)) 2pkt_1+1.file &&
-		generate_random_characters $(($S*2-1)) 2pkt_2-1.file &&
-		generate_random_characters $(($S*2  )) 2pkt_2__.file &&
-		generate_random_characters $(($S*2+1)) 3pkt_2+1.file &&
-
-		for FILE in "$TEST_ROOT"/*.file
-		do
-			cp "$FILE" . &&
-			rot13.sh <"$FILE" >"$FILE.rot13" || return 1
-		done &&
-
-		echo "*.file filter=protocol" >.gitattributes &&
-		filter_git add *.file .gitattributes &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: clean 1pkt_1__.file $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
-			IN: clean 2pkt_1+1.file $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
-			IN: clean 2pkt_2-1.file $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
-			IN: clean 2pkt_2__.file $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
-			IN: clean 3pkt_2+1.file $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
-			STOP
-		EOF
-		test_cmp_count expected.log debug.log &&
-
-		M1="blob=$(git hash-object 1pkt_1__.file)" &&
-		M2="blob=$(git hash-object 2pkt_1+1.file)" &&
-		M3="blob=$(git hash-object 2pkt_2-1.file)" &&
-		M4="blob=$(git hash-object 2pkt_2__.file)" &&
-		M5="blob=$(git hash-object 3pkt_2+1.file)" &&
-		rm -f *.file debug.log &&
-
-		filter_git checkout --quiet --no-progress -- *.file &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge 1pkt_1__.file $M1 $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
-			IN: smudge 2pkt_1+1.file $M2 $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
-			IN: smudge 2pkt_2-1.file $M3 $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
-			IN: smudge 2pkt_2__.file $M4 $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
-			IN: smudge 3pkt_2+1.file $M5 $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		for FILE in *.file
-		do
-			test_cmp_committed_rot13 "$TEST_ROOT/$FILE" $FILE || return 1
-		done
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-ok 21 - required process filter should process multiple packets
-
-expecting success of 0021.22 'required process filter with clean error should fail': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	test_config_global filter.protocol.required true &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		echo "this is going to fail" >clean-write-fail.r &&
-		echo "content-test3-subdir" >test3.r &&
-
-		test_must_fail git add .
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-fatal: clean write error
-error: external filter 'test-tool rot13-filter --log=debug.log clean smudge' failed
-fatal: clean-write-fail.r: clean filter 'protocol' failed
-ok 22 - required process filter with clean error should fail
-
-expecting success of 0021.23 'process filter should restart after unexpected write failure': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		cp "$TEST_ROOT/test2.o" test2.r &&
-		echo "this is going to fail" >smudge-write-fail.o &&
-		cp smudge-write-fail.o smudge-write-fail.r &&
-
-		S=$(test_file_size test.r) &&
-		S2=$(test_file_size test2.r) &&
-		SF=$(test_file_size smudge-write-fail.r) &&
-		M=$(git hash-object test.r) &&
-		M2=$(git hash-object test2.r) &&
-		MF=$(git hash-object smudge-write-fail.r) &&
-		rm -f debug.log &&
-
-		git add . &&
-		rm -f *.r &&
-
-		rm -f debug.log &&
-		git checkout --quiet --no-progress . 2>git-stderr.log &&
-
-		grep "smudge write error" git-stderr.log &&
-		test_grep "error: external filter" git-stderr.log &&
-
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge smudge-write-fail.r blob=$MF $SF [OK] -- [WRITE FAIL]
-			START
-			init handshake complete
-			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
-
-		# Smudge failed
-		! test_cmp smudge-write-fail.o smudge-write-fail.r &&
-		rot13.sh <smudge-write-fail.o >expected &&
-		git cat-file blob :smudge-write-fail.r >actual &&
-		test_cmp expected actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-fatal: smudge write error
-error: external filter 'test-tool rot13-filter --log=debug.log clean smudge' failed
---- smudge-write-fail.o	2025-12-18 01:32:21.990773267 +0000
-+++ smudge-write-fail.r	2025-12-18 01:32:22.038773267 +0000
-@@ -1 +1 @@
--this is going to fail
-+guvf vf tbvat gb snvy
-ok 23 - process filter should restart after unexpected write failure
-
-expecting success of 0021.24 'process filter should not be restarted if it signals an error': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		cp "$TEST_ROOT/test2.o" test2.r &&
-		echo "this will cause an error" >error.o &&
-		cp error.o error.r &&
-
-		S=$(test_file_size test.r) &&
-		S2=$(test_file_size test2.r) &&
-		SE=$(test_file_size error.r) &&
-		M=$(git hash-object test.r) &&
-		M2=$(git hash-object test2.r) &&
-		ME=$(git hash-object error.r) &&
-		rm -f debug.log &&
-
-		git add . &&
-		rm -f *.r &&
-
-		filter_git checkout --quiet --no-progress . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge error.r blob=$ME $SE [OK] -- [ERROR]
-			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.r &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test2.o" test2.r &&
-		test_cmp error.o error.r
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-ok 24 - process filter should not be restarted if it signals an error
-
-expecting success of 0021.25 'process filter abort stops processing of all further files': 
-	test_config_global filter.protocol.process "test-tool rot13-filter --log=debug.log clean smudge" &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		cp "$TEST_ROOT/test2.o" test2.r &&
-		echo "error this blob and all future blobs" >abort.o &&
-		cp abort.o abort.r &&
-
-		M="blob=$(git hash-object abort.r)" &&
-		rm -f debug.log &&
-		SA=$(test_file_size abort.r) &&
-
-		git add . &&
-		rm -f *.r &&
-
-
-		# Note: This test assumes that Git filters files in alphabetical
-		# order ("abort.r" before "test.r").
-		filter_git checkout --quiet --no-progress . &&
-		cat >expected.log <<-EOF &&
-			START
-			init handshake complete
-			IN: smudge abort.r $M $SA [OK] -- [ABORT]
-			STOP
-		EOF
-		test_cmp_exclude_clean expected.log debug.log &&
-
-		test_cmp "$TEST_ROOT/test.o" test.r &&
-		test_cmp "$TEST_ROOT/test2.o" test2.r &&
-		test_cmp abort.o abort.r
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-ok 25 - process filter abort stops processing of all further files
-
-expecting success of 0021.26 'invalid process filter must fail (and not hang!)': 
-	test_config_global filter.protocol.process cat &&
-	test_config_global filter.protocol.required true &&
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-
-		echo "*.r filter=protocol" >.gitattributes &&
-
-		cp "$TEST_ROOT/test.o" test.r &&
-		test_must_fail git add . 2>git-stderr.log &&
-		grep "expected git-filter-server" git-stderr.log
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-error: Unexpected line 'git-filter-client', expected git-filter-server
-ok 26 - invalid process filter must fail (and not hang!)
-
-expecting success of 0021.27 'delayed checkout in process filter': 
-	test_config_global filter.a.process "test-tool rot13-filter --log=a.log clean smudge delay" &&
-	test_config_global filter.a.required true &&
-	test_config_global filter.b.process "test-tool rot13-filter --log=b.log clean smudge delay" &&
-	test_config_global filter.b.required true &&
-
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		echo "*.a filter=a" >.gitattributes &&
-		echo "*.b filter=b" >>.gitattributes &&
-		cp "$TEST_ROOT/test.o" test.a &&
-		cp "$TEST_ROOT/test.o" test-delay10.a &&
-		cp "$TEST_ROOT/test.o" test-delay11.a &&
-		cp "$TEST_ROOT/test.o" test-delay20.a &&
-		cp "$TEST_ROOT/test.o" test-delay10.b &&
-		git add . &&
-		git commit -m "test commit"
-	) &&
-
-	S=$(test_file_size "$TEST_ROOT/test.o") &&
-	PM="ref=refs/heads/main treeish=$(git -C repo rev-parse --verify main) " &&
-	M="${PM}blob=$(git -C repo rev-parse --verify main:test.a)" &&
-	cat >a.exp <<-EOF &&
-		START
-		init handshake complete
-		IN: smudge test.a $M $S [OK] -- OUT: $S . [OK]
-		IN: smudge test-delay10.a $M $S [OK] -- [DELAYED]
-		IN: smudge test-delay11.a $M $S [OK] -- [DELAYED]
-		IN: smudge test-delay20.a $M $S [OK] -- [DELAYED]
-		IN: list_available_blobs test-delay10.a test-delay11.a [OK]
-		IN: smudge test-delay10.a $M 0 [OK] -- OUT: $S . [OK]
-		IN: smudge test-delay11.a $M 0 [OK] -- OUT: $S . [OK]
-		IN: list_available_blobs test-delay20.a [OK]
-		IN: smudge test-delay20.a $M 0 [OK] -- OUT: $S . [OK]
-		IN: list_available_blobs [OK]
-		STOP
-	EOF
-	cat >b.exp <<-EOF &&
-		START
-		init handshake complete
-		IN: smudge test-delay10.b $M $S [OK] -- [DELAYED]
-		IN: list_available_blobs test-delay10.b [OK]
-		IN: smudge test-delay10.b $M 0 [OK] -- OUT: $S . [OK]
-		IN: list_available_blobs [OK]
-		STOP
-	EOF
-
-	rm -rf repo-cloned &&
-	filter_git clone repo repo-cloned &&
-	test_cmp_count a.exp repo-cloned/a.log &&
-	test_cmp_count b.exp repo-cloned/b.log &&
-
-	(
-		cd repo-cloned &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b &&
-
-		rm *.a *.b &&
-		filter_git checkout . &&
-		# We are not checking out a ref here, so filter out ref metadata.
-		sed -e "s!$PM!!" ../a.exp >a.exp.filtered &&
-		sed -e "s!$PM!!" ../b.exp >b.exp.filtered &&
-		test_cmp_count a.exp.filtered a.log &&
-		test_cmp_count b.exp.filtered b.log &&
-
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay11.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay20.a &&
-		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.b
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 27d7fe8] test commit
- Author: A U Thor <author@example.com>
- 6 files changed, 17 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 test-delay10.a
- create mode 100644 test-delay10.b
- create mode 100644 test-delay11.a
- create mode 100644 test-delay20.a
- create mode 100644 test.a
-Cloning into 'repo-cloned'...
-done.
-Updated 5 paths from the index
-ok 27 - delayed checkout in process filter
-
-expecting success of 0021.28 'missing file in delayed checkout': 
-	test_config_global filter.bug.process "test-tool rot13-filter --log=bug.log clean smudge delay" &&
-	test_config_global filter.bug.required true &&
-
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		echo "*.a filter=bug" >.gitattributes &&
-		cp "$TEST_ROOT/test.o" missing-delay.a &&
-		git add . &&
-		git commit -m "test commit"
-	) &&
-
-	rm -rf repo-cloned &&
-	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
-	grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 5567259] test commit
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 missing-delay.a
-error: 'missing-delay.a' was not filtered properly
-ok 28 - missing file in delayed checkout
-
-expecting success of 0021.29 'invalid file in delayed checkout': 
-	test_config_global filter.bug.process "test-tool rot13-filter --log=bug.log clean smudge delay" &&
-	test_config_global filter.bug.required true &&
-
-	rm -rf repo &&
-	mkdir repo &&
-	(
-		cd repo &&
-		git init &&
-		echo "*.a filter=bug" >.gitattributes &&
-		cp "$TEST_ROOT/test.o" invalid-delay.a &&
-		cp "$TEST_ROOT/test.o" unfiltered &&
-		git add . &&
-		git commit -m "test commit"
-	) &&
-
-	rm -rf repo-cloned &&
-	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
-	grep "error: external filter .* signaled that .unfiltered. is now available although it has not been delayed earlier" git-stderr.log
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 636012f] test commit
- Author: A U Thor <author@example.com>
- 3 files changed, 7 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 invalid-delay.a
- create mode 100644 unfiltered
-error: external filter 'test-tool rot13-filter --log=bug.log clean smudge delay' signaled that 'unfiltered' is now available although it has not been delayed earlier
-ok 29 - invalid file in delayed checkout
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-checking prerequisite: CASE_INSENSITIVE_FS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-	echo good >CamelCase &&
-	echo bad >camelcase &&
-	test "$(cat CamelCase)" != good
-
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 30 # skip delayed checkout with case-collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
-
-checking prerequisite: UTF8_NFD_TO_NFC
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-	# check whether FS converts nfd unicode to nfc
-	auml=$(printf "\303\244")
-	aumlcdiar=$(printf "\141\314\210")
-	>"$auml" &&
-	test -f "$aumlcdiar"
-
-)
-prerequisite UTF8_NFD_TO_NFC not satisfied
-ok 31 # skip delayed checkout with utf-8-collision don't write to the wrong place (missing UTF8_NFD_TO_NFC of SYMLINKS,UTF8_NFD_TO_NFC)
-
-ok 32 # skip delayed checkout with submodule collision don't write to the wrong place (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
-
-expecting success of 0021.33 'setup for progress tests': 
-	git init progress &&
-	(
-		cd progress &&
-		git config filter.delay.process "test-tool rot13-filter --log=delay-progress.log clean smudge delay" &&
-		git config filter.delay.required true &&
-
-		echo "*.a filter=delay" >.gitattributes &&
-		touch test-delay10.a &&
-		git add . &&
-		git commit -m files
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/progress/.git/
-[main (root-commit) 36dc8bf] files
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 .gitattributes
- create mode 100644 test-delay10.a
-ok 33 - setup for progress tests
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
-
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
-
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
-
-)
-prerequisite TTY ok
-expecting success of 0021.34 'delayed checkout shows progress by default on tty (pathspec checkout)': 
-		test_delayed_checkout_progress test_terminal git checkout $opt
-	
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
-ok 34 - delayed checkout shows progress by default on tty (pathspec checkout)
-
-expecting success of 0021.35 'delayed checkout ommits progress on non-tty (pathspec checkout)': 
-		test_delayed_checkout_progress ! git checkout $opt
-	
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-ok 35 - delayed checkout ommits progress on non-tty (pathspec checkout)
-
-expecting success of 0021.36 'delayed checkout ommits progress with --quiet (pathspec checkout)': 
-		test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt
-	
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-ok 36 - delayed checkout ommits progress with --quiet (pathspec checkout)
-
-expecting success of 0021.37 'delayed checkout honors --[no]-progress (pathspec checkout)': 
-		test_delayed_checkout_progress ! test_terminal git checkout --no-progress $opt &&
-		test_delayed_checkout_progress test_terminal git checkout --quiet --progress $opt
-	
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-IN: smudge test-delay10.a blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
-ok 37 - delayed checkout honors --[no]-progress (pathspec checkout)
-
-expecting success of 0021.38 'delayed checkout shows progress by default on tty (branch checkout)': 
-		test_delayed_checkout_progress test_terminal git checkout $opt
-	
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
-ok 38 - delayed checkout shows progress by default on tty (branch checkout)
-
-expecting success of 0021.39 'delayed checkout ommits progress on non-tty (branch checkout)': 
-		test_delayed_checkout_progress ! git checkout $opt
-	
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-ok 39 - delayed checkout ommits progress on non-tty (branch checkout)
-
-expecting success of 0021.40 'delayed checkout ommits progress with --quiet (branch checkout)': 
-		test_delayed_checkout_progress ! test_terminal git checkout --quiet $opt
-	
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-ok 40 - delayed checkout ommits progress with --quiet (branch checkout)
-
-expecting success of 0021.41 'delayed checkout honors --[no]-progress (branch checkout)': 
-		test_delayed_checkout_progress ! test_terminal git checkout --no-progress $opt &&
-		test_delayed_checkout_progress test_terminal git checkout --quiet --progress $opt
-	
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-IN: smudge test-delay10.a ref=refs/heads/main treeish=36dc8bfae462bbc71de73591934e95020c6c26ce blob=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 [OK] -- [DELAYED]
-Filtering content: 100% (1/1)
Filtering content: 100% (1/1), 0 bytes | 0 bytes/s, done.
-ok 41 - delayed checkout honors --[no]-progress (branch checkout)
-
-expecting success of 0021.42 'delayed checkout correctly reports the number of updated entries': 
-	rm -rf repo &&
-	git init repo &&
-	(
-		cd repo &&
-		git config filter.delay.process "test-tool rot13-filter --log=delayed.log clean smudge delay" &&
-		git config filter.delay.required true &&
-
-		echo "*.a filter=delay" >.gitattributes &&
-		echo a >test-delay10.a &&
-		echo a >test-delay11.a &&
-		git add . &&
-		git commit -m files &&
-
-		rm *.a &&
-		git checkout . 2>err &&
-		grep "IN: smudge test-delay10.a .* \\[DELAYED\\]" delayed.log &&
-		grep "IN: smudge test-delay11.a .* \\[DELAYED\\]" delayed.log &&
-		grep "Updated 2 paths from the index" err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0021-conversion/repo/.git/
-[main (root-commit) 6d52fcb] files
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 test-delay10.a
- create mode 100644 test-delay11.a
-IN: smudge test-delay10.a blob=8ba3a16384aacc37d01564b28401755ce8053f51 2 [OK] -- [DELAYED]
-IN: smudge test-delay11.a blob=8ba3a16384aacc37d01564b28401755ce8053f51 2 [OK] -- [DELAYED]
-Updated 2 paths from the index
-ok 42 - delayed checkout correctly reports the number of updated entries
-
-# passed all 42 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0056-git-C.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0056-git-C/.git/
 expecting success of 0056.1 '"git -C <path>" runs git from the directory <path>': 
@@ -25714,128 +25233,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0032-reftable-unittest.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0032-reftable-unittest/.git/
-expecting success of 0032.1 'unittests': 
-	TMPDIR=$(pwd) && export TMPDIR &&
-	test-tool reftable
-
-running test_common_prefix
-running test_parse_names_normal
-running test_parse_names_drop_empty
-running test_binsearch
-running test_names_length
-running test_reftable_log_record_equal
-running test_reftable_log_record_roundtrip
-running test_reftable_ref_record_roundtrip
-running test_varint_roundtrip
-running test_key_roundtrip
-running test_common_prefix
-running test_reftable_obj_record_roundtrip
-running test_reftable_index_record_roundtrip
-running test_u24_roundtrip
-running test_block_read_write
-running test_tree
-running test_pq
-running test_log_zlib_corruption
-running test_corrupt_table
-running test_corrupt_table_empty
-running test_log_write_read
-running test_write_key_order
-running test_table_read_write_seek_linear_sha256
-running test_log_buffer_size
-running test_table_write_small_table
-running test_buffer
-running test_table_read_api
-running test_table_read_write_sequential
-running test_table_read_write_seek_linear
-running test_table_read_write_seek_index
-running test_table_refs_for_no_index
-running test_table_refs_for_obj_index
-running test_write_empty_key
-running test_write_empty_table
-running test_log_overflow
-running test_write_object_id_length
-running test_write_object_id_min_length
-running test_write_multiple_indices
-running test_write_multi_level_index
-running test_merged_logs
-running test_merged_between
-running test_merged
-running test_default_write_opts
-running test_empty_add
-running test_names_equal
-running test_parse_names
-running test_read_file
-running test_reflog_expire
-running test_reftable_stack_add
-running test_reftable_stack_add_one
-running test_reftable_stack_auto_compaction
-running test_reftable_stack_add_performs_auto_compaction
-running test_reftable_stack_compaction_concurrent
-running test_reftable_stack_compaction_concurrent_clean
-running test_reftable_stack_hash_id
-running test_reftable_stack_lock_failure
-running test_reftable_stack_log_normalize
-running test_reftable_stack_tombstone
-running test_reftable_stack_transaction_api
-running test_reftable_stack_transaction_api_performs_auto_compaction
-running test_reftable_stack_auto_compaction_fails_gracefully
-running test_reftable_stack_update_index_check
-running test_reftable_stack_uptodate
-running test_reftable_stack_validate_refname
-running test_suggest_compaction_segment
-running test_suggest_compaction_segment_nothing
-running test_conflict
-testing print coverage:
-
-'g': log{refs/heads/master(42) han-wen <hanwen@google.com> 1577123507 0100
-0202020202020202020202020202020202020202 => 0101010101010101010101010101010101010101
-
-test
-}
-testing print coverage:
-
-'g': log{refs/heads/master(22) delete
-testing print coverage:
-
-'g': log{branch(33)  <> 0 0000
-0404040404040404040404040404040404040404 => 0303030303030303030303030303030303030303
-
-
-}
-testing print coverage:
-
-'r': ref{refs/heads/master(0) delete}
-testing print coverage:
-
-'r': ref{refs/heads/master(0) val 1 0100000000000000000000000000000000000000}
-testing print coverage:
-
-'r': ref{refs/heads/master(0) val 2 0100000000000000000000000000000000000000(T 0201000000000000000000000000000000000000)}
-testing print coverage:
-
-'r': ref{refs/heads/master(0) => target}
-testing print coverage:
-
-'o': prefix 0102030400 (len 5), offsets [1 2 3 ]
-testing print coverage:
-
-'o': prefix 0102030400 (len 5), offsets [1 2 3 4 500 600 700 800 9000 ]
-testing print coverage:
-
-'o': prefix 0102030400 (len 5), offsets []
-testing print coverage:
-
-'i': "refs/heads/master" 42
-testing print functionality:
-ref{HEAD(1) => master}
-ok 1 - unittests
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0062-revision-walking.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0062-revision-walking/.git/
 expecting success of 0062.1 'setup': 
@@ -25866,6 +25263,128 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0063-string-list.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0063-string-list/.git/
+expecting success of 0063.1 'split foo:bar:baz at :, max -1': 
+		test-tool string-list split 'foo:bar:baz' ':' '-1' >actual &&
+		test_cmp expected actual &&
+		test-tool string-list split_in_place 'foo:bar:baz' ':' '-1' >actual &&
+		test_cmp expected actual
+	
+ok 1 - split foo:bar:baz at :, max -1
+
+expecting success of 0063.2 'split foo:bar:baz at :, max 0': 
+		test-tool string-list split 'foo:bar:baz' ':' '0' >actual &&
+		test_cmp expected actual &&
+		test-tool string-list split_in_place 'foo:bar:baz' ':' '0' >actual &&
+		test_cmp expected actual
+	
+ok 2 - split foo:bar:baz at :, max 0
+
+expecting success of 0063.3 'split foo:bar:baz at :, max 1': 
+		test-tool string-list split 'foo:bar:baz' ':' '1' >actual &&
+		test_cmp expected actual &&
+		test-tool string-list split_in_place 'foo:bar:baz' ':' '1' >actual &&
+		test_cmp expected actual
+	
+ok 3 - split foo:bar:baz at :, max 1
+
+expecting success of 0063.4 'split foo:bar:baz at :, max 2': 
+		test-tool string-list split 'foo:bar:baz' ':' '2' >actual &&
+		test_cmp expected actual &&
+		test-tool string-list split_in_place 'foo:bar:baz' ':' '2' >actual &&
+		test_cmp expected actual
+	
+ok 4 - split foo:bar:baz at :, max 2
+
+expecting success of 0063.5 'split foo:bar: at :, max -1': 
+		test-tool string-list split 'foo:bar:' ':' '-1' >actual &&
+		test_cmp expected actual &&
+		test-tool string-list split_in_place 'foo:bar:' ':' '-1' >actual &&
+		test_cmp expected actual
+	
+ok 5 - split foo:bar: at :, max -1
+
+expecting success of 0063.6 'split  at :, max -1': 
+		test-tool string-list split '' ':' '-1' >actual &&
+		test_cmp expected actual &&
+		test-tool string-list split_in_place '' ':' '-1' >actual &&
+		test_cmp expected actual
+	
+ok 6 - split  at :, max -1
+
+expecting success of 0063.7 'split : at :, max -1': 
+		test-tool string-list split ':' ':' '-1' >actual &&
+		test_cmp expected actual &&
+		test-tool string-list split_in_place ':' ':' '-1' >actual &&
+		test_cmp expected actual
+	
+ok 7 - split : at :, max -1
+
+expecting success of 0063.8 'split (in place) foo:;:bar:;:baz:;: at :;, max -1': 
+		test-tool string-list split_in_place 'foo:;:bar:;:baz:;:' ':;' '-1' >actual &&
+		test_cmp expected actual
+	
+ok 8 - split (in place) foo:;:bar:;:baz:;: at :;, max -1
+
+expecting success of 0063.9 'split (in place) foo:;:bar:;:baz at :;, max 0': 
+		test-tool string-list split_in_place 'foo:;:bar:;:baz' ':;' '0' >actual &&
+		test_cmp expected actual
+	
+ok 9 - split (in place) foo:;:bar:;:baz at :;, max 0
+
+expecting success of 0063.10 'split (in place) foo:;:bar:;:baz at :;, max 1': 
+		test-tool string-list split_in_place 'foo:;:bar:;:baz' ':;' '1' >actual &&
+		test_cmp expected actual
+	
+ok 10 - split (in place) foo:;:bar:;:baz at :;, max 1
+
+expecting success of 0063.11 'split (in place) foo:;:bar:;:baz at :;, max 2': 
+		test-tool string-list split_in_place 'foo:;:bar:;:baz' ':;' '2' >actual &&
+		test_cmp expected actual
+	
+ok 11 - split (in place) foo:;:bar:;:baz at :;, max 2
+
+expecting success of 0063.12 'split (in place) foo:;:bar:;: at :;, max -1': 
+		test-tool string-list split_in_place 'foo:;:bar:;:' ':;' '-1' >actual &&
+		test_cmp expected actual
+	
+ok 12 - split (in place) foo:;:bar:;: at :;, max -1
+
+expecting success of 0063.13 'test filter_string_list': 
+	test "x-" = "x$(test-tool string-list filter - y)" &&
+	test "x-" = "x$(test-tool string-list filter no y)" &&
+	test yes = "$(test-tool string-list filter yes y)" &&
+	test yes = "$(test-tool string-list filter no:yes y)" &&
+	test yes = "$(test-tool string-list filter yes:no y)" &&
+	test y1:y2 = "$(test-tool string-list filter y1:y2 y)" &&
+	test y2:y1 = "$(test-tool string-list filter y2:y1 y)" &&
+	test "x-" = "x$(test-tool string-list filter x1:x2 y)"
+
+ok 13 - test filter_string_list
+
+expecting success of 0063.14 'test remove_duplicates': 
+	test "x-" = "x$(test-tool string-list remove_duplicates -)" &&
+	test "x" = "x$(test-tool string-list remove_duplicates "")" &&
+	test a = "$(test-tool string-list remove_duplicates a)" &&
+	test a = "$(test-tool string-list remove_duplicates a:a)" &&
+	test a = "$(test-tool string-list remove_duplicates a:a:a:a:a)" &&
+	test a:b = "$(test-tool string-list remove_duplicates a:b)" &&
+	test a:b = "$(test-tool string-list remove_duplicates a:a:b)" &&
+	test a:b = "$(test-tool string-list remove_duplicates a:b:b)" &&
+	test a:b:c = "$(test-tool string-list remove_duplicates a:b:c)" &&
+	test a:b:c = "$(test-tool string-list remove_duplicates a:a:b:c)" &&
+	test a:b:c = "$(test-tool string-list remove_duplicates a:b:b:c)" &&
+	test a:b:c = "$(test-tool string-list remove_duplicates a:b:c:c)" &&
+	test a:b:c = "$(test-tool string-list remove_duplicates a:a:b:b:c:c)" &&
+	test a:b:c = "$(test-tool string-list remove_duplicates a:a:a:b:b:b:c:c:c)"
+
+ok 14 - test remove_duplicates
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0061-run-command.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0061-run-command/.git/
 ok 1 # skip subprocess inherits only std handles (missing MINGW)
@@ -26117,6 +25636,40 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0065-strcmp-offset.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0065-strcmp-offset/.git/
+expecting success of 0065.1 'strcmp_offset(abc, abc)': 
+		echo "$expect" >expect &&
+		test-tool strcmp-offset "$s1" "$s2" >actual &&
+		test_cmp expect actual
+	
+ok 1 - strcmp_offset(abc, abc)
+
+expecting success of 0065.2 'strcmp_offset(abc, def)': 
+		echo "$expect" >expect &&
+		test-tool strcmp-offset "$s1" "$s2" >actual &&
+		test_cmp expect actual
+	
+ok 2 - strcmp_offset(abc, def)
+
+expecting success of 0065.3 'strcmp_offset(abc, abz)': 
+		echo "$expect" >expect &&
+		test-tool strcmp-offset "$s1" "$s2" >actual &&
+		test_cmp expect actual
+	
+ok 3 - strcmp_offset(abc, abz)
+
+expecting success of 0065.4 'strcmp_offset(abc, abcdef)': 
+		echo "$expect" >expect &&
+		test-tool strcmp-offset "$s1" "$s2" >actual &&
+		test_cmp expect actual
+	
+ok 4 - strcmp_offset(abc, abcdef)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0064-oid-array.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0064-oid-array/.git/
 expecting success of 0064.1 'ordered enumeration': 
@@ -26217,160 +25770,119 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0065-strcmp-offset.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0065-strcmp-offset/.git/
-expecting success of 0065.1 'strcmp_offset(abc, abc)': 
-		echo "$expect" >expect &&
-		test-tool strcmp-offset "$s1" "$s2" >actual &&
-		test_cmp expect actual
-	
-ok 1 - strcmp_offset(abc, abc)
+*** t0067-parse_pathspec_file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0067-parse_pathspec_file/.git/
+expecting success of 0067.1 'one item from stdin': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
 
-expecting success of 0065.2 'strcmp_offset(abc, def)': 
-		echo "$expect" >expect &&
-		test-tool strcmp-offset "$s1" "$s2" >actual &&
-		test_cmp expect actual
-	
-ok 2 - strcmp_offset(abc, def)
+	echo fileA.t |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
 
-expecting success of 0065.3 'strcmp_offset(abc, abz)': 
-		echo "$expect" >expect &&
-		test-tool strcmp-offset "$s1" "$s2" >actual &&
-		test_cmp expect actual
-	
-ok 3 - strcmp_offset(abc, abz)
+	test_cmp expect actual
 
-expecting success of 0065.4 'strcmp_offset(abc, abcdef)': 
-		echo "$expect" >expect &&
-		test-tool strcmp-offset "$s1" "$s2" >actual &&
-		test_cmp expect actual
-	
-ok 4 - strcmp_offset(abc, abcdef)
+ok 1 - one item from stdin
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0063-string-list.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0063-string-list/.git/
-expecting success of 0063.1 'split foo:bar:baz at :, max -1': 
-		test-tool string-list split 'foo:bar:baz' ':' '-1' >actual &&
-		test_cmp expected actual &&
-		test-tool string-list split_in_place 'foo:bar:baz' ':' '-1' >actual &&
-		test_cmp expected actual
-	
-ok 1 - split foo:bar:baz at :, max -1
+expecting success of 0067.2 'one item from file': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
 
-expecting success of 0063.2 'split foo:bar:baz at :, max 0': 
-		test-tool string-list split 'foo:bar:baz' ':' '0' >actual &&
-		test_cmp expected actual &&
-		test-tool string-list split_in_place 'foo:bar:baz' ':' '0' >actual &&
-		test_cmp expected actual
-	
-ok 2 - split foo:bar:baz at :, max 0
+	echo fileA.t >list &&
+	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
 
-expecting success of 0063.3 'split foo:bar:baz at :, max 1': 
-		test-tool string-list split 'foo:bar:baz' ':' '1' >actual &&
-		test_cmp expected actual &&
-		test-tool string-list split_in_place 'foo:bar:baz' ':' '1' >actual &&
-		test_cmp expected actual
-	
-ok 3 - split foo:bar:baz at :, max 1
+	test_cmp expect actual
 
-expecting success of 0063.4 'split foo:bar:baz at :, max 2': 
-		test-tool string-list split 'foo:bar:baz' ':' '2' >actual &&
-		test_cmp expected actual &&
-		test-tool string-list split_in_place 'foo:bar:baz' ':' '2' >actual &&
-		test_cmp expected actual
-	
-ok 4 - split foo:bar:baz at :, max 2
+ok 2 - one item from file
 
-expecting success of 0063.5 'split foo:bar: at :, max -1': 
-		test-tool string-list split 'foo:bar:' ':' '-1' >actual &&
-		test_cmp expected actual &&
-		test-tool string-list split_in_place 'foo:bar:' ':' '-1' >actual &&
-		test_cmp expected actual
-	
-ok 5 - split foo:bar: at :, max -1
+expecting success of 0067.3 'NUL delimiters': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
 
-expecting success of 0063.6 'split  at :, max -1': 
-		test-tool string-list split '' ':' '-1' >actual &&
-		test_cmp expected actual &&
-		test-tool string-list split_in_place '' ':' '-1' >actual &&
-		test_cmp expected actual
-	
-ok 6 - split  at :, max -1
+	printf "fileA.t\0fileB.t\0" |
+	test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
 
-expecting success of 0063.7 'split : at :, max -1': 
-		test-tool string-list split ':' ':' '-1' >actual &&
-		test_cmp expected actual &&
-		test-tool string-list split_in_place ':' ':' '-1' >actual &&
-		test_cmp expected actual
-	
-ok 7 - split : at :, max -1
+	test_cmp expect actual
 
-expecting success of 0063.8 'split (in place) foo:;:bar:;:baz:;: at :;, max -1': 
-		test-tool string-list split_in_place 'foo:;:bar:;:baz:;:' ':;' '-1' >actual &&
-		test_cmp expected actual
-	
-ok 8 - split (in place) foo:;:bar:;:baz:;: at :;, max -1
+ok 3 - NUL delimiters
 
-expecting success of 0063.9 'split (in place) foo:;:bar:;:baz at :;, max 0': 
-		test-tool string-list split_in_place 'foo:;:bar:;:baz' ':;' '0' >actual &&
-		test_cmp expected actual
-	
-ok 9 - split (in place) foo:;:bar:;:baz at :;, max 0
+expecting success of 0067.4 'LF delimiters': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
 
-expecting success of 0063.10 'split (in place) foo:;:bar:;:baz at :;, max 1': 
-		test-tool string-list split_in_place 'foo:;:bar:;:baz' ':;' '1' >actual &&
-		test_cmp expected actual
-	
-ok 10 - split (in place) foo:;:bar:;:baz at :;, max 1
+	printf "fileA.t\nfileB.t\n" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
 
-expecting success of 0063.11 'split (in place) foo:;:bar:;:baz at :;, max 2': 
-		test-tool string-list split_in_place 'foo:;:bar:;:baz' ':;' '2' >actual &&
-		test_cmp expected actual
-	
-ok 11 - split (in place) foo:;:bar:;:baz at :;, max 2
+	test_cmp expect actual
 
-expecting success of 0063.12 'split (in place) foo:;:bar:;: at :;, max -1': 
-		test-tool string-list split_in_place 'foo:;:bar:;:' ':;' '-1' >actual &&
-		test_cmp expected actual
-	
-ok 12 - split (in place) foo:;:bar:;: at :;, max -1
+ok 4 - LF delimiters
 
-expecting success of 0063.13 'test filter_string_list': 
-	test "x-" = "x$(test-tool string-list filter - y)" &&
-	test "x-" = "x$(test-tool string-list filter no y)" &&
-	test yes = "$(test-tool string-list filter yes y)" &&
-	test yes = "$(test-tool string-list filter no:yes y)" &&
-	test yes = "$(test-tool string-list filter yes:no y)" &&
-	test y1:y2 = "$(test-tool string-list filter y1:y2 y)" &&
-	test y2:y1 = "$(test-tool string-list filter y2:y1 y)" &&
-	test "x-" = "x$(test-tool string-list filter x1:x2 y)"
+expecting success of 0067.5 'no trailing delimiter': 
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
 
-ok 13 - test filter_string_list
+	printf "fileA.t\nfileB.t" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
 
-expecting success of 0063.14 'test remove_duplicates': 
-	test "x-" = "x$(test-tool string-list remove_duplicates -)" &&
-	test "x" = "x$(test-tool string-list remove_duplicates "")" &&
-	test a = "$(test-tool string-list remove_duplicates a)" &&
-	test a = "$(test-tool string-list remove_duplicates a:a)" &&
-	test a = "$(test-tool string-list remove_duplicates a:a:a:a:a)" &&
-	test a:b = "$(test-tool string-list remove_duplicates a:b)" &&
-	test a:b = "$(test-tool string-list remove_duplicates a:a:b)" &&
-	test a:b = "$(test-tool string-list remove_duplicates a:b:b)" &&
-	test a:b:c = "$(test-tool string-list remove_duplicates a:b:c)" &&
-	test a:b:c = "$(test-tool string-list remove_duplicates a:a:b:c)" &&
-	test a:b:c = "$(test-tool string-list remove_duplicates a:b:b:c)" &&
-	test a:b:c = "$(test-tool string-list remove_duplicates a:b:c:c)" &&
-	test a:b:c = "$(test-tool string-list remove_duplicates a:a:b:b:c:c)" &&
-	test a:b:c = "$(test-tool string-list remove_duplicates a:a:a:b:b:b:c:c:c)"
+	test_cmp expect actual
 
-ok 14 - test remove_duplicates
+ok 5 - no trailing delimiter
 
-# passed all 14 test(s)
-1..14
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0066-dir-iterator.sh ***
@@ -26554,121 +26066,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0067-parse_pathspec_file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0069-oidtree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0069-oidtree/.git/
 expecting success of 0069.1 'oidtree insert and contains': 
@@ -26707,13 +26104,125 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0068-for-each-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/.git/
+expecting success of 0068.1 'run based on configured value': 
+	git init one &&
+	git init two &&
+	git init three &&
+	git init ~/four &&
+	git -C two commit --allow-empty -m "DID NOT RUN" &&
+	git config run.key "$TRASH_DIRECTORY/one" &&
+	git config --add run.key "$TRASH_DIRECTORY/three" &&
+	git config --add run.key "~/four" &&
+	git for-each-repo --config=run.key commit --allow-empty -m "ran" &&
+	git -C one log -1 --pretty=format:%s >message &&
+	grep ran message &&
+	git -C two log -1 --pretty=format:%s >message &&
+	! grep ran message &&
+	git -C three log -1 --pretty=format:%s >message &&
+	grep ran message &&
+	git -C ~/four log -1 --pretty=format:%s >message &&
+	grep ran message &&
+	git for-each-repo --config=run.key -- commit --allow-empty -m "ran again" &&
+	git -C one log -1 --pretty=format:%s >message &&
+	grep again message &&
+	git -C two log -1 --pretty=format:%s >message &&
+	! grep again message &&
+	git -C three log -1 --pretty=format:%s >message &&
+	grep again message &&
+	git -C ~/four log -1 --pretty=format:%s >message &&
+	grep again message
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/one/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/two/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/three/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/four/.git/
+[master (root-commit) 20fd2df] DID NOT RUN
+ Author: A U Thor <author@example.com>
+[master (root-commit) 3c2529d] ran
+ Author: A U Thor <author@example.com>
+[master (root-commit) 3c2529d] ran
+ Author: A U Thor <author@example.com>
+[master (root-commit) 3c2529d] ran
+ Author: A U Thor <author@example.com>
+ran
+ran
+ran
+[master 3fc5dd1] ran again
+ Author: A U Thor <author@example.com>
+[master 3fc5dd1] ran again
+ Author: A U Thor <author@example.com>
+[master 3fc5dd1] ran again
+ Author: A U Thor <author@example.com>
+ran again
+ran again
+ran again
+ok 1 - run based on configured value
+
+expecting success of 0068.2 'do nothing on empty config': 
+	# the whole thing would fail if for-each-ref iterated even
+	# once, because "git help --no-such-option" would fail
+	git for-each-repo --config=bogus.config -- help --no-such-option
+
+ok 2 - do nothing on empty config
+
+expecting success of 0068.3 'error on bad config keys': 
+	test_expect_code 129 git for-each-repo --config=a &&
+	test_expect_code 129 git for-each-repo --config=a.b. &&
+	test_expect_code 129 git for-each-repo --config="'.b"
+
+error: key does not contain a section: a
+fatal: got bad config --config=a
+
+usage: git for-each-repo --config=<config> [--] <arguments>
+
+    --[no-]config <config>
+                          config key storing a list of repository paths
+
+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
+
+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
+
+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
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0070-fundamental.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0070-fundamental/.git/
 expecting success of 0070.1 'mktemp to nonexistent directory prints filename': 
 	test_must_fail test-tool mktemp doesnotexist/testXXXXXX 2>err &&
 	grep "doesnotexist/test" err
 
-fatal: Unable to create temporary file '/build/reproducible-path/git-2.45.2/t/trash directory.t0070-fundamental/doesnotexist/testsGpICs': No such file or directory
+fatal: Unable to create temporary file '/build/reproducible-path/git-2.45.2/t/trash directory.t0070-fundamental/doesnotexist/test0Tcn0m': No such file or directory
 ok 1 - mktemp to nonexistent directory prints filename
 
 checking prerequisite: SANITY
@@ -26749,7 +26258,7 @@
 	test_must_fail test-tool mktemp cannotwrite/testXXXXXX 2>err &&
 	grep "cannotwrite/test" err
 
-fatal: Unable to create temporary file '/build/reproducible-path/git-2.45.2/t/trash directory.t0070-fundamental/cannotwrite/testx9DMdt': Permission denied
+fatal: Unable to create temporary file '/build/reproducible-path/git-2.45.2/t/trash directory.t0070-fundamental/cannotwrite/testiA3UPH': 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': 
@@ -26856,118 +26365,6 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0068-for-each-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/.git/
-expecting success of 0068.1 'run based on configured value': 
-	git init one &&
-	git init two &&
-	git init three &&
-	git init ~/four &&
-	git -C two commit --allow-empty -m "DID NOT RUN" &&
-	git config run.key "$TRASH_DIRECTORY/one" &&
-	git config --add run.key "$TRASH_DIRECTORY/three" &&
-	git config --add run.key "~/four" &&
-	git for-each-repo --config=run.key commit --allow-empty -m "ran" &&
-	git -C one log -1 --pretty=format:%s >message &&
-	grep ran message &&
-	git -C two log -1 --pretty=format:%s >message &&
-	! grep ran message &&
-	git -C three log -1 --pretty=format:%s >message &&
-	grep ran message &&
-	git -C ~/four log -1 --pretty=format:%s >message &&
-	grep ran message &&
-	git for-each-repo --config=run.key -- commit --allow-empty -m "ran again" &&
-	git -C one log -1 --pretty=format:%s >message &&
-	grep again message &&
-	git -C two log -1 --pretty=format:%s >message &&
-	! grep again message &&
-	git -C three log -1 --pretty=format:%s >message &&
-	grep again message &&
-	git -C ~/four log -1 --pretty=format:%s >message &&
-	grep again message
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/one/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/two/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/three/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0068-for-each-repo/four/.git/
-[master (root-commit) 20fd2df] DID NOT RUN
- Author: A U Thor <author@example.com>
-[master (root-commit) 3c2529d] ran
- Author: A U Thor <author@example.com>
-[master (root-commit) 3c2529d] ran
- Author: A U Thor <author@example.com>
-[master (root-commit) 3c2529d] ran
- Author: A U Thor <author@example.com>
-ran
-ran
-ran
-[master 3fc5dd1] ran again
- Author: A U Thor <author@example.com>
-[master 3fc5dd1] ran again
- Author: A U Thor <author@example.com>
-[master 3fc5dd1] ran again
- Author: A U Thor <author@example.com>
-ran again
-ran again
-ran again
-ok 1 - run based on configured value
-
-expecting success of 0068.2 'do nothing on empty config': 
-	# the whole thing would fail if for-each-ref iterated even
-	# once, because "git help --no-such-option" would fail
-	git for-each-repo --config=bogus.config -- help --no-such-option
-
-ok 2 - do nothing on empty config
-
-expecting success of 0068.3 'error on bad config keys': 
-	test_expect_code 129 git for-each-repo --config=a &&
-	test_expect_code 129 git for-each-repo --config=a.b. &&
-	test_expect_code 129 git for-each-repo --config="'.b"
-
-error: key does not contain a section: a
-fatal: got bad config --config=a
-
-usage: git for-each-repo --config=<config> [--] <arguments>
-
-    --[no-]config <config>
-                          config key storing a list of repository paths
-
-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
-
-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
-
-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
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0080-unit-test-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0080-unit-test-output/.git/
 expecting success of 0080.1 'TAP output from unit tests': 
@@ -28852,2141 +28249,149 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0091-bugreport.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0091-bugreport/.git/
-expecting success of 0091.1 'create a report': 
-	git bugreport -s format &&
-	test_file_not_empty git-bugreport-format.txt
-
-Created new report at 'git-bugreport-format.txt'.
-ok 1 - create a report
+*** t0052-simple-ipc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0052-simple-ipc/.git/
+expecting success of 0052.1 'start simple command server': 
+	test_atexit stop_simple_IPC_server &&
+	test-tool simple-ipc start-daemon --threads=8 &&
+	test-tool simple-ipc is-active
 
-expecting success of 0091.2 'report contains wanted template (before first section)': 
-	sed -ne "/^\[/q;p" git-bugreport-format.txt >actual &&
-	cat >expect <<-\EOF &&
-	Thank you for filling out a Git bug report!
-	Please answer the following questions to help us understand your issue.
+ok 1 - start simple command server
 
-	What did you do before the bug happened? (Steps to reproduce your issue)
+expecting success of 0052.2 'simple command server': 
+	test-tool simple-ipc send --token=ping >actual &&
+	echo pong >expect &&
+	test_cmp expect actual
 
-	What did you expect to happen? (Expected behavior)
+ok 2 - simple command server
 
-	What happened instead? (Actual behavior)
+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
 
-	What's different between what you expected and what actually happened?
+error: socket/pipe already in use: 'ipc-test'
+ok 3 - servers cannot share the same path
 
-	Anything else you want to add:
+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
 
-	Please review the rest of the bug report below.
-	You can delete any lines you don't wish to share.
+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
 
-	EOF
-	test_cmp expect actual
+ok 5 - chunk response
 
-ok 2 - report contains wanted template (before first section)
+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
 
-expecting success of 0091.3 'sanity check "System Info" section': 
-	test_when_finished rm -f git-bugreport-format.txt &&
+ok 6 - slow response
 
-	sed -ne "/^\[System Info\]$/,/^$/p" <git-bugreport-format.txt >system &&
+expecting success of 0052.7 'sendbytes': 
+	test-tool simple-ipc sendbytes --bytecount=100000 --byte=A >actual &&
+	grep "sent:A00100000 rcvd:A00100000" actual
 
-	# The beginning should match "git version --build-options" verbatim,
-	# but rather than checking bit-for-bit equality, just test some basics.
-	grep "git version " system &&
-	grep "shell-path: ." system &&
+sent:A00100000 rcvd:A00100000
+ok 7 - sendbytes
 
-	# After the version, there should be some more info.
-	# This is bound to differ from environment to environment,
-	# so we just do some rather high-level checks.
-	grep "uname: ." system &&
-	grep "compiler info: ." system
+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
 
-git version 2.45.2
-shell-path: /bin/sh
-uname: Linux 6.10.11+bpo-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.10.11-1~bpo12+1 (2024-10-03) x86_64
-compiler info: gnuc: 14.2
-ok 3 - sanity check "System Info" section
+client (good 91) (join 0), (errors 0)
+ok 8 - stress test threads
 
-expecting success of 0091.4 'dies if file with same name as report already exists': 
-	test_when_finished rm git-bugreport-duplicate.txt &&
-	>>git-bugreport-duplicate.txt &&
-	test_must_fail git bugreport --suffix duplicate
+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
 
-fatal: unable to create 'git-bugreport-duplicate.txt': File exists
-ok 4 - dies if file with same name as report already exists
+error: no server listening at 'ipc-test'
+error: no server listening at 'ipc-test'
+ok 9 - stop-daemon works
 
-expecting success of 0091.5 '--output-directory puts the report in the provided dir': 
-	test_when_finished rm -fr foo/ &&
-	git bugreport -o foo/ &&
-	test_path_is_file foo/git-bugreport-*
+error: no server listening at 'ipc-test'
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0060-path-utils.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0060-path-utils/.git/
+expecting success of 0060.1 'basename': test-tool path-utils basename
+ok 1 - basename
 
-Created new report at 'foo/git-bugreport-2025-12-18-0132.txt'.
-ok 5 - --output-directory puts the report in the provided dir
+expecting success of 0060.2 'dirname': test-tool path-utils dirname
+ok 2 - dirname
 
-expecting success of 0091.6 'incorrect arguments abort with usage': 
-	test_must_fail git bugreport --false 2>output &&
-	test_grep usage output &&
-	test_path_is_missing git-bugreport-*
+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:  => 
 
-usage: git bugreport [(-o | --output-directory) <path>]
-ok 6 - incorrect arguments abort with usage
+expecting success of 0060.4 'normalize path: . => ': 
+		echo '' >expect &&
+		test-tool path-utils normalize_path_copy '.' >actual &&
+		test_cmp expect actual
+	
+ok 4 - normalize path: . => 
 
-expecting success of 0091.7 'incorrect positional arguments abort with usage and hint': 
-	test_must_fail git bugreport false 2>output &&
-	test_grep usage output &&
-	test_grep false output &&
-	test_path_is_missing git-bugreport-*
+expecting success of 0060.5 'normalize path: ./ => ': 
+		echo '' >expect &&
+		test-tool path-utils normalize_path_copy './' >actual &&
+		test_cmp expect actual
+	
+ok 5 - normalize path: ./ => 
 
-usage: git bugreport [(-o | --output-directory) <path>]
-error: unknown argument `false'
-ok 7 - incorrect positional arguments abort with usage and hint
+expecting success of 0060.6 'normalize path: ./. => ': 
+		echo '' >expect &&
+		test-tool path-utils normalize_path_copy './.' >actual &&
+		test_cmp expect actual
+	
+ok 6 - normalize path: ./. => 
 
-expecting success of 0091.8 'runs outside of a git dir': 
-	test_when_finished rm non-repo/git-bugreport-* &&
-	nongit git bugreport
+expecting success of 0060.7 'normalize path: ./.. => ++failed++': 
+		echo '++failed++' >expect &&
+		test-tool path-utils normalize_path_copy './..' >actual &&
+		test_cmp expect actual
+	
+ok 7 - normalize path: ./.. => ++failed++
 
-Created new report at 'git-bugreport-2025-12-18-0132.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-12-18-0132.txt'.
-ok 9 - can create leading directories outside of a git dir
-
-expecting success of 0091.10 'indicates populated hooks': 
-	test_when_finished rm git-bugreport-hooks.txt &&
-
-	test_hook applypatch-msg <<-\EOF &&
-	true
-	EOF
-	test_hook unknown-hook <<-\EOF &&
-	true
-	EOF
-	git bugreport -s hooks &&
-
-	sort >expect <<-\EOF &&
-	[Enabled Hooks]
-	applypatch-msg
-	EOF
-
-	sed -ne "/^\[Enabled Hooks\]$/,/^$/p" <git-bugreport-hooks.txt >actual &&
-	test_cmp expect actual
-
-Created new report at 'git-bugreport-hooks.txt'.
-ok 10 - indicates populated hooks
-
-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 12.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 0091.11 '--diagnose creates diagnostics zip archive': 
-	test_when_finished rm -rf report &&
-
-	git bugreport --diagnose -o report -s test >out &&
-
-	zip_path=report/git-diagnostics-test.zip &&
-	grep "Available space" out &&
-	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'
-Created new report at 'report/git-bugreport-test.txt'.
-Available space on '/build/reproducible-path/git-2.45.2/t/trash directory.t0091-bugreport': 182.21 GiB (mount flags 0x1000)
-Contents of .git/objects:
-Total: 0 loose objects
-ok 11 - --diagnose creates diagnostics zip archive
-
-expecting success of 0091.12 '--diagnose=stats excludes .git dir contents': 
-	test_when_finished rm -rf report &&
-
-	git bugreport --diagnose=stats -o report -s test >out &&
-
-	# Includes pack quantity/size info
-	"$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'
-Created new report at 'report/git-bugreport-test.txt'.
-Contents of .git/objects:
-ok 12 - --diagnose=stats excludes .git dir contents
-
-expecting success of 0091.13 '--diagnose=all includes .git dir contents': 
-	test_when_finished rm -rf report &&
-
-	git bugreport --diagnose=all -o report -s test >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
-
-warning: could not archive missing directory '.git/logs'
-
-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-12-18 01:32   .git/HEAD
-       92  2025-12-18 01:32   .git/config
-       73  2025-12-18 01:32   .git/description
-     1492  2025-12-18 01:32   .git/hooks/prepare-commit-msg.sample
-      189  2025-12-18 01:32   .git/hooks/post-update.sample
-     3650  2025-12-18 01:32   .git/hooks/update.sample
-      478  2025-12-18 01:32   .git/hooks/applypatch-msg.sample
-     1649  2025-12-18 01:32   .git/hooks/pre-commit.sample
-     2308  2025-12-18 01:32   .git/hooks/sendemail-validate.sample
-      544  2025-12-18 01:32   .git/hooks/pre-receive.sample
-      416  2025-12-18 01:32   .git/hooks/pre-merge-commit.sample
-     4726  2025-12-18 01:32   .git/hooks/fsmonitor-watchman.sample
-     4898  2025-12-18 01:32   .git/hooks/pre-rebase.sample
-      896  2025-12-18 01:32   .git/hooks/commit-msg.sample
-     2783  2025-12-18 01:32   .git/hooks/push-to-checkout.sample
-     1374  2025-12-18 01:32   .git/hooks/pre-push.sample
-      424  2025-12-18 01:32   .git/hooks/pre-applypatch.sample
-      240  2025-12-18 01:32   .git/info/exclude
-ok 13 - --diagnose=all includes .git dir contents
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0092-diagnose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0092-diagnose/.git/
-checking prerequisite: UNZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-	"$GIT_UNZIP" -v
-	test $? -ne 127
-
-)
-UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
-
-Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
-see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
-
-Compiled with gcc 12.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.45.2/t/trash directory.t0092-diagnose': 182.21 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:
-       23  2025-12-18 01:32   .git/HEAD
-       92  2025-12-18 01:32   .git/config
-       73  2025-12-18 01:32   .git/description
-      137  2025-12-18 01:32   .git/index
-        2  2025-12-18 01:32   .git/COMMIT_EDITMSG
-     1492  2025-12-18 01:32   .git/hooks/prepare-commit-msg.sample
-      189  2025-12-18 01:32   .git/hooks/post-update.sample
-     3650  2025-12-18 01:32   .git/hooks/update.sample
-      478  2025-12-18 01:32   .git/hooks/applypatch-msg.sample
-     1649  2025-12-18 01:32   .git/hooks/pre-commit.sample
-     2308  2025-12-18 01:32   .git/hooks/sendemail-validate.sample
-      544  2025-12-18 01:32   .git/hooks/pre-receive.sample
-      416  2025-12-18 01:32   .git/hooks/pre-merge-commit.sample
-     4726  2025-12-18 01:32   .git/hooks/fsmonitor-watchman.sample
-     4898  2025-12-18 01:32   .git/hooks/pre-rebase.sample
-      896  2025-12-18 01:32   .git/hooks/commit-msg.sample
-     2783  2025-12-18 01:32   .git/hooks/push-to-checkout.sample
-     1374  2025-12-18 01:32   .git/hooks/pre-push.sample
-      424  2025-12-18 01:32   .git/hooks/pre-applypatch.sample
-      240  2025-12-18 01:32   .git/info/exclude
-      154  2025-12-18 01:32   .git/logs/refs/heads/master
-      154  2025-12-18 01:32   .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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0095-bloom.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0095-bloom/.git/
-expecting success of 0095.1 'compute unseeded murmur3 hash for empty string': 
-	cat >expect <<-\EOF &&
-	Murmur3 Hash with seed=0:0x00000000
-	EOF
-	test-tool bloom get_murmur3 "" >actual &&
-	test_cmp expect actual
-
-ok 1 - compute unseeded murmur3 hash for empty string
-
-expecting success of 0095.2 'compute unseeded murmur3 hash for test string 1': 
-	cat >expect <<-\EOF &&
-	Murmur3 Hash with seed=0:0x627b0c2c
-	EOF
-	test-tool bloom get_murmur3 "Hello world!" >actual &&
-	test_cmp expect actual
-
-ok 2 - compute unseeded murmur3 hash for test string 1
-
-expecting success of 0095.3 'compute unseeded murmur3 hash for test string 2': 
-	cat >expect <<-\EOF &&
-	Murmur3 Hash with seed=0:0x2e4ff723
-	EOF
-	test-tool bloom get_murmur3 "The quick brown fox jumps over the lazy dog" >actual &&
-	test_cmp expect actual
-
-ok 3 - compute unseeded murmur3 hash for test string 2
-
-expecting success of 0095.4 'compute bloom key for empty string': 
-	cat >expect <<-\EOF &&
-	Hashes:0x5615800c|0x5b966560|0x61174ab4|0x66983008|0x6c19155c|0x7199fab0|0x771ae004|
-	Filter_Length:2
-	Filter_Data:11|11|
-	EOF
-	test-tool bloom generate_filter "" >actual &&
-	test_cmp expect actual
-
-ok 4 - compute bloom key for empty string
-
-expecting success of 0095.5 'compute bloom key for whitespace': 
-	cat >expect <<-\EOF &&
-	Hashes:0xf178874c|0x5f3d6eb6|0xcd025620|0x3ac73d8a|0xa88c24f4|0x16510c5e|0x8415f3c8|
-	Filter_Length:2
-	Filter_Data:51|55|
-	EOF
-	test-tool bloom generate_filter " " >actual &&
-	test_cmp expect actual
-
-ok 5 - compute bloom key for whitespace
-
-expecting success of 0095.6 'compute bloom key for test string 1': 
-	cat >expect <<-\EOF &&
-	Hashes:0xb270de9b|0x1bb6f26e|0x84fd0641|0xee431a14|0x57892de7|0xc0cf41ba|0x2a15558d|
-	Filter_Length:2
-	Filter_Data:92|6c|
-	EOF
-	test-tool bloom generate_filter "Hello world!" >actual &&
-	test_cmp expect actual
-
-ok 6 - compute bloom key for test string 1
-
-expecting success of 0095.7 'compute bloom key for test string 2': 
-	cat >expect <<-\EOF &&
-	Hashes:0x20ab385b|0xf5237fe2|0xc99bc769|0x9e140ef0|0x728c5677|0x47049dfe|0x1b7ce585|
-	Filter_Length:2
-	Filter_Data:a5|4a|
-	EOF
-	test-tool bloom generate_filter "file.txt" >actual &&
-	test_cmp expect actual
-
-ok 7 - compute bloom key for test string 2
-
-expecting success of 0095.8 'get bloom filters for commit with no changes': 
-	git init &&
-	git commit --allow-empty -m "c0" &&
-	cat >expect <<-\EOF &&
-	Filter_Length:1
-	Filter_Data:00|
-	EOF
-	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
-	test_cmp expect actual
-
-Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0095-bloom/.git/
-[master (root-commit) c7bd1a3] c0
- Author: A U Thor <author@example.com>
-ok 8 - get bloom filters for commit with no changes
-
-expecting success of 0095.9 'get bloom filter for commit with 10 changes': 
-	rm actual &&
-	rm expect &&
-	mkdir smallDir &&
-	for i in $(test_seq 0 9)
-	do
-		echo $i >smallDir/$i || return 1
-	done &&
-	git add smallDir &&
-	git commit -m "commit with 10 changes" &&
-	cat >expect <<-\EOF &&
-	Filter_Length:14
-	Filter_Data:02|b3|c4|a0|34|e7|fe|eb|cb|47|fe|a0|e8|72|
-	EOF
-	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
-	test_cmp expect actual
-
-[master 2444bb6] commit with 10 changes
- Author: A U Thor <author@example.com>
- 10 files changed, 10 insertions(+)
- create mode 100644 smallDir/0
- create mode 100644 smallDir/1
- create mode 100644 smallDir/2
- create mode 100644 smallDir/3
- create mode 100644 smallDir/4
- create mode 100644 smallDir/5
- create mode 100644 smallDir/6
- create mode 100644 smallDir/7
- create mode 100644 smallDir/8
- create mode 100644 smallDir/9
-ok 9 - get bloom filter for commit with 10 changes
-
-checking prerequisite: EXPENSIVE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
-
-)
-prerequisite EXPENSIVE not satisfied
-ok 10 # skip get bloom filter for commit with 513 changes (missing EXPENSIVE)
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0101-at-syntax.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0101-at-syntax/.git/
-expecting success of 0101.1 'setup': 
-	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 - setup
-
-expecting success of 0101.2 '@{0} shows current': 
-	check_at @{0} two
-
-ok 2 - @{0} shows current
-
-expecting success of 0101.3 '@{1} shows old': 
-	check_at @{1} one
-
-ok 3 - @{1} shows old
-
-expecting success of 0101.4 '@{now} shows current': 
-	check_at @{now} two
-
-ok 4 - @{now} shows current
-
-expecting success of 0101.5 '@{2001-09-17} (before the first commit) shows old': 
-	check_at @{2001-09-17} one
-
-warning: log for 'master' only goes back to Thu, 7 Apr 2005 15:13:13 -0700
-ok 5 - @{2001-09-17} (before the first commit) shows old
-
-expecting success of 0101.6 'silly approxidates work': 
-	check_at @{3.hot.dogs.on.2001-09-17} one
-
-warning: log for 'master' only goes back to Thu, 7 Apr 2005 15:13:13 -0700
-ok 6 - silly approxidates work
-
-expecting success of 0101.7 'notice misspelled upstream': 
-	test_must_fail git log -1 --format=%s @{usptream}
-
-fatal: ambiguous argument '@{usptream}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 7 - notice misspelled upstream
-
-expecting success of 0101.8 'complain about total nonsense': 
-	test_must_fail git log -1 --format=%s @{utter.bogosity}
-
-fatal: ambiguous argument '@{utter.bogosity}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 8 - complain about total nonsense
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0100-previous.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0100-previous/.git/
-expecting success of 0100.1 'branch -d @{-1}': 
-	test_commit A &&
-	git checkout -b junk &&
-	git checkout - &&
-	echo refs/heads/main >expect &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual &&
-	git branch -d @{-1} &&
-	test_must_fail git rev-parse --verify refs/heads/junk
-
-[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 'junk'
-Switched to branch 'main'
-Deleted branch junk (was 0ddfaf1).
-fatal: Needed a single revision
-ok 1 - branch -d @{-1}
-
-expecting success of 0100.2 'branch -d @{-12} when there is not enough switches yet': 
-	git reflog expire --expire=now &&
-	git checkout -b junk2 &&
-	git checkout - &&
-	echo refs/heads/main >expect &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch -d @{-12} &&
-	git rev-parse --verify refs/heads/main
-
-Switched to a new branch 'junk2'
-Switched to branch 'main'
-error: branch '@{-12}' not found
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050
-ok 2 - branch -d @{-12} when there is not enough switches yet
-
-expecting success of 0100.3 'merge @{-1}': 
-	git checkout A &&
-	test_commit B &&
-	git checkout A &&
-	test_commit C &&
-	test_commit D &&
-	git branch -f main B &&
-	git branch -f other &&
-	git checkout other &&
-	git checkout main &&
-	git merge @{-1} &&
-	git cat-file commit HEAD | grep "Merge branch 'other'"
-
-Note: switching to 'A'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 0ddfaf1 A
-[detached HEAD d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Previous HEAD position was d9df450 B
-HEAD is now at 0ddfaf1 A
-[detached HEAD 5dee784] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[detached HEAD 12bd07b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Switched to branch 'other'
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- D.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 C.t
- create mode 100644 D.t
-Merge branch 'other'
-ok 3 - merge @{-1}
-
-expecting success of 0100.4 'merge @{-1}~1': 
-	git checkout main &&
-	git reset --hard B &&
-	git checkout other &&
-	git checkout main &&
-	git merge @{-1}~1 &&
-	git cat-file commit HEAD >actual &&
-	grep "Merge branch 'other'" actual
-
-Already on 'main'
-HEAD is now at d9df450 B
-Switched to branch 'other'
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Merge branch 'other' (early part)
-ok 4 - merge @{-1}~1
-
-expecting success of 0100.5 'merge @{-100} before checking out that many branches yet': 
-	git reflog expire --expire=now &&
-	git checkout -f main &&
-	git reset --hard B &&
-	git branch -f other C &&
-	git checkout other &&
-	git checkout main &&
-	test_must_fail git merge @{-100}
-
-Already on 'main'
-HEAD is now at d9df450 B
-Switched to branch 'other'
-Switched to branch 'main'
-merge: @{-100} - not something we can merge
-ok 5 - merge @{-100} before checking out that many branches yet
-
-expecting success of 0100.6 'log -g @{-1}': 
-	git checkout -b last_branch &&
-	git checkout -b new_branch &&
-	echo "last_branch@{0}" >expect &&
-	git log -g --format=%gd @{-1} >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'last_branch'
-Switched to a new branch 'new_branch'
-ok 6 - log -g @{-1}
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0110-urlmatch-normalization.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0110-urlmatch-normalization/.git/
-expecting success of 0110.1 'url scheme': 
-	! test-tool urlmatch-normalization "" &&
-	! test-tool urlmatch-normalization "_" &&
-	! test-tool urlmatch-normalization "scheme" &&
-	! test-tool urlmatch-normalization "scheme:" &&
-	! test-tool urlmatch-normalization "scheme:/" &&
-	! test-tool urlmatch-normalization "scheme://" &&
-	! test-tool urlmatch-normalization "file" &&
-	! test-tool urlmatch-normalization "file:" &&
-	! test-tool urlmatch-normalization "file:/" &&
-	test-tool urlmatch-normalization "file://" &&
-	! test-tool urlmatch-normalization "://acme.co" &&
-	! test-tool urlmatch-normalization "x_test://acme.co" &&
-	! test-tool urlmatch-normalization "-test://acme.co" &&
-	! test-tool urlmatch-normalization "0test://acme.co" &&
-	! test-tool urlmatch-normalization "+test://acme.co" &&
-	! test-tool urlmatch-normalization ".test://acme.co" &&
-	! test-tool urlmatch-normalization "schem%6e://" &&
-	test-tool urlmatch-normalization "x-Test+v1.0://acme.co" &&
-	test "$(test-tool urlmatch-normalization -p "AbCdeF://x.Y")" = "abcdef://x.y/"
-
-ok 1 - url scheme
-
-expecting success of 0110.2 'url authority': 
-	! test-tool urlmatch-normalization "scheme://user:pass@" &&
-	! test-tool urlmatch-normalization "scheme://?" &&
-	! test-tool urlmatch-normalization "scheme://#" &&
-	! test-tool urlmatch-normalization "scheme:///" &&
-	! test-tool urlmatch-normalization "scheme://:" &&
-	! test-tool urlmatch-normalization "scheme://:555" &&
-	test-tool urlmatch-normalization "file://user:pass@" &&
-	test-tool urlmatch-normalization "file://?" &&
-	test-tool urlmatch-normalization "file://#" &&
-	test-tool urlmatch-normalization "file:///" &&
-	test-tool urlmatch-normalization "file://:" &&
-	! test-tool urlmatch-normalization "file://:555" &&
-	test-tool urlmatch-normalization "scheme://user:pass@host" &&
-	test-tool urlmatch-normalization "scheme://@host" &&
-	test-tool urlmatch-normalization "scheme://%00@host" &&
-	! test-tool urlmatch-normalization "scheme://%%@host" &&
-	test-tool urlmatch-normalization "scheme://host_" &&
-	test-tool urlmatch-normalization "scheme://user:pass@host/" &&
-	test-tool urlmatch-normalization "scheme://@host/" &&
-	test-tool urlmatch-normalization "scheme://host/" &&
-	test-tool urlmatch-normalization "scheme://host?x" &&
-	test-tool urlmatch-normalization "scheme://host#x" &&
-	test-tool urlmatch-normalization "scheme://host/@" &&
-	test-tool urlmatch-normalization "scheme://host?@x" &&
-	test-tool urlmatch-normalization "scheme://host#@x" &&
-	test-tool urlmatch-normalization "scheme://[::1]" &&
-	test-tool urlmatch-normalization "scheme://[::1]/" &&
-	! test-tool urlmatch-normalization "scheme://hos%41/" &&
-	test-tool urlmatch-normalization "scheme://[invalid....:/" &&
-	test-tool urlmatch-normalization "scheme://invalid....:]/" &&
-	! test-tool urlmatch-normalization "scheme://invalid....:[/" &&
-	! test-tool urlmatch-normalization "scheme://invalid....:["
-
-ok 2 - url authority
-
-expecting success of 0110.3 'url port checks': 
-	test-tool urlmatch-normalization "xyz://q@some.host:" &&
-	test-tool urlmatch-normalization "xyz://q@some.host:456/" &&
-	! test-tool urlmatch-normalization "xyz://q@some.host:0" &&
-	! test-tool urlmatch-normalization "xyz://q@some.host:0000000" &&
-	test-tool urlmatch-normalization "xyz://q@some.host:0000001?" &&
-	test-tool urlmatch-normalization "xyz://q@some.host:065535#" &&
-	test-tool urlmatch-normalization "xyz://q@some.host:65535" &&
-	! test-tool urlmatch-normalization "xyz://q@some.host:65536" &&
-	! test-tool urlmatch-normalization "xyz://q@some.host:99999" &&
-	! test-tool urlmatch-normalization "xyz://q@some.host:100000" &&
-	! test-tool urlmatch-normalization "xyz://q@some.host:100001" &&
-	test-tool urlmatch-normalization "http://q@some.host:80" &&
-	test-tool urlmatch-normalization "https://q@some.host:443" &&
-	test-tool urlmatch-normalization "http://q@some.host:80/" &&
-	test-tool urlmatch-normalization "https://q@some.host:443?" &&
-	! test-tool urlmatch-normalization "http://q@:8008" &&
-	! test-tool urlmatch-normalization "http://:8080" &&
-	! test-tool urlmatch-normalization "http://:" &&
-	test-tool urlmatch-normalization "xyz://q@some.host:456/" &&
-	test-tool urlmatch-normalization "xyz://[::1]:456/" &&
-	test-tool urlmatch-normalization "xyz://[::1]:/" &&
-	! test-tool urlmatch-normalization "xyz://[::1]:000/" &&
-	! test-tool urlmatch-normalization "xyz://[::1]:0%300/" &&
-	! test-tool urlmatch-normalization "xyz://[::1]:0x80/" &&
-	! test-tool urlmatch-normalization "xyz://[::1]:4294967297/" &&
-	! test-tool urlmatch-normalization "xyz://[::1]:030f/"
-
-ok 3 - url port checks
-
-expecting success of 0110.4 'url port normalization': 
-	test "$(test-tool urlmatch-normalization -p "http://x:800")" = "http://x:800/" &&
-	test "$(test-tool urlmatch-normalization -p "http://x:0800")" = "http://x:800/" &&
-	test "$(test-tool urlmatch-normalization -p "http://x:00000800")" = "http://x:800/" &&
-	test "$(test-tool urlmatch-normalization -p "http://x:065535")" = "http://x:65535/" &&
-	test "$(test-tool urlmatch-normalization -p "http://x:1")" = "http://x:1/" &&
-	test "$(test-tool urlmatch-normalization -p "http://x:80")" = "http://x/" &&
-	test "$(test-tool urlmatch-normalization -p "http://x:080")" = "http://x/" &&
-	test "$(test-tool urlmatch-normalization -p "http://x:000000080")" = "http://x/" &&
-	test "$(test-tool urlmatch-normalization -p "https://x:443")" = "https://x/" &&
-	test "$(test-tool urlmatch-normalization -p "https://x:0443")" = "https://x/" &&
-	test "$(test-tool urlmatch-normalization -p "https://x:000000443")" = "https://x/"
-
-ok 4 - url port normalization
-
-expecting success of 0110.5 'url general escapes': 
-	! test-tool urlmatch-normalization "http://x.y?%fg" &&
-	test "$(test-tool urlmatch-normalization -p "X://W/%7e%41^%3a")" = "x://w/~A%5E%3A" &&
-	test "$(test-tool urlmatch-normalization -p "X://W/:/?#[]@")" = "x://w/:/?#[]@" &&
-	test "$(test-tool urlmatch-normalization -p "X://W/$&()*+,;=")" = "x://w/$&()*+,;=" &&
-	test "$(test-tool urlmatch-normalization -p "X://W/'")" = "x://w/'" &&
-	test "$(test-tool urlmatch-normalization -p "X://W?!")" = "x://w/?!"
-
-ok 5 - url general escapes
-
-expecting success of 0110.6 'url high-bit escapes': 
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-1")")" = "x://q/%01%02%03%04%05%06%07%08%0E%0F%10%11%12" &&
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-2")")" = "x://q/%13%14%15%16%17%18%19%1B%1C%1D%1E%1F%7F" &&
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-3")")" = "x://q/%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F" &&
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-4")")" = "x://q/%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F" &&
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-5")")" = "x://q/%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF" &&
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-6")")" = "x://q/%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF" &&
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-7")")" = "x://q/%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF" &&
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-8")")" = "x://q/%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF" &&
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-9")")" = "x://q/%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF" &&
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-10")")" = "x://q/%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF"
-
-ok 6 - url high-bit escapes
-
-expecting success of 0110.7 'url utf-8 escapes': 
-	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-11")")" = "x://q/%C2%80%DF%BF%E0%A0%80%EF%BF%BD%F0%90%80%80%F0%AF%BF%BD"
-
-ok 7 - url utf-8 escapes
-
-expecting success of 0110.8 'url username/password escapes': 
-	test "$(test-tool urlmatch-normalization -p "x://%41%62(^):%70+d@foo")" = "x://Ab(%5E):p+d@foo/"
-
-ok 8 - url username/password escapes
-
-expecting success of 0110.9 'url normalized lengths': 
-	test "$(test-tool urlmatch-normalization -l "Http://%4d%65:%4d^%70@The.Host")" = 25 &&
-	test "$(test-tool urlmatch-normalization -l "http://%41:%42@x.y/%61/")" = 17 &&
-	test "$(test-tool urlmatch-normalization -l "http://@x.y/^")" = 15
-
-ok 9 - url normalized lengths
-
-expecting success of 0110.10 'url . and .. segments': 
-	test "$(test-tool urlmatch-normalization -p "x://y/.")" = "x://y/" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/./")" = "x://y/" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/a/.")" = "x://y/a" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/a/./")" = "x://y/a/" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/.?")" = "x://y/?" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/./?")" = "x://y/?" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/a/.?")" = "x://y/a?" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/a/./?")" = "x://y/a/?" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/a/./b/.././../c")" = "x://y/c" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/a/./b/../.././c/")" = "x://y/c/" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/a/./b/.././../c/././.././.")" = "x://y/" &&
-	! test-tool urlmatch-normalization "x://y/a/./b/.././../c/././.././.." &&
-	test "$(test-tool urlmatch-normalization -p "x://y/a/./?/././..")" = "x://y/a/?/././.." &&
-	test "$(test-tool urlmatch-normalization -p "x://y/%2e/")" = "x://y/" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/%2E/")" = "x://y/" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/a/%2e./")" = "x://y/" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/b/.%2E/")" = "x://y/" &&
-	test "$(test-tool urlmatch-normalization -p "x://y/c/%2e%2E/")" = "x://y/"
-
-ok 10 - url . and .. segments
-
-expecting success of 0110.11 'url equivalents': 
-	test-tool urlmatch-normalization "httP://x" "Http://X/" &&
-	test-tool urlmatch-normalization "Http://%4d%65:%4d^%70@The.Host" "hTTP://Me:%4D^p@the.HOST:80/" &&
-	! test-tool urlmatch-normalization "https://@x.y/^" "httpS://x.y:443/^" &&
-	test-tool urlmatch-normalization "https://@x.y/^" "httpS://@x.y:0443/^" &&
-	test-tool urlmatch-normalization "https://@x.y/^/../abc" "httpS://@x.y:0443/abc" &&
-	test-tool urlmatch-normalization "https://@x.y/^/.." "httpS://@x.y:0443/"
-
-ok 11 - url equivalents
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0200-gettext-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0200-gettext-basic/.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 0200.1 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to gnu)': 
-    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
-
-ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to gnu)
-
-expecting success of 0200.2 'sanity: $TEXTDOMAIN is git': 
-    test $TEXTDOMAIN = "git"
-
-ok 2 - sanity: $TEXTDOMAIN is git
-
-expecting success of 0200.3 'xgettext sanity: Perl _() strings are not extracted': 
-    ! grep "A Perl string xgettext will not get" "$GIT_PO_PATH"/is.po
-
-ok 3 - xgettext sanity: Perl _() strings are not extracted
-
-expecting success of 0200.4 'xgettext sanity: Comment extraction with --add-comments': 
-    grep "TRANSLATORS: This is a test" "$TEST_DIRECTORY"/t0200/* | wc -l >expect &&
-    grep "TRANSLATORS: This is a test" "$GIT_PO_PATH"/is.po  | wc -l >actual &&
-    test_cmp expect actual
-
-ok 4 - xgettext sanity: Comment extraction with --add-comments
-
-expecting success of 0200.5 'xgettext sanity: Comment extraction with --add-comments stops at statements': 
-    ! grep "This is a phony" "$GIT_PO_PATH"/is.po &&
-    ! grep "the above comment" "$GIT_PO_PATH"/is.po
-
-ok 5 - xgettext sanity: Comment extraction with --add-comments stops at statements
-
-expecting success of 0200.6 'sanity: $TEXTDOMAINDIR exists without NO_GETTEXT=YesPlease': 
-    test -d "$TEXTDOMAINDIR" &&
-    test "$TEXTDOMAINDIR" = "$GIT_TEXTDOMAINDIR"
-
-ok 6 - sanity: $TEXTDOMAINDIR exists without NO_GETTEXT=YesPlease
-
-expecting success of 0200.7 'sanity: Icelandic locale was compiled': 
-    test -f "$TEXTDOMAINDIR/is/LC_MESSAGES/git.mo"
-
-ok 7 - sanity: Icelandic locale was compiled
-
-expecting success of 0200.8 'sanity: gettext("") metadata is OK': 
-    # Return value may be non-zero
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "" >zero-expect &&
-    grep "Project-Id-Version: Git" zero-expect &&
-    grep "Git Mailing List <git@vger.kernel.org>" zero-expect &&
-    grep "Content-Type: text/plain; charset=UTF-8" zero-expect &&
-    grep "Content-Transfer-Encoding: 8bit" zero-expect
-
-Project-Id-Version: Git
-Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>
-Language-Team: Git Mailing List <git@vger.kernel.org>
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-ok 8 - sanity: gettext("") metadata is OK
-
-expecting success of 0200.9 'sanity: gettext(unknown) is passed through': 
-    printf "This is not a translation string"  >expect &&
-    gettext "This is not a translation string" >actual &&
-    eval_gettext "This is not a translation string" >actual &&
-    test_cmp expect actual
-
-ok 9 - sanity: gettext(unknown) is passed through
-
-expecting success of 0200.10 'xgettext: C extraction of _() and N_() strings': 
-    printf "TILRAUN: C tilraunastrengur" >expect &&
-    printf "\n" >>expect &&
-    printf "Sjá 'git help SKIPUN' til að sjá hjálp fyrir tiltekna skipun." >>expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A C test string" >actual &&
-    printf "\n" >>actual &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "See 'git help COMMAND' for more information on a specific command." >>actual &&
-    test_cmp expect actual
-
-ok 10 - xgettext: C extraction of _() and N_() strings
-
-expecting success of 0200.11 'xgettext: C extraction with %s': 
-    printf "TILRAUN: C tilraunastrengur %%s" >expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A C test string %s" >actual &&
-    test_cmp expect actual
-
-ok 11 - xgettext: C extraction with %s
-
-expecting success of 0200.12 'xgettext: Shell extraction': 
-    printf "TILRAUN: Skeljartilraunastrengur" >expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Shell test string" >actual &&
-    test_cmp expect actual
-
-ok 12 - xgettext: Shell extraction
-
-expecting success of 0200.13 'xgettext: Shell extraction with $variable': 
-    printf "TILRAUN: Skeljartilraunastrengur með breytunni a var i able" >x-expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" variable="a var i able" eval_gettext "TEST: A Shell test \$variable" >x-actual &&
-    test_cmp x-expect x-actual
-
-ok 13 - xgettext: Shell extraction with $variable
-
-expecting success of 0200.14 'xgettext: Perl extraction': 
-    printf "TILRAUN: Perl tilraunastrengur" >expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test string" >actual &&
-    test_cmp expect actual
-
-ok 14 - xgettext: Perl extraction
-
-expecting success of 0200.15 'xgettext: Perl extraction with %s': 
-    printf "TILRAUN: Perl tilraunastrengur með breytunni %%s" >expect &&
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test variable %s" >actual &&
-    test_cmp expect actual
-
-ok 15 - xgettext: Perl extraction with %s
-
-expecting success of 0200.16 'sanity: Some gettext("") data for real locale': 
-    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "" >real-locale &&
-    test -s real-locale
-
-ok 16 - sanity: Some gettext("") data for real locale
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0201-gettext-fallbacks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0201-gettext-fallbacks/.git/
-# lib-gettext: No is_IS UTF-8 locale available
-# lib-gettext: No is_IS ISO-8859-1 locale available
-expecting success of 0201.1 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)': 
-    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
-
-ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)
-
-expecting success of 0201.2 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set': 
-    test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
-
-ok 2 - sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set
-
-expecting success of 0201.3 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough': 
-    echo fallthrough >expect &&
-    echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual &&
-    test_cmp expect actual
-
-ok 3 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough
-
-expecting success of 0201.4 'gettext: our gettext() fallback has pass-through semantics': 
-    printf "test" >expect &&
-    gettext "test" >actual &&
-    test_cmp expect actual &&
-    printf "test more words" >expect &&
-    gettext "test more words" >actual &&
-    test_cmp expect actual
-
-ok 4 - gettext: our gettext() fallback has pass-through semantics
-
-expecting success of 0201.5 'eval_gettext: our eval_gettext() fallback has pass-through semantics': 
-    printf "test" >expect &&
-    eval_gettext "test" >actual &&
-    test_cmp expect actual &&
-    printf "test more words" >expect &&
-    eval_gettext "test more words" >actual &&
-    test_cmp expect actual
-
-ok 5 - eval_gettext: our eval_gettext() fallback has pass-through semantics
-
-expecting success of 0201.6 'eval_gettext: our eval_gettext() fallback can interpolate variables': 
-    printf "test YesPlease" >expect &&
-    GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
-    test_cmp expect actual
-
-ok 6 - eval_gettext: our eval_gettext() fallback can interpolate variables
-
-expecting success of 0201.7 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces': 
-    cmdline="git am" &&
-    export cmdline &&
-    printf "When you have resolved this problem, run git am --resolved." >expect &&
-    eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
-    test_cmp expect actual
-
-ok 7 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces
-
-expecting success of 0201.8 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes': 
-    cmdline="git am" &&
-    export cmdline &&
-    printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
-    eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
-    test_cmp expect actual
-
-ok 8 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0090-cache-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0090-cache-tree/.git/
-expecting success of 0090.1 'initial commit has cache-tree': 
-	test_commit foo &&
-	test_cache_tree
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 1 - initial commit has cache-tree
-
-expecting success of 0090.2 'read-tree HEAD establishes cache-tree': 
-	git read-tree HEAD &&
-	test_cache_tree
-
-ok 2 - read-tree HEAD establishes cache-tree
-
-expecting success of 0090.3 'git-add invalidates cache-tree': 
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	echo "I changed this file" >foo &&
-	git add foo &&
-	test_invalid_cache_tree
-
-HEAD is now at ddd63c9 foo
-ok 3 - git-add invalidates cache-tree
-
-expecting success of 0090.4 'git-add in subdir invalidates cache-tree': 
-	test_when_finished "git reset --hard; git read-tree HEAD" &&
-	mkdir dirx &&
-	echo "I changed this file" >dirx/foo &&
-	git add dirx/foo &&
-	test_invalid_cache_tree
-
-error: invalid object 040000 59d259507ddf2acc00997a8b70c61d7bdc240440 for 'dirx'
-HEAD is now at ddd63c9 foo
-ok 4 - git-add in subdir invalidates cache-tree
-
-expecting success of 0090.5 'git-add in subdir does not invalidate sibling cache-tree': 
-	git tag no-children &&
-	test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
-	mkdir dir1 dir2 &&
-	test_commit dir1/a &&
-	test_commit dir2/b &&
-	echo "I changed this file" >dir1/a &&
-	test_when_finished "rm before" &&
-	cat >before <<-\EOF &&
-	SHA  (3 entries, 2 subtrees)
-	SHA dir1/ (1 entries, 0 subtrees)
-	SHA dir2/ (1 entries, 0 subtrees)
-	EOF
-	cmp_cache_tree before &&
-	echo "I changed this file" >dir1/a &&
-	git add dir1/a &&
-	cat >expect <<-\EOF &&
-	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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0202-gettext-perl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0202-gettext-perl/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-checking prerequisite: PERL_TEST_MORE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
-	perl -MTest::More -e 0
-
-)
-prerequisite PERL_TEST_MORE ok
-expecting success of 0202.1 'run t0202/test.pl to test Git::I18N.pm': 
-	"$PERL_PATH" "$TEST_DIRECTORY"/t0202/test.pl 2>stderr &&
-	test_must_be_empty stderr
-
-1..13
-ok 1 - Testing Git::I18N with NO Perl gettext library
-ok 2 - Git::I18N is located at /build/reproducible-path/git-2.45.2/perl/build/lib/Git/I18N.pm
-ok 3 - sanity: Git::I18N has 3 export(s)
-ok 4 - sanity: Git::I18N exports everything by default
-ok 5 - sanity: __ has a $ prototype
-ok 6 - sanity: N__ has a $ prototype
-ok 7 - sanity: __n has a $$$ prototype
-ok 8 - Passing a string through __() in the C locale works
-ok 9 - Get singular string through __n() in C locale
-ok 10 - Get plural string through __n() in C locale
-ok 11 - Passing a string through N__() in the C locale works
-ok 12 - Without a gettext library + <C> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
-ok 13 - Without a gettext library + <is> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
-ok 1 - run t0202/test.pl to test Git::I18N.pm
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0203-gettext-setlocale-sanity.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0203-gettext-setlocale-sanity/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-expecting success of 0203.1 'git show a ISO-8859-1 commit under C locale': 
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-	test_commit "iso-c-commit" iso-under-c &&
-	git show >out 2>err &&
-	test_must_be_empty err &&
-	grep -q "iso-c-commit" out
-
-Warning: commit message did not conform to UTF-8.
-You may want to amend it after fixing the message, or set the config
-variable i18n.commitEncoding to the encoding your project uses.
-[master (root-commit) f2030b4] iso-c-commit
- Author: �éí óú <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 iso-under-c
-ok 1 - git show a ISO-8859-1 commit under C locale
-
-expecting success of 0203.2 'git show a ISO-8859-1 commit under a UTF-8 locale': 
-	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
-	test_commit "iso-utf8-commit" iso-under-utf8 &&
-	LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err &&
-	test_must_be_empty err &&
-	grep -q "iso-utf8-commit" out
-
-Warning: commit message did not conform to UTF-8.
-You may want to amend it after fixing the message, or set the config
-variable i18n.commitEncoding to the encoding your project uses.
-[master 7495ea2] iso-utf8-commit
- Author: �éí óú <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 iso-under-utf8
-ok 2 - git show a ISO-8859-1 commit under a UTF-8 locale
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0204-gettext-reencode-sanity.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0212-trace2-event.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0212-trace2-event/.git/
-expecting success of 0212.1 'event stream, error event': 
-	test_when_finished "rm trace.event actual expect" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 003error "hello world" "this is a test" &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "003error",
-	|      "hello world",
-	|      "this is a test"
-	|    ],
-	|    "errors":[
-	|      "%s",
-	|      "%s"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-error: hello world
-error: this is a test
-ok 1 - event stream, error event
-
-expecting success of 0212.2 'event stream, return code 0': 
-	test_when_finished "rm trace.event actual expect" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 004child test-tool trace2 004child test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "004child",
-	|      "test-tool",
-	|      "trace2",
-	|      "004child",
-	|      "test-tool",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "child":{
-	|      "0":{
-	|        "child_argv":[
-	|          "_EXE_",
-	|          "trace2",
-	|          "004child",
-	|          "test-tool",
-	|          "trace2",
-	|          "001return",
-	|          "0"
-	|        ],
-	|        "child_class":"?",
-	|        "child_code":0,
-	|        "use_shell":0
-	|      }
-	|    },
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  },
-	|  "_SID0_/_SID1_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "004child",
-	|      "test-tool",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "child":{
-	|      "0":{
-	|        "child_argv":[
-	|          "_EXE_",
-	|          "trace2",
-	|          "001return",
-	|          "0"
-	|        ],
-	|        "child_class":"?",
-	|        "child_code":0,
-	|        "use_shell":0
-	|      }
-	|    },
-	|    "exit_code":0,
-	|    "hierarchy":"trace2/trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  },
-	|  "_SID0_/_SID1_/_SID2_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2/trace2/trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-ok 2 - event stream, return code 0
-
-expecting success of 0212.3 'event stream, list config': 
-	test_when_finished "rm trace.event actual expect" &&
-	git config --local t0212.abc 1 &&
-	git config --local t0212.def "hello world" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" GIT_TRACE2_CONFIG_PARAMS="t0212.*" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "params":[
-	|      {
-	|        "param":"t0212.abc",
-	|        "value":"1"
-	|      },
-	|      {
-	|        "param":"t0212.def",
-	|        "value":"hello world"
-	|      }
-	|    ],
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-ok 3 - event stream, list config
-
-expecting success of 0212.4 'event stream, list env vars': 
-	test_when_finished "rm trace.event actual expect" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		GIT_TRACE2_ENV_VARS="A_VAR,OTHER_VAR,MISSING" \
-		A_VAR=1 OTHER_VAR="hello world" test-tool trace2 001return 0 &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "001return",
-	|      "0"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "params":[
-	|      {
-	|        "param":"A_VAR",
-	|        "value":"1"
-	|      },
-	|      {
-	|        "param":"OTHER_VAR",
-	|        "value":"hello world"
-	|      }
-	|    ],
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-ok 4 - event stream, list env vars
-
-expecting success of 0212.5 'basic trace2_data': 
-	test_when_finished "rm trace.event actual expect" &&
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 006data test_category k1 v1 test_category k2 v2 &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "006data",
-	|      "test_category",
-	|      "k1",
-	|      "v1",
-	|      "test_category",
-	|      "k2",
-	|      "v2"
-	|    ],
-	|    "data":{
-	|      "test_category":{
-	|        "k1":"v1",
-	|        "k2":"v2"
-	|      }
-	|    },
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-ok 5 - basic trace2_data
-
-expecting success of 0212.6 'using global config, event stream, error event': 
-	test_when_finished "rm trace.event actual expect" &&
-	test_config_global trace2.eventTarget "$(pwd)/trace.event" &&
-	test-tool trace2 003error "hello world" "this is a test" &&
-	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
-	sed -e "s/^|//" >expect <<-EOF &&
-	|VAR1 = {
-	|  "_SID0_":{
-	|    "argv":[
-	|      "_EXE_",
-	|      "trace2",
-	|      "003error",
-	|      "hello world",
-	|      "this is a test"
-	|    ],
-	|    "errors":[
-	|      "%s",
-	|      "%s"
-	|    ],
-	|    "exit_code":0,
-	|    "hierarchy":"trace2",
-	|    "name":"trace2",
-	|    "version":"$V"
-	|  }
-	|};
-	EOF
-	test_cmp expect actual
-
-error: hello world
-error: this is a test
-ok 6 - using global config, event stream, error event
-
-expecting success of 0212.7 'discard traces when there are too many files': 
-	mkdir trace_target_dir &&
-	test_when_finished "rm -r trace_target_dir" &&
-	(
-		GIT_TRACE2_MAX_FILES=5 &&
-		export GIT_TRACE2_MAX_FILES &&
-		cd trace_target_dir &&
-		test_seq $GIT_TRACE2_MAX_FILES >../expected_filenames.txt &&
-		xargs touch <../expected_filenames.txt &&
-		cd .. &&
-		GIT_TRACE2_EVENT="$(pwd)/trace_target_dir" test-tool trace2 001return 0
-	) &&
-	echo git-trace2-discard >>expected_filenames.txt &&
-	ls trace_target_dir >ls_output.txt &&
-	test_cmp expected_filenames.txt ls_output.txt &&
-	head -n1 trace_target_dir/git-trace2-discard | grep \"event\":\"version\" &&
-	head -n2 trace_target_dir/git-trace2-discard | tail -n1 | grep \"event\":\"too_many_files\"
-
-{"event":"version","sid":"20251218T013227.425692Z-Hfbad846e-P00000bd8","thread":"main","time":"2025-12-18T01:32:27.425828Z","file":"common-main.c","line":55,"evt":"3","exe":"2.45.2"}
-{"event":"too_many_files","sid":"20251218T013227.425692Z-Hfbad846e-P00000bd8","thread":"main","time":"2025-12-18T01:32:27.425849Z","file":"common-main.c","line":55}
-ok 7 - discard traces when there are too many files
-
-expecting success of 0212.8 'unsafe URLs are redacted by default in cmd_start events': 
-	test_when_finished \
-		"rm -r trace.event" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 300redact_start git clone https://user:pwd@example.com/ clone2 &&
-	! grep user:pwd trace.event
-
-ok 8 - unsafe URLs are redacted by default in cmd_start events
-
-expecting success of 0212.9 'unsafe URLs are redacted by default in child_start events': 
-	test_when_finished \
-		"rm -r trace.event" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 301redact_child_start git clone https://user:pwd@example.com/ clone2 &&
-	! grep user:pwd trace.event
-
-ok 9 - unsafe URLs are redacted by default in child_start events
-
-expecting success of 0212.10 'unsafe URLs are redacted by default in exec events': 
-	test_when_finished \
-		"rm -r trace.event" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 302redact_exec git clone https://user:pwd@example.com/ clone2 &&
-	! grep user:pwd trace.event
-
-ok 10 - unsafe URLs are redacted by default in exec events
-
-expecting success of 0212.11 'unsafe URLs are redacted by default in def_param events': 
-	test_when_finished \
-		"rm -r trace.event" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
-		test-tool trace2 303redact_def_param url https://user:pwd@example.com/ &&
-	! grep user:pwd trace.event
-
-ok 11 - unsafe URLs are redacted by default in def_param events
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0060-path-utils.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-	
-ok 4 - normalize path: . => 
-
-expecting success of 0060.5 'normalize path: ./ => ': 
-		echo '' >expect &&
-		test-tool path-utils normalize_path_copy './' >actual &&
-		test_cmp expect actual
-	
-ok 5 - normalize path: ./ => 
-
-expecting success of 0060.6 'normalize path: ./. => ': 
-		echo '' >expect &&
-		test-tool path-utils normalize_path_copy './.' >actual &&
-		test_cmp expect actual
-	
-ok 6 - normalize path: ./. => 
-
-expecting success of 0060.7 'normalize path: ./.. => ++failed++': 
-		echo '++failed++' >expect &&
-		test-tool path-utils normalize_path_copy './..' >actual &&
-		test_cmp expect actual
-	
-ok 7 - normalize path: ./.. => ++failed++
-
-expecting success of 0060.8 'normalize path: ../. => ++failed++': 
-		echo '++failed++' >expect &&
-		test-tool path-utils normalize_path_copy '../.' >actual &&
-		test_cmp expect actual
-	
-ok 8 - normalize path: ../. => ++failed++
+expecting success of 0060.8 'normalize path: ../. => ++failed++': 
+		echo '++failed++' >expect &&
+		test-tool path-utils normalize_path_copy '../.' >actual &&
+		test_cmp expect actual
+	
+ok 8 - normalize path: ../. => ++failed++
 
 expecting success of 0060.9 'normalize path: ./../.// => ++failed++': 
 		echo '++failed++' >expect &&
@@ -32679,6 +30084,1768 @@
 1..218
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0092-diagnose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0092-diagnose/.git/
+checking prerequisite: UNZIP
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+	"$GIT_UNZIP" -v
+	test $? -ne 127
+
+)
+UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
+
+Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
+see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
+
+Compiled with gcc 12.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.45.2/t/trash directory.t0092-diagnose': 176.64 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  2024-11-14 19:26   .git/COMMIT_EDITMSG
+       92  2024-11-14 19:26   .git/config
+       73  2024-11-14 19:26   .git/description
+       23  2024-11-14 19:26   .git/HEAD
+      137  2024-11-14 19:26   .git/index
+      416  2024-11-14 19:26   .git/hooks/pre-merge-commit.sample
+      544  2024-11-14 19:26   .git/hooks/pre-receive.sample
+     2308  2024-11-14 19:26   .git/hooks/sendemail-validate.sample
+      896  2024-11-14 19:26   .git/hooks/commit-msg.sample
+      478  2024-11-14 19:26   .git/hooks/applypatch-msg.sample
+     1374  2024-11-14 19:26   .git/hooks/pre-push.sample
+     1492  2024-11-14 19:26   .git/hooks/prepare-commit-msg.sample
+     2783  2024-11-14 19:26   .git/hooks/push-to-checkout.sample
+     1649  2024-11-14 19:26   .git/hooks/pre-commit.sample
+      189  2024-11-14 19:26   .git/hooks/post-update.sample
+      424  2024-11-14 19:26   .git/hooks/pre-applypatch.sample
+     4726  2024-11-14 19:26   .git/hooks/fsmonitor-watchman.sample
+     4898  2024-11-14 19:26   .git/hooks/pre-rebase.sample
+     3650  2024-11-14 19:26   .git/hooks/update.sample
+      240  2024-11-14 19:26   .git/info/exclude
+      154  2024-11-14 19:26   .git/logs/refs/heads/master
+      154  2024-11-14 19: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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0091-bugreport.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0091-bugreport/.git/
+expecting success of 0091.1 'create a report': 
+	git bugreport -s format &&
+	test_file_not_empty git-bugreport-format.txt
+
+Created new report at 'git-bugreport-format.txt'.
+ok 1 - create a report
+
+expecting success of 0091.2 'report contains wanted template (before first section)': 
+	sed -ne "/^\[/q;p" git-bugreport-format.txt >actual &&
+	cat >expect <<-\EOF &&
+	Thank you for filling out a Git bug report!
+	Please answer the following questions to help us understand your issue.
+
+	What did you do before the bug happened? (Steps to reproduce your issue)
+
+	What did you expect to happen? (Expected behavior)
+
+	What happened instead? (Actual behavior)
+
+	What's different between what you expected and what actually happened?
+
+	Anything else you want to add:
+
+	Please review the rest of the bug report below.
+	You can delete any lines you don't wish to share.
+
+
+	EOF
+	test_cmp expect actual
+
+ok 2 - report contains wanted template (before first section)
+
+expecting success of 0091.3 'sanity check "System Info" section': 
+	test_when_finished rm -f git-bugreport-format.txt &&
+
+	sed -ne "/^\[System Info\]$/,/^$/p" <git-bugreport-format.txt >system &&
+
+	# The beginning should match "git version --build-options" verbatim,
+	# but rather than checking bit-for-bit equality, just test some basics.
+	grep "git version " system &&
+	grep "shell-path: ." system &&
+
+	# After the version, there should be some more info.
+	# This is bound to differ from environment to environment,
+	# so we just do some rather high-level checks.
+	grep "uname: ." system &&
+	grep "compiler info: ." system
+
+git version 2.45.2
+shell-path: /bin/sh
+uname: Linux 6.1.0-27-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.115-1 (2024-11-01) x86_64
+compiler info: gnuc: 14.2
+ok 3 - sanity check "System Info" section
+
+expecting success of 0091.4 'dies if file with same name as report already exists': 
+	test_when_finished rm git-bugreport-duplicate.txt &&
+	>>git-bugreport-duplicate.txt &&
+	test_must_fail git bugreport --suffix duplicate
+
+fatal: unable to create 'git-bugreport-duplicate.txt': File exists
+ok 4 - dies if file with same name as report already exists
+
+expecting success of 0091.5 '--output-directory puts the report in the provided dir': 
+	test_when_finished rm -fr foo/ &&
+	git bugreport -o foo/ &&
+	test_path_is_file foo/git-bugreport-*
+
+Created new report at 'foo/git-bugreport-2024-11-14-1926.txt'.
+ok 5 - --output-directory puts the report in the provided dir
+
+expecting success of 0091.6 'incorrect arguments abort with usage': 
+	test_must_fail git bugreport --false 2>output &&
+	test_grep usage output &&
+	test_path_is_missing git-bugreport-*
+
+usage: git bugreport [(-o | --output-directory) <path>]
+ok 6 - incorrect arguments abort with usage
+
+expecting success of 0091.7 'incorrect positional arguments abort with usage and hint': 
+	test_must_fail git bugreport false 2>output &&
+	test_grep usage output &&
+	test_grep false output &&
+	test_path_is_missing git-bugreport-*
+
+usage: git bugreport [(-o | --output-directory) <path>]
+error: unknown argument `false'
+ok 7 - incorrect positional arguments abort with usage and hint
+
+expecting success of 0091.8 'runs outside of a git dir': 
+	test_when_finished rm non-repo/git-bugreport-* &&
+	nongit git bugreport
+
+Created new report at 'git-bugreport-2024-11-14-1926.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-2024-11-14-1926.txt'.
+ok 9 - can create leading directories outside of a git dir
+
+expecting success of 0091.10 'indicates populated hooks': 
+	test_when_finished rm git-bugreport-hooks.txt &&
+
+	test_hook applypatch-msg <<-\EOF &&
+	true
+	EOF
+	test_hook unknown-hook <<-\EOF &&
+	true
+	EOF
+	git bugreport -s hooks &&
+
+	sort >expect <<-\EOF &&
+	[Enabled Hooks]
+	applypatch-msg
+	EOF
+
+	sed -ne "/^\[Enabled Hooks\]$/,/^$/p" <git-bugreport-hooks.txt >actual &&
+	test_cmp expect actual
+
+Created new report at 'git-bugreport-hooks.txt'.
+ok 10 - indicates populated hooks
+
+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 12.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 0091.11 '--diagnose creates diagnostics zip archive': 
+	test_when_finished rm -rf report &&
+
+	git bugreport --diagnose -o report -s test >out &&
+
+	zip_path=report/git-diagnostics-test.zip &&
+	grep "Available space" out &&
+	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'
+Created new report at 'report/git-bugreport-test.txt'.
+Available space on '/build/reproducible-path/git-2.45.2/t/trash directory.t0091-bugreport': 176.65 GiB (mount flags 0x1000)
+Contents of .git/objects:
+Total: 0 loose objects
+ok 11 - --diagnose creates diagnostics zip archive
+
+expecting success of 0091.12 '--diagnose=stats excludes .git dir contents': 
+	test_when_finished rm -rf report &&
+
+	git bugreport --diagnose=stats -o report -s test >out &&
+
+	# Includes pack quantity/size info
+	"$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'
+Created new report at 'report/git-bugreport-test.txt'.
+Contents of .git/objects:
+ok 12 - --diagnose=stats excludes .git dir contents
+
+expecting success of 0091.13 '--diagnose=all includes .git dir contents': 
+	test_when_finished rm -rf report &&
+
+	git bugreport --diagnose=all -o report -s test >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
+
+warning: could not archive missing directory '.git/logs'
+
+Diagnostics complete.
+All of the gathered info is captured in 'report/git-diagnostics-test.zip'
+Created new report at 'report/git-bugreport-test.txt'.
+       92  2024-11-14 19:26   .git/config
+       73  2024-11-14 19:26   .git/description
+       23  2024-11-14 19:26   .git/HEAD
+      416  2024-11-14 19:26   .git/hooks/pre-merge-commit.sample
+      544  2024-11-14 19:26   .git/hooks/pre-receive.sample
+     2308  2024-11-14 19:26   .git/hooks/sendemail-validate.sample
+      896  2024-11-14 19:26   .git/hooks/commit-msg.sample
+      478  2024-11-14 19:26   .git/hooks/applypatch-msg.sample
+     1374  2024-11-14 19:26   .git/hooks/pre-push.sample
+     1492  2024-11-14 19:26   .git/hooks/prepare-commit-msg.sample
+     2783  2024-11-14 19:26   .git/hooks/push-to-checkout.sample
+     1649  2024-11-14 19:26   .git/hooks/pre-commit.sample
+      189  2024-11-14 19:26   .git/hooks/post-update.sample
+      424  2024-11-14 19:26   .git/hooks/pre-applypatch.sample
+     4726  2024-11-14 19:26   .git/hooks/fsmonitor-watchman.sample
+     4898  2024-11-14 19:26   .git/hooks/pre-rebase.sample
+     3650  2024-11-14 19:26   .git/hooks/update.sample
+      240  2024-11-14 19:26   .git/info/exclude
+ok 13 - --diagnose=all includes .git dir contents
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0095-bloom.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0095-bloom/.git/
+expecting success of 0095.1 'compute unseeded murmur3 hash for empty string': 
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0x00000000
+	EOF
+	test-tool bloom get_murmur3 "" >actual &&
+	test_cmp expect actual
+
+ok 1 - compute unseeded murmur3 hash for empty string
+
+expecting success of 0095.2 'compute unseeded murmur3 hash for test string 1': 
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0x627b0c2c
+	EOF
+	test-tool bloom get_murmur3 "Hello world!" >actual &&
+	test_cmp expect actual
+
+ok 2 - compute unseeded murmur3 hash for test string 1
+
+expecting success of 0095.3 'compute unseeded murmur3 hash for test string 2': 
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0x2e4ff723
+	EOF
+	test-tool bloom get_murmur3 "The quick brown fox jumps over the lazy dog" >actual &&
+	test_cmp expect actual
+
+ok 3 - compute unseeded murmur3 hash for test string 2
+
+expecting success of 0095.4 'compute bloom key for empty string': 
+	cat >expect <<-\EOF &&
+	Hashes:0x5615800c|0x5b966560|0x61174ab4|0x66983008|0x6c19155c|0x7199fab0|0x771ae004|
+	Filter_Length:2
+	Filter_Data:11|11|
+	EOF
+	test-tool bloom generate_filter "" >actual &&
+	test_cmp expect actual
+
+ok 4 - compute bloom key for empty string
+
+expecting success of 0095.5 'compute bloom key for whitespace': 
+	cat >expect <<-\EOF &&
+	Hashes:0xf178874c|0x5f3d6eb6|0xcd025620|0x3ac73d8a|0xa88c24f4|0x16510c5e|0x8415f3c8|
+	Filter_Length:2
+	Filter_Data:51|55|
+	EOF
+	test-tool bloom generate_filter " " >actual &&
+	test_cmp expect actual
+
+ok 5 - compute bloom key for whitespace
+
+expecting success of 0095.6 'compute bloom key for test string 1': 
+	cat >expect <<-\EOF &&
+	Hashes:0xb270de9b|0x1bb6f26e|0x84fd0641|0xee431a14|0x57892de7|0xc0cf41ba|0x2a15558d|
+	Filter_Length:2
+	Filter_Data:92|6c|
+	EOF
+	test-tool bloom generate_filter "Hello world!" >actual &&
+	test_cmp expect actual
+
+ok 6 - compute bloom key for test string 1
+
+expecting success of 0095.7 'compute bloom key for test string 2': 
+	cat >expect <<-\EOF &&
+	Hashes:0x20ab385b|0xf5237fe2|0xc99bc769|0x9e140ef0|0x728c5677|0x47049dfe|0x1b7ce585|
+	Filter_Length:2
+	Filter_Data:a5|4a|
+	EOF
+	test-tool bloom generate_filter "file.txt" >actual &&
+	test_cmp expect actual
+
+ok 7 - compute bloom key for test string 2
+
+expecting success of 0095.8 'get bloom filters for commit with no changes': 
+	git init &&
+	git commit --allow-empty -m "c0" &&
+	cat >expect <<-\EOF &&
+	Filter_Length:1
+	Filter_Data:00|
+	EOF
+	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
+	test_cmp expect actual
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0095-bloom/.git/
+[master (root-commit) c7bd1a3] c0
+ Author: A U Thor <author@example.com>
+ok 8 - get bloom filters for commit with no changes
+
+expecting success of 0095.9 'get bloom filter for commit with 10 changes': 
+	rm actual &&
+	rm expect &&
+	mkdir smallDir &&
+	for i in $(test_seq 0 9)
+	do
+		echo $i >smallDir/$i || return 1
+	done &&
+	git add smallDir &&
+	git commit -m "commit with 10 changes" &&
+	cat >expect <<-\EOF &&
+	Filter_Length:14
+	Filter_Data:02|b3|c4|a0|34|e7|fe|eb|cb|47|fe|a0|e8|72|
+	EOF
+	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
+	test_cmp expect actual
+
+[master 2444bb6] commit with 10 changes
+ Author: A U Thor <author@example.com>
+ 10 files changed, 10 insertions(+)
+ create mode 100644 smallDir/0
+ create mode 100644 smallDir/1
+ create mode 100644 smallDir/2
+ create mode 100644 smallDir/3
+ create mode 100644 smallDir/4
+ create mode 100644 smallDir/5
+ create mode 100644 smallDir/6
+ create mode 100644 smallDir/7
+ create mode 100644 smallDir/8
+ create mode 100644 smallDir/9
+ok 9 - get bloom filter for commit with 10 changes
+
+checking prerequisite: EXPENSIVE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
+
+)
+prerequisite EXPENSIVE not satisfied
+ok 10 # skip get bloom filter for commit with 513 changes (missing EXPENSIVE)
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0101-at-syntax.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0101-at-syntax/.git/
+expecting success of 0101.1 'setup': 
+	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 - setup
+
+expecting success of 0101.2 '@{0} shows current': 
+	check_at @{0} two
+
+ok 2 - @{0} shows current
+
+expecting success of 0101.3 '@{1} shows old': 
+	check_at @{1} one
+
+ok 3 - @{1} shows old
+
+expecting success of 0101.4 '@{now} shows current': 
+	check_at @{now} two
+
+ok 4 - @{now} shows current
+
+expecting success of 0101.5 '@{2001-09-17} (before the first commit) shows old': 
+	check_at @{2001-09-17} one
+
+warning: log for 'master' only goes back to Thu, 7 Apr 2005 15:13:13 -0700
+ok 5 - @{2001-09-17} (before the first commit) shows old
+
+expecting success of 0101.6 'silly approxidates work': 
+	check_at @{3.hot.dogs.on.2001-09-17} one
+
+warning: log for 'master' only goes back to Thu, 7 Apr 2005 15:13:13 -0700
+ok 6 - silly approxidates work
+
+expecting success of 0101.7 'notice misspelled upstream': 
+	test_must_fail git log -1 --format=%s @{usptream}
+
+fatal: ambiguous argument '@{usptream}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 7 - notice misspelled upstream
+
+expecting success of 0101.8 'complain about total nonsense': 
+	test_must_fail git log -1 --format=%s @{utter.bogosity}
+
+fatal: ambiguous argument '@{utter.bogosity}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 8 - complain about total nonsense
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0100-previous.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0100-previous/.git/
+expecting success of 0100.1 'branch -d @{-1}': 
+	test_commit A &&
+	git checkout -b junk &&
+	git checkout - &&
+	echo refs/heads/main >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	git branch -d @{-1} &&
+	test_must_fail git rev-parse --verify refs/heads/junk
+
+[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 'junk'
+Switched to branch 'main'
+Deleted branch junk (was 0ddfaf1).
+fatal: Needed a single revision
+ok 1 - branch -d @{-1}
+
+expecting success of 0100.2 'branch -d @{-12} when there is not enough switches yet': 
+	git reflog expire --expire=now &&
+	git checkout -b junk2 &&
+	git checkout - &&
+	echo refs/heads/main >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	test_must_fail git branch -d @{-12} &&
+	git rev-parse --verify refs/heads/main
+
+Switched to a new branch 'junk2'
+Switched to branch 'main'
+error: branch '@{-12}' not found
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050
+ok 2 - branch -d @{-12} when there is not enough switches yet
+
+expecting success of 0100.3 'merge @{-1}': 
+	git checkout A &&
+	test_commit B &&
+	git checkout A &&
+	test_commit C &&
+	test_commit D &&
+	git branch -f main B &&
+	git branch -f other &&
+	git checkout other &&
+	git checkout main &&
+	git merge @{-1} &&
+	git cat-file commit HEAD | grep "Merge branch 'other'"
+
+Note: switching to 'A'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 0ddfaf1 A
+[detached HEAD d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Previous HEAD position was d9df450 B
+HEAD is now at 0ddfaf1 A
+[detached HEAD 5dee784] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[detached HEAD 12bd07b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Switched to branch 'other'
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ D.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 C.t
+ create mode 100644 D.t
+Merge branch 'other'
+ok 3 - merge @{-1}
+
+expecting success of 0100.4 'merge @{-1}~1': 
+	git checkout main &&
+	git reset --hard B &&
+	git checkout other &&
+	git checkout main &&
+	git merge @{-1}~1 &&
+	git cat-file commit HEAD >actual &&
+	grep "Merge branch 'other'" actual
+
+Already on 'main'
+HEAD is now at d9df450 B
+Switched to branch 'other'
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Merge branch 'other' (early part)
+ok 4 - merge @{-1}~1
+
+expecting success of 0100.5 'merge @{-100} before checking out that many branches yet': 
+	git reflog expire --expire=now &&
+	git checkout -f main &&
+	git reset --hard B &&
+	git branch -f other C &&
+	git checkout other &&
+	git checkout main &&
+	test_must_fail git merge @{-100}
+
+Already on 'main'
+HEAD is now at d9df450 B
+Switched to branch 'other'
+Switched to branch 'main'
+merge: @{-100} - not something we can merge
+ok 5 - merge @{-100} before checking out that many branches yet
+
+expecting success of 0100.6 'log -g @{-1}': 
+	git checkout -b last_branch &&
+	git checkout -b new_branch &&
+	echo "last_branch@{0}" >expect &&
+	git log -g --format=%gd @{-1} >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'last_branch'
+Switched to a new branch 'new_branch'
+ok 6 - log -g @{-1}
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0201-gettext-fallbacks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0201-gettext-fallbacks/.git/
+# lib-gettext: No is_IS UTF-8 locale available
+# lib-gettext: No is_IS ISO-8859-1 locale available
+expecting success of 0201.1 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)': 
+    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
+
+ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to fallthrough)
+
+expecting success of 0201.2 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set': 
+    test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+
+ok 2 - sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set
+
+expecting success of 0201.3 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough': 
+    echo fallthrough >expect &&
+    echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual &&
+    test_cmp expect actual
+
+ok 3 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough
+
+expecting success of 0201.4 'gettext: our gettext() fallback has pass-through semantics': 
+    printf "test" >expect &&
+    gettext "test" >actual &&
+    test_cmp expect actual &&
+    printf "test more words" >expect &&
+    gettext "test more words" >actual &&
+    test_cmp expect actual
+
+ok 4 - gettext: our gettext() fallback has pass-through semantics
+
+expecting success of 0201.5 'eval_gettext: our eval_gettext() fallback has pass-through semantics': 
+    printf "test" >expect &&
+    eval_gettext "test" >actual &&
+    test_cmp expect actual &&
+    printf "test more words" >expect &&
+    eval_gettext "test more words" >actual &&
+    test_cmp expect actual
+
+ok 5 - eval_gettext: our eval_gettext() fallback has pass-through semantics
+
+expecting success of 0201.6 'eval_gettext: our eval_gettext() fallback can interpolate variables': 
+    printf "test YesPlease" >expect &&
+    GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
+    test_cmp expect actual
+
+ok 6 - eval_gettext: our eval_gettext() fallback can interpolate variables
+
+expecting success of 0201.7 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces': 
+    cmdline="git am" &&
+    export cmdline &&
+    printf "When you have resolved this problem, run git am --resolved." >expect &&
+    eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
+    test_cmp expect actual
+
+ok 7 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces
+
+expecting success of 0201.8 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes': 
+    cmdline="git am" &&
+    export cmdline &&
+    printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
+    eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
+    test_cmp expect actual
+
+ok 8 - eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0090-cache-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0090-cache-tree/.git/
+expecting success of 0090.1 'initial commit has cache-tree': 
+	test_commit foo &&
+	test_cache_tree
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 1 - initial commit has cache-tree
+
+expecting success of 0090.2 'read-tree HEAD establishes cache-tree': 
+	git read-tree HEAD &&
+	test_cache_tree
+
+ok 2 - read-tree HEAD establishes cache-tree
+
+expecting success of 0090.3 'git-add invalidates cache-tree': 
+	test_when_finished "git reset --hard; git read-tree HEAD" &&
+	echo "I changed this file" >foo &&
+	git add foo &&
+	test_invalid_cache_tree
+
+HEAD is now at ddd63c9 foo
+ok 3 - git-add invalidates cache-tree
+
+expecting success of 0090.4 'git-add in subdir invalidates cache-tree': 
+	test_when_finished "git reset --hard; git read-tree HEAD" &&
+	mkdir dirx &&
+	echo "I changed this file" >dirx/foo &&
+	git add dirx/foo &&
+	test_invalid_cache_tree
+
+error: invalid object 040000 59d259507ddf2acc00997a8b70c61d7bdc240440 for 'dirx'
+HEAD is now at ddd63c9 foo
+ok 4 - git-add in subdir invalidates cache-tree
+
+expecting success of 0090.5 'git-add in subdir does not invalidate sibling cache-tree': 
+	git tag no-children &&
+	test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
+	mkdir dir1 dir2 &&
+	test_commit dir1/a &&
+	test_commit dir2/b &&
+	echo "I changed this file" >dir1/a &&
+	test_when_finished "rm before" &&
+	cat >before <<-\EOF &&
+	SHA  (3 entries, 2 subtrees)
+	SHA dir1/ (1 entries, 0 subtrees)
+	SHA dir2/ (1 entries, 0 subtrees)
+	EOF
+	cmp_cache_tree before &&
+	echo "I changed this file" >dir1/a &&
+	git add dir1/a &&
+	cat >expect <<-\EOF &&
+	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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0200-gettext-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0200-gettext-basic/.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 0200.1 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to gnu)': 
+    test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
+
+ok 1 - sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to gnu)
+
+expecting success of 0200.2 'sanity: $TEXTDOMAIN is git': 
+    test $TEXTDOMAIN = "git"
+
+ok 2 - sanity: $TEXTDOMAIN is git
+
+expecting success of 0200.3 'xgettext sanity: Perl _() strings are not extracted': 
+    ! grep "A Perl string xgettext will not get" "$GIT_PO_PATH"/is.po
+
+ok 3 - xgettext sanity: Perl _() strings are not extracted
+
+expecting success of 0200.4 'xgettext sanity: Comment extraction with --add-comments': 
+    grep "TRANSLATORS: This is a test" "$TEST_DIRECTORY"/t0200/* | wc -l >expect &&
+    grep "TRANSLATORS: This is a test" "$GIT_PO_PATH"/is.po  | wc -l >actual &&
+    test_cmp expect actual
+
+ok 4 - xgettext sanity: Comment extraction with --add-comments
+
+expecting success of 0200.5 'xgettext sanity: Comment extraction with --add-comments stops at statements': 
+    ! grep "This is a phony" "$GIT_PO_PATH"/is.po &&
+    ! grep "the above comment" "$GIT_PO_PATH"/is.po
+
+ok 5 - xgettext sanity: Comment extraction with --add-comments stops at statements
+
+expecting success of 0200.6 'sanity: $TEXTDOMAINDIR exists without NO_GETTEXT=YesPlease': 
+    test -d "$TEXTDOMAINDIR" &&
+    test "$TEXTDOMAINDIR" = "$GIT_TEXTDOMAINDIR"
+
+ok 6 - sanity: $TEXTDOMAINDIR exists without NO_GETTEXT=YesPlease
+
+expecting success of 0200.7 'sanity: Icelandic locale was compiled': 
+    test -f "$TEXTDOMAINDIR/is/LC_MESSAGES/git.mo"
+
+ok 7 - sanity: Icelandic locale was compiled
+
+expecting success of 0200.8 'sanity: gettext("") metadata is OK': 
+    # Return value may be non-zero
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "" >zero-expect &&
+    grep "Project-Id-Version: Git" zero-expect &&
+    grep "Git Mailing List <git@vger.kernel.org>" zero-expect &&
+    grep "Content-Type: text/plain; charset=UTF-8" zero-expect &&
+    grep "Content-Transfer-Encoding: 8bit" zero-expect
+
+Project-Id-Version: Git
+Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>
+Language-Team: Git Mailing List <git@vger.kernel.org>
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+ok 8 - sanity: gettext("") metadata is OK
+
+expecting success of 0200.9 'sanity: gettext(unknown) is passed through': 
+    printf "This is not a translation string"  >expect &&
+    gettext "This is not a translation string" >actual &&
+    eval_gettext "This is not a translation string" >actual &&
+    test_cmp expect actual
+
+ok 9 - sanity: gettext(unknown) is passed through
+
+expecting success of 0200.10 'xgettext: C extraction of _() and N_() strings': 
+    printf "TILRAUN: C tilraunastrengur" >expect &&
+    printf "\n" >>expect &&
+    printf "Sjá 'git help SKIPUN' til að sjá hjálp fyrir tiltekna skipun." >>expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A C test string" >actual &&
+    printf "\n" >>actual &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "See 'git help COMMAND' for more information on a specific command." >>actual &&
+    test_cmp expect actual
+
+ok 10 - xgettext: C extraction of _() and N_() strings
+
+expecting success of 0200.11 'xgettext: C extraction with %s': 
+    printf "TILRAUN: C tilraunastrengur %%s" >expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A C test string %s" >actual &&
+    test_cmp expect actual
+
+ok 11 - xgettext: C extraction with %s
+
+expecting success of 0200.12 'xgettext: Shell extraction': 
+    printf "TILRAUN: Skeljartilraunastrengur" >expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Shell test string" >actual &&
+    test_cmp expect actual
+
+ok 12 - xgettext: Shell extraction
+
+expecting success of 0200.13 'xgettext: Shell extraction with $variable': 
+    printf "TILRAUN: Skeljartilraunastrengur með breytunni a var i able" >x-expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" variable="a var i able" eval_gettext "TEST: A Shell test \$variable" >x-actual &&
+    test_cmp x-expect x-actual
+
+ok 13 - xgettext: Shell extraction with $variable
+
+expecting success of 0200.14 'xgettext: Perl extraction': 
+    printf "TILRAUN: Perl tilraunastrengur" >expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test string" >actual &&
+    test_cmp expect actual
+
+ok 14 - xgettext: Perl extraction
+
+expecting success of 0200.15 'xgettext: Perl extraction with %s': 
+    printf "TILRAUN: Perl tilraunastrengur með breytunni %%s" >expect &&
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "TEST: A Perl test variable %s" >actual &&
+    test_cmp expect actual
+
+ok 15 - xgettext: Perl extraction with %s
+
+expecting success of 0200.16 'sanity: Some gettext("") data for real locale': 
+    LANGUAGE=is LC_ALL="$is_IS_locale" gettext "" >real-locale &&
+    test -s real-locale
+
+ok 16 - sanity: Some gettext("") data for real locale
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0110-urlmatch-normalization.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0110-urlmatch-normalization/.git/
+expecting success of 0110.1 'url scheme': 
+	! test-tool urlmatch-normalization "" &&
+	! test-tool urlmatch-normalization "_" &&
+	! test-tool urlmatch-normalization "scheme" &&
+	! test-tool urlmatch-normalization "scheme:" &&
+	! test-tool urlmatch-normalization "scheme:/" &&
+	! test-tool urlmatch-normalization "scheme://" &&
+	! test-tool urlmatch-normalization "file" &&
+	! test-tool urlmatch-normalization "file:" &&
+	! test-tool urlmatch-normalization "file:/" &&
+	test-tool urlmatch-normalization "file://" &&
+	! test-tool urlmatch-normalization "://acme.co" &&
+	! test-tool urlmatch-normalization "x_test://acme.co" &&
+	! test-tool urlmatch-normalization "-test://acme.co" &&
+	! test-tool urlmatch-normalization "0test://acme.co" &&
+	! test-tool urlmatch-normalization "+test://acme.co" &&
+	! test-tool urlmatch-normalization ".test://acme.co" &&
+	! test-tool urlmatch-normalization "schem%6e://" &&
+	test-tool urlmatch-normalization "x-Test+v1.0://acme.co" &&
+	test "$(test-tool urlmatch-normalization -p "AbCdeF://x.Y")" = "abcdef://x.y/"
+
+ok 1 - url scheme
+
+expecting success of 0110.2 'url authority': 
+	! test-tool urlmatch-normalization "scheme://user:pass@" &&
+	! test-tool urlmatch-normalization "scheme://?" &&
+	! test-tool urlmatch-normalization "scheme://#" &&
+	! test-tool urlmatch-normalization "scheme:///" &&
+	! test-tool urlmatch-normalization "scheme://:" &&
+	! test-tool urlmatch-normalization "scheme://:555" &&
+	test-tool urlmatch-normalization "file://user:pass@" &&
+	test-tool urlmatch-normalization "file://?" &&
+	test-tool urlmatch-normalization "file://#" &&
+	test-tool urlmatch-normalization "file:///" &&
+	test-tool urlmatch-normalization "file://:" &&
+	! test-tool urlmatch-normalization "file://:555" &&
+	test-tool urlmatch-normalization "scheme://user:pass@host" &&
+	test-tool urlmatch-normalization "scheme://@host" &&
+	test-tool urlmatch-normalization "scheme://%00@host" &&
+	! test-tool urlmatch-normalization "scheme://%%@host" &&
+	test-tool urlmatch-normalization "scheme://host_" &&
+	test-tool urlmatch-normalization "scheme://user:pass@host/" &&
+	test-tool urlmatch-normalization "scheme://@host/" &&
+	test-tool urlmatch-normalization "scheme://host/" &&
+	test-tool urlmatch-normalization "scheme://host?x" &&
+	test-tool urlmatch-normalization "scheme://host#x" &&
+	test-tool urlmatch-normalization "scheme://host/@" &&
+	test-tool urlmatch-normalization "scheme://host?@x" &&
+	test-tool urlmatch-normalization "scheme://host#@x" &&
+	test-tool urlmatch-normalization "scheme://[::1]" &&
+	test-tool urlmatch-normalization "scheme://[::1]/" &&
+	! test-tool urlmatch-normalization "scheme://hos%41/" &&
+	test-tool urlmatch-normalization "scheme://[invalid....:/" &&
+	test-tool urlmatch-normalization "scheme://invalid....:]/" &&
+	! test-tool urlmatch-normalization "scheme://invalid....:[/" &&
+	! test-tool urlmatch-normalization "scheme://invalid....:["
+
+ok 2 - url authority
+
+expecting success of 0110.3 'url port checks': 
+	test-tool urlmatch-normalization "xyz://q@some.host:" &&
+	test-tool urlmatch-normalization "xyz://q@some.host:456/" &&
+	! test-tool urlmatch-normalization "xyz://q@some.host:0" &&
+	! test-tool urlmatch-normalization "xyz://q@some.host:0000000" &&
+	test-tool urlmatch-normalization "xyz://q@some.host:0000001?" &&
+	test-tool urlmatch-normalization "xyz://q@some.host:065535#" &&
+	test-tool urlmatch-normalization "xyz://q@some.host:65535" &&
+	! test-tool urlmatch-normalization "xyz://q@some.host:65536" &&
+	! test-tool urlmatch-normalization "xyz://q@some.host:99999" &&
+	! test-tool urlmatch-normalization "xyz://q@some.host:100000" &&
+	! test-tool urlmatch-normalization "xyz://q@some.host:100001" &&
+	test-tool urlmatch-normalization "http://q@some.host:80" &&
+	test-tool urlmatch-normalization "https://q@some.host:443" &&
+	test-tool urlmatch-normalization "http://q@some.host:80/" &&
+	test-tool urlmatch-normalization "https://q@some.host:443?" &&
+	! test-tool urlmatch-normalization "http://q@:8008" &&
+	! test-tool urlmatch-normalization "http://:8080" &&
+	! test-tool urlmatch-normalization "http://:" &&
+	test-tool urlmatch-normalization "xyz://q@some.host:456/" &&
+	test-tool urlmatch-normalization "xyz://[::1]:456/" &&
+	test-tool urlmatch-normalization "xyz://[::1]:/" &&
+	! test-tool urlmatch-normalization "xyz://[::1]:000/" &&
+	! test-tool urlmatch-normalization "xyz://[::1]:0%300/" &&
+	! test-tool urlmatch-normalization "xyz://[::1]:0x80/" &&
+	! test-tool urlmatch-normalization "xyz://[::1]:4294967297/" &&
+	! test-tool urlmatch-normalization "xyz://[::1]:030f/"
+
+ok 3 - url port checks
+
+expecting success of 0110.4 'url port normalization': 
+	test "$(test-tool urlmatch-normalization -p "http://x:800")" = "http://x:800/" &&
+	test "$(test-tool urlmatch-normalization -p "http://x:0800")" = "http://x:800/" &&
+	test "$(test-tool urlmatch-normalization -p "http://x:00000800")" = "http://x:800/" &&
+	test "$(test-tool urlmatch-normalization -p "http://x:065535")" = "http://x:65535/" &&
+	test "$(test-tool urlmatch-normalization -p "http://x:1")" = "http://x:1/" &&
+	test "$(test-tool urlmatch-normalization -p "http://x:80")" = "http://x/" &&
+	test "$(test-tool urlmatch-normalization -p "http://x:080")" = "http://x/" &&
+	test "$(test-tool urlmatch-normalization -p "http://x:000000080")" = "http://x/" &&
+	test "$(test-tool urlmatch-normalization -p "https://x:443")" = "https://x/" &&
+	test "$(test-tool urlmatch-normalization -p "https://x:0443")" = "https://x/" &&
+	test "$(test-tool urlmatch-normalization -p "https://x:000000443")" = "https://x/"
+
+ok 4 - url port normalization
+
+expecting success of 0110.5 'url general escapes': 
+	! test-tool urlmatch-normalization "http://x.y?%fg" &&
+	test "$(test-tool urlmatch-normalization -p "X://W/%7e%41^%3a")" = "x://w/~A%5E%3A" &&
+	test "$(test-tool urlmatch-normalization -p "X://W/:/?#[]@")" = "x://w/:/?#[]@" &&
+	test "$(test-tool urlmatch-normalization -p "X://W/$&()*+,;=")" = "x://w/$&()*+,;=" &&
+	test "$(test-tool urlmatch-normalization -p "X://W/'")" = "x://w/'" &&
+	test "$(test-tool urlmatch-normalization -p "X://W?!")" = "x://w/?!"
+
+ok 5 - url general escapes
+
+expecting success of 0110.6 'url high-bit escapes': 
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-1")")" = "x://q/%01%02%03%04%05%06%07%08%0E%0F%10%11%12" &&
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-2")")" = "x://q/%13%14%15%16%17%18%19%1B%1C%1D%1E%1F%7F" &&
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-3")")" = "x://q/%80%81%82%83%84%85%86%87%88%89%8A%8B%8C%8D%8E%8F" &&
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-4")")" = "x://q/%90%91%92%93%94%95%96%97%98%99%9A%9B%9C%9D%9E%9F" &&
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-5")")" = "x://q/%A0%A1%A2%A3%A4%A5%A6%A7%A8%A9%AA%AB%AC%AD%AE%AF" &&
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-6")")" = "x://q/%B0%B1%B2%B3%B4%B5%B6%B7%B8%B9%BA%BB%BC%BD%BE%BF" &&
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-7")")" = "x://q/%C0%C1%C2%C3%C4%C5%C6%C7%C8%C9%CA%CB%CC%CD%CE%CF" &&
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-8")")" = "x://q/%D0%D1%D2%D3%D4%D5%D6%D7%D8%D9%DA%DB%DC%DD%DE%DF" &&
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-9")")" = "x://q/%E0%E1%E2%E3%E4%E5%E6%E7%E8%E9%EA%EB%EC%ED%EE%EF" &&
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-10")")" = "x://q/%F0%F1%F2%F3%F4%F5%F6%F7%F8%F9%FA%FB%FC%FD%FE%FF"
+
+ok 6 - url high-bit escapes
+
+expecting success of 0110.7 'url utf-8 escapes': 
+	test "$(test-tool urlmatch-normalization -p "$(cat "$tu-11")")" = "x://q/%C2%80%DF%BF%E0%A0%80%EF%BF%BD%F0%90%80%80%F0%AF%BF%BD"
+
+ok 7 - url utf-8 escapes
+
+expecting success of 0110.8 'url username/password escapes': 
+	test "$(test-tool urlmatch-normalization -p "x://%41%62(^):%70+d@foo")" = "x://Ab(%5E):p+d@foo/"
+
+ok 8 - url username/password escapes
+
+expecting success of 0110.9 'url normalized lengths': 
+	test "$(test-tool urlmatch-normalization -l "Http://%4d%65:%4d^%70@The.Host")" = 25 &&
+	test "$(test-tool urlmatch-normalization -l "http://%41:%42@x.y/%61/")" = 17 &&
+	test "$(test-tool urlmatch-normalization -l "http://@x.y/^")" = 15
+
+ok 9 - url normalized lengths
+
+expecting success of 0110.10 'url . and .. segments': 
+	test "$(test-tool urlmatch-normalization -p "x://y/.")" = "x://y/" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/./")" = "x://y/" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/a/.")" = "x://y/a" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/a/./")" = "x://y/a/" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/.?")" = "x://y/?" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/./?")" = "x://y/?" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/a/.?")" = "x://y/a?" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/a/./?")" = "x://y/a/?" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/a/./b/.././../c")" = "x://y/c" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/a/./b/../.././c/")" = "x://y/c/" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/a/./b/.././../c/././.././.")" = "x://y/" &&
+	! test-tool urlmatch-normalization "x://y/a/./b/.././../c/././.././.." &&
+	test "$(test-tool urlmatch-normalization -p "x://y/a/./?/././..")" = "x://y/a/?/././.." &&
+	test "$(test-tool urlmatch-normalization -p "x://y/%2e/")" = "x://y/" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/%2E/")" = "x://y/" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/a/%2e./")" = "x://y/" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/b/.%2E/")" = "x://y/" &&
+	test "$(test-tool urlmatch-normalization -p "x://y/c/%2e%2E/")" = "x://y/"
+
+ok 10 - url . and .. segments
+
+expecting success of 0110.11 'url equivalents': 
+	test-tool urlmatch-normalization "httP://x" "Http://X/" &&
+	test-tool urlmatch-normalization "Http://%4d%65:%4d^%70@The.Host" "hTTP://Me:%4D^p@the.HOST:80/" &&
+	! test-tool urlmatch-normalization "https://@x.y/^" "httpS://x.y:443/^" &&
+	test-tool urlmatch-normalization "https://@x.y/^" "httpS://@x.y:0443/^" &&
+	test-tool urlmatch-normalization "https://@x.y/^/../abc" "httpS://@x.y:0443/abc" &&
+	test-tool urlmatch-normalization "https://@x.y/^/.." "httpS://@x.y:0443/"
+
+ok 11 - url equivalents
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0202-gettext-perl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0202-gettext-perl/.git/
+# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
+# lib-gettext: No is_IS ISO-8859-1 locale available
+checking prerequisite: PERL_TEST_MORE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
+	perl -MTest::More -e 0
+
+)
+prerequisite PERL_TEST_MORE ok
+expecting success of 0202.1 'run t0202/test.pl to test Git::I18N.pm': 
+	"$PERL_PATH" "$TEST_DIRECTORY"/t0202/test.pl 2>stderr &&
+	test_must_be_empty stderr
+
+1..13
+ok 1 - Testing Git::I18N with NO Perl gettext library
+ok 2 - Git::I18N is located at /build/reproducible-path/git-2.45.2/perl/build/lib/Git/I18N.pm
+ok 3 - sanity: Git::I18N has 3 export(s)
+ok 4 - sanity: Git::I18N exports everything by default
+ok 5 - sanity: N__ has a $ prototype
+ok 6 - sanity: __ has a $ prototype
+ok 7 - sanity: __n has a $$$ prototype
+ok 8 - Passing a string through __() in the C locale works
+ok 9 - Get singular string through __n() in C locale
+ok 10 - Get plural string through __n() in C locale
+ok 11 - Passing a string through N__() in the C locale works
+ok 12 - Without a gettext library + <C> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
+ok 13 - Without a gettext library + <is> locale <TEST: A Perl test string> turns into <TEST: A Perl test string>
+ok 1 - run t0202/test.pl to test Git::I18N.pm
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0204-gettext-reencode-sanity.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0203-gettext-setlocale-sanity.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0203-gettext-setlocale-sanity/.git/
+# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
+# lib-gettext: No is_IS ISO-8859-1 locale available
+expecting success of 0203.1 'git show a ISO-8859-1 commit under C locale': 
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+	test_commit "iso-c-commit" iso-under-c &&
+	git show >out 2>err &&
+	test_must_be_empty err &&
+	grep -q "iso-c-commit" out
+
+Warning: commit message did not conform to UTF-8.
+You may want to amend it after fixing the message, or set the config
+variable i18n.commitEncoding to the encoding your project uses.
+[master (root-commit) f2030b4] iso-c-commit
+ Author: �éí óú <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 iso-under-c
+ok 1 - git show a ISO-8859-1 commit under C locale
+
+expecting success of 0203.2 'git show a ISO-8859-1 commit under a UTF-8 locale': 
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
+	test_commit "iso-utf8-commit" iso-under-utf8 &&
+	LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err &&
+	test_must_be_empty err &&
+	grep -q "iso-utf8-commit" out
+
+Warning: commit message did not conform to UTF-8.
+You may want to amend it after fixing the message, or set the config
+variable i18n.commitEncoding to the encoding your project uses.
+[master 7495ea2] iso-utf8-commit
+ Author: �éí óú <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 iso-under-utf8
+ok 2 - git show a ISO-8859-1 commit under a UTF-8 locale
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0210-trace2-normal.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0210-trace2-normal/.git/
 expecting success of 0210.1 'normal stream, return code 0': 
@@ -32931,14 +32098,338 @@
 Cloning into 'clone2'...
 warning: You appear to have cloned an empty repository.
 done.
-01:32:28.276745 common-main.c:56                  start /build/reproducible-path/git-2.45.2/git clone https://user:pwd@example.com/ clone2
-01:32:28.314174 config.c:3182                     def_param scope:unknown remote.origin.url=https://user:pwd@example.com/
+19:26:44.143567 common-main.c:56                  start /build/reproducible-path/git-2.45.2/git clone https://user:pwd@example.com/ clone2
+19:26:44.147764 config.c:3182                     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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0212-trace2-event.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0212-trace2-event/.git/
+expecting success of 0212.1 'event stream, error event': 
+	test_when_finished "rm trace.event actual expect" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 003error "hello world" "this is a test" &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "003error",
+	|      "hello world",
+	|      "this is a test"
+	|    ],
+	|    "errors":[
+	|      "%s",
+	|      "%s"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
+
+error: hello world
+error: this is a test
+ok 1 - event stream, error event
+
+expecting success of 0212.2 'event stream, return code 0': 
+	test_when_finished "rm trace.event actual expect" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 004child test-tool trace2 004child test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "004child",
+	|      "test-tool",
+	|      "trace2",
+	|      "004child",
+	|      "test-tool",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "child":{
+	|      "0":{
+	|        "child_argv":[
+	|          "_EXE_",
+	|          "trace2",
+	|          "004child",
+	|          "test-tool",
+	|          "trace2",
+	|          "001return",
+	|          "0"
+	|        ],
+	|        "child_class":"?",
+	|        "child_code":0,
+	|        "use_shell":0
+	|      }
+	|    },
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  },
+	|  "_SID0_/_SID1_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "004child",
+	|      "test-tool",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "child":{
+	|      "0":{
+	|        "child_argv":[
+	|          "_EXE_",
+	|          "trace2",
+	|          "001return",
+	|          "0"
+	|        ],
+	|        "child_class":"?",
+	|        "child_code":0,
+	|        "use_shell":0
+	|      }
+	|    },
+	|    "exit_code":0,
+	|    "hierarchy":"trace2/trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  },
+	|  "_SID0_/_SID1_/_SID2_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2/trace2/trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
+
+ok 2 - event stream, return code 0
+
+expecting success of 0212.3 'event stream, list config': 
+	test_when_finished "rm trace.event actual expect" &&
+	git config --local t0212.abc 1 &&
+	git config --local t0212.def "hello world" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" GIT_TRACE2_CONFIG_PARAMS="t0212.*" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "params":[
+	|      {
+	|        "param":"t0212.abc",
+	|        "value":"1"
+	|      },
+	|      {
+	|        "param":"t0212.def",
+	|        "value":"hello world"
+	|      }
+	|    ],
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
+
+ok 3 - event stream, list config
+
+expecting success of 0212.4 'event stream, list env vars': 
+	test_when_finished "rm trace.event actual expect" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		GIT_TRACE2_ENV_VARS="A_VAR,OTHER_VAR,MISSING" \
+		A_VAR=1 OTHER_VAR="hello world" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "params":[
+	|      {
+	|        "param":"A_VAR",
+	|        "value":"1"
+	|      },
+	|      {
+	|        "param":"OTHER_VAR",
+	|        "value":"hello world"
+	|      }
+	|    ],
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
+
+ok 4 - event stream, list env vars
+
+expecting success of 0212.5 'basic trace2_data': 
+	test_when_finished "rm trace.event actual expect" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 006data test_category k1 v1 test_category k2 v2 &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "006data",
+	|      "test_category",
+	|      "k1",
+	|      "v1",
+	|      "test_category",
+	|      "k2",
+	|      "v2"
+	|    ],
+	|    "data":{
+	|      "test_category":{
+	|        "k1":"v1",
+	|        "k2":"v2"
+	|      }
+	|    },
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
+
+ok 5 - basic trace2_data
+
+expecting success of 0212.6 'using global config, event stream, error event': 
+	test_when_finished "rm trace.event actual expect" &&
+	test_config_global trace2.eventTarget "$(pwd)/trace.event" &&
+	test-tool trace2 003error "hello world" "this is a test" &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "003error",
+	|      "hello world",
+	|      "this is a test"
+	|    ],
+	|    "errors":[
+	|      "%s",
+	|      "%s"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
+
+error: hello world
+error: this is a test
+ok 6 - using global config, event stream, error event
+
+expecting success of 0212.7 'discard traces when there are too many files': 
+	mkdir trace_target_dir &&
+	test_when_finished "rm -r trace_target_dir" &&
+	(
+		GIT_TRACE2_MAX_FILES=5 &&
+		export GIT_TRACE2_MAX_FILES &&
+		cd trace_target_dir &&
+		test_seq $GIT_TRACE2_MAX_FILES >../expected_filenames.txt &&
+		xargs touch <../expected_filenames.txt &&
+		cd .. &&
+		GIT_TRACE2_EVENT="$(pwd)/trace_target_dir" test-tool trace2 001return 0
+	) &&
+	echo git-trace2-discard >>expected_filenames.txt &&
+	ls trace_target_dir >ls_output.txt &&
+	test_cmp expected_filenames.txt ls_output.txt &&
+	head -n1 trace_target_dir/git-trace2-discard | grep \"event\":\"version\" &&
+	head -n2 trace_target_dir/git-trace2-discard | tail -n1 | grep \"event\":\"too_many_files\"
+
+{"event":"version","sid":"20241114T192644.279987Z-H5c947e1c-P000069cd","thread":"main","time":"2024-11-14T19:26:44.280202Z","file":"common-main.c","line":55,"evt":"3","exe":"2.45.2"}
+{"event":"too_many_files","sid":"20241114T192644.279987Z-H5c947e1c-P000069cd","thread":"main","time":"2024-11-14T19:26:44.280223Z","file":"common-main.c","line":55}
+ok 7 - discard traces when there are too many files
+
+expecting success of 0212.8 'unsafe URLs are redacted by default in cmd_start events': 
+	test_when_finished \
+		"rm -r trace.event" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		test-tool trace2 300redact_start git clone https://user:pwd@example.com/ clone2 &&
+	! grep user:pwd trace.event
+
+ok 8 - unsafe URLs are redacted by default in cmd_start events
+
+expecting success of 0212.9 'unsafe URLs are redacted by default in child_start events': 
+	test_when_finished \
+		"rm -r trace.event" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		test-tool trace2 301redact_child_start git clone https://user:pwd@example.com/ clone2 &&
+	! grep user:pwd trace.event
+
+ok 9 - unsafe URLs are redacted by default in child_start events
+
+expecting success of 0212.10 'unsafe URLs are redacted by default in exec events': 
+	test_when_finished \
+		"rm -r trace.event" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		test-tool trace2 302redact_exec git clone https://user:pwd@example.com/ clone2 &&
+	! grep user:pwd trace.event
+
+ok 10 - unsafe URLs are redacted by default in exec events
+
+expecting success of 0212.11 'unsafe URLs are redacted by default in def_param events': 
+	test_when_finished \
+		"rm -r trace.event" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		test-tool trace2 303redact_def_param url https://user:pwd@example.com/ &&
+	! grep user:pwd trace.event
+
+ok 11 - unsafe URLs are redacted by default in def_param events
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0211-trace2-perf.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0211-trace2-perf/.git/
 expecting success of 0211.1 'perf stream, return code 0': 
@@ -33120,10 +32611,10 @@
 d0|th01:ut_201|th_counter||||test|name:test2 value:20
 d0|th01:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th02:ut_201|thread_start||_T_ABS_|||
-d0|th02:ut_201|th_counter||||test|name:test2 value:20
-d0|th02:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th03:ut_201|thread_start||_T_ABS_|||
+d0|th02:ut_201|th_counter||||test|name:test2 value:20
 d0|th03:ut_201|th_counter||||test|name:test2 value:20
+d0|th02:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th03:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|main|exit||_T_ABS_|||code:0
 d0|main|counter||||test|name:test2 value:60
@@ -33135,10 +32626,10 @@
 d0|th01:ut_201|th_counter||||test|name:test2 value:20
 d0|th01:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th02:ut_201|thread_start||_T_ABS_|||
-d0|th02:ut_201|th_counter||||test|name:test2 value:20
-d0|th02:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th03:ut_201|thread_start||_T_ABS_|||
+d0|th02:ut_201|th_counter||||test|name:test2 value:20
 d0|th03:ut_201|th_counter||||test|name:test2 value:20
+d0|th02:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th03:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|main|exit||_T_ABS_|||code:0
 d0|main|counter||||test|name:test2 value:60
@@ -33150,10 +32641,10 @@
 d0|th01:ut_201|th_counter||||test|name:test2 value:20
 d0|th01:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th02:ut_201|thread_start||_T_ABS_|||
-d0|th02:ut_201|th_counter||||test|name:test2 value:20
-d0|th02:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th03:ut_201|thread_start||_T_ABS_|||
+d0|th02:ut_201|th_counter||||test|name:test2 value:20
 d0|th03:ut_201|th_counter||||test|name:test2 value:20
+d0|th02:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th03:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|main|exit||_T_ABS_|||code:0
 d0|main|counter||||test|name:test2 value:60
@@ -33165,10 +32656,10 @@
 d0|th01:ut_201|th_counter||||test|name:test2 value:20
 d0|th01:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th02:ut_201|thread_start||_T_ABS_|||
-d0|th02:ut_201|th_counter||||test|name:test2 value:20
-d0|th02:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th03:ut_201|thread_start||_T_ABS_|||
+d0|th02:ut_201|th_counter||||test|name:test2 value:20
 d0|th03:ut_201|th_counter||||test|name:test2 value:20
+d0|th02:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|th03:ut_201|thread_exit||_T_ABS_|_T_REL_||
 d0|main|exit||_T_ABS_|||code:0
 d0|main|counter||||test|name:test2 value:60
@@ -33199,26 +32690,26 @@
 Cloning into 'clone2'...
 warning: You appear to have cloned an empty repository.
 done.
-01:32:28.321936 common-main.c:56|d0|main|start||_T_REL_|||/build/reproducible-path/git-2.45.2/git clone https://user:pwd@example.com/ clone2
-01:32:28.357730 config.c:3182|d0|main|def_param||||scope:unknow|remote.origin.url:https://user:pwd@example.com/
+19:26:44.527693 common-main.c:56|d0|main|start||_T_REL_|||/build/reproducible-path/git-2.45.2/git clone https://user:pwd@example.com/ clone2
+19:26:44.533626 config.c:3182|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.45.2
-01:32:28.423257 git.c:466|d0|main|cmd_name|||||version (version)
-01:32:28.423358 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.423382 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:44.756341 git.c:466|d0|main|cmd_name|||||version (version)
+19:26:44.756497 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:44.756542 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 11 - expect def_params for normal builtin command
 
 expecting success of 0211.12 'expect def_params for query command': 
 	try_simple "git --man-path" "_query_"
 
 /usr/share/man
-01:32:28.476982 git.c:178|d0|main|cmd_name|||||_query_ (_query_)
-01:32:28.477075 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.477100 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:44.999483 git.c:178|d0|main|cmd_name|||||_query_ (_query_)
+19:26:44.999573 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:44.999597 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 12 - expect def_params for query command
 
 expecting success of 0211.13 'expect def_params for remote-curl and _run_dashed_': 
@@ -33246,12 +32737,12 @@
 
 warning: url has no scheme: y/
 fatal: credential url cannot be parsed: y/
-01:32:28.583440 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-01:32:28.583516 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.583538 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-01:32:28.591037 remote-curl.c:1549|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
-01:32:28.591065 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.591088 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:45.181405 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+19:26:45.181487 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:45.181512 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:45.192978 remote-curl.c:1549|d1|main|cmd_name|||||remote-curl (_run_dashed_/remote-curl)
+19:26:45.193005 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:45.193025 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 13 - expect def_params for remote-curl and _run_dashed_
 
 expecting success of 0211.14 'expect def_params for http-fetch and _run_dashed_': 
@@ -33278,12 +32769,12 @@
 	grep "d1|main|def_param|.*|cfg.prop.foo:red" actual &&
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
-01:32:28.688618 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-01:32:28.688711 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.688737 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-01:32:28.695946 http-fetch.c:144|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
-01:32:28.695974 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.695997 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:45.414748 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+19:26:45.414822 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:45.414848 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:45.440639 http-fetch.c:144|d1|main|cmd_name|||||http-fetch (_run_dashed_/http-fetch)
+19:26:45.440675 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:45.440702 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 14 - expect def_params for http-fetch and _run_dashed_
 
 expecting success of 0211.15 'expect def_params during git alias expansion': 
@@ -33321,13 +32812,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.45.2
-01:32:28.796190 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-01:32:28.796550 git.c:800|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
-01:32:28.796288 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.796316 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-01:32:28.798821 git.c:466|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
-01:32:28.798940 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.798971 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:45.631777 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+19:26:45.632009 git.c:800|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_git_alias_)
+19:26:45.631839 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:45.631860 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:45.641763 git.c:466|d1|main|cmd_name|||||version (_run_dashed_/_run_git_alias_/version)
+19:26:45.641859 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:45.641893 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 15 - expect def_params during git alias expansion
 
 expecting success of 0211.16 'expect def_params during shell alias expansion': 
@@ -33368,13 +32859,13 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.45.2
-01:32:28.929653 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-01:32:28.929958 git.c:382|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
-01:32:28.929726 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.929747 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-01:32:28.932435 git.c:466|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
-01:32:28.932549 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:28.932574 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:45.819992 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+19:26:45.820297 git.c:382|d0|main|cmd_name|||||_run_shell_alias_ (_run_dashed_/_run_shell_alias_)
+19:26:45.820050 trace2.c:437|d0|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:45.820096 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:45.839712 git.c:466|d1|main|cmd_name|||||version (_run_dashed_/_run_shell_alias_/version)
+19:26:45.839808 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:45.839832 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 16 - expect def_params during shell alias expansion
 
 expecting success of 0211.17 'expect def_params during nested git alias expansion': 
@@ -33425,17 +32916,17 @@
 	grep "d1|main|def_param|.*|ENV_PROP_FOO:blue" actual
 
 git version 2.45.2
-01:32:29.059648 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
-01:32:29.059757 run-command.c:724|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
-01:32:29.059890 git.c:417|d0|main|alias|||||alias:xxx argv:[yyy]
-01:32:29.059974 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
-01:32:29.059981 run-command.c:724|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
-01:32:29.060151 git.c:417|d0|main|alias|||||alias:yyy argv:[version]
-01:32:29.060159 git.c:800|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
-01:32:29.059746 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
-01:32:29.061981 git.c:466|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
-01:32:29.062082 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
-01:32:29.062105 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:46.256267 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_)
+19:26:46.256395 run-command.c:724|d0|main|child_start||_T_REL_|||[ch0] class:dashed argv:[git-xxx]
+19:26:46.256522 git.c:417|d0|main|alias|||||alias:xxx argv:[yyy]
+19:26:46.256599 git.c:744|d0|main|cmd_name|||||_run_dashed_ (_run_dashed_/_run_dashed_)
+19:26:46.256607 run-command.c:724|d0|main|child_start||_T_REL_|||[ch1] class:dashed argv:[git-yyy]
+19:26:46.256732 git.c:417|d0|main|alias|||||alias:yyy argv:[version]
+19:26:46.256742 git.c:800|d0|main|cmd_name|||||_run_git_alias_ (_run_dashed_/_run_dashed_/_run_git_alias_)
+19:26:46.256381 trace2.c:438|d0|main|def_param||||scope:comman|ENV_PROP_FOO:blue
+19:26:46.266959 git.c:466|d1|main|cmd_name|||||version (_run_dashed_/_run_dashed_/_run_git_alias_/version)
+19:26:46.267040 trace2.c:437|d1|main|def_param||||scope:global|cfg.prop.foo:red
+19:26:46.267062 trace2.c:438|d1|main|def_param||||scope:comman|ENV_PROP_FOO:blue
 ok 17 - expect def_params during nested git alias expansion
 
 # passed all 17 test(s)
@@ -34309,9 +33800,9 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0302-credential-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0302-credential-store/.git/
-expecting success of 0302.1 'helper (store) has no existing data': 
+*** t0303-credential-external.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
@@ -34327,7 +33818,7 @@
 	
 ok 1 - helper (store) has no existing data
 
-expecting success of 0302.2 'helper (store) stores password': 
+expecting success of 0303.2 'helper (store) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34337,7 +33828,7 @@
 	
 ok 2 - helper (store) stores password
 
-expecting success of 0302.3 'helper (store) can retrieve password': 
+expecting success of 0303.3 'helper (store) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34351,7 +33842,7 @@
 	
 ok 3 - helper (store) can retrieve password
 
-expecting success of 0302.4 'helper (store) requires matching protocol': 
+expecting success of 0303.4 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -34367,7 +33858,7 @@
 	
 ok 4 - helper (store) requires matching protocol
 
-expecting success of 0302.5 'helper (store) requires matching host': 
+expecting success of 0303.5 'helper (store) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -34383,7 +33874,7 @@
 	
 ok 5 - helper (store) requires matching host
 
-expecting success of 0302.6 'helper (store) requires matching username': 
+expecting success of 0303.6 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34399,7 +33890,7 @@
 	
 ok 6 - helper (store) requires matching username
 
-expecting success of 0302.7 'helper (store) requires matching path': 
+expecting success of 0303.7 'helper (store) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -34425,7 +33916,7 @@
 	
 ok 7 - helper (store) requires matching path
 
-expecting success of 0302.8 'helper (store) overwrites on store': 
+expecting success of 0303.8 'helper (store) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34469,7 +33960,7 @@
 	
 ok 8 - helper (store) overwrites on store
 
-expecting success of 0302.9 'helper (store) can forget host': 
+expecting success of 0303.9 'helper (store) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34489,7 +33980,7 @@
 	
 ok 9 - helper (store) can forget host
 
-expecting success of 0302.10 'helper (store) can store multiple users': 
+expecting success of 0303.10 'helper (store) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34525,7 +34016,7 @@
 	
 ok 10 - helper (store) can store multiple users
 
-expecting success of 0302.11 'helper (store) does not erase a password distinct from input': 
+expecting success of 0303.11 'helper (store) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34551,7 +34042,7 @@
 	
 ok 11 - helper (store) does not erase a password distinct from input
 
-expecting success of 0302.12 'helper (store) can forget user': 
+expecting success of 0303.12 'helper (store) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34572,7 +34063,7 @@
 	
 ok 12 - helper (store) can forget user
 
-expecting success of 0302.13 'helper (store) remembers other user': 
+expecting success of 0303.13 'helper (store) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34586,7 +34077,7 @@
 	
 ok 13 - helper (store) remembers other user
 
-expecting success of 0302.14 'helper (store) can store empty username': 
+expecting success of 0303.14 'helper (store) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -34605,7 +34096,7 @@
 	
 ok 14 - helper (store) can store empty username
 
-expecting success of 0302.15 'helper (store) erases all matching credentials': 
+expecting success of 0303.15 'helper (store) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34637,7 +34128,7 @@
 	
 ok 15 - helper (store) erases all matching credentials
 
-expecting success of 0302.16 'helper (store) not confused by long header': 
+expecting success of 0303.16 'helper (store) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -34662,20 +34153,238 @@
 	
 ok 16 - helper (store) not confused by long header
 
-expecting success of 0302.17 'when xdg file does not exist, xdg file not created': 
-	test_path_is_missing "$HOME/.config/git/credentials" &&
-	test -s "$HOME/.git-credentials"
-
-ok 17 - when xdg file does not exist, xdg file not created
+expecting success of 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 0302.18 'setup xdg file': 
-	rm -f "$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	>"$HOME/.config/git/credentials"
+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
 
-ok 18 - setup xdg file
+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 0302.19 'helper (store) has no existing data': 
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0411-clone-from-partial.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/.git/
+expecting success of 0411.1 'create evil repo': 
+	git init tmp &&
+	test_commit -C tmp a &&
+	git -C tmp config uploadpack.allowfilter 1 &&
+	git clone --filter=blob:none --no-local --no-checkout tmp evil &&
+	rm -rf tmp &&
+
+	git -C evil config remote.origin.uploadpack \"\$TRASH_DIRECTORY/fake-upload-pack\" &&
+	write_script fake-upload-pack <<-\EOF &&
+		echo >&2 "fake-upload-pack running"
+		>"$TRASH_DIRECTORY/script-executed"
+		exit 1
+	EOF
+	export TRASH_DIRECTORY &&
+
+	# empty shallow file disables local clone optimization
+	>evil/.git/shallow
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/tmp/.git/
+[master (root-commit) ce450c7] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+Cloning into 'evil'...
+ok 1 - create evil repo
+
+expecting success of 0411.2 'local clone must not fetch from promisor remote and execute script': 
+	rm -f script-executed &&
+	test_must_fail git clone \
+		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
+		evil clone1 2>err &&
+	test_grep "detected dubious ownership" err &&
+	test_grep ! "fake-upload-pack running" err &&
+	test_path_is_missing script-executed
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/evil/.git'
+ok 2 - local clone must not fetch from promisor remote and execute script
+
+expecting success of 0411.3 'clone from file://... must not fetch from promisor remote and execute script': 
+	rm -f script-executed &&
+	test_must_fail git clone \
+		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
+		"file://$(pwd)/evil" clone2 2>err &&
+	test_grep "detected dubious ownership" err &&
+	test_grep ! "fake-upload-pack running" err &&
+	test_path_is_missing script-executed
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/evil/.git'
+ok 3 - clone from file://... must not fetch from promisor remote and execute script
+
+expecting success of 0411.4 'fetch from file://... must not fetch from promisor remote and execute script': 
+	rm -f script-executed &&
+	test_must_fail git fetch \
+		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
+		"file://$(pwd)/evil" 2>err &&
+	test_grep "detected dubious ownership" err &&
+	test_grep ! "fake-upload-pack running" err &&
+	test_path_is_missing script-executed
+
+fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/evil/.git'
+ok 4 - fetch from file://... must not fetch from promisor remote and execute script
+
+expecting success of 0411.5 'pack-objects should fetch from promisor remote and execute script': 
+	rm -f script-executed &&
+	echo "HEAD" | test_must_fail git -C evil pack-objects --revs --stdout >/dev/null 2>err &&
+	test_grep "fake-upload-pack running" err &&
+	test_path_is_file script-executed
+
+fake-upload-pack running
+ok 5 - pack-objects should fetch from promisor remote and execute script
+
+expecting success of 0411.6 'clone from promisor remote does not lazy-fetch by default': 
+	rm -f script-executed &&
+	test_must_fail git clone evil no-lazy 2>err &&
+	test_grep "lazy fetching disabled" err &&
+	test_path_is_missing script-executed
+
+remote: warning: lazy fetching disabled; some objects may not be available        
+ok 6 - clone from promisor remote does not lazy-fetch by default
+
+expecting success of 0411.7 'promisor lazy-fetching can be re-enabled': 
+	rm -f script-executed &&
+	test_must_fail env GIT_NO_LAZY_FETCH=0 \
+		git clone evil lazy-ok 2>err &&
+	test_grep "fake-upload-pack running" err &&
+	test_path_is_file script-executed
+
+remote: fake-upload-pack running        
+ok 7 - promisor lazy-fetching can be re-enabled
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0301-credential-cache.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0301-credential-cache/.git/
+expecting success of 0301.1 'helper (cache) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34689,9 +34398,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 19 - helper (store) has no existing data
+ok 1 - helper (cache) has no existing data
 
-expecting success of 0302.20 'helper (store) stores password': 
+expecting success of 0301.2 'helper (cache) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34699,9 +34408,9 @@
 		password=store-pass
 		EOF
 	
-ok 20 - helper (store) stores password
+ok 2 - helper (cache) stores password
 
-expecting success of 0302.21 'helper (store) can retrieve password': 
+expecting success of 0301.3 'helper (cache) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34713,9 +34422,9 @@
 		--
 		EOF
 	
-ok 21 - helper (store) can retrieve password
+ok 3 - helper (cache) can retrieve password
 
-expecting success of 0302.22 'helper (store) requires matching protocol': 
+expecting success of 0301.4 'helper (cache) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -34729,9 +34438,9 @@
 		askpass: Password for 'http://askpass-username@example.com':
 		EOF
 	
-ok 22 - helper (store) requires matching protocol
+ok 4 - helper (cache) requires matching protocol
 
-expecting success of 0302.23 'helper (store) requires matching host': 
+expecting success of 0301.5 'helper (cache) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -34745,9 +34454,9 @@
 		askpass: Password for 'https://askpass-username@other.tld':
 		EOF
 	
-ok 23 - helper (store) requires matching host
+ok 5 - helper (cache) requires matching host
 
-expecting success of 0302.24 'helper (store) requires matching username': 
+expecting success of 0301.6 'helper (cache) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34761,9 +34470,9 @@
 		askpass: Password for 'https://other@example.com':
 		EOF
 	
-ok 24 - helper (store) requires matching username
+ok 6 - helper (cache) requires matching username
 
-expecting success of 0302.25 'helper (store) requires matching path': 
+expecting success of 0301.7 'helper (cache) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -34787,9 +34496,9 @@
 		askpass: Password for 'http://askpass-username@path.tld/bar.git':
 		EOF
 	
-ok 25 - helper (store) requires matching path
+ok 7 - helper (cache) requires matching path
 
-expecting success of 0302.26 'helper (store) overwrites on store': 
+expecting success of 0301.8 'helper (cache) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34831,9 +34540,9 @@
 		askpass: Password for 'https://user-overwrite@example.com':
 		EOF
 	
-ok 26 - helper (store) overwrites on store
+ok 8 - helper (cache) overwrites on store
 
-expecting success of 0302.27 'helper (store) can forget host': 
+expecting success of 0301.9 'helper (cache) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34851,9 +34560,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 27 - helper (store) can forget host
+ok 9 - helper (cache) can forget host
 
-expecting success of 0302.28 'helper (store) can store multiple users': 
+expecting success of 0301.10 'helper (cache) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34887,9 +34596,9 @@
 		password=pass2
 		EOF
 	
-ok 28 - helper (store) can store multiple users
+ok 10 - helper (cache) can store multiple users
 
-expecting success of 0302.29 'helper (store) does not erase a password distinct from input': 
+expecting success of 0301.11 'helper (cache) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34913,9 +34622,9 @@
 		password=pass1
 		EOF
 	
-ok 29 - helper (store) does not erase a password distinct from input
+ok 11 - helper (cache) does not erase a password distinct from input
 
-expecting success of 0302.30 'helper (store) can forget user': 
+expecting success of 0301.12 'helper (cache) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34934,9 +34643,9 @@
 		askpass: Password for 'https://user1@example.com':
 		EOF
 	
-ok 30 - helper (store) can forget user
+ok 12 - helper (cache) can forget user
 
-expecting success of 0302.31 'helper (store) remembers other user': 
+expecting success of 0301.13 'helper (cache) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -34948,9 +34657,9 @@
 		password=pass2
 		EOF
 	
-ok 31 - helper (store) remembers other user
+ok 13 - helper (cache) remembers other user
 
-expecting success of 0302.32 'helper (store) can store empty username': 
+expecting success of 0301.14 'helper (cache) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -34967,9 +34676,9 @@
 		password=
 		EOF
 	
-ok 32 - helper (store) can store empty username
+ok 14 - helper (cache) can store empty username
 
-expecting success of 0302.33 'helper (store) erases all matching credentials': 
+expecting success of 0301.15 'helper (cache) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -34999,9 +34708,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 33 - helper (store) erases all matching credentials
+ok 15 - helper (cache) erases all matching credentials
 
-expecting success of 0302.34 'helper (store) not confused by long header': 
+expecting success of 0301.16 'helper (cache) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -35024,23 +34733,120 @@
 		askpass: Password for 'https://askpass-username@badguy.example.com':
 		EOF
 	
-ok 34 - helper (store) not confused by long header
+ok 16 - helper (cache) not confused by long header
 
-expecting success of 0302.35 'when xdg file exists, home file not created': 
-	test -s "$HOME/.config/git/credentials" &&
-	test_path_is_missing "$HOME/.git-credentials"
+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
 
-ok 35 - when xdg file exists, home file not created
+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 0302.36 'setup custom xdg file': 
-	rm -f "$HOME/.git-credentials" &&
-	rm -f "$HOME/.config/git/credentials" &&
-	mkdir -p "$HOME/xdg/git" &&
-	>"$HOME/xdg/git/credentials"
+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
 
-ok 36 - setup custom xdg file
+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 0302.37 'helper (store) has no existing data': 
+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 '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 22 - socket defaults to ~/.cache/git/credential/socket
+
+expecting success of 0301.23 'helper (cache) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35054,9 +34860,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 37 - helper (store) has no existing data
+ok 23 - helper (cache) has no existing data
 
-expecting success of 0302.38 'helper (store) stores password': 
+expecting success of 0301.24 'helper (cache) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35064,9 +34870,9 @@
 		password=store-pass
 		EOF
 	
-ok 38 - helper (store) stores password
+ok 24 - helper (cache) stores password
 
-expecting success of 0302.39 'helper (store) can retrieve password': 
+expecting success of 0301.25 'helper (cache) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35078,9 +34884,9 @@
 		--
 		EOF
 	
-ok 39 - helper (store) can retrieve password
+ok 25 - helper (cache) can retrieve password
 
-expecting success of 0302.40 'helper (store) requires matching protocol': 
+expecting success of 0301.26 'helper (cache) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -35094,9 +34900,9 @@
 		askpass: Password for 'http://askpass-username@example.com':
 		EOF
 	
-ok 40 - helper (store) requires matching protocol
+ok 26 - helper (cache) requires matching protocol
 
-expecting success of 0302.41 'helper (store) requires matching host': 
+expecting success of 0301.27 'helper (cache) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -35110,9 +34916,9 @@
 		askpass: Password for 'https://askpass-username@other.tld':
 		EOF
 	
-ok 41 - helper (store) requires matching host
+ok 27 - helper (cache) requires matching host
 
-expecting success of 0302.42 'helper (store) requires matching username': 
+expecting success of 0301.28 'helper (cache) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35126,9 +34932,9 @@
 		askpass: Password for 'https://other@example.com':
 		EOF
 	
-ok 42 - helper (store) requires matching username
+ok 28 - helper (cache) requires matching username
 
-expecting success of 0302.43 'helper (store) requires matching path': 
+expecting success of 0301.29 'helper (cache) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -35152,9 +34958,9 @@
 		askpass: Password for 'http://askpass-username@path.tld/bar.git':
 		EOF
 	
-ok 43 - helper (store) requires matching path
+ok 29 - helper (cache) requires matching path
 
-expecting success of 0302.44 'helper (store) overwrites on store': 
+expecting success of 0301.30 'helper (cache) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35196,9 +35002,9 @@
 		askpass: Password for 'https://user-overwrite@example.com':
 		EOF
 	
-ok 44 - helper (store) overwrites on store
+ok 30 - helper (cache) overwrites on store
 
-expecting success of 0302.45 'helper (store) can forget host': 
+expecting success of 0301.31 'helper (cache) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35216,9 +35022,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 45 - helper (store) can forget host
+ok 31 - helper (cache) can forget host
 
-expecting success of 0302.46 'helper (store) can store multiple users': 
+expecting success of 0301.32 'helper (cache) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35252,9 +35058,9 @@
 		password=pass2
 		EOF
 	
-ok 46 - helper (store) can store multiple users
+ok 32 - helper (cache) can store multiple users
 
-expecting success of 0302.47 'helper (store) does not erase a password distinct from input': 
+expecting success of 0301.33 'helper (cache) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35278,9 +35084,9 @@
 		password=pass1
 		EOF
 	
-ok 47 - helper (store) does not erase a password distinct from input
+ok 33 - helper (cache) does not erase a password distinct from input
 
-expecting success of 0302.48 'helper (store) can forget user': 
+expecting success of 0301.34 'helper (cache) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35299,9 +35105,9 @@
 		askpass: Password for 'https://user1@example.com':
 		EOF
 	
-ok 48 - helper (store) can forget user
+ok 34 - helper (cache) can forget user
 
-expecting success of 0302.49 'helper (store) remembers other user': 
+expecting success of 0301.35 'helper (cache) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35313,9 +35119,9 @@
 		password=pass2
 		EOF
 	
-ok 49 - helper (store) remembers other user
+ok 35 - helper (cache) remembers other user
 
-expecting success of 0302.50 'helper (store) can store empty username': 
+expecting success of 0301.36 'helper (cache) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -35332,9 +35138,9 @@
 		password=
 		EOF
 	
-ok 50 - helper (store) can store empty username
+ok 36 - helper (cache) can store empty username
 
-expecting success of 0302.51 'helper (store) erases all matching credentials': 
+expecting success of 0301.37 'helper (cache) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35364,9 +35170,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 51 - helper (store) erases all matching credentials
+ok 37 - helper (cache) erases all matching credentials
 
-expecting success of 0302.52 'helper (store) not confused by long header': 
+expecting success of 0301.38 'helper (cache) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -35389,351 +35195,130 @@
 		askpass: Password for 'https://askpass-username@badguy.example.com':
 		EOF
 	
-ok 52 - helper (store) not confused by long header
+ok 38 - helper (cache) not confused by long header
 
-expecting success of 0302.53 'if custom xdg file exists, home and xdg files not created': 
-	test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
-	test -s "$HOME/xdg/git/credentials" &&
-	test_path_is_missing "$HOME/.git-credentials" &&
-	test_path_is_missing "$HOME/.config/git/credentials"
+expecting success of 0301.39 '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 53 - if custom xdg file exists, home and xdg files not created
+ok 39 - use custom XDG_CACHE_HOME if set and default sockets are not created
 
-expecting success of 0302.54 'get: use home file if both home and xdg files have matches': 
-	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
-	check fill store <<-\EOF
-	protocol=https
-	host=example.com
-	--
+expecting success of 0301.40 '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=home-user
-	password=home-pass
-	--
+	username=store-user
+	password=store-pass
 	EOF
+	test_path_is_socket "$HOME/dir/socket"
 
-ok 54 - get: use home file if both home and xdg files have matches
+ok 40 - credential-cache --socket option overrides default location
 
-expecting success of 0302.55 'get: use xdg file if home file has no matches': 
-	>"$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
-	check fill store <<-\EOF
-	protocol=https
-	host=example.com
-	--
+expecting success of 0301.41 '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=xdg-user
-	password=xdg-pass
-	--
+	username=store-user
+	password=store-pass
 	EOF
-
-ok 55 - get: use xdg file if home file has no matches
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
-
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
-
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
-
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
-
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 0302.56 'get: use xdg file if home file is unreadable': 
-	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
-	chmod -r "$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
-	check fill store <<-\EOF
-	protocol=https
-	host=example.com
-	--
+	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=xdg-user
-	password=xdg-pass
-	--
+	username=store-user
+	password=store-pass
 	EOF
+	test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket"
 
-ok 56 - get: use xdg file if home file is unreadable
+ok 41 - use custom XDG_CACHE_HOME even if xdg socket exists
 
-expecting success of 0302.57 'store: if both xdg and home files exist, only store in home file': 
-	>"$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	>"$HOME/.config/git/credentials" &&
-	check approve store <<-\EOF &&
+expecting success of 0301.42 '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
-	echo "https://store-user:store-pass@example.com" >expected &&
-	test_cmp expected "$HOME/.git-credentials" &&
-	test_must_be_empty "$HOME/.config/git/credentials"
+	test_path_is_socket "$HOME/.git-credential-cache/socket"
 
-ok 57 - store: if both xdg and home files exist, only store in home file
+ok 42 - use user socket if user directory exists
 
-expecting success of 0302.58 'erase: erase matching credentials from both xdg and home files': 
-	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
-	mkdir -p "$HOME/.config/git" &&
-	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
-	check reject store <<-\EOF &&
+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.43 '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_must_be_empty "$HOME/.git-credentials" &&
-	test_must_be_empty "$HOME/.config/git/credentials"
-
-ok 58 - erase: erase matching credentials from both xdg and home files
+	test_path_is_socket "$HOME/.git-credential-cache/socket"
 
-expecting success of 0302.59 'get: ignore credentials without scheme as invalid': 
-		echo "$2" >"$HOME/.git-credentials" &&
-		check fill store <<-\EOF
-		protocol=https
-		host=example.com
-		--
-		protocol=https
-		host=example.com
-		username=askpass-username
-		password=askpass-password
-		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		--
-		EOF
-	
-ok 59 - get: ignore credentials without scheme as invalid
+ok 43 - use user socket if user directory is a symlink to a directory
 
-expecting success of 0302.60 'get: ignore credentials without valid host/path as invalid': 
-		echo "$2" >"$HOME/.git-credentials" &&
-		check fill store <<-\EOF
-		protocol=https
-		host=example.com
-		--
+expecting success of 0301.44 'helper (cache --timeout=1) times out': 
+		check approve "$HELPER" <<-\EOF &&
 		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':
-		--
+		host=timeout.tld
+		username=user
+		password=pass
 		EOF
-	
-ok 60 - get: ignore credentials without valid host/path as invalid
-
-expecting success of 0302.61 'get: ignore credentials without username/password as invalid': 
-		echo "$2" >"$HOME/.git-credentials" &&
-		check fill store <<-\EOF
+		sleep 2 &&
+		check fill "$HELPER" <<-\EOF
 		protocol=https
-		host=example.com
+		host=timeout.tld
 		--
 		protocol=https
-		host=example.com
+		host=timeout.tld
 		username=askpass-username
 		password=askpass-password
 		--
-		askpass: Username for 'https://example.com':
-		askpass: Password for 'https://askpass-username@example.com':
-		--
+		askpass: Username for 'https://timeout.tld':
+		askpass: Password for 'https://askpass-username@timeout.tld':
 		EOF
 	
-ok 61 - get: ignore credentials without username/password as invalid
-
-expecting success of 0302.62 'get: credentials with DOS line endings are invalid': 
-	printf "https://user:pass@example.com\r\n" >"$HOME/.git-credentials" &&
-	check fill store <<-\EOF
-	protocol=https
-	host=example.com
-	--
-	protocol=https
-	host=example.com
-	username=askpass-username
-	password=askpass-password
-	--
-	askpass: Username for 'https://example.com':
-	askpass: Password for 'https://askpass-username@example.com':
-	--
-	EOF
-
-ok 62 - get: credentials with DOS line endings are invalid
-
-expecting success of 0302.63 'get: credentials with path and DOS line endings are valid': 
-	printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" &&
-	check fill store <<-\EOF
-	url=https://example.com/repo.git
-	--
-	protocol=https
-	host=example.com
-	username=user
-	password=pass
-	--
-	EOF
-
-ok 63 - get: credentials with path and DOS line endings are valid
-
-expecting success of 0302.64 'get: credentials with DOS line endings are invalid if path is relevant': 
-	printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" &&
-	test_config credential.useHttpPath true &&
-	check fill store <<-\EOF
-	url=https://example.com/repo.git
-	--
-	protocol=https
-	host=example.com
-	path=repo.git
-	username=askpass-username
-	password=askpass-password
-	--
-	askpass: Username for 'https://example.com/repo.git':
-	askpass: Password for 'https://askpass-username@example.com/repo.git':
-	--
-	EOF
-
-ok 64 - get: credentials with DOS line endings are invalid if path is relevant
-
-expecting success of 0302.65 'get: store file can contain empty/bogus lines': 
-	echo "" >"$HOME/.git-credentials" &&
-	q_to_tab <<-\CREDENTIAL >>"$HOME/.git-credentials" &&
-	#comment
-	Q
-	https://user:pass@example.com
-	CREDENTIAL
-	check fill store <<-\EOF
-	protocol=https
-	host=example.com
-	--
-	protocol=https
-	host=example.com
-	username=user
-	password=pass
-	--
-	EOF
-
-ok 65 - get: store file can contain empty/bogus lines
-
-# passed all 65 test(s)
-1..65
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0411-clone-from-partial.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/.git/
-expecting success of 0411.1 'create evil repo': 
-	git init tmp &&
-	test_commit -C tmp a &&
-	git -C tmp config uploadpack.allowfilter 1 &&
-	git clone --filter=blob:none --no-local --no-checkout tmp evil &&
-	rm -rf tmp &&
-
-	git -C evil config remote.origin.uploadpack \"\$TRASH_DIRECTORY/fake-upload-pack\" &&
-	write_script fake-upload-pack <<-\EOF &&
-		echo >&2 "fake-upload-pack running"
-		>"$TRASH_DIRECTORY/script-executed"
-		exit 1
-	EOF
-	export TRASH_DIRECTORY &&
-
-	# empty shallow file disables local clone optimization
-	>evil/.git/shallow
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/tmp/.git/
-[master (root-commit) ce450c7] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-Cloning into 'evil'...
-ok 1 - create evil repo
-
-expecting success of 0411.2 'local clone must not fetch from promisor remote and execute script': 
-	rm -f script-executed &&
-	test_must_fail git clone \
-		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
-		evil clone1 2>err &&
-	test_grep "detected dubious ownership" err &&
-	test_grep ! "fake-upload-pack running" err &&
-	test_path_is_missing script-executed
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/evil/.git'
-ok 2 - local clone must not fetch from promisor remote and execute script
-
-expecting success of 0411.3 'clone from file://... must not fetch from promisor remote and execute script': 
-	rm -f script-executed &&
-	test_must_fail git clone \
-		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
-		"file://$(pwd)/evil" clone2 2>err &&
-	test_grep "detected dubious ownership" err &&
-	test_grep ! "fake-upload-pack running" err &&
-	test_path_is_missing script-executed
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/evil/.git'
-ok 3 - clone from file://... must not fetch from promisor remote and execute script
-
-expecting success of 0411.4 'fetch from file://... must not fetch from promisor remote and execute script': 
-	rm -f script-executed &&
-	test_must_fail git fetch \
-		--upload-pack="GIT_TEST_ASSUME_DIFFERENT_OWNER=true git-upload-pack" \
-		"file://$(pwd)/evil" 2>err &&
-	test_grep "detected dubious ownership" err &&
-	test_grep ! "fake-upload-pack running" err &&
-	test_path_is_missing script-executed
-
-fatal: detected dubious ownership in repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t0411-clone-from-partial/evil/.git'
-ok 4 - fetch from file://... must not fetch from promisor remote and execute script
-
-expecting success of 0411.5 'pack-objects should fetch from promisor remote and execute script': 
-	rm -f script-executed &&
-	echo "HEAD" | test_must_fail git -C evil pack-objects --revs --stdout >/dev/null 2>err &&
-	test_grep "fake-upload-pack running" err &&
-	test_path_is_file script-executed
-
-fake-upload-pack running
-ok 5 - pack-objects should fetch from promisor remote and execute script
-
-expecting success of 0411.6 'clone from promisor remote does not lazy-fetch by default': 
-	rm -f script-executed &&
-	test_must_fail git clone evil no-lazy 2>err &&
-	test_grep "lazy fetching disabled" err &&
-	test_path_is_missing script-executed
-
-remote: warning: lazy fetching disabled; some objects may not be available        
-ok 6 - clone from promisor remote does not lazy-fetch by default
-
-expecting success of 0411.7 'promisor lazy-fetching can be re-enabled': 
-	rm -f script-executed &&
-	test_must_fail env GIT_NO_LAZY_FETCH=0 \
-		git clone evil lazy-ok 2>err &&
-	test_grep "fake-upload-pack running" err &&
-	test_path_is_file script-executed
-
-remote: fake-upload-pack running        
-ok 7 - promisor lazy-fetching can be re-enabled
+ok 44 - helper (cache --timeout=1) times out
 
-# passed all 7 test(s)
-1..7
+# passed all 44 test(s)
+1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0303-credential-external.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0303-credential-external/.git/
-expecting success of 0303.1 'helper (store) has no existing data': 
+*** t0302-credential-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0302-credential-store/.git/
+expecting success of 0302.1 'helper (store) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35749,7 +35334,7 @@
 	
 ok 1 - helper (store) has no existing data
 
-expecting success of 0303.2 'helper (store) stores password': 
+expecting success of 0302.2 'helper (store) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35759,7 +35344,7 @@
 	
 ok 2 - helper (store) stores password
 
-expecting success of 0303.3 'helper (store) can retrieve password': 
+expecting success of 0302.3 'helper (store) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35773,7 +35358,7 @@
 	
 ok 3 - helper (store) can retrieve password
 
-expecting success of 0303.4 'helper (store) requires matching protocol': 
+expecting success of 0302.4 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -35789,7 +35374,7 @@
 	
 ok 4 - helper (store) requires matching protocol
 
-expecting success of 0303.5 'helper (store) requires matching host': 
+expecting success of 0302.5 'helper (store) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -35805,7 +35390,7 @@
 	
 ok 5 - helper (store) requires matching host
 
-expecting success of 0303.6 'helper (store) requires matching username': 
+expecting success of 0302.6 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -35821,7 +35406,7 @@
 	
 ok 6 - helper (store) requires matching username
 
-expecting success of 0303.7 'helper (store) requires matching path': 
+expecting success of 0302.7 'helper (store) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -35847,7 +35432,7 @@
 	
 ok 7 - helper (store) requires matching path
 
-expecting success of 0303.8 'helper (store) overwrites on store': 
+expecting success of 0302.8 'helper (store) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35891,7 +35476,7 @@
 	
 ok 8 - helper (store) overwrites on store
 
-expecting success of 0303.9 'helper (store) can forget host': 
+expecting success of 0302.9 'helper (store) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35911,7 +35496,7 @@
 	
 ok 9 - helper (store) can forget host
 
-expecting success of 0303.10 'helper (store) can store multiple users': 
+expecting success of 0302.10 'helper (store) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35947,7 +35532,7 @@
 	
 ok 10 - helper (store) can store multiple users
 
-expecting success of 0303.11 'helper (store) does not erase a password distinct from input': 
+expecting success of 0302.11 'helper (store) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35973,7 +35558,7 @@
 	
 ok 11 - helper (store) does not erase a password distinct from input
 
-expecting success of 0303.12 'helper (store) can forget user': 
+expecting success of 0302.12 'helper (store) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -35994,7 +35579,7 @@
 	
 ok 12 - helper (store) can forget user
 
-expecting success of 0303.13 'helper (store) remembers other user': 
+expecting success of 0302.13 'helper (store) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36008,7 +35593,7 @@
 	
 ok 13 - helper (store) remembers other user
 
-expecting success of 0303.14 'helper (store) can store empty username': 
+expecting success of 0302.14 'helper (store) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -36027,7 +35612,7 @@
 	
 ok 14 - helper (store) can store empty username
 
-expecting success of 0303.15 'helper (store) erases all matching credentials': 
+expecting success of 0302.15 'helper (store) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36059,7 +35644,7 @@
 	
 ok 15 - helper (store) erases all matching credentials
 
-expecting success of 0303.16 'helper (store) not confused by long header': 
+expecting success of 0302.16 'helper (store) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -36084,538 +35669,20 @@
 	
 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0500-progress-display.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0500-progress-display/.git/
-expecting success of 0500.1 'simple progress display': 
-	cat >expect <<-\EOF &&
-	Working hard: 1<CR>
-	Working hard: 2<CR>
-	Working hard: 5<CR>
-	Working hard: 5, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 0
-	update
-	progress 1
-	update
-	progress 2
-	progress 3
-	progress 4
-	update
-	progress 5
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 1 - simple progress display
-
-expecting success of 0500.2 'progress display with total': 
-	cat >expect <<-\EOF &&
-	Working hard:  33% (1/3)<CR>
-	Working hard:  66% (2/3)<CR>
-	Working hard: 100% (3/3)<CR>
-	Working hard: 100% (3/3), done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 3
-	progress 1
-	progress 2
-	progress 3
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 2 - progress display with total
-
-expecting success of 0500.3 'progress display breaks long lines #1': 
-	sed -e "s/Z$//" >expect <<\EOF &&
-Working hard.......2.........3.........4.........5.........6:   0% (100/100000)<CR>
-Working hard.......2.........3.........4.........5.........6:   1% (1000/100000)<CR>
-Working hard.......2.........3.........4.........5.........6:                   Z
-   10% (10000/100000)<CR>
-  100% (100000/100000)<CR>
-  100% (100000/100000), done.
-EOF
-
-	cat >in <<-\EOF &&
-	start 100000 Working hard.......2.........3.........4.........5.........6
-	progress 100
-	progress 1000
-	progress 10000
-	progress 100000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 3 - progress display breaks long lines #1
-
-expecting success of 0500.4 'progress display breaks long lines #2': 
-	# Note: we do not need that many spaces after the title to cover up
-	# the last line before breaking the progress line.
-	sed -e "s/Z$//" >expect <<\EOF &&
-Working hard.......2.........3.........4.........5.........6:   0% (1/100000)<CR>
-Working hard.......2.........3.........4.........5.........6:   0% (2/100000)<CR>
-Working hard.......2.........3.........4.........5.........6:                   Z
-   10% (10000/100000)<CR>
-  100% (100000/100000)<CR>
-  100% (100000/100000), done.
-EOF
-
-	cat >in <<-\EOF &&
-	start 100000 Working hard.......2.........3.........4.........5.........6
-	update
-	progress 1
-	update
-	progress 2
-	progress 10000
-	progress 100000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 4 - progress display breaks long lines #2
-
-expecting success of 0500.5 'progress display breaks long lines #3 - even the first is too long': 
-	# Note: we do not actually need any spaces at the end of the title
-	# line, because there is no previous progress line to cover up.
-	sed -e "s/Z$//" >expect <<\EOF &&
-Working hard.......2.........3.........4.........5.........6:                   Z
-   25% (25000/100000)<CR>
-   50% (50000/100000)<CR>
-   75% (75000/100000)<CR>
-  100% (100000/100000)<CR>
-  100% (100000/100000), done.
-EOF
-
-	cat >in <<-\EOF &&
-	start 100000 Working hard.......2.........3.........4.........5.........6
-	progress 25000
-	progress 50000
-	progress 75000
-	progress 100000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 5 - progress display breaks long lines #3 - even the first is too long
-
-expecting success of 0500.6 'progress display breaks long lines #4 - title line matches terminal width': 
-	cat >expect <<\EOF &&
-Working hard.......2.........3.........4.........5.........6.........7.........:
-   25% (25000/100000)<CR>
-   50% (50000/100000)<CR>
-   75% (75000/100000)<CR>
-  100% (100000/100000)<CR>
-  100% (100000/100000), done.
-EOF
-
-	cat >in <<-\EOF &&
-	start 100000 Working hard.......2.........3.........4.........5.........6.........7.........
-	progress 25000
-	progress 50000
-	progress 75000
-	progress 100000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 6 - progress display breaks long lines #4 - title line matches terminal width
-
-expecting success of 0500.7 'progress shortens - crazy caller': 
-	cat >expect <<-\EOF &&
-	Working hard:  10% (100/1000)<CR>
-	Working hard:  20% (200/1000)<CR>
-	Working hard:   0% (1/1000)  <CR>
-	Working hard: 100% (1000/1000)<CR>
-	Working hard: 100% (1000/1000), done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 1000
-	progress 100
-	progress 200
-	progress 1
-	progress 1000
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 7 - progress shortens - crazy caller
-
-expecting success of 0500.8 'progress display with throughput': 
-	cat >expect <<-\EOF &&
-	Working hard: 10<CR>
-	Working hard: 20, 200.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 30, 300.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 40, 400.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 40, 400.00 KiB | 100.00 KiB/s, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 0
-	throughput 102400 1000
-	update
-	progress 10
-	throughput 204800 2000
-	update
-	progress 20
-	throughput 307200 3000
-	update
-	progress 30
-	throughput 409600 4000
-	update
-	progress 40
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 8 - progress display with throughput
-
-expecting success of 0500.9 'progress display with throughput and total': 
-	cat >expect <<-\EOF &&
-	Working hard:  25% (10/40)<CR>
-	Working hard:  50% (20/40), 200.00 KiB | 100.00 KiB/s<CR>
-	Working hard:  75% (30/40), 300.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s<CR>
-	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 40
-	throughput 102400 1000
-	progress 10
-	throughput 204800 2000
-	progress 20
-	throughput 307200 3000
-	progress 30
-	throughput 409600 4000
-	progress 40
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 9 - progress display with throughput and total
-
-expecting success of 0500.10 'cover up after throughput shortens': 
-	cat >expect <<-\EOF &&
-	Working hard: 1<CR>
-	Working hard: 2, 800.00 KiB | 400.00 KiB/s<CR>
-	Working hard: 3, 1.17 MiB | 400.00 KiB/s  <CR>
-	Working hard: 4, 1.56 MiB | 400.00 KiB/s<CR>
-	Working hard: 4, 1.56 MiB | 400.00 KiB/s, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 0
-	throughput 409600 1000
-	update
-	progress 1
-	throughput 819200 2000
-	update
-	progress 2
-	throughput 1228800 3000
-	update
-	progress 3
-	throughput 1638400 4000
-	update
-	progress 4
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 10 - cover up after throughput shortens
-
-expecting success of 0500.11 'cover up after throughput shortens a lot': 
-	cat >expect <<-\EOF &&
-	Working hard: 1<CR>
-	Working hard: 2, 1000.00 KiB | 1000.00 KiB/s<CR>
-	Working hard: 3, 3.00 MiB | 1.50 MiB/s      <CR>
-	Working hard: 3, 3.00 MiB | 1024.00 KiB/s, done.
-	EOF
-
-	cat >in <<-\EOF &&
-	start 0
-	throughput 1 1000
-	update
-	progress 1
-	throughput 1024000 2000
-	update
-	progress 2
-	throughput 3145728 3000
-	update
-	progress 3
-	stop
-	EOF
-	test-tool progress <in 2>stderr &&
-
-	show_cr <stderr >out &&
-	test_cmp expect out
-
-ok 11 - cover up after throughput shortens a lot
-
-expecting success of 0500.12 'progress generates traces': 
-	cat >in <<-\EOF &&
-	start 40
-	throughput 102400 1000
-	update
-	progress 10
-	throughput 204800 2000
-	update
-	progress 20
-	throughput 307200 3000
-	update
-	progress 30
-	throughput 409600 4000
-	update
-	progress 40
-	stop
-	EOF
-
-	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress \
-		<in 2>stderr &&
-
-	# t0212/parse_events.perl intentionally omits regions and data.
-	test_region progress "Working hard" trace.event &&
-	grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
-	grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
-
-{"event":"region_enter","sid":"20251218T013231.789036Z-Hfbad846e-P00002d32","thread":"main","time":"2025-12-18T01:32:31.789561Z","file":"progress.c","line":270,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20251218T013231.789036Z-Hfbad846e-P00002d32","thread":"main","time":"2025-12-18T01:32:31.789611Z","file":"progress.c","line":348,"repo":0,"t_rel":0.000050,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"data","sid":"20251218T013231.789036Z-Hfbad846e-P00002d32","thread":"main","time":"2025-12-18T01:32:31.789597Z","file":"progress.c","line":341,"repo":0,"t_abs":0.000728,"t_rel":0.000035,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
-{"event":"data","sid":"20251218T013231.789036Z-Hfbad846e-P00002d32","thread":"main","time":"2025-12-18T01:32:31.789605Z","file":"progress.c","line":345,"repo":0,"t_abs":0.000737,"t_rel":0.000044,"nesting":2,"category":"progress","key":"total_bytes","value":"409600"}
-ok 12 - progress generates traces
-
-expecting success of 0500.13 'progress generates traces: stop / start': 
-	cat >in <<-\EOF &&
-	start 0
-	stop
-	EOF
-
-	GIT_TRACE2_EVENT="$PWD/trace-startstop.event" test-tool progress \
-		<in 2>stderr &&
-	test_region progress "Working hard" trace-startstop.event
-
-{"event":"region_enter","sid":"20251218T013231.798067Z-Hfbad846e-P00002d52","thread":"main","time":"2025-12-18T01:32:31.798522Z","file":"progress.c","line":270,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-{"event":"region_leave","sid":"20251218T013231.798067Z-Hfbad846e-P00002d52","thread":"main","time":"2025-12-18T01:32:31.798538Z","file":"progress.c","line":348,"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': 
-	cat >in <<-\EOF &&
-	start 0
-	EOF
-
-	GIT_TRACE2_EVENT="$PWD/trace-start.event" \
-	LSAN_OPTIONS=detect_leaks=0 \
-	test-tool progress \
-		<in 2>stderr &&
-	grep region_enter.*progress trace-start.event &&
-	! grep region_leave.*progress trace-start.event
-
-{"event":"region_enter","sid":"20251218T013231.805236Z-Hfbad846e-P00002d6e","thread":"main","time":"2025-12-18T01:32:31.805749Z","file":"progress.c","line":270,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
-ok 14 - progress generates traces: start without stop
-
-expecting success of 0500.15 'progress generates traces: stop without start': 
-	cat >in <<-\EOF &&
-	stop
-	EOF
-
-	GIT_TRACE2_EVENT="$PWD/trace-stop.event" test-tool progress \
-		<in 2>stderr &&
-	! grep region_enter.*progress trace-stop.event &&
-	! grep region_leave.*progress trace-stop.event
-
-ok 15 - progress generates traces: stop without start
+expecting success of 0302.17 'when xdg file does not exist, xdg file not created': 
+	test_path_is_missing "$HOME/.config/git/credentials" &&
+	test -s "$HOME/.git-credentials"
 
-expecting success of 0500.16 'progress generates traces: start with active progress bar (no stops)': 
-	cat >in <<-\EOF &&
-	start 0 One
-	start 0 Two
-	EOF
+ok 17 - when xdg file does not exist, xdg file not created
 
-	GIT_TRACE2_EVENT="$PWD/trace-2start.event" \
-	LSAN_OPTIONS=detect_leaks=0 \
-	test-tool progress \
-		<in 2>stderr &&
-	grep region_enter.*progress.*One trace-2start.event &&
-	grep region_enter.*progress.*Two trace-2start.event &&
-	! grep region_leave trace-2start.event
+expecting success of 0302.18 'setup xdg file': 
+	rm -f "$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	>"$HOME/.config/git/credentials"
 
-{"event":"region_enter","sid":"20251218T013231.818280Z-Hfbad846e-P00002da2","thread":"main","time":"2025-12-18T01:32:31.819094Z","file":"progress.c","line":270,"repo":0,"nesting":1,"category":"progress","label":"One"}
-{"event":"region_enter","sid":"20251218T013231.818280Z-Hfbad846e-P00002da2","thread":"main","time":"2025-12-18T01:32:31.819102Z","file":"progress.c","line":270,"repo":0,"nesting":2,"category":"progress","label":"Two"}
-ok 16 - progress generates traces: start with active progress bar (no stops)
+ok 18 - setup xdg file
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0301-credential-cache.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0301-credential-cache/.git/
-expecting success of 0301.1 'helper (cache) has no existing data': 
+expecting success of 0302.19 'helper (store) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36629,9 +35696,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 1 - helper (cache) has no existing data
+ok 19 - helper (store) has no existing data
 
-expecting success of 0301.2 'helper (cache) stores password': 
+expecting success of 0302.20 'helper (store) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36639,9 +35706,9 @@
 		password=store-pass
 		EOF
 	
-ok 2 - helper (cache) stores password
+ok 20 - helper (store) stores password
 
-expecting success of 0301.3 'helper (cache) can retrieve password': 
+expecting success of 0302.21 'helper (store) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36653,9 +35720,9 @@
 		--
 		EOF
 	
-ok 3 - helper (cache) can retrieve password
+ok 21 - helper (store) can retrieve password
 
-expecting success of 0301.4 'helper (cache) requires matching protocol': 
+expecting success of 0302.22 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -36669,9 +35736,9 @@
 		askpass: Password for 'http://askpass-username@example.com':
 		EOF
 	
-ok 4 - helper (cache) requires matching protocol
+ok 22 - helper (store) requires matching protocol
 
-expecting success of 0301.5 'helper (cache) requires matching host': 
+expecting success of 0302.23 'helper (store) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -36685,9 +35752,9 @@
 		askpass: Password for 'https://askpass-username@other.tld':
 		EOF
 	
-ok 5 - helper (cache) requires matching host
+ok 23 - helper (store) requires matching host
 
-expecting success of 0301.6 'helper (cache) requires matching username': 
+expecting success of 0302.24 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36701,9 +35768,9 @@
 		askpass: Password for 'https://other@example.com':
 		EOF
 	
-ok 6 - helper (cache) requires matching username
+ok 24 - helper (store) requires matching username
 
-expecting success of 0301.7 'helper (cache) requires matching path': 
+expecting success of 0302.25 'helper (store) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -36727,9 +35794,9 @@
 		askpass: Password for 'http://askpass-username@path.tld/bar.git':
 		EOF
 	
-ok 7 - helper (cache) requires matching path
+ok 25 - helper (store) requires matching path
 
-expecting success of 0301.8 'helper (cache) overwrites on store': 
+expecting success of 0302.26 'helper (store) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36771,9 +35838,9 @@
 		askpass: Password for 'https://user-overwrite@example.com':
 		EOF
 	
-ok 8 - helper (cache) overwrites on store
+ok 26 - helper (store) overwrites on store
 
-expecting success of 0301.9 'helper (cache) can forget host': 
+expecting success of 0302.27 'helper (store) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36791,9 +35858,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 9 - helper (cache) can forget host
+ok 27 - helper (store) can forget host
 
-expecting success of 0301.10 'helper (cache) can store multiple users': 
+expecting success of 0302.28 'helper (store) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36827,9 +35894,9 @@
 		password=pass2
 		EOF
 	
-ok 10 - helper (cache) can store multiple users
+ok 28 - helper (store) can store multiple users
 
-expecting success of 0301.11 'helper (cache) does not erase a password distinct from input': 
+expecting success of 0302.29 'helper (store) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36853,9 +35920,9 @@
 		password=pass1
 		EOF
 	
-ok 11 - helper (cache) does not erase a password distinct from input
+ok 29 - helper (store) does not erase a password distinct from input
 
-expecting success of 0301.12 'helper (cache) can forget user': 
+expecting success of 0302.30 'helper (store) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36874,9 +35941,9 @@
 		askpass: Password for 'https://user1@example.com':
 		EOF
 	
-ok 12 - helper (cache) can forget user
+ok 30 - helper (store) can forget user
 
-expecting success of 0301.13 'helper (cache) remembers other user': 
+expecting success of 0302.31 'helper (store) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -36888,9 +35955,9 @@
 		password=pass2
 		EOF
 	
-ok 13 - helper (cache) remembers other user
+ok 31 - helper (store) remembers other user
 
-expecting success of 0301.14 'helper (cache) can store empty username': 
+expecting success of 0302.32 'helper (store) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -36907,9 +35974,9 @@
 		password=
 		EOF
 	
-ok 14 - helper (cache) can store empty username
+ok 32 - helper (store) can store empty username
 
-expecting success of 0301.15 'helper (cache) erases all matching credentials': 
+expecting success of 0302.33 'helper (store) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -36939,9 +36006,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 15 - helper (cache) erases all matching credentials
+ok 33 - helper (store) erases all matching credentials
 
-expecting success of 0301.16 'helper (cache) not confused by long header': 
+expecting success of 0302.34 'helper (store) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -36964,120 +36031,23 @@
 		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
+ok 34 - helper (store) not confused by long header
 
-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 0302.35 'when xdg file exists, home file not created': 
+	test -s "$HOME/.config/git/credentials" &&
+	test_path_is_missing "$HOME/.git-credentials"
 
-expecting success of 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
+ok 35 - when xdg file exists, home file not created
 
-expecting success of 0301.22 'socket defaults to ~/.cache/git/credential/socket': 
-	test_when_finished "
-		git credential-cache exit &&
-		rmdir -p .cache/git/credential/
-	" &&
-	test_path_is_missing "$HOME/.git-credential-cache" &&
-	test_path_is_socket "$HOME/.cache/git/credential/socket"
+expecting success of 0302.36 'setup custom xdg file': 
+	rm -f "$HOME/.git-credentials" &&
+	rm -f "$HOME/.config/git/credentials" &&
+	mkdir -p "$HOME/xdg/git" &&
+	>"$HOME/xdg/git/credentials"
 
-ok 22 - socket defaults to ~/.cache/git/credential/socket
+ok 36 - setup custom xdg file
 
-expecting success of 0301.23 'helper (cache) has no existing data': 
+expecting success of 0302.37 'helper (store) has no existing data': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -37091,9 +36061,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 23 - helper (cache) has no existing data
+ok 37 - helper (store) has no existing data
 
-expecting success of 0301.24 'helper (cache) stores password': 
+expecting success of 0302.38 'helper (store) stores password': 
 		check approve $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -37101,9 +36071,9 @@
 		password=store-pass
 		EOF
 	
-ok 24 - helper (cache) stores password
+ok 38 - helper (store) stores password
 
-expecting success of 0301.25 'helper (cache) can retrieve password': 
+expecting success of 0302.39 'helper (store) can retrieve password': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -37115,9 +36085,9 @@
 		--
 		EOF
 	
-ok 25 - helper (cache) can retrieve password
+ok 39 - helper (store) can retrieve password
 
-expecting success of 0301.26 'helper (cache) requires matching protocol': 
+expecting success of 0302.40 'helper (store) requires matching protocol': 
 		check fill $HELPER <<-\EOF
 		protocol=http
 		host=example.com
@@ -37131,9 +36101,9 @@
 		askpass: Password for 'http://askpass-username@example.com':
 		EOF
 	
-ok 26 - helper (cache) requires matching protocol
+ok 40 - helper (store) requires matching protocol
 
-expecting success of 0301.27 'helper (cache) requires matching host': 
+expecting success of 0302.41 'helper (store) requires matching host': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=other.tld
@@ -37147,9 +36117,9 @@
 		askpass: Password for 'https://askpass-username@other.tld':
 		EOF
 	
-ok 27 - helper (cache) requires matching host
+ok 41 - helper (store) requires matching host
 
-expecting success of 0301.28 'helper (cache) requires matching username': 
+expecting success of 0302.42 'helper (store) requires matching username': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -37163,9 +36133,9 @@
 		askpass: Password for 'https://other@example.com':
 		EOF
 	
-ok 28 - helper (cache) requires matching username
+ok 42 - helper (store) requires matching username
 
-expecting success of 0301.29 'helper (cache) requires matching path': 
+expecting success of 0302.43 'helper (store) requires matching path': 
 		test_config credential.usehttppath true &&
 		check approve $HELPER <<-\EOF &&
 		protocol=http
@@ -37189,9 +36159,9 @@
 		askpass: Password for 'http://askpass-username@path.tld/bar.git':
 		EOF
 	
-ok 29 - helper (cache) requires matching path
+ok 43 - helper (store) requires matching path
 
-expecting success of 0301.30 'helper (cache) overwrites on store': 
+expecting success of 0302.44 'helper (store) overwrites on store': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -37233,9 +36203,9 @@
 		askpass: Password for 'https://user-overwrite@example.com':
 		EOF
 	
-ok 30 - helper (cache) overwrites on store
+ok 44 - helper (store) overwrites on store
 
-expecting success of 0301.31 'helper (cache) can forget host': 
+expecting success of 0302.45 'helper (store) can forget host': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -37253,9 +36223,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 31 - helper (cache) can forget host
+ok 45 - helper (store) can forget host
 
-expecting success of 0301.32 'helper (cache) can store multiple users': 
+expecting success of 0302.46 'helper (store) can store multiple users': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -37289,9 +36259,9 @@
 		password=pass2
 		EOF
 	
-ok 32 - helper (cache) can store multiple users
+ok 46 - helper (store) can store multiple users
 
-expecting success of 0301.33 'helper (cache) does not erase a password distinct from input': 
+expecting success of 0302.47 'helper (store) does not erase a password distinct from input': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -37315,9 +36285,9 @@
 		password=pass1
 		EOF
 	
-ok 33 - helper (cache) does not erase a password distinct from input
+ok 47 - helper (store) does not erase a password distinct from input
 
-expecting success of 0301.34 'helper (cache) can forget user': 
+expecting success of 0302.48 'helper (store) can forget user': 
 		check reject $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -37336,9 +36306,9 @@
 		askpass: Password for 'https://user1@example.com':
 		EOF
 	
-ok 34 - helper (cache) can forget user
+ok 48 - helper (store) can forget user
 
-expecting success of 0301.35 'helper (cache) remembers other user': 
+expecting success of 0302.49 'helper (store) remembers other user': 
 		check fill $HELPER <<-\EOF
 		protocol=https
 		host=example.com
@@ -37350,9 +36320,9 @@
 		password=pass2
 		EOF
 	
-ok 35 - helper (cache) remembers other user
+ok 49 - helper (store) remembers other user
 
-expecting success of 0301.36 'helper (cache) can store empty username': 
+expecting success of 0302.50 'helper (store) can store empty username': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=sso.tld
@@ -37369,9 +36339,9 @@
 		password=
 		EOF
 	
-ok 36 - helper (cache) can store empty username
+ok 50 - helper (store) can store empty username
 
-expecting success of 0301.37 'helper (cache) erases all matching credentials': 
+expecting success of 0302.51 'helper (store) erases all matching credentials': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=example.com
@@ -37401,9 +36371,9 @@
 		askpass: Password for 'https://askpass-username@example.com':
 		EOF
 	
-ok 37 - helper (cache) erases all matching credentials
+ok 51 - helper (store) erases all matching credentials
 
-expecting success of 0301.38 'helper (cache) not confused by long header': 
+expecting success of 0302.52 'helper (store) not confused by long header': 
 		check approve $HELPER <<-\EOF &&
 		protocol=https
 		host=victim.example.com
@@ -37426,125 +36396,1723 @@
 		askpass: Password for 'https://askpass-username@badguy.example.com':
 		EOF
 	
-ok 38 - helper (cache) not confused by long header
+ok 52 - helper (store) not confused by long header
 
-expecting success of 0301.39 '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"
+expecting success of 0302.53 'if custom xdg file exists, home and xdg files not created': 
+	test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
+	test -s "$HOME/xdg/git/credentials" &&
+	test_path_is_missing "$HOME/.git-credentials" &&
+	test_path_is_missing "$HOME/.config/git/credentials"
 
-ok 39 - use custom XDG_CACHE_HOME if set and default sockets are not created
+ok 53 - if custom xdg file exists, home and xdg files not created
 
-expecting success of 0301.40 '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 &&
+expecting success of 0302.54 'get: use home file if both home and xdg files have matches': 
+	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
+	check fill store <<-\EOF
 	protocol=https
 	host=example.com
-	username=store-user
-	password=store-pass
+	--
+	protocol=https
+	host=example.com
+	username=home-user
+	password=home-pass
+	--
 	EOF
-	test_path_is_socket "$HOME/dir/socket"
 
-ok 40 - credential-cache --socket option overrides default location
+ok 54 - get: use home file if both home and xdg files have matches
 
-expecting success of 0301.41 '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 &&
+expecting success of 0302.55 'get: use xdg file if home file has no matches': 
+	>"$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
+	check fill store <<-\EOF
 	protocol=https
 	host=example.com
-	username=store-user
-	password=store-pass
+	--
+	protocol=https
+	host=example.com
+	username=xdg-user
+	password=xdg-pass
+	--
 	EOF
-	test_path_is_socket "$HOME/.cache/git/credential/socket" &&
-	XDG_CACHE_HOME="$HOME/xdg" &&
-	export XDG_CACHE_HOME &&
-	check approve cache <<-\EOF &&
+
+ok 55 - get: use xdg file if home file has no matches
+
+checking prerequisite: SANITY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
+
+	chmod +w SANETESTD.1 SANETESTD.2 &&
+	>SANETESTD.1/x 2>SANETESTD.2/x &&
+	chmod -w SANETESTD.1 &&
+	chmod -r SANETESTD.1/x &&
+	chmod -rx SANETESTD.2 ||
+	BUG "cannot prepare SANETESTD"
+
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
+
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
+
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 0302.56 'get: use xdg file if home file is unreadable': 
+	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
+	chmod -r "$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
+	check fill store <<-\EOF
 	protocol=https
 	host=example.com
-	username=store-user
-	password=store-pass
+	--
+	protocol=https
+	host=example.com
+	username=xdg-user
+	password=xdg-pass
+	--
 	EOF
-	test_path_is_socket "$XDG_CACHE_HOME/git/credential/socket"
 
-ok 41 - use custom XDG_CACHE_HOME even if xdg socket exists
+ok 56 - get: use xdg file if home file is unreadable
 
-expecting success of 0301.42 '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 &&
+expecting success of 0302.57 'store: if both xdg and home files exist, only store in home file': 
+	>"$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	>"$HOME/.config/git/credentials" &&
+	check approve store <<-\EOF &&
 	protocol=https
 	host=example.com
 	username=store-user
 	password=store-pass
 	EOF
-	test_path_is_socket "$HOME/.git-credential-cache/socket"
-
-ok 42 - use user socket if user directory exists
-
-checking prerequisite: SYMLINKS
+	echo "https://store-user:store-pass@example.com" >expected &&
+	test_cmp expected "$HOME/.git-credentials" &&
+	test_must_be_empty "$HOME/.config/git/credentials"
 
-mkdir -p "$TRASH_DIRECTORY/prereq-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 57 - store: if both xdg and home files exist, only store in home file
 
-)
-prerequisite SYMLINKS ok
-expecting success of 0301.43 '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 &&
+expecting success of 0302.58 'erase: erase matching credentials from both xdg and home files': 
+	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
+	mkdir -p "$HOME/.config/git" &&
+	echo "https://xdg-user:xdg-pass@example.com" >"$HOME/.config/git/credentials" &&
+	check reject store <<-\EOF &&
 	protocol=https
 	host=example.com
-	username=store-user
-	password=store-pass
 	EOF
-	test_path_is_socket "$HOME/.git-credential-cache/socket"
+	test_must_be_empty "$HOME/.git-credentials" &&
+	test_must_be_empty "$HOME/.config/git/credentials"
 
-ok 43 - use user socket if user directory is a symlink to a directory
+ok 58 - erase: erase matching credentials from both xdg and home files
 
-expecting success of 0301.44 'helper (cache --timeout=1) times out': 
-		check approve "$HELPER" <<-\EOF &&
+expecting success of 0302.59 'get: ignore credentials without scheme as invalid': 
+		echo "$2" >"$HOME/.git-credentials" &&
+		check fill store <<-\EOF
 		protocol=https
-		host=timeout.tld
-		username=user
-		password=pass
+		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
-		sleep 2 &&
-		check fill "$HELPER" <<-\EOF
+	
+ok 59 - get: ignore credentials without scheme as invalid
+
+expecting success of 0302.60 'get: ignore credentials without valid host/path as invalid': 
+		echo "$2" >"$HOME/.git-credentials" &&
+		check fill store <<-\EOF
 		protocol=https
-		host=timeout.tld
+		host=example.com
 		--
 		protocol=https
-		host=timeout.tld
+		host=example.com
 		username=askpass-username
 		password=askpass-password
 		--
-		askpass: Username for 'https://timeout.tld':
-		askpass: Password for 'https://askpass-username@timeout.tld':
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		--
 		EOF
 	
-ok 44 - helper (cache --timeout=1) times out
+ok 60 - get: ignore credentials without valid host/path as invalid
 
-# passed all 44 test(s)
-1..44
+expecting success of 0302.61 'get: ignore credentials without username/password as invalid': 
+		echo "$2" >"$HOME/.git-credentials" &&
+		check fill store <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for 'https://example.com':
+		askpass: Password for 'https://askpass-username@example.com':
+		--
+		EOF
+	
+ok 61 - get: ignore credentials without username/password as invalid
+
+expecting success of 0302.62 'get: credentials with DOS line endings are invalid': 
+	printf "https://user:pass@example.com\r\n" >"$HOME/.git-credentials" &&
+	check fill store <<-\EOF
+	protocol=https
+	host=example.com
+	--
+	protocol=https
+	host=example.com
+	username=askpass-username
+	password=askpass-password
+	--
+	askpass: Username for 'https://example.com':
+	askpass: Password for 'https://askpass-username@example.com':
+	--
+	EOF
+
+ok 62 - get: credentials with DOS line endings are invalid
+
+expecting success of 0302.63 'get: credentials with path and DOS line endings are valid': 
+	printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" &&
+	check fill store <<-\EOF
+	url=https://example.com/repo.git
+	--
+	protocol=https
+	host=example.com
+	username=user
+	password=pass
+	--
+	EOF
+
+ok 63 - get: credentials with path and DOS line endings are valid
+
+expecting success of 0302.64 'get: credentials with DOS line endings are invalid if path is relevant': 
+	printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" &&
+	test_config credential.useHttpPath true &&
+	check fill store <<-\EOF
+	url=https://example.com/repo.git
+	--
+	protocol=https
+	host=example.com
+	path=repo.git
+	username=askpass-username
+	password=askpass-password
+	--
+	askpass: Username for 'https://example.com/repo.git':
+	askpass: Password for 'https://askpass-username@example.com/repo.git':
+	--
+	EOF
+
+ok 64 - get: credentials with DOS line endings are invalid if path is relevant
+
+expecting success of 0302.65 'get: store file can contain empty/bogus lines': 
+	echo "" >"$HOME/.git-credentials" &&
+	q_to_tab <<-\CREDENTIAL >>"$HOME/.git-credentials" &&
+	#comment
+	Q
+	https://user:pass@example.com
+	CREDENTIAL
+	check fill store <<-\EOF
+	protocol=https
+	host=example.com
+	--
+	protocol=https
+	host=example.com
+	username=user
+	password=pass
+	--
+	EOF
+
+ok 65 - get: store file can contain empty/bogus lines
+
+# passed all 65 test(s)
+1..65
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0500-progress-display.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0500-progress-display/.git/
+expecting success of 0500.1 'simple progress display': 
+	cat >expect <<-\EOF &&
+	Working hard: 1<CR>
+	Working hard: 2<CR>
+	Working hard: 5<CR>
+	Working hard: 5, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 0
+	update
+	progress 1
+	update
+	progress 2
+	progress 3
+	progress 4
+	update
+	progress 5
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 1 - simple progress display
+
+expecting success of 0500.2 'progress display with total': 
+	cat >expect <<-\EOF &&
+	Working hard:  33% (1/3)<CR>
+	Working hard:  66% (2/3)<CR>
+	Working hard: 100% (3/3)<CR>
+	Working hard: 100% (3/3), done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 3
+	progress 1
+	progress 2
+	progress 3
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 2 - progress display with total
+
+expecting success of 0500.3 'progress display breaks long lines #1': 
+	sed -e "s/Z$//" >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6:   0% (100/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:   1% (1000/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:                   Z
+   10% (10000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	start 100000 Working hard.......2.........3.........4.........5.........6
+	progress 100
+	progress 1000
+	progress 10000
+	progress 100000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 3 - progress display breaks long lines #1
+
+expecting success of 0500.4 'progress display breaks long lines #2': 
+	# Note: we do not need that many spaces after the title to cover up
+	# the last line before breaking the progress line.
+	sed -e "s/Z$//" >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6:   0% (1/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:   0% (2/100000)<CR>
+Working hard.......2.........3.........4.........5.........6:                   Z
+   10% (10000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	start 100000 Working hard.......2.........3.........4.........5.........6
+	update
+	progress 1
+	update
+	progress 2
+	progress 10000
+	progress 100000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 4 - progress display breaks long lines #2
+
+expecting success of 0500.5 'progress display breaks long lines #3 - even the first is too long': 
+	# Note: we do not actually need any spaces at the end of the title
+	# line, because there is no previous progress line to cover up.
+	sed -e "s/Z$//" >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6:                   Z
+   25% (25000/100000)<CR>
+   50% (50000/100000)<CR>
+   75% (75000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	start 100000 Working hard.......2.........3.........4.........5.........6
+	progress 25000
+	progress 50000
+	progress 75000
+	progress 100000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 5 - progress display breaks long lines #3 - even the first is too long
+
+expecting success of 0500.6 'progress display breaks long lines #4 - title line matches terminal width': 
+	cat >expect <<\EOF &&
+Working hard.......2.........3.........4.........5.........6.........7.........:
+   25% (25000/100000)<CR>
+   50% (50000/100000)<CR>
+   75% (75000/100000)<CR>
+  100% (100000/100000)<CR>
+  100% (100000/100000), done.
+EOF
+
+	cat >in <<-\EOF &&
+	start 100000 Working hard.......2.........3.........4.........5.........6.........7.........
+	progress 25000
+	progress 50000
+	progress 75000
+	progress 100000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 6 - progress display breaks long lines #4 - title line matches terminal width
+
+expecting success of 0500.7 'progress shortens - crazy caller': 
+	cat >expect <<-\EOF &&
+	Working hard:  10% (100/1000)<CR>
+	Working hard:  20% (200/1000)<CR>
+	Working hard:   0% (1/1000)  <CR>
+	Working hard: 100% (1000/1000)<CR>
+	Working hard: 100% (1000/1000), done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 1000
+	progress 100
+	progress 200
+	progress 1
+	progress 1000
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 7 - progress shortens - crazy caller
+
+expecting success of 0500.8 'progress display with throughput': 
+	cat >expect <<-\EOF &&
+	Working hard: 10<CR>
+	Working hard: 20, 200.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 30, 300.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 40, 400.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 40, 400.00 KiB | 100.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 0
+	throughput 102400 1000
+	update
+	progress 10
+	throughput 204800 2000
+	update
+	progress 20
+	throughput 307200 3000
+	update
+	progress 30
+	throughput 409600 4000
+	update
+	progress 40
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 8 - progress display with throughput
+
+expecting success of 0500.9 'progress display with throughput and total': 
+	cat >expect <<-\EOF &&
+	Working hard:  25% (10/40)<CR>
+	Working hard:  50% (20/40), 200.00 KiB | 100.00 KiB/s<CR>
+	Working hard:  75% (30/40), 300.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s<CR>
+	Working hard: 100% (40/40), 400.00 KiB | 100.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 40
+	throughput 102400 1000
+	progress 10
+	throughput 204800 2000
+	progress 20
+	throughput 307200 3000
+	progress 30
+	throughput 409600 4000
+	progress 40
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 9 - progress display with throughput and total
+
+expecting success of 0500.10 'cover up after throughput shortens': 
+	cat >expect <<-\EOF &&
+	Working hard: 1<CR>
+	Working hard: 2, 800.00 KiB | 400.00 KiB/s<CR>
+	Working hard: 3, 1.17 MiB | 400.00 KiB/s  <CR>
+	Working hard: 4, 1.56 MiB | 400.00 KiB/s<CR>
+	Working hard: 4, 1.56 MiB | 400.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 0
+	throughput 409600 1000
+	update
+	progress 1
+	throughput 819200 2000
+	update
+	progress 2
+	throughput 1228800 3000
+	update
+	progress 3
+	throughput 1638400 4000
+	update
+	progress 4
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 10 - cover up after throughput shortens
+
+expecting success of 0500.11 'cover up after throughput shortens a lot': 
+	cat >expect <<-\EOF &&
+	Working hard: 1<CR>
+	Working hard: 2, 1000.00 KiB | 1000.00 KiB/s<CR>
+	Working hard: 3, 3.00 MiB | 1.50 MiB/s      <CR>
+	Working hard: 3, 3.00 MiB | 1024.00 KiB/s, done.
+	EOF
+
+	cat >in <<-\EOF &&
+	start 0
+	throughput 1 1000
+	update
+	progress 1
+	throughput 1024000 2000
+	update
+	progress 2
+	throughput 3145728 3000
+	update
+	progress 3
+	stop
+	EOF
+	test-tool progress <in 2>stderr &&
+
+	show_cr <stderr >out &&
+	test_cmp expect out
+
+ok 11 - cover up after throughput shortens a lot
+
+expecting success of 0500.12 'progress generates traces': 
+	cat >in <<-\EOF &&
+	start 40
+	throughput 102400 1000
+	update
+	progress 10
+	throughput 204800 2000
+	update
+	progress 20
+	throughput 307200 3000
+	update
+	progress 30
+	throughput 409600 4000
+	update
+	progress 40
+	stop
+	EOF
+
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress \
+		<in 2>stderr &&
+
+	# t0212/parse_events.perl intentionally omits regions and data.
+	test_region progress "Working hard" trace.event &&
+	grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
+	grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
+
+{"event":"region_enter","sid":"20241114T192656.249136Z-H5c947e1c-P000003e9","thread":"main","time":"2024-11-14T19:26:56.249481Z","file":"progress.c","line":270,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20241114T192656.249136Z-H5c947e1c-P000003e9","thread":"main","time":"2024-11-14T19:26:56.249530Z","file":"progress.c","line":348,"repo":0,"t_rel":0.000049,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"data","sid":"20241114T192656.249136Z-H5c947e1c-P000003e9","thread":"main","time":"2024-11-14T19:26:56.249516Z","file":"progress.c","line":341,"repo":0,"t_abs":0.000549,"t_rel":0.000036,"nesting":2,"category":"progress","key":"total_objects","value":"40"}
+{"event":"data","sid":"20241114T192656.249136Z-H5c947e1c-P000003e9","thread":"main","time":"2024-11-14T19:26:56.249524Z","file":"progress.c","line":345,"repo":0,"t_abs":0.000557,"t_rel":0.000044,"nesting":2,"category":"progress","key":"total_bytes","value":"409600"}
+ok 12 - progress generates traces
+
+expecting success of 0500.13 'progress generates traces: stop / start': 
+	cat >in <<-\EOF &&
+	start 0
+	stop
+	EOF
+
+	GIT_TRACE2_EVENT="$PWD/trace-startstop.event" test-tool progress \
+		<in 2>stderr &&
+	test_region progress "Working hard" trace-startstop.event
+
+{"event":"region_enter","sid":"20241114T192656.310458Z-H5c947e1c-P0000040f","thread":"main","time":"2024-11-14T19:26:56.310844Z","file":"progress.c","line":270,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+{"event":"region_leave","sid":"20241114T192656.310458Z-H5c947e1c-P0000040f","thread":"main","time":"2024-11-14T19:26:56.310863Z","file":"progress.c","line":348,"repo":0,"t_rel":0.000020,"nesting":1,"category":"progress","label":"Working hard"}
+ok 13 - progress generates traces: stop / start
+
+expecting success of 0500.14 'progress generates traces: start without stop': 
+	cat >in <<-\EOF &&
+	start 0
+	EOF
+
+	GIT_TRACE2_EVENT="$PWD/trace-start.event" \
+	LSAN_OPTIONS=detect_leaks=0 \
+	test-tool progress \
+		<in 2>stderr &&
+	grep region_enter.*progress trace-start.event &&
+	! grep region_leave.*progress trace-start.event
+
+{"event":"region_enter","sid":"20241114T192656.328727Z-H5c947e1c-P00000427","thread":"main","time":"2024-11-14T19:26:56.329147Z","file":"progress.c","line":270,"repo":0,"nesting":1,"category":"progress","label":"Working hard"}
+ok 14 - progress generates traces: start without stop
+
+expecting success of 0500.15 'progress generates traces: stop without start': 
+	cat >in <<-\EOF &&
+	stop
+	EOF
+
+	GIT_TRACE2_EVENT="$PWD/trace-stop.event" test-tool progress \
+		<in 2>stderr &&
+	! grep region_enter.*progress trace-stop.event &&
+	! grep region_leave.*progress trace-stop.event
+
+ok 15 - progress generates traces: stop without start
+
+expecting success of 0500.16 'progress generates traces: start with active progress bar (no stops)': 
+	cat >in <<-\EOF &&
+	start 0 One
+	start 0 Two
+	EOF
+
+	GIT_TRACE2_EVENT="$PWD/trace-2start.event" \
+	LSAN_OPTIONS=detect_leaks=0 \
+	test-tool progress \
+		<in 2>stderr &&
+	grep region_enter.*progress.*One trace-2start.event &&
+	grep region_enter.*progress.*Two trace-2start.event &&
+	! grep region_leave trace-2start.event
+
+{"event":"region_enter","sid":"20241114T192656.460320Z-H5c947e1c-P00000490","thread":"main","time":"2024-11-14T19:26:56.460750Z","file":"progress.c","line":270,"repo":0,"nesting":1,"category":"progress","label":"One"}
+{"event":"region_enter","sid":"20241114T192656.460320Z-H5c947e1c-P00000490","thread":"main","time":"2024-11-14T19:26:56.460758Z","file":"progress.c","line":270,"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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0600-reffiles-backend.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/.git/
+expecting success of 0600.1 'setup': 
+	git commit --allow-empty -m Initial &&
+	C=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m Second &&
+	D=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m Third &&
+	E=$(git rev-parse HEAD)
+
+[main (root-commit) d31adcd] Initial
+ Author: A U Thor <author@example.com>
+[main e6940ad] Second
+ Author: A U Thor <author@example.com>
+[main c2327cb] Third
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 0600.2 'empty directory should not fool rev-parse': 
+	prefix=refs/e-rev-parse &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	echo "$C" >expected &&
+	git rev-parse $prefix/foo >actual &&
+	test_cmp expected actual
+
+ok 2 - empty directory should not fool rev-parse
+
+expecting success of 0600.3 'empty directory should not fool for-each-ref': 
+	prefix=refs/e-for-each-ref &&
+	git update-ref $prefix/foo $C &&
+	git for-each-ref $prefix >expected &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	git for-each-ref $prefix >actual &&
+	test_cmp expected actual
+
+ok 3 - empty directory should not fool for-each-ref
+
+expecting success of 0600.4 'empty directory should not fool create': 
+	prefix=refs/e-create &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "create %s $C\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 4 - empty directory should not fool create
+
+expecting success of 0600.5 'empty directory should not fool verify': 
+	prefix=refs/e-verify &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "verify %s $C\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 5 - empty directory should not fool verify
+
+expecting success of 0600.6 'empty directory should not fool 1-arg update': 
+	prefix=refs/e-update-1 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "update %s $D\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 6 - empty directory should not fool 1-arg update
+
+expecting success of 0600.7 'empty directory should not fool 2-arg update': 
+	prefix=refs/e-update-2 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "update %s $D $C\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 7 - empty directory should not fool 2-arg update
+
+expecting success of 0600.8 'empty directory should not fool 0-arg delete': 
+	prefix=refs/e-delete-0 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "delete %s\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 8 - empty directory should not fool 0-arg delete
+
+expecting success of 0600.9 'empty directory should not fool 1-arg delete': 
+	prefix=refs/e-delete-1 &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	mkdir -p .git/$prefix/foo/bar/baz &&
+	printf "delete %s $C\n" $prefix/foo |
+	git update-ref --stdin
+
+ok 9 - empty directory should not fool 1-arg delete
+
+expecting success of 0600.10 'non-empty directory blocks create': 
+	prefix=refs/ne-create &&
+	mkdir -p .git/$prefix/foo/bar &&
+	: >.git/$prefix/foo/bar/baz.lock &&
+	test_when_finished "rm -f .git/$prefix/foo/bar/baz.lock" &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
+	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 $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
+	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 $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $SQ$prefix/symref$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
+	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 $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
+	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 $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $SQ.*packed-refs.lock$SQ: " err &&
+	test_cmp unchanged actual
+
+error: Unable to create '/build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/.git/packed-refs.lock': File exists.
+ok 15 - delete fails cleanly if packed-refs file is locked
+
+expecting success of 0600.16 'delete fails cleanly if packed-refs.new write fails': 
+	# Setup and expectations are similar to the test above.
+	prefix=refs/failed-packed-refs &&
+	git update-ref $prefix/foo $C &&
+	git pack-refs --all &&
+	git update-ref $prefix/foo $D &&
+	git for-each-ref $prefix >unchanged &&
+	# This should not happen in practice, but it is an easy way to get a
+	# reliable error (we open with create_tempfile(), which uses O_EXCL).
+	: >.git/packed-refs.new &&
+	test_when_finished "rm -f .git/packed-refs.new" &&
+	test_must_fail git update-ref -d $prefix/foo &&
+	git for-each-ref $prefix >actual &&
+	test_cmp unchanged actual
+
+error: unable to create file /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/.git/packed-refs.new: File exists
+ok 16 - delete fails cleanly if packed-refs.new write fails
+
+expecting success of 0600.17 'setup worktree': 
+	test_commit first &&
+	git worktree add -b wt-main wt &&
+	(
+		cd wt &&
+		test_commit second
+	)
+
+[main 89a3a1d] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Preparing worktree (new branch 'wt-main')
+HEAD is now at 89a3a1d first
+[wt-main da840b1] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+ok 17 - setup worktree
+
+expecting success of 0600.18 'for_each_reflog()': 
+	echo $ZERO_OID >.git/logs/PSEUDO_MAIN_HEAD &&
+	mkdir -p     .git/logs/refs/bisect &&
+	echo $ZERO_OID >.git/logs/refs/bisect/random &&
+
+	echo $ZERO_OID >.git/worktrees/wt/logs/PSEUDO_WT_HEAD &&
+	mkdir -p     .git/worktrees/wt/logs/refs/bisect &&
+	echo $ZERO_OID >.git/worktrees/wt/logs/refs/bisect/wt-random &&
+
+	$RWT for-each-reflog >actual &&
+	cat >expected <<-\EOF &&
+	HEAD
+	PSEUDO_WT_HEAD
+	refs/bisect/wt-random
+	refs/heads/main
+	refs/heads/wt-main
+	EOF
+	test_cmp expected actual &&
+
+	$RMAIN for-each-reflog >actual &&
+	cat >expected <<-\EOF &&
+	HEAD
+	PSEUDO_MAIN_HEAD
+	refs/bisect/random
+	refs/heads/main
+	refs/heads/wt-main
+	EOF
+	test_cmp expected actual
+
+ok 18 - for_each_reflog()
+
+checking prerequisite: SHA1
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
+	case "$GIT_DEFAULT_HASH" in
+	sha1) true ;;
+	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
+	*) false ;;
+	esac
+
+)
+prerequisite SHA1 ok
+expecting success of 0600.19 'parsing reverse reflogs at BUFSIZ boundaries': 
+	git checkout -b reflogskip &&
+	zf=$(test_oid zero_2) &&
+	ident="abc <xyz> 0000000001 +0000" &&
+	for i in $(test_seq 1 75); do
+		printf "$zf%02d $zf%02d %s\t" $i $(($i+1)) "$ident" &&
+		if test $i = 75; then
+			for j in $(test_seq 1 89); do
+				printf X || return 1
+			done
+		else
+			printf X
+		fi &&
+		printf "\n" || return 1
+	done >.git/logs/refs/heads/reflogskip &&
+	git rev-parse reflogskip@{73} >actual &&
+	echo ${zf}03 >expect &&
+	test_cmp expect actual
+
+Switched to a new branch 'reflogskip'
+ok 19 - parsing reverse reflogs at BUFSIZ boundaries
+
+expecting success of 0600.20 'reflog expire operates on symref not referrent': 
+	git branch --create-reflog the_symref &&
+	git branch --create-reflog referrent &&
+	git update-ref referrent HEAD &&
+	git symbolic-ref refs/heads/the_symref refs/heads/referrent &&
+	test_when_finished "rm -f .git/refs/heads/referrent.lock" &&
+	touch .git/refs/heads/referrent.lock &&
+	git reflog expire --expire=all the_symref
+
+ok 20 - reflog expire operates on symref not referrent
+
+expecting success of 0600.21 'empty reflog': 
+	test_when_finished "rm -rf empty" &&
+	git init empty &&
+	test_commit -C empty A &&
+	>empty/.git/logs/refs/heads/foo &&
+	git -C empty reflog expire --all 2>err &&
+	test_must_be_empty err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/empty/.git/
+[main (root-commit) 508df12] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 21 - empty reflog
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 0600.22 'ref resolution not confused by broken symlinks': 
+       ln -s does-not-exist .git/refs/heads/broken &&
+       test_must_fail git rev-parse --verify broken
+
+fatal: Needed a single revision
+ok 22 - ref resolution not confused by broken symlinks
+
+expecting success of 0600.23 'log diagnoses bogus HEAD hash': 
+	git init empty &&
+	test_when_finished "rm -rf empty" &&
+	echo 1234abcd >empty/.git/refs/heads/main &&
+	test_must_fail git -C empty log 2>stderr &&
+	test_grep broken stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/empty/.git/
+fatal: your current branch appears to be broken
+ok 23 - log diagnoses bogus HEAD hash
+
+expecting success of 0600.24 'log diagnoses bogus HEAD symref': 
+	git init empty &&
+	test-tool -C empty ref-store main create-symref HEAD refs/heads/invalid.lock &&
+	test_must_fail git -C empty log 2>stderr &&
+	test_grep broken stderr &&
+	test_must_fail git -C empty log --default totally-bogus 2>stderr &&
+	test_grep broken stderr
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/empty/.git/
+fatal: your current branch appears to be broken
+fatal: your current branch appears to be broken
+ok 24 - log diagnoses bogus HEAD symref
+
+expecting success of 0600.25 'empty directory removal': 
+	git branch d1/d2/r1 HEAD &&
+	git branch d1/r2 HEAD &&
+	test_path_is_file .git/refs/heads/d1/d2/r1 &&
+	test_path_is_file .git/logs/refs/heads/d1/d2/r1 &&
+	git branch -d d1/d2/r1 &&
+	test_must_fail git show-ref --verify -q refs/heads/d1/d2 &&
+	test_must_fail git show-ref --verify -q logs/refs/heads/d1/d2 &&
+	test_path_is_file .git/refs/heads/d1/r2 &&
+	test_path_is_file .git/logs/refs/heads/d1/r2
+
+Deleted branch d1/d2/r1 (was 89a3a1d).
+ok 25 - empty directory removal
+
+expecting success of 0600.26 'symref empty directory removal': 
+	git branch e1/e2/r1 HEAD &&
+	git branch e1/r2 HEAD &&
+	git checkout e1/e2/r1 &&
+	test_when_finished "git checkout main" &&
+	test_path_is_file .git/refs/heads/e1/e2/r1 &&
+	test_path_is_file .git/logs/refs/heads/e1/e2/r1 &&
+	git update-ref -d HEAD &&
+	test_must_fail git show-ref --verify -q refs/heads/e1/e2 &&
+	test_must_fail git show-ref --verify -q logs/refs/heads/e1/e2 &&
+	test_path_is_file .git/refs/heads/e1/r2 &&
+	test_path_is_file .git/logs/refs/heads/e1/r2 &&
+	test_path_is_file .git/logs/HEAD
+
+Switched to branch 'e1/e2/r1'
+Switched to branch 'main'
+ok 26 - symref empty directory removal
+
+expecting success of 0600.27 'directory not created deleting packed ref': 
+	git branch d1/d2/r1 HEAD &&
+	git pack-refs --all &&
+	test_path_is_missing .git/refs/heads/d1/d2 &&
+	git update-ref -d refs/heads/d1/d2/r1 &&
+	test_path_is_missing .git/refs/heads/d1/d2 &&
+	test_path_is_missing .git/refs/heads/d1
+
+ok 27 - directory not created deleting packed ref
+
+expecting success of 0600.28 'git branch -m u v should fail when the reflog for u is a symlink': 
+	git branch --create-reflog u &&
+	mv .git/logs/refs/heads/u real-u &&
+	ln -s real-u .git/logs/refs/heads/u &&
+	test_must_fail git branch -m u v
+
+error: reflog for refs/heads/u is a symlink
+fatal: branch rename failed
+ok 28 - git branch -m u v should fail when the reflog for u is a symlink
+
+expecting success of 0600.29 'git branch -m with symlinked .git/refs': 
+	test_when_finished "rm -rf subdir" &&
+	git init --bare subdir &&
+
+	rm -rfv 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.45.2/t/trash directory.t0600-reffiles-backend/subdir/
+removed directory 'subdir/refs/heads'
+removed directory 'subdir/refs/tags'
+removed directory 'subdir/refs'
+removed directory 'subdir/objects/pack'
+removed directory 'subdir/objects/info'
+removed directory 'subdir/objects'
+--- subdir.dir	2024-11-14 19:27:00.404147402 +0000
++++ our.dir	2024-11-14 19:27:00.408147442 +0000
+@@ -1 +1 @@
+-/build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/subdir
++/build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/.git
+commit 89a3a1dedc5a76d0eefcd624dfb8d4f8004a1994
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    first
+
+commit c2327cb6b086a944f739ef59ddcffd3d45998884
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Third
+
+commit e6940ad615916edba236dd73cb432b3598c8537f
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Second
+
+commit d31adcd248e1f85d12741183d231fa5260dcfd5e
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    Initial
+Deleted branch rename-dest (was 89a3a1d).
+ok 29 - git branch -m with symlinked .git/refs
+
+checking prerequisite: SYMLINKS_WINDOWS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
+	# test whether symbolic links are enabled on Windows
+	test_have_prereq MINGW &&
+	cmd //c "mklink y x" &> /dev/null && test -h y
+
+)
+prerequisite SYMLINKS_WINDOWS not satisfied
+ok 30 # skip rebase when .git/logs is a symlink (missing SYMLINKS_WINDOWS,MINGW of MINGW,SYMLINKS_WINDOWS)
+
+expecting success of 0600.31 'git reflog expire honors core.sharedRepository': 
+	umask 077 &&
+	git config core.sharedRepository group &&
+	git reflog expire --all &&
+	actual="$(ls -l .git/logs/refs/heads/main)" &&
+	case "$actual" in
+	-rw-rw-*)
+		: happy
+		;;
+	*)
+		echo Ooops, .git/logs/refs/heads/main is not 066x [$actual]
+		false
+		;;
+	esac
+
+ok 31 - git reflog expire honors core.sharedRepository
+
+# passed all 31 test(s)
+1..31
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0610-reftable-basics.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0610-reftable-basics/.git/
+1..0 # SKIP skipping reftable tests; set GIT_TEST_DEFAULT_REF_FORMAT=reftable
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0611-reftable-httpd.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0601-reffiles-pack-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0601-reffiles-pack-refs/.git/
+expecting success of 0601.1 'enable reflogs': 
+	git config core.logallrefupdates true
+
+ok 1 - enable reflogs
+
+expecting success of 0601.2 'prepare a trivial repository': 
+	echo Hello > A &&
+	git update-index --add A &&
+	git commit -m "Initial commit." &&
+	HEAD=$(git rev-parse --verify HEAD)
+
+[main (root-commit) 2daebe9] Initial commit.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A
+ok 2 - prepare a trivial repository
+
+expecting success of 0601.3 'pack-refs --prune --all': 
+	test_path_is_missing .git/packed-refs &&
+	git pack-refs --no-prune --all &&
+	test_path_is_file .git/packed-refs &&
+	N=$(find .git/refs -type f | wc -l) &&
+	test "$N" != 0 &&
+
+	git pack-refs --prune --all &&
+	test_path_is_file .git/packed-refs &&
+	N=$(find .git/refs -type f) &&
+	test -z "$N"
+
+ok 3 - pack-refs --prune --all
+
+expecting success of 0601.4 'see if git show-ref works as expected': 
+	git branch a &&
+	SHA1=$(cat .git/refs/heads/a) &&
+	echo "$SHA1 refs/heads/a" >expect &&
+	git show-ref a >result &&
+	test_cmp expect result
+
+ok 4 - see if git show-ref works as expected
+
+expecting success of 0601.5 'see if a branch still exists when packed': 
+	git branch b &&
+	git pack-refs --all &&
+	rm -f .git/refs/heads/b &&
+	echo "$SHA1 refs/heads/b" >expect &&
+	git show-ref b >result &&
+	test_cmp expect result
+
+ok 5 - see if a branch still exists when packed
+
+expecting success of 0601.6 'git branch c/d should barf if branch c exists': 
+	git branch c &&
+	git pack-refs --all &&
+	rm -f .git/refs/heads/c &&
+	test_must_fail git branch c/d
+
+fatal: cannot lock ref 'refs/heads/c/d': 'refs/heads/c' exists; cannot create 'refs/heads/c/d'
+ok 6 - git branch c/d should barf if branch c exists
+
+expecting success of 0601.7 'see if a branch still exists after git pack-refs --prune': 
+	git branch e &&
+	git pack-refs --all --prune &&
+	echo "$SHA1 refs/heads/e" >expect &&
+	git show-ref e >result &&
+	test_cmp expect result
+
+ok 7 - see if a branch still exists after git pack-refs --prune
+
+expecting success of 0601.8 'see if git pack-refs --prune remove ref files': 
+	git branch f &&
+	git pack-refs --all --prune &&
+	! test -f .git/refs/heads/f
+
+ok 8 - see if git pack-refs --prune remove ref files
+
+expecting success of 0601.9 'see if git pack-refs --prune removes empty dirs': 
+	git branch r/s/t &&
+	git pack-refs --all --prune &&
+	! test -e .git/refs/heads/r
+
+ok 9 - see if git pack-refs --prune removes empty dirs
+
+expecting success of 0601.10 'git branch g should work when git branch g/h has been deleted': 
+	git branch g/h &&
+	git pack-refs --all --prune &&
+	git branch -d g/h &&
+	git branch g &&
+	git pack-refs --all &&
+	git branch -d g
+
+Deleted branch g/h (was 2daebe9).
+Deleted branch g (was 2daebe9).
+ok 10 - git branch g should work when git branch g/h has been deleted
+
+expecting success of 0601.11 'git branch i/j/k should barf if branch i exists': 
+	git branch i &&
+	git pack-refs --all --prune &&
+	test_must_fail git branch i/j/k
+
+fatal: cannot lock ref 'refs/heads/i/j/k': 'refs/heads/i' exists; cannot create 'refs/heads/i/j/k'
+ok 11 - git branch i/j/k should barf if branch i exists
+
+expecting success of 0601.12 'test git branch k after branch k/l/m and k/lm have been deleted': 
+	git branch k/l &&
+	git branch k/lm &&
+	git branch -d k/l &&
+	git branch k/l/m &&
+	git branch -d k/l/m &&
+	git branch -d k/lm &&
+	git branch k
+
+Deleted branch k/l (was 2daebe9).
+Deleted branch k/l/m (was 2daebe9).
+Deleted branch k/lm (was 2daebe9).
+ok 12 - test git branch k after branch k/l/m and k/lm have been deleted
+
+expecting success of 0601.13 'test git branch n after some branch deletion and pruning': 
+	git branch n/o &&
+	git branch n/op &&
+	git branch -d n/o &&
+	git branch n/o/p &&
+	git branch -d n/op &&
+	git pack-refs --all --prune &&
+	git branch -d n/o/p &&
+	git branch n
+
+Deleted branch n/o (was 2daebe9).
+Deleted branch n/op (was 2daebe9).
+Deleted branch n/o/p (was 2daebe9).
+ok 13 - test git branch n after some branch deletion and pruning
+
+expecting success of 0601.14 'test excluded refs are not packed': 
+	git branch dont_pack1 &&
+	git branch dont_pack2 &&
+	git branch pack_this &&
+	git pack-refs --all --exclude "refs/heads/dont_pack*" &&
+	test -f .git/refs/heads/dont_pack1 &&
+	test -f .git/refs/heads/dont_pack2 &&
+	! test -f .git/refs/heads/pack_this
+ok 14 - test excluded refs are not packed
+
+expecting success of 0601.15 'test --no-exclude refs clears excluded refs': 
+	git branch dont_pack3 &&
+	git branch dont_pack4 &&
+	git pack-refs --all --exclude "refs/heads/dont_pack*" --no-exclude &&
+	! test -f .git/refs/heads/dont_pack3 &&
+	! test -f .git/refs/heads/dont_pack4
+ok 15 - test --no-exclude refs clears excluded refs
+
+expecting success of 0601.16 'test only included refs are packed': 
+	git branch pack_this1 &&
+	git branch pack_this2 &&
+	git tag dont_pack5 &&
+	git pack-refs --include "refs/heads/pack_this*" &&
+	test -f .git/refs/tags/dont_pack5 &&
+	! test -f .git/refs/heads/pack_this1 &&
+	! test -f .git/refs/heads/pack_this2
+ok 16 - test only included refs are packed
+
+expecting success of 0601.17 'test --no-include refs clears included refs': 
+	git branch pack1 &&
+	git branch pack2 &&
+	git pack-refs --include "refs/heads/pack*" --no-include &&
+	test -f .git/refs/heads/pack1 &&
+	test -f .git/refs/heads/pack2
+ok 17 - test --no-include refs clears included refs
+
+expecting success of 0601.18 'test --exclude takes precedence over --include': 
+	git branch dont_pack5 &&
+	git pack-refs --include "refs/heads/pack*" --exclude "refs/heads/pack*" &&
+	test -f .git/refs/heads/dont_pack5
+ok 18 - test --exclude takes precedence over --include
+
+expecting success of 0601.19 '--auto packs and prunes refs as usual': 
+	git branch auto &&
+	test_path_is_file .git/refs/heads/auto &&
+	git pack-refs --auto --all &&
+	test_path_is_missing .git/refs/heads/auto
+
+ok 19 - --auto packs and prunes refs as usual
+
+expecting success of 0601.20 '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 20 - see if up-to-date packed refs are preserved
+
+expecting success of 0601.21 '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 21 - pack, prune and repack
+
+expecting success of 0601.22 '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 22 - explicit pack-refs with dangling packed reference
+
+expecting success of 0601.23 '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 23 - delete ref with dangling packed version
+
+expecting success of 0601.24 '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 24 - delete ref while another dangling packed ref
+
+expecting success of 0601.25 '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 25 - pack ref directly below refs/
+
+expecting success of 0601.26 '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 26 - do not pack ref in refs/bisect
+
+expecting success of 0601.27 'disable reflogs': 
+	git config core.logallrefupdates false &&
+	rm -rf .git/logs
+
+ok 27 - disable reflogs
+
+expecting success of 0601.28 '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 28 - create packed foo/bar/baz branch
+
+expecting success of 0601.29 '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 29 - notice d/f conflict with existing directory
+
+expecting success of 0601.30 '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 30 - existing directory reports concrete ref
+
+expecting success of 0601.31 '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 31 - notice d/f conflict with existing ref
+
+expecting success of 0601.32 '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 32 - reject packed-refs with unterminated line
+
+expecting success of 0601.33 '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 33 - reject packed-refs containing junk
+
+expecting success of 0601.34 '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 34 - reject packed-refs with a short SHA-1
+
+expecting success of 0601.35 '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.45.2/t/trash directory.t0601-reffiles-pack-refs/.git/packed-refs.lock': File exists.
+
+Another git process seems to be running in this repository, e.g.
+an editor opened by 'git commit'. Please make sure all processes
+are terminated then try again. If it still fails, a git process
+may have crashed in this repository earlier:
+remove the file manually to continue.
+ok 35 - timeout if packed-refs.lock exists
+
+expecting success of 0601.36 '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 36 - 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.37 '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 37 - pack symlinked packed-refs
+
+expecting success of 0601.38 '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 38 - refs/worktree must not be packed
+
+expecting success of 0601.39 '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 39 - create packed-refs file with broken ref
+
+expecting success of 0601.40 '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 40 - pack-refs does not silently delete broken packed ref
+
+expecting success of 0601.41 '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 41 - pack-refs does not drop broken refs during deletion
+
+expecting success of 0601.42 'maintenance --auto unconditionally packs loose refs': 
+	git update-ref refs/heads/something HEAD &&
+	test_path_is_file .git/refs/heads/something &&
+	git rev-parse refs/heads/something >expect &&
+	git maintenance run --task=pack-refs --auto &&
+	test_path_is_missing .git/refs/heads/something &&
+	git rev-parse refs/heads/something >actual &&
+	test_cmp expect actual
+
+ok 42 - maintenance --auto unconditionally packs loose refs
+
+# passed all 42 test(s)
+1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t0410-partial-clone.sh ***
@@ -38662,118 +39230,517 @@
 1..32
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0610-reftable-basics.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0610-reftable-basics/.git/
-1..0 # SKIP skipping reftable tests; set GIT_TEST_DEFAULT_REF_FORMAT=reftable
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0611-reftable-httpd.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0611-reftable-httpd/.git/
-checking prerequisite: NOT_ROOT
+*** t1001-read-tree-m-2way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1001-read-tree-m-2way/.git/
+expecting success of 1001.1 'setup': 
+	echo frotz >frotz &&
+	echo nitfol >nitfol &&
+	cat bozbar-old >bozbar &&
+	echo rezrov >rezrov &&
+	echo yomin >yomin &&
+	git update-index --add nitfol bozbar rezrov &&
+	treeH=$(git write-tree) &&
+	echo treeH $treeH &&
+	git ls-tree $treeH &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+	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
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0052-simple-ipc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0052-simple-ipc/.git/
-expecting success of 0052.1 'start simple command server': 
-	test_atexit stop_simple_IPC_server &&
-	test-tool simple-ipc start-daemon --threads=8 &&
-	test-tool simple-ipc is-active
+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
 
-ok 1 - start simple command server
+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 0052.2 'simple command server': 
-	test-tool simple-ipc send --token=ping >actual &&
-	echo pong >expect &&
-	test_cmp expect actual
+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
 
-ok 2 - simple command server
+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 0052.3 'servers cannot share the same path': 
-	test_must_fail test-tool simple-ipc run-daemon &&
-	test-tool simple-ipc is-active
+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.
 
-error: socket/pipe already in use: 'ipc-test'
-ok 3 - servers cannot share the same path
+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 0052.4 'big response': 
-	test-tool simple-ipc send --token=big >actual &&
-	test_line_count -ge 10000 actual &&
-	grep -q "big: [0]*9999\$" actual
+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 4 - big response
+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 0052.5 'chunk response': 
-	test-tool simple-ipc send --token=chunk >actual &&
-	test_line_count -ge 10000 actual &&
-	grep -q "big: [0]*9999\$" actual
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+frotz: clean
+ok 5 - 6 - local addition already has the same.
 
-ok 5 - chunk response
+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
 
-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
+100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
+100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
+100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
+frotz: dirty
+ok 6 - 7 - local addition already has the same.
 
-ok 6 - slow response
+expecting success of 1001.7 '8 - conflicting addition.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo frotz frotz >frotz &&
+	git update-index --add frotz &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
 
-expecting success of 0052.7 'sendbytes': 
-	test-tool simple-ipc sendbytes --bytecount=100000 --byte=A >actual &&
-	grep "sent:A00100000 rcvd:A00100000" actual
+error: Entry 'frotz' would be overwritten by merge. Cannot merge.
+ok 7 - 8 - conflicting addition.
 
-sent:A00100000 rcvd:A00100000
-ok 7 - sendbytes
+expecting success of 1001.8 '9 - conflicting addition.': 
+	rm -f .git/index &&
+	read_tree_must_succeed $treeH &&
+	git checkout-index -u -f -q -a &&
+	echo frotz frotz >frotz &&
+	git update-index --add frotz &&
+	echo frotz >frotz &&
+	if read_tree_twoway $treeH $treeM; then false; else :; fi
 
-expecting success of 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
+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_cmp expect_a actual_a
+	test_must_fail git read-tree --super-prefix fictional/ -u -m "$treeH" "$treeM" 2>actual &&
+	test_cmp expect actual
 
-client (good 91) (join 0), (errors 0)
-ok 8 - stress test threads
+ok 26 - read-tree supports the super-prefix
 
-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
+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 &&
 
-error: no server listening at 'ipc-test'
-error: no server listening at 'ipc-test'
-ok 9 - stop-daemon works
+	rm -f a &&
+	mkdir a &&
+	: >a/b &&
+	git update-index --add --remove a a/b &&
+	treeH=$(git write-tree) &&
+	echo treeH $treeH &&
+	git ls-tree $treeH
 
-error: no server listening at 'ipc-test'
-# passed all 9 test(s)
-1..9
+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 | tee >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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1003-read-tree-prefix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1003-read-tree-prefix/.git/
+expecting success of 1003.1 'setup': 
+	echo hello >one &&
+	git update-index --add one &&
+	tree=$(git write-tree) &&
+	echo tree is $tree
+
+tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
+ok 1 - setup
+
+expecting success of 1003.2 'read-tree --prefix': 
+	git read-tree --prefix=two/ $tree &&
+	git ls-files >actual &&
+	cmp expect actual
+
+ok 2 - read-tree --prefix
+
+expecting success of 1003.3 'read-tree --prefix with leading slash exits with error': 
+	git rm -rf . &&
+	test_must_fail git read-tree --prefix=/two/ $tree &&
+	git read-tree --prefix=two/ $tree &&
+
+	git rm -rf . &&
+	test_must_fail git read-tree --prefix=/ $tree &&
+	git read-tree --prefix= $tree
+
+rm 'one'
+rm 'two/one'
+fatal: Invalid prefix, prefix cannot start with '/'
+rm 'two/one'
+fatal: Invalid prefix, prefix cannot start with '/'
+ok 3 - read-tree --prefix with leading slash exits with error
+
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1000-read-tree-m-3way.sh ***
@@ -39418,908 +40385,333 @@
 1..83
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0600-reffiles-backend.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/.git/
-expecting success of 0600.1 'setup': 
-	git commit --allow-empty -m Initial &&
-	C=$(git rev-parse HEAD) &&
-	git commit --allow-empty -m Second &&
-	D=$(git rev-parse HEAD) &&
-	git commit --allow-empty -m Third &&
-	E=$(git rev-parse HEAD)
-
-[main (root-commit) d31adcd] Initial
- Author: A U Thor <author@example.com>
-[main e6940ad] Second
- Author: A U Thor <author@example.com>
-[main c2327cb] Third
- Author: A U Thor <author@example.com>
-ok 1 - setup
+*** t1002-read-tree-m-u-2way.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 0600.2 'empty directory should not fool rev-parse': 
-	prefix=refs/e-rev-parse &&
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	mkdir -p .git/$prefix/foo/bar/baz &&
-	echo "$C" >expected &&
-	git rev-parse $prefix/foo >actual &&
-	test_cmp expected actual
+	echo 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
 
-ok 2 - empty directory should not fool rev-parse
+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 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 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
 
-ok 3 - empty directory should not fool for-each-ref
+bozbar: clean
+frotz: clean
+nitfol: clean
+ok 2 - 1, 2, 3 - no carry forward
 
-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
+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 4 - empty directory should not fool create
+yomin: clean
+ok 3 - 4 - carry forward local addition.
 
-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 $SQ$prefix/foo$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
-	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 $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
-	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 $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $SQ$prefix/symref$SQ: there is a non-empty directory $SQ.git/$prefix/foo$SQ blocking reference $SQ$prefix/foo$SQ
-	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 $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
-	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 $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ: 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 $SQ.*packed-refs.lock$SQ: " err &&
-	test_cmp unchanged actual
-
-error: Unable to create '/build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/.git/packed-refs.lock': File exists.
-ok 15 - delete fails cleanly if packed-refs file is locked
-
-expecting success of 0600.16 'delete fails cleanly if packed-refs.new write fails': 
-	# Setup and expectations are similar to the test above.
-	prefix=refs/failed-packed-refs &&
-	git update-ref $prefix/foo $C &&
-	git pack-refs --all &&
-	git update-ref $prefix/foo $D &&
-	git for-each-ref $prefix >unchanged &&
-	# This should not happen in practice, but it is an easy way to get a
-	# reliable error (we open with create_tempfile(), which uses O_EXCL).
-	: >.git/packed-refs.new &&
-	test_when_finished "rm -f .git/packed-refs.new" &&
-	test_must_fail git update-ref -d $prefix/foo &&
-	git for-each-ref $prefix >actual &&
-	test_cmp unchanged actual
-
-error: unable to create file /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/.git/packed-refs.new: File exists
-ok 16 - delete fails cleanly if packed-refs.new write fails
-
-expecting success of 0600.17 'setup worktree': 
-	test_commit first &&
-	git worktree add -b wt-main wt &&
-	(
-		cd wt &&
-		test_commit second
-	)
-
-[main 89a3a1d] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Preparing worktree (new branch 'wt-main')
-HEAD is now at 89a3a1d first
-[wt-main da840b1] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 17 - setup worktree
-
-expecting success of 0600.18 'for_each_reflog()': 
-	echo $ZERO_OID >.git/logs/PSEUDO_MAIN_HEAD &&
-	mkdir -p     .git/logs/refs/bisect &&
-	echo $ZERO_OID >.git/logs/refs/bisect/random &&
-
-	echo $ZERO_OID >.git/worktrees/wt/logs/PSEUDO_WT_HEAD &&
-	mkdir -p     .git/worktrees/wt/logs/refs/bisect &&
-	echo $ZERO_OID >.git/worktrees/wt/logs/refs/bisect/wt-random &&
-
-	$RWT for-each-reflog >actual &&
-	cat >expected <<-\EOF &&
-	HEAD
-	PSEUDO_WT_HEAD
-	refs/bisect/wt-random
-	refs/heads/main
-	refs/heads/wt-main
-	EOF
-	test_cmp expected actual &&
-
-	$RMAIN for-each-reflog >actual &&
-	cat >expected <<-\EOF &&
-	HEAD
-	PSEUDO_MAIN_HEAD
-	refs/bisect/random
-	refs/heads/main
-	refs/heads/wt-main
-	EOF
-	test_cmp expected actual
-
-ok 18 - for_each_reflog()
-
-checking prerequisite: SHA1
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-	case "$GIT_DEFAULT_HASH" in
-	sha1) true ;;
-	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
-	*) false ;;
-	esac
-
-)
-prerequisite SHA1 ok
-expecting success of 0600.19 'parsing reverse reflogs at BUFSIZ boundaries': 
-	git checkout -b reflogskip &&
-	zf=$(test_oid zero_2) &&
-	ident="abc <xyz> 0000000001 +0000" &&
-	for i in $(test_seq 1 75); do
-		printf "$zf%02d $zf%02d %s\t" $i $(($i+1)) "$ident" &&
-		if test $i = 75; then
-			for j in $(test_seq 1 89); do
-				printf X || return 1
-			done
-		else
-			printf X
-		fi &&
-		printf "\n" || return 1
-	done >.git/logs/refs/heads/reflogskip &&
-	git rev-parse reflogskip@{73} >actual &&
-	echo ${zf}03 >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'reflogskip'
-ok 19 - parsing reverse reflogs at BUFSIZ boundaries
-
-expecting success of 0600.20 'reflog expire operates on symref not referrent': 
-	git branch --create-reflog the_symref &&
-	git branch --create-reflog referrent &&
-	git update-ref referrent HEAD &&
-	git symbolic-ref refs/heads/the_symref refs/heads/referrent &&
-	test_when_finished "rm -f .git/refs/heads/referrent.lock" &&
-	touch .git/refs/heads/referrent.lock &&
-	git reflog expire --expire=all the_symref
-
-ok 20 - reflog expire operates on symref not referrent
-
-expecting success of 0600.21 'empty reflog': 
-	test_when_finished "rm -rf empty" &&
-	git init empty &&
-	test_commit -C empty A &&
-	>empty/.git/logs/refs/heads/foo &&
-	git -C empty reflog expire --all 2>err &&
-	test_must_be_empty err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/empty/.git/
-[main (root-commit) 508df12] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 21 - empty reflog
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 0600.22 'ref resolution not confused by broken symlinks': 
-       ln -s does-not-exist .git/refs/heads/broken &&
-       test_must_fail git rev-parse --verify broken
-
-fatal: Needed a single revision
-ok 22 - ref resolution not confused by broken symlinks
-
-expecting success of 0600.23 'log diagnoses bogus HEAD hash': 
-	git init empty &&
-	test_when_finished "rm -rf empty" &&
-	echo 1234abcd >empty/.git/refs/heads/main &&
-	test_must_fail git -C empty log 2>stderr &&
-	test_grep broken stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/empty/.git/
-fatal: your current branch appears to be broken
-ok 23 - log diagnoses bogus HEAD hash
-
-expecting success of 0600.24 'log diagnoses bogus HEAD symref': 
-	git init empty &&
-	test-tool -C empty ref-store main create-symref HEAD refs/heads/invalid.lock &&
-	test_must_fail git -C empty log 2>stderr &&
-	test_grep broken stderr &&
-	test_must_fail git -C empty log --default totally-bogus 2>stderr &&
-	test_grep broken stderr
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/empty/.git/
-fatal: your current branch appears to be broken
-fatal: your current branch appears to be broken
-ok 24 - log diagnoses bogus HEAD symref
-
-expecting success of 0600.25 'empty directory removal': 
-	git branch d1/d2/r1 HEAD &&
-	git branch d1/r2 HEAD &&
-	test_path_is_file .git/refs/heads/d1/d2/r1 &&
-	test_path_is_file .git/logs/refs/heads/d1/d2/r1 &&
-	git branch -d d1/d2/r1 &&
-	test_must_fail git show-ref --verify -q refs/heads/d1/d2 &&
-	test_must_fail git show-ref --verify -q logs/refs/heads/d1/d2 &&
-	test_path_is_file .git/refs/heads/d1/r2 &&
-	test_path_is_file .git/logs/refs/heads/d1/r2
-
-Deleted branch d1/d2/r1 (was 89a3a1d).
-ok 25 - empty directory removal
-
-expecting success of 0600.26 'symref empty directory removal': 
-	git branch e1/e2/r1 HEAD &&
-	git branch e1/r2 HEAD &&
-	git checkout e1/e2/r1 &&
-	test_when_finished "git checkout main" &&
-	test_path_is_file .git/refs/heads/e1/e2/r1 &&
-	test_path_is_file .git/logs/refs/heads/e1/e2/r1 &&
-	git update-ref -d HEAD &&
-	test_must_fail git show-ref --verify -q refs/heads/e1/e2 &&
-	test_must_fail git show-ref --verify -q logs/refs/heads/e1/e2 &&
-	test_path_is_file .git/refs/heads/e1/r2 &&
-	test_path_is_file .git/logs/refs/heads/e1/r2 &&
-	test_path_is_file .git/logs/HEAD
-
-Switched to branch 'e1/e2/r1'
-Switched to branch 'main'
-ok 26 - symref empty directory removal
-
-expecting success of 0600.27 'directory not created deleting packed ref': 
-	git branch d1/d2/r1 HEAD &&
-	git pack-refs --all &&
-	test_path_is_missing .git/refs/heads/d1/d2 &&
-	git update-ref -d refs/heads/d1/d2/r1 &&
-	test_path_is_missing .git/refs/heads/d1/d2 &&
-	test_path_is_missing .git/refs/heads/d1
-
-ok 27 - directory not created deleting packed ref
-
-expecting success of 0600.28 'git branch -m u v should fail when the reflog for u is a symlink': 
-	git branch --create-reflog u &&
-	mv .git/logs/refs/heads/u real-u &&
-	ln -s real-u .git/logs/refs/heads/u &&
-	test_must_fail git branch -m u v
-
-error: reflog for refs/heads/u is a symlink
-fatal: branch rename failed
-ok 28 - git branch -m u v should fail when the reflog for u is a symlink
-
-expecting success of 0600.29 'git branch -m with symlinked .git/refs': 
-	test_when_finished "rm -rf subdir" &&
-	git init --bare subdir &&
-
-	rm -rfv 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.45.2/t/trash directory.t0600-reffiles-backend/subdir/
-removed directory 'subdir/refs/heads'
-removed directory 'subdir/refs/tags'
-removed directory 'subdir/refs'
-removed directory 'subdir/objects/pack'
-removed directory 'subdir/objects/info'
-removed directory 'subdir/objects'
---- subdir.dir	2025-12-18 01:32:34.522773267 +0000
-+++ our.dir	2025-12-18 01:32:34.522773267 +0000
-@@ -1 +1 @@
--/build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/subdir
-+/build/reproducible-path/git-2.45.2/t/trash directory.t0600-reffiles-backend/.git
-commit 89a3a1dedc5a76d0eefcd624dfb8d4f8004a1994
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    first
-
-commit c2327cb6b086a944f739ef59ddcffd3d45998884
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    Third
-
-commit e6940ad615916edba236dd73cb432b3598c8537f
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    Second
-
-commit d31adcd248e1f85d12741183d231fa5260dcfd5e
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    Initial
-Deleted branch rename-dest (was 89a3a1d).
-ok 29 - git branch -m with symlinked .git/refs
-
-checking prerequisite: SYMLINKS_WINDOWS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS_WINDOWS" &&
-	# test whether symbolic links are enabled on Windows
-	test_have_prereq MINGW &&
-	cmd //c "mklink y x" &> /dev/null && test -h y
-
-)
-prerequisite SYMLINKS_WINDOWS not satisfied
-ok 30 # skip rebase when .git/logs is a symlink (missing SYMLINKS_WINDOWS,MINGW of MINGW,SYMLINKS_WINDOWS)
-
-expecting success of 0600.31 'git reflog expire honors core.sharedRepository': 
-	umask 077 &&
-	git config core.sharedRepository group &&
-	git reflog expire --all &&
-	actual="$(ls -l .git/logs/refs/heads/main)" &&
-	case "$actual" in
-	-rw-rw-*)
-		: happy
-		;;
-	*)
-		echo Ooops, .git/logs/refs/heads/main is not 066x [$actual]
-		false
-		;;
-	esac
-
-ok 31 - git reflog expire honors core.sharedRepository
-
-# passed all 31 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1001-read-tree-m-2way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1001-read-tree-m-2way/.git/
-expecting success of 1001.1 'setup': 
-	echo frotz >frotz &&
-	echo nitfol >nitfol &&
-	cat bozbar-old >bozbar &&
-	echo rezrov >rezrov &&
-	echo yomin >yomin &&
-	git update-index --add nitfol bozbar rezrov &&
-	treeH=$(git write-tree) &&
-	echo treeH $treeH &&
-	git ls-tree $treeH &&
-
-	cat bozbar-new >bozbar &&
-	git update-index --add frotz bozbar --force-remove rezrov &&
-	git ls-files --stage >M.out &&
-	treeM=$(git write-tree) &&
-	echo treeM $treeM &&
-	git ls-tree $treeM &&
-	git diff-tree $treeH $treeM
-
-treeH ca3aa9e6ee09349df7db6f0de15016afcdf5d9e4
-100644 blob 3e8d9abb979a4fbdc93309f457a5496bc41ba6ab	bozbar
-100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
-100644 blob 766498d93a4b06057a8e49d23f4068f1170ff38f	rezrov
-treeM d2c045ead2ecb56f2632385a395918bf21816c12
-100644 blob 346d4e61f111336a1443ef6b2e834aa5b1a7f91a	bozbar
-100644 blob 8e4020bb5a8d8c873b25de15933e75cc0fc275df	frotz
-100644 blob dca6b92303befc93086aa025d90a5facd7eb2812	nitfol
-:100644 100644 3e8d9abb979a4fbdc93309f457a5496bc41ba6ab 346d4e61f111336a1443ef6b2e834aa5b1a7f91a M	bozbar
-:000000 100644 0000000000000000000000000000000000000000 8e4020bb5a8d8c873b25de15933e75cc0fc275df A	frotz
-:100644 000000 766498d93a4b06057a8e49d23f4068f1170ff38f 0000000000000000000000000000000000000000 D	rezrov
-ok 1 - setup
-
-expecting success of 1001.2 '1, 2, 3 - no carry forward': 
-	rm -f .git/index &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >1-3.out &&
-	test_cmp M.out 1-3.out &&
-	check_cache_at bozbar dirty &&
-	check_cache_at frotz dirty &&
-	check_cache_at nitfol dirty
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-bozbar: dirty
-frotz: dirty
-nitfol: dirty
-ok 2 - 1, 2, 3 - no carry forward
-
-expecting success of 1001.3 '4 - carry forward local addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	git update-index --add yomin &&
-	read_tree_twoway $treeH $treeM &&
-	git ls-files --stage >4.out &&
-	test_must_fail git diff --no-index M.out 4.out >4diff.out &&
-	compare_change 4diff.out expected &&
-	check_cache_at yomin clean
-
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0	yomin
-yomin: clean
-ok 3 - 4 - carry forward local addition.
-
-expecting success of 1001.4 '5 - carry forward local addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.4 '5 - carry forward local addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	read_tree_u_must_succeed -m -u $treeH &&
 	echo yomin >yomin &&
 	git update-index --add yomin &&
 	echo yomin yomin >yomin &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >5.out &&
-	test_must_fail git diff --no-index M.out 5.out >5diff.out &&
+	test_might_fail git diff -U0 --no-index M.out 5.out >5diff.out &&
 	compare_change 5diff.out expected &&
-	check_cache_at yomin dirty
+	check_cache_at yomin dirty &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	: dirty index should have prevented -u from checking it out. &&
+	echo yomin yomin >yomin1 &&
+	diff yomin yomin1 &&
+	rm -f yomin1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-100644 0a41e115ab61be0328a19b29f18cdcb49338d516 0	yomin
 yomin: dirty
 ok 4 - 5 - carry forward local addition.
 
-expecting success of 1001.5 '6 - local addition already has the same.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.5 '6 - local addition already has the same.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo frotz >frotz &&
 	git update-index --add frotz &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >6.out &&
 	test_cmp M.out 6.out &&
-	check_cache_at frotz clean
+	check_cache_at frotz clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	echo frotz >frotz1 &&
+	diff frotz frotz1 &&
+	rm -f frotz1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 frotz: clean
 ok 5 - 6 - local addition already has the same.
 
-expecting success of 1001.6 '7 - local addition already has the same.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.6 '7 - local addition already has the same.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo frotz >frotz &&
 	git update-index --add frotz &&
 	echo frotz frotz >frotz &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >7.out &&
 	test_cmp M.out 7.out &&
-	check_cache_at frotz dirty
+	check_cache_at frotz dirty &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp nitfol.M nitfol &&
+	: dirty index should have prevented -u from checking it out. &&
+	echo frotz frotz >frotz1 &&
+	diff frotz frotz1 &&
+	rm -f frotz1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 frotz: dirty
 ok 6 - 7 - local addition already has the same.
 
-expecting success of 1001.7 '8 - conflicting addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.7 '8 - conflicting addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo frotz frotz >frotz &&
 	git update-index --add frotz &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'frotz' would be overwritten by merge. Cannot merge.
 ok 7 - 8 - conflicting addition.
 
-expecting success of 1001.8 '9 - conflicting addition.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.8 '9 - conflicting addition.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo frotz frotz >frotz &&
 	git update-index --add frotz &&
 	echo frotz >frotz &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'frotz' would be overwritten by merge. Cannot merge.
 ok 8 - 9 - conflicting addition.
 
-expecting success of 1001.9 '10 - path removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.9 '10 - path removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo rezrov >rezrov &&
 	git update-index --add rezrov &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >10.out &&
-	test_cmp M.out 10.out
+	cmp M.out 10.out &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 ok 9 - 10 - path removed.
 
-expecting success of 1001.10 '11 - dirty path removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.10 '11 - dirty path removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo rezrov >rezrov &&
 	git update-index --add rezrov &&
 	echo rezrov rezrov >rezrov &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'rezrov' not uptodate. Cannot merge.
 ok 10 - 11 - dirty path removed.
 
-expecting success of 1001.11 '12 - unmatching local changes being removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.11 '12 - unmatching local changes being removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo rezrov rezrov >rezrov &&
 	git update-index --add rezrov &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
 ok 11 - 12 - unmatching local changes being removed.
 
-expecting success of 1001.12 '13 - unmatching local changes being removed.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.12 '13 - unmatching local changes being removed.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo rezrov rezrov >rezrov &&
 	git update-index --add rezrov &&
 	echo rezrov >rezrov &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
 ok 12 - 13 - unmatching local changes being removed.
 
-expecting success of 1001.13 '14 - unchanged in two heads.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.13 '14 - unchanged in two heads.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo nitfol nitfol >nitfol &&
 	git update-index --add nitfol &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >14.out &&
-	test_must_fail git diff --no-index M.out 14.out >14diff.out &&
+	test_must_fail git diff -U0 --no-index M.out 14.out >14diff.out &&
 	compare_change 14diff.out expected &&
-	check_cache_at nitfol clean
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	check_cache_at nitfol clean &&
+	echo nitfol nitfol >nitfol1 &&
+	diff nitfol nitfol1 &&
+	rm -f nitfol1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
 nitfol: clean
 ok 13 - 14 - unchanged in two heads.
 
-expecting success of 1001.14 '15 - unchanged in two heads.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.14 '15 - unchanged in two heads.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo nitfol nitfol >nitfol &&
 	git update-index --add nitfol &&
 	echo nitfol nitfol nitfol >nitfol &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >15.out &&
-	test_must_fail git diff --no-index M.out 15.out >15diff.out &&
+	test_must_fail git diff -U0 --no-index M.out 15.out >15diff.out &&
 	compare_change 15diff.out expected &&
-	check_cache_at nitfol dirty
+	check_cache_at nitfol dirty &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	echo nitfol nitfol nitfol >nitfol1 &&
+	diff nitfol nitfol1 &&
+	rm -f nitfol1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 7e1bf714fb103c778a21dd67411666901222425a 0	nitfol
 nitfol: dirty
 ok 14 - 15 - unchanged in two heads.
 
-expecting success of 1001.15 '16 - conflicting local change.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.15 '16 - conflicting local change.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo bozbar bozbar >bozbar &&
 	git update-index --add bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
 ok 15 - 16 - conflicting local change.
 
-expecting success of 1001.16 '17 - conflicting local change.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
+expecting success of 1002.16 '17 - conflicting local change.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
 	echo bozbar bozbar >bozbar &&
 	git update-index --add bozbar &&
 	echo bozbar bozbar bozbar >bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
 ok 16 - 17 - conflicting local change.
 
-expecting success of 1001.17 '18 - local change already having a good result.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-new >bozbar &&
+expecting success of 1002.17 '18 - local change already having a good result.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo gnusto >bozbar &&
 	git update-index --add bozbar &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >18.out &&
 	test_cmp M.out 18.out &&
-	check_cache_at bozbar clean
+	check_cache_at bozbar clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 bozbar: clean
 ok 17 - 18 - local change already having a good result.
 
-expecting success of 1001.18 '19 - local change already having a good result, further modified.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-new >bozbar &&
+expecting success of 1002.18 '19 - local change already having a good result, further modified.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo gnusto >bozbar &&
 	git update-index --add bozbar &&
 	echo gnusto gnusto >bozbar &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >19.out &&
 	test_cmp M.out 19.out &&
-	check_cache_at bozbar dirty
+	check_cache_at bozbar dirty &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol &&
+	echo gnusto gnusto >bozbar1 &&
+	diff bozbar bozbar1 &&
+	rm -f bozbar1
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
 bozbar: dirty
 ok 18 - 19 - local change already having a good result, further modified.
 
-expecting success of 1001.19 '20 - no local change, use new tree.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-old >bozbar &&
+expecting success of 1002.19 '20 - no local change, use new tree.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo bozbar >bozbar &&
 	git update-index --add bozbar &&
-	read_tree_twoway $treeH $treeM &&
+	read_tree_u_must_succeed -m -u $treeH $treeM &&
 	git ls-files --stage >20.out &&
 	test_cmp M.out 20.out &&
-	check_cache_at bozbar dirty
+	check_cache_at bozbar clean &&
+	test_cmp bozbar.M bozbar &&
+	test_cmp frotz.M frotz &&
+	test_cmp nitfol.M nitfol
 
-100644 346d4e61f111336a1443ef6b2e834aa5b1a7f91a 0	bozbar
-100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df 0	frotz
-100644 dca6b92303befc93086aa025d90a5facd7eb2812 0	nitfol
-bozbar: dirty
+bozbar: clean
 ok 19 - 20 - no local change, use new tree.
 
-expecting success of 1001.20 '21 - no local change, dirty cache.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	cat bozbar-old >bozbar &&
+expecting success of 1002.20 '21 - no local change, dirty cache.': 
+	rm -f .git/index nitfol bozbar rezrov frotz &&
+	read_tree_u_must_succeed --reset -u $treeH &&
+	echo bozbar >bozbar &&
 	git update-index --add bozbar &&
 	echo gnusto gnusto >bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
+	! read_tree_u_must_succeed -m -u $treeH $treeM
 
 error: Entry 'bozbar' not uptodate. Cannot merge.
 ok 20 - 21 - no local change, dirty cache.
 
-expecting success of 1001.21 '22 - local change cache updated.': 
-	rm -f .git/index &&
-	read_tree_must_succeed $treeH &&
-	git checkout-index -u -f -q -a &&
-	sed -e "s/such as/SUCH AS/" bozbar-old >bozbar &&
-	git update-index --add bozbar &&
-	if read_tree_twoway $treeH $treeM; then false; else :; fi
-
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 21 - 22 - local change cache updated.
-
-expecting success of 1001.22 'DF vs DF/DF case setup.': 
+expecting success of 1002.21 'DF vs DF/DF case setup.': 
 	rm -f .git/index &&
 	echo DF >DF &&
 	git update-index --add DF &&
@@ -40340,652 +40732,23 @@
 100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
 treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
 040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
-ok 22 - DF vs DF/DF case setup.
+ok 21 - DF vs DF/DF case setup.
 
-expecting success of 1001.23 'DF vs DF/DF case test.': 
+expecting success of 1002.22 'DF vs DF/DF case test.': 
 	rm -f .git/index &&
 	rm -fr DF &&
 	echo DF >DF &&
 	git update-index --add DF &&
-	read_tree_twoway $treeDF $treeDFDF &&
+	read_tree_u_must_succeed -m -u $treeDF $treeDFDF &&
 	git ls-files --stage >DFDFcheck.out &&
 	test_cmp DFDF.out DFDFcheck.out &&
-	check_cache_at DF/DF dirty &&
-	:
-
-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 | tee >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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1003-read-tree-prefix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1003-read-tree-prefix/.git/
-expecting success of 1003.1 'setup': 
-	echo hello >one &&
-	git update-index --add one &&
-	tree=$(git write-tree) &&
-	echo tree is $tree
-
-tree is 700196ec4e5b1c75e9f5481e5b545d78533ff917
-ok 1 - setup
-
-expecting success of 1003.2 'read-tree --prefix': 
-	git read-tree --prefix=two/ $tree &&
-	git ls-files >actual &&
-	cmp expect actual
-
-ok 2 - read-tree --prefix
-
-expecting success of 1003.3 'read-tree --prefix with leading slash exits with error': 
-	git rm -rf . &&
-	test_must_fail git read-tree --prefix=/two/ $tree &&
-	git read-tree --prefix=two/ $tree &&
-
-	git rm -rf . &&
-	test_must_fail git read-tree --prefix=/ $tree &&
-	git read-tree --prefix= $tree
-
-rm 'one'
-rm 'two/one'
-fatal: Invalid prefix, prefix cannot start with '/'
-rm 'two/one'
-fatal: Invalid prefix, prefix cannot start with '/'
-ok 3 - read-tree --prefix with leading slash exits with error
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0601-reffiles-pack-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0601-reffiles-pack-refs/.git/
-expecting success of 0601.1 'enable reflogs': 
-	git config core.logallrefupdates true
-
-ok 1 - enable reflogs
-
-expecting success of 0601.2 'prepare a trivial repository': 
-	echo Hello > A &&
-	git update-index --add A &&
-	git commit -m "Initial commit." &&
-	HEAD=$(git rev-parse --verify HEAD)
-
-[main (root-commit) 2daebe9] Initial commit.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-ok 2 - prepare a trivial repository
-
-expecting success of 0601.3 'pack-refs --prune --all': 
-	test_path_is_missing .git/packed-refs &&
-	git pack-refs --no-prune --all &&
-	test_path_is_file .git/packed-refs &&
-	N=$(find .git/refs -type f | wc -l) &&
-	test "$N" != 0 &&
-
-	git pack-refs --prune --all &&
-	test_path_is_file .git/packed-refs &&
-	N=$(find .git/refs -type f) &&
-	test -z "$N"
-
-ok 3 - pack-refs --prune --all
-
-expecting success of 0601.4 'see if git show-ref works as expected': 
-	git branch a &&
-	SHA1=$(cat .git/refs/heads/a) &&
-	echo "$SHA1 refs/heads/a" >expect &&
-	git show-ref a >result &&
-	test_cmp expect result
-
-ok 4 - see if git show-ref works as expected
-
-expecting success of 0601.5 'see if a branch still exists when packed': 
-	git branch b &&
-	git pack-refs --all &&
-	rm -f .git/refs/heads/b &&
-	echo "$SHA1 refs/heads/b" >expect &&
-	git show-ref b >result &&
-	test_cmp expect result
-
-ok 5 - see if a branch still exists when packed
-
-expecting success of 0601.6 'git branch c/d should barf if branch c exists': 
-	git branch c &&
-	git pack-refs --all &&
-	rm -f .git/refs/heads/c &&
-	test_must_fail git branch c/d
-
-fatal: cannot lock ref 'refs/heads/c/d': 'refs/heads/c' exists; cannot create 'refs/heads/c/d'
-ok 6 - git branch c/d should barf if branch c exists
-
-expecting success of 0601.7 'see if a branch still exists after git pack-refs --prune': 
-	git branch e &&
-	git pack-refs --all --prune &&
-	echo "$SHA1 refs/heads/e" >expect &&
-	git show-ref e >result &&
-	test_cmp expect result
-
-ok 7 - see if a branch still exists after git pack-refs --prune
-
-expecting success of 0601.8 'see if git pack-refs --prune remove ref files': 
-	git branch f &&
-	git pack-refs --all --prune &&
-	! test -f .git/refs/heads/f
-
-ok 8 - see if git pack-refs --prune remove ref files
-
-expecting success of 0601.9 'see if git pack-refs --prune removes empty dirs': 
-	git branch r/s/t &&
-	git pack-refs --all --prune &&
-	! test -e .git/refs/heads/r
-
-ok 9 - see if git pack-refs --prune removes empty dirs
-
-expecting success of 0601.10 'git branch g should work when git branch g/h has been deleted': 
-	git branch g/h &&
-	git pack-refs --all --prune &&
-	git branch -d g/h &&
-	git branch g &&
-	git pack-refs --all &&
-	git branch -d g
-
-Deleted branch g/h (was 2daebe9).
-Deleted branch g (was 2daebe9).
-ok 10 - git branch g should work when git branch g/h has been deleted
-
-expecting success of 0601.11 'git branch i/j/k should barf if branch i exists': 
-	git branch i &&
-	git pack-refs --all --prune &&
-	test_must_fail git branch i/j/k
-
-fatal: cannot lock ref 'refs/heads/i/j/k': 'refs/heads/i' exists; cannot create 'refs/heads/i/j/k'
-ok 11 - git branch i/j/k should barf if branch i exists
-
-expecting success of 0601.12 'test git branch k after branch k/l/m and k/lm have been deleted': 
-	git branch k/l &&
-	git branch k/lm &&
-	git branch -d k/l &&
-	git branch k/l/m &&
-	git branch -d k/l/m &&
-	git branch -d k/lm &&
-	git branch k
-
-Deleted branch k/l (was 2daebe9).
-Deleted branch k/l/m (was 2daebe9).
-Deleted branch k/lm (was 2daebe9).
-ok 12 - test git branch k after branch k/l/m and k/lm have been deleted
-
-expecting success of 0601.13 'test git branch n after some branch deletion and pruning': 
-	git branch n/o &&
-	git branch n/op &&
-	git branch -d n/o &&
-	git branch n/o/p &&
-	git branch -d n/op &&
-	git pack-refs --all --prune &&
-	git branch -d n/o/p &&
-	git branch n
-
-Deleted branch n/o (was 2daebe9).
-Deleted branch n/op (was 2daebe9).
-Deleted branch n/o/p (was 2daebe9).
-ok 13 - test git branch n after some branch deletion and pruning
-
-expecting success of 0601.14 'test excluded refs are not packed': 
-	git branch dont_pack1 &&
-	git branch dont_pack2 &&
-	git branch pack_this &&
-	git pack-refs --all --exclude "refs/heads/dont_pack*" &&
-	test -f .git/refs/heads/dont_pack1 &&
-	test -f .git/refs/heads/dont_pack2 &&
-	! test -f .git/refs/heads/pack_this
-ok 14 - test excluded refs are not packed
-
-expecting success of 0601.15 'test --no-exclude refs clears excluded refs': 
-	git branch dont_pack3 &&
-	git branch dont_pack4 &&
-	git pack-refs --all --exclude "refs/heads/dont_pack*" --no-exclude &&
-	! test -f .git/refs/heads/dont_pack3 &&
-	! test -f .git/refs/heads/dont_pack4
-ok 15 - test --no-exclude refs clears excluded refs
-
-expecting success of 0601.16 'test only included refs are packed': 
-	git branch pack_this1 &&
-	git branch pack_this2 &&
-	git tag dont_pack5 &&
-	git pack-refs --include "refs/heads/pack_this*" &&
-	test -f .git/refs/tags/dont_pack5 &&
-	! test -f .git/refs/heads/pack_this1 &&
-	! test -f .git/refs/heads/pack_this2
-ok 16 - test only included refs are packed
-
-expecting success of 0601.17 'test --no-include refs clears included refs': 
-	git branch pack1 &&
-	git branch pack2 &&
-	git pack-refs --include "refs/heads/pack*" --no-include &&
-	test -f .git/refs/heads/pack1 &&
-	test -f .git/refs/heads/pack2
-ok 17 - test --no-include refs clears included refs
-
-expecting success of 0601.18 'test --exclude takes precedence over --include': 
-	git branch dont_pack5 &&
-	git pack-refs --include "refs/heads/pack*" --exclude "refs/heads/pack*" &&
-	test -f .git/refs/heads/dont_pack5
-ok 18 - test --exclude takes precedence over --include
-
-expecting success of 0601.19 '--auto packs and prunes refs as usual': 
-	git branch auto &&
-	test_path_is_file .git/refs/heads/auto &&
-	git pack-refs --auto --all &&
-	test_path_is_missing .git/refs/heads/auto
-
-ok 19 - --auto packs and prunes refs as usual
-
-expecting success of 0601.20 '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 20 - see if up-to-date packed refs are preserved
-
-expecting success of 0601.21 '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 21 - pack, prune and repack
-
-expecting success of 0601.22 '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 22 - explicit pack-refs with dangling packed reference
-
-expecting success of 0601.23 '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 23 - delete ref with dangling packed version
-
-expecting success of 0601.24 '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 24 - delete ref while another dangling packed ref
-
-expecting success of 0601.25 '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 25 - pack ref directly below refs/
-
-expecting success of 0601.26 '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 26 - do not pack ref in refs/bisect
-
-expecting success of 0601.27 'disable reflogs': 
-	git config core.logallrefupdates false &&
-	rm -rf .git/logs
-
-ok 27 - disable reflogs
-
-expecting success of 0601.28 '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 28 - create packed foo/bar/baz branch
-
-expecting success of 0601.29 '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 29 - notice d/f conflict with existing directory
-
-expecting success of 0601.30 '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 30 - existing directory reports concrete ref
-
-expecting success of 0601.31 '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 31 - notice d/f conflict with existing ref
-
-expecting success of 0601.32 '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 32 - reject packed-refs with unterminated line
-
-expecting success of 0601.33 '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 33 - reject packed-refs containing junk
-
-expecting success of 0601.34 '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 34 - reject packed-refs with a short SHA-1
-
-expecting success of 0601.35 '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.45.2/t/trash directory.t0601-reffiles-pack-refs/.git/packed-refs.lock': File exists.
-
-Another git process seems to be running in this repository, e.g.
-an editor opened by 'git commit'. Please make sure all processes
-are terminated then try again. If it still fails, a git process
-may have crashed in this repository earlier:
-remove the file manually to continue.
-ok 35 - timeout if packed-refs.lock exists
-
-expecting success of 0601.36 '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 36 - 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.37 '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 37 - pack symlinked packed-refs
-
-expecting success of 0601.38 '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 38 - refs/worktree must not be packed
-
-expecting success of 0601.39 '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 39 - create packed-refs file with broken ref
-
-expecting success of 0601.40 '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 40 - pack-refs does not silently delete broken packed ref
-
-expecting success of 0601.41 '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 41 - pack-refs does not drop broken refs during deletion
-
-expecting success of 0601.42 'maintenance --auto unconditionally packs loose refs': 
-	git update-ref refs/heads/something HEAD &&
-	test_path_is_file .git/refs/heads/something &&
-	git rev-parse refs/heads/something >expect &&
-	git maintenance run --task=pack-refs --auto &&
-	test_path_is_missing .git/refs/heads/something &&
-	git rev-parse refs/heads/something >actual &&
-	test_cmp expect actual
+	check_cache_at DF/DF clean
 
-ok 42 - maintenance --auto unconditionally packs loose refs
+DF/DF: clean
+ok 22 - DF vs DF/DF case test.
 
-# passed all 42 test(s)
-1..42
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1005-read-tree-reset.sh ***
@@ -41501,9303 +41264,7736 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1002-read-tree-m-u-2way.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t1008-read-tree-overlay.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1008-read-tree-overlay/.git/
+expecting success of 1008.1 'setup': 
+	echo one >a &&
+	git add a &&
+	git commit -m initial &&
+	git tag initial &&
+	echo two >b &&
+	git add b &&
+	git commit -m second &&
+	git checkout -b side initial &&
+	echo three >a &&
+	mkdir b &&
+	echo four >b/c &&
+	git add b/c &&
+	git commit -m third
 
-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
+[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 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
+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
 
-bozbar: clean
-frotz: clean
-nitfol: clean
-ok 2 - 1, 2, 3 - no carry forward
+ok 2 - multi-read
 
-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
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1009-read-tree-new-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-yomin: clean
-ok 3 - 4 - carry forward local addition.
+[main (root-commit) 4d54ff5] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+ok 1 - setup
 
-expecting success of 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
+expecting success of 1009.2 'non-existent index file': 
+	rm -f new-index &&
+	GIT_INDEX_FILE=new-index git read-tree main
 
-yomin: dirty
-ok 4 - 5 - carry forward local addition.
+ok 2 - non-existent index file
 
-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
+expecting success of 1009.3 'empty index file': 
+	rm -f new-index &&
+	> new-index &&
+	GIT_INDEX_FILE=new-index git read-tree main
 
-frotz: clean
-ok 5 - 6 - local addition already has the same.
+ok 3 - empty index file
 
-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
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1007-hash-object.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/.git/
+expecting success of 1007.1 'setup': 
+	setup_repo &&
+	test_oid_cache <<-EOF
+	hello sha1:5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	hello sha256:1e3b6c04d2eeb2b3e45c8a330445404c0b7cc7b257e2b097167d26f5230090c4
 
-frotz: dirty
-ok 6 - 7 - local addition already has the same.
+	example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+	example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
+	EOF
 
-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 1 - setup
 
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 7 - 8 - conflicting addition.
+expecting success of 1007.2 'multiple '--stdin's are rejected': 
+	echo example | test_must_fail git hash-object --stdin --stdin
 
-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: 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]
 
-error: Entry 'frotz' would be overwritten by merge. Cannot merge.
-ok 8 - 9 - conflicting addition.
+    -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 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 2 - multiple '--stdin's are rejected
 
-ok 9 - 10 - path removed.
+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
 
-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: 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]
 
-error: Entry 'rezrov' not uptodate. Cannot merge.
-ok 10 - 11 - dirty path removed.
+    -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 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: 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]
 
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 11 - 12 - unmatching local changes being removed.
+    -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 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 3 - Can't use --stdin and --stdin-paths together
 
-error: Entry 'rezrov' would be overwritten by merge. Cannot merge.
-ok 12 - 13 - unmatching local changes being removed.
+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
 
-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
+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]
 
-nitfol: clean
-ok 13 - 14 - unchanged in two heads.
+    -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 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
+ok 4 - Can't pass filenames as arguments with --stdin-paths
 
-nitfol: dirty
-ok 14 - 15 - unchanged in two heads.
+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 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: 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]
 
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 15 - 16 - conflicting local change.
+    -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 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
+ok 5 - Can't use --path with --stdin-paths
 
-error: Entry 'bozbar' would be overwritten by merge. Cannot merge.
-ok 16 - 17 - conflicting local change.
+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 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
+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]
 
-bozbar: clean
-ok 17 - 18 - local change already having a good result.
+    -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 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
+ok 6 - Can't use --path with --no-filters
 
-bozbar: dirty
-ok 18 - 19 - local change already having a good result, further modified.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.7 'hash a file': 
+	test "$(test_oid hello)" = $(git hash-object hello)
 
-expecting success of 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
+ok 7 - hash a file
 
-bozbar: clean
-ok 19 - 20 - no local change, use new tree.
+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 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
+expecting success of 1007.9 'hash from stdin': 
+	test "$(test_oid example)" = $(git hash-object --stdin < example)
 
-error: Entry 'bozbar' not uptodate. Cannot merge.
-ok 20 - 21 - no local change, dirty cache.
+ok 9 - hash from stdin
 
-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 &&
+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
 
-	rm -f DF &&
-	mkdir DF &&
-	echo DF/DF >DF/DF &&
-	git update-index --add --remove DF DF/DF &&
-	treeDFDF=$(git write-tree) &&
-	echo treeDFDF $treeDFDF &&
-	git ls-tree $treeDFDF &&
-	git ls-files --stage >DFDF.out
+expecting success of 1007.11 'hash a file and write to database': 
+	test "$(test_oid hello)" = $(git hash-object -w hello)
 
-treeDF 6bf22db9043f2b5821c019d0ce0f2605421affcb
-100644 blob 052efc3abbc31348f7abd34535b1953d38273257	DF
-treeDFDF c38e296263d024b0f48c4a728d293232ac6c5443
-040000 tree 90bbead36f4d6a7c325fd450e6cfbcc7479d421a	DF
-ok 21 - DF vs DF/DF case setup.
+ok 11 - hash a file and write to database
 
-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
+expecting success of 1007.12 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+	
+Hello Worldok 12 - blob exists in database
 
-DF/DF: clean
-ok 22 - DF vs DF/DF case test.
+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"
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0450-txt-doc-vs-help.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0450-txt-doc-vs-help/.git/
-expecting success of 0450.1 'setup: list of builtins': 
-	git --list-cmds=builtins >builtins
+ok 13 - git hash-object --stdin file1 <file0 first operates on file0, then file1
 
-ok 1 - setup: list of builtins
+expecting success of 1007.14 'set up crlf tests': 
+	echo fooQ | tr Q "\\015" >file0 &&
+	cp file0 file1 &&
+	echo "file0 -crlf" >.gitattributes &&
+	echo "file1 crlf" >>.gitattributes &&
+	git config core.autocrlf true &&
+	file0_sha=$(git hash-object file0) &&
+	file1_sha=$(git hash-object file1) &&
+	test "$file0_sha" != "$file1_sha"
 
-expecting success of 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
+ok 14 - set up crlf tests
 
-ok 2 - list of txt and help mismatches is sorted
+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 0450.3 'add -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 3 - add -h output has no \t
+ok 15 - check that appropriate filter is invoke when --path is used
 
-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 1007.16 'gitattributes also work in a subdirectory': 
+	mkdir subdir &&
+	(
+		cd subdir &&
+		subdir_sha0=$(git hash-object ../file0) &&
+		subdir_sha1=$(git hash-object ../file1) &&
+		test "$file0_sha" = "$subdir_sha0" &&
+		test "$file1_sha" = "$subdir_sha1"
+	)
 
-expecting success of 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
+ok 16 - gitattributes also work in a subdirectory
 
-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
+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"
+	)
 
-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")" &&
+ok 17 - --path works in a subdirectory
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:30.870773267 +0000
-+++ help	2025-12-18 01:32:30.874773267 +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 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"
 
-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 18 - check that --no-filters option works
 
-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 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 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 19 - check that --no-filters option works with --stdin-paths
 
-expecting success of 0450.11 'am *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.20 'hash from stdin and write to database (-w --stdin)': 
+		test "$(test_oid example)" = $(git hash-object $args < example)
 	
-ok 11 - am *.txt SYNOPSIS has dashed labels
-
-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")" &&
+ok 20 - hash from stdin and write to database (-w --stdin)
 
-		# The *.txt and -h use different spacing for 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 1007.21 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
 	
---- txt	2025-12-18 01:32:30.902773267 +0000
-+++ help	2025-12-18 01:32:30.902773267 +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 | --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
+This is an exampleok 21 - blob exists in database
 
-expecting success of 0450.13 'annotate -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.22 'hash from stdin and write to database (--stdin -w)': 
+		test "$(test_oid example)" = $(git hash-object $args < example)
 	
-ok 13 - annotate -h output has no \t
+ok 22 - hash from stdin and write to database (--stdin -w)
 
-expecting success of 0450.14 'annotate -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1007.23 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
 	
-ok 14 - annotate -h output has dashed labels
+This is an exampleok 23 - blob exists in database
 
-expecting success of 0450.15 'annotate -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 15 - annotate -h output has consistent spacing
+expecting success of 1007.24 'hash two files with names on stdin': 
+	test "$oids" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
 
-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
+ok 24 - hash two files with names on stdin
 
-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")" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.25 'hash two files with names on stdin and write to database (-w --stdin-paths)': 
+		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
+	
+ok 25 - hash two files with names on stdin and write to database (-w --stdin-paths)
 
-		# The *.txt and -h use different spacing for 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 1007.26 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
 	
-ok 17 - annotate -h output and SYNOPSIS agree
+Hello Worldok 26 - blob exists in database
 
-expecting success of 0450.18 'apply -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1007.27 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
 	
-ok 18 - apply -h output has no \t
+This is an exampleok 27 - blob exists in database
 
-expecting success of 0450.19 'apply -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
+expecting success of 1007.28 'hash two files with names on stdin and write to database (--stdin-paths -w)': 
+		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
 	
-ok 19 - apply -h output has dashed labels
+ok 28 - hash two files with names on stdin and write to database (--stdin-paths -w)
 
-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
+expecting success of 1007.29 'blob exists in database': 
+		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
 	
-ok 20 - apply -h output has consistent spacing
+Hello Worldok 29 - blob exists in database
 
-expecting success of 0450.21 'apply *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1007.30 'blob exists in database': 
+		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
 	
-ok 21 - apply *.txt SYNOPSIS has dashed labels
+This is an exampleok 30 - blob exists in database
 
-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 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
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:30.966773267 +0000
-+++ help	2025-12-18 01:32:30.970773267 +0000
-@@ -1,8 +1 @@
--git apply [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]
--          [--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
+error: too-short tree object
+ok 31 - too-short tree
 
-expecting success of 0450.23 'archive -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 23 - archive -h output has no \t
+expecting success of 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 0450.24 'archive -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 24 - archive -h output has dashed labels
+error: malformed mode in tree entry
+ok 32 - malformed mode in tree
 
-expecting success of 0450.25 'archive -h output has consistent spacing': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		sed -n \
-			-e "/^ / {
-				s/[^ ].*//;
-				p;
-			}" \
-			<"$h2s" >help &&
-		sort -u help >help.ws &&
-		if test -s help.ws
-		then
-			test_line_count = 1 help.ws
-		fi
-	
-ok 25 - archive -h output has consistent spacing
+expecting success of 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 0450.26 'archive *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 26 - archive *.txt SYNOPSIS has dashed labels
+error: empty filename in tree entry
+ok 33 - empty filename in tree
 
-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 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
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:30.998773267 +0000
-+++ help	2025-12-18 01:32:30.998773267 +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
+error: object fails fsck: duplicateEntries: contains duplicate file entries
+ok 34 - duplicate filename in tree
 
-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 1007.35 'corrupt commit': 
+	test_must_fail git hash-object -t commit --stdin </dev/null
 
-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
+error: object fails fsck: unterminatedHeader: unterminated header
+fatal: refusing to create malformed object
+ok 35 - corrupt commit
 
-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
+expecting success of 1007.36 'corrupt tag': 
+	test_must_fail git hash-object -t tag --stdin </dev/null
 
-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
+error: object fails fsck: unterminatedHeader: unterminated header
+fatal: refusing to create malformed object
+ok 36 - corrupt tag
 
-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 1007.37 'hash-object complains about bogus type name': 
+	test_must_fail git hash-object -t bogus --stdin </dev/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	2025-12-18 01:32:31.030773267 +0000
-+++ help	2025-12-18 01:32:31.030773267 +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
+fatal: invalid object type "bogus"
+ok 37 - hash-object complains about bogus type name
 
-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
+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 0450.34 'blame -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 34 - blame -h output has dashed labels
+fatal: invalid object type "bl"
+ok 38 - hash-object complains about truncated type name
 
-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
+expecting success of 1007.39 '--literally': 
+	t=1234567890 &&
+	echo example | git hash-object -t $t --literally --stdin
 
-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
+f78b23c3f872d473c764d5fcf4fb39af8bbf2123
+ok 39 - --literally
 
-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")" &&
+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
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:31.058773267 +0000
-+++ help	2025-12-18 01:32:31.062773267 +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
+2a881776ee43e849175ee7158075560ca0ae7692
+ok 40 - --literally with extra-long type
 
-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
+# passed all 40 test(s)
+1..40
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1010-mktree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1010-mktree/.git/
+expecting success of 1010.1 'setup': 
+	for d in a a- a0
+	do
+		mkdir "$d" && echo "$d/one" >"$d/one" &&
+		git add "$d" || return 1
+	done &&
+	echo zero >one &&
+	git update-index --add --info-only one &&
+	git write-tree --missing-ok >tree.missing &&
+	git ls-tree $(cat tree.missing) >top.missing &&
+	git ls-tree -r $(cat tree.missing) >all.missing &&
+	echo one >one &&
+	git add one &&
+	git write-tree >tree &&
+	git ls-tree $(cat tree) >top &&
+	git ls-tree -r $(cat tree) >all &&
+	test_tick &&
+	git commit -q -m one &&
+	H=$(git rev-parse HEAD) &&
+	git update-index --add --cacheinfo 160000 $H sub &&
+	test_tick &&
+	git commit -q -m two &&
+	git rev-parse HEAD^{tree} >tree.withsub &&
+	git ls-tree HEAD >top.withsub &&
+	git ls-tree -r HEAD >all.withsub
 
-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
+ok 1 - setup
 
-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
+expecting success of 1010.2 'ls-tree piped to mktree (1)': 
+	git mktree <top >actual &&
+	test_cmp tree actual
 
-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
+ok 2 - ls-tree piped to mktree (1)
 
-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")" &&
+expecting success of 1010.3 'ls-tree piped to mktree (2)': 
+	git mktree <top.withsub >actual &&
+	test_cmp tree.withsub 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-12-18 01:32:31.090773267 +0000
-+++ help	2025-12-18 01:32:31.094773267 +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
+ok 3 - ls-tree piped to mktree (2)
 
-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 1010.4 'ls-tree output in wrong order given to mktree (1)': 
+	perl -e "print reverse <>" <top |
+	git mktree >actual &&
+	test_cmp tree actual
 
-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
+ok 4 - ls-tree output in wrong order given to mktree (1)
 
-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
+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
 
-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
+ok 5 - ls-tree output in wrong order given to mktree (2)
 
-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")" &&
+expecting success of 1010.6 'allow missing object with --missing': 
+	git mktree --missing <top.missing >actual &&
+	test_cmp tree.missing 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
+ok 6 - allow missing object with --missing
 
-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 1010.7 'mktree refuses to read ls-tree -r output (1)': 
+	test_must_fail git mktree <all
 
-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
+fatal: path a-/one contains slash
+ok 7 - mktree refuses to read ls-tree -r output (1)
 
-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 1010.8 'mktree refuses to read ls-tree -r output (2)': 
+	test_must_fail git mktree <all.withsub
 
-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
+fatal: path a-/one contains slash
+ok 8 - mktree refuses to read ls-tree -r output (2)
 
-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 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1011-read-tree-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1011-read-tree-sparse-checkout/.git/
+expecting success of 1011.1 'setup': 
+	test_commit init &&
+	echo modified >>init.t &&
 
-		# The *.txt and -h use different spacing for 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
+	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
 
-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
+	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
 
-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
+[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'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.56 'cat-file *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 56 - cat-file *.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.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")" &&
+  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 57 - cat-file -h output and SYNOPSIS agree
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 9598e22 modified and added
+ok 1 - setup
 
-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
+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
 
-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 2 - read-tree without .git/info/sparse-checkout
 
-		# The *.txt and -h use different spacing for 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 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 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
+ok 3 - read-tree with .git/info/sparse-checkout but disabled
 
-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
+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 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
+ok 4 - read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled
 
-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
+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 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 5 - read-tree with empty .git/info/sparse-checkout
 
-		# The *.txt and -h use different spacing for 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 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 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
+	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
 
-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 6 - match directories with trailing slash
 
-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 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
 
-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
+ok 7 - match directories without trailing slash
 
-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 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
 
-		# The *.txt and -h use different spacing for 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
+	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
 
-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
+ok 8 - match directories with negated patterns
 
-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
+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
 
-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
+	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 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
+ok 9 - match directories with negated patterns (2)
 
-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 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
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:31.302773267 +0000
-+++ help	2025-12-18 01:32:31.302773267 +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
+ok 10 - match directory pattern
 
-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 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 0450.79 'checkout -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 79 - checkout -h output has dashed labels
+	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
 
-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
+ok 11 - checkout area changes
 
-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
+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
 
-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")" &&
+HEAD is now at 9598e22 modified and added
+ok 12 - read-tree updates worktree, absent 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
-	
---- txt	2025-12-18 01:32:31.330773267 +0000
-+++ help	2025-12-18 01:32:31.334773267 +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
+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 &&
 
-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
+	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 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
+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 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 1011.14 'read-tree will not throw away dirty changes, sparse': 
+	echo "/*" >.git/info/sparse-checkout &&
+	read_tree_u_must_succeed -m -u HEAD &&
 
-ok 86 # skip checkout--worker *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_CHECKOUT__WORKER)
+	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 87 # skip checkout--worker -h output and SYNOPSIS agree (missing BUILTIN_TXT_CHECKOUT__WORKER)
+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 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
+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
 
-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
+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 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 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
 
-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
+HEAD is now at 9598e22 modified and added
+ok 16 - read-tree removes worktree, dirty case
 
-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")" &&
+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
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:31.378773267 +0000
-+++ help	2025-12-18 01:32:31.378773267 +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
+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 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 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
 
-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
+HEAD is now at de70956 removed
+ok 18 - read-tree adds to worktree, dirty case
 
-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
+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
 
-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
+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 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 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
 
-		# The *.txt and -h use different spacing for 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
+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 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 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 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
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
+EOF
+	test_cmp expected actual
 
-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
+Previous HEAD position was de70956 removed
+HEAD is now at 2519212 init
+ok 21 - print warnings when some worktree updates disabled
 
-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 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 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")" &&
+HEAD is now at 9598e22 modified and added
+Updated 1 path from the index
+ok 22 - checkout without --ignore-skip-worktree-bits
 
-		# The *.txt and -h use different spacing for 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 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
 
-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
+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 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 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1012-read-tree-df.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1012-read-tree-df/.git/
+expecting success of 1012.1 'setup': 
+	maketree O-000 a/b-2/c/d a/b/c/d a/x &&
+	maketree A-000 a/b-2/c/d a/b/c/d a/x &&
+	maketree A-001 a/b-2/c/d a/b/c/d a/b/c/e a/x &&
+	maketree B-000 a/b-2/c/d a/b     a/x &&
 
-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
+	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: &&
 
-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
+	maketree O-020 ds/dma/ioat.c ds/dma/ioat_dca.c &&
+	maketree A-020 ds/dma/ioat/Makefile ds/dma/ioat/registers.h &&
+	:
 
-expecting success of 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")" &&
+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 107 - clean -h output and SYNOPSIS agree
+expecting success of 1012.2 '3-way (1)': 
+	settree A-000 &&
+	read_tree_u_must_succeed -m -u O-000 A-000 B-000 &&
+	checkindex <<-EOF
+	3 a/b
+	0 a/b-2/c/d
+	1 a/b/c/d
+	2 a/b/c/d
+	0 a/x
+	EOF
 
-expecting success of 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 2 - 3-way (1)
 
-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 1012.3 '3-way (2)': 
+	settree A-001 &&
+	read_tree_u_must_succeed -m -u O-000 A-001 B-000 &&
+	checkindex <<-EOF
+	3 a/b
+	0 a/b-2/c/d
+	1 a/b/c/d
+	2 a/b/c/d
+	2 a/b/c/e
+	0 a/x
+	EOF
 
-expecting success of 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
+ok 3 - 3-way (2)
 
-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
+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
 
-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")" &&
+ok 4 - 3-way (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	2025-12-18 01:32:31.498773267 +0000
-+++ help	2025-12-18 01:32:31.502773267 +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
+expecting success of 1012.5 '2-way (1)': 
+	settree O-020 &&
+	read_tree_u_must_succeed -m -u O-020 A-020 &&
+	checkindex <<-EOF
+	0 ds/dma/ioat/Makefile
+	0 ds/dma/ioat/registers.h
+	EOF
 
-expecting success of 0450.113 'column -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 113 - column -h output has no \t
+ok 5 - 2-way (1)
 
-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
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1014-read-tree-confusing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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})
 
-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
+[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 0450.116 'column *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 116 - column *.txt SYNOPSIS has dashed labels
+expecting success of 1014.2 'enable core.protectHFS for rejection tests': 
+	git config core.protectHFS true
 
-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")" &&
+ok 2 - enable core.protectHFS for rejection tests
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:31.526773267 +0000
-+++ help	2025-12-18 01:32:31.530773267 +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
+expecting success of 1014.3 'enable core.protectNTFS for rejection tests': 
+	git config core.protectNTFS true
 
-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
+ok 3 - enable core.protectNTFS for rejection tests
 
-expecting success of 0450.119 'commit -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+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
 	
-ok 119 - commit -h output has dashed labels
+error: invalid path '.'
+ok 4 - reject . at end of path
 
-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
+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
 	
-ok 120 - commit -h output has consistent spacing
+error: invalid path './file'
+ok 5 - reject . as subtree
 
-expecting success of 0450.121 'commit *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+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
 	
-ok 121 - commit *.txt SYNOPSIS has dashed labels
-
-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")" &&
+error: invalid path '..'
+ok 6 - reject .. at end of 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
+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
 	
-ok 122 - commit -h output and SYNOPSIS agree
+error: invalid path '../file'
+ok 7 - reject .. as subtree
 
-expecting success of 0450.123 'commit-graph -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1014.8 'reject .git at end of path': 
+		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
+		bogus=$(git mktree <tree) &&
+		test_must_fail git read-tree $bogus
 	
-ok 123 - commit-graph -h output has no \t
+error: invalid path '.git'
+ok 8 - reject .git at end of path
 
-expecting success of 0450.124 'commit-graph -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+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
 	
-ok 124 - commit-graph -h output has dashed labels
+error: invalid path '.git/file'
+ok 9 - reject .git as subtree
 
-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
+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
 	
-ok 125 - commit-graph -h output has consistent spacing
+error: invalid path '.GIT'
+ok 10 - reject .GIT at end of path
 
-expecting success of 0450.126 'commit-graph *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+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
 	
-ok 126 - commit-graph *.txt SYNOPSIS has dashed labels
-
-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")" &&
+error: invalid path '.GIT/file'
+ok 11 - reject .GIT as subtree
 
-		# The *.txt and -h use different spacing for 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 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
 	
-ok 127 - commit-graph -h output and SYNOPSIS agree
+error: invalid path '‌.Git'
+ok 12 - reject {u200c}.Git at end of path
 
-expecting success of 0450.128 'commit-tree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+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
 	
-ok 128 - commit-tree -h output has no \t
+error: invalid path '‌.Git/file'
+ok 13 - reject {u200c}.Git as subtree
 
-expecting success of 0450.129 'commit-tree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+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
 	
-ok 129 - commit-tree -h output has dashed labels
+error: invalid path '.gI‌T'
+ok 14 - reject .gI{u200c}T at end of path
 
-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
+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
 	
-ok 130 - commit-tree -h output has consistent spacing
+error: invalid path '.gI‌T/file'
+ok 15 - reject .gI{u200c}T as subtree
 
-expecting success of 0450.131 'commit-tree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+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
 	
-ok 131 - commit-tree *.txt SYNOPSIS has dashed labels
-
-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")" &&
+error: invalid path '.GiT‌'
+ok 16 - reject .GiT{u200c} at end of 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
+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
 	
-ok 132 - commit-tree -h output and SYNOPSIS agree
+error: invalid path '.GiT‌/file'
+ok 17 - reject .GiT{u200c} as subtree
 
-expecting success of 0450.133 'config -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+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
 	
-ok 133 - config -h output has no \t
+error: invalid path 'git~1'
+ok 18 - reject git~1 at end of path
 
-expecting success of 0450.134 'config -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+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
 	
-ok 134 - config -h output has dashed labels
+error: invalid path 'git~1/file'
+ok 19 - reject git~1 as subtree
 
-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
+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
 	
-ok 135 - config -h output has consistent spacing
+error: invalid path '.git. '
+ok 20 - reject .git.{space} at end of path
 
-expecting success of 0450.136 'config *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+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
 	
-ok 136 - config *.txt SYNOPSIS has dashed labels
+error: invalid path '.git. /file'
+ok 21 - reject .git.{space} as subtree
 
-checking known breakage 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 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
 
-		# The *.txt and -h use different spacing for 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 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
 	
---- txt	2025-12-18 01:32:31.650773267 +0000
-+++ help	2025-12-18 01:32:31.654773267 +0000
-@@ -1,15 +1 @@
--git config [<file-option>] [--type=<type>] [--comment=<message>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]
--git config [<file-option>] [--type=<type>] [--comment=<message>] --add <name> <value>
--git config [<file-option>] [--type=<type>] [--comment=<message>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]
--git config [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]
--git config [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]
--git config [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]
--git config [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>
--git config [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]
--git config [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]
--git config [<file-option>] --rename-section <old-name> <new-name>
--git config [<file-option>] --remove-section <name>
--git config [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
--git config [<file-option>] --get-color <name> [<default>]
--git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]
--git config [<file-option>] -e | --edit
-+git config [<options>]
-not ok 137 - config -h output and SYNOPSIS agree # TODO known breakage
+error: invalid path '.\.GIT\foobar/file'
+ok 23 - reject backslashes as subtree
 
-expecting success of 0450.138 'count-objects -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+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
 	
-ok 138 - count-objects -h output has no \t
+error: invalid path '.git\foobar'
+ok 24 - reject backslashes2 at end of path
 
-expecting success of 0450.139 'count-objects -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+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
 	
-ok 139 - count-objects -h output has dashed labels
+error: invalid path '.git\foobar/file'
+ok 25 - reject backslashes2 as subtree
 
-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
+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
 	
-ok 140 - count-objects -h output has consistent spacing
+error: invalid path '.git...:alternate-stream'
+ok 26 - reject .git...:alternate-stream at end of path
 
-expecting success of 0450.141 'count-objects *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+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
 	
-ok 141 - count-objects *.txt SYNOPSIS has dashed labels
+error: invalid path '.git...:alternate-stream/file'
+ok 27 - reject .git...:alternate-stream as subtree
 
-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")" &&
+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
 
-		# The *.txt and -h use different spacing for 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
+ok 28 - utf-8 paths allowed with core.protectHFS off
 
-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
+# passed all 28 test(s)
+1..28
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1015-read-index-unmerged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1015-read-index-unmerged/.git/
+expecting success of 1015.1 'setup modify/delete + directory/file conflict': 
+	test_create_repo df_plus_modify_delete &&
+	(
+		cd df_plus_modify_delete &&
 
-expecting success of 0450.144 'credential -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 144 - credential -h output has dashed labels
+		test_write_lines a b c d e f g h >letters &&
+		git add letters &&
+		git commit -m initial &&
 
-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
+		git checkout -b modify &&
+		# Throw in letters.txt for sorting order fun
+		# ("letters.txt" sorts between "letters" and "letters/file")
+		echo i >>letters &&
+		echo "version 2" >letters.txt &&
+		git add letters letters.txt &&
+		git commit -m modified &&
 
-expecting success of 0450.146 'credential *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 146 - credential *.txt SYNOPSIS has dashed labels
+		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
+	)
 
-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")" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:31.710773267 +0000
-+++ help	2025-12-18 01:32:31.714773267 +0000
-@@ -0,0 +1 @@
-+git credential (fill|approve|reject)
-not ok 147 - credential -h output and SYNOPSIS agree # TODO known breakage
+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 &&
 
-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
+		git checkout delete^0 &&
+		test_must_fail git merge modify &&
 
-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
+		git read-tree --reset HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
 
-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
+Note: switching to 'delete^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 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")" &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:31.738773267 +0000
-+++ help	2025-12-18 01:32:31.746773267 +0000
-@@ -0,0 +1 @@
-+git credential-cache [<options>] <action>
-not ok 152 - credential-cache -h output and SYNOPSIS agree # TODO known breakage
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+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 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")" &&
+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 &&
 
-		# The *.txt and -h use different spacing for 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 checkout delete^0 &&
+		test_must_fail git merge modify &&
 
-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
+		git reset --hard &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
 
-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
+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 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
+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 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
+		test_seq 1 10 >numbers &&
+		git add numbers &&
+		git commit -m initial &&
 
-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")" &&
+		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" &&
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:31.802773267 +0000
-+++ help	2025-12-18 01:32:31.806773267 +0000
-@@ -0,0 +1 @@
-+git credential-store [<options>] <action>
-not ok 162 - credential-store -h output and SYNOPSIS agree # TODO known breakage
+		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"
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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 &&
 
-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
+		git checkout f-edit^0 &&
+		test_must_fail git merge d-edit^0 &&
 
-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
+		git merge --abort &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
 
-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")" &&
+Note: switching to 'f-edit^0'.
 
-		# The *.txt and -h use different spacing for 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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.168 'diagnose -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 168 - diagnose -h output has no \t
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 0450.169 'diagnose -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 169 - diagnose -h output has dashed labels
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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")" &&
+Turn off this advice by setting config variable advice.detachedHead to 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 172 - diagnose -h output and SYNOPSIS agree
+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 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 1015.6 'git am --skip succeeds despite D/F conflict': 
+	test_when_finished "git -C df_plus_edit_edit clean -f" &&
+	test_when_finished "git -C df_plus_edit_edit reset --hard" &&
+	(
+		cd df_plus_edit_edit &&
 
-expecting success of 0450.174 'diff -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 174 - diff -h output has dashed labels
+		git checkout f-edit^0 &&
+		git format-patch -1 d-edit &&
+		test_must_fail git am -3 0001*.patch &&
 
-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
+		git am --skip &&
+		test_path_is_missing .git/rebase-apply &&
+		git ls-files -u >conflicts &&
+		test_must_be_empty conflicts
+	)
 
-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
+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
 
-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")" &&
+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 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
 
-		# The *.txt and -h use different spacing for the
-		# alignment of continued usage output, normalize it.
-		align_after_nl "$builtin" <"$t2s" >txt &&
-		align_after_nl "$builtin" <"$h2s" >help &&
-		test_cmp txt help
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1006-cat-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1006-cat-file/.git/
+expecting success of 1006.1 'usage: cmdmode -e -p': 
+		test_cmdmode_usage git cat-file $switches
 	
-ok 177 - diff -h output and SYNOPSIS agree
+error: options '-p' and '-e' cannot be used together
+ok 1 - usage: cmdmode -e -p
 
-expecting success of 0450.178 'diff-files -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.2 'usage: cmdmode -p -t': 
+		test_cmdmode_usage git cat-file $switches
 	
-ok 178 - diff-files -h output has no \t
+error: options '-t' and '-p' cannot be used together
+ok 2 - usage: cmdmode -p -t
 
-expecting success of 0450.179 'diff-files -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.3 'usage: cmdmode -t -s': 
+		test_cmdmode_usage git cat-file $switches
 	
-ok 179 - diff-files -h output has dashed labels
+error: options '-s' and '-t' cannot be used together
+ok 3 - usage: cmdmode -t -s
 
-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
+expecting success of 1006.4 'usage: cmdmode -s --textconv': 
+		test_cmdmode_usage git cat-file $switches
 	
-ok 180 - diff-files -h output has consistent spacing
+error: options '--textconv' and '-s' cannot be used together
+ok 4 - usage: cmdmode -s --textconv
 
-expecting success of 0450.181 'diff-files *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.5 'usage: cmdmode --textconv --filters': 
+		test_cmdmode_usage git cat-file $switches
 	
-ok 181 - diff-files *.txt SYNOPSIS has dashed labels
+error: options '--filters' and '--textconv' cannot be used together
+ok 5 - usage: cmdmode --textconv --filters
 
-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 1006.6 'usage: cmdmode --batch-all-objects -e': 
+		test_cmdmode_usage git cat-file $switches
+	
+error: options '-e' and '--batch-all-objects' cannot be used together
+ok 6 - usage: cmdmode --batch-all-objects -e
 
-		# The *.txt and -h use different spacing for 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 1006.7 'usage: incompatible options: --path with --batch': 
+		test_incompatible_usage git cat-file --path=foo $opt
 	
-ok 182 - diff-files -h output and SYNOPSIS agree
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 7 - usage: incompatible options: --path with --batch
 
-expecting success of 0450.183 'diff-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.8 'usage: incompatible options: --path with --batch-check': 
+		test_incompatible_usage git cat-file --path=foo $opt
 	
-ok 183 - diff-index -h output has no \t
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 8 - usage: incompatible options: --path with --batch-check
 
-expecting success of 0450.184 'diff-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.9 'usage: --textconv requires another option': 
+		test_missing_usage git cat-file $opt
 	
-ok 184 - diff-index -h output has dashed labels
+fatal: <rev> required with '--textconv'
+ok 9 - usage: --textconv requires another option
 
-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
+expecting success of 1006.10 'usage: --filters requires another option': 
+		test_missing_usage git cat-file $opt
 	
-ok 185 - diff-index -h output has consistent spacing
+fatal: <rev> required with '--filters'
+ok 10 - usage: --filters requires another option
 
-expecting success of 0450.186 'diff-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.11 'usage: -e requires another option': 
+		test_missing_usage git cat-file $opt
 	
-ok 186 - diff-index *.txt SYNOPSIS has dashed labels
+fatal: <object> required with '-e'
+ok 11 - usage: -e requires another option
 
-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 1006.12 'usage: incompatible options: -e and --batch': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '-e' is incompatible with batch mode
+ok 12 - usage: incompatible options: -e and --batch
 
-		# The *.txt and -h use different spacing for 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
+expecting success of 1006.13 'usage: incompatible options: -e and --batch-check': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '-e' is incompatible with batch mode
+ok 13 - usage: incompatible options: -e and --batch-check
 
-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 1006.14 'usage: incompatible options: -e and --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 14 - usage: incompatible options: -e and --follow-symlinks
 
-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 1006.15 'usage: incompatible options: -e and --path=foo HEAD:some-path.txt': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 15 - usage: incompatible options: -e and --path=foo HEAD:some-path.txt
 
-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
+expecting success of 1006.16 'usage: -p requires another option': 
+		test_missing_usage git cat-file $opt
 	
-ok 190 - diff-tree -h output has consistent spacing
+fatal: <object> required with '-p'
+ok 16 - usage: -p requires another option
 
-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 1006.17 'usage: incompatible options: -p and --batch': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '-p' is incompatible with batch mode
+ok 17 - usage: incompatible options: -p and --batch
 
-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")" &&
+expecting success of 1006.18 'usage: incompatible options: -p and --batch-check': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '-p' is incompatible with batch mode
+ok 18 - usage: incompatible options: -p and --batch-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 192 - diff-tree -h output and SYNOPSIS agree
+expecting success of 1006.19 'usage: incompatible options: -p and --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 19 - usage: incompatible options: -p and --follow-symlinks
 
-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
+expecting success of 1006.20 'usage: incompatible options: -p and --path=foo HEAD:some-path.txt': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 20 - usage: incompatible options: -p and --path=foo HEAD:some-path.txt
 
-expecting success of 0450.194 'difftool -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.21 'usage: -t requires another option': 
+		test_missing_usage git cat-file $opt
 	
-ok 194 - difftool -h output has dashed labels
+fatal: <object> required with '-t'
+ok 21 - usage: -t requires another option
 
-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
+expecting success of 1006.22 'usage: incompatible options: -t and --batch': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '-t' is incompatible with batch mode
+ok 22 - usage: incompatible options: -t and --batch
 
-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
+expecting success of 1006.23 'usage: incompatible options: -t and --batch-check': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '-t' is incompatible with batch mode
+ok 23 - usage: incompatible options: -t and --batch-check
 
-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")" &&
+expecting success of 1006.24 'usage: incompatible options: -t and --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 24 - usage: incompatible options: -t and --follow-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
-	
-ok 197 - difftool -h output and SYNOPSIS agree
+expecting success of 1006.25 'usage: incompatible options: -t and --path=foo HEAD:some-path.txt': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 25 - usage: incompatible options: -t and --path=foo HEAD:some-path.txt
 
-expecting success of 0450.198 'fast-export -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.26 'usage: -s requires another option': 
+		test_missing_usage git cat-file $opt
 	
-ok 198 - fast-export -h output has no \t
+fatal: <object> required with '-s'
+ok 26 - usage: -s requires another option
 
-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
+expecting success of 1006.27 'usage: incompatible options: -s and --batch': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '-s' is incompatible with batch mode
+ok 27 - usage: incompatible options: -s and --batch
 
-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 1006.28 'usage: incompatible options: -s and --batch-check': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '-s' is incompatible with batch mode
+ok 28 - usage: incompatible options: -s and --batch-check
 
-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
+expecting success of 1006.29 'usage: incompatible options: -s and --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 29 - usage: incompatible options: -s and --follow-symlinks
 
-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 1006.30 'usage: incompatible options: -s and --path=foo HEAD:some-path.txt': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 30 - usage: incompatible options: -s and --path=foo HEAD:some-path.txt
 
-		# The *.txt and -h use different spacing for 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 1006.31 'usage: too many arguments: -e one two three': 
+		test_too_many_arguments git cat-file $opt $args
 	
---- txt	2025-12-18 01:32:32.058773267 +0000
-+++ help	2025-12-18 01:32:32.062773267 +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
+fatal: too many arguments
+ok 31 - usage: too many arguments: -e one two three
 
-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 1006.32 'usage: incompatible arguments: -e with batch option --buffer': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--buffer' requires a batch mode
+ok 32 - usage: incompatible arguments: -e with batch option --buffer
 
-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
+expecting success of 1006.33 'usage: incompatible arguments: -e with batch option --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 33 - usage: incompatible arguments: -e with batch option --follow-symlinks
 
-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
+expecting success of 1006.34 'usage: too many arguments: -p one two three': 
+		test_too_many_arguments git cat-file $opt $args
 	
-ok 205 - fast-import -h output has consistent spacing
+fatal: too many arguments
+ok 34 - usage: too many arguments: -p one two three
 
-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
+expecting success of 1006.35 'usage: incompatible arguments: -p with batch option --buffer': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--buffer' requires a batch mode
+ok 35 - usage: incompatible arguments: -p with batch option --buffer
 
-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")" &&
+expecting success of 1006.36 'usage: incompatible arguments: -p with batch option --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 36 - usage: incompatible arguments: -p with batch option --follow-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
+expecting success of 1006.37 'usage: too many arguments: -t one two three': 
+		test_too_many_arguments git cat-file $opt $args
 	
---- txt	2025-12-18 01:32:32.090773267 +0000
-+++ help	2025-12-18 01:32:32.094773267 +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
+fatal: too many arguments
+ok 37 - usage: too many arguments: -t one two three
 
-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
+expecting success of 1006.38 'usage: incompatible arguments: -t with batch option --buffer': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--buffer' requires a batch mode
+ok 38 - usage: incompatible arguments: -t with batch option --buffer
 
-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
+expecting success of 1006.39 'usage: incompatible arguments: -t with batch option --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 39 - usage: incompatible arguments: -t with batch option --follow-symlinks
 
-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
+expecting success of 1006.40 'usage: too many arguments: -s one two three': 
+		test_too_many_arguments git cat-file $opt $args
 	
-ok 210 - fetch -h output has consistent spacing
+fatal: too many arguments
+ok 40 - usage: too many arguments: -s one two three
 
-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
+expecting success of 1006.41 'usage: incompatible arguments: -s with batch option --buffer': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--buffer' requires a batch mode
+ok 41 - usage: incompatible arguments: -s with batch option --buffer
 
-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")" &&
+expecting success of 1006.42 'usage: incompatible arguments: -s with batch option --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 42 - usage: incompatible arguments: -s with batch option --follow-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
+expecting success of 1006.43 'usage: too many arguments: --textconv one two three': 
+		test_too_many_arguments git cat-file $opt $args
 	
-ok 212 - fetch -h output and SYNOPSIS agree
+fatal: too many arguments
+ok 43 - usage: too many arguments: --textconv one two three
 
-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 1006.44 'usage: incompatible arguments: --textconv with batch option --buffer': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--buffer' requires a batch mode
+ok 44 - usage: incompatible arguments: --textconv with batch option --buffer
 
-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 1006.45 'usage: incompatible arguments: --textconv with batch option --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 45 - usage: incompatible arguments: --textconv with batch option --follow-symlinks
 
-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
+expecting success of 1006.46 'usage: too many arguments: --filters one two three': 
+		test_too_many_arguments git cat-file $opt $args
 	
-ok 215 - fetch-pack -h output has consistent spacing
+fatal: too many arguments
+ok 46 - usage: too many arguments: --filters one two three
 
-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
+expecting success of 1006.47 'usage: incompatible arguments: --filters with batch option --buffer': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--buffer' requires a batch mode
+ok 47 - usage: incompatible arguments: --filters with batch option --buffer
 
-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 1006.48 'usage: incompatible arguments: --filters with batch option --follow-symlinks': 
+			test_incompatible_usage git cat-file $opt $opt2
+		
+fatal: '--follow-symlinks' requires a batch mode
+ok 48 - usage: incompatible arguments: --filters with batch option --follow-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
+expecting success of 1006.49 'usage: bad option combination: --buffer without batch mode': 
+		test_incompatible_usage git cat-file $opt &&
+		test_incompatible_usage git cat-file $opt commit HEAD
 	
---- txt	2025-12-18 01:32:32.154773267 +0000
-+++ help	2025-12-18 01:32:32.158773267 +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
+fatal: '--buffer' requires a batch mode
+fatal: '--buffer' requires a batch mode
+ok 49 - usage: bad option combination: --buffer without batch mode
 
-expecting success of 0450.218 'fmt-merge-msg -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.50 'usage: bad option combination: --follow-symlinks without batch mode': 
+		test_incompatible_usage git cat-file $opt &&
+		test_incompatible_usage git cat-file $opt commit HEAD
 	
-ok 218 - fmt-merge-msg -h output has no \t
+fatal: '--follow-symlinks' requires a batch mode
+fatal: '--follow-symlinks' requires a batch mode
+ok 50 - usage: bad option combination: --follow-symlinks without batch mode
 
-expecting success of 0450.219 'fmt-merge-msg -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.51 'usage: bad option combination: --batch-all-objects without batch mode': 
+		test_incompatible_usage git cat-file $opt &&
+		test_incompatible_usage git cat-file $opt commit HEAD
 	
-ok 219 - fmt-merge-msg -h output has dashed labels
+fatal: '--batch-all-objects' requires a batch mode
+fatal: '--batch-all-objects' requires a batch mode
+ok 51 - usage: bad option combination: --batch-all-objects without batch mode
 
-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
+expecting success of 1006.52 'usage: bad option combination: -z without batch mode': 
+		test_incompatible_usage git cat-file $opt &&
+		test_incompatible_usage git cat-file $opt commit HEAD
 	
-ok 220 - fmt-merge-msg -h output has consistent spacing
+fatal: '-z' requires a batch mode
+fatal: '-z' requires a batch mode
+ok 52 - usage: bad option combination: -z without batch mode
 
-expecting success of 0450.221 'fmt-merge-msg *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.53 'usage: bad option combination: -Z without batch mode': 
+		test_incompatible_usage git cat-file $opt &&
+		test_incompatible_usage git cat-file $opt commit HEAD
 	
-ok 221 - fmt-merge-msg *.txt SYNOPSIS has dashed labels
+fatal: '-Z' requires a batch mode
+fatal: '-Z' requires a batch mode
+ok 53 - usage: bad option combination: -Z without batch mode
 
-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")" &&
+expecting success of 1006.54 'setup': 
+	git config core.repositoryformatversion 1 &&
+	git config extensions.objectformat $test_hash_algo &&
+	git config extensions.compatobjectformat $test_compat_hash_algo &&
+	echo_without_newline "$hello_content" > hello &&
+	git update-index --add hello
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.186773267 +0000
-+++ help	2025-12-18 01:32:32.190773267 +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
+ok 54 - setup
 
-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
+expecting success of 1006.55 'blob exists': 
+	git cat-file -e $oid
+    
+ok 55 - blob exists
 
-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 1006.56 'Type of blob is correct': 
+	echo $type >expect &&
+	git cat-file -t $oid >actual &&
+	test_cmp expect actual
+    
+ok 56 - Type of blob is correct
 
-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
+expecting success of 1006.57 'Size of blob is correct': 
+	echo $size >expect &&
+	git cat-file -s $oid >actual &&
+	test_cmp expect actual
+    
+ok 57 - Size of blob is correct
 
-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 1006.58 'Type of blob is correct using --allow-unknown-type': 
+	echo $type >expect &&
+	git cat-file -t --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 58 - Type of blob is correct using --allow-unknown-type
 
-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")" &&
+expecting success of 1006.59 'Size of blob is correct using --allow-unknown-type': 
+	echo $size >expect &&
+	git cat-file -s --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 59 - Size of blob is correct using --allow-unknown-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
-	
---- txt	2025-12-18 01:32:32.218773267 +0000
-+++ help	2025-12-18 01:32:32.222773267 +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 1006.60 'Content of blob is correct': 
+	echo_without_newline "$content" >expect &&
+	git cat-file $type $oid >actual &&
+	test_cmp expect actual
+    
+ok 60 - Content of blob is correct
 
-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
+expecting success of 1006.61 'Pretty content of blob is correct': 
+	echo_without_newline "$pretty_content" >expect &&
+	git cat-file -p $oid >actual &&
+	test_cmp expect actual
+    
+ok 61 - Pretty content of blob is correct
 
-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
+expecting success of 1006.62 '--batch output of blob is correct': 
+	echo "$batch_output" >expect &&
+	echo $oid | git cat-file --batch >actual &&
+	test_cmp expect actual
+    
+ok 62 - --batch output of blob is correct
 
-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
+expecting success of 1006.63 '--batch-check output of blob is correct': 
+	echo "$oid $type $size" >expect &&
+	echo_without_newline $oid | git cat-file --batch-check >actual &&
+	test_cmp expect actual
+    
+ok 63 - --batch-check output of blob is correct
 
-expecting success of 0450.231 'for-each-repo *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.64 '--batch-command --buffer output of blob content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 231 - for-each-repo *.txt SYNOPSIS has dashed labels
-
-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")" &&
+ok 64 - --batch-command --buffer output of blob content is correct
 
-		# The *.txt and -h use different spacing for 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 1006.65 '--batch-command --buffer output of blob info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 232 - for-each-repo -h output and SYNOPSIS agree
+ok 65 - --batch-command --buffer output of blob info is correct
 
-expecting success of 0450.233 'format-patch -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.66 '--batch-command --no-buffer output of blob content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 233 - format-patch -h output has no \t
+ok 66 - --batch-command --no-buffer output of blob content is correct
 
-expecting success of 0450.234 'format-patch -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.67 '--batch-command --no-buffer output of blob info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 234 - format-patch -h output has dashed labels
+ok 67 - --batch-command --no-buffer output of blob info is correct
 
-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 1006.68 'custom --batch-check format': 
+	echo "$type $oid" >expect &&
+	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 68 - custom --batch-check format
 
-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 1006.69 'custom --batch-command format': 
+	echo "$type $oid" >expect &&
+	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 69 - custom --batch-command format
 
-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")" &&
+expecting success of 1006.70 '--batch-check with %(rest)': 
+	echo "$type this is some extra content" >expect &&
+	echo "$oid    this is some extra content" |
+		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
+	test_cmp expect actual
+    
+ok 70 - --batch-check with %(rest)
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.282773267 +0000
-+++ help	2025-12-18 01:32:32.286773267 +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] [--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 1006.71 '--batch without type (blob)': 
+	{
+		echo "$size" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
+	test_cmp expect actual
+    
+ok 71 - --batch without type (blob)
 
-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 1006.72 '--batch without size (blob)': 
+	{
+		echo "$type" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
+	test_cmp expect actual
+    
+ok 72 - --batch without size (blob)
 
-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
+expecting success of 1006.73 '--batch-command --buffer with flush for blob info': 
+	echo "$oid blob $hello_size" >expect &&
+	test_write_lines "info $oid" "flush" |
+	GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
+	git cat-file --batch-command --buffer >actual &&
+	test_cmp expect actual
+    
+ok 73 - --batch-command --buffer with flush for blob info
 
-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 1006.74 '--batch-command --buffer without flush for blob info': 
+	touch output &&
+	test_write_lines "info $oid" |
+	GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
+	git cat-file --batch-command --buffer >>output &&
+	test_must_be_empty output
+    
+ok 74 - --batch-command --buffer without flush for blob info
 
-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 1006.75 'blob exists': 
+	git cat-file -e $oid
+    
+ok 75 - blob exists
 
-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 1006.76 'Type of blob is correct': 
+	echo $type >expect &&
+	git cat-file -t $oid >actual &&
+	test_cmp expect actual
+    
+ok 76 - Type of blob is correct
 
-		# The *.txt and -h use different spacing for 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
+expecting success of 1006.77 'Size of blob is correct': 
+	echo $size >expect &&
+	git cat-file -s $oid >actual &&
+	test_cmp expect actual
+    
+ok 77 - Size of blob is correct
 
-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 1006.78 'Type of blob is correct using --allow-unknown-type': 
+	echo $type >expect &&
+	git cat-file -t --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 78 - Type of blob is correct using --allow-unknown-type
 
-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
+expecting success of 1006.79 'Size of blob is correct using --allow-unknown-type': 
+	echo $size >expect &&
+	git cat-file -s --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 79 - Size of blob is correct using --allow-unknown-type
 
-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 1006.80 'Content of blob is correct': 
+	echo_without_newline "$content" >expect &&
+	git cat-file $type $oid >actual &&
+	test_cmp expect actual
+    
+ok 80 - Content of blob is correct
 
-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 1006.81 'Pretty content of blob is correct': 
+	echo_without_newline "$pretty_content" >expect &&
+	git cat-file -p $oid >actual &&
+	test_cmp expect actual
+    
+ok 81 - Pretty content of blob is correct
 
-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 1006.82 '--batch output of blob is correct': 
+	echo "$batch_output" >expect &&
+	echo $oid | git cat-file --batch >actual &&
+	test_cmp expect actual
+    
+ok 82 - --batch output of blob is correct
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.410773267 +0000
-+++ help	2025-12-18 01:32:32.414773267 +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 1006.83 '--batch-check output of blob is correct': 
+	echo "$oid $type $size" >expect &&
+	echo_without_newline $oid | git cat-file --batch-check >actual &&
+	test_cmp expect actual
+    
+ok 83 - --batch-check output of blob is correct
 
-expecting success of 0450.248 'fsmonitor--daemon -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.84 '--batch-command --buffer output of blob content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 248 - fsmonitor--daemon -h output has no \t
+ok 84 - --batch-command --buffer output of blob content is correct
 
-expecting success of 0450.249 'fsmonitor--daemon -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.85 '--batch-command --buffer output of blob info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 249 - fsmonitor--daemon -h output has dashed labels
+ok 85 - --batch-command --buffer output of blob info is correct
 
-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
+expecting success of 1006.86 '--batch-command --no-buffer output of blob content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 250 - fsmonitor--daemon -h output has consistent spacing
+ok 86 - --batch-command --no-buffer output of blob content is correct
 
-expecting success of 0450.251 'fsmonitor--daemon *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.87 '--batch-command --no-buffer output of blob info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 251 - fsmonitor--daemon *.txt SYNOPSIS has dashed labels
+ok 87 - --batch-command --no-buffer output of blob info is correct
 
-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 1006.88 'custom --batch-check format': 
+	echo "$type $oid" >expect &&
+	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 88 - custom --batch-check format
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.442773267 +0000
-+++ help	2025-12-18 01:32:32.446773267 +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
+expecting success of 1006.89 'custom --batch-command format': 
+	echo "$type $oid" >expect &&
+	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 89 - custom --batch-command format
 
-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 1006.90 '--batch-check with %(rest)': 
+	echo "$type this is some extra content" >expect &&
+	echo "$oid    this is some extra content" |
+		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
+	test_cmp expect actual
+    
+ok 90 - --batch-check with %(rest)
 
-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
+expecting success of 1006.91 '--batch without type (blob)': 
+	{
+		echo "$size" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
+	test_cmp expect actual
+    
+ok 91 - --batch without type (blob)
 
-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 1006.92 '--batch without size (blob)': 
+	{
+		echo "$type" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
+	test_cmp expect actual
+    
+ok 92 - --batch without size (blob)
 
-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 1006.93 '--batch-command --buffer with flush for blob info': 
+	echo "$oid blob $hello_size" >expect &&
+	test_write_lines "info $oid" "flush" |
+	GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
+	git cat-file --batch-command --buffer >actual &&
+	test_cmp expect actual
+    
+ok 93 - --batch-command --buffer with flush for blob info
 
-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")" &&
+expecting success of 1006.94 '--batch-command --buffer without flush for blob info': 
+	touch output &&
+	test_write_lines "info $oid" |
+	GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
+	git cat-file --batch-command --buffer >>output &&
+	test_must_be_empty output
+    
+ok 94 - --batch-command --buffer without flush for blob info
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.474773267 +0000
-+++ help	2025-12-18 01:32:32.478773267 +0000
-@@ -1 +1 @@
--git gc [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]
-+git gc [<options>]
-not ok 257 - gc -h output and SYNOPSIS agree # TODO known breakage
+expecting success of 1006.95 '--batch-check without %(rest) considers whole line': 
+	echo "$hello_oid blob $hello_size" >expect &&
+	git update-index --add --cacheinfo 100644 $hello_oid "white space" &&
+	test_when_finished "git update-index --remove \"white space\"" &&
+	echo ":white space" | git cat-file --batch-check >actual &&
+	test_cmp expect actual
 
-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
+ok 95 - --batch-check without %(rest) considers whole line
 
-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
+expecting success of 1006.96 'tree exists': 
+	git cat-file -e $oid
+    
+ok 96 - tree exists
 
-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 1006.97 'Type of tree is correct': 
+	echo $type >expect &&
+	git cat-file -t $oid >actual &&
+	test_cmp expect actual
+    
+ok 97 - Type of tree is correct
 
-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
+expecting success of 1006.98 'Size of tree is correct': 
+	echo $size >expect &&
+	git cat-file -s $oid >actual &&
+	test_cmp expect actual
+    
+ok 98 - Size of tree is correct
 
-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 1006.99 'Type of tree is correct using --allow-unknown-type': 
+	echo $type >expect &&
+	git cat-file -t --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 99 - Type of tree is correct using --allow-unknown-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
-	
-ok 262 - get-tar-commit-id -h output and SYNOPSIS agree
+expecting success of 1006.100 'Size of tree is correct using --allow-unknown-type': 
+	echo $size >expect &&
+	git cat-file -s --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 100 - Size of tree is correct using --allow-unknown-type
 
-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 1006.101 'Pretty content of tree is correct': 
+	echo_without_newline "$pretty_content" >expect &&
+	git cat-file -p $oid >actual &&
+	test_cmp expect actual
+    
+ok 101 - Pretty content of tree is correct
 
-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 1006.102 '--batch-check output of tree is correct': 
+	echo "$oid $type $size" >expect &&
+	echo_without_newline $oid | git cat-file --batch-check >actual &&
+	test_cmp expect actual
+    
+ok 102 - --batch-check output of tree is correct
 
-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
+expecting success of 1006.103 '--batch-command --buffer output of tree info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 265 - grep -h output has consistent spacing
+ok 103 - --batch-command --buffer output of tree info is correct
 
-expecting success of 0450.266 'grep *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.104 '--batch-command --no-buffer output of tree info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 266 - grep *.txt SYNOPSIS has dashed labels
+ok 104 - --batch-command --no-buffer output of tree info is correct
 
-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 1006.105 'custom --batch-check format': 
+	echo "$type $oid" >expect &&
+	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 105 - custom --batch-check format
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.538773267 +0000
-+++ help	2025-12-18 01:32:32.538773267 +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
+expecting success of 1006.106 'custom --batch-command format': 
+	echo "$type $oid" >expect &&
+	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 106 - custom --batch-command format
 
-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 1006.107 '--batch-check with %(rest)': 
+	echo "$type this is some extra content" >expect &&
+	echo "$oid    this is some extra content" |
+		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
+	test_cmp expect actual
+    
+ok 107 - --batch-check with %(rest)
 
-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 1006.108 'tree exists': 
+	git cat-file -e $oid
+    
+ok 108 - tree exists
 
-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 1006.109 'Type of tree is correct': 
+	echo $type >expect &&
+	git cat-file -t $oid >actual &&
+	test_cmp expect actual
+    
+ok 109 - Type of tree is correct
 
-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
+expecting success of 1006.110 'Size of tree is correct': 
+	echo $size >expect &&
+	git cat-file -s $oid >actual &&
+	test_cmp expect actual
+    
+ok 110 - Size of tree is correct
 
-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")" &&
+expecting success of 1006.111 'Type of tree is correct using --allow-unknown-type': 
+	echo $type >expect &&
+	git cat-file -t --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 111 - Type of tree is correct using --allow-unknown-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
-	
-ok 272 - hash-object -h output and SYNOPSIS agree
+expecting success of 1006.112 'Size of tree is correct using --allow-unknown-type': 
+	echo $size >expect &&
+	git cat-file -s --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 112 - Size of tree is correct using --allow-unknown-type
 
-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
+expecting success of 1006.113 'Pretty content of tree is correct': 
+	echo_without_newline "$pretty_content" >expect &&
+	git cat-file -p $oid >actual &&
+	test_cmp expect actual
+    
+ok 113 - Pretty content of tree is correct
 
-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 1006.114 '--batch-check output of tree is correct': 
+	echo "$oid $type $size" >expect &&
+	echo_without_newline $oid | git cat-file --batch-check >actual &&
+	test_cmp expect actual
+    
+ok 114 - --batch-check output of tree is correct
 
-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
+expecting success of 1006.115 '--batch-command --buffer output of tree info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 275 - help -h output has consistent spacing
+ok 115 - --batch-command --buffer output of tree info is correct
 
-expecting success of 0450.276 'help *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.116 '--batch-command --no-buffer output of tree info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 276 - help *.txt SYNOPSIS has dashed labels
+ok 116 - --batch-command --no-buffer output of tree info is correct
 
-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")" &&
+expecting success of 1006.117 'custom --batch-check format': 
+	echo "$type $oid" >expect &&
+	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 117 - custom --batch-check format
 
-		# The *.txt and -h use different spacing for 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 1006.118 'custom --batch-command format': 
+	echo "$type $oid" >expect &&
+	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 118 - custom --batch-command format
 
-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 1006.119 '--batch-check with %(rest)': 
+	echo "$type this is some extra content" >expect &&
+	echo "$oid    this is some extra content" |
+		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
+	test_cmp expect actual
+    
+ok 119 - --batch-check with %(rest)
 
-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 1006.120 'commit exists': 
+	git cat-file -e $oid
+    
+ok 120 - commit exists
 
-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 1006.121 'Type of commit is correct': 
+	echo $type >expect &&
+	git cat-file -t $oid >actual &&
+	test_cmp expect actual
+    
+ok 121 - Type of commit is correct
 
-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
+expecting success of 1006.122 'Size of commit is correct': 
+	echo $size >expect &&
+	git cat-file -s $oid >actual &&
+	test_cmp expect actual
+    
+ok 122 - Size of commit is correct
 
-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 1006.123 'Type of commit is correct using --allow-unknown-type': 
+	echo $type >expect &&
+	git cat-file -t --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 123 - Type of commit is correct using --allow-unknown-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
-	
-ok 282 - hook -h output and SYNOPSIS agree
+expecting success of 1006.124 'Size of commit is correct using --allow-unknown-type': 
+	echo $size >expect &&
+	git cat-file -s --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 124 - Size of commit is correct using --allow-unknown-type
 
-expecting success of 0450.283 'index-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.125 'Content of commit is correct': 
+	echo_without_newline "$content" >expect &&
+	git cat-file $type $oid >actual &&
+	test_cmp expect actual
+    
+ok 125 - Content of commit is correct
+
+expecting success of 1006.126 'Pretty content of commit is correct': 
+	echo_without_newline "$pretty_content" >expect &&
+	git cat-file -p $oid >actual &&
+	test_cmp expect actual
+    
+ok 126 - Pretty content of commit is correct
+
+expecting success of 1006.127 '--batch output of commit is correct': 
+	echo "$batch_output" >expect &&
+	echo $oid | git cat-file --batch >actual &&
+	test_cmp expect actual
+    
+ok 127 - --batch output of commit is correct
+
+expecting success of 1006.128 '--batch-check output of commit is correct': 
+	echo "$oid $type $size" >expect &&
+	echo_without_newline $oid | git cat-file --batch-check >actual &&
+	test_cmp expect actual
+    
+ok 128 - --batch-check output of commit is correct
+
+expecting success of 1006.129 '--batch-command --buffer output of commit content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 283 - index-pack -h output has no \t
+ok 129 - --batch-command --buffer output of commit content is correct
 
-expecting success of 0450.284 'index-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.130 '--batch-command --buffer output of commit info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 284 - index-pack -h output has dashed labels
+ok 130 - --batch-command --buffer output of commit info is correct
 
-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
+expecting success of 1006.131 '--batch-command --no-buffer output of commit content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 285 - index-pack -h output has consistent spacing
+ok 131 - --batch-command --no-buffer output of commit content is correct
 
-expecting success of 0450.286 'index-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.132 '--batch-command --no-buffer output of commit info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 286 - index-pack *.txt SYNOPSIS has dashed labels
+ok 132 - --batch-command --no-buffer output of commit info is correct
 
-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 1006.133 'custom --batch-check format': 
+	echo "$type $oid" >expect &&
+	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 133 - custom --batch-check format
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.658773267 +0000
-+++ help	2025-12-18 01:32:32.662773267 +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 1006.134 'custom --batch-command format': 
+	echo "$type $oid" >expect &&
+	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 134 - custom --batch-command format
 
-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 1006.135 '--batch-check with %(rest)': 
+	echo "$type this is some extra content" >expect &&
+	echo "$oid    this is some extra content" |
+		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
+	test_cmp expect actual
+    
+ok 135 - --batch-check with %(rest)
 
-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 1006.136 '--batch without type (commit)': 
+	{
+		echo "$size" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
+	test_cmp expect actual
+    
+ok 136 - --batch without type (commit)
 
-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
+expecting success of 1006.137 '--batch without size (commit)': 
+	{
+		echo "$type" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
+	test_cmp expect actual
+    
+ok 137 - --batch without size (commit)
 
-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 1006.138 'commit exists': 
+	git cat-file -e $oid
+    
+ok 138 - commit exists
 
-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")" &&
+expecting success of 1006.139 'Type of commit is correct': 
+	echo $type >expect &&
+	git cat-file -t $oid >actual &&
+	test_cmp expect actual
+    
+ok 139 - Type of commit is correct
 
-		# The *.txt and -h use different spacing for 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 1006.140 'Size of commit is correct': 
+	echo $size >expect &&
+	git cat-file -s $oid >actual &&
+	test_cmp expect actual
+    
+ok 140 - Size of commit is correct
 
-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
+expecting success of 1006.141 'Type of commit is correct using --allow-unknown-type': 
+	echo $type >expect &&
+	git cat-file -t --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 141 - Type of commit is correct using --allow-unknown-type
 
-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 1006.142 'Size of commit is correct using --allow-unknown-type': 
+	echo $size >expect &&
+	git cat-file -s --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 142 - Size of commit is correct using --allow-unknown-type
 
-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
+expecting success of 1006.143 'Content of commit is correct': 
+	echo_without_newline "$content" >expect &&
+	git cat-file $type $oid >actual &&
+	test_cmp expect actual
+    
+ok 143 - Content of commit is correct
 
-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 1006.144 'Pretty content of commit is correct': 
+	echo_without_newline "$pretty_content" >expect &&
+	git cat-file -p $oid >actual &&
+	test_cmp expect actual
+    
+ok 144 - Pretty content of commit is correct
 
-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")" &&
+expecting success of 1006.145 '--batch output of commit is correct': 
+	echo "$batch_output" >expect &&
+	echo $oid | git cat-file --batch >actual &&
+	test_cmp expect actual
+    
+ok 145 - --batch output of commit is correct
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.726773267 +0000
-+++ help	2025-12-18 01:32:32.730773267 +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 1006.146 '--batch-check output of commit is correct': 
+	echo "$oid $type $size" >expect &&
+	echo_without_newline $oid | git cat-file --batch-check >actual &&
+	test_cmp expect actual
+    
+ok 146 - --batch-check output of commit is correct
 
-expecting success of 0450.298 'interpret-trailers -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.147 '--batch-command --buffer output of commit content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 298 - interpret-trailers -h output has no \t
+ok 147 - --batch-command --buffer output of commit content is correct
 
-expecting success of 0450.299 'interpret-trailers -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.148 '--batch-command --buffer output of commit info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 299 - interpret-trailers -h output has dashed labels
+ok 148 - --batch-command --buffer output of commit info is correct
 
-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
+expecting success of 1006.149 '--batch-command --no-buffer output of commit content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 300 - interpret-trailers -h output has consistent spacing
+ok 149 - --batch-command --no-buffer output of commit content is correct
 
-expecting success of 0450.301 'interpret-trailers *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.150 '--batch-command --no-buffer output of commit info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 301 - interpret-trailers *.txt SYNOPSIS has dashed labels
+ok 150 - --batch-command --no-buffer output of commit info is correct
 
-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")" &&
+expecting success of 1006.151 'custom --batch-check format': 
+	echo "$type $oid" >expect &&
+	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 151 - custom --batch-check format
 
-		# The *.txt and -h use different spacing for 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 1006.152 'custom --batch-command format': 
+	echo "$type $oid" >expect &&
+	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 152 - custom --batch-command format
 
-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
+expecting success of 1006.153 '--batch-check with %(rest)': 
+	echo "$type this is some extra content" >expect &&
+	echo "$oid    this is some extra content" |
+		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
+	test_cmp expect actual
+    
+ok 153 - --batch-check with %(rest)
 
-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 1006.154 '--batch without type (commit)': 
+	{
+		echo "$size" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
+	test_cmp expect actual
+    
+ok 154 - --batch without type (commit)
 
-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
+expecting success of 1006.155 '--batch without size (commit)': 
+	{
+		echo "$type" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
+	test_cmp expect actual
+    
+ok 155 - --batch without size (commit)
 
-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 1006.156 'tag exists': 
+	git cat-file -e $oid
+    
+ok 156 - tag exists
 
-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")" &&
+expecting success of 1006.157 'Type of tag is correct': 
+	echo $type >expect &&
+	git cat-file -t $oid >actual &&
+	test_cmp expect actual
+    
+ok 157 - Type of tag is correct
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.790773267 +0000
-+++ help	2025-12-18 01:32:32.794773267 +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 1006.158 'Size of tag is correct': 
+	echo $size >expect &&
+	git cat-file -s $oid >actual &&
+	test_cmp expect actual
+    
+ok 158 - Size of tag is correct
 
-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
+expecting success of 1006.159 'Type of tag is correct using --allow-unknown-type': 
+	echo $type >expect &&
+	git cat-file -t --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 159 - Type of tag is correct using --allow-unknown-type
 
-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 1006.160 'Size of tag is correct using --allow-unknown-type': 
+	echo $size >expect &&
+	git cat-file -s --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 160 - Size of tag is correct using --allow-unknown-type
 
-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
+expecting success of 1006.161 'Content of tag is correct': 
+	echo_without_newline "$content" >expect &&
+	git cat-file $type $oid >actual &&
+	test_cmp expect actual
+    
+ok 161 - Content of tag is correct
 
-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 1006.162 'Pretty content of tag is correct': 
+	echo_without_newline "$pretty_content" >expect &&
+	git cat-file -p $oid >actual &&
+	test_cmp expect actual
+    
+ok 162 - Pretty content of tag is correct
 
-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")" &&
+expecting success of 1006.163 '--batch output of tag is correct': 
+	echo "$batch_output" >expect &&
+	echo $oid | git cat-file --batch >actual &&
+	test_cmp expect actual
+    
+ok 163 - --batch output of tag is correct
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.826773267 +0000
-+++ help	2025-12-18 01:32:32.830773267 +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 1006.164 '--batch-check output of tag is correct': 
+	echo "$oid $type $size" >expect &&
+	echo_without_newline $oid | git cat-file --batch-check >actual &&
+	test_cmp expect actual
+    
+ok 164 - --batch-check output of tag is correct
 
-expecting success of 0450.313 'ls-remote -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.165 '--batch-command --buffer output of tag content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 313 - ls-remote -h output has no \t
+ok 165 - --batch-command --buffer output of tag content is correct
 
-expecting success of 0450.314 'ls-remote -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.166 '--batch-command --buffer output of tag info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 314 - ls-remote -h output has dashed labels
+ok 166 - --batch-command --buffer output of tag info is correct
 
-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
+expecting success of 1006.167 '--batch-command --no-buffer output of tag content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 315 - ls-remote -h output has consistent spacing
+ok 167 - --batch-command --no-buffer output of tag content is correct
 
-expecting success of 0450.316 'ls-remote *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.168 '--batch-command --no-buffer output of tag info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 316 - ls-remote *.txt SYNOPSIS has dashed labels
+ok 168 - --batch-command --no-buffer output of tag info is correct
 
-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")" &&
+expecting success of 1006.169 'custom --batch-check format': 
+	echo "$type $oid" >expect &&
+	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 169 - custom --batch-check format
 
-		# The *.txt and -h use different spacing for 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 1006.170 'custom --batch-command format': 
+	echo "$type $oid" >expect &&
+	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 170 - custom --batch-command format
 
-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
+expecting success of 1006.171 '--batch-check with %(rest)': 
+	echo "$type this is some extra content" >expect &&
+	echo "$oid    this is some extra content" |
+		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
+	test_cmp expect actual
+    
+ok 171 - --batch-check with %(rest)
 
-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 1006.172 '--batch without type (tag)': 
+	{
+		echo "$size" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
+	test_cmp expect actual
+    
+ok 172 - --batch without type (tag)
 
-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 1006.173 '--batch without size (tag)': 
+	{
+		echo "$type" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
+	test_cmp expect actual
+    
+ok 173 - --batch without size (tag)
 
-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 1006.174 'tag exists': 
+	git cat-file -e $oid
+    
+ok 174 - tag exists
 
-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 1006.175 'Type of tag is correct': 
+	echo $type >expect &&
+	git cat-file -t $oid >actual &&
+	test_cmp expect actual
+    
+ok 175 - Type of tag is correct
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.890773267 +0000
-+++ help	2025-12-18 01:32:32.894773267 +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 1006.176 'Size of tag is correct': 
+	echo $size >expect &&
+	git cat-file -s $oid >actual &&
+	test_cmp expect actual
+    
+ok 176 - Size of tag is correct
 
-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
+expecting success of 1006.177 'Type of tag is correct using --allow-unknown-type': 
+	echo $type >expect &&
+	git cat-file -t --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 177 - Type of tag is correct using --allow-unknown-type
 
-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 1006.178 'Size of tag is correct using --allow-unknown-type': 
+	echo $size >expect &&
+	git cat-file -s --allow-unknown-type $oid >actual &&
+	test_cmp expect actual
+    
+ok 178 - Size of tag is correct using --allow-unknown-type
 
-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 1006.179 'Content of tag is correct': 
+	echo_without_newline "$content" >expect &&
+	git cat-file $type $oid >actual &&
+	test_cmp expect actual
+    
+ok 179 - Content of tag is correct
 
-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
+expecting success of 1006.180 'Pretty content of tag is correct': 
+	echo_without_newline "$pretty_content" >expect &&
+	git cat-file -p $oid >actual &&
+	test_cmp expect actual
+    
+ok 180 - Pretty content of tag is correct
 
-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 1006.181 '--batch output of tag is correct': 
+	echo "$batch_output" >expect &&
+	echo $oid | git cat-file --batch >actual &&
+	test_cmp expect actual
+    
+ok 181 - --batch output of tag is correct
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.922773267 +0000
-+++ help	2025-12-18 01:32:32.926773267 +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
+expecting success of 1006.182 '--batch-check output of tag is correct': 
+	echo "$oid $type $size" >expect &&
+	echo_without_newline $oid | git cat-file --batch-check >actual &&
+	test_cmp expect actual
+    
+ok 182 - --batch-check output of tag is correct
 
-expecting success of 0450.328 'mailsplit -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.183 '--batch-command --buffer output of tag content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 328 - mailsplit -h output has no \t
+ok 183 - --batch-command --buffer output of tag content is correct
 
-expecting success of 0450.329 'mailsplit -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.184 '--batch-command --buffer output of tag info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 329 - mailsplit -h output has dashed labels
+ok 184 - --batch-command --buffer output of tag info is correct
 
-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 1006.185 '--batch-command --no-buffer output of tag content is correct': 
+		echo "$batch_output" >expect &&
+		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 330 - mailsplit -h output has consistent spacing
+ok 185 - --batch-command --no-buffer output of tag content is correct
 
-expecting success of 0450.331 'mailsplit *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.186 '--batch-command --no-buffer output of tag info is correct': 
+		echo "$oid $type $size" >expect &&
+		test_write_lines "info $oid" |
+		git cat-file --batch-command $opt >actual &&
+		test_cmp expect actual
 	
-ok 331 - mailsplit *.txt SYNOPSIS has dashed labels
+ok 186 - --batch-command --no-buffer output of tag info is correct
 
-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 1006.187 'custom --batch-check format': 
+	echo "$type $oid" >expect &&
+	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 187 - custom --batch-check format
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:32.954773267 +0000
-+++ help	2025-12-18 01:32:32.958773267 +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
+expecting success of 1006.188 'custom --batch-command format': 
+	echo "$type $oid" >expect &&
+	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
+	test_cmp expect actual
+    
+ok 188 - custom --batch-command format
 
-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 1006.189 '--batch-check with %(rest)': 
+	echo "$type this is some extra content" >expect &&
+	echo "$oid    this is some extra content" |
+		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
+	test_cmp expect actual
+    
+ok 189 - --batch-check with %(rest)
 
-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
+expecting success of 1006.190 '--batch without type (tag)': 
+	{
+		echo "$size" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
+	test_cmp expect actual
+    
+ok 190 - --batch without type (tag)
 
-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 1006.191 '--batch without size (tag)': 
+	{
+		echo "$type" &&
+		echo "$content"
+	} >expect &&
+	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
+	test_cmp expect actual
+    
+ok 191 - --batch without size (tag)
 
-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
+expecting success of 1006.192 'Reach a blob from a tag pointing to it': 
+	echo_without_newline "$hello_content" >expect &&
+	git cat-file blob $tag_oid >actual &&
+	test_cmp expect actual
 
-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")" &&
+ok 192 - Reach a blob from a tag pointing to it
 
-		# The *.txt and -h use different spacing for 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 1006.193 'Passing -t with --batch fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
---- txt	2025-12-18 01:32:32.986773267 +0000
-+++ help	2025-12-18 01:32:32.990773267 +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
+fatal: '-t' is incompatible with batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.339 'merge -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 339 - merge -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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 340 - merge -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.018773267 +0000
-+++ help	2025-12-18 01:32:33.022773267 +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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.343 'merge-base -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 343 - merge-base -h output has no \t
+ok 193 - Passing -t with --batch fails
 
-expecting success of 0450.344 'merge-base -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.194 'Passing --batch with -t fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 344 - merge-base -h output has dashed labels
+fatal: '-t' is incompatible with batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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
+ok 194 - Passing --batch with -t fails
 
-expecting success of 0450.351 'merge-file *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.195 'Passing -s with --batch fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 351 - merge-file *.txt SYNOPSIS has dashed labels
+fatal: '-s' is incompatible with batch mode
 
-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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.082773267 +0000
-+++ help	2025-12-18 01:32:33.082773267 +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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 195 - Passing -s with --batch fails
 
-		# The *.txt and -h use different spacing for 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 1006.196 'Passing --batch with -s fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
---- txt	2025-12-18 01:32:33.110773267 +0000
-+++ help	2025-12-18 01:32:33.114773267 +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
+fatal: '-s' is incompatible with batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 361 # skip merge-ours *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_OURS)
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-ok 362 # skip merge-ours -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_OURS)
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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
+ok 196 - Passing --batch with -s fails
 
-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 1006.197 'Passing -e with --batch fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 365 - merge-recursive -h output has consistent spacing
+fatal: '-e' is incompatible with batch mode
 
-ok 366 # skip merge-recursive *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE)
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 367 # skip merge-recursive -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE)
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-ok 371 # skip merge-recursive-ours *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE_OURS)
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-ok 372 # skip merge-recursive-ours -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE_OURS)
+ok 197 - Passing -e with --batch fails
 
-expecting success of 0450.373 'merge-recursive-theirs -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.198 'Passing --batch with -e fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 373 - merge-recursive-theirs -h output has no \t
+fatal: '-e' is incompatible with batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-ok 376 # skip merge-recursive-theirs *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE_THEIRS)
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 377 # skip merge-recursive-theirs -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE_THEIRS)
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 198 - Passing --batch with -e fails
+
+expecting success of 1006.199 'Passing -p with --batch fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 380 - merge-subtree -h output has consistent spacing
+fatal: '-p' is incompatible with batch mode
 
-ok 381 # skip merge-subtree *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_SUBTREE)
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 382 # skip merge-subtree -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_SUBTREE)
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.386 'merge-tree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 386 - merge-tree *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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")" &&
+ok 199 - Passing -p with --batch fails
 
-		# The *.txt and -h use different spacing for 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 1006.200 'Passing --batch with -p fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 387 - merge-tree -h output and SYNOPSIS agree
+fatal: '-p' is incompatible with batch mode
 
-expecting success of 0450.388 'mktag -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 388 - mktag -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.389 'mktag -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 389 - mktag -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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 390 - mktag -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.391 'mktag *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 391 - mktag *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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 392 - mktag -h output and SYNOPSIS agree
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.393 'mktree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 393 - mktree -h output has no \t
+ok 200 - Passing --batch with -p fails
 
-expecting success of 0450.394 'mktree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.201 'Passing <type> with --batch fails': 
+	test_must_fail git cat-file --$batch blob $oid
 	
-ok 394 - mktree -h output has dashed labels
+fatal: batch modes take no arguments
 
-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
-	
-ok 395 - mktree -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.396 'mktree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 396 - mktree *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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 397 - mktree -h output and SYNOPSIS agree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.398 'multi-pack-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 398 - multi-pack-index -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.399 'multi-pack-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 399 - multi-pack-index -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 400 - multi-pack-index -h output has consistent spacing
+ok 201 - Passing <type> with --batch fails
 
-expecting success of 0450.401 'multi-pack-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.202 'Passing --batch with <type> fails': 
+	test_must_fail git cat-file blob --$batch $oid
 	
-ok 401 - multi-pack-index *.txt SYNOPSIS has dashed labels
+fatal: batch modes take no arguments
 
-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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.330773267 +0000
-+++ help	2025-12-18 01:32:33.330773267 +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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.403 'mv -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 403 - mv -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.404 'mv -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 404 - mv -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
-	
-ok 405 - mv -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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")" &&
+ok 202 - Passing --batch with <type> fails
 
-		# The *.txt and -h use different spacing for 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 1006.203 'Passing oid with --batch fails': 
+	test_must_fail git cat-file --$batch $oid
 	
-ok 407 - mv -h output and SYNOPSIS agree
+fatal: batch modes take no arguments
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.390773267 +0000
-+++ help	2025-12-18 01:32:33.394773267 +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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 203 - Passing oid with --batch fails
 
-expecting success of 0450.414 'notes -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.204 'Passing -t with --batch-check fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 414 - notes -h output has dashed labels
+fatal: '-t' is incompatible with batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.422773267 +0000
-+++ help	2025-12-18 01:32:33.426773267 +0000
-@@ -1,12 +1,12 @@
--git notes [list [<object>]]
--git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
--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>] [<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>]
-+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>]
-+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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 204 - Passing -t with --batch-check fails
 
-expecting success of 0450.421 'pack-objects *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.205 'Passing --batch-check with -t fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 421 - pack-objects *.txt SYNOPSIS has dashed labels
+fatal: '-t' is incompatible with batch mode
 
-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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.454773267 +0000
-+++ help	2025-12-18 01:32:33.458773267 +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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 205 - Passing --batch-check with -t fails
 
-		# The *.txt and -h use different spacing for 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 1006.206 'Passing -s with --batch-check fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 427 - pack-redundant -h output and SYNOPSIS agree
+fatal: '-s' is incompatible with batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 206 - Passing -s with --batch-check fails
 
-expecting success of 0450.434 'patch-id -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.207 'Passing --batch-check with -s fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 434 - patch-id -h output has dashed labels
+fatal: '-s' is incompatible with batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 207 - Passing --batch-check with -s fails
+
+expecting success of 1006.208 'Passing -e with --batch-check fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 440 - pickaxe -h output has consistent spacing
+fatal: '-e' is incompatible with batch mode
 
-ok 441 # skip pickaxe *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_PICKAXE)
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 442 # skip pickaxe -h output and SYNOPSIS agree (missing BUILTIN_TXT_PICKAXE)
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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")" &&
+ok 208 - Passing -e with --batch-check fails
 
-		# The *.txt and -h use different spacing for 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 1006.209 'Passing --batch-check with -e fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 447 - prune -h output and SYNOPSIS agree
+fatal: '-e' is incompatible with batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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
+ok 209 - Passing --batch-check with -e fails
 
-expecting success of 0450.454 'pull -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.210 'Passing -p with --batch-check fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 454 - pull -h output has dashed labels
+fatal: '-p' is incompatible with batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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
+ok 210 - Passing -p with --batch-check fails
 
-expecting success of 0450.461 'push *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.211 'Passing --batch-check with -p fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 461 - push *.txt SYNOPSIS has dashed labels
+fatal: '-p' is incompatible with batch mode
 
-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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.690773267 +0000
-+++ help	2025-12-18 01:32:33.694773267 +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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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")" &&
+ok 211 - Passing --batch-check with -p fails
 
-		# The *.txt and -h use different spacing for 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 1006.212 'Passing <type> with --batch-check fails': 
+	test_must_fail git cat-file --$batch blob $oid
 	
---- txt	2025-12-18 01:32:33.722773267 +0000
-+++ help	2025-12-18 01:32:33.722773267 +0000
-@@ -1,5 +1,3 @@
--git range-diff [--color=[<when>]] [--no-color] [<diff-options>]
--               [--no-dual-color] [--creation-factor=<factor>]
--               [--left-only | --right-only]
--               ( <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
+fatal: batch modes take no arguments
 
-expecting success of 0450.468 'read-tree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 468 - read-tree -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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
+ok 212 - Passing <type> with --batch-check fails
 
-expecting success of 0450.474 'rebase -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.213 'Passing --batch-check with <type> fails': 
+	test_must_fail git cat-file blob --$batch $oid
 	
-ok 474 - rebase -h output has dashed labels
+fatal: batch modes take no arguments
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.786773267 +0000
-+++ help	2025-12-18 01:32:33.786773267 +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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 213 - Passing --batch-check with <type> fails
 
-expecting success of 0450.481 'receive-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.214 'Passing oid with --batch-check fails': 
+	test_must_fail git cat-file --$batch $oid
 	
-ok 481 - receive-pack *.txt SYNOPSIS has dashed labels
+fatal: batch modes take no arguments
 
-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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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")" &&
+ok 214 - Passing oid with --batch-check fails
 
-		# The *.txt and -h use different spacing for 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 1006.215 'Passing -t with --batch-command fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 487 - reflog -h output and SYNOPSIS agree
+fatal: '-t' is incompatible with batch mode
 
-expecting success of 0450.488 'remote -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 488 - remote -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.489 'remote -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 489 - remote -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.490 '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 490 - remote -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.491 'remote *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 491 - remote *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-checking known breakage of 0450.492 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.878773267 +0000
-+++ help	2025-12-18 01:32:33.882773267 +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 492 - remote -h output and SYNOPSIS agree # TODO known breakage
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.493 'remote-ext -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 493 - remote-ext -h output has no \t
+ok 215 - Passing -t with --batch-command fails
 
-expecting success of 0450.494 'remote-ext -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.216 'Passing --batch-command with -t fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 494 - remote-ext -h output has dashed labels
+fatal: '-t' is incompatible with batch mode
 
-expecting success of 0450.495 '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 495 - remote-ext -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.496 'remote-ext *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 496 - remote-ext *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-checking known breakage of 0450.497 '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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.910773267 +0000
-+++ help	2025-12-18 01:32:33.914773267 +0000
-@@ -1 +1 @@
--git remote add <nick> "ext::<command>[ <arguments>...]"
-+git remote-ext <remote> <url>
-not ok 497 - remote-ext -h output and SYNOPSIS agree # TODO known breakage
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.498 'remote-fd -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 498 - remote-fd -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.499 'remote-fd -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 499 - remote-fd -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.500 '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 500 - remote-fd -h output has consistent spacing
+ok 216 - Passing --batch-command with -t fails
 
-expecting success of 0450.501 'remote-fd *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.217 'Passing -s with --batch-command fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 501 - remote-fd *.txt SYNOPSIS has dashed labels
+fatal: '-s' is incompatible with batch mode
 
-checking known breakage of 0450.502 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:33.938773267 +0000
-+++ help	2025-12-18 01:32:33.942773267 +0000
-@@ -0,0 +1 @@
-+git remote-fd <remote> <url>
-not ok 502 - remote-fd -h output and SYNOPSIS agree # TODO known breakage
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.503 'repack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 503 - repack -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.504 'repack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 504 - repack -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.505 '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 505 - repack -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.506 'repack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 506 - repack *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-checking known breakage of 0450.507 '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 217 - Passing -s with --batch-command fails
 
-		# The *.txt and -h use different spacing for 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 1006.218 'Passing --batch-command with -s fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
---- txt	2025-12-18 01:32:33.970773267 +0000
-+++ help	2025-12-18 01:32:33.974773267 +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 507 - repack -h output and SYNOPSIS agree # TODO known breakage
+fatal: '-s' is incompatible with batch mode
 
-expecting success of 0450.508 'replace -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 508 - replace -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.509 'replace -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 509 - replace -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.510 '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 510 - replace -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.511 'replace *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 511 - replace *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.512 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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 512 - replace -h output and SYNOPSIS agree
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.513 'replay -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 513 - replay -h output has no \t
+ok 218 - Passing --batch-command with -s fails
 
-expecting success of 0450.514 'replay -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.219 'Passing -e with --batch-command fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 514 - replay -h output has dashed labels
+fatal: '-e' is incompatible with batch mode
 
-expecting success of 0450.515 '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 515 - replay -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.516 'replay *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 516 - replay *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.517 '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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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 - replay -h output and SYNOPSIS agree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.518 'rerere -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 518 - rerere -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.519 'rerere -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 519 - rerere -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.520 '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 520 - rerere -h output has consistent spacing
+ok 219 - Passing -e with --batch-command fails
 
-expecting success of 0450.521 'rerere *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.220 'Passing --batch-command with -e fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 521 - rerere *.txt SYNOPSIS has dashed labels
+fatal: '-e' is incompatible with batch mode
 
-expecting success of 0450.522 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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 - rerere -h output and SYNOPSIS agree
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.523 'reset -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 523 - reset -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.524 'reset -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 524 - reset -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.525 '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 525 - reset -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.526 'reset *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 526 - reset *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-checking known breakage of 0450.527 '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")" &&
+ok 220 - Passing --batch-command with -e fails
 
-		# The *.txt and -h use different spacing for 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 1006.221 'Passing -p with --batch-command fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
---- txt	2025-12-18 01:32:34.102773267 +0000
-+++ help	2025-12-18 01:32:34.106773267 +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 527 - reset -h output and SYNOPSIS agree # TODO known breakage
+fatal: '-p' is incompatible with batch mode
 
-expecting success of 0450.528 'restore -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 528 - restore -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.529 'restore -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 529 - restore -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.530 '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 530 - restore -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.531 'restore *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 531 - restore *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-checking known breakage of 0450.532 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:34.134773267 +0000
-+++ help	2025-12-18 01:32:34.134773267 +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 532 - restore -h output and SYNOPSIS agree # TODO known breakage
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.533 'rev-list -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 533 - rev-list -h output has no \t
+ok 221 - Passing -p with --batch-command fails
 
-expecting success of 0450.534 'rev-list -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.222 'Passing --batch-command with -p fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 534 - rev-list -h output has dashed labels
+fatal: '-p' is incompatible with batch mode
 
-expecting success of 0450.535 '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 535 - rev-list -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.536 'rev-list *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 536 - rev-list *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.537 '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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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 537 - rev-list -h output and SYNOPSIS agree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.538 'rev-parse -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 538 - rev-parse -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.539 'rev-parse -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 539 - rev-parse -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.540 '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 540 - rev-parse -h output has consistent spacing
+ok 222 - Passing --batch-command with -p fails
 
-expecting success of 0450.541 'rev-parse *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.223 'Passing <type> with --batch-command fails': 
+	test_must_fail git cat-file --$batch blob $oid
 	
-ok 541 - rev-parse *.txt SYNOPSIS has dashed labels
+fatal: batch modes take no arguments
 
-checking known breakage of 0450.542 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:34.194773267 +0000
-+++ help	2025-12-18 01:32:34.198773267 +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 542 - rev-parse -h output and SYNOPSIS agree # TODO known breakage
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.543 'revert -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 543 - revert -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.544 'revert -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 544 - revert -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.545 '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 545 - revert -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.546 'revert *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 546 - revert *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.547 '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")" &&
+ok 223 - Passing <type> with --batch-command fails
 
-		# The *.txt and -h use different spacing for 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 1006.224 'Passing --batch-command with <type> fails': 
+	test_must_fail git cat-file blob --$batch $oid
 	
-ok 547 - revert -h output and SYNOPSIS agree
+fatal: batch modes take no arguments
 
-expecting success of 0450.548 'rm -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 548 - rm -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.549 'rm -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 549 - rm -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.550 '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 550 - rm -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.551 'rm *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 551 - rm *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.552 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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 - rm -h output and SYNOPSIS agree
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.553 'send-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 553 - send-pack -h output has no \t
+ok 224 - Passing --batch-command with <type> fails
 
-expecting success of 0450.554 'send-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.225 'Passing oid with --batch-command fails': 
+	test_must_fail git cat-file --$batch $oid
 	
-ok 554 - send-pack -h output has dashed labels
+fatal: batch modes take no arguments
 
-expecting success of 0450.555 '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 555 - send-pack -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.556 'send-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 556 - send-pack *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.557 '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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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 - send-pack -h output and SYNOPSIS agree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.558 'shortlog -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 558 - shortlog -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.559 'shortlog -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 559 - shortlog -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.560 '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 560 - shortlog -h output has consistent spacing
+ok 225 - Passing oid with --batch-command fails
 
-expecting success of 0450.561 'shortlog *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.226 'Passing -t with --batch fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 561 - shortlog *.txt SYNOPSIS has dashed labels
+fatal: '-t' is incompatible with batch mode
 
-expecting success of 0450.562 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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 - shortlog -h output and SYNOPSIS agree
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.563 'show -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 563 - show -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.564 'show -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 564 - show -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.565 '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 565 - show -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.566 'show *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 566 - show *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-checking known breakage of 0450.567 '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")" &&
+ok 226 - Passing -t with --batch fails
 
-		# The *.txt and -h use different spacing for 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 1006.227 'Passing --batch with -t fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
---- txt	2025-12-18 01:32:34.354773267 +0000
-+++ help	2025-12-18 01:32:34.354773267 +0000
-@@ -1 +1,2 @@
--git show [<options>] [<object>...]
-+git log [<options>] [<revision-range>] [[--] <path>...]
-+git show [<options>] <object>...
-not ok 567 - show -h output and SYNOPSIS agree # TODO known breakage
+fatal: '-t' is incompatible with batch mode
 
-expecting success of 0450.568 'show-branch -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 568 - show-branch -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.569 'show-branch -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 569 - show-branch -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.570 '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 570 - show-branch -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.571 'show-branch *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 571 - show-branch *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.572 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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 572 - show-branch -h output and SYNOPSIS agree
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.573 'show-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 573 - show-index -h output has no \t
+ok 227 - Passing --batch with -t fails
 
-expecting success of 0450.574 'show-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.228 'Passing -s with --batch fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 574 - show-index -h output has dashed labels
+fatal: '-s' is incompatible with batch mode
 
-expecting success of 0450.575 '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 575 - show-index -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.576 'show-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 576 - show-index *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.577 '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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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-index -h output and SYNOPSIS agree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.578 'show-ref -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 578 - show-ref -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.579 'show-ref -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 579 - show-ref -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.580 '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 580 - show-ref -h output has consistent spacing
+ok 228 - Passing -s with --batch fails
 
-expecting success of 0450.581 'show-ref *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.229 'Passing --batch with -s fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 581 - show-ref *.txt SYNOPSIS has dashed labels
+fatal: '-s' is incompatible with batch mode
 
-expecting success of 0450.582 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-ref -h output and SYNOPSIS agree
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.583 'sparse-checkout -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 583 - sparse-checkout -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.584 'sparse-checkout -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 584 - sparse-checkout -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.585 '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 585 - sparse-checkout -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.586 'sparse-checkout *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 586 - sparse-checkout *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.587 '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 229 - Passing --batch with -s fails
 
-		# The *.txt and -h use different spacing for 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 1006.230 'Passing -e with --batch fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 587 - sparse-checkout -h output and SYNOPSIS agree
+fatal: '-e' is incompatible with batch mode
 
-expecting success of 0450.588 'stage -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 588 - stage -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.589 'stage -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 589 - stage -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.590 '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 590 - stage -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.591 'stage *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 591 - stage *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-checking known breakage of 0450.592 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:34.514773267 +0000
-+++ help	2025-12-18 01:32:34.514773267 +0000
-@@ -1 +1 @@
--git stage <arg>...
-+git add [<options>] [--] <pathspec>...
-not ok 592 - stage -h output and SYNOPSIS agree # TODO known breakage
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.593 'stash -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 593 - stash -h output has no \t
+ok 230 - Passing -e with --batch fails
 
-expecting success of 0450.594 'stash -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.231 'Passing --batch with -e fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 594 - stash -h output has dashed labels
+fatal: '-e' is incompatible with batch mode
 
-expecting success of 0450.595 '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 595 - stash -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.596 'stash *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 596 - stash *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.597 '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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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 597 - stash -h output and SYNOPSIS agree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.598 'status -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 598 - status -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.599 'status -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 599 - status -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.600 '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 600 - status -h output has consistent spacing
+ok 231 - Passing --batch with -e fails
 
-expecting success of 0450.601 'status *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.232 'Passing -p with --batch fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 601 - status *.txt SYNOPSIS has dashed labels
-
-expecting success of 0450.602 '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")" &&
+fatal: '-p' is incompatible with batch mode
 
-		# The *.txt and -h use different spacing for 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 - status -h output and SYNOPSIS agree
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.603 'stripspace -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 603 - stripspace -h output has no \t
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.604 'stripspace -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 604 - stripspace -h output has dashed labels
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.605 '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 605 - stripspace -h output has consistent spacing
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.606 'stripspace *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 606 - stripspace *.txt SYNOPSIS has dashed labels
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.607 '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")" &&
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-		# The *.txt and -h use different spacing for 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 - stripspace -h output and SYNOPSIS agree
+ok 232 - Passing -p with --batch fails
 
-expecting success of 0450.608 'submodule--helper -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.233 'Passing --batch with -p fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 608 - submodule--helper -h output has no \t
+fatal: '-p' is incompatible with batch mode
 
-expecting success of 0450.609 'submodule--helper -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 609 - submodule--helper -h output has dashed labels
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.610 '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 610 - submodule--helper -h output has consistent spacing
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-ok 611 # skip submodule--helper *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_SUBMODULE__HELPER)
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 612 # skip submodule--helper -h output and SYNOPSIS agree (missing BUILTIN_TXT_SUBMODULE__HELPER)
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.613 'switch -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 613 - switch -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.614 'switch -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 614 - switch -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.615 '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 615 - switch -h output has consistent spacing
+ok 233 - Passing --batch with -p fails
 
-expecting success of 0450.616 'switch *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.234 'Passing <type> with --batch fails': 
+	test_must_fail git cat-file --$batch blob $oid
 	
-ok 616 - switch *.txt SYNOPSIS has dashed labels
+fatal: batch modes take no arguments
 
-checking known breakage of 0450.617 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:34.658773267 +0000
-+++ help	2025-12-18 01:32:34.662773267 +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 617 - switch -h output and SYNOPSIS agree # TODO known breakage
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.618 'symbolic-ref -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 618 - symbolic-ref -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.619 'symbolic-ref -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 619 - symbolic-ref -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.620 '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 620 - symbolic-ref -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.621 'symbolic-ref *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 621 - symbolic-ref *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.622 '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")" &&
+ok 234 - Passing <type> with --batch fails
 
-		# The *.txt and -h use different spacing for 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 1006.235 'Passing --batch with <type> fails': 
+	test_must_fail git cat-file blob --$batch $oid
 	
-ok 622 - symbolic-ref -h output and SYNOPSIS agree
+fatal: batch modes take no arguments
 
-expecting success of 0450.623 'tag -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 623 - tag -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.624 'tag -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 624 - tag -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.625 '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 625 - tag -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.626 'tag *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 626 - tag *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.627 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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 - tag -h output and SYNOPSIS agree
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.628 'unpack-file -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 628 - unpack-file -h output has no \t
+ok 235 - Passing --batch with <type> fails
 
-expecting success of 0450.629 'unpack-file -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.236 'Passing oid with --batch fails': 
+	test_must_fail git cat-file --$batch $oid
 	
-ok 629 - unpack-file -h output has dashed labels
+fatal: batch modes take no arguments
 
-expecting success of 0450.630 '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 630 - unpack-file -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.631 'unpack-file *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 631 - unpack-file *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.632 '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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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 - unpack-file -h output and SYNOPSIS agree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.633 'unpack-objects -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 633 - unpack-objects -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.634 'unpack-objects -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 634 - unpack-objects -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.635 '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 635 - unpack-objects -h output has consistent spacing
+ok 236 - Passing oid with --batch fails
 
-expecting success of 0450.636 'unpack-objects *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.237 'Passing -t with --batch-check fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 636 - unpack-objects *.txt SYNOPSIS has dashed labels
+fatal: '-t' is incompatible with batch mode
 
-expecting success of 0450.637 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-objects -h output and SYNOPSIS agree
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.638 'update-index -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 638 - update-index -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.639 'update-index -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 639 - update-index -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.640 '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 640 - update-index -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.641 'update-index *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 641 - update-index *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-checking known breakage of 0450.642 '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")" &&
+ok 237 - Passing -t with --batch-check fails
 
-		# The *.txt and -h use different spacing for 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 1006.238 'Passing --batch-check with -t fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
---- txt	2025-12-18 01:32:34.822773267 +0000
-+++ help	2025-12-18 01:32:34.826773267 +0000
-@@ -1,18 +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>]
--                 [--verbose]
--                 [--] [<file>...]
-+git update-index [<options>] [--] [<file>...]
-not ok 642 - update-index -h output and SYNOPSIS agree # TODO known breakage
+fatal: '-t' is incompatible with batch mode
 
-expecting success of 0450.643 'update-ref -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 643 - update-ref -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.644 'update-ref -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 644 - update-ref -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.645 '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 645 - update-ref -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.646 'update-ref *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 646 - update-ref *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-checking known breakage of 0450.647 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:34.862773267 +0000
-+++ help	2025-12-18 01:32:34.862773267 +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 647 - update-ref -h output and SYNOPSIS agree # TODO known breakage
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.648 'update-server-info -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 648 - update-server-info -h output has no \t
+ok 238 - Passing --batch-check with -t fails
 
-expecting success of 0450.649 'update-server-info -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.239 'Passing -s with --batch-check fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 649 - update-server-info -h output has dashed labels
+fatal: '-s' is incompatible with batch mode
 
-expecting success of 0450.650 '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 650 - update-server-info -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.651 'update-server-info *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 651 - update-server-info *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.652 '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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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 652 - update-server-info -h output and SYNOPSIS agree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.653 'upload-archive -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 653 - upload-archive -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.654 'upload-archive -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 654 - upload-archive -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.655 '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 655 - upload-archive -h output has consistent spacing
+ok 239 - Passing -s with --batch-check fails
 
-expecting success of 0450.656 'upload-archive *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.240 'Passing --batch-check with -s fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 656 - upload-archive *.txt SYNOPSIS has dashed labels
+fatal: '-s' is incompatible with batch mode
 
-expecting success of 0450.657 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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 - upload-archive -h output and SYNOPSIS agree
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.658 'upload-archive--writer -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 658 - upload-archive--writer -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.659 'upload-archive--writer -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 659 - upload-archive--writer -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.660 '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 660 - upload-archive--writer -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-ok 661 # skip upload-archive--writer *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_UPLOAD_ARCHIVE__WRITER)
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-ok 662 # skip upload-archive--writer -h output and SYNOPSIS agree (missing BUILTIN_TXT_UPLOAD_ARCHIVE__WRITER)
+ok 240 - Passing --batch-check with -s fails
 
-expecting success of 0450.663 'upload-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
+expecting success of 1006.241 'Passing -e with --batch-check fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 663 - upload-pack -h output has no \t
+fatal: '-e' is incompatible with batch mode
 
-expecting success of 0450.664 'upload-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 664 - upload-pack -h output has dashed labels
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.665 '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 665 - upload-pack -h output has consistent spacing
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.666 'upload-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 666 - upload-pack *.txt SYNOPSIS has dashed labels
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.667 '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")" &&
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
-	
-ok 667 - upload-pack -h output and SYNOPSIS agree
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.668 'var -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 668 - var -h output has no \t
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.669 'var -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 669 - var -h output has dashed labels
+ok 241 - Passing -e with --batch-check fails
 
-expecting success of 0450.670 '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
+expecting success of 1006.242 'Passing --batch-check with -e fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 670 - var -h output has consistent spacing
+fatal: '-e' is incompatible with batch mode
 
-expecting success of 0450.671 'var *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 671 - var *.txt SYNOPSIS has dashed labels
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.672 '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")" &&
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-		# The *.txt and -h use different spacing for 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 - var -h output and SYNOPSIS agree
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.673 'verify-commit -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 673 - verify-commit -h output has no \t
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.674 'verify-commit -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 674 - verify-commit -h output has dashed labels
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.675 '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 675 - verify-commit -h output has consistent spacing
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.676 'verify-commit *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+ok 242 - Passing --batch-check with -e fails
+
+expecting success of 1006.243 'Passing -p with --batch-check fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-ok 676 - verify-commit *.txt SYNOPSIS has dashed labels
+fatal: '-p' is incompatible with batch mode
 
-expecting success of 0450.677 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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 - verify-commit -h output and SYNOPSIS agree
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.678 'verify-pack -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 678 - verify-pack -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.679 'verify-pack -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 679 - verify-pack -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.680 '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 680 - verify-pack -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.681 'verify-pack *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 681 - verify-pack *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.682 '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")" &&
+ok 243 - Passing -p with --batch-check fails
 
-		# The *.txt and -h use different spacing for 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 1006.244 'Passing --batch-check with -p fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-ok 682 - verify-pack -h output and SYNOPSIS agree
+fatal: '-p' is incompatible with batch mode
 
-expecting success of 0450.683 'verify-tag -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 683 - verify-tag -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.684 'verify-tag -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 684 - verify-tag -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.685 '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 685 - verify-tag -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.686 'verify-tag *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 686 - verify-tag *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.687 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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-tag -h output and SYNOPSIS agree
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.688 'version -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 688 - version -h output has no \t
+ok 244 - Passing --batch-check with -p fails
 
-expecting success of 0450.689 'version -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
+expecting success of 1006.245 'Passing <type> with --batch-check fails': 
+	test_must_fail git cat-file --$batch blob $oid
 	
-ok 689 - version -h output has dashed labels
+fatal: batch modes take no arguments
 
-expecting success of 0450.690 '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 690 - version -h output has consistent spacing
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.691 'version *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 691 - version *.txt SYNOPSIS has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.692 '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")" &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-		# The *.txt and -h use different spacing for 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 - version -h output and SYNOPSIS agree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.693 'whatchanged -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 693 - whatchanged -h output has no \t
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.694 'whatchanged -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 694 - whatchanged -h output has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.695 '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 695 - whatchanged -h output has consistent spacing
+ok 245 - Passing <type> with --batch-check fails
 
-expecting success of 0450.696 'whatchanged *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+expecting success of 1006.246 'Passing --batch-check with <type> fails': 
+	test_must_fail git cat-file blob --$batch $oid
 	
-ok 696 - whatchanged *.txt SYNOPSIS has dashed labels
+fatal: batch modes take no arguments
 
-checking known breakage of 0450.697 '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")" &&
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-		# The *.txt and -h use different spacing for 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-12-18 01:32:35.254773267 +0000
-+++ help	2025-12-18 01:32:35.258773267 +0000
-@@ -1 +1,2 @@
--git whatchanged <option>...
-+git log [<options>] [<revision-range>] [[--] <path>...]
-+git show [<options>] <object>...
-not ok 697 - whatchanged -h output and SYNOPSIS agree # TODO known breakage
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.698 'worktree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 698 - worktree -h output has no \t
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.699 'worktree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 699 - worktree -h output has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.700 '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 700 - worktree -h output has consistent spacing
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 0450.701 'worktree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 701 - worktree *.txt SYNOPSIS has dashed labels
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 0450.702 '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")" &&
+ok 246 - Passing --batch-check with <type> fails
 
-		# The *.txt and -h use different spacing for 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 1006.247 'Passing oid with --batch-check fails': 
+	test_must_fail git cat-file --$batch $oid
 	
-ok 702 - worktree -h output and SYNOPSIS agree
+fatal: batch modes take no arguments
 
-expecting success of 0450.703 'write-tree -h output has no \t': 
-		h2s="$(help_to_synopsis "$builtin")" &&
-		! grep "$HT" "$h2s"
-	
-ok 703 - write-tree -h output has no \t
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 0450.704 'write-tree -h output has dashed labels': 
-		check_dashed_labels "$(help_to_synopsis "$builtin")"
-	
-ok 704 - write-tree -h output has dashed labels
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 0450.705 '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 705 - write-tree -h output has consistent spacing
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 0450.706 'write-tree *.txt SYNOPSIS has dashed labels': 
-		check_dashed_labels "$(txt_to_synopsis "$builtin")"
-	
-ok 706 - write-tree *.txt SYNOPSIS has dashed labels
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 0450.707 '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")" &&
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-		# The *.txt and -h use different spacing for 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 - write-tree -h output and SYNOPSIS agree
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-# still have 57 known breakage(s)
-# passed all remaining 650 test(s)
-1..707
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1009-read-tree-new-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+ok 247 - Passing oid with --batch-check fails
 
-[main (root-commit) 4d54ff5] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-ok 1 - setup
+expecting success of 1006.248 'Passing -t with --batch-command fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
+	
+fatal: '-t' is incompatible with batch mode
 
-expecting success of 1009.2 'non-existent index file': 
-	rm -f new-index &&
-	GIT_INDEX_FILE=new-index git read-tree main
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 2 - non-existent index file
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 1009.3 'empty index file': 
-	rm -f new-index &&
-	> new-index &&
-	GIT_INDEX_FILE=new-index git read-tree main
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 3 - empty index file
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1007-hash-object.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/.git/
-expecting success of 1007.1 'setup': 
-	setup_repo &&
-	test_oid_cache <<-EOF
-	hello sha1:5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	hello sha256:1e3b6c04d2eeb2b3e45c8a330445404c0b7cc7b257e2b097167d26f5230090c4
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-	example sha1:ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	example sha256:b44fe1fe65589848253737db859bd490453510719d7424daab03daf0767b85ae
-	EOF
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-ok 1 - setup
+ok 248 - Passing -t with --batch-command fails
 
-expecting success of 1007.2 'multiple '--stdin's are rejected': 
-	echo example | test_must_fail git hash-object --stdin --stdin
+expecting success of 1006.249 'Passing --batch-command with -t fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
+	
+fatal: '-t' is incompatible with batch mode
 
-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]
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-    -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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-ok 2 - multiple '--stdin's are rejected
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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]
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-    -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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 249 - Passing --batch-command with -t fails
 
-    -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 1006.250 'Passing -s with --batch-command fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
+	
+fatal: '-s' is incompatible with batch mode
 
-ok 3 - Can't use --stdin and --stdin-paths together
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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]
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-    -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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-ok 4 - Can't pass filenames as arguments with --stdin-paths
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 1007.5 'Can't use --path with --stdin-paths': 
-	echo example | test_must_fail git hash-object --stdin-paths --path=foo
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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]
+ok 250 - Passing -s with --batch-command fails
 
-    -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 1006.251 'Passing --batch-command with -s fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
+	
+fatal: '-s' is incompatible with batch mode
 
-ok 5 - Can't use --path with --stdin-paths
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 1007.6 'Can't use --path with --no-filters': 
-	test_must_fail git hash-object --no-filters --path=foo
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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]
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-    -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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-ok 6 - Can't use --path with --no-filters
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.7 'hash a file': 
-	test "$(test_oid hello)" = $(git hash-object hello)
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-ok 7 - hash a file
+ok 251 - Passing --batch-command with -s fails
 
-expecting success of 1007.8 'blob does not exist in database': 
-		test_must_fail git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+expecting success of 1006.252 'Passing -e with --batch-command fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
 	
-fatal: git cat-file 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689: bad file
-ok 8 - blob does not exist in database
+fatal: '-e' is incompatible with batch mode
 
-expecting success of 1007.9 'hash from stdin': 
-	test "$(test_oid example)" = $(git hash-object --stdin < example)
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 9 - hash from stdin
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-expecting success of 1007.11 'hash a file and write to database': 
-	test "$(test_oid hello)" = $(git hash-object -w hello)
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-ok 11 - hash a file and write to database
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 1007.12 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+
+ok 252 - Passing -e with --batch-command fails
+
+expecting success of 1006.253 'Passing --batch-command with -e fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-Hello Worldok 12 - blob exists in database
+fatal: '-e' is incompatible with batch mode
 
-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"
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 13 - git hash-object --stdin file1 <file0 first operates on file0, then file1
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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"
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 14 - set up crlf tests
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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"
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-ok 15 - check that appropriate filter is invoke when --path is used
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 253 - Passing --batch-command with -e fails
 
-ok 16 - gitattributes also work in a subdirectory
+expecting success of 1006.254 'Passing -p with --batch-command fails': 
+	    test_must_fail git cat-file --$batch -$opt $oid
+	
+fatal: '-p' is incompatible with batch mode
 
-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"
-	)
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 17 - --path works in a subdirectory
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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"
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 18 - check that --no-filters option works
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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"
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-ok 19 - check that --no-filters option works with --stdin-paths
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.20 'hash from stdin and write to database (-w --stdin)': 
-		test "$(test_oid example)" = $(git hash-object $args < example)
-	
-ok 20 - hash from stdin and write to database (-w --stdin)
+ok 254 - Passing -p with --batch-command fails
 
-expecting success of 1007.21 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+expecting success of 1006.255 'Passing --batch-command with -p fails': 
+	    test_must_fail git cat-file -$opt --$batch $oid
 	
-This is an exampleok 21 - blob exists in database
+fatal: '-p' is incompatible with batch mode
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.22 'hash from stdin and write to database (--stdin -w)': 
-		test "$(test_oid example)" = $(git hash-object $args < example)
-	
-ok 22 - hash from stdin and write to database (--stdin -w)
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 1007.23 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 23 - blob exists in database
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 1007.24 'hash two files with names on stdin': 
-	test "$oids" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 24 - hash two files with names on stdin
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.25 'hash two files with names on stdin and write to database (-w --stdin-paths)': 
-		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
-	
-ok 25 - hash two files with names on stdin and write to database (-w --stdin-paths)
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-expecting success of 1007.26 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 26 - blob exists in database
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 1007.27 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
-	
-This is an exampleok 27 - blob exists in database
+ok 255 - Passing --batch-command with -p fails
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1007-hash-object/test/.git/
-expecting success of 1007.28 'hash two files with names on stdin and write to database (--stdin-paths -w)': 
-		test "$oids" = "$(echo_without_newline "$filenames" | git hash-object $args)"
+expecting success of 1006.256 'Passing <type> with --batch-command fails': 
+	test_must_fail git cat-file --$batch blob $oid
 	
-ok 28 - hash two files with names on stdin and write to database (--stdin-paths -w)
+fatal: batch modes take no arguments
 
-expecting success of 1007.29 'blob exists in database': 
-		git cat-file blob 5e1c309dae7f45e0f39b1bf3ac3cd9db12e7d689
-	
-Hello Worldok 29 - blob exists in database
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-expecting success of 1007.30 'blob exists in database': 
-		git cat-file blob ddd3f836d3e3fbb7ae289aa9ae83536f76956399
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
+
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
+
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
+
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+
+ok 256 - Passing <type> with --batch-command fails
+
+expecting success of 1006.257 'Passing --batch-command with <type> fails': 
+	test_must_fail git cat-file blob --$batch $oid
 	
-This is an exampleok 30 - blob exists in database
+fatal: batch modes take no arguments
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-error: too-short tree object
-ok 31 - too-short tree
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-error: malformed mode in tree entry
-ok 32 - malformed mode in tree
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-error: empty filename in tree entry
-ok 33 - empty filename in tree
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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
+ok 257 - Passing --batch-command with <type> fails
 
-error: object fails fsck: duplicateEntries: contains duplicate file entries
-ok 34 - duplicate filename in tree
+expecting success of 1006.258 'Passing oid with --batch-command fails': 
+	test_must_fail git cat-file --$batch $oid
+	
+fatal: batch modes take no arguments
 
-expecting success of 1007.35 'corrupt commit': 
-	test_must_fail git hash-object -t commit --stdin </dev/null
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-error: object fails fsck: unterminatedHeader: unterminated header
-fatal: refusing to create malformed object
-ok 35 - corrupt commit
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 1007.36 'corrupt tag': 
-	test_must_fail git hash-object -t tag --stdin </dev/null
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-error: object fails fsck: unterminatedHeader: unterminated header
-fatal: refusing to create malformed object
-ok 36 - corrupt tag
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 1007.37 'hash-object complains about bogus type name': 
-	test_must_fail git hash-object -t bogus --stdin </dev/null
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-fatal: invalid object type "bogus"
-ok 37 - hash-object complains about bogus type name
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 1007.38 'hash-object complains about truncated type name': 
-	test_must_fail git hash-object -t bl --stdin </dev/null
+ok 258 - Passing oid with --batch-command fails
 
-fatal: invalid object type "bl"
-ok 38 - hash-object complains about truncated type name
+expecting success of 1006.259 'Passing -t with --follow-symlinks fails': 
+	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+	
+fatal: '--follow-symlinks' requires a batch mode
 
-expecting success of 1007.39 '--literally': 
-	t=1234567890 &&
-	echo example | git hash-object -t $t --literally --stdin
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-f78b23c3f872d473c764d5fcf4fb39af8bbf2123
-ok 39 - --literally
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-2a881776ee43e849175ee7158075560ca0ae7692
-ok 40 - --literally with extra-long type
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-# passed all 40 test(s)
-1..40
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1008-read-tree-overlay.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1008-read-tree-overlay/.git/
-expecting success of 1008.1 'setup': 
-	echo one >a &&
-	git add a &&
-	git commit -m initial &&
-	git tag initial &&
-	echo two >b &&
-	git add b &&
-	git commit -m second &&
-	git checkout -b side initial &&
-	echo three >a &&
-	mkdir b &&
-	echo four >b/c &&
-	git add b/c &&
-	git commit -m third
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-[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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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 259 - Passing -t with --follow-symlinks fails
 
-ok 2 - multi-read
+expecting success of 1006.260 'Passing -s with --follow-symlinks fails': 
+	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+	
+fatal: '--follow-symlinks' requires a batch mode
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1010-mktree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1010-mktree/.git/
-expecting success of 1010.1 'setup': 
-	for d in a a- a0
-	do
-		mkdir "$d" && echo "$d/one" >"$d/one" &&
-		git add "$d" || return 1
-	done &&
-	echo zero >one &&
-	git update-index --add --info-only one &&
-	git write-tree --missing-ok >tree.missing &&
-	git ls-tree $(cat tree.missing) >top.missing &&
-	git ls-tree -r $(cat tree.missing) >all.missing &&
-	echo one >one &&
-	git add one &&
-	git write-tree >tree &&
-	git ls-tree $(cat tree) >top &&
-	git ls-tree -r $(cat tree) >all &&
-	test_tick &&
-	git commit -q -m one &&
-	H=$(git rev-parse HEAD) &&
-	git update-index --add --cacheinfo 160000 $H sub &&
-	test_tick &&
-	git commit -q -m two &&
-	git rev-parse HEAD^{tree} >tree.withsub &&
-	git ls-tree HEAD >top.withsub &&
-	git ls-tree -r HEAD >all.withsub
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 1 - setup
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 1010.2 'ls-tree piped to mktree (1)': 
-	git mktree <top >actual &&
-	test_cmp tree actual
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 2 - ls-tree piped to mktree (1)
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 1010.3 'ls-tree piped to mktree (2)': 
-	git mktree <top.withsub >actual &&
-	test_cmp tree.withsub actual
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-ok 3 - ls-tree piped to mktree (2)
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 1010.4 'ls-tree output in wrong order given to mktree (1)': 
-	perl -e "print reverse <>" <top |
-	git mktree >actual &&
-	test_cmp tree actual
+ok 260 - Passing -s with --follow-symlinks fails
 
-ok 4 - ls-tree output in wrong order given to mktree (1)
+expecting success of 1006.261 'Passing -e with --follow-symlinks fails': 
+	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+	
+fatal: '--follow-symlinks' requires a batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 5 - ls-tree output in wrong order given to mktree (2)
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 1010.6 'allow missing object with --missing': 
-	git mktree --missing <top.missing >actual &&
-	test_cmp tree.missing actual
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 6 - allow missing object with --missing
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 1010.7 'mktree refuses to read ls-tree -r output (1)': 
-	test_must_fail git mktree <all
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-fatal: path a-/one contains slash
-ok 7 - mktree refuses to read ls-tree -r output (1)
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 1010.8 'mktree refuses to read ls-tree -r output (2)': 
-	test_must_fail git mktree <all.withsub
+ok 261 - Passing -e with --follow-symlinks fails
 
-fatal: path a-/one contains slash
-ok 8 - mktree refuses to read ls-tree -r output (2)
+expecting success of 1006.262 'Passing -p with --follow-symlinks fails': 
+	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+	
+fatal: '--follow-symlinks' requires a batch mode
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1014-read-tree-confusing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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})
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-[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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-expecting success of 1014.2 'enable core.protectHFS for rejection tests': 
-	git config core.protectHFS true
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-ok 2 - enable core.protectHFS for rejection tests
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-expecting success of 1014.3 'enable core.protectNTFS for rejection tests': 
-	git config core.protectNTFS true
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-ok 3 - enable core.protectNTFS for rejection tests
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-expecting success of 1014.4 'reject . at end of path': 
-		printf "100644 blob %s\t%s" "$blob" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
-	
-error: invalid path '.'
-ok 4 - reject . at end of path
+ok 262 - Passing -p with --follow-symlinks fails
 
-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
+expecting success of 1006.263 'Passing -t with --follow-symlinks fails': 
+	    test_must_fail git cat-file --follow-symlinks -$opt $oid
 	
-error: invalid path './file'
-ok 5 - reject . as subtree
+fatal: '--follow-symlinks' requires a batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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
+ok 263 - Passing -t with --follow-symlinks fails
 
-expecting success of 1014.13 'reject {u200c}.Git as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
+expecting success of 1006.264 'Passing -s with --follow-symlinks fails': 
+	    test_must_fail git cat-file --follow-symlinks -$opt $oid
 	
-error: invalid path '‌.Git/file'
-ok 13 - reject {u200c}.Git as subtree
+fatal: '--follow-symlinks' requires a batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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
+ok 264 - Passing -s with --follow-symlinks fails
 
-expecting success of 1014.21 'reject .git.{space} as subtree': 
-		printf "040000 tree %s\t%s" "$tree" "$path" >tree &&
-		bogus=$(git mktree <tree) &&
-		test_must_fail git read-tree $bogus
+expecting success of 1006.265 'Passing -e with --follow-symlinks fails': 
+	    test_must_fail git cat-file --follow-symlinks -$opt $oid
 	
-error: invalid path '.git. /file'
-ok 21 - reject .git.{space} as subtree
+fatal: '--follow-symlinks' requires a batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-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
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-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
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-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
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-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
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-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
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+
+ok 265 - Passing -e with --follow-symlinks fails
+
+expecting success of 1006.266 'Passing -p with --follow-symlinks fails': 
+	    test_must_fail git cat-file --follow-symlinks -$opt $oid
 	
-error: invalid path '.git...:alternate-stream/file'
-ok 27 - reject .git...:alternate-stream as subtree
+fatal: '--follow-symlinks' requires a batch mode
 
-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
+usage: git cat-file <type> <object>
+   or: git cat-file (-e | -p) <object>
+   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
+   or: git cat-file (--textconv | --filters)
+                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
+                    [--buffer] [--follow-symlinks] [--unordered]
+                    [--textconv | --filters] [-Z]
 
-ok 28 - utf-8 paths allowed with core.protectHFS off
+Check object existence or emit object contents
+    -e                    check if <object> exists
+    -p                    pretty-print <object> content
 
-# passed all 28 test(s)
-1..28
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1012-read-tree-df.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1012-read-tree-df/.git/
-expecting success of 1012.1 'setup': 
-	maketree O-000 a/b-2/c/d a/b/c/d a/x &&
-	maketree A-000 a/b-2/c/d a/b/c/d a/x &&
-	maketree A-001 a/b-2/c/d a/b/c/d a/b/c/e a/x &&
-	maketree B-000 a/b-2/c/d a/b     a/x &&
+Emit [broken] object attributes
+    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
+    -s                    show object size
+    --[no-]allow-unknown-type
+                          allow -s and -t to work with broken/corrupt objects
+    --[no-]use-mailmap    use mail map file
+    --[no-]mailmap ...    alias of --use-mailmap
 
-	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: &&
+Batch objects requested on stdin (or --batch-all-objects)
+    --batch[=<format>]    show full <object> or <rev> contents
+    --batch-check[=<format>]
+                          like --batch, but don't emit <contents>
+    -Z                    stdin and stdout is NUL-terminated
+    --batch-command[=<format>]
+                          read commands from stdin
+    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
 
-	maketree O-020 ds/dma/ioat.c ds/dma/ioat_dca.c &&
-	maketree A-020 ds/dma/ioat/Makefile ds/dma/ioat/registers.h &&
-	:
+Change or optimize batch output
+    --[no-]buffer         buffer --batch output
+    --[no-]follow-symlinks
+                          follow in-tree symlinks
+    --[no-]unordered      do not order objects before emitting them
 
-ok 1 - setup
+Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
+    --textconv            run textconv on object's content
+    --filters             run filters on object's content
+    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
 
-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
+ok 266 - Passing -p with --follow-symlinks fails
+
+expecting success of 1006.267 '--batch-check for a non-existent named object': 
+	cat >expect <<-EOF &&
+	foobar42 missing
+	foobar84 missing
 	EOF
 
-ok 2 - 3-way (1)
+	printf "foobar42\nfoobar84" >in &&
+	git cat-file --batch-check <in >actual &&
+	test_cmp expect actual
 
-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
+ok 267 - --batch-check for a non-existent named object
+
+expecting success of 1006.268 '--batch-check for a non-existent hash': 
+	cat >expect <<-EOF &&
+	0000000000000000000000000000000000000042 missing
+	0000000000000000000000000000000000000084 missing
 	EOF
 
-ok 3 - 3-way (2)
+	printf "0000000000000000000000000000000000000042\n0000000000000000000000000000000000000084" >in &&
+	git cat-file --batch-check <in >actual &&
+	test_cmp expect actual
 
-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
+ok 268 - --batch-check for a non-existent hash
+
+expecting success of 1006.269 '--batch for an existent and a non-existent hash': 
+	cat >expect <<-EOF &&
+	$tag_oid tag $tag_size
+	$tag_content
+	0000000000000000000000000000000000000000 missing
 	EOF
 
-ok 4 - 3-way (3)
+	printf "$tag_oid\n0000000000000000000000000000000000000000" >in &&
+	git cat-file --batch <in >actual &&
+	test_cmp expect actual
 
-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
+ok 269 - --batch for an existent and a non-existent hash
+
+expecting success of 1006.270 '--batch-check for an empty line': 
+	cat >expect <<-EOF &&
+	 missing
 	EOF
 
-ok 5 - 2-way (1)
+	echo >in &&
+	git cat-file --batch-check <in >actual &&
+	test_cmp expect actual
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1011-read-tree-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1011-read-tree-sparse-checkout/.git/
-expecting success of 1011.1 'setup': 
-	test_commit init &&
-	echo modified >>init.t &&
+ok 270 - --batch-check for an empty line
 
-	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
+expecting success of 1006.271 'empty --batch-check notices missing object': 
+	echo "$ZERO_OID missing" >expect &&
+	echo "$ZERO_OID" | git cat-file --batch-check="" >actual &&
+	test_cmp expect actual
+
+ok 271 - empty --batch-check notices missing object
+
+expecting success of 1006.272 '--batch with multiple oids gives correct format': 
+	tr "\0" "\n" <batch_output >expect &&
+	echo_without_newline "$batch_input" >in &&
+	git cat-file --batch <in >actual &&
+	test_cmp expect actual
+    
+ok 272 - --batch with multiple oids gives correct format
+
+expecting success of 1006.273 '--batch, -z with multiple oids gives correct format': 
+	echo_without_newline_nul "$batch_input" >in &&
+	tr "\0" "\n" <batch_output >expect &&
+	git cat-file --batch -z <in >actual &&
+	test_cmp expect actual
+    
+ok 273 - --batch, -z with multiple oids gives correct format
+
+expecting success of 1006.274 '--batch, -Z with multiple oids gives correct format': 
+	echo_without_newline_nul "$batch_input" >in &&
+	git cat-file --batch -Z <in >actual &&
+	test_cmp batch_output actual
+    
+ok 274 - --batch, -Z with multiple oids gives correct format
+
+expecting success of 1006.275 '--batch-check with multiple oids gives correct format': 
+	tr "\0" "\n" <batch_check_output >expect &&
+	echo_without_newline "$batch_check_input" >in &&
+	git cat-file --batch-check <in >actual &&
+	test_cmp expect actual
+    
+ok 275 - --batch-check with multiple oids gives correct format
+
+expecting success of 1006.276 '--batch-check, -z with multiple oids gives correct format': 
+	tr "\0" "\n" <batch_check_output >expect &&
+	echo_without_newline_nul "$batch_check_input" >in &&
+	git cat-file --batch-check -z <in >actual &&
+	test_cmp expect actual
+    
+ok 276 - --batch-check, -z with multiple oids gives correct format
+
+expecting success of 1006.277 '--batch-check, -Z with multiple oids gives correct format': 
+	echo_without_newline_nul "$batch_check_input" >in &&
+	git cat-file --batch-check -Z <in >actual &&
+	test_cmp batch_check_output actual
+    
+ok 277 - --batch-check, -Z with multiple oids gives correct format
+
+expecting success of 1006.278 '--batch-command with multiple info calls gives correct format': 
+	cat >expect <<-EOF &&
+	$boid blob $hello_size
+	$loid tree $lsize
+	$coid commit $csize
+	$toid tag $tsize
+	deadbeef missing
 	EOF
-	cat >expected.swt <<-\EOF &&
-	H init.t
-	H sub/added
-	H sub/addedtoo
-	H subsub/added
+
+	echo "$batch_command_multiple_info" >in &&
+	git cat-file --batch-command --buffer <in >actual &&
+
+	test_cmp expect actual &&
+
+	echo "$batch_command_multiple_info" | tr "\n" "\0" >in &&
+	git cat-file --batch-command --buffer -z <in >actual &&
+
+	test_cmp expect actual &&
+
+	echo "$batch_command_multiple_info" | tr "\n" "\0" >in &&
+	tr "\n" "\0" <expect >expect_nul &&
+	git cat-file --batch-command --buffer -Z <in >actual &&
+
+	test_cmp expect_nul actual
+    
+ok 278 - --batch-command with multiple info calls gives correct format
+
+expecting success of 1006.279 '--batch-command with multiple command calls gives correct format': 
+	printf "%s\0" \
+		"$boid blob $hello_size" \
+		"$hello_content" \
+		"$coid commit $csize" \
+		"$ccontent" \
+		"$toid tag $tsize" \
+		"$tcontent" \
+		"deadbeef missing" >expect_nul &&
+	tr "\0" "\n" <expect_nul >expect &&
+
+	echo "$batch_command_multiple_contents" >in &&
+	git cat-file --batch-command --buffer <in >actual &&
+
+	test_cmp expect actual &&
+
+	echo "$batch_command_multiple_contents" | tr "\n" "\0" >in &&
+	git cat-file --batch-command --buffer -z <in >actual &&
+
+	test_cmp expect actual &&
+
+	echo "$batch_command_multiple_contents" | tr "\n" "\0" >in &&
+	git cat-file --batch-command --buffer -Z <in >actual &&
+
+	test_cmp expect_nul actual
+    
+ok 279 - --batch-command with multiple command calls gives correct format
+
+expecting success of 1006.280 '--batch with multiple oids gives correct format': 
+	tr "\0" "\n" <batch_output >expect &&
+	echo_without_newline "$batch_input" >in &&
+	git cat-file --batch <in >actual &&
+	test_cmp expect actual
+    
+ok 280 - --batch with multiple oids gives correct format
+
+expecting success of 1006.281 '--batch, -z with multiple oids gives correct format': 
+	echo_without_newline_nul "$batch_input" >in &&
+	tr "\0" "\n" <batch_output >expect &&
+	git cat-file --batch -z <in >actual &&
+	test_cmp expect actual
+    
+ok 281 - --batch, -z with multiple oids gives correct format
+
+expecting success of 1006.282 '--batch, -Z with multiple oids gives correct format': 
+	echo_without_newline_nul "$batch_input" >in &&
+	git cat-file --batch -Z <in >actual &&
+	test_cmp batch_output actual
+    
+ok 282 - --batch, -Z with multiple oids gives correct format
+
+expecting success of 1006.283 '--batch-check with multiple oids gives correct format': 
+	tr "\0" "\n" <batch_check_output >expect &&
+	echo_without_newline "$batch_check_input" >in &&
+	git cat-file --batch-check <in >actual &&
+	test_cmp expect actual
+    
+ok 283 - --batch-check with multiple oids gives correct format
+
+expecting success of 1006.284 '--batch-check, -z with multiple oids gives correct format': 
+	tr "\0" "\n" <batch_check_output >expect &&
+	echo_without_newline_nul "$batch_check_input" >in &&
+	git cat-file --batch-check -z <in >actual &&
+	test_cmp expect actual
+    
+ok 284 - --batch-check, -z with multiple oids gives correct format
+
+expecting success of 1006.285 '--batch-check, -Z with multiple oids gives correct format': 
+	echo_without_newline_nul "$batch_check_input" >in &&
+	git cat-file --batch-check -Z <in >actual &&
+	test_cmp batch_check_output actual
+    
+ok 285 - --batch-check, -Z with multiple oids gives correct format
+
+expecting success of 1006.286 '--batch-command with multiple info calls gives correct format': 
+	cat >expect <<-EOF &&
+	$boid blob $hello_size
+	$loid tree $lsize
+	$coid commit $csize
+	$toid tag $tsize
+	deadbeef missing
 	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
+	echo "$batch_command_multiple_info" >in &&
+	git cat-file --batch-command --buffer <in >actual &&
 
-[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'.
+	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.
+	echo "$batch_command_multiple_info" | tr "\n" "\0" >in &&
+	git cat-file --batch-command --buffer -z <in >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>
+	echo "$batch_command_multiple_info" | tr "\n" "\0" >in &&
+	tr "\n" "\0" <expect >expect_nul &&
+	git cat-file --batch-command --buffer -Z <in >actual &&
 
-Or undo this operation with:
+	test_cmp expect_nul actual
+    
+ok 286 - --batch-command with multiple info calls gives correct format
 
-  git switch -
+expecting success of 1006.287 '--batch-command with multiple command calls gives correct format': 
+	printf "%s\0" \
+		"$boid blob $hello_size" \
+		"$hello_content" \
+		"$coid commit $csize" \
+		"$ccontent" \
+		"$toid tag $tsize" \
+		"$tcontent" \
+		"deadbeef missing" >expect_nul &&
+	tr "\0" "\n" <expect_nul >expect &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	echo "$batch_command_multiple_contents" >in &&
+	git cat-file --batch-command --buffer <in >actual &&
 
-HEAD is now at 9598e22 modified and added
-ok 1 - setup
+	test_cmp expect actual &&
 
-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
+	echo "$batch_command_multiple_contents" | tr "\n" "\0" >in &&
+	git cat-file --batch-command --buffer -z <in >actual &&
 
-ok 2 - read-tree without .git/info/sparse-checkout
+	test_cmp expect actual &&
 
-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
+	echo "$batch_command_multiple_contents" | tr "\n" "\0" >in &&
+	git cat-file --batch-command --buffer -Z <in >actual &&
 
-ok 3 - read-tree with .git/info/sparse-checkout but disabled
+	test_cmp expect_nul actual
+    
+ok 287 - --batch-command with multiple command calls gives correct format
 
-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
+checking prerequisite: FUNNYNAMES
 
-ok 4 - read-tree --no-sparse-checkout with empty .git/info/sparse-checkout and enabled
+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 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
+)
+prerequisite FUNNYNAMES ok
+expecting success of 1006.288 'setup with newline in input': 
+	touch -- "newline${LF}embedded" &&
+	git add -- "newline${LF}embedded" &&
+	git commit -m "file with newline embedded" &&
+	test_tick &&
+
+	printf "HEAD:newline${LF}embedded" >in
+
+[master (root-commit) a7561ce] file with newline embedded
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 hello
+ create mode 100644 "newline\nembedded"
+ok 288 - setup with newline in input
+
+expecting success of 1006.289 '--batch-check, -z with newline in input': 
+	git cat-file --batch-check -z <in >actual &&
+	echo "$(git rev-parse "HEAD:newline${LF}embedded") blob 0" >expect &&
+	test_cmp expect actual
+
+ok 289 - --batch-check, -z with newline in input
+
+expecting success of 1006.290 '--batch-check, -Z with newline in input': 
+	git cat-file --batch-check -Z <in >actual &&
+	printf "%s\0" "$(git rev-parse "HEAD:newline${LF}embedded") blob 0" >expect &&
+	test_cmp expect actual
+
+ok 290 - --batch-check, -Z with newline in input
+
+expecting success of 1006.291 'setup blobs which are likely to delta': 
+	test-tool genrandom foo 10240 >foo &&
+	{ cat foo && echo plus; } >foo-plus &&
+	git add foo foo-plus &&
+	git commit -m foo &&
+	cat >blobs <<-\EOF
+	HEAD:foo
+	HEAD:foo-plus
 	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
+[master 149611e] foo
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+ create mode 100644 foo-plus
+ok 291 - setup blobs which are likely to delta
 
-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
+expecting success of 1006.292 'confirm that neither loose blob is a delta': 
+	cat >expect <<-EOF &&
+	$ZERO_OID
+	$ZERO_OID
 	EOF
+	git cat-file --batch-check="%(deltabase)" <blobs >actual &&
+	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
+ok 292 - confirm that neither loose blob is a delta
 
-ok 6 - match directories with trailing slash
+expecting success of 1006.293 '%(deltabase) reports packed delta bases': 
+	git repack -ad &&
+	git cat-file --batch-check="%(deltabase)" <blobs >actual &&
+	{
+		grep "$(git rev-parse HEAD:foo)" actual ||
+		grep "$(git rev-parse HEAD:foo-plus)" 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
+9b546ef00c80e00a1733cb882d607028fcd562fc
+ok 293 - %(deltabase) reports packed delta bases
 
-ok 7 - match directories without trailing slash
+expecting success of 1006.294 'setup bogus data': 
+	bogus_short_type="bogus" &&
+	bogus_short_content="bogus" &&
+	bogus_short_size=$(strlen "$bogus_short_content") &&
+	bogus_short_oid=$(echo_without_newline "$bogus_short_content" | git hash-object -t $bogus_short_type --literally -w --stdin) &&
 
-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
+	bogus_long_type="abcdefghijklmnopqrstuvwxyz1234679" &&
+	bogus_long_content="bogus" &&
+	bogus_long_size=$(strlen "$bogus_long_content") &&
+	bogus_long_oid=$(echo_without_newline "$bogus_long_content" | git hash-object -t $bogus_long_type --literally -w --stdin)
 
-	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 294 - setup bogus data
 
-ok 8 - match directories with negated patterns
+expecting success of 1006.295 'cat-file  -s error on bogus short OID': 
+			cat >expect <<-\EOF &&
+			fatal: invalid object type
+			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
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+ok 295 - cat-file  -s error on bogus short OID
 
-	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 1006.296 'cat-file  -s error on bogus full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: Not a valid object name $bogus_long_oid
+				EOF
+			else
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
 
-ok 9 - match directories with negated patterns (2)
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+ok 296 - cat-file  -s error on bogus full OID
 
-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
+expecting success of 1006.297 'cat-file  -s error on missing short OID': 
+			cat >expect.err <<-EOF &&
+			fatal: Not a valid object name $(test_oid deadbeef_short)
+			EOF
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 297 - cat-file  -s error on missing short OID
 
-ok 10 - match directory pattern
+expecting success of 1006.298 'cat-file  -s error on missing full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect.err <<-EOF
+				fatal: Not a valid object name $(test_oid deadbeef)
+				EOF
+			else
+				cat >expect.err <<-\EOF
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 298 - cat-file  -s error on missing full OID
 
-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 1006.299 'cat-file  -t error on bogus short OID': 
+			cat >expect <<-\EOF &&
+			fatal: invalid object type
+			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
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+ok 299 - cat-file  -t error on bogus short OID
 
-ok 11 - checkout area changes
+expecting success of 1006.300 'cat-file  -t error on bogus full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: Not a valid object name $bogus_long_oid
+				EOF
+			else
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
 
-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
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+ok 300 - cat-file  -t error on bogus full OID
 
-HEAD is now at 9598e22 modified and added
-ok 12 - read-tree updates worktree, absent case
+expecting success of 1006.301 'cat-file  -t error on missing short OID': 
+			cat >expect.err <<-EOF &&
+			fatal: Not a valid object name $(test_oid deadbeef_short)
+			EOF
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 301 - cat-file  -t error on missing short OID
 
-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 &&
+expecting success of 1006.302 'cat-file  -t error on missing full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect.err <<-EOF
+				fatal: Not a valid object name $(test_oid deadbeef)
+				EOF
+			else
+				cat >expect.err <<-\EOF
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 302 - cat-file  -t error on missing full OID
 
-	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 1006.303 'cat-file  -p error on bogus short OID': 
+			cat >expect <<-\EOF &&
+			fatal: invalid object type
+			EOF
 
-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
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+ok 303 - cat-file  -p error on bogus short OID
 
-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 &&
+expecting success of 1006.304 'cat-file  -p error on bogus full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: Not a valid object name $bogus_long_oid
+				EOF
+			else
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
 
-	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
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+ok 304 - cat-file  -p error on bogus full OID
 
-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 1006.305 'cat-file  -p error on missing short OID': 
+			cat >expect.err <<-EOF &&
+			fatal: Not a valid object name $(test_oid deadbeef_short)
+			EOF
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 305 - cat-file  -p error on missing short OID
 
-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
+expecting success of 1006.306 'cat-file  -p error on missing full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect.err <<-EOF
+				fatal: Not a valid object name $(test_oid deadbeef)
+				EOF
+			else
+				cat >expect.err <<-\EOF
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 306 - cat-file  -p error on missing full OID
 
-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 1006.307 'cat-file --allow-unknown-type -s error on bogus short OID': 
+			cat >expect <<-\EOF &&
+			fatal: invalid object type
+			EOF
 
-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
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+5
+ok 307 - cat-file --allow-unknown-type -s error on bogus short OID
 
-HEAD is now at 9598e22 modified and added
-ok 16 - read-tree removes worktree, dirty case
+expecting success of 1006.308 'cat-file --allow-unknown-type -s error on bogus full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: Not a valid object name $bogus_long_oid
+				EOF
+			else
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
 
-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
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+5
+ok 308 - cat-file --allow-unknown-type -s error on bogus full OID
 
-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 1006.309 'cat-file --allow-unknown-type -s error on missing short OID': 
+			cat >expect.err <<-EOF &&
+			fatal: Not a valid object name $(test_oid deadbeef_short)
+			EOF
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 309 - cat-file --allow-unknown-type -s error on missing short OID
 
-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
+expecting success of 1006.310 'cat-file --allow-unknown-type -s error on missing full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect.err <<-EOF
+				fatal: Not a valid object name $(test_oid deadbeef)
+				EOF
+			else
+				cat >expect.err <<-\EOF
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 310 - cat-file --allow-unknown-type -s error on missing full OID
 
-HEAD is now at de70956 removed
-ok 18 - read-tree adds to worktree, dirty case
+expecting success of 1006.311 'cat-file --allow-unknown-type -t error on bogus short OID': 
+			cat >expect <<-\EOF &&
+			fatal: invalid object type
+			EOF
 
-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
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+bogus
+ok 311 - cat-file --allow-unknown-type -t error on bogus short OID
 
-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 1006.312 'cat-file --allow-unknown-type -t error on bogus full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: Not a valid object name $bogus_long_oid
+				EOF
+			else
+				cat >expect <<-EOF
+				error: header for $bogus_long_oid too long, exceeds 32 bytes
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
 
-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
+			if test "$arg1" = "--allow-unknown-type"
+			then
+				git cat-file $arg1 $arg2 $bogus_short_oid
+			else
+				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
+				test_must_be_empty out &&
+				test_cmp expect actual
+			fi
+		
+bogus
+ok 312 - cat-file --allow-unknown-type -t error on bogus full OID
 
-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 1006.313 'cat-file --allow-unknown-type -t error on missing short OID': 
+			cat >expect.err <<-EOF &&
+			fatal: Not a valid object name $(test_oid deadbeef_short)
+			EOF
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 313 - cat-file --allow-unknown-type -t error on missing short OID
 
-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 1006.314 'cat-file --allow-unknown-type -t error on missing full OID': 
+			if test "$arg2" = "-p"
+			then
+				cat >expect.err <<-EOF
+				fatal: Not a valid object name $(test_oid deadbeef)
+				EOF
+			else
+				cat >expect.err <<-\EOF
+				fatal: git cat-file: could not get object info
+				EOF
+			fi &&
+			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
+			test_must_be_empty out &&
+			test_cmp expect.err err.actual
+		
+ok 314 - cat-file --allow-unknown-type -t error on missing full OID
 
-After fixing the above paths, you may want to run `git sparse-checkout reapply`.
-EOF
-	test_cmp expected actual
+expecting success of 1006.315 '-e is OK with a broken object without --allow-unknown-type': 
+	git cat-file -e $bogus_short_oid
 
-Previous HEAD position was de70956 removed
-HEAD is now at 2519212 init
-ok 21 - print warnings when some worktree updates disabled
+ok 315 - -e is OK with a broken object without --allow-unknown-type
 
-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 1006.316 '-e can not be combined with --allow-unknown-type': 
+	test_expect_code 128 git cat-file -e --allow-unknown-type $bogus_short_oid
 
-HEAD is now at 9598e22 modified and added
-Updated 1 path from the index
-ok 22 - checkout without --ignore-skip-worktree-bits
+fatal: git cat-file --allow-unknown-type: use with -s or -t
+ok 316 - -e can not be combined with --allow-unknown-type
 
-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
+expecting success of 1006.317 '-p cannot print a broken object even with --allow-unknown-type': 
+	test_must_fail git cat-file -p $bogus_short_oid &&
+	test_expect_code 128 git cat-file -p --allow-unknown-type $bogus_short_oid
 
-HEAD is now at 9598e22 modified and added
-Updated 3 paths from the index
-ok 23 - checkout with --ignore-skip-worktree-bits
+fatal: invalid object type
+fatal: git cat-file --allow-unknown-type: use with -s or -t
+ok 317 - -p cannot print a broken object even with --allow-unknown-type
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1015-read-index-unmerged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1015-read-index-unmerged/.git/
-expecting success of 1015.1 'setup modify/delete + directory/file conflict': 
-	test_create_repo df_plus_modify_delete &&
-	(
-		cd df_plus_modify_delete &&
+expecting success of 1006.318 '<type> <hash> does not work with objects of broken types': 
+	cat >err.expect <<-\EOF &&
+	fatal: invalid object type "bogus"
+	EOF
+	test_must_fail git cat-file $bogus_short_type $bogus_short_oid 2>err.actual &&
+	test_cmp err.expect err.actual
 
-		test_write_lines a b c d e f g h >letters &&
-		git add letters &&
-		git commit -m initial &&
+ok 318 - <type> <hash> does not work with objects of broken types
 
-		git checkout -b modify &&
-		# Throw in letters.txt for sorting order fun
-		# ("letters.txt" sorts between "letters" and "letters/file")
-		echo i >>letters &&
-		echo "version 2" >letters.txt &&
-		git add letters letters.txt &&
-		git commit -m modified &&
+expecting success of 1006.319 'broken types combined with --batch and --batch-check': 
+	echo $bogus_short_oid >bogus-oid &&
 
-		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
-	)
+	cat >err.expect <<-\EOF &&
+	fatal: invalid object type
+	EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+	test_must_fail git cat-file --batch <bogus-oid 2>err.actual &&
+	test_cmp err.expect err.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 &&
+	test_must_fail git cat-file --batch-check <bogus-oid 2>err.actual &&
+	test_cmp err.expect err.actual
 
-		git checkout delete^0 &&
-		test_must_fail git merge modify &&
+ok 319 - broken types combined with --batch and --batch-check
 
-		git read-tree --reset HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
+expecting success of 1006.320 'the --batch and --batch-check options do not combine with --allow-unknown-type': 
+	test_expect_code 128 git cat-file --batch --allow-unknown-type <bogus-oid &&
+	test_expect_code 128 git cat-file --batch-check --allow-unknown-type <bogus-oid
 
-Note: switching to 'delete^0'.
+fatal: invalid object type
+fatal: invalid object type
+ok 320 - the --batch and --batch-check options do not combine with --allow-unknown-type
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 1006.321 'the --allow-unknown-type option does not consider replacement refs': 
+	cat >expect <<-EOF &&
+	$bogus_short_type
+	EOF
+	git cat-file -t --allow-unknown-type $bogus_short_oid >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:
+	# Create it manually, as "git replace" will die on bogus
+	# types.
+	head=$(git rev-parse --verify HEAD) &&
+	test_when_finished "test-tool ref-store main delete-refs 0 msg refs/replace/$bogus_short_oid" &&
+	test-tool ref-store main update-ref msg "refs/replace/$bogus_short_oid" $head $ZERO_OID REF_SKIP_OID_VERIFICATION &&
 
-  git switch -c <new-branch-name>
+	cat >expect <<-EOF &&
+	commit
+	EOF
+	git cat-file -t --allow-unknown-type $bogus_short_oid >actual &&
+	test_cmp expect actual
 
-Or undo this operation with:
+ok 321 - the --allow-unknown-type option does not consider replacement refs
 
-  git switch -
+expecting success of 1006.322 'Type of broken object is correct': 
+	echo $bogus_short_type >expect &&
+	git cat-file -t --allow-unknown-type $bogus_short_oid >actual &&
+	test_cmp expect actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 322 - Type of broken object is correct
 
-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 1006.323 'Size of broken object is correct': 
+	echo $bogus_short_size >expect &&
+	git cat-file -s --allow-unknown-type $bogus_short_oid >actual &&
+	test_cmp expect actual
 
-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 &&
+ok 323 - Size of broken object is correct
 
-		git checkout delete^0 &&
-		test_must_fail git merge modify &&
+expecting success of 1006.324 'clean up broken object': 
+	rm .git/objects/$(test_oid_to_path $bogus_short_oid)
 
-		git reset --hard &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
+ok 324 - clean up broken object
 
-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 1006.325 'Type of broken object is correct when type is large': 
+	echo $bogus_long_type >expect &&
+	git cat-file -t --allow-unknown-type $bogus_long_oid >actual &&
+	test_cmp expect actual
 
-expecting success of 1015.4 'setup directory/file conflict + simple edit/edit': 
-	test_create_repo df_plus_edit_edit &&
+ok 325 - Type of broken object is correct when type is large
+
+expecting success of 1006.326 'Size of large broken object is correct when type is large': 
+	echo $bogus_long_size >expect &&
+	git cat-file -s --allow-unknown-type $bogus_long_oid >actual &&
+	test_cmp expect actual
+
+ok 326 - Size of large broken object is correct when type is large
+
+expecting success of 1006.327 'clean up broken object': 
+	rm .git/objects/$(test_oid_to_path $bogus_long_oid)
+
+ok 327 - clean up broken object
+
+expecting success of 1006.328 'cat-file -t and -s on corrupt loose object': 
+	git init --bare corrupt-loose.git &&
 	(
-		cd df_plus_edit_edit &&
+		cd corrupt-loose.git &&
 
-		test_seq 1 10 >numbers &&
-		git add numbers &&
-		git commit -m initial &&
+		# Setup and create the empty blob and its path
+		empty_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$EMPTY_BLOB")) &&
+		empty_blob=$(git hash-object -w --stdin </dev/null) &&
 
-		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" &&
+		# Create another blob and its path
+		echo other >other.blob &&
+		other_blob=$(git hash-object -w --stdin <other.blob) &&
+		other_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$other_blob")) &&
 
-		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"
+		# Before the swap the size is 0
+		cat >out.expect <<-EOF &&
+		0
+		EOF
+		git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
+		test_must_be_empty err.actual &&
+		test_cmp out.expect out.actual &&
+
+		# Swap the two to corrupt the repository
+		mv -f "$other_path" "$empty_path" &&
+		test_must_fail git fsck 2>err.fsck &&
+		grep "hash-path mismatch" err.fsck &&
+
+		# confirm that cat-file is reading the new swapped-in
+		# blob...
+		cat >out.expect <<-EOF &&
+		blob
+		EOF
+		git cat-file -t "$EMPTY_BLOB" >out.actual 2>err.actual &&
+		test_must_be_empty err.actual &&
+		test_cmp out.expect out.actual &&
+
+		# ... since it has a different size now.
+		cat >out.expect <<-EOF &&
+		6
+		EOF
+		git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
+		test_must_be_empty err.actual &&
+		test_cmp out.expect out.actual &&
+
+		# So far "cat-file" has been happy to spew the found
+		# content out as-is. Try to make it zlib-invalid.
+		mv -f other.blob "$empty_path" &&
+		test_must_fail git fsck 2>err.fsck &&
+		cat >expect <<-EOF &&
+		error: inflate: data stream error (incorrect header check)
+		error: unable to unpack header of ./$empty_path
+		error: $empty_blob: object corrupt or missing: ./$empty_path
+		EOF
+		grep "^error: " err.fsck >actual &&
+		test_cmp expect actual
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1006-cat-file/corrupt-loose.git/
+error: e45c9c2666d44e0327c1f9c239a74c508336053e: hash-path mismatch, found at: ./objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 328 - cat-file -t and -s on corrupt loose object
+
+expecting success of 1006.329 'prep for symlink tests': 
+	echo_without_newline "$hello_content" >morx &&
+	test_ln_s_add morx same-dir-link &&
+	test_ln_s_add dir link-to-dir &&
+	test_ln_s_add ../fleem out-of-repo-link &&
+	test_ln_s_add .. out-of-repo-link-dir &&
+	test_ln_s_add same-dir-link link-to-link &&
+	test_ln_s_add nope broken-same-dir-link &&
+	mkdir dir &&
+	test_ln_s_add ../morx dir/parent-dir-link &&
+	test_ln_s_add .. dir/link-dir &&
+	test_ln_s_add ../../escape dir/out-of-repo-link &&
+	test_ln_s_add ../.. dir/out-of-repo-link-dir &&
+	test_ln_s_add nope dir/broken-link-in-dir &&
+	mkdir dir/subdir &&
+	test_ln_s_add ../../morx dir/subdir/grandparent-dir-link &&
+	test_ln_s_add ../../../great-escape dir/subdir/out-of-repo-link &&
+	test_ln_s_add ../../.. dir/subdir/out-of-repo-link-dir &&
+	test_ln_s_add ../../../ dir/subdir/out-of-repo-link-dir-trailing &&
+	test_ln_s_add ../parent-dir-link dir/subdir/parent-dir-link-to-link &&
+	echo_without_newline "$hello_content" >dir/subdir/ind2 &&
+	echo_without_newline "$hello_content" >dir/ind1 &&
+	test_ln_s_add dir dirlink &&
+	test_ln_s_add dir/subdir subdirlink &&
+	test_ln_s_add subdir/ind2 dir/link-to-child &&
+	test_ln_s_add dir/link-to-child link-to-down-link &&
+	test_ln_s_add dir/.. up-down &&
+	test_ln_s_add dir/../ up-down-trailing &&
+	test_ln_s_add dir/../morx up-down-file &&
+	test_ln_s_add dir/../../morx up-up-down-file &&
+	test_ln_s_add subdirlink/../../morx up-two-down-file &&
+	test_ln_s_add loop1 loop2 &&
+	test_ln_s_add loop2 loop1 &&
+	git add morx dir/subdir/ind2 dir/ind1 &&
+	git commit -am "test" &&
+	echo $hello_oid blob $hello_size >found
+
+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 86a080e] test
  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
+ 30 files changed, 30 insertions(+)
+ create mode 120000 broken-same-dir-link
+ create mode 120000 dir/broken-link-in-dir
+ create mode 100644 dir/ind1
+ create mode 120000 dir/link-dir
+ create mode 120000 dir/link-to-child
+ create mode 120000 dir/out-of-repo-link
+ create mode 120000 dir/out-of-repo-link-dir
+ create mode 120000 dir/parent-dir-link
+ create mode 120000 dir/subdir/grandparent-dir-link
+ create mode 100644 dir/subdir/ind2
+ create mode 120000 dir/subdir/out-of-repo-link
+ create mode 120000 dir/subdir/out-of-repo-link-dir
+ create mode 120000 dir/subdir/out-of-repo-link-dir-trailing
+ create mode 120000 dir/subdir/parent-dir-link-to-link
+ create mode 120000 dirlink
+ create mode 120000 link-to-dir
+ create mode 120000 link-to-down-link
+ create mode 120000 link-to-link
+ create mode 120000 loop1
+ create mode 120000 loop2
+ create mode 100644 morx
+ create mode 120000 out-of-repo-link
+ create mode 120000 out-of-repo-link-dir
+ create mode 120000 same-dir-link
+ create mode 120000 subdirlink
+ create mode 120000 up-down
+ create mode 120000 up-down-file
+ create mode 120000 up-down-trailing
+ create mode 120000 up-two-down-file
+ create mode 120000 up-up-down-file
+ok 329 - prep for symlink tests
 
-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 &&
+expecting success of 1006.330 'git cat-file --batch-check --follow-symlinks works for non-links': 
+	echo HEAD:morx | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual &&
+	echo HEAD:nope missing >expect &&
+	echo HEAD:nope | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual
 
-		git checkout f-edit^0 &&
-		test_must_fail git merge d-edit^0 &&
+ok 330 - git cat-file --batch-check --follow-symlinks works for non-links
 
-		git merge --abort &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
+expecting success of 1006.331 'git cat-file --batch-check --follow-symlinks works for in-repo, same-dir links': 
+	echo HEAD:same-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual
 
-Note: switching to 'f-edit^0'.
+ok 331 - git cat-file --batch-check --follow-symlinks works for in-repo, same-dir links
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 1006.332 'git cat-file --batch-check --follow-symlinks works for in-repo, links to dirs': 
+	echo HEAD:link-to-dir/ind1 | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found 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 332 - git cat-file --batch-check --follow-symlinks works for in-repo, links to dirs
 
-  git switch -c <new-branch-name>
+expecting success of 1006.333 'git cat-file --batch-check --follow-symlinks works for broken in-repo, same-dir links': 
+	echo dangling 25 >expect &&
+	echo HEAD:broken-same-dir-link >>expect &&
+	echo HEAD:broken-same-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual
 
-Or undo this operation with:
+ok 333 - git cat-file --batch-check --follow-symlinks works for broken in-repo, same-dir links
 
-  git switch -
+expecting success of 1006.334 'git cat-file --batch-check --follow-symlinks -Z works for broken in-repo, same-dir links': 
+	printf "HEAD:broken-same-dir-link\0" >in &&
+	printf "dangling 25\0HEAD:broken-same-dir-link\0" >expect &&
+	git cat-file --batch-check --follow-symlinks -Z <in >actual &&
+	test_cmp expect actual
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 334 - git cat-file --batch-check --follow-symlinks -Z works for broken in-repo, same-dir links
 
-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 1006.335 'git cat-file --batch-check --follow-symlinks works for same-dir links-to-links': 
+	echo HEAD:link-to-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual
 
-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" &&
+ok 335 - git cat-file --batch-check --follow-symlinks works for same-dir links-to-links
+
+expecting success of 1006.336 'git cat-file --batch-check --follow-symlinks works for parent-dir links': 
+	echo HEAD:dir/parent-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual &&
+	echo notdir 29 >expect &&
+	echo HEAD:dir/parent-dir-link/nope >>expect &&
+	echo HEAD:dir/parent-dir-link/nope | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual
+
+ok 336 - git cat-file --batch-check --follow-symlinks works for parent-dir links
+
+expecting success of 1006.337 'git cat-file --batch-check --follow-symlinks -Z works for parent-dir links': 
+	echo HEAD:dir/parent-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual &&
+	printf "notdir 29\0HEAD:dir/parent-dir-link/nope\0" >expect &&
+	printf "HEAD:dir/parent-dir-link/nope\0" >in &&
+	git cat-file --batch-check --follow-symlinks -Z <in >actual &&
+	test_cmp expect actual
+
+ok 337 - git cat-file --batch-check --follow-symlinks -Z works for parent-dir links
+
+expecting success of 1006.338 'git cat-file --batch-check --follow-symlinks works for .. links': 
+	echo dangling 22 >expect &&
+	echo HEAD:dir/link-dir/nope >>expect &&
+	echo HEAD:dir/link-dir/nope | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo HEAD:dir/link-dir/morx | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual &&
+	echo dangling 27 >expect &&
+	echo HEAD:dir/broken-link-in-dir >>expect &&
+	echo HEAD:dir/broken-link-in-dir | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual
+
+ok 338 - git cat-file --batch-check --follow-symlinks works for .. links
+
+expecting success of 1006.339 'git cat-file --batch-check --follow-symlinks works for ../.. links': 
+	echo notdir 41 >expect &&
+	echo HEAD:dir/subdir/grandparent-dir-link/nope >>expect &&
+	echo HEAD:dir/subdir/grandparent-dir-link/nope | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo HEAD:dir/subdir/grandparent-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual &&
+	echo HEAD:dir/subdir/parent-dir-link-to-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual
+
+ok 339 - git cat-file --batch-check --follow-symlinks works for ../.. links
+
+expecting success of 1006.340 'git cat-file --batch-check --follow-symlinks works for dir/ links': 
+	echo dangling 17 >expect &&
+	echo HEAD:dirlink/morx >>expect &&
+	echo HEAD:dirlink/morx | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo $hello_oid blob $hello_size >expect &&
+	echo HEAD:dirlink/ind1 | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual
+
+ok 340 - git cat-file --batch-check --follow-symlinks works for dir/ links
+
+expecting success of 1006.341 'git cat-file --batch-check --follow-symlinks works for dir/subdir links': 
+	echo dangling 20 >expect &&
+	echo HEAD:subdirlink/morx >>expect &&
+	echo HEAD:subdirlink/morx | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo HEAD:subdirlink/ind2 | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual
+
+ok 341 - git cat-file --batch-check --follow-symlinks works for dir/subdir links
+
+expecting success of 1006.342 'git cat-file --batch-check --follow-symlinks works for dir ->subdir links': 
+	echo notdir 27 >expect &&
+	echo HEAD:dir/link-to-child/morx >>expect &&
+	echo HEAD:dir/link-to-child/morx | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo HEAD:dir/link-to-child | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual &&
+	echo HEAD:link-to-down-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual
+
+ok 342 - git cat-file --batch-check --follow-symlinks works for dir ->subdir links
+
+expecting success of 1006.343 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks': 
+	echo symlink 8 >expect &&
+	echo ../fleem >>expect &&
+	echo HEAD:out-of-repo-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo symlink 2 >expect &&
+	echo .. >>expect &&
+	echo HEAD:out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual
+
+ok 343 - git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks
+
+expecting success of 1006.344 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in dirs': 
+	echo symlink 9 >expect &&
+	echo ../escape >>expect &&
+	echo HEAD:dir/out-of-repo-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo symlink 2 >expect &&
+	echo .. >>expect &&
+	echo HEAD:dir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual
+
+ok 344 - git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in dirs
+
+expecting success of 1006.345 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in subdirs': 
+	echo symlink 15 >expect &&
+	echo ../great-escape >>expect &&
+	echo HEAD:dir/subdir/out-of-repo-link | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo symlink 2 >expect &&
+	echo .. >>expect &&
+	echo HEAD:dir/subdir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo symlink 3 >expect &&
+	echo ../ >>expect &&
+	echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual
+
+ok 345 - git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in subdirs
+
+expecting success of 1006.346 'git cat-file --batch-check --follow-symlinks works for symlinks with internal ..': 
+	echo HEAD: | git cat-file --batch-check >expect &&
+	echo HEAD:up-down | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo HEAD:up-down-trailing | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo HEAD:up-down-file | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual &&
+	echo symlink 7 >expect &&
+	echo ../morx >>expect &&
+	echo HEAD:up-up-down-file | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual &&
+	echo HEAD:up-two-down-file | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp found actual
+
+ok 346 - git cat-file --batch-check --follow-symlinks works for symlinks with internal ..
+
+expecting success of 1006.347 'git cat-file --batch-check --follow-symlink breaks loops': 
+	echo loop 10 >expect &&
+	echo HEAD:loop1 >>expect &&
+	echo HEAD:loop1 | git cat-file --batch-check --follow-symlinks >actual &&
+	test_cmp expect actual
+
+ok 347 - git cat-file --batch-check --follow-symlink breaks loops
+
+expecting success of 1006.348 'git cat-file --batch-check --follow-symlink -Z breaks loops': 
+	printf "loop 10\0HEAD:loop1\0" >expect &&
+	printf "HEAD:loop1\0" >in &&
+	git cat-file --batch-check --follow-symlinks -Z <in >actual &&
+	test_cmp expect actual
+
+ok 348 - git cat-file --batch-check --follow-symlink -Z breaks loops
+
+expecting success of 1006.349 'git cat-file --batch --follow-symlink returns correct sha and mode': 
+	echo HEAD:morx | git cat-file --batch >expect &&
+	echo HEAD:morx | git cat-file --batch --follow-symlinks >actual &&
+	test_cmp expect actual
+
+ok 349 - git cat-file --batch --follow-symlink returns correct sha and mode
+
+expecting success of 1006.350 'cat-file --batch-all-objects shows all objects': 
+	# make new repos so we know the full set of objects; we will
+	# also make sure that there are some packed and some loose
+	# objects, some referenced and some not, some duplicates, and that
+	# there are some available only via alternates.
+	git init all-one &&
 	(
-		cd df_plus_edit_edit &&
+		cd all-one &&
+		echo content >file &&
+		git add file &&
+		git commit -qm base &&
+		git rev-parse HEAD HEAD^{tree} HEAD:file &&
+		git repack -ad &&
+		echo not-cloned | git hash-object -w --stdin
+	) >expect.unsorted &&
+	git clone -s all-one all-two &&
+	(
+		cd all-two &&
+		echo local-unref | git hash-object -w --stdin
+	) >>expect.unsorted &&
+	git -C all-two rev-parse HEAD:file |
+		git -C all-two pack-objects .git/objects/pack/pack &&
+	sort <expect.unsorted >expect &&
+	git -C all-two cat-file --batch-all-objects \
+				--batch-check="%(objectname)" >actual &&
+	test_cmp expect actual
 
-		git checkout f-edit^0 &&
-		git format-patch -1 d-edit &&
-		test_must_fail git am -3 0001*.patch &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1006-cat-file/all-one/.git/
+Cloning into 'all-two'...
+done.
+2d40090ddd2c612f2679520aaab9f69d52e41628
+ok 350 - cat-file --batch-all-objects shows all objects
 
-		git am --skip &&
-		test_path_is_missing .git/rebase-apply &&
-		git ls-files -u >conflicts &&
-		test_must_be_empty conflicts
-	)
+expecting success of 1006.351 'cat-file --unordered works': 
+	git -C all-two cat-file --batch-all-objects --unordered \
+				--batch-check="%(objectname)" >actual.unsorted &&
+	sort <actual.unsorted >actual &&
+	test_cmp expect actual
 
-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
+ok 351 - cat-file --unordered works
 
-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 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
+expecting success of 1006.352 'set up object list for --batch-all-objects tests': 
+	git -C all-two cat-file --batch-all-objects --batch-check="%(objectname)" >objects
 
-# passed all 6 test(s)
-1..6
+ok 352 - set up object list for --batch-all-objects tests
+
+expecting success of 1006.353 'cat-file --batch="%(objectname)" with --batch-all-objects will work': 
+	git -C all-two cat-file --batch="%(objectname)" <objects >expect &&
+	git -C all-two cat-file --batch-all-objects --batch="%(objectname)" >actual &&
+	cmp expect actual
+
+ok 353 - cat-file --batch="%(objectname)" with --batch-all-objects will work
+
+expecting success of 1006.354 'cat-file --batch="%(rest)" with --batch-all-objects will work': 
+	git -C all-two cat-file --batch="%(rest)" <objects >expect &&
+	git -C all-two cat-file --batch-all-objects --batch="%(rest)" >actual &&
+	cmp expect actual
+
+ok 354 - cat-file --batch="%(rest)" with --batch-all-objects will work
+
+expecting success of 1006.355 'cat-file --batch="batman" with --batch-all-objects will work': 
+	git -C all-two cat-file --batch="batman" <objects >expect &&
+	git -C all-two cat-file --batch-all-objects --batch="batman" >actual &&
+	cmp expect actual
+
+ok 355 - cat-file --batch="batman" with --batch-all-objects will work
+
+expecting success of 1006.356 'cat-file %(objectsize:disk) with --batch-all-objects': 
+	# our state has both loose and packed objects,
+	# so find both for our expected output
+	{
+		find .git/objects/?? -type f |
+		awk -F/ "{ print \$0, \$3\$4 }" |
+		while read path oid
+		do
+			size=$(test_file_size "$path") &&
+			echo "$oid $size" ||
+			return 1
+		done &&
+		rawsz=$(test_oid rawsz) &&
+		find .git/objects/pack -name "*.idx" |
+		while read idx
+		do
+			git show-index <"$idx" >idx.raw &&
+			sort -nr <idx.raw >idx.sorted &&
+			packsz=$(test_file_size "${idx%.idx}.pack") &&
+			end=$((packsz - rawsz)) &&
+			while read start oid rest
+			do
+				size=$((end - start)) &&
+				end=$start &&
+				echo "$oid $size" ||
+				return 1
+			done <idx.sorted ||
+			return 1
+		done
+	} >expect.raw &&
+	sort <expect.raw >expect &&
+	git cat-file --batch-all-objects \
+		--batch-check="%(objectname) %(objectsize:disk)" >actual &&
+	test_cmp expect actual
+
+ok 356 - cat-file %(objectsize:disk) with --batch-all-objects
+
+expecting success of 1006.357 'set up replacement object': 
+	orig=$(git rev-parse HEAD) &&
+	git cat-file commit $orig >orig &&
+	{
+		cat orig &&
+		echo extra
+	} >fake &&
+	fake=$(git hash-object -t commit -w fake) &&
+	orig_size=$(git cat-file -s $orig) &&
+	fake_size=$(git cat-file -s $fake) &&
+	git replace $orig $fake
+
+ok 357 - set up replacement object
+
+expecting success of 1006.358 'cat-file --batch respects replace objects': 
+	git cat-file --batch >actual <<-EOF &&
+	$orig
+	EOF
+	{
+		echo "$orig commit $fake_size" &&
+		cat fake &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+
+ok 358 - cat-file --batch respects replace objects
+
+expecting success of 1006.359 'cat-file --batch-check respects replace objects': 
+	git cat-file --batch-check >actual <<-EOF &&
+	$orig
+	EOF
+	echo "$orig commit $fake_size" >expect &&
+	test_cmp expect actual
+
+ok 359 - cat-file --batch-check respects replace objects
+
+expecting success of 1006.360 'cat-file --batch-all-objects --batch ignores replace': 
+	git cat-file --batch-all-objects --batch >actual.raw &&
+	extract_batch_output $orig <actual.raw >actual &&
+	{
+		echo "$orig commit $orig_size" &&
+		cat orig &&
+		echo
+	} >expect &&
+	test_cmp expect actual
+
+ok 360 - cat-file --batch-all-objects --batch ignores replace
+
+expecting success of 1006.361 'cat-file --batch-all-objects --batch-check ignores replace': 
+	git cat-file --batch-all-objects --batch-check >actual.raw &&
+	grep ^$orig actual.raw >actual &&
+	echo "$orig commit $orig_size" >expect &&
+	test_cmp expect actual
+
+ok 361 - cat-file --batch-all-objects --batch-check ignores replace
+
+expecting success of 1006.362 'batch-command empty command': 
+	echo "" >cmd &&
+	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+	grep "^fatal:.*empty command in input.*" err
+
+fatal: empty command in input
+ok 362 - batch-command empty command
+
+expecting success of 1006.363 'batch-command whitespace before command': 
+	echo " info deadbeef" >cmd &&
+	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+	grep "^fatal:.*whitespace before command.*" err
+
+fatal: whitespace before command: ' info deadbeef'
+ok 363 - batch-command whitespace before command
+
+expecting success of 1006.364 'batch-command unknown command': 
+	echo unknown_command >cmd &&
+	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+	grep "^fatal:.*unknown command.*" err
+
+fatal: unknown command: 'unknown_command'
+ok 364 - batch-command unknown command
+
+expecting success of 1006.365 'batch-command missing arguments': 
+	echo "info" >cmd &&
+	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+	grep "^fatal:.*info requires arguments.*" err
+
+fatal: info requires arguments
+ok 365 - batch-command missing arguments
+
+expecting success of 1006.366 'batch-command flush with arguments': 
+	echo "flush arg" >cmd &&
+	test_expect_code 128 git cat-file --batch-command --buffer <cmd 2>err &&
+	grep "^fatal:.*flush takes no arguments.*" err
+
+fatal: flush takes no arguments
+ok 366 - batch-command flush with arguments
+
+expecting success of 1006.367 'batch-command flush without --buffer': 
+	echo "flush" >cmd &&
+	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
+	grep "^fatal:.*flush is only for --buffer mode.*" err
+
+fatal: flush is only for --buffer mode
+ok 367 - batch-command flush without --buffer
+
+# passed all 367 test(s)
+1..367
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1020-subdirectory.sh ***
@@ -51097,236 +49293,6 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1021-rerere-in-workdir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1022-read-tree-partial-clone.sh ***
-expecting success of 1022.1 'read-tree in partial clone prefetches in one batch': 
-	test_when_finished "rm -rf server client trace" &&
-
-	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.45.2/t/trash directory.t1022-read-tree-partial-clone/server/.git/
-[master (root-commit) a6fa93e] initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 two
-Cloning into bare repository 'client'...
-ok 1 - read-tree in partial clone prefetches in one batch
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1051-large-conversion.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1051-large-conversion/.git/
-expecting success of 1051.1 'setup input tests': 
-	printf "\$Id: foo\$\\r\\n" >small &&
-	cat small small >large &&
-	git config core.bigfilethreshold 20 &&
-	git config filter.test.clean "sed s/.*/CLEAN/"
-
-ok 1 - setup input tests
-
-expecting success of 1051.2 'autocrlf=true converts on input': 
-	test_config core.autocrlf true &&
-	check_input
-
-ok 2 - autocrlf=true converts on input
-
-expecting success of 1051.3 'eol=crlf converts on input': 
-	set_attr eol=crlf &&
-	check_input
-
-ok 3 - eol=crlf converts on input
-
-expecting success of 1051.4 'ident converts on input': 
-	set_attr ident &&
-	check_input
-
-ok 4 - ident converts on input
-
-expecting success of 1051.5 'user-defined filters convert on input': 
-	set_attr filter=test &&
-	check_input
-
-ok 5 - user-defined filters convert on input
-
-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 not satisfied
-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 not satisfied
-ok 11 # skip files over 4GB convert on output (missing SIZE_T_IS_64BIT,EXPENSIVE of EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT)
-
-ok 12 # skip files over 4GB convert on input (missing SIZE_T_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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1016-compatObjectFormat.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1016-compatObjectFormat/.git/
 expecting success of 1016.1 'setup sha1 repository': 
@@ -52357,401 +50323,234 @@
 1..202
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1090-sparse-checkout-scope.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
+*** t1021-rerere-in-workdir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1021-rerere-in-workdir/.git/
+checking prerequisite: SYMLINKS
 
-[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
+mkdir -p "$TRASH_DIRECTORY/prereq-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 1090.2 'create feature branch': 
-	git checkout -b feature &&
-	echo "modified" >b &&
-	echo "modified" >c &&
-	git add b c &&
-	git commit -m "modification"
+)
+prerequisite SYMLINKS ok
+expecting success of 1021.1 'setup': 
+	git config rerere.enabled true &&
+	>world &&
+	git add world &&
+	test_tick &&
+	git commit -m initial &&
 
-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
+	echo hello >world &&
+	test_tick &&
+	git commit -a -m hello &&
 
-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
+	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 3 - perform sparse checkout of main
+ok 1 - setup
 
-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"
+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
+	)
 
-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
+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 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"
+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
+	)
 
-Switched to branch 'feature'
-Switched to branch 'main'
-ok 5 - return to full checkout of main
+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
 
-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 &&
+# still have 1 known breakage(s)
+# passed all remaining 2 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1022-read-tree-partial-clone.sh ***
+expecting success of 1022.1 'read-tree in partial clone prefetches in one batch': 
+	test_when_finished "rm -rf server client trace" &&
 
-	git ls-files -t >output &&
-	! grep ^S output >actual &&
-	test_must_be_empty actual &&
+	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}) &&
 
-	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
+	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 6 - skip-worktree on files outside sparse patterns
+	# "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 1090.7 'in partial clone, sparse checkout only fetches needed blobs': 
-	test_create_repo server &&
-	git clone --template= "file://$(pwd)/server" client &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1022-read-tree-partial-clone/server/.git/
+[master (root-commit) a6fa93e] initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100644 two
+Cloning into bare repository 'client'...
+ok 1 - read-tree in partial clone prefetches in one batch
 
-	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 &&
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1051-large-conversion.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1051-large-conversion/.git/
+expecting success of 1051.1 'setup input tests': 
+	printf "\$Id: foo\$\\r\\n" >small &&
+	cat small small >large &&
+	git config core.bigfilethreshold 20 &&
+	git config filter.test.clean "sed s/.*/CLEAN/"
 
-	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 &&
+ok 1 - setup input tests
 
-	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
+expecting success of 1051.2 'autocrlf=true converts on input': 
+	test_config core.autocrlf true &&
+	check_input
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1090-sparse-checkout-scope/server
- * [new branch]      main       -> origin/main
-Note: switching to 'FETCH_HEAD'.
+ok 2 - autocrlf=true converts on 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 1051.3 'eol=crlf converts on input': 
+	set_attr eol=crlf &&
+	check_input
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+ok 3 - eol=crlf converts on input
 
-  git switch -c <new-branch-name>
+expecting success of 1051.4 'ident converts on input': 
+	set_attr ident &&
+	check_input
 
-Or undo this operation with:
+ok 4 - ident converts on input
 
-  git switch -
+expecting success of 1051.5 'user-defined filters convert on input': 
+	set_attr filter=test &&
+	check_input
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ok 5 - user-defined filters convert on input
 
-HEAD is now at ab14680 message
-ok 7 - in partial clone, sparse checkout only fetches needed blobs
+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/"
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1060-object-corruption.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/.git/
-expecting success of 1060.1 'setup corrupt repo': 
-	git init bit-error &&
-	(
-		cd bit-error &&
-		test_commit content &&
-		corrupt_byte HEAD:content.t 10
-	) &&
-	git init no-bit-error &&
-	(
-		# distinct commit from bit-error, but containing a
-		# non-corrupted version of the same blob
-		cd no-bit-error &&
-		test_tick &&
-		test_commit content
-	)
+ok 6 - setup output tests
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/bit-error/.git/
-[master (root-commit) 0df6d69] content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 content.t
-1+0 records in
-1+0 records out
-1 byte copied, 3.5704e-05 s, 28.0 kB/s
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/no-bit-error/.git/
-[master (root-commit) f374eba] content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 content.t
-ok 1 - setup corrupt repo
+expecting success of 1051.7 'autocrlf=true converts on output': 
+	test_config core.autocrlf true &&
+	check_output
 
-expecting success of 1060.2 'setup repo with missing object': 
-	git init missing &&
-	(
-		cd missing &&
-		test_commit content &&
-		rm -f "$(obj_to_file HEAD:content.t)"
-	)
+Updated 2 paths from the index
+ok 7 - autocrlf=true converts on output
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/missing/.git/
-[master (root-commit) 0df6d69] content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 content.t
-ok 2 - setup repo with missing object
+expecting success of 1051.8 'eol=crlf converts on output': 
+	set_attr eol=crlf &&
+	check_output
 
-expecting success of 1060.3 'setup repo with misnamed object': 
-	git init misnamed &&
-	(
-		cd misnamed &&
-		test_commit content &&
-		good=$(obj_to_file HEAD:content.t) &&
-		blob=$(echo corrupt | git hash-object -w --stdin) &&
-		bad=$(obj_to_file $blob) &&
-		rm -f "$good" &&
-		mv "$bad" "$good"
-	)
+Updated 2 paths from the index
+ok 8 - eol=crlf converts on output
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/misnamed/.git/
-[master (root-commit) 0df6d69] content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 content.t
-ok 3 - setup repo with misnamed object
-
-expecting success of 1060.4 'streaming a corrupt blob fails': 
-	(
-		cd bit-error &&
-		test_must_fail git cat-file blob HEAD:content.t
-	)
-
-error: inflate: data stream error (invalid distance too far back)
-error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
-error: inflate: data stream error (invalid distance too far back)
-error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
-error: inflate: data stream error (invalid distance too far back)
-error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
-fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in .git/objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt
-ok 4 - streaming a corrupt blob fails
-
-expecting success of 1060.5 'getting type of a corrupt blob fails': 
-	(
-		cd bit-error &&
-		test_must_fail git cat-file -s HEAD:content.t
-	)
-
-error: inflate: data stream error (invalid distance too far back)
-error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
-fatal: git cat-file: could not get object info
-ok 5 - getting type of a corrupt blob fails
-
-expecting success of 1060.6 'read-tree -u detects bit-errors in blobs': 
-	(
-		cd bit-error &&
-		rm -f content.t &&
-		test_must_fail git read-tree --reset -u HEAD
-	)
-
-error: inflate: data stream error (invalid distance too far back)
-error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
-error: inflate: data stream error (invalid distance too far back)
-error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
-fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in .git/objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt
-ok 6 - read-tree -u detects bit-errors in blobs
-
-expecting success of 1060.7 'read-tree -u detects missing objects': 
-	(
-		cd missing &&
-		rm -f content.t &&
-		test_must_fail git read-tree --reset -u HEAD
-	)
-
-error: unable to read sha1 file of content.t (d95f3ad14dee633a758d2e331151e950dd13e4ed)
-ok 7 - read-tree -u detects missing objects
-
-expecting success of 1060.8 'clone --no-local --bare detects corruption': 
-	test_must_fail git clone --no-local --bare bit-error corrupt-transport
-
-Cloning into bare repository 'corrupt-transport'...
-remote: error: inflate: data stream error (invalid distance too far back)        
-remote: error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header        
-remote: error: inflate: data stream error (invalid distance too far back)        
-remote: error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header        
-remote: fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in ./objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt        
-error: git upload-pack: git-pack-objects died with error.
-fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
-remote: aborting due to possible repository corruption on the remote side.
-fatal: early EOF
-fatal: fetch-pack: invalid index-pack output
-ok 8 - clone --no-local --bare detects corruption
-
-expecting success of 1060.9 'clone --no-local --bare detects missing object': 
-	test_must_fail git clone --no-local --bare missing missing-transport
-
-Cloning into bare repository 'missing-transport'...
-remote: fatal: unable to read d95f3ad14dee633a758d2e331151e950dd13e4ed        
-error: git upload-pack: git-pack-objects died with error.
-fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
-remote: aborting due to possible repository corruption on the remote side.
-fatal: early EOF
-fatal: fetch-pack: invalid index-pack output
-ok 9 - clone --no-local --bare detects missing object
-
-expecting success of 1060.10 'clone --no-local --bare detects misnamed object': 
-	test_must_fail git clone --no-local --bare misnamed misnamed-transport
-
-Cloning into bare repository 'misnamed-transport'...
-fatal: did not receive expected object d95f3ad14dee633a758d2e331151e950dd13e4ed
-fatal: fetch-pack: invalid index-pack output
-ok 10 - clone --no-local --bare detects misnamed object
-
-expecting success of 1060.11 'clone --local detects corruption': 
-	test_must_fail git clone --local bit-error corrupt-checkout
-
-Cloning into 'corrupt-checkout'...
-done.
-error: inflate: data stream error (invalid distance too far back)
-error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
-error: inflate: data stream error (invalid distance too far back)
-error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
-fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/corrupt-checkout/.git/objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt
-warning: Clone succeeded, but checkout failed.
-You can inspect what was checked out with 'git status'
-and retry with 'git restore --source=HEAD :/'
-
-ok 11 - clone --local detects corruption
-
-expecting success of 1060.12 'error detected during checkout leaves repo intact': 
-	test_path_is_dir corrupt-checkout/.git
-
-ok 12 - error detected during checkout leaves repo intact
-
-expecting success of 1060.13 'clone --local detects missing objects': 
-	test_must_fail git clone --local missing missing-checkout
+expecting success of 1051.9 'user-defined filters convert on output': 
+	set_attr filter=test &&
+	check_output
 
-Cloning into 'missing-checkout'...
-done.
-error: unable to read sha1 file of content.t (d95f3ad14dee633a758d2e331151e950dd13e4ed)
-fatal: unable to checkout working tree
-warning: Clone succeeded, but checkout failed.
-You can inspect what was checked out with 'git status'
-and retry with 'git restore --source=HEAD :/'
+Updated 2 paths from the index
+ok 9 - user-defined filters convert on output
 
-ok 13 - clone --local detects missing objects
+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
 
-checking known breakage of 1060.14 'clone --local detects misnamed objects': 
-	test_must_fail git clone --local misnamed misnamed-checkout
+Updated 2 paths from the index
+ok 10 - ident converts on output
 
-Cloning into 'misnamed-checkout'...
-done.
-test_must_fail: command succeeded: git clone --local misnamed misnamed-checkout
-not ok 14 - clone --local detects misnamed objects # TODO known breakage
+checking prerequisite: EXPENSIVE
 
-expecting success of 1060.15 'fetch into corrupted repo with index-pack': 
-	cp -R bit-error bit-error-cp &&
-	test_when_finished "rm -rf bit-error-cp" &&
-	(
-		cd bit-error-cp &&
-		test_must_fail git -c transfer.unpackLimit=1 \
-			fetch ../no-bit-error 2>stderr &&
-		test_grep ! -i collision stderr
-	)
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
 
-ok 15 - fetch into corrupted repo with index-pack
+)
+prerequisite EXPENSIVE not satisfied
+checking prerequisite: SIZE_T_IS_64BIT
 
-expecting success of 1060.16 'internal tree objects are not "missing"': 
-	git init missing-empty &&
-	(
-		cd missing-empty &&
-		empty_tree=$(git hash-object -t tree /dev/null) &&
-		commit=$(echo foo | git commit-tree $empty_tree) &&
-		git rev-list --objects $commit
-	)
+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)"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/missing-empty/.git/
-2093db06f424f426e05da2ca90f40d2663e89387
-4b825dc642cb6eb9a060e54bf8d69288fbee4904 
-ok 16 - internal tree objects are not "missing"
+)
+prerequisite SIZE_T_IS_64BIT not satisfied
+checking prerequisite: LONG_IS_64BIT
 
-expecting success of 1060.17 'partial clone of corrupted repository': 
-	test_config -C misnamed uploadpack.allowFilter true &&
-	git clone --no-local --no-checkout --filter=blob:none \
-		misnamed corrupt-partial && \
-	test_must_fail git -C corrupt-partial checkout --force
+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)"
 
-Cloning into 'corrupt-partial'...
-fatal: bad revision 'd95f3ad14dee633a758d2e331151e950dd13e4ed'
-error: /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/misnamed did not send all necessary objects
+)
+prerequisite LONG_IS_64BIT not satisfied
+ok 11 # skip files over 4GB convert on output (missing SIZE_T_IS_64BIT,EXPENSIVE of EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT)
 
-fatal: could not fetch d95f3ad14dee633a758d2e331151e950dd13e4ed from promisor remote
-ok 17 - partial clone of corrupted repository
+ok 12 # skip files over 4GB convert on input (missing SIZE_T_IS_64BIT,EXPENSIVE of EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT)
 
-# still have 1 known breakage(s)
-# passed all remaining 16 test(s)
-1..17
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1050-large.sh ***
@@ -53071,7247 +50870,8302 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1100-commit-tree-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1100-commit-tree-options/.git/
-expecting success of 1100.1 'test preparation: write empty tree': git write-tree >treeid
-ok 1 - test preparation: write empty tree
+*** t1060-object-corruption.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/.git/
+expecting success of 1060.1 'setup corrupt repo': 
+	git init bit-error &&
+	(
+		cd bit-error &&
+		test_commit content &&
+		corrupt_byte HEAD:content.t 10
+	) &&
+	git init no-bit-error &&
+	(
+		# distinct commit from bit-error, but containing a
+		# non-corrupted version of the same blob
+		cd no-bit-error &&
+		test_tick &&
+		test_commit content
+	)
 
-expecting success of 1100.2 'construct commit': echo comment text |
-     GIT_AUTHOR_NAME="Author Name" \
-     GIT_AUTHOR_EMAIL="author@email" \
-     GIT_AUTHOR_DATE="2005-05-26 23:00" \
-     GIT_COMMITTER_NAME="Committer Name" \
-     GIT_COMMITTER_EMAIL="committer@email" \
-     GIT_COMMITTER_DATE="2005-05-26 23:30" \
-     TZ=GMT git commit-tree $(cat treeid) >commitid 2>/dev/null
-ok 2 - construct commit
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/bit-error/.git/
+[master (root-commit) 0df6d69] content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 content.t
+1+0 records in
+1+0 records out
+1 byte copied, 0.00392751 s, 0.3 kB/s
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/no-bit-error/.git/
+[master (root-commit) f374eba] content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 content.t
+ok 1 - setup corrupt repo
 
-expecting success of 1100.3 'read commit': git cat-file commit $(cat commitid) >commit
-ok 3 - read commit
+expecting success of 1060.2 'setup repo with missing object': 
+	git init missing &&
+	(
+		cd missing &&
+		test_commit content &&
+		rm -f "$(obj_to_file HEAD:content.t)"
+	)
 
-expecting success of 1100.4 'compare commit': test_cmp expected commit
-ok 4 - compare commit
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/missing/.git/
+[master (root-commit) 0df6d69] content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 content.t
+ok 2 - setup repo with missing object
 
-expecting success of 1100.5 'flags and then non flags': 
-	test_tick &&
-	echo comment text |
-	git commit-tree $(cat treeid) >commitid &&
-	echo comment text |
-	git commit-tree $(cat treeid) -p $(cat commitid) >childid-1 &&
-	echo comment text |
-	git commit-tree -p $(cat commitid) $(cat treeid) >childid-2 &&
-	test_cmp childid-1 childid-2 &&
-	git commit-tree $(cat treeid) -m foo >childid-3 &&
-	git commit-tree -m foo $(cat treeid) >childid-4 &&
-	test_cmp childid-3 childid-4
+expecting success of 1060.3 'setup repo with misnamed object': 
+	git init misnamed &&
+	(
+		cd misnamed &&
+		test_commit content &&
+		good=$(obj_to_file HEAD:content.t) &&
+		blob=$(echo corrupt | git hash-object -w --stdin) &&
+		bad=$(obj_to_file $blob) &&
+		rm -f "$good" &&
+		mv "$bad" "$good"
+	)
 
-ok 5 - flags and then non flags
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/misnamed/.git/
+[master (root-commit) 0df6d69] content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 content.t
+ok 3 - setup repo with misnamed object
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1006-cat-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1006-cat-file/.git/
-expecting success of 1006.1 'usage: cmdmode -e -p': 
-		test_cmdmode_usage git cat-file $switches
-	
-error: options '-p' and '-e' cannot be used together
-ok 1 - usage: cmdmode -e -p
+expecting success of 1060.4 'streaming a corrupt blob fails': 
+	(
+		cd bit-error &&
+		test_must_fail git cat-file blob HEAD:content.t
+	)
 
-expecting success of 1006.2 'usage: cmdmode -p -t': 
-		test_cmdmode_usage git cat-file $switches
-	
-error: options '-t' and '-p' cannot be used together
-ok 2 - usage: cmdmode -p -t
+error: inflate: data stream error (invalid distance too far back)
+error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
+error: inflate: data stream error (invalid distance too far back)
+error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
+error: inflate: data stream error (invalid distance too far back)
+error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
+fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in .git/objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt
+ok 4 - streaming a corrupt blob fails
 
-expecting success of 1006.3 'usage: cmdmode -t -s': 
-		test_cmdmode_usage git cat-file $switches
-	
-error: options '-s' and '-t' cannot be used together
-ok 3 - usage: cmdmode -t -s
+expecting success of 1060.5 'getting type of a corrupt blob fails': 
+	(
+		cd bit-error &&
+		test_must_fail git cat-file -s HEAD:content.t
+	)
 
-expecting success of 1006.4 'usage: cmdmode -s --textconv': 
-		test_cmdmode_usage git cat-file $switches
-	
-error: options '--textconv' and '-s' cannot be used together
-ok 4 - usage: cmdmode -s --textconv
+error: inflate: data stream error (invalid distance too far back)
+error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
+fatal: git cat-file: could not get object info
+ok 5 - getting type of a corrupt blob fails
 
-expecting success of 1006.5 'usage: cmdmode --textconv --filters': 
-		test_cmdmode_usage git cat-file $switches
-	
-error: options '--filters' and '--textconv' cannot be used together
-ok 5 - usage: cmdmode --textconv --filters
+expecting success of 1060.6 'read-tree -u detects bit-errors in blobs': 
+	(
+		cd bit-error &&
+		rm -f content.t &&
+		test_must_fail git read-tree --reset -u HEAD
+	)
 
-expecting success of 1006.6 'usage: cmdmode --batch-all-objects -e': 
-		test_cmdmode_usage git cat-file $switches
-	
-error: options '-e' and '--batch-all-objects' cannot be used together
-ok 6 - usage: cmdmode --batch-all-objects -e
+error: inflate: data stream error (invalid distance too far back)
+error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
+error: inflate: data stream error (invalid distance too far back)
+error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
+fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in .git/objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt
+ok 6 - read-tree -u detects bit-errors in blobs
 
-expecting success of 1006.7 'usage: incompatible options: --path with --batch': 
-		test_incompatible_usage git cat-file --path=foo $opt
-	
-fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
-ok 7 - usage: incompatible options: --path with --batch
+expecting success of 1060.7 'read-tree -u detects missing objects': 
+	(
+		cd missing &&
+		rm -f content.t &&
+		test_must_fail git read-tree --reset -u HEAD
+	)
 
-expecting success of 1006.8 'usage: incompatible options: --path with --batch-check': 
-		test_incompatible_usage git cat-file --path=foo $opt
-	
-fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
-ok 8 - usage: incompatible options: --path with --batch-check
+error: unable to read sha1 file of content.t (d95f3ad14dee633a758d2e331151e950dd13e4ed)
+ok 7 - read-tree -u detects missing objects
 
-expecting success of 1006.9 'usage: --textconv requires another option': 
-		test_missing_usage git cat-file $opt
-	
-fatal: <rev> required with '--textconv'
-ok 9 - usage: --textconv requires another option
+expecting success of 1060.8 'clone --no-local --bare detects corruption': 
+	test_must_fail git clone --no-local --bare bit-error corrupt-transport
 
-expecting success of 1006.10 'usage: --filters requires another option': 
-		test_missing_usage git cat-file $opt
-	
-fatal: <rev> required with '--filters'
-ok 10 - usage: --filters requires another option
+Cloning into bare repository 'corrupt-transport'...
+error: git upload-pack: git-pack-objects died with error.
+fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
+remote: error: inflate: data stream error (invalid distance too far back)        
+remote: error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header        
+remote: error: inflate: data stream error (invalid distance too far back)        
+remote: error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header        
+remote: fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in ./objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt        
+remote: aborting due to possible repository corruption on the remote side.
+fatal: early EOF
+fatal: fetch-pack: invalid index-pack output
+ok 8 - clone --no-local --bare detects corruption
 
-expecting success of 1006.11 'usage: -e requires another option': 
-		test_missing_usage git cat-file $opt
-	
-fatal: <object> required with '-e'
-ok 11 - usage: -e requires another option
+expecting success of 1060.9 'clone --no-local --bare detects missing object': 
+	test_must_fail git clone --no-local --bare missing missing-transport
 
-expecting success of 1006.12 'usage: incompatible options: -e and --batch': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '-e' is incompatible with batch mode
-ok 12 - usage: incompatible options: -e and --batch
+Cloning into bare repository 'missing-transport'...
+error: git upload-pack: git-pack-objects died with error.
+fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
+remote: 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
+ok 9 - clone --no-local --bare detects missing object
 
-expecting success of 1006.13 'usage: incompatible options: -e and --batch-check': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '-e' is incompatible with batch mode
-ok 13 - usage: incompatible options: -e and --batch-check
+expecting success of 1060.10 'clone --no-local --bare detects misnamed object': 
+	test_must_fail git clone --no-local --bare misnamed misnamed-transport
 
-expecting success of 1006.14 'usage: incompatible options: -e and --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 14 - usage: incompatible options: -e and --follow-symlinks
+Cloning into bare repository 'misnamed-transport'...
+fatal: did not receive expected object d95f3ad14dee633a758d2e331151e950dd13e4ed
+fatal: fetch-pack: invalid index-pack output
+ok 10 - clone --no-local --bare detects misnamed object
 
-expecting success of 1006.15 'usage: incompatible options: -e and --path=foo HEAD:some-path.txt': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
-ok 15 - usage: incompatible options: -e and --path=foo HEAD:some-path.txt
+expecting success of 1060.11 'clone --local detects corruption': 
+	test_must_fail git clone --local bit-error corrupt-checkout
 
-expecting success of 1006.16 'usage: -p requires another option': 
-		test_missing_usage git cat-file $opt
-	
-fatal: <object> required with '-p'
-ok 16 - usage: -p requires another option
+Cloning into 'corrupt-checkout'...
+done.
+error: inflate: data stream error (invalid distance too far back)
+error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
+error: inflate: data stream error (invalid distance too far back)
+error: unable to unpack d95f3ad14dee633a758d2e331151e950dd13e4ed header
+fatal: loose object d95f3ad14dee633a758d2e331151e950dd13e4ed (stored in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/corrupt-checkout/.git/objects/d9/5f3ad14dee633a758d2e331151e950dd13e4ed) is corrupt
+warning: Clone succeeded, but checkout failed.
+You can inspect what was checked out with 'git status'
+and retry with 'git restore --source=HEAD :/'
 
-expecting success of 1006.17 'usage: incompatible options: -p and --batch': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '-p' is incompatible with batch mode
-ok 17 - usage: incompatible options: -p and --batch
+ok 11 - clone --local detects corruption
 
-expecting success of 1006.18 'usage: incompatible options: -p and --batch-check': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '-p' is incompatible with batch mode
-ok 18 - usage: incompatible options: -p and --batch-check
+expecting success of 1060.12 'error detected during checkout leaves repo intact': 
+	test_path_is_dir corrupt-checkout/.git
 
-expecting success of 1006.19 'usage: incompatible options: -p and --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 19 - usage: incompatible options: -p and --follow-symlinks
+ok 12 - error detected during checkout leaves repo intact
 
-expecting success of 1006.20 'usage: incompatible options: -p and --path=foo HEAD:some-path.txt': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
-ok 20 - usage: incompatible options: -p and --path=foo HEAD:some-path.txt
+expecting success of 1060.13 'clone --local detects missing objects': 
+	test_must_fail git clone --local missing missing-checkout
 
-expecting success of 1006.21 'usage: -t requires another option': 
-		test_missing_usage git cat-file $opt
-	
-fatal: <object> required with '-t'
-ok 21 - usage: -t requires another option
+Cloning into 'missing-checkout'...
+done.
+error: unable to read sha1 file of content.t (d95f3ad14dee633a758d2e331151e950dd13e4ed)
+fatal: unable to checkout working tree
+warning: Clone succeeded, but checkout failed.
+You can inspect what was checked out with 'git status'
+and retry with 'git restore --source=HEAD :/'
 
-expecting success of 1006.22 'usage: incompatible options: -t and --batch': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '-t' is incompatible with batch mode
-ok 22 - usage: incompatible options: -t and --batch
+ok 13 - clone --local detects missing objects
 
-expecting success of 1006.23 'usage: incompatible options: -t and --batch-check': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '-t' is incompatible with batch mode
-ok 23 - usage: incompatible options: -t and --batch-check
+checking known breakage of 1060.14 'clone --local detects misnamed objects': 
+	test_must_fail git clone --local misnamed misnamed-checkout
 
-expecting success of 1006.24 'usage: incompatible options: -t and --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 24 - usage: incompatible options: -t and --follow-symlinks
+Cloning into 'misnamed-checkout'...
+done.
+test_must_fail: command succeeded: git clone --local misnamed misnamed-checkout
+not ok 14 - clone --local detects misnamed objects # TODO known breakage
 
-expecting success of 1006.25 'usage: incompatible options: -t and --path=foo HEAD:some-path.txt': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
-ok 25 - usage: incompatible options: -t and --path=foo HEAD:some-path.txt
+expecting success of 1060.15 'fetch into corrupted repo with index-pack': 
+	cp -R bit-error bit-error-cp &&
+	test_when_finished "rm -rf bit-error-cp" &&
+	(
+		cd bit-error-cp &&
+		test_must_fail git -c transfer.unpackLimit=1 \
+			fetch ../no-bit-error 2>stderr &&
+		test_grep ! -i collision stderr
+	)
 
-expecting success of 1006.26 'usage: -s requires another option': 
-		test_missing_usage git cat-file $opt
-	
-fatal: <object> required with '-s'
-ok 26 - usage: -s requires another option
+ok 15 - fetch into corrupted repo with index-pack
 
-expecting success of 1006.27 'usage: incompatible options: -s and --batch': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '-s' is incompatible with batch mode
-ok 27 - usage: incompatible options: -s and --batch
+expecting success of 1060.16 'internal tree objects are not "missing"': 
+	git init missing-empty &&
+	(
+		cd missing-empty &&
+		empty_tree=$(git hash-object -t tree /dev/null) &&
+		commit=$(echo foo | git commit-tree $empty_tree) &&
+		git rev-list --objects $commit
+	)
 
-expecting success of 1006.28 'usage: incompatible options: -s and --batch-check': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '-s' is incompatible with batch mode
-ok 28 - usage: incompatible options: -s and --batch-check
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/missing-empty/.git/
+2093db06f424f426e05da2ca90f40d2663e89387
+4b825dc642cb6eb9a060e54bf8d69288fbee4904 
+ok 16 - internal tree objects are not "missing"
 
-expecting success of 1006.29 'usage: incompatible options: -s and --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 29 - usage: incompatible options: -s and --follow-symlinks
+expecting success of 1060.17 'partial clone of corrupted repository': 
+	test_config -C misnamed uploadpack.allowFilter true &&
+	git clone --no-local --no-checkout --filter=blob:none \
+		misnamed corrupt-partial && \
+	test_must_fail git -C corrupt-partial checkout --force
 
-expecting success of 1006.30 'usage: incompatible options: -s and --path=foo HEAD:some-path.txt': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
-ok 30 - usage: incompatible options: -s and --path=foo HEAD:some-path.txt
+Cloning into 'corrupt-partial'...
+fatal: bad revision 'd95f3ad14dee633a758d2e331151e950dd13e4ed'
+error: /build/reproducible-path/git-2.45.2/t/trash directory.t1060-object-corruption/misnamed did not send all necessary objects
 
-expecting success of 1006.31 'usage: too many arguments: -e one two three': 
-		test_too_many_arguments git cat-file $opt $args
-	
-fatal: too many arguments
-ok 31 - usage: too many arguments: -e one two three
+fatal: could not fetch d95f3ad14dee633a758d2e331151e950dd13e4ed from promisor remote
+ok 17 - partial clone of corrupted repository
 
-expecting success of 1006.32 'usage: incompatible arguments: -e with batch option --buffer': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--buffer' requires a batch mode
-ok 32 - usage: incompatible arguments: -e with batch option --buffer
+# still have 1 known breakage(s)
+# passed all remaining 16 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1090-sparse-checkout-scope.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
 
-expecting success of 1006.33 'usage: incompatible arguments: -e with batch option --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 33 - usage: incompatible arguments: -e with batch option --follow-symlinks
+[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 1006.34 'usage: too many arguments: -p one two three': 
-		test_too_many_arguments git cat-file $opt $args
-	
-fatal: too many arguments
-ok 34 - usage: too many arguments: -p one two three
+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"
 
-expecting success of 1006.35 'usage: incompatible arguments: -p with batch option --buffer': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--buffer' requires a batch mode
-ok 35 - usage: incompatible arguments: -p with batch option --buffer
+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 1006.36 'usage: incompatible arguments: -p with batch option --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 36 - usage: incompatible arguments: -p with batch option --follow-symlinks
+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
 
-expecting success of 1006.37 'usage: too many arguments: -t one two three': 
-		test_too_many_arguments git cat-file $opt $args
-	
-fatal: too many arguments
-ok 37 - usage: too many arguments: -t one two three
+Switched to branch 'main'
+ok 3 - perform sparse checkout of main
 
-expecting success of 1006.38 'usage: incompatible arguments: -t with batch option --buffer': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--buffer' requires a batch mode
-ok 38 - usage: incompatible arguments: -t with batch option --buffer
+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"
 
-expecting success of 1006.39 'usage: incompatible arguments: -t with batch option --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 39 - usage: incompatible arguments: -t with batch option --follow-symlinks
+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 1006.40 'usage: too many arguments: -s one two three': 
-		test_too_many_arguments git cat-file $opt $args
-	
-fatal: too many arguments
-ok 40 - usage: too many arguments: -s one two three
+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"
 
-expecting success of 1006.41 'usage: incompatible arguments: -s with batch option --buffer': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--buffer' requires a batch mode
-ok 41 - usage: incompatible arguments: -s with batch option --buffer
+Switched to branch 'feature'
+Switched to branch 'main'
+ok 5 - return to full checkout of main
 
-expecting success of 1006.42 'usage: incompatible arguments: -s with batch option --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 42 - usage: incompatible arguments: -s with batch option --follow-symlinks
+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 &&
 
-expecting success of 1006.43 'usage: too many arguments: --textconv one two three': 
-		test_too_many_arguments git cat-file $opt $args
-	
-fatal: too many arguments
-ok 43 - usage: too many arguments: --textconv one two three
+	git ls-files -t >output &&
+	! grep ^S output >actual &&
+	test_must_be_empty actual &&
 
-expecting success of 1006.44 'usage: incompatible arguments: --textconv with batch option --buffer': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--buffer' requires a batch mode
-ok 44 - usage: incompatible arguments: --textconv with batch option --buffer
+	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
 
-expecting success of 1006.45 'usage: incompatible arguments: --textconv with batch option --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 45 - usage: incompatible arguments: --textconv with batch option --follow-symlinks
+ok 6 - skip-worktree on files outside sparse patterns
 
-expecting success of 1006.46 'usage: too many arguments: --filters one two three': 
-		test_too_many_arguments git cat-file $opt $args
-	
-fatal: too many arguments
-ok 46 - usage: too many arguments: --filters one two three
+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 &&
 
-expecting success of 1006.47 'usage: incompatible arguments: --filters with batch option --buffer': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--buffer' requires a batch mode
-ok 47 - usage: incompatible arguments: --filters with batch option --buffer
+	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 1006.48 'usage: incompatible arguments: --filters with batch option --follow-symlinks': 
-			test_incompatible_usage git cat-file $opt $opt2
-		
-fatal: '--follow-symlinks' requires a batch mode
-ok 48 - usage: incompatible arguments: --filters with batch option --follow-symlinks
+	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 &&
 
-expecting success of 1006.49 'usage: bad option combination: --buffer without batch mode': 
-		test_incompatible_usage git cat-file $opt &&
-		test_incompatible_usage git cat-file $opt commit HEAD
-	
-fatal: '--buffer' requires a batch mode
-fatal: '--buffer' requires a batch mode
-ok 49 - usage: bad option combination: --buffer without batch mode
+	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
 
-expecting success of 1006.50 'usage: bad option combination: --follow-symlinks without batch mode': 
-		test_incompatible_usage git cat-file $opt &&
-		test_incompatible_usage git cat-file $opt commit HEAD
-	
-fatal: '--follow-symlinks' requires a batch mode
-fatal: '--follow-symlinks' requires a batch mode
-ok 50 - usage: bad option combination: --follow-symlinks without batch mode
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1090-sparse-checkout-scope/server
+ * [new branch]      main       -> origin/main
+Note: switching to 'FETCH_HEAD'.
 
-expecting success of 1006.51 'usage: bad option combination: --batch-all-objects without batch mode': 
-		test_incompatible_usage git cat-file $opt &&
-		test_incompatible_usage git cat-file $opt commit HEAD
-	
-fatal: '--batch-all-objects' requires a batch mode
-fatal: '--batch-all-objects' requires a batch mode
-ok 51 - usage: bad option combination: --batch-all-objects without batch mode
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 1006.52 'usage: bad option combination: -z without batch mode': 
-		test_incompatible_usage git cat-file $opt &&
-		test_incompatible_usage git cat-file $opt commit HEAD
-	
-fatal: '-z' requires a batch mode
-fatal: '-z' requires a batch mode
-ok 52 - usage: bad option combination: -z without batch mode
+If you want to 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 1006.53 'usage: bad option combination: -Z without batch mode': 
-		test_incompatible_usage git cat-file $opt &&
-		test_incompatible_usage git cat-file $opt commit HEAD
-	
-fatal: '-Z' requires a batch mode
-fatal: '-Z' requires a batch mode
-ok 53 - usage: bad option combination: -Z without batch mode
+  git switch -c <new-branch-name>
 
-expecting success of 1006.54 'setup': 
-	git config core.repositoryformatversion 1 &&
-	git config extensions.objectformat $test_hash_algo &&
-	git config extensions.compatobjectformat $test_compat_hash_algo &&
-	echo_without_newline "$hello_content" > hello &&
-	git update-index --add hello
+Or undo this operation with:
 
-ok 54 - setup
+  git switch -
 
-expecting success of 1006.55 'blob exists': 
-	git cat-file -e $oid
-    
-ok 55 - blob exists
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1006.56 'Type of blob is correct': 
-	echo $type >expect &&
-	git cat-file -t $oid >actual &&
-	test_cmp expect actual
-    
-ok 56 - Type of blob is correct
+HEAD is now at ab14680 message
+ok 7 - in partial clone, sparse checkout only fetches needed blobs
 
-expecting success of 1006.57 'Size of blob is correct': 
-	echo $size >expect &&
-	git cat-file -s $oid >actual &&
-	test_cmp expect actual
-    
-ok 57 - Size of blob is correct
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0450-txt-doc-vs-help.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0450-txt-doc-vs-help/.git/
+expecting success of 0450.1 'setup: list of builtins': 
+	git --list-cmds=builtins >builtins
 
-expecting success of 1006.58 'Type of blob is correct using --allow-unknown-type': 
-	echo $type >expect &&
-	git cat-file -t --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 58 - Type of blob is correct using --allow-unknown-type
+ok 1 - setup: list of builtins
 
-expecting success of 1006.59 'Size of blob is correct using --allow-unknown-type': 
-	echo $size >expect &&
-	git cat-file -s --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 59 - Size of blob is correct using --allow-unknown-type
+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
 
-expecting success of 1006.60 'Content of blob is correct': 
-	echo_without_newline "$content" >expect &&
-	git cat-file $type $oid >actual &&
-	test_cmp expect actual
-    
-ok 60 - Content of blob is correct
+ok 2 - list of txt and help mismatches is sorted
 
-expecting success of 1006.61 'Pretty content of blob is correct': 
-	echo_without_newline "$pretty_content" >expect &&
-	git cat-file -p $oid >actual &&
-	test_cmp expect actual
-    
-ok 61 - Pretty content of blob is correct
+expecting success of 0450.3 'add -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 3 - add -h output has no \t
 
-expecting success of 1006.62 '--batch output of blob is correct': 
-	echo "$batch_output" >expect &&
-	echo $oid | git cat-file --batch >actual &&
-	test_cmp expect actual
-    
-ok 62 - --batch output of blob is correct
+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 1006.63 '--batch-check output of blob is correct': 
-	echo "$oid $type $size" >expect &&
-	echo_without_newline $oid | git cat-file --batch-check >actual &&
-	test_cmp expect actual
-    
-ok 63 - --batch-check output of blob is correct
+expecting success of 0450.5 'add -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 5 - add -h output has consistent spacing
 
-expecting success of 1006.64 '--batch-command --buffer output of blob content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.6 'add *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 64 - --batch-command --buffer output of blob content is correct
+ok 6 - add *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.65 '--batch-command --buffer output of blob info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+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")" &&
+
+		# The *.txt and -h use different spacing for 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 65 - --batch-command --buffer output of blob info is correct
+--- txt	2024-11-14 19:26:54.076082859 +0000
++++ help	2024-11-14 19:26:54.128083389 +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 1006.66 '--batch-command --no-buffer output of blob content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.8 'am -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 66 - --batch-command --no-buffer output of blob content is correct
+ok 8 - am -h output has no \t
 
-expecting success of 1006.67 '--batch-command --no-buffer output of blob info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.9 'am -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 67 - --batch-command --no-buffer output of blob info is correct
+ok 9 - am -h output has dashed labels
 
-expecting success of 1006.68 'custom --batch-check format': 
-	echo "$type $oid" >expect &&
-	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 68 - custom --batch-check format
+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 1006.69 'custom --batch-command format': 
-	echo "$type $oid" >expect &&
-	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 69 - custom --batch-command format
+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 1006.70 '--batch-check with %(rest)': 
-	echo "$type this is some extra content" >expect &&
-	echo "$oid    this is some extra content" |
-		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
-	test_cmp expect actual
-    
-ok 70 - --batch-check with %(rest)
+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")" &&
 
-expecting success of 1006.71 '--batch without type (blob)': 
-	{
-		echo "$size" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
-	test_cmp expect actual
-    
-ok 71 - --batch without type (blob)
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:26:54.332085470 +0000
++++ help	2024-11-14 19:26:54.336085511 +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 | --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 1006.72 '--batch without size (blob)': 
-	{
-		echo "$type" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
-	test_cmp expect actual
-    
-ok 72 - --batch without size (blob)
+expecting success of 0450.13 'annotate -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 13 - annotate -h output has no \t
 
-expecting success of 1006.73 '--batch-command --buffer with flush for blob info': 
-	echo "$oid blob $hello_size" >expect &&
-	test_write_lines "info $oid" "flush" |
-	GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
-	git cat-file --batch-command --buffer >actual &&
-	test_cmp expect actual
-    
-ok 73 - --batch-command --buffer with flush for blob info
+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 1006.74 '--batch-command --buffer without flush for blob info': 
-	touch output &&
-	test_write_lines "info $oid" |
-	GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
-	git cat-file --batch-command --buffer >>output &&
-	test_must_be_empty output
-    
-ok 74 - --batch-command --buffer without flush for blob info
+expecting success of 0450.15 'annotate -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 15 - annotate -h output has consistent spacing
 
-expecting success of 1006.75 'blob exists': 
-	git cat-file -e $oid
-    
-ok 75 - blob exists
+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 1006.76 'Type of blob is correct': 
-	echo $type >expect &&
-	git cat-file -t $oid >actual &&
-	test_cmp expect actual
-    
-ok 76 - Type of blob is correct
+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")" &&
 
-expecting success of 1006.77 'Size of blob is correct': 
-	echo $size >expect &&
-	git cat-file -s $oid >actual &&
-	test_cmp expect actual
-    
-ok 77 - Size of blob is correct
+		# The *.txt and -h use different spacing for 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 1006.78 'Type of blob is correct using --allow-unknown-type': 
-	echo $type >expect &&
-	git cat-file -t --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 78 - Type of blob is correct using --allow-unknown-type
+expecting success of 0450.18 'apply -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 18 - apply -h output has no \t
 
-expecting success of 1006.79 'Size of blob is correct using --allow-unknown-type': 
-	echo $size >expect &&
-	git cat-file -s --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 79 - Size of blob is correct using --allow-unknown-type
+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 1006.80 'Content of blob is correct': 
-	echo_without_newline "$content" >expect &&
-	git cat-file $type $oid >actual &&
-	test_cmp expect actual
-    
-ok 80 - Content of blob is correct
+expecting success of 0450.20 'apply -h output has consistent spacing': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		sed -n \
+			-e "/^ / {
+				s/[^ ].*//;
+				p;
+			}" \
+			<"$h2s" >help &&
+		sort -u help >help.ws &&
+		if test -s help.ws
+		then
+			test_line_count = 1 help.ws
+		fi
+	
+ok 20 - apply -h output has consistent spacing
 
-expecting success of 1006.81 'Pretty content of blob is correct': 
-	echo_without_newline "$pretty_content" >expect &&
-	git cat-file -p $oid >actual &&
-	test_cmp expect actual
-    
-ok 81 - Pretty content of blob is correct
+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 1006.82 '--batch output of blob is correct': 
-	echo "$batch_output" >expect &&
-	echo $oid | git cat-file --batch >actual &&
-	test_cmp expect actual
-    
-ok 82 - --batch output of blob is correct
+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 1006.83 '--batch-check output of blob is correct': 
-	echo "$oid $type $size" >expect &&
-	echo_without_newline $oid | git cat-file --batch-check >actual &&
-	test_cmp expect actual
-    
-ok 83 - --batch-check output of blob is correct
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:26:54.992092202 +0000
++++ help	2024-11-14 19:26:55.044092732 +0000
+@@ -1,8 +1 @@
+-git apply [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]
+-          [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]
+-          [--allow-binary-replacement | --binary] [--reject] [-z]
+-          [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]
+-          [--ignore-space-change | --ignore-whitespace]
+-          [--whitespace=(nowarn|warn|fix|error|error-all)]
+-          [--exclude=<path>] [--include=<path>] [--directory=<root>]
+-          [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
++git apply [<options>] [<patch>...]
+not ok 22 - apply -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1006.84 '--batch-command --buffer output of blob content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.23 'archive -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 84 - --batch-command --buffer output of blob content is correct
+ok 23 - archive -h output has no \t
 
-expecting success of 1006.85 '--batch-command --buffer output of blob info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.24 'archive -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 85 - --batch-command --buffer output of blob info is correct
+ok 24 - archive -h output has dashed labels
 
-expecting success of 1006.86 '--batch-command --no-buffer output of blob content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		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
+		then
+			test_line_count = 1 help.ws
+		fi
 	
-ok 86 - --batch-command --no-buffer output of blob content is correct
+ok 25 - archive -h output has consistent spacing
 
-expecting success of 1006.87 '--batch-command --no-buffer output of blob info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.26 'archive *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 87 - --batch-command --no-buffer output of blob info is correct
+ok 26 - archive *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.88 'custom --batch-check format': 
-	echo "$type $oid" >expect &&
-	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 88 - custom --batch-check format
+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 1006.89 'custom --batch-command format': 
-	echo "$type $oid" >expect &&
-	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 89 - custom --batch-command format
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:26:55.296095302 +0000
++++ help	2024-11-14 19:26:55.300095343 +0000
+@@ -1,4 +1,4 @@
+-git archive [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
+-            [-o <file> | --output=<file>] [--worktree-attributes]
+-            [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
+-            [<path>...]
++git archive [<options>] <tree-ish> [<path>...]
++git archive --list
++git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]
++git archive --remote <repo> [--exec <cmd>] --list
+not ok 27 - archive -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1006.90 '--batch-check with %(rest)': 
-	echo "$type this is some extra content" >expect &&
-	echo "$oid    this is some extra content" |
-		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
-	test_cmp expect actual
-    
-ok 90 - --batch-check with %(rest)
+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 1006.91 '--batch without type (blob)': 
-	{
-		echo "$size" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
-	test_cmp expect actual
-    
-ok 91 - --batch without type (blob)
+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 1006.92 '--batch without size (blob)': 
-	{
-		echo "$type" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
-	test_cmp expect actual
-    
-ok 92 - --batch without size (blob)
+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
 
-expecting success of 1006.93 '--batch-command --buffer with flush for blob info': 
-	echo "$oid blob $hello_size" >expect &&
-	test_write_lines "info $oid" "flush" |
-	GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
-	git cat-file --batch-command --buffer >actual &&
-	test_cmp expect actual
-    
-ok 93 - --batch-command --buffer with flush for blob info
+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
 
-expecting success of 1006.94 '--batch-command --buffer without flush for blob info': 
-	touch output &&
-	test_write_lines "info $oid" |
-	GIT_TEST_CAT_FILE_NO_FLUSH_ON_EXIT=1 \
-	git cat-file --batch-command --buffer >>output &&
-	test_must_be_empty output
-    
-ok 94 - --batch-command --buffer without flush for blob info
+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 1006.95 '--batch-check without %(rest) considers whole line': 
-	echo "$hello_oid blob $hello_size" >expect &&
-	git update-index --add --cacheinfo 100644 $hello_oid "white space" &&
-	test_when_finished "git update-index --remove \"white space\"" &&
-	echo ":white space" | git cat-file --batch-check >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	2024-11-14 19:26:55.468097056 +0000
++++ help	2024-11-14 19:26:55.480097179 +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
 
-ok 95 - --batch-check without %(rest) considers whole line
+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
 
-expecting success of 1006.96 'tree exists': 
-	git cat-file -e $oid
-    
-ok 96 - tree exists
+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 1006.97 'Type of tree is correct': 
-	echo $type >expect &&
-	git cat-file -t $oid >actual &&
-	test_cmp expect actual
-    
-ok 97 - Type of tree is correct
+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
 
-expecting success of 1006.98 'Size of tree is correct': 
-	echo $size >expect &&
-	git cat-file -s $oid >actual &&
-	test_cmp expect actual
-    
-ok 98 - Size of tree is correct
+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 1006.99 'Type of tree is correct using --allow-unknown-type': 
-	echo $type >expect &&
-	git cat-file -t --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 99 - Type of tree is correct using --allow-unknown-type
+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")" &&
 
-expecting success of 1006.100 'Size of tree is correct using --allow-unknown-type': 
-	echo $size >expect &&
-	git cat-file -s --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 100 - Size of tree is correct using --allow-unknown-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
+	
+--- txt	2024-11-14 19:26:55.736099790 +0000
++++ help	2024-11-14 19:26:55.780100239 +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 1006.101 'Pretty content of tree is correct': 
-	echo_without_newline "$pretty_content" >expect &&
-	git cat-file -p $oid >actual &&
-	test_cmp expect actual
-    
-ok 101 - Pretty content of tree is correct
+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 1006.102 '--batch-check output of tree is correct': 
-	echo "$oid $type $size" >expect &&
-	echo_without_newline $oid | git cat-file --batch-check >actual &&
-	test_cmp expect actual
-    
-ok 102 - --batch-check output of tree is correct
+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
 
-expecting success of 1006.103 '--batch-command --buffer output of tree info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+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 103 - --batch-command --buffer output of tree info is correct
+ok 40 - branch -h output has consistent spacing
 
-expecting success of 1006.104 '--batch-command --no-buffer output of tree info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.41 'branch *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 104 - --batch-command --no-buffer output of tree info is correct
+ok 41 - branch *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.105 'custom --batch-check format': 
-	echo "$type $oid" >expect &&
-	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 105 - custom --batch-check format
+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")" &&
 
-expecting success of 1006.106 'custom --batch-command format': 
-	echo "$type $oid" >expect &&
-	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 106 - custom --batch-command format
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:26:56.032102809 +0000
++++ help	2024-11-14 19:26:56.040102891 +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 1006.107 '--batch-check with %(rest)': 
-	echo "$type this is some extra content" >expect &&
-	echo "$oid    this is some extra content" |
-		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
-	test_cmp expect actual
-    
-ok 107 - --batch-check with %(rest)
+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 1006.108 'tree exists': 
-	git cat-file -e $oid
-    
-ok 108 - tree exists
+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
 
-expecting success of 1006.109 'Type of tree is correct': 
-	echo $type >expect &&
-	git cat-file -t $oid >actual &&
-	test_cmp expect actual
-    
-ok 109 - Type of tree is correct
+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
 
-expecting success of 1006.110 'Size of tree is correct': 
-	echo $size >expect &&
-	git cat-file -s $oid >actual &&
-	test_cmp expect actual
-    
-ok 110 - Size of tree is correct
+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 1006.111 'Type of tree is correct using --allow-unknown-type': 
-	echo $type >expect &&
-	git cat-file -t --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 111 - Type of tree is correct using --allow-unknown-type
+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")" &&
 
-expecting success of 1006.112 'Size of tree is correct using --allow-unknown-type': 
-	echo $size >expect &&
-	git cat-file -s --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 112 - Size of tree is correct using --allow-unknown-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
+	
+ok 47 - bugreport -h output and SYNOPSIS agree
 
-expecting success of 1006.113 'Pretty content of tree is correct': 
-	echo_without_newline "$pretty_content" >expect &&
-	git cat-file -p $oid >actual &&
-	test_cmp expect actual
-    
-ok 113 - Pretty content of tree is correct
+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 1006.114 '--batch-check output of tree is correct': 
-	echo "$oid $type $size" >expect &&
-	echo_without_newline $oid | git cat-file --batch-check >actual &&
-	test_cmp expect actual
-    
-ok 114 - --batch-check output of tree is correct
+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
 
-expecting success of 1006.115 '--batch-command --buffer output of tree info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+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 115 - --batch-command --buffer output of tree info is correct
+ok 50 - bundle -h output has consistent spacing
 
-expecting success of 1006.116 '--batch-command --no-buffer output of tree info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.51 'bundle *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 116 - --batch-command --no-buffer output of tree info is correct
+ok 51 - bundle *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.117 'custom --batch-check format': 
-	echo "$type $oid" >expect &&
-	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 117 - custom --batch-check format
+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")" &&
 
-expecting success of 1006.118 'custom --batch-command format': 
-	echo "$type $oid" >expect &&
-	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 118 - custom --batch-command format
+		# The *.txt and -h use different spacing for 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
 
-expecting success of 1006.119 '--batch-check with %(rest)': 
-	echo "$type this is some extra content" >expect &&
-	echo "$oid    this is some extra content" |
-		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
-	test_cmp expect actual
-    
-ok 119 - --batch-check with %(rest)
+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 1006.120 'commit exists': 
-	git cat-file -e $oid
-    
-ok 120 - commit exists
+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
 
-expecting success of 1006.121 'Type of commit is correct': 
-	echo $type >expect &&
-	git cat-file -t $oid >actual &&
-	test_cmp expect actual
-    
-ok 121 - Type of commit is correct
+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 1006.122 'Size of commit is correct': 
-	echo $size >expect &&
-	git cat-file -s $oid >actual &&
-	test_cmp expect actual
-    
-ok 122 - Size of commit is correct
+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
 
-expecting success of 1006.123 'Type of commit is correct using --allow-unknown-type': 
-	echo $type >expect &&
-	git cat-file -t --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 123 - Type of commit is correct using --allow-unknown-type
+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")" &&
 
-expecting success of 1006.124 'Size of commit is correct using --allow-unknown-type': 
-	echo $size >expect &&
-	git cat-file -s --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 124 - Size of commit is correct using --allow-unknown-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
+	
+ok 57 - cat-file -h output and SYNOPSIS agree
 
-expecting success of 1006.125 'Content of commit is correct': 
-	echo_without_newline "$content" >expect &&
-	git cat-file $type $oid >actual &&
-	test_cmp expect actual
-    
-ok 125 - Content of commit is correct
+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 1006.126 'Pretty content of commit is correct': 
-	echo_without_newline "$pretty_content" >expect &&
-	git cat-file -p $oid >actual &&
-	test_cmp expect actual
-    
-ok 126 - Pretty content of commit is correct
+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
 
-expecting success of 1006.127 '--batch output of commit is correct': 
-	echo "$batch_output" >expect &&
-	echo $oid | git cat-file --batch >actual &&
-	test_cmp expect actual
-    
-ok 127 - --batch output of commit is correct
+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 1006.128 '--batch-check output of commit is correct': 
-	echo "$oid $type $size" >expect &&
-	echo_without_newline $oid | git cat-file --batch-check >actual &&
-	test_cmp expect actual
-    
-ok 128 - --batch-check output of commit is correct
+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
 
-expecting success of 1006.129 '--batch-command --buffer output of commit content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+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")" &&
+
+		# The *.txt and -h use different spacing for 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 129 - --batch-command --buffer output of commit content is correct
+ok 62 - check-attr -h output and SYNOPSIS agree
 
-expecting success of 1006.130 '--batch-command --buffer output of commit info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.63 'check-ignore -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 130 - --batch-command --buffer output of commit info is correct
+ok 63 - check-ignore -h output has no \t
 
-expecting success of 1006.131 '--batch-command --no-buffer output of commit content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.64 'check-ignore -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 131 - --batch-command --no-buffer output of commit content is correct
+ok 64 - check-ignore -h output has dashed labels
 
-expecting success of 1006.132 '--batch-command --no-buffer output of commit info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+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 132 - --batch-command --no-buffer output of commit info is correct
+ok 65 - check-ignore -h output has consistent spacing
 
-expecting success of 1006.133 'custom --batch-check format': 
-	echo "$type $oid" >expect &&
-	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 133 - custom --batch-check format
+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
 
-expecting success of 1006.134 'custom --batch-command format': 
-	echo "$type $oid" >expect &&
-	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 134 - custom --batch-command format
+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 1006.135 '--batch-check with %(rest)': 
-	echo "$type this is some extra content" >expect &&
-	echo "$oid    this is some extra content" |
-		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
-	test_cmp expect actual
-    
-ok 135 - --batch-check with %(rest)
+		# The *.txt and -h use different spacing for 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 1006.136 '--batch without type (commit)': 
-	{
-		echo "$size" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
-	test_cmp expect actual
-    
-ok 136 - --batch without type (commit)
+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 1006.137 '--batch without size (commit)': 
-	{
-		echo "$type" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
-	test_cmp expect actual
-    
-ok 137 - --batch without size (commit)
+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
 
-expecting success of 1006.138 'commit exists': 
-	git cat-file -e $oid
-    
-ok 138 - commit exists
+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 1006.139 'Type of commit is correct': 
-	echo $type >expect &&
-	git cat-file -t $oid >actual &&
-	test_cmp expect actual
-    
-ok 139 - Type of commit is correct
+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
 
-expecting success of 1006.140 'Size of commit is correct': 
-	echo $size >expect &&
-	git cat-file -s $oid >actual &&
-	test_cmp expect actual
-    
-ok 140 - Size of commit is correct
+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 1006.141 'Type of commit is correct using --allow-unknown-type': 
-	echo $type >expect &&
-	git cat-file -t --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 141 - Type of commit is correct using --allow-unknown-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
+	
+ok 72 - check-mailmap -h output and SYNOPSIS agree
 
-expecting success of 1006.142 'Size of commit is correct using --allow-unknown-type': 
-	echo $size >expect &&
-	git cat-file -s --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 142 - Size of commit is correct using --allow-unknown-type
+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
 
-expecting success of 1006.143 'Content of commit is correct': 
-	echo_without_newline "$content" >expect &&
-	git cat-file $type $oid >actual &&
-	test_cmp expect actual
-    
-ok 143 - Content of commit is correct
+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
 
-expecting success of 1006.144 'Pretty content of commit is correct': 
-	echo_without_newline "$pretty_content" >expect &&
-	git cat-file -p $oid >actual &&
-	test_cmp expect actual
-    
-ok 144 - Pretty content of commit is correct
+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 1006.145 '--batch output of commit is correct': 
-	echo "$batch_output" >expect &&
-	echo $oid | git cat-file --batch >actual &&
-	test_cmp expect actual
-    
-ok 145 - --batch output of commit is correct
+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
 
-expecting success of 1006.146 '--batch-check output of commit is correct': 
-	echo "$oid $type $size" >expect &&
-	echo_without_newline $oid | git cat-file --batch-check >actual &&
-	test_cmp expect actual
-    
-ok 146 - --batch-check output of commit is correct
+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 1006.147 '--batch-command --buffer output of commit content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >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 147 - --batch-command --buffer output of commit content is correct
+--- txt	2024-11-14 19:26:58.852131572 +0000
++++ help	2024-11-14 19:26:58.912132184 +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 1006.148 '--batch-command --buffer output of commit info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.78 'checkout -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 148 - --batch-command --buffer output of commit info is correct
+ok 78 - checkout -h output has no \t
 
-expecting success of 1006.149 '--batch-command --no-buffer output of commit content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.79 'checkout -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 149 - --batch-command --no-buffer output of commit content is correct
+ok 79 - checkout -h output has dashed labels
 
-expecting success of 1006.150 '--batch-command --no-buffer output of commit info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+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 150 - --batch-command --no-buffer output of commit info is correct
+ok 80 - checkout -h output has consistent spacing
 
-expecting success of 1006.151 'custom --batch-check format': 
-	echo "$type $oid" >expect &&
-	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 151 - custom --batch-check format
+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
 
-expecting success of 1006.152 'custom --batch-command format': 
-	echo "$type $oid" >expect &&
-	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 152 - custom --batch-command format
+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 1006.153 '--batch-check with %(rest)': 
-	echo "$type this is some extra content" >expect &&
-	echo "$oid    this is some extra content" |
-		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
-	test_cmp expect actual
-    
-ok 153 - --batch-check with %(rest)
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:26:59.240135529 +0000
++++ help	2024-11-14 19:26:59.244135570 +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
 
-expecting success of 1006.154 '--batch without type (commit)': 
-	{
-		echo "$size" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
-	test_cmp expect actual
-    
-ok 154 - --batch without type (commit)
+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 1006.155 '--batch without size (commit)': 
-	{
-		echo "$type" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
-	test_cmp expect actual
-    
-ok 155 - --batch without size (commit)
+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
 
-expecting success of 1006.156 'tag exists': 
-	git cat-file -e $oid
-    
-ok 156 - tag exists
+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 1006.157 'Type of tag is correct': 
-	echo $type >expect &&
-	git cat-file -t $oid >actual &&
-	test_cmp expect actual
-    
-ok 157 - Type of tag is correct
+ok 86 # skip checkout--worker *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_CHECKOUT__WORKER)
 
-expecting success of 1006.158 'Size of tag is correct': 
-	echo $size >expect &&
-	git cat-file -s $oid >actual &&
-	test_cmp expect actual
-    
-ok 158 - Size of tag is correct
+ok 87 # skip checkout--worker -h output and SYNOPSIS agree (missing BUILTIN_TXT_CHECKOUT__WORKER)
 
-expecting success of 1006.159 'Type of tag is correct using --allow-unknown-type': 
-	echo $type >expect &&
-	git cat-file -t --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 159 - Type of tag is correct using --allow-unknown-type
+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
 
-expecting success of 1006.160 'Size of tag is correct using --allow-unknown-type': 
-	echo $size >expect &&
-	git cat-file -s --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 160 - Size of tag is correct using --allow-unknown-type
+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
 
-expecting success of 1006.161 'Content of tag is correct': 
-	echo_without_newline "$content" >expect &&
-	git cat-file $type $oid >actual &&
-	test_cmp expect actual
-    
-ok 161 - Content of tag is correct
+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 1006.162 'Pretty content of tag is correct': 
-	echo_without_newline "$pretty_content" >expect &&
-	git cat-file -p $oid >actual &&
-	test_cmp expect actual
-    
-ok 162 - Pretty content of tag is correct
+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
 
-expecting success of 1006.163 '--batch output of tag is correct': 
-	echo "$batch_output" >expect &&
-	echo $oid | git cat-file --batch >actual &&
-	test_cmp expect actual
-    
-ok 163 - --batch output of tag is correct
+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")" &&
 
-expecting success of 1006.164 '--batch-check output of tag is correct': 
-	echo "$oid $type $size" >expect &&
-	echo_without_newline $oid | git cat-file --batch-check >actual &&
-	test_cmp expect actual
-    
-ok 164 - --batch-check output of tag is correct
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:26:59.752140752 +0000
++++ help	2024-11-14 19:26:59.760140833 +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
 
-expecting success of 1006.165 '--batch-command --buffer output of tag content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.93 'cherry -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 165 - --batch-command --buffer output of tag content is correct
+ok 93 - cherry -h output has no \t
 
-expecting success of 1006.166 '--batch-command --buffer output of tag info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.94 'cherry -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 166 - --batch-command --buffer output of tag info is correct
+ok 94 - cherry -h output has dashed labels
 
-expecting success of 1006.167 '--batch-command --no-buffer output of tag content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+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 167 - --batch-command --no-buffer output of tag content is correct
+ok 95 - cherry -h output has consistent spacing
 
-expecting success of 1006.168 '--batch-command --no-buffer output of tag info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.96 'cherry *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 168 - --batch-command --no-buffer output of tag info is correct
+ok 96 - cherry *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.169 'custom --batch-check format': 
-	echo "$type $oid" >expect &&
-	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 169 - custom --batch-check format
+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 1006.170 'custom --batch-command format': 
-	echo "$type $oid" >expect &&
-	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 170 - custom --batch-command format
+		# The *.txt and -h use different spacing for 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
 
-expecting success of 1006.171 '--batch-check with %(rest)': 
-	echo "$type this is some extra content" >expect &&
-	echo "$oid    this is some extra content" |
-		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
-	test_cmp expect actual
-    
-ok 171 - --batch-check with %(rest)
+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 1006.172 '--batch without type (tag)': 
-	{
-		echo "$size" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
-	test_cmp expect actual
-    
-ok 172 - --batch without type (tag)
+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 1006.173 '--batch without size (tag)': 
-	{
-		echo "$type" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
-	test_cmp expect actual
-    
-ok 173 - --batch without size (tag)
+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 1006.174 'tag exists': 
-	git cat-file -e $oid
-    
-ok 174 - tag exists
+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 1006.175 'Type of tag is correct': 
-	echo $type >expect &&
-	git cat-file -t $oid >actual &&
-	test_cmp expect actual
-    
-ok 175 - Type of tag is correct
+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")" &&
 
-expecting success of 1006.176 'Size of tag is correct': 
-	echo $size >expect &&
-	git cat-file -s $oid >actual &&
-	test_cmp expect actual
-    
-ok 176 - Size of tag is correct
+		# The *.txt and -h use different spacing for 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 1006.177 'Type of tag is correct using --allow-unknown-type': 
-	echo $type >expect &&
-	git cat-file -t --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 177 - Type of tag is correct using --allow-unknown-type
+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 1006.178 'Size of tag is correct using --allow-unknown-type': 
-	echo $size >expect &&
-	git cat-file -s --allow-unknown-type $oid >actual &&
-	test_cmp expect actual
-    
-ok 178 - Size of tag is correct using --allow-unknown-type
+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
 
-expecting success of 1006.179 'Content of tag is correct': 
-	echo_without_newline "$content" >expect &&
-	git cat-file $type $oid >actual &&
-	test_cmp expect actual
-    
-ok 179 - Content of tag is correct
+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
 
-expecting success of 1006.180 'Pretty content of tag is correct': 
-	echo_without_newline "$pretty_content" >expect &&
-	git cat-file -p $oid >actual &&
-	test_cmp expect actual
-    
-ok 180 - Pretty content of tag is correct
+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 1006.181 '--batch output of tag is correct': 
-	echo "$batch_output" >expect &&
-	echo $oid | git cat-file --batch >actual &&
-	test_cmp expect actual
-    
-ok 181 - --batch output of tag is correct
+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 1006.182 '--batch-check output of tag is correct': 
-	echo "$oid $type $size" >expect &&
-	echo_without_newline $oid | git cat-file --batch-check >actual &&
-	test_cmp expect actual
-    
-ok 182 - --batch-check output of tag is correct
+		# The *.txt and -h use different spacing for 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 1006.183 '--batch-command --buffer output of tag content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.108 'clone -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-ok 183 - --batch-command --buffer output of tag content is correct
+ok 108 - clone -h output has no \t
 
-expecting success of 1006.184 '--batch-command --buffer output of tag info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.109 'clone -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-ok 184 - --batch-command --buffer output of tag info is correct
+ok 109 - clone -h output has dashed labels
 
-expecting success of 1006.185 '--batch-command --no-buffer output of tag content is correct': 
-		echo "$batch_output" >expect &&
-		test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+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 185 - --batch-command --no-buffer output of tag content is correct
+ok 110 - clone -h output has consistent spacing
 
-expecting success of 1006.186 '--batch-command --no-buffer output of tag info is correct': 
-		echo "$oid $type $size" >expect &&
-		test_write_lines "info $oid" |
-		git cat-file --batch-command $opt >actual &&
-		test_cmp expect actual
+expecting success of 0450.111 'clone *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-ok 186 - --batch-command --no-buffer output of tag info is correct
+ok 111 - clone *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.187 'custom --batch-check format': 
-	echo "$type $oid" >expect &&
-	echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 187 - custom --batch-check format
+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 1006.188 'custom --batch-command format': 
-	echo "$type $oid" >expect &&
-	echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
-	test_cmp expect actual
-    
-ok 188 - custom --batch-command format
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:01.224155765 +0000
++++ help	2024-11-14 19:27:01.264156173 +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
 
-expecting success of 1006.189 '--batch-check with %(rest)': 
-	echo "$type this is some extra content" >expect &&
-	echo "$oid    this is some extra content" |
-		git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
-	test_cmp expect actual
-    
-ok 189 - --batch-check with %(rest)
+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 1006.190 '--batch without type (tag)': 
-	{
-		echo "$size" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objectsize)" >actual &&
-	test_cmp expect actual
-    
-ok 190 - --batch without type (tag)
+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
 
-expecting success of 1006.191 '--batch without size (tag)': 
-	{
-		echo "$type" &&
-		echo "$content"
-	} >expect &&
-	echo $oid | git cat-file --batch="%(objecttype)" >actual &&
-	test_cmp expect actual
-    
-ok 191 - --batch without size (tag)
+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
 
-expecting success of 1006.192 'Reach a blob from a tag pointing to it': 
-	echo_without_newline "$hello_content" >expect &&
-	git cat-file blob $tag_oid >actual &&
-	test_cmp expect actual
+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
 
-ok 192 - Reach a blob from a tag pointing to it
+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 1006.193 'Passing -t with --batch fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-t' is incompatible with batch mode
+--- txt	2024-11-14 19:27:01.404157601 +0000
++++ help	2024-11-14 19:27:01.460158172 +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
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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
 
-ok 193 - Passing -t with --batch fails
+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 1006.194 'Passing --batch with -t fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.124 'commit-graph -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-t' is incompatible with batch mode
+ok 124 - commit-graph -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 127 - commit-graph -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 194 - Passing --batch with -t fails
+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 1006.195 'Passing -s with --batch fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.131 'commit-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-s' is incompatible with batch mode
+ok 131 - commit-tree *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 195 - Passing -s with --batch fails
+checking known breakage 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 1006.196 'Passing --batch with -s fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-s' is incompatible with batch mode
+--- txt	2024-11-14 19:27:02.500168780 +0000
++++ help	2024-11-14 19:27:02.560169391 +0000
+@@ -1,15 +1 @@
+-git config [<file-option>] [--type=<type>] [--comment=<message>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]
+-git config [<file-option>] [--type=<type>] [--comment=<message>] --add <name> <value>
+-git config [<file-option>] [--type=<type>] [--comment=<message>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]
+-git config [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]
+-git config [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]
+-git config [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]
+-git config [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>
+-git config [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]
+-git config [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]
+-git config [<file-option>] --rename-section <old-name> <new-name>
+-git config [<file-option>] --remove-section <name>
+-git config [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
+-git config [<file-option>] --get-color <name> [<default>]
+-git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]
+-git config [<file-option>] -e | --edit
++git config [<options>]
+not ok 137 - config -h output and SYNOPSIS agree # TODO known breakage
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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
 
-ok 196 - Passing --batch with -s fails
+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 1006.197 'Passing -e with --batch fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.144 'credential -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-e' is incompatible with batch mode
+ok 144 - credential -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:03.220176123 +0000
++++ help	2024-11-14 19:27:03.264176572 +0000
+@@ -0,0 +1 @@
++git credential (fill|approve|reject)
+not ok 147 - credential -h output and SYNOPSIS agree # TODO known breakage
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 197 - Passing -e with --batch fails
+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
 
-expecting success of 1006.198 'Passing --batch with -e fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.151 'credential-cache *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-e' is incompatible with batch mode
+ok 151 - credential-cache *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:03.672180733 +0000
++++ help	2024-11-14 19:27:03.712181141 +0000
+@@ -0,0 +1 @@
++git credential-cache [<options>] <action>
+not ok 152 - credential-cache -h output and SYNOPSIS agree # TODO known breakage
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 198 - Passing --batch with -e fails
+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")" &&
 
-expecting success of 1006.199 'Passing -p with --batch fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-p' is incompatible with batch mode
+ok 157 - credential-cache--daemon -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:04.508189260 +0000
++++ help	2024-11-14 19:27:04.608190280 +0000
+@@ -0,0 +1 @@
++git credential-store [<options>] <action>
+not ok 162 - credential-store -h output and SYNOPSIS agree # TODO known breakage
 
-ok 199 - Passing -p with --batch fails
+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
 
-expecting success of 1006.200 'Passing --batch with -p fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.164 'describe -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-p' is incompatible with batch mode
+ok 164 - describe -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 167 - describe -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 200 - Passing --batch with -p fails
+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 1006.201 'Passing <type> with --batch fails': 
-	test_must_fail git cat-file --$batch blob $oid
+expecting success of 0450.171 'diagnose *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 171 - diagnose *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 201 - Passing <type> with --batch fails
+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")" &&
 
-expecting success of 1006.202 'Passing --batch with <type> fails': 
-	test_must_fail git cat-file blob --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: batch modes take no arguments
+ok 177 - diff -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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 202 - Passing --batch with <type> fails
+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 1006.203 'Passing oid with --batch fails': 
-	test_must_fail git cat-file --$batch $oid
+expecting success of 0450.184 'diff-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 184 - diff-index -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 187 - diff-index -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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 203 - Passing oid with --batch fails
+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 1006.204 'Passing -t with --batch-check fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.191 'diff-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-t' is incompatible with batch mode
+ok 191 - diff-tree *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 204 - Passing -t with --batch-check fails
+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")" &&
 
-expecting success of 1006.205 'Passing --batch-check with -t fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-t' is incompatible with batch mode
+ok 197 - difftool -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:07.876223612 +0000
++++ help	2024-11-14 19:27:07.928224142 +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
 
-ok 205 - Passing --batch-check with -t fails
+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 1006.206 'Passing -s with --batch-check fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.204 'fast-import -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-s' is incompatible with batch mode
+ok 204 - fast-import -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
-
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
-
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:08.316228099 +0000
++++ help	2024-11-14 19:27:08.356228507 +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
 
-ok 206 - Passing -s with --batch-check fails
+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
 
-expecting success of 1006.207 'Passing --batch-check with -s fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.209 'fetch -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-s' is incompatible with batch mode
+ok 209 - fetch -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 212 - fetch -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 207 - Passing --batch-check with -s fails
+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 1006.208 'Passing -e with --batch-check fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.216 'fetch-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-e' is incompatible with batch mode
+ok 216 - fetch-pack *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:08.956234626 +0000
++++ help	2024-11-14 19:27:08.964234708 +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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 208 - Passing -e with --batch-check fails
+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")" &&
 
-expecting success of 1006.209 'Passing --batch-check with -e fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-e' is incompatible with batch mode
+--- txt	2024-11-14 19:27:09.024235320 +0000
++++ help	2024-11-14 19:27:09.028235361 +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
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:09.184236952 +0000
++++ help	2024-11-14 19:27:09.248237605 +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
 
-ok 209 - Passing --batch-check with -e fails
+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
 
-expecting success of 1006.210 'Passing -p with --batch-check fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.229 'for-each-repo -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-p' is incompatible with batch mode
+ok 229 - for-each-repo -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 232 - for-each-repo -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 210 - Passing -p with --batch-check fails
+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 1006.211 'Passing --batch-check with -p fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.236 'format-patch *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-p' is incompatible with batch mode
+ok 236 - format-patch *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:10.148246784 +0000
++++ help	2024-11-14 19:27:10.216247477 +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] [--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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 211 - Passing --batch-check with -p fails
+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 1006.212 'Passing <type> with --batch-check fails': 
-	test_must_fail git cat-file --$batch blob $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: batch modes take no arguments
+ok 242 - fsck -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:10.992255392 +0000
++++ help	2024-11-14 19:27:11.040255882 +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
 
-ok 212 - Passing <type> with --batch-check fails
+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 1006.213 'Passing --batch-check with <type> fails': 
-	test_must_fail git cat-file blob --$batch $oid
+expecting success of 0450.249 'fsmonitor--daemon -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 249 - fsmonitor--daemon -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:11.232257840 +0000
++++ help	2024-11-14 19:27:11.240257922 +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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 213 - Passing --batch-check with <type> fails
+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 1006.214 'Passing oid with --batch-check fails': 
-	test_must_fail git cat-file --$batch $oid
+expecting success of 0450.256 'gc *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 256 - gc *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:11.524260818 +0000
++++ help	2024-11-14 19:27:11.576261349 +0000
+@@ -1 +1 @@
+-git gc [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]
++git gc [<options>]
+not ok 257 - gc -h output and SYNOPSIS agree # TODO known breakage
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 214 - Passing oid with --batch-check fails
+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 1006.215 'Passing -t with --batch-command fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-t' is incompatible with batch mode
+ok 262 - get-tar-commit-id -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:12.400269753 +0000
++++ help	2024-11-14 19:27:12.432270079 +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
 
-ok 215 - Passing -t with --batch-command fails
+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 1006.216 'Passing --batch-command with -t fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.269 'hash-object -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-t' is incompatible with batch mode
+ok 269 - hash-object -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 272 - hash-object -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 216 - Passing --batch-command with -t fails
+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
 
-expecting success of 1006.217 'Passing -s with --batch-command fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.276 'help *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-s' is incompatible with batch mode
+ok 276 - help *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 217 - Passing -s with --batch-command fails
+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 1006.218 'Passing --batch-command with -s fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-s' is incompatible with batch mode
+ok 282 - hook -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:13.724283256 +0000
++++ help	2024-11-14 19:27:13.784283868 +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 218 - Passing --batch-command with -s fails
+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 1006.219 'Passing -e with --batch-command fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.289 'init -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-e' is incompatible with batch mode
+ok 289 - init -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 292 - init -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 219 - Passing -e with --batch-command fails
+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
 
-expecting success of 1006.220 'Passing --batch-command with -e fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.296 'init-db *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-e' is incompatible with batch mode
+ok 296 - init-db *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:14.552291701 +0000
++++ help	2024-11-14 19:27:14.556291742 +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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 220 - Passing --batch-command with -e fails
+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")" &&
 
-expecting success of 1006.221 'Passing -p with --batch-command fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-p' is incompatible with batch mode
+ok 302 - interpret-trailers -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:14.868294924 +0000
++++ help	2024-11-14 19:27:14.872294965 +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
 
-ok 221 - Passing -p with --batch-command fails
+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
 
-expecting success of 1006.222 'Passing --batch-command with -p fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.309 'ls-files -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-p' is incompatible with batch mode
+ok 309 - ls-files -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:15.148297780 +0000
++++ help	2024-11-14 19:27:15.152297821 +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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 222 - Passing --batch-command with -p fails
+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
 
-expecting success of 1006.223 'Passing <type> with --batch-command fails': 
-	test_must_fail git cat-file --$batch blob $oid
+expecting success of 0450.316 'ls-remote *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 316 - ls-remote *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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 223 - Passing <type> with --batch-command fails
+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 1006.224 'Passing --batch-command with <type> fails': 
-	test_must_fail git cat-file blob --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: batch modes take no arguments
+--- txt	2024-11-14 19:27:15.584302227 +0000
++++ help	2024-11-14 19:27:15.632302717 +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
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:15.768304104 +0000
++++ help	2024-11-14 19:27:15.772304144 +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 224 - Passing --batch-command with <type> fails
+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
 
-expecting success of 1006.225 'Passing oid with --batch-command fails': 
-	test_must_fail git cat-file --$batch $oid
+expecting success of 0450.329 'mailsplit -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 329 - mailsplit -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:15.972306184 +0000
++++ help	2024-11-14 19:27:16.020306674 +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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 225 - Passing oid with --batch-command fails
+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 1006.226 'Passing -t with --batch fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.336 'maintenance *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-t' is incompatible with batch mode
+ok 336 - maintenance *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:16.408310631 +0000
++++ help	2024-11-14 19:27:16.452311080 +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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.339 'merge -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 339 - merge -h output has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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 340 - merge -h output has consistent spacing
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 226 - Passing -t with --batch fails
+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")" &&
 
-expecting success of 1006.227 'Passing --batch with -t fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-t' is incompatible with batch mode
+--- txt	2024-11-14 19:27:16.704313650 +0000
++++ help	2024-11-14 19:27:16.712313732 +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
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.343 'merge-base -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 343 - merge-base -h output has no \t
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.344 'merge-base -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 344 - merge-base -h output has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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
 
-ok 227 - Passing --batch with -t fails
+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
 
-expecting success of 1006.228 'Passing -s with --batch fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.349 'merge-file -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-s' is incompatible with batch mode
+ok 349 - merge-file -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:16.964316302 +0000
++++ help	2024-11-14 19:27:17.012316791 +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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 228 - Passing -s with --batch fails
+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 1006.229 'Passing --batch with -s fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.356 'merge-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-s' is incompatible with batch mode
+ok 356 - merge-index *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:17.228318994 +0000
++++ help	2024-11-14 19:27:17.252319239 +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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+ok 361 # skip merge-ours *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_OURS)
 
-ok 229 - Passing --batch with -s fails
+ok 362 # skip merge-ours -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_OURS)
 
-expecting success of 1006.230 'Passing -e with --batch fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.363 'merge-recursive -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-fatal: '-e' is incompatible with batch mode
-
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+ok 363 - merge-recursive -h output has no \t
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+ok 366 # skip merge-recursive *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE)
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+ok 367 # skip merge-recursive -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE)
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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 230 - Passing -e with --batch fails
+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 1006.231 'Passing --batch with -e fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+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
 	
-fatal: '-e' is incompatible with batch mode
+ok 370 - merge-recursive-ours -h output has consistent spacing
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+ok 371 # skip merge-recursive-ours *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE_OURS)
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+ok 372 # skip merge-recursive-ours -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE_OURS)
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+ok 376 # skip merge-recursive-theirs *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_RECURSIVE_THEIRS)
 
-ok 231 - Passing --batch with -e fails
+ok 377 # skip merge-recursive-theirs -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_RECURSIVE_THEIRS)
 
-expecting success of 1006.232 'Passing -p with --batch fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.378 'merge-subtree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-fatal: '-p' is incompatible with batch mode
+ok 378 - merge-subtree -h output has no \t
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+ok 381 # skip merge-subtree *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_MERGE_SUBTREE)
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+ok 382 # skip merge-subtree -h output and SYNOPSIS agree (missing BUILTIN_TXT_MERGE_SUBTREE)
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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 232 - Passing -p with --batch fails
+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 1006.233 'Passing --batch with -p fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.386 'merge-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-p' is incompatible with batch mode
+ok 386 - merge-tree *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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 387 - merge-tree -h output and SYNOPSIS agree
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.388 'mktag -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 388 - mktag -h output has no \t
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.389 'mktag -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 389 - mktag -h output has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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 390 - mktag -h output has consistent spacing
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.391 'mktag *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 391 - mktag *.txt SYNOPSIS has dashed labels
 
-ok 233 - Passing --batch with -p fails
+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")" &&
 
-expecting success of 1006.234 'Passing <type> with --batch fails': 
-	test_must_fail git cat-file --$batch blob $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: batch modes take no arguments
+ok 392 - mktag -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.393 'mktree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 393 - mktree -h output has no \t
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.394 'mktree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 394 - mktree -h output has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
+	
+ok 395 - mktree -h output has consistent spacing
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.396 'mktree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 396 - mktree *.txt SYNOPSIS has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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 397 - mktree -h output and SYNOPSIS agree
 
-ok 234 - Passing <type> with --batch fails
+expecting success of 0450.398 'multi-pack-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 398 - multi-pack-index -h output has no \t
 
-expecting success of 1006.235 'Passing --batch with <type> fails': 
-	test_must_fail git cat-file blob --$batch $oid
+expecting success of 0450.399 'multi-pack-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 399 - multi-pack-index -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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 400 - multi-pack-index -h output has consistent spacing
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.401 'multi-pack-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 401 - multi-pack-index *.txt SYNOPSIS has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:19.380340943 +0000
++++ help	2024-11-14 19:27:19.384340984 +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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.403 'mv -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 403 - mv -h output has no \t
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.404 'mv -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 404 - mv -h output has dashed labels
 
-ok 235 - Passing --batch with <type> fails
+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
+	
+ok 405 - mv -h output has consistent spacing
 
-expecting success of 1006.236 'Passing oid with --batch fails': 
-	test_must_fail git cat-file --$batch $oid
+expecting success of 0450.406 'mv *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 406 - mv *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 236 - Passing oid with --batch fails
+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")" &&
 
-expecting success of 1006.237 'Passing -t with --batch-check fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-t' is incompatible with batch mode
+--- txt	2024-11-14 19:27:19.900346247 +0000
++++ help	2024-11-14 19:27:19.904346288 +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
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:20.120348491 +0000
++++ help	2024-11-14 19:27:20.132348613 +0000
+@@ -1,12 +1,12 @@
+-git notes [list [<object>]]
+-git notes add [-f] [--allow-empty] [--[no-]separator | --separator=<paragraph-break>] [--[no-]stripspace] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
+-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>] [<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>]
++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>]
++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
 
-ok 237 - Passing -t with --batch-check fails
+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
 
-expecting success of 1006.238 'Passing --batch-check with -t fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.419 'pack-objects -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-t' is incompatible with batch mode
+ok 419 - pack-objects -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:20.516352530 +0000
++++ help	2024-11-14 19:27:20.524352611 +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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 238 - Passing --batch-check with -t fails
+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
 
-expecting success of 1006.239 'Passing -s with --batch-check fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.426 'pack-redundant *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-s' is incompatible with batch mode
+ok 426 - pack-redundant *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 239 - Passing -s with --batch-check fails
+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 1006.240 'Passing --batch-check with -s fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-s' is incompatible with batch mode
-
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+ok 432 - pack-refs -h output and SYNOPSIS agree
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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 240 - Passing --batch-check with -s fails
+		# The *.txt and -h use different spacing for 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 1006.241 'Passing -e with --batch-check fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.438 'pickaxe -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
 	
-fatal: '-e' is incompatible with batch mode
+ok 438 - pickaxe -h output has no \t
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+ok 441 # skip pickaxe *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_PICKAXE)
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+ok 442 # skip pickaxe -h output and SYNOPSIS agree (missing BUILTIN_TXT_PICKAXE)
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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 241 - Passing -e with --batch-check fails
+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 1006.242 'Passing --batch-check with -e fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.446 'prune *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-e' is incompatible with batch mode
+ok 446 - prune *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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 242 - Passing --batch-check with -e fails
+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 1006.243 'Passing -p with --batch-check fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-p' is incompatible with batch mode
+ok 452 - prune-packed -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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 243 - Passing -p with --batch-check fails
+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 1006.244 'Passing --batch-check with -p fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.459 'push -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-p' is incompatible with batch mode
+ok 459 - push -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:22.280370520 +0000
++++ help	2024-11-14 19:27:22.332371051 +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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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 244 - Passing --batch-check with -p fails
+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 1006.245 'Passing <type> with --batch-check fails': 
-	test_must_fail git cat-file --$batch blob $oid
+expecting success of 0450.466 'range-diff *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 466 - range-diff *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:22.684374641 +0000
++++ help	2024-11-14 19:27:22.740375212 +0000
+@@ -1,5 +1,3 @@
+-git range-diff [--color=[<when>]] [--no-color] [<diff-options>]
+-               [--no-dual-color] [--creation-factor=<factor>]
+-               [--left-only | --right-only]
+-               ( <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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.468 'read-tree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 468 - read-tree -h output has no \t
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 245 - Passing <type> with --batch-check fails
+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 1006.246 'Passing --batch-check with <type> fails': 
-	test_must_fail git cat-file blob --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: batch modes take no arguments
+ok 472 - read-tree -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+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
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:23.316381087 +0000
++++ help	2024-11-14 19:27:23.348381413 +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
 
-ok 246 - Passing --batch-check with <type> fails
+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
 
-expecting success of 1006.247 'Passing oid with --batch-check fails': 
-	test_must_fail git cat-file --$batch $oid
+expecting success of 0450.479 'receive-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 479 - receive-pack -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 482 - receive-pack -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+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
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+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
 
-ok 247 - Passing oid with --batch-check fails
+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 1006.248 'Passing -t with --batch-command fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.486 'reflog *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-t' is incompatible with batch mode
+ok 486 - reflog *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.488 'remote -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 488 - remote -h output has no \t
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.489 'remote -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 489 - remote -h output has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.490 '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 490 - remote -h output has consistent spacing
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.491 'remote *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 491 - remote *.txt SYNOPSIS has dashed labels
 
-ok 248 - Passing -t with --batch-command fails
+checking known breakage of 0450.492 '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")" &&
 
-expecting success of 1006.249 'Passing --batch-command with -t fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-t' is incompatible with batch mode
+--- txt	2024-11-14 19:27:24.352391653 +0000
++++ help	2024-11-14 19:27:24.404392183 +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 492 - remote -h output and SYNOPSIS agree # TODO known breakage
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.493 'remote-ext -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 493 - remote-ext -h output has no \t
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.494 'remote-ext -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 494 - remote-ext -h output has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.495 '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 495 - remote-ext -h output has consistent spacing
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.496 'remote-ext *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 496 - remote-ext *.txt SYNOPSIS has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+checking known breakage of 0450.497 '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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:24.748395692 +0000
++++ help	2024-11-14 19:27:24.756395773 +0000
+@@ -1 +1 @@
+-git remote add <nick> "ext::<command>[ <arguments>...]"
++git remote-ext <remote> <url>
+not ok 497 - remote-ext -h output and SYNOPSIS agree # TODO known breakage
 
-ok 249 - Passing --batch-command with -t fails
+expecting success of 0450.498 'remote-fd -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 498 - remote-fd -h output has no \t
 
-expecting success of 1006.250 'Passing -s with --batch-command fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.499 'remote-fd -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-s' is incompatible with batch mode
+ok 499 - remote-fd -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.500 '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 500 - remote-fd -h output has consistent spacing
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.501 'remote-fd *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 501 - remote-fd *.txt SYNOPSIS has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+checking known breakage of 0450.502 '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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:24.816396385 +0000
++++ help	2024-11-14 19:27:24.824396467 +0000
+@@ -0,0 +1 @@
++git remote-fd <remote> <url>
+not ok 502 - remote-fd -h output and SYNOPSIS agree # TODO known breakage
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.503 'repack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 503 - repack -h output has no \t
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.504 'repack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 504 - repack -h output has dashed labels
 
-ok 250 - Passing -s with --batch-command fails
+expecting success of 0450.505 '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 505 - repack -h output has consistent spacing
 
-expecting success of 1006.251 'Passing --batch-command with -s fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.506 'repack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-s' is incompatible with batch mode
+ok 506 - repack *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+checking known breakage of 0450.507 '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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:25.088399159 +0000
++++ help	2024-11-14 19:27:25.112399405 +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 507 - repack -h output and SYNOPSIS agree # TODO known breakage
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.508 'replace -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 508 - replace -h output has no \t
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.509 'replace -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 509 - replace -h output has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.510 '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 510 - replace -h output has consistent spacing
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.511 'replace *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 511 - replace *.txt SYNOPSIS has dashed labels
 
-ok 251 - Passing --batch-command with -s fails
+expecting success of 0450.512 '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 1006.252 'Passing -e with --batch-command fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-e' is incompatible with batch mode
+ok 512 - replace -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.513 'replay -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 513 - replay -h output has no \t
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.514 'replay -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 514 - replay -h output has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.515 '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 515 - replay -h output has consistent spacing
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.516 'replay *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 516 - replay *.txt SYNOPSIS has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.517 '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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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 - replay -h output and SYNOPSIS agree
 
-ok 252 - Passing -e with --batch-command fails
+expecting success of 0450.518 'rerere -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 518 - rerere -h output has no \t
 
-expecting success of 1006.253 'Passing --batch-command with -e fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+expecting success of 0450.519 'rerere -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '-e' is incompatible with batch mode
+ok 519 - rerere -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.520 '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 520 - rerere -h output has consistent spacing
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.521 'rerere *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 521 - rerere *.txt SYNOPSIS has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.522 '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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 522 - rerere -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.523 'reset -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 523 - reset -h output has no \t
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.524 'reset -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 524 - reset -h output has dashed labels
 
-ok 253 - Passing --batch-command with -e fails
+expecting success of 0450.525 '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 525 - reset -h output has consistent spacing
 
-expecting success of 1006.254 'Passing -p with --batch-command fails': 
-	    test_must_fail git cat-file --$batch -$opt $oid
+expecting success of 0450.526 'reset *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '-p' is incompatible with batch mode
+ok 526 - reset *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+checking known breakage of 0450.527 '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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:25.952407971 +0000
++++ help	2024-11-14 19:27:25.976408217 +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 527 - reset -h output and SYNOPSIS agree # TODO known breakage
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.528 'restore -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 528 - restore -h output has no \t
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.529 'restore -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 529 - restore -h output has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.530 '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 530 - restore -h output has consistent spacing
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.531 'restore *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 531 - restore *.txt SYNOPSIS has dashed labels
 
-ok 254 - Passing -p with --batch-command fails
+checking known breakage of 0450.532 '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 1006.255 'Passing --batch-command with -p fails': 
-	    test_must_fail git cat-file -$opt --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '-p' is incompatible with batch mode
+--- txt	2024-11-14 19:27:26.260411113 +0000
++++ help	2024-11-14 19:27:26.264411154 +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 532 - restore -h output and SYNOPSIS agree # TODO known breakage
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.533 'rev-list -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 533 - rev-list -h output has no \t
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.534 'rev-list -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 534 - rev-list -h output has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.535 '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 535 - rev-list -h output has consistent spacing
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.536 'rev-list *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 536 - rev-list *.txt SYNOPSIS has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.537 '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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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 537 - rev-list -h output and SYNOPSIS agree
 
-ok 255 - Passing --batch-command with -p fails
+expecting success of 0450.538 'rev-parse -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 538 - rev-parse -h output has no \t
 
-expecting success of 1006.256 'Passing <type> with --batch-command fails': 
-	test_must_fail git cat-file --$batch blob $oid
+expecting success of 0450.539 'rev-parse -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 539 - rev-parse -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.540 '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 540 - rev-parse -h output has consistent spacing
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.541 'rev-parse *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 541 - rev-parse *.txt SYNOPSIS has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+checking known breakage of 0450.542 '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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+--- txt	2024-11-14 19:27:26.736415968 +0000
++++ help	2024-11-14 19:27:26.796416580 +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 542 - rev-parse -h output and SYNOPSIS agree # TODO known breakage
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.543 'revert -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 543 - revert -h output has no \t
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.544 'revert -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 544 - revert -h output has dashed labels
 
-ok 256 - Passing <type> with --batch-command fails
+expecting success of 0450.545 '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 545 - revert -h output has consistent spacing
 
-expecting success of 1006.257 'Passing --batch-command with <type> fails': 
-	test_must_fail git cat-file blob --$batch $oid
+expecting success of 0450.546 'revert *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: batch modes take no arguments
+ok 546 - revert *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.547 '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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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 547 - revert -h output and SYNOPSIS agree
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.548 'rm -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 548 - rm -h output has no \t
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.549 'rm -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 549 - rm -h output has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.550 '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 550 - rm -h output has consistent spacing
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.551 'rm *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 551 - rm *.txt SYNOPSIS has dashed labels
 
-ok 257 - Passing --batch-command with <type> fails
+expecting success of 0450.552 '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 1006.258 'Passing oid with --batch-command fails': 
-	test_must_fail git cat-file --$batch $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: batch modes take no arguments
+ok 552 - rm -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.553 'send-pack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 553 - send-pack -h output has no \t
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.554 'send-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 554 - send-pack -h output has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.555 '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 555 - send-pack -h output has consistent spacing
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.556 'send-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 556 - send-pack *.txt SYNOPSIS has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.557 '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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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 - send-pack -h output and SYNOPSIS agree
 
-ok 258 - Passing oid with --batch-command fails
+expecting success of 0450.558 'shortlog -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 558 - shortlog -h output has no \t
 
-expecting success of 1006.259 'Passing -t with --follow-symlinks fails': 
-	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+expecting success of 0450.559 'shortlog -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '--follow-symlinks' requires a batch mode
+ok 559 - shortlog -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.560 '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 560 - shortlog -h output has consistent spacing
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.561 'shortlog *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 561 - shortlog *.txt SYNOPSIS has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.562 '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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 562 - shortlog -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.563 'show -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 563 - show -h output has no \t
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.564 'show -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 564 - show -h output has dashed labels
 
-ok 259 - Passing -t with --follow-symlinks fails
+expecting success of 0450.565 '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 565 - show -h output has consistent spacing
 
-expecting success of 1006.260 'Passing -s with --follow-symlinks fails': 
-	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+expecting success of 0450.566 'show *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '--follow-symlinks' requires a batch mode
+ok 566 - show *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+checking known breakage of 0450.567 '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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:28.084429716 +0000
++++ help	2024-11-14 19:27:28.088429757 +0000
+@@ -1 +1,2 @@
+-git show [<options>] [<object>...]
++git log [<options>] [<revision-range>] [[--] <path>...]
++git show [<options>] <object>...
+not ok 567 - show -h output and SYNOPSIS agree # TODO known breakage
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.568 'show-branch -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 568 - show-branch -h output has no \t
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.569 'show-branch -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 569 - show-branch -h output has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.570 '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 570 - show-branch -h output has consistent spacing
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.571 'show-branch *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 571 - show-branch *.txt SYNOPSIS has dashed labels
 
-ok 260 - Passing -s with --follow-symlinks fails
+expecting success of 0450.572 '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 1006.261 'Passing -e with --follow-symlinks fails': 
-	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '--follow-symlinks' requires a batch mode
+ok 572 - show-branch -h output and SYNOPSIS agree
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.573 'show-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 573 - show-index -h output has no \t
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.574 'show-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 574 - show-index -h output has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.575 '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 575 - show-index -h output has consistent spacing
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.576 'show-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 576 - show-index *.txt SYNOPSIS has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.577 '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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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-index -h output and SYNOPSIS agree
 
-ok 261 - Passing -e with --follow-symlinks fails
+expecting success of 0450.578 'show-ref -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 578 - show-ref -h output has no \t
 
-expecting success of 1006.262 'Passing -p with --follow-symlinks fails': 
-	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+expecting success of 0450.579 'show-ref -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '--follow-symlinks' requires a batch mode
+ok 579 - show-ref -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.580 '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 580 - show-ref -h output has consistent spacing
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.581 'show-ref *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 581 - show-ref *.txt SYNOPSIS has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.582 '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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 582 - show-ref -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.583 'sparse-checkout -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 583 - sparse-checkout -h output has no \t
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.584 'sparse-checkout -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 584 - sparse-checkout -h output has dashed labels
 
-ok 262 - Passing -p with --follow-symlinks fails
+expecting success of 0450.585 '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 585 - sparse-checkout -h output has consistent spacing
 
-expecting success of 1006.263 'Passing -t with --follow-symlinks fails': 
-	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+expecting success of 0450.586 'sparse-checkout *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '--follow-symlinks' requires a batch mode
+ok 586 - sparse-checkout *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.587 '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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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 587 - sparse-checkout -h output and SYNOPSIS agree
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.588 'stage -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 588 - stage -h output has no \t
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.589 'stage -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 589 - stage -h output has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.590 '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 590 - stage -h output has consistent spacing
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.591 'stage *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 591 - stage *.txt SYNOPSIS has dashed labels
 
-ok 263 - Passing -t with --follow-symlinks fails
+checking known breakage of 0450.592 '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 1006.264 'Passing -s with --follow-symlinks fails': 
-	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+		# The *.txt and -h use different spacing for the
+		# alignment of continued usage output, normalize it.
+		align_after_nl "$builtin" <"$t2s" >txt &&
+		align_after_nl "$builtin" <"$h2s" >help &&
+		test_cmp txt help
 	
-fatal: '--follow-symlinks' requires a batch mode
+--- txt	2024-11-14 19:27:29.000439058 +0000
++++ help	2024-11-14 19:27:29.016439222 +0000
+@@ -1 +1 @@
+-git stage <arg>...
++git add [<options>] [--] <pathspec>...
+not ok 592 - stage -h output and SYNOPSIS agree # TODO known breakage
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.593 'stash -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 593 - stash -h output has no \t
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.594 'stash -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 594 - stash -h output has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.595 '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 595 - stash -h output has consistent spacing
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.596 'stash *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 596 - stash *.txt SYNOPSIS has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.597 '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")" &&
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+		# The *.txt and -h use different spacing for 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 597 - stash -h output and SYNOPSIS agree
 
-ok 264 - Passing -s with --follow-symlinks fails
+expecting success of 0450.598 'status -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 598 - status -h output has no \t
 
-expecting success of 1006.265 'Passing -e with --follow-symlinks fails': 
-	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+expecting success of 0450.599 'status -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
 	
-fatal: '--follow-symlinks' requires a batch mode
+ok 599 - status -h output has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.600 '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 600 - status -h output has consistent spacing
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+expecting success of 0450.601 'status *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 601 - status *.txt SYNOPSIS has dashed labels
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.602 '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")" &&
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known 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
+	
+ok 602 - status -h output and SYNOPSIS agree
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.603 'stripspace -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 603 - stripspace -h output has no \t
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+expecting success of 0450.604 'stripspace -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 604 - stripspace -h output has dashed labels
 
-ok 265 - Passing -e with --follow-symlinks fails
+expecting success of 0450.605 '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 605 - stripspace -h output has consistent spacing
 
-expecting success of 1006.266 'Passing -p with --follow-symlinks fails': 
-	    test_must_fail git cat-file --follow-symlinks -$opt $oid
+expecting success of 0450.606 'stripspace *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
 	
-fatal: '--follow-symlinks' requires a batch mode
+ok 606 - stripspace *.txt SYNOPSIS has dashed labels
 
-usage: git cat-file <type> <object>
-   or: git cat-file (-e | -p) <object>
-   or: git cat-file (-t | -s) [--allow-unknown-type] <object>
-   or: git cat-file (--textconv | --filters)
-                    [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
-   or: git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]
-                    [--buffer] [--follow-symlinks] [--unordered]
-                    [--textconv | --filters] [-Z]
+expecting success of 0450.607 '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")" &&
 
-Check object existence or emit object contents
-    -e                    check if <object> exists
-    -p                    pretty-print <object> content
+		# The *.txt and -h use different spacing for 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 - stripspace -h output and SYNOPSIS agree
 
-Emit [broken] object attributes
-    -t                    show object type (one of 'blob', 'tree', 'commit', 'tag', ...)
-    -s                    show object size
-    --[no-]allow-unknown-type
-                          allow -s and -t to work with broken/corrupt objects
-    --[no-]use-mailmap    use mail map file
-    --[no-]mailmap ...    alias of --use-mailmap
+expecting success of 0450.608 'submodule--helper -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 608 - submodule--helper -h output has no \t
 
-Batch objects requested on stdin (or --batch-all-objects)
-    --batch[=<format>]    show full <object> or <rev> contents
-    --batch-check[=<format>]
-                          like --batch, but don't emit <contents>
-    -Z                    stdin and stdout is NUL-terminated
-    --batch-command[=<format>]
-                          read commands from stdin
-    --batch-all-objects   with --batch[-check]: ignores stdin, batches all known objects
+expecting success of 0450.609 'submodule--helper -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 609 - submodule--helper -h output has dashed labels
 
-Change or optimize batch output
-    --[no-]buffer         buffer --batch output
-    --[no-]follow-symlinks
-                          follow in-tree symlinks
-    --[no-]unordered      do not order objects before emitting them
+expecting success of 0450.610 '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 610 - submodule--helper -h output has consistent spacing
 
-Emit object (blob or tree) with conversion or filter (stand-alone, or with batch)
-    --textconv            run textconv on object's content
-    --filters             run filters on object's content
-    --[no-]path blob|tree use a <path> for (--textconv | --filters); Not with 'batch'
+ok 611 # skip submodule--helper *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_SUBMODULE__HELPER)
 
-ok 266 - Passing -p with --follow-symlinks fails
+ok 612 # skip submodule--helper -h output and SYNOPSIS agree (missing BUILTIN_TXT_SUBMODULE__HELPER)
 
-expecting success of 1006.267 '--batch-check for a non-existent named object': 
-	cat >expect <<-EOF &&
-	foobar42 missing
-	foobar84 missing
-	EOF
+expecting success of 0450.613 'switch -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 613 - switch -h output has no \t
 
-	printf "foobar42\nfoobar84" >in &&
-	git cat-file --batch-check <in >actual &&
-	test_cmp expect actual
+expecting success of 0450.614 'switch -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 614 - switch -h output has dashed labels
 
-ok 267 - --batch-check for a non-existent named object
+expecting success of 0450.615 '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 615 - switch -h output has consistent spacing
 
-expecting success of 1006.268 '--batch-check for a non-existent hash': 
-	cat >expect <<-EOF &&
-	0000000000000000000000000000000000000042 missing
-	0000000000000000000000000000000000000084 missing
-	EOF
+expecting success of 0450.616 'switch *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 616 - switch *.txt SYNOPSIS has dashed labels
 
-	printf "0000000000000000000000000000000000000042\n0000000000000000000000000000000000000084" >in &&
-	git cat-file --batch-check <in >actual &&
-	test_cmp expect actual
+checking known breakage of 0450.617 '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")" &&
 
-ok 268 - --batch-check for a non-existent 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
+	
+--- txt	2024-11-14 19:27:30.744456845 +0000
++++ help	2024-11-14 19:27:30.764457049 +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 617 - switch -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1006.269 '--batch for an existent and a non-existent hash': 
-	cat >expect <<-EOF &&
-	$tag_oid tag $tag_size
-	$tag_content
-	0000000000000000000000000000000000000000 missing
-	EOF
+expecting success of 0450.618 'symbolic-ref -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 618 - symbolic-ref -h output has no \t
 
-	printf "$tag_oid\n0000000000000000000000000000000000000000" >in &&
-	git cat-file --batch <in >actual &&
-	test_cmp expect actual
+expecting success of 0450.619 'symbolic-ref -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 619 - symbolic-ref -h output has dashed labels
 
-ok 269 - --batch for an existent and a non-existent hash
+expecting success of 0450.620 '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 620 - symbolic-ref -h output has consistent spacing
 
-expecting success of 1006.270 '--batch-check for an empty line': 
-	cat >expect <<-EOF &&
-	 missing
-	EOF
+expecting success of 0450.621 'symbolic-ref *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 621 - symbolic-ref *.txt SYNOPSIS has dashed labels
 
-	echo >in &&
-	git cat-file --batch-check <in >actual &&
-	test_cmp expect actual
+expecting success of 0450.622 '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")" &&
 
-ok 270 - --batch-check for an empty 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
+	
+ok 622 - symbolic-ref -h output and SYNOPSIS agree
 
-expecting success of 1006.271 'empty --batch-check notices missing object': 
-	echo "$ZERO_OID missing" >expect &&
-	echo "$ZERO_OID" | git cat-file --batch-check="" >actual &&
-	test_cmp expect actual
+expecting success of 0450.623 'tag -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 623 - tag -h output has no \t
 
-ok 271 - empty --batch-check notices missing object
+expecting success of 0450.624 'tag -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 624 - tag -h output has dashed labels
 
-expecting success of 1006.272 '--batch with multiple oids gives correct format': 
-	tr "\0" "\n" <batch_output >expect &&
-	echo_without_newline "$batch_input" >in &&
-	git cat-file --batch <in >actual &&
-	test_cmp expect actual
-    
-ok 272 - --batch with multiple oids gives correct format
+expecting success of 0450.625 '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 625 - tag -h output has consistent spacing
 
-expecting success of 1006.273 '--batch, -z with multiple oids gives correct format': 
-	echo_without_newline_nul "$batch_input" >in &&
-	tr "\0" "\n" <batch_output >expect &&
-	git cat-file --batch -z <in >actual &&
-	test_cmp expect actual
-    
-ok 273 - --batch, -z with multiple oids gives correct format
+expecting success of 0450.626 'tag *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 626 - tag *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.274 '--batch, -Z with multiple oids gives correct format': 
-	echo_without_newline_nul "$batch_input" >in &&
-	git cat-file --batch -Z <in >actual &&
-	test_cmp batch_output actual
-    
-ok 274 - --batch, -Z with multiple oids gives correct format
+expecting success of 0450.627 '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 1006.275 '--batch-check with multiple oids gives correct format': 
-	tr "\0" "\n" <batch_check_output >expect &&
-	echo_without_newline "$batch_check_input" >in &&
-	git cat-file --batch-check <in >actual &&
-	test_cmp expect actual
-    
-ok 275 - --batch-check with multiple oids gives correct format
+		# The *.txt and -h use different spacing for 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 - tag -h output and SYNOPSIS agree
 
-expecting success of 1006.276 '--batch-check, -z with multiple oids gives correct format': 
-	tr "\0" "\n" <batch_check_output >expect &&
-	echo_without_newline_nul "$batch_check_input" >in &&
-	git cat-file --batch-check -z <in >actual &&
-	test_cmp expect actual
-    
-ok 276 - --batch-check, -z with multiple oids gives correct format
+expecting success of 0450.628 'unpack-file -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 628 - unpack-file -h output has no \t
 
-expecting success of 1006.277 '--batch-check, -Z with multiple oids gives correct format': 
-	echo_without_newline_nul "$batch_check_input" >in &&
-	git cat-file --batch-check -Z <in >actual &&
-	test_cmp batch_check_output actual
-    
-ok 277 - --batch-check, -Z with multiple oids gives correct format
+expecting success of 0450.629 'unpack-file -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 629 - unpack-file -h output has dashed labels
 
-expecting success of 1006.278 '--batch-command with multiple info calls gives correct format': 
-	cat >expect <<-EOF &&
-	$boid blob $hello_size
-	$loid tree $lsize
-	$coid commit $csize
-	$toid tag $tsize
-	deadbeef missing
-	EOF
+expecting success of 0450.630 '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 630 - unpack-file -h output has consistent spacing
 
-	echo "$batch_command_multiple_info" >in &&
-	git cat-file --batch-command --buffer <in >actual &&
+expecting success of 0450.631 'unpack-file *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 631 - unpack-file *.txt SYNOPSIS has dashed labels
 
-	test_cmp expect actual &&
+expecting success of 0450.632 '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")" &&
 
-	echo "$batch_command_multiple_info" | tr "\n" "\0" >in &&
-	git cat-file --batch-command --buffer -z <in >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 632 - unpack-file -h output and SYNOPSIS agree
 
-	test_cmp expect actual &&
+expecting success of 0450.633 'unpack-objects -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 633 - unpack-objects -h output has no \t
 
-	echo "$batch_command_multiple_info" | tr "\n" "\0" >in &&
-	tr "\n" "\0" <expect >expect_nul &&
-	git cat-file --batch-command --buffer -Z <in >actual &&
+expecting success of 0450.634 'unpack-objects -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 634 - unpack-objects -h output has dashed labels
 
-	test_cmp expect_nul actual
-    
-ok 278 - --batch-command with multiple info calls gives correct format
+expecting success of 0450.635 '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 635 - unpack-objects -h output has consistent spacing
 
-expecting success of 1006.279 '--batch-command with multiple command calls gives correct format': 
-	printf "%s\0" \
-		"$boid blob $hello_size" \
-		"$hello_content" \
-		"$coid commit $csize" \
-		"$ccontent" \
-		"$toid tag $tsize" \
-		"$tcontent" \
-		"deadbeef missing" >expect_nul &&
-	tr "\0" "\n" <expect_nul >expect &&
+expecting success of 0450.636 'unpack-objects *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 636 - unpack-objects *.txt SYNOPSIS has dashed labels
 
-	echo "$batch_command_multiple_contents" >in &&
-	git cat-file --batch-command --buffer <in >actual &&
+expecting success of 0450.637 '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")" &&
 
-	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 637 - unpack-objects -h output and SYNOPSIS agree
 
-	echo "$batch_command_multiple_contents" | tr "\n" "\0" >in &&
-	git cat-file --batch-command --buffer -z <in >actual &&
+expecting success of 0450.638 'update-index -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 638 - update-index -h output has no \t
 
-	test_cmp expect actual &&
+expecting success of 0450.639 'update-index -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 639 - update-index -h output has dashed labels
 
-	echo "$batch_command_multiple_contents" | tr "\n" "\0" >in &&
-	git cat-file --batch-command --buffer -Z <in >actual &&
+expecting success of 0450.640 '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 640 - update-index -h output has consistent spacing
 
-	test_cmp expect_nul actual
-    
-ok 279 - --batch-command with multiple command calls gives correct format
+expecting success of 0450.641 'update-index *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 641 - update-index *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.280 '--batch with multiple oids gives correct format': 
-	tr "\0" "\n" <batch_output >expect &&
-	echo_without_newline "$batch_input" >in &&
-	git cat-file --batch <in >actual &&
-	test_cmp expect actual
-    
-ok 280 - --batch with multiple oids gives correct format
+checking known breakage of 0450.642 '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 1006.281 '--batch, -z with multiple oids gives correct format': 
-	echo_without_newline_nul "$batch_input" >in &&
-	tr "\0" "\n" <batch_output >expect &&
-	git cat-file --batch -z <in >actual &&
-	test_cmp expect actual
-    
-ok 281 - --batch, -z with multiple oids gives correct format
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:32.096470634 +0000
++++ help	2024-11-14 19:27:32.148471164 +0000
+@@ -1,18 +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>]
+-                 [--verbose]
+-                 [--] [<file>...]
++git update-index [<options>] [--] [<file>...]
+not ok 642 - update-index -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1006.282 '--batch, -Z with multiple oids gives correct format': 
-	echo_without_newline_nul "$batch_input" >in &&
-	git cat-file --batch -Z <in >actual &&
-	test_cmp batch_output actual
-    
-ok 282 - --batch, -Z with multiple oids gives correct format
+expecting success of 0450.643 'update-ref -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 643 - update-ref -h output has no \t
 
-expecting success of 1006.283 '--batch-check with multiple oids gives correct format': 
-	tr "\0" "\n" <batch_check_output >expect &&
-	echo_without_newline "$batch_check_input" >in &&
-	git cat-file --batch-check <in >actual &&
-	test_cmp expect actual
-    
-ok 283 - --batch-check with multiple oids gives correct format
+expecting success of 0450.644 'update-ref -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 644 - update-ref -h output has dashed labels
 
-expecting success of 1006.284 '--batch-check, -z with multiple oids gives correct format': 
-	tr "\0" "\n" <batch_check_output >expect &&
-	echo_without_newline_nul "$batch_check_input" >in &&
-	git cat-file --batch-check -z <in >actual &&
-	test_cmp expect actual
-    
-ok 284 - --batch-check, -z with multiple oids gives correct format
+expecting success of 0450.645 '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 645 - update-ref -h output has consistent spacing
 
-expecting success of 1006.285 '--batch-check, -Z with multiple oids gives correct format': 
-	echo_without_newline_nul "$batch_check_input" >in &&
-	git cat-file --batch-check -Z <in >actual &&
-	test_cmp batch_check_output actual
-    
-ok 285 - --batch-check, -Z with multiple oids gives correct format
+expecting success of 0450.646 'update-ref *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 646 - update-ref *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.286 '--batch-command with multiple info calls gives correct format': 
-	cat >expect <<-EOF &&
-	$boid blob $hello_size
-	$loid tree $lsize
-	$coid commit $csize
-	$toid tag $tsize
-	deadbeef missing
-	EOF
+checking known breakage of 0450.647 '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 "$batch_command_multiple_info" >in &&
-	git cat-file --batch-command --buffer <in >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	2024-11-14 19:27:32.564475408 +0000
++++ help	2024-11-14 19:27:32.624476019 +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 647 - update-ref -h output and SYNOPSIS agree # TODO known breakage
 
-	test_cmp expect actual &&
+expecting success of 0450.648 'update-server-info -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 648 - update-server-info -h output has no \t
 
-	echo "$batch_command_multiple_info" | tr "\n" "\0" >in &&
-	git cat-file --batch-command --buffer -z <in >actual &&
+expecting success of 0450.649 'update-server-info -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 649 - update-server-info -h output has dashed labels
 
-	test_cmp expect actual &&
+expecting success of 0450.650 '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 650 - update-server-info -h output has consistent spacing
 
-	echo "$batch_command_multiple_info" | tr "\n" "\0" >in &&
-	tr "\n" "\0" <expect >expect_nul &&
-	git cat-file --batch-command --buffer -Z <in >actual &&
+expecting success of 0450.651 'update-server-info *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 651 - update-server-info *.txt SYNOPSIS has dashed labels
 
-	test_cmp expect_nul actual
-    
-ok 286 - --batch-command with multiple info calls gives correct format
+expecting success of 0450.652 '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")" &&
 
-expecting success of 1006.287 '--batch-command with multiple command calls gives correct format': 
-	printf "%s\0" \
-		"$boid blob $hello_size" \
-		"$hello_content" \
-		"$coid commit $csize" \
-		"$ccontent" \
-		"$toid tag $tsize" \
-		"$tcontent" \
-		"deadbeef missing" >expect_nul &&
-	tr "\0" "\n" <expect_nul >expect &&
+		# The *.txt and -h use different spacing for 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 652 - update-server-info -h output and SYNOPSIS agree
 
-	echo "$batch_command_multiple_contents" >in &&
-	git cat-file --batch-command --buffer <in >actual &&
+expecting success of 0450.653 'upload-archive -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 653 - upload-archive -h output has no \t
 
-	test_cmp expect actual &&
+expecting success of 0450.654 'upload-archive -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 654 - upload-archive -h output has dashed labels
 
-	echo "$batch_command_multiple_contents" | tr "\n" "\0" >in &&
-	git cat-file --batch-command --buffer -z <in >actual &&
+expecting success of 0450.655 '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 655 - upload-archive -h output has consistent spacing
 
-	test_cmp expect actual &&
+expecting success of 0450.656 'upload-archive *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 656 - upload-archive *.txt SYNOPSIS has dashed labels
 
-	echo "$batch_command_multiple_contents" | tr "\n" "\0" >in &&
-	git cat-file --batch-command --buffer -Z <in >actual &&
+expecting success of 0450.657 '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")" &&
 
-	test_cmp expect_nul actual
-    
-ok 287 - --batch-command with multiple command calls gives correct format
+		# The *.txt and -h use different spacing for 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 - upload-archive -h output and SYNOPSIS agree
 
-checking prerequisite: FUNNYNAMES
+expecting success of 0450.658 'upload-archive--writer -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 658 - upload-archive--writer -h output has no \t
 
-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 0450.659 'upload-archive--writer -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 659 - upload-archive--writer -h output has dashed labels
 
-)
-prerequisite FUNNYNAMES ok
-expecting success of 1006.288 'setup with newline in input': 
-	touch -- "newline${LF}embedded" &&
-	git add -- "newline${LF}embedded" &&
-	git commit -m "file with newline embedded" &&
-	test_tick &&
+expecting success of 0450.660 '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 660 - upload-archive--writer -h output has consistent spacing
 
-	printf "HEAD:newline${LF}embedded" >in
+ok 661 # skip upload-archive--writer *.txt SYNOPSIS has dashed labels (missing BUILTIN_TXT_UPLOAD_ARCHIVE__WRITER)
 
-[master (root-commit) a7561ce] file with newline embedded
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 hello
- create mode 100644 "newline\nembedded"
-ok 288 - setup with newline in input
+ok 662 # skip upload-archive--writer -h output and SYNOPSIS agree (missing BUILTIN_TXT_UPLOAD_ARCHIVE__WRITER)
 
-expecting success of 1006.289 '--batch-check, -z with newline in input': 
-	git cat-file --batch-check -z <in >actual &&
-	echo "$(git rev-parse "HEAD:newline${LF}embedded") blob 0" >expect &&
-	test_cmp expect actual
+expecting success of 0450.663 'upload-pack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 663 - upload-pack -h output has no \t
 
-ok 289 - --batch-check, -z with newline in input
+expecting success of 0450.664 'upload-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 664 - upload-pack -h output has dashed labels
 
-expecting success of 1006.290 '--batch-check, -Z with newline in input': 
-	git cat-file --batch-check -Z <in >actual &&
-	printf "%s\0" "$(git rev-parse "HEAD:newline${LF}embedded") blob 0" >expect &&
-	test_cmp expect actual
+expecting success of 0450.665 '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 665 - upload-pack -h output has consistent spacing
 
-ok 290 - --batch-check, -Z with newline in input
+expecting success of 0450.666 'upload-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 666 - upload-pack *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.291 'setup blobs which are likely to delta': 
-	test-tool genrandom foo 10240 >foo &&
-	{ cat foo && echo plus; } >foo-plus &&
-	git add foo foo-plus &&
-	git commit -m foo &&
-	cat >blobs <<-\EOF
-	HEAD:foo
-	HEAD:foo-plus
-	EOF
+expecting success of 0450.667 '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")" &&
 
-[master 149611e] foo
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
- create mode 100644 foo-plus
-ok 291 - setup blobs which are likely to delta
+		# The *.txt and -h use different spacing for 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 667 - upload-pack -h output and SYNOPSIS agree
 
-expecting success of 1006.292 'confirm that neither loose blob is a delta': 
-	cat >expect <<-EOF &&
-	$ZERO_OID
-	$ZERO_OID
-	EOF
-	git cat-file --batch-check="%(deltabase)" <blobs >actual &&
-	test_cmp expect actual
+expecting success of 0450.668 'var -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 668 - var -h output has no \t
 
-ok 292 - confirm that neither loose blob is a delta
+expecting success of 0450.669 'var -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 669 - var -h output has dashed labels
 
-expecting success of 1006.293 '%(deltabase) reports packed delta bases': 
-	git repack -ad &&
-	git cat-file --batch-check="%(deltabase)" <blobs >actual &&
-	{
-		grep "$(git rev-parse HEAD:foo)" actual ||
-		grep "$(git rev-parse HEAD:foo-plus)" actual
-	}
+expecting success of 0450.670 '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 670 - var -h output has consistent spacing
 
-9b546ef00c80e00a1733cb882d607028fcd562fc
-ok 293 - %(deltabase) reports packed delta bases
+expecting success of 0450.671 'var *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 671 - var *.txt SYNOPSIS has dashed labels
 
-expecting success of 1006.294 'setup bogus data': 
-	bogus_short_type="bogus" &&
-	bogus_short_content="bogus" &&
-	bogus_short_size=$(strlen "$bogus_short_content") &&
-	bogus_short_oid=$(echo_without_newline "$bogus_short_content" | git hash-object -t $bogus_short_type --literally -w --stdin) &&
+expecting success of 0450.672 '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")" &&
 
-	bogus_long_type="abcdefghijklmnopqrstuvwxyz1234679" &&
-	bogus_long_content="bogus" &&
-	bogus_long_size=$(strlen "$bogus_long_content") &&
-	bogus_long_oid=$(echo_without_newline "$bogus_long_content" | git hash-object -t $bogus_long_type --literally -w --stdin)
+		# The *.txt and -h use different spacing for 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 - var -h output and SYNOPSIS agree
 
-ok 294 - setup bogus data
+expecting success of 0450.673 'verify-commit -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 673 - verify-commit -h output has no \t
 
-expecting success of 1006.295 'cat-file  -s error on bogus short OID': 
-			cat >expect <<-\EOF &&
-			fatal: invalid object type
-			EOF
+expecting success of 0450.674 'verify-commit -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 674 - verify-commit -h output has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-ok 295 - cat-file  -s error on bogus short OID
+expecting success of 0450.675 '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 675 - verify-commit -h output has consistent spacing
 
-expecting success of 1006.296 'cat-file  -s error on bogus full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: Not a valid object name $bogus_long_oid
-				EOF
-			else
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
+expecting success of 0450.676 'verify-commit *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 676 - verify-commit *.txt SYNOPSIS has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-ok 296 - cat-file  -s error on bogus full OID
+expecting success of 0450.677 '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 1006.297 'cat-file  -s error on missing short OID': 
-			cat >expect.err <<-EOF &&
-			fatal: Not a valid object name $(test_oid deadbeef_short)
-			EOF
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 297 - cat-file  -s error on missing short OID
+		# The *.txt and -h use different spacing for 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 - verify-commit -h output and SYNOPSIS agree
 
-expecting success of 1006.298 'cat-file  -s error on missing full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect.err <<-EOF
-				fatal: Not a valid object name $(test_oid deadbeef)
-				EOF
-			else
-				cat >expect.err <<-\EOF
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 298 - cat-file  -s error on missing full OID
+expecting success of 0450.678 'verify-pack -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 678 - verify-pack -h output has no \t
 
-expecting success of 1006.299 'cat-file  -t error on bogus short OID': 
-			cat >expect <<-\EOF &&
-			fatal: invalid object type
-			EOF
+expecting success of 0450.679 'verify-pack -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 679 - verify-pack -h output has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-ok 299 - cat-file  -t error on bogus short OID
+expecting success of 0450.680 '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 680 - verify-pack -h output has consistent spacing
 
-expecting success of 1006.300 'cat-file  -t error on bogus full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: Not a valid object name $bogus_long_oid
-				EOF
-			else
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
+expecting success of 0450.681 'verify-pack *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 681 - verify-pack *.txt SYNOPSIS has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-ok 300 - cat-file  -t error on bogus full OID
+expecting success of 0450.682 '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 1006.301 'cat-file  -t error on missing short OID': 
-			cat >expect.err <<-EOF &&
-			fatal: Not a valid object name $(test_oid deadbeef_short)
-			EOF
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 301 - cat-file  -t error on missing short OID
+		# The *.txt and -h use different spacing for 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-pack -h output and SYNOPSIS agree
 
-expecting success of 1006.302 'cat-file  -t error on missing full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect.err <<-EOF
-				fatal: Not a valid object name $(test_oid deadbeef)
-				EOF
-			else
-				cat >expect.err <<-\EOF
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 302 - cat-file  -t error on missing full OID
+expecting success of 0450.683 'verify-tag -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 683 - verify-tag -h output has no \t
 
-expecting success of 1006.303 'cat-file  -p error on bogus short OID': 
-			cat >expect <<-\EOF &&
-			fatal: invalid object type
-			EOF
+expecting success of 0450.684 'verify-tag -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 684 - verify-tag -h output has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-ok 303 - cat-file  -p error on bogus short OID
+expecting success of 0450.685 '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 685 - verify-tag -h output has consistent spacing
 
-expecting success of 1006.304 'cat-file  -p error on bogus full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: Not a valid object name $bogus_long_oid
-				EOF
-			else
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
+expecting success of 0450.686 'verify-tag *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 686 - verify-tag *.txt SYNOPSIS has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-ok 304 - cat-file  -p error on bogus full OID
+expecting success of 0450.687 '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 1006.305 'cat-file  -p error on missing short OID': 
-			cat >expect.err <<-EOF &&
-			fatal: Not a valid object name $(test_oid deadbeef_short)
-			EOF
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 305 - cat-file  -p error on missing short OID
+		# The *.txt and -h use different spacing for 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-tag -h output and SYNOPSIS agree
 
-expecting success of 1006.306 'cat-file  -p error on missing full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect.err <<-EOF
-				fatal: Not a valid object name $(test_oid deadbeef)
-				EOF
-			else
-				cat >expect.err <<-\EOF
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 306 - cat-file  -p error on missing full OID
+expecting success of 0450.688 'version -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 688 - version -h output has no \t
 
-expecting success of 1006.307 'cat-file --allow-unknown-type -s error on bogus short OID': 
-			cat >expect <<-\EOF &&
-			fatal: invalid object type
-			EOF
+expecting success of 0450.689 'version -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 689 - version -h output has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-5
-ok 307 - cat-file --allow-unknown-type -s error on bogus short OID
+expecting success of 0450.690 '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 690 - version -h output has consistent spacing
 
-expecting success of 1006.308 'cat-file --allow-unknown-type -s error on bogus full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: Not a valid object name $bogus_long_oid
-				EOF
-			else
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
+expecting success of 0450.691 'version *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 691 - version *.txt SYNOPSIS has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-5
-ok 308 - cat-file --allow-unknown-type -s error on bogus full OID
+expecting success of 0450.692 '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")" &&
 
-expecting success of 1006.309 'cat-file --allow-unknown-type -s error on missing short OID': 
-			cat >expect.err <<-EOF &&
-			fatal: Not a valid object name $(test_oid deadbeef_short)
-			EOF
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 309 - cat-file --allow-unknown-type -s error on missing short OID
+		# The *.txt and -h use different spacing for 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 - version -h output and SYNOPSIS agree
 
-expecting success of 1006.310 'cat-file --allow-unknown-type -s error on missing full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect.err <<-EOF
-				fatal: Not a valid object name $(test_oid deadbeef)
-				EOF
-			else
-				cat >expect.err <<-\EOF
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 310 - cat-file --allow-unknown-type -s error on missing full OID
+expecting success of 0450.693 'whatchanged -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 693 - whatchanged -h output has no \t
 
-expecting success of 1006.311 'cat-file --allow-unknown-type -t error on bogus short OID': 
-			cat >expect <<-\EOF &&
-			fatal: invalid object type
-			EOF
+expecting success of 0450.694 'whatchanged -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 694 - whatchanged -h output has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_short_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-bogus
-ok 311 - cat-file --allow-unknown-type -t error on bogus short OID
+expecting success of 0450.695 '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 695 - whatchanged -h output has consistent spacing
 
-expecting success of 1006.312 'cat-file --allow-unknown-type -t error on bogus full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: Not a valid object name $bogus_long_oid
-				EOF
-			else
-				cat >expect <<-EOF
-				error: header for $bogus_long_oid too long, exceeds 32 bytes
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
+expecting success of 0450.696 'whatchanged *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 696 - whatchanged *.txt SYNOPSIS has dashed labels
 
-			if test "$arg1" = "--allow-unknown-type"
-			then
-				git cat-file $arg1 $arg2 $bogus_short_oid
-			else
-				test_must_fail git cat-file $arg1 $arg2 $bogus_long_oid >out 2>actual &&
-				test_must_be_empty out &&
-				test_cmp expect actual
-			fi
-		
-bogus
-ok 312 - cat-file --allow-unknown-type -t error on bogus full OID
+checking known breakage of 0450.697 '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")" &&
 
-expecting success of 1006.313 'cat-file --allow-unknown-type -t error on missing short OID': 
-			cat >expect.err <<-EOF &&
-			fatal: Not a valid object name $(test_oid deadbeef_short)
-			EOF
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef_short) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 313 - cat-file --allow-unknown-type -t error on missing short OID
+		# The *.txt and -h use different spacing for 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	2024-11-14 19:27:36.868519266 +0000
++++ help	2024-11-14 19:27:36.920519796 +0000
+@@ -1 +1,2 @@
+-git whatchanged <option>...
++git log [<options>] [<revision-range>] [[--] <path>...]
++git show [<options>] <object>...
+not ok 697 - whatchanged -h output and SYNOPSIS agree # TODO known breakage
 
-expecting success of 1006.314 'cat-file --allow-unknown-type -t error on missing full OID': 
-			if test "$arg2" = "-p"
-			then
-				cat >expect.err <<-EOF
-				fatal: Not a valid object name $(test_oid deadbeef)
-				EOF
-			else
-				cat >expect.err <<-\EOF
-				fatal: git cat-file: could not get object info
-				EOF
-			fi &&
-			test_must_fail git cat-file $arg1 $arg2 $(test_oid deadbeef) >out 2>err.actual &&
-			test_must_be_empty out &&
-			test_cmp expect.err err.actual
-		
-ok 314 - cat-file --allow-unknown-type -t error on missing full OID
+expecting success of 0450.698 'worktree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 698 - worktree -h output has no \t
 
-expecting success of 1006.315 '-e is OK with a broken object without --allow-unknown-type': 
-	git cat-file -e $bogus_short_oid
+expecting success of 0450.699 'worktree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 699 - worktree -h output has dashed labels
 
-ok 315 - -e is OK with a broken object without --allow-unknown-type
+expecting success of 0450.700 '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 700 - worktree -h output has consistent spacing
 
-expecting success of 1006.316 '-e can not be combined with --allow-unknown-type': 
-	test_expect_code 128 git cat-file -e --allow-unknown-type $bogus_short_oid
+expecting success of 0450.701 'worktree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 701 - worktree *.txt SYNOPSIS has dashed labels
 
-fatal: git cat-file --allow-unknown-type: use with -s or -t
-ok 316 - -e can not be combined with --allow-unknown-type
+expecting success of 0450.702 '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")" &&
 
-expecting success of 1006.317 '-p cannot print a broken object even with --allow-unknown-type': 
-	test_must_fail git cat-file -p $bogus_short_oid &&
-	test_expect_code 128 git cat-file -p --allow-unknown-type $bogus_short_oid
+		# The *.txt and -h use different spacing for 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 702 - worktree -h output and SYNOPSIS agree
 
-fatal: invalid object type
-fatal: git cat-file --allow-unknown-type: use with -s or -t
-ok 317 - -p cannot print a broken object even with --allow-unknown-type
+expecting success of 0450.703 'write-tree -h output has no \t': 
+		h2s="$(help_to_synopsis "$builtin")" &&
+		! grep "$HT" "$h2s"
+	
+ok 703 - write-tree -h output has no \t
 
-expecting success of 1006.318 '<type> <hash> does not work with objects of broken types': 
-	cat >err.expect <<-\EOF &&
-	fatal: invalid object type "bogus"
-	EOF
-	test_must_fail git cat-file $bogus_short_type $bogus_short_oid 2>err.actual &&
-	test_cmp err.expect err.actual
+expecting success of 0450.704 'write-tree -h output has dashed labels': 
+		check_dashed_labels "$(help_to_synopsis "$builtin")"
+	
+ok 704 - write-tree -h output has dashed labels
 
-ok 318 - <type> <hash> does not work with objects of broken types
+expecting success of 0450.705 '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 705 - write-tree -h output has consistent spacing
 
-expecting success of 1006.319 'broken types combined with --batch and --batch-check': 
-	echo $bogus_short_oid >bogus-oid &&
+expecting success of 0450.706 'write-tree *.txt SYNOPSIS has dashed labels': 
+		check_dashed_labels "$(txt_to_synopsis "$builtin")"
+	
+ok 706 - write-tree *.txt SYNOPSIS has dashed labels
 
-	cat >err.expect <<-\EOF &&
-	fatal: invalid object type
-	EOF
+expecting success of 0450.707 '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")" &&
 
-	test_must_fail git cat-file --batch <bogus-oid 2>err.actual &&
-	test_cmp err.expect err.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 707 - write-tree -h output and SYNOPSIS agree
 
-	test_must_fail git cat-file --batch-check <bogus-oid 2>err.actual &&
-	test_cmp err.expect err.actual
+# still have 57 known breakage(s)
+# passed all remaining 650 test(s)
+1..707
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1100-commit-tree-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1100-commit-tree-options/.git/
+expecting success of 1100.1 'test preparation: write empty tree': git write-tree >treeid
+ok 1 - test preparation: write empty tree
 
-ok 319 - broken types combined with --batch and --batch-check
+expecting success of 1100.2 'construct commit': echo comment text |
+     GIT_AUTHOR_NAME="Author Name" \
+     GIT_AUTHOR_EMAIL="author@email" \
+     GIT_AUTHOR_DATE="2005-05-26 23:00" \
+     GIT_COMMITTER_NAME="Committer Name" \
+     GIT_COMMITTER_EMAIL="committer@email" \
+     GIT_COMMITTER_DATE="2005-05-26 23:30" \
+     TZ=GMT git commit-tree $(cat treeid) >commitid 2>/dev/null
+ok 2 - construct commit
 
-expecting success of 1006.320 'the --batch and --batch-check options do not combine with --allow-unknown-type': 
-	test_expect_code 128 git cat-file --batch --allow-unknown-type <bogus-oid &&
-	test_expect_code 128 git cat-file --batch-check --allow-unknown-type <bogus-oid
+expecting success of 1100.3 'read commit': git cat-file commit $(cat commitid) >commit
+ok 3 - read commit
 
-fatal: invalid object type
-fatal: invalid object type
-ok 320 - the --batch and --batch-check options do not combine with --allow-unknown-type
+expecting success of 1100.4 'compare commit': test_cmp expected commit
+ok 4 - compare commit
 
-expecting success of 1006.321 'the --allow-unknown-type option does not consider replacement refs': 
-	cat >expect <<-EOF &&
-	$bogus_short_type
-	EOF
-	git cat-file -t --allow-unknown-type $bogus_short_oid >actual &&
-	test_cmp expect actual &&
+expecting success of 1100.5 'flags and then non flags': 
+	test_tick &&
+	echo comment text |
+	git commit-tree $(cat treeid) >commitid &&
+	echo comment text |
+	git commit-tree $(cat treeid) -p $(cat commitid) >childid-1 &&
+	echo comment text |
+	git commit-tree -p $(cat commitid) $(cat treeid) >childid-2 &&
+	test_cmp childid-1 childid-2 &&
+	git commit-tree $(cat treeid) -m foo >childid-3 &&
+	git commit-tree -m foo $(cat treeid) >childid-4 &&
+	test_cmp childid-3 childid-4
 
-	# Create it manually, as "git replace" will die on bogus
-	# types.
-	head=$(git rev-parse --verify HEAD) &&
-	test_when_finished "test-tool ref-store main delete-refs 0 msg refs/replace/$bogus_short_oid" &&
-	test-tool ref-store main update-ref msg "refs/replace/$bogus_short_oid" $head $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+ok 5 - flags and then non flags
 
-	cat >expect <<-EOF &&
-	commit
-	EOF
-	git cat-file -t --allow-unknown-type $bogus_short_oid >actual &&
-	test_cmp expect actual
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1091-sparse-checkout-builtin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/.git/
+expecting success of 1091.1 'setup': 
+	git init repo &&
+	(
+		cd repo &&
+		echo "initial" >a &&
+		mkdir folder1 folder2 deep &&
+		mkdir deep/deeper1 deep/deeper2 &&
+		mkdir deep/deeper1/deepest &&
+		cp a folder1 &&
+		cp a folder2 &&
+		cp a deep &&
+		cp a deep/deeper1 &&
+		cp a deep/deeper2 &&
+		cp a deep/deeper1/deepest &&
+		git add . &&
+		git commit -m "initial commit"
+	)
 
-ok 321 - the --allow-unknown-type option does not consider replacement refs
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/repo/.git/
+[main (root-commit) ebf8b57] initial commit
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 a
+ create mode 100644 deep/a
+ create mode 100644 deep/deeper1/a
+ create mode 100644 deep/deeper1/deepest/a
+ create mode 100644 deep/deeper2/a
+ create mode 100644 folder1/a
+ create mode 100644 folder2/a
+ok 1 - setup
 
-expecting success of 1006.322 'Type of broken object is correct': 
-	echo $bogus_short_type >expect &&
-	git cat-file -t --allow-unknown-type $bogus_short_oid >actual &&
-	test_cmp expect actual
+expecting success of 1091.2 'git sparse-checkout list (not sparse)': 
+	test_must_fail git -C repo sparse-checkout list >list 2>err &&
+	test_must_be_empty list &&
+	test_grep "this worktree is not sparse" err
 
-ok 322 - Type of broken object is correct
+fatal: this worktree is not sparse
+ok 2 - git sparse-checkout list (not sparse)
 
-expecting success of 1006.323 'Size of broken object is correct': 
-	echo $bogus_short_size >expect &&
-	git cat-file -s --allow-unknown-type $bogus_short_oid >actual &&
-	test_cmp expect actual
+expecting success of 1091.3 'git sparse-checkout list (not sparse)': 
+	git -C repo sparse-checkout set &&
+	rm repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout list >list 2>err &&
+	test_must_be_empty list &&
+	test_grep "this worktree is not sparse (sparse-checkout file may not exist)" err
 
-ok 323 - Size of broken object is correct
+warning: this worktree is not sparse (sparse-checkout file may not exist)
+ok 3 - git sparse-checkout list (not sparse)
 
-expecting success of 1006.324 'clean up broken object': 
-	rm .git/objects/$(test_oid_to_path $bogus_short_oid)
+expecting success of 1091.4 'git sparse-checkout list (populated)': 
+	test_when_finished rm -f repo/.git/info/sparse-checkout &&
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/folder1/*
+	/deep/
+	**/a
+	!*bin*
+	EOF
+	cp repo/.git/info/sparse-checkout expect &&
+	git -C repo sparse-checkout list >list &&
+	test_cmp expect list
 
-ok 324 - clean up broken object
+warning: unrecognized pattern: '/folder1/*'
+warning: disabling cone pattern matching
+ok 4 - git sparse-checkout list (populated)
 
-expecting success of 1006.325 'Type of broken object is correct when type is large': 
-	echo $bogus_long_type >expect &&
-	git cat-file -t --allow-unknown-type $bogus_long_oid >actual &&
-	test_cmp expect actual
+expecting success of 1091.5 'git sparse-checkout init': 
+	git -C repo sparse-checkout init --no-cone &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	test_cmp_config -C repo true core.sparsecheckout &&
+	check_files repo a
 
-ok 325 - Type of broken object is correct when type is large
+ok 5 - git sparse-checkout init
 
-expecting success of 1006.326 'Size of large broken object is correct when type is large': 
-	echo $bogus_long_size >expect &&
-	git cat-file -s --allow-unknown-type $bogus_long_oid >actual &&
-	test_cmp expect actual
+expecting success of 1091.6 'git sparse-checkout init in empty repo': 
+	test_when_finished rm -rf empty-repo blank-template &&
+	git init --template= empty-repo &&
+	git -C empty-repo sparse-checkout init
 
-ok 326 - Size of large broken object is correct when type is large
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/empty-repo/.git/
+ok 6 - git sparse-checkout init in empty repo
 
-expecting success of 1006.327 'clean up broken object': 
-	rm .git/objects/$(test_oid_to_path $bogus_long_oid)
+expecting success of 1091.7 'git sparse-checkout list after init': 
+	git -C repo sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect actual
 
-ok 327 - clean up broken object
+ok 7 - git sparse-checkout list after init
 
-expecting success of 1006.328 'cat-file -t and -s on corrupt loose object': 
-	git init --bare corrupt-loose.git &&
-	(
-		cd corrupt-loose.git &&
+expecting success of 1091.8 'init with existing sparse-checkout': 
+	echo "*folder*" >> repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout init &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	*folder*
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1 folder2
 
-		# Setup and create the empty blob and its path
-		empty_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$EMPTY_BLOB")) &&
-		empty_blob=$(git hash-object -w --stdin </dev/null) &&
+ok 8 - init with existing sparse-checkout
 
-		# Create another blob and its path
-		echo other >other.blob &&
-		other_blob=$(git hash-object -w --stdin <other.blob) &&
-		other_path=$(git rev-parse --git-path objects/$(test_oid_to_path "$other_blob")) &&
+expecting success of 1091.9 'clone --sparse': 
+	git clone --sparse "file://$(pwd)/repo" clone &&
+	git -C clone sparse-checkout reapply --no-cone &&
+	git -C clone sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect actual &&
+	check_files clone a
 
-		# Before the swap the size is 0
-		cat >out.expect <<-EOF &&
-		0
-		EOF
-		git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
-		test_must_be_empty err.actual &&
-		test_cmp out.expect out.actual &&
+Cloning into 'clone'...
+ok 9 - clone --sparse
 
-		# Swap the two to corrupt the repository
-		mv -f "$other_path" "$empty_path" &&
-		test_must_fail git fsck 2>err.fsck &&
-		grep "hash-path mismatch" err.fsck &&
+expecting success of 1091.10 'switching to cone mode with non-cone mode patterns': 
+	git init bad-patterns &&
+	(
+		cd bad-patterns &&
+		git sparse-checkout init --no-cone &&
+		git sparse-checkout add dir &&
+		git config --worktree core.sparseCheckoutCone true &&
+		test_must_fail git sparse-checkout add dir 2>err &&
+		grep "existing sparse-checkout patterns do not use cone mode" err
+	)
 
-		# confirm that cat-file is reading the new swapped-in
-		# blob...
-		cat >out.expect <<-EOF &&
-		blob
-		EOF
-		git cat-file -t "$EMPTY_BLOB" >out.actual 2>err.actual &&
-		test_must_be_empty err.actual &&
-		test_cmp out.expect out.actual &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/bad-patterns/.git/
+fatal: existing sparse-checkout patterns do not use cone mode
+ok 10 - switching to cone mode with non-cone mode patterns
 
-		# ... since it has a different size now.
-		cat >out.expect <<-EOF &&
-		6
-		EOF
-		git cat-file -s "$EMPTY_BLOB" >out.actual 2>err.actual &&
-		test_must_be_empty err.actual &&
-		test_cmp out.expect out.actual &&
+expecting success of 1091.11 'interaction with clone --no-checkout (unborn index)': 
+	git clone --no-checkout "file://$(pwd)/repo" clone_no_checkout &&
+	git -C clone_no_checkout sparse-checkout init --cone &&
+	git -C clone_no_checkout sparse-checkout set folder1 &&
 
-		# So far "cat-file" has been happy to spew the found
-		# content out as-is. Try to make it zlib-invalid.
-		mv -f other.blob "$empty_path" &&
-		test_must_fail git fsck 2>err.fsck &&
-		cat >expect <<-EOF &&
-		error: inflate: data stream error (incorrect header check)
-		error: unable to unpack header of ./$empty_path
-		error: $empty_blob: object corrupt or missing: ./$empty_path
-		EOF
-		grep "^error: " err.fsck >actual &&
-		test_cmp expect actual
-	)
+	git -C clone_no_checkout sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	folder1
+	EOF
+	test_cmp expect actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1006-cat-file/corrupt-loose.git/
-error: e45c9c2666d44e0327c1f9c239a74c508336053e: hash-path mismatch, found at: ./objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 328 - cat-file -t and -s on corrupt loose object
+	# nothing checked out, expect "No such file or directory"
+	! ls clone_no_checkout/* >actual &&
+	test_must_be_empty actual &&
+	test_path_is_missing clone_no_checkout/.git/index &&
 
-expecting success of 1006.329 'prep for symlink tests': 
-	echo_without_newline "$hello_content" >morx &&
-	test_ln_s_add morx same-dir-link &&
-	test_ln_s_add dir link-to-dir &&
-	test_ln_s_add ../fleem out-of-repo-link &&
-	test_ln_s_add .. out-of-repo-link-dir &&
-	test_ln_s_add same-dir-link link-to-link &&
-	test_ln_s_add nope broken-same-dir-link &&
-	mkdir dir &&
-	test_ln_s_add ../morx dir/parent-dir-link &&
-	test_ln_s_add .. dir/link-dir &&
-	test_ln_s_add ../../escape dir/out-of-repo-link &&
-	test_ln_s_add ../.. dir/out-of-repo-link-dir &&
-	test_ln_s_add nope dir/broken-link-in-dir &&
-	mkdir dir/subdir &&
-	test_ln_s_add ../../morx dir/subdir/grandparent-dir-link &&
-	test_ln_s_add ../../../great-escape dir/subdir/out-of-repo-link &&
-	test_ln_s_add ../../.. dir/subdir/out-of-repo-link-dir &&
-	test_ln_s_add ../../../ dir/subdir/out-of-repo-link-dir-trailing &&
-	test_ln_s_add ../parent-dir-link dir/subdir/parent-dir-link-to-link &&
-	echo_without_newline "$hello_content" >dir/subdir/ind2 &&
-	echo_without_newline "$hello_content" >dir/ind1 &&
-	test_ln_s_add dir dirlink &&
-	test_ln_s_add dir/subdir subdirlink &&
-	test_ln_s_add subdir/ind2 dir/link-to-child &&
-	test_ln_s_add dir/link-to-child link-to-down-link &&
-	test_ln_s_add dir/.. up-down &&
-	test_ln_s_add dir/../ up-down-trailing &&
-	test_ln_s_add dir/../morx up-down-file &&
-	test_ln_s_add dir/../../morx up-up-down-file &&
-	test_ln_s_add subdirlink/../../morx up-two-down-file &&
-	test_ln_s_add loop1 loop2 &&
-	test_ln_s_add loop2 loop1 &&
-	git add morx dir/subdir/ind2 dir/ind1 &&
-	git commit -am "test" &&
-	echo $hello_oid blob $hello_size >found
+	# No branch is checked out until we manually switch to one
+	git -C clone_no_checkout switch main &&
+	test_path_is_file clone_no_checkout/.git/index &&
+	check_files clone_no_checkout a folder1
 
-checking prerequisite: SYMLINKS
+Cloning into 'clone_no_checkout'...
+ls: cannot access 'clone_no_checkout/*': No such file or directory
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+ok 11 - interaction with clone --no-checkout (unborn index)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-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 1091.12 'set enables config': 
+	git init worktree-config &&
+	(
+		cd worktree-config &&
+		test_commit test file &&
+		test_path_is_missing .git/config.worktree &&
+		git sparse-checkout set nothing &&
+		test_path_is_file .git/config.worktree &&
+		test_cmp_config true core.sparseCheckout
+	)
 
-)
-prerequisite SYMLINKS ok
-[master 86a080e] test
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/worktree-config/.git/
+[main (root-commit) 236e830] test
  Author: A U Thor <author@example.com>
- 30 files changed, 30 insertions(+)
- create mode 120000 broken-same-dir-link
- create mode 120000 dir/broken-link-in-dir
- create mode 100644 dir/ind1
- create mode 120000 dir/link-dir
- create mode 120000 dir/link-to-child
- create mode 120000 dir/out-of-repo-link
- create mode 120000 dir/out-of-repo-link-dir
- create mode 120000 dir/parent-dir-link
- create mode 120000 dir/subdir/grandparent-dir-link
- create mode 100644 dir/subdir/ind2
- create mode 120000 dir/subdir/out-of-repo-link
- create mode 120000 dir/subdir/out-of-repo-link-dir
- create mode 120000 dir/subdir/out-of-repo-link-dir-trailing
- create mode 120000 dir/subdir/parent-dir-link-to-link
- create mode 120000 dirlink
- create mode 120000 link-to-dir
- create mode 120000 link-to-down-link
- create mode 120000 link-to-link
- create mode 120000 loop1
- create mode 120000 loop2
- create mode 100644 morx
- create mode 120000 out-of-repo-link
- create mode 120000 out-of-repo-link-dir
- create mode 120000 same-dir-link
- create mode 120000 subdirlink
- create mode 120000 up-down
- create mode 120000 up-down-file
- create mode 120000 up-down-trailing
- create mode 120000 up-two-down-file
- create mode 120000 up-up-down-file
-ok 329 - prep for symlink tests
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 12 - set enables config
 
-expecting success of 1006.330 'git cat-file --batch-check --follow-symlinks works for non-links': 
-	echo HEAD:morx | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual &&
-	echo HEAD:nope missing >expect &&
-	echo HEAD:nope | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual
+expecting success of 1091.13 'set sparse-checkout using builtin': 
+	git -C repo sparse-checkout set "/*" "!/*/" "*folder*" &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	*folder*
+	EOF
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1 folder2
 
-ok 330 - git cat-file --batch-check --follow-symlinks works for non-links
+ok 13 - set sparse-checkout using builtin
 
-expecting success of 1006.331 'git cat-file --batch-check --follow-symlinks works for in-repo, same-dir links': 
-	echo HEAD:same-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual
+expecting success of 1091.14 'set sparse-checkout using --stdin': 
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/folder1/
+	/folder2/
+	EOF
+	git -C repo sparse-checkout set --stdin <expect &&
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo "a folder1 folder2"
 
-ok 331 - git cat-file --batch-check --follow-symlinks works for in-repo, same-dir links
+ok 14 - set sparse-checkout using --stdin
 
-expecting success of 1006.332 'git cat-file --batch-check --follow-symlinks works for in-repo, links to dirs': 
-	echo HEAD:link-to-dir/ind1 | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual
+expecting success of 1091.15 'add to sparse-checkout': 
+	cat repo/.git/info/sparse-checkout >old &&
+	test_when_finished cp old repo/.git/info/sparse-checkout &&
+	cat >add <<-\EOF &&
+	pattern1
+	/folder1/
+	pattern2
+	EOF
+	cat old >expect &&
+	cat add >>expect &&
+	git -C repo sparse-checkout add --stdin <add &&
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo "a folder1 folder2"
 
-ok 332 - git cat-file --batch-check --follow-symlinks works for in-repo, links to dirs
+ok 15 - add to sparse-checkout
 
-expecting success of 1006.333 'git cat-file --batch-check --follow-symlinks works for broken in-repo, same-dir links': 
-	echo dangling 25 >expect &&
-	echo HEAD:broken-same-dir-link >>expect &&
-	echo HEAD:broken-same-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual
+expecting success of 1091.16 'worktree: add copies sparse-checkout patterns': 
+	cat repo/.git/info/sparse-checkout >old &&
+	test_when_finished cp old repo/.git/info/sparse-checkout &&
+	test_when_finished git -C repo worktree remove ../worktree &&
+	git -C repo sparse-checkout set --no-cone "/*" &&
+	git -C repo worktree add --quiet ../worktree 2>err &&
+	test_must_be_empty err &&
+	new="$(git -C worktree rev-parse --git-path info/sparse-checkout)" &&
+	test_path_is_file "$new" &&
+	test_cmp repo/.git/info/sparse-checkout "$new" &&
+	git -C worktree sparse-checkout set --cone &&
+	test_cmp_config -C worktree true core.sparseCheckoutCone &&
+	test_must_fail git -C repo core.sparseCheckoutCone
 
-ok 333 - git cat-file --batch-check --follow-symlinks works for broken in-repo, same-dir links
+git: 'core.sparseCheckoutCone' is not a git command. See 'git --help'.
+ok 16 - worktree: add copies sparse-checkout patterns
 
-expecting success of 1006.334 'git cat-file --batch-check --follow-symlinks -Z works for broken in-repo, same-dir links': 
-	printf "HEAD:broken-same-dir-link\0" >in &&
-	printf "dangling 25\0HEAD:broken-same-dir-link\0" >expect &&
-	git cat-file --batch-check --follow-symlinks -Z <in >actual &&
-	test_cmp expect actual
+expecting success of 1091.17 'cone mode: match patterns': 
+	git -C repo config --worktree core.sparseCheckoutCone true &&
+	rm -rf repo/a repo/folder1 repo/folder2 &&
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_grep ! "disabling cone patterns" err &&
+	git -C repo reset --hard &&
+	check_files repo a folder1 folder2
 
-ok 334 - git cat-file --batch-check --follow-symlinks -Z works for broken in-repo, same-dir links
+HEAD is now at ebf8b57 initial commit
+ok 17 - cone mode: match patterns
 
-expecting success of 1006.335 'git cat-file --batch-check --follow-symlinks works for same-dir links-to-links': 
-	echo HEAD:link-to-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual
+expecting success of 1091.18 'cone mode: warn on bad pattern': 
+	test_when_finished mv sparse-checkout repo/.git/info/ &&
+	cp repo/.git/info/sparse-checkout . &&
+	echo "!/deep/deeper/*/" >>repo/.git/info/sparse-checkout &&
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_grep "unrecognized negative pattern" err
 
-ok 335 - git cat-file --batch-check --follow-symlinks works for same-dir links-to-links
+warning: unrecognized negative pattern: '/deep/deeper/*'
+warning: unrecognized negative pattern: '/deep/deeper/*'
+ok 18 - cone mode: warn on bad pattern
 
-expecting success of 1006.336 'git cat-file --batch-check --follow-symlinks works for parent-dir links': 
-	echo HEAD:dir/parent-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual &&
-	echo notdir 29 >expect &&
-	echo HEAD:dir/parent-dir-link/nope >>expect &&
-	echo HEAD:dir/parent-dir-link/nope | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual
+expecting success of 1091.19 'sparse-checkout disable': 
+	test_when_finished rm -rf repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout disable &&
+	test_path_is_file repo/.git/info/sparse-checkout &&
+	git -C repo config --list >config &&
+	test_must_fail git config core.sparseCheckout &&
+	check_files repo a deep folder1 folder2
 
-ok 336 - git cat-file --batch-check --follow-symlinks works for parent-dir links
+ok 19 - sparse-checkout disable
 
-expecting success of 1006.337 'git cat-file --batch-check --follow-symlinks -Z works for parent-dir links': 
-	echo HEAD:dir/parent-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual &&
-	printf "notdir 29\0HEAD:dir/parent-dir-link/nope\0" >expect &&
-	printf "HEAD:dir/parent-dir-link/nope\0" >in &&
-	git cat-file --batch-check --follow-symlinks -Z <in >actual &&
-	test_cmp expect actual
+expecting success of 1091.20 'sparse-index enabled and disabled': 
+	git -C repo sparse-checkout init --cone --sparse-index &&
+	test_cmp_config -C repo true index.sparse &&
+	git -C repo ls-files --sparse >sparse &&
+	git -C repo sparse-checkout disable &&
+	git -C repo ls-files --sparse >full &&
 
-ok 337 - git cat-file --batch-check --follow-symlinks -Z works for parent-dir links
+	cat >expect <<-\EOF &&
+	@@ -1,4 +1,7 @@
+	 a
+	-deep/
+	-folder1/
+	-folder2/
+	+deep/a
+	+deep/deeper1/a
+	+deep/deeper1/deepest/a
+	+deep/deeper2/a
+	+folder1/a
+	+folder2/a
+	EOF
 
-expecting success of 1006.338 'git cat-file --batch-check --follow-symlinks works for .. links': 
-	echo dangling 22 >expect &&
-	echo HEAD:dir/link-dir/nope >>expect &&
-	echo HEAD:dir/link-dir/nope | git cat-file --batch-check --follow-symlinks >actual &&
+	diff -u sparse full | tail -n +3 >actual &&
 	test_cmp expect actual &&
-	echo HEAD:dir/link-dir/morx | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual &&
-	echo dangling 27 >expect &&
-	echo HEAD:dir/broken-link-in-dir >>expect &&
-	echo HEAD:dir/broken-link-in-dir | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual
 
-ok 338 - git cat-file --batch-check --follow-symlinks works for .. links
+	git -C repo config --list >config &&
+	test_cmp_config -C repo false index.sparse
 
-expecting success of 1006.339 'git cat-file --batch-check --follow-symlinks works for ../.. links': 
-	echo notdir 41 >expect &&
-	echo HEAD:dir/subdir/grandparent-dir-link/nope >>expect &&
-	echo HEAD:dir/subdir/grandparent-dir-link/nope | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo HEAD:dir/subdir/grandparent-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual &&
-	echo HEAD:dir/subdir/parent-dir-link-to-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual
+ok 20 - sparse-index enabled and disabled
 
-ok 339 - git cat-file --batch-check --follow-symlinks works for ../.. links
+expecting success of 1091.21 'cone mode: init and set': 
+	git -C repo sparse-checkout init --cone &&
+	git -C repo config --list >config &&
+	test_grep "core.sparsecheckoutcone=true" config &&
+	list_files repo >dir  &&
+	echo a >expect &&
+	test_cmp expect dir &&
+	git -C repo sparse-checkout set deep/deeper1/deepest/ 2>err &&
+	test_must_be_empty err &&
+	check_files repo a deep &&
+	check_files repo/deep a deeper1 &&
+	check_files repo/deep/deeper1 a deepest &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	!/deep/deeper1/*/
+	/deep/deeper1/deepest/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout set --stdin 2>err <<-\EOF &&
+	folder1
+	folder2
+	EOF
+	test_must_be_empty err &&
+	check_files repo a folder1 folder2
 
-expecting success of 1006.340 'git cat-file --batch-check --follow-symlinks works for dir/ links': 
-	echo dangling 17 >expect &&
-	echo HEAD:dirlink/morx >>expect &&
-	echo HEAD:dirlink/morx | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo $hello_oid blob $hello_size >expect &&
-	echo HEAD:dirlink/ind1 | git cat-file --batch-check --follow-symlinks >actual &&
+core.sparsecheckoutcone=true
+ok 21 - cone mode: init and set
+
+expecting success of 1091.22 'cone mode: list': 
+	cat >expect <<-\EOF &&
+	folder1
+	folder2
+	EOF
+	git -C repo sparse-checkout set --stdin <expect &&
+	git -C repo sparse-checkout list >actual 2>err &&
+	test_must_be_empty err &&
 	test_cmp expect actual
 
-ok 340 - git cat-file --batch-check --follow-symlinks works for dir/ links
+ok 22 - cone mode: list
 
-expecting success of 1006.341 'git cat-file --batch-check --follow-symlinks works for dir/subdir links': 
-	echo dangling 20 >expect &&
-	echo HEAD:subdirlink/morx >>expect &&
-	echo HEAD:subdirlink/morx | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo HEAD:subdirlink/ind2 | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual
+expecting success of 1091.23 'cone mode: set with nested folders': 
+	git -C repo sparse-checkout set deep deep/deeper1/deepest 2>err &&
+	test_line_count = 0 err &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	EOF
+	test_cmp repo/.git/info/sparse-checkout expect
 
-ok 341 - git cat-file --batch-check --follow-symlinks works for dir/subdir links
+ok 23 - cone mode: set with nested folders
 
-expecting success of 1006.342 'git cat-file --batch-check --follow-symlinks works for dir ->subdir links': 
-	echo notdir 27 >expect &&
-	echo HEAD:dir/link-to-child/morx >>expect &&
-	echo HEAD:dir/link-to-child/morx | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo HEAD:dir/link-to-child | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual &&
-	echo HEAD:link-to-down-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual
+expecting success of 1091.24 'cone mode: add independent path': 
+	git -C repo sparse-checkout set deep/deeper1 &&
+	git -C repo sparse-checkout add --end-of-options folder1 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	/folder1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep folder1
 
-ok 342 - git cat-file --batch-check --follow-symlinks works for dir ->subdir links
-
-expecting success of 1006.343 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks': 
-	echo symlink 8 >expect &&
-	echo ../fleem >>expect &&
-	echo HEAD:out-of-repo-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo symlink 2 >expect &&
-	echo .. >>expect &&
-	echo HEAD:out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual
-
-ok 343 - git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks
-
-expecting success of 1006.344 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in dirs': 
-	echo symlink 9 >expect &&
-	echo ../escape >>expect &&
-	echo HEAD:dir/out-of-repo-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo symlink 2 >expect &&
-	echo .. >>expect &&
-	echo HEAD:dir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual
-
-ok 344 - git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in dirs
-
-expecting success of 1006.345 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in subdirs': 
-	echo symlink 15 >expect &&
-	echo ../great-escape >>expect &&
-	echo HEAD:dir/subdir/out-of-repo-link | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo symlink 2 >expect &&
-	echo .. >>expect &&
-	echo HEAD:dir/subdir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo symlink 3 >expect &&
-	echo ../ >>expect &&
-	echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual
-
-ok 345 - git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in subdirs
-
-expecting success of 1006.346 'git cat-file --batch-check --follow-symlinks works for symlinks with internal ..': 
-	echo HEAD: | git cat-file --batch-check >expect &&
-	echo HEAD:up-down | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo HEAD:up-down-trailing | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo HEAD:up-down-file | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual &&
-	echo symlink 7 >expect &&
-	echo ../morx >>expect &&
-	echo HEAD:up-up-down-file | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual &&
-	echo HEAD:up-two-down-file | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp found actual
-
-ok 346 - git cat-file --batch-check --follow-symlinks works for symlinks with internal ..
-
-expecting success of 1006.347 'git cat-file --batch-check --follow-symlink breaks loops': 
-	echo loop 10 >expect &&
-	echo HEAD:loop1 >>expect &&
-	echo HEAD:loop1 | git cat-file --batch-check --follow-symlinks >actual &&
-	test_cmp expect actual
-
-ok 347 - git cat-file --batch-check --follow-symlink breaks loops
-
-expecting success of 1006.348 'git cat-file --batch-check --follow-symlink -Z breaks loops': 
-	printf "loop 10\0HEAD:loop1\0" >expect &&
-	printf "HEAD:loop1\0" >in &&
-	git cat-file --batch-check --follow-symlinks -Z <in >actual &&
-	test_cmp expect actual
-
-ok 348 - git cat-file --batch-check --follow-symlink -Z breaks loops
-
-expecting success of 1006.349 'git cat-file --batch --follow-symlink returns correct sha and mode': 
-	echo HEAD:morx | git cat-file --batch >expect &&
-	echo HEAD:morx | git cat-file --batch --follow-symlinks >actual &&
-	test_cmp expect actual
-
-ok 349 - git cat-file --batch --follow-symlink returns correct sha and mode
-
-expecting success of 1006.350 'cat-file --batch-all-objects shows all objects': 
-	# make new repos so we know the full set of objects; we will
-	# also make sure that there are some packed and some loose
-	# objects, some referenced and some not, some duplicates, and that
-	# there are some available only via alternates.
-	git init all-one &&
-	(
-		cd all-one &&
-		echo content >file &&
-		git add file &&
-		git commit -qm base &&
-		git rev-parse HEAD HEAD^{tree} HEAD:file &&
-		git repack -ad &&
-		echo not-cloned | git hash-object -w --stdin
-	) >expect.unsorted &&
-	git clone -s all-one all-two &&
-	(
-		cd all-two &&
-		echo local-unref | git hash-object -w --stdin
-	) >>expect.unsorted &&
-	git -C all-two rev-parse HEAD:file |
-		git -C all-two pack-objects .git/objects/pack/pack &&
-	sort <expect.unsorted >expect &&
-	git -C all-two cat-file --batch-all-objects \
-				--batch-check="%(objectname)" >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1006-cat-file/all-one/.git/
-Cloning into 'all-two'...
-done.
-2d40090ddd2c612f2679520aaab9f69d52e41628
-ok 350 - cat-file --batch-all-objects shows all objects
-
-expecting success of 1006.351 'cat-file --unordered works': 
-	git -C all-two cat-file --batch-all-objects --unordered \
-				--batch-check="%(objectname)" >actual.unsorted &&
-	sort <actual.unsorted >actual &&
-	test_cmp expect actual
-
-ok 351 - cat-file --unordered works
-
-expecting success of 1006.352 'set up object list for --batch-all-objects tests': 
-	git -C all-two cat-file --batch-all-objects --batch-check="%(objectname)" >objects
-
-ok 352 - set up object list for --batch-all-objects tests
-
-expecting success of 1006.353 'cat-file --batch="%(objectname)" with --batch-all-objects will work': 
-	git -C all-two cat-file --batch="%(objectname)" <objects >expect &&
-	git -C all-two cat-file --batch-all-objects --batch="%(objectname)" >actual &&
-	cmp expect actual
-
-ok 353 - cat-file --batch="%(objectname)" with --batch-all-objects will work
-
-expecting success of 1006.354 'cat-file --batch="%(rest)" with --batch-all-objects will work': 
-	git -C all-two cat-file --batch="%(rest)" <objects >expect &&
-	git -C all-two cat-file --batch-all-objects --batch="%(rest)" >actual &&
-	cmp expect actual
-
-ok 354 - cat-file --batch="%(rest)" with --batch-all-objects will work
-
-expecting success of 1006.355 'cat-file --batch="batman" with --batch-all-objects will work': 
-	git -C all-two cat-file --batch="batman" <objects >expect &&
-	git -C all-two cat-file --batch-all-objects --batch="batman" >actual &&
-	cmp expect actual
-
-ok 355 - cat-file --batch="batman" with --batch-all-objects will work
-
-expecting success of 1006.356 'cat-file %(objectsize:disk) with --batch-all-objects': 
-	# our state has both loose and packed objects,
-	# so find both for our expected output
-	{
-		find .git/objects/?? -type f |
-		awk -F/ "{ print \$0, \$3\$4 }" |
-		while read path oid
-		do
-			size=$(test_file_size "$path") &&
-			echo "$oid $size" ||
-			return 1
-		done &&
-		rawsz=$(test_oid rawsz) &&
-		find .git/objects/pack -name "*.idx" |
-		while read idx
-		do
-			git show-index <"$idx" >idx.raw &&
-			sort -nr <idx.raw >idx.sorted &&
-			packsz=$(test_file_size "${idx%.idx}.pack") &&
-			end=$((packsz - rawsz)) &&
-			while read start oid rest
-			do
-				size=$((end - start)) &&
-				end=$start &&
-				echo "$oid $size" ||
-				return 1
-			done <idx.sorted ||
-			return 1
-		done
-	} >expect.raw &&
-	sort <expect.raw >expect &&
-	git cat-file --batch-all-objects \
-		--batch-check="%(objectname) %(objectsize:disk)" >actual &&
-	test_cmp expect actual
-
-ok 356 - cat-file %(objectsize:disk) with --batch-all-objects
-
-expecting success of 1006.357 'set up replacement object': 
-	orig=$(git rev-parse HEAD) &&
-	git cat-file commit $orig >orig &&
-	{
-		cat orig &&
-		echo extra
-	} >fake &&
-	fake=$(git hash-object -t commit -w fake) &&
-	orig_size=$(git cat-file -s $orig) &&
-	fake_size=$(git cat-file -s $fake) &&
-	git replace $orig $fake
-
-ok 357 - set up replacement object
-
-expecting success of 1006.358 'cat-file --batch respects replace objects': 
-	git cat-file --batch >actual <<-EOF &&
-	$orig
-	EOF
-	{
-		echo "$orig commit $fake_size" &&
-		cat fake &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 358 - cat-file --batch respects replace objects
-
-expecting success of 1006.359 'cat-file --batch-check respects replace objects': 
-	git cat-file --batch-check >actual <<-EOF &&
-	$orig
-	EOF
-	echo "$orig commit $fake_size" >expect &&
-	test_cmp expect actual
-
-ok 359 - cat-file --batch-check respects replace objects
-
-expecting success of 1006.360 'cat-file --batch-all-objects --batch ignores replace': 
-	git cat-file --batch-all-objects --batch >actual.raw &&
-	extract_batch_output $orig <actual.raw >actual &&
-	{
-		echo "$orig commit $orig_size" &&
-		cat orig &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-
-ok 360 - cat-file --batch-all-objects --batch ignores replace
-
-expecting success of 1006.361 'cat-file --batch-all-objects --batch-check ignores replace': 
-	git cat-file --batch-all-objects --batch-check >actual.raw &&
-	grep ^$orig actual.raw >actual &&
-	echo "$orig commit $orig_size" >expect &&
-	test_cmp expect actual
-
-ok 361 - cat-file --batch-all-objects --batch-check ignores replace
-
-expecting success of 1006.362 'batch-command empty command': 
-	echo "" >cmd &&
-	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
-	grep "^fatal:.*empty command in input.*" err
-
-fatal: empty command in input
-ok 362 - batch-command empty command
-
-expecting success of 1006.363 'batch-command whitespace before command': 
-	echo " info deadbeef" >cmd &&
-	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
-	grep "^fatal:.*whitespace before command.*" err
-
-fatal: whitespace before command: ' info deadbeef'
-ok 363 - batch-command whitespace before command
-
-expecting success of 1006.364 'batch-command unknown command': 
-	echo unknown_command >cmd &&
-	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
-	grep "^fatal:.*unknown command.*" err
-
-fatal: unknown command: 'unknown_command'
-ok 364 - batch-command unknown command
-
-expecting success of 1006.365 'batch-command missing arguments': 
-	echo "info" >cmd &&
-	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
-	grep "^fatal:.*info requires arguments.*" err
-
-fatal: info requires arguments
-ok 365 - batch-command missing arguments
-
-expecting success of 1006.366 'batch-command flush with arguments': 
-	echo "flush arg" >cmd &&
-	test_expect_code 128 git cat-file --batch-command --buffer <cmd 2>err &&
-	grep "^fatal:.*flush takes no arguments.*" err
-
-fatal: flush takes no arguments
-ok 366 - batch-command flush with arguments
-
-expecting success of 1006.367 'batch-command flush without --buffer': 
-	echo "flush" >cmd &&
-	test_expect_code 128 git cat-file --batch-command <cmd 2>err &&
-	grep "^fatal:.*flush is only for --buffer mode.*" err
-
-fatal: flush is only for --buffer mode
-ok 367 - batch-command flush without --buffer
-
-# passed all 367 test(s)
-1..367
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1301-shared-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/.git/
-expecting success of 1301.1 'shared = 0400 (faulty permission u-w)': 
-	test_when_finished "rm -rf sub" &&
-	mkdir sub && (
-		cd sub &&
-		test_must_fail git init --shared=0400
-	)
-
-fatal: problem with core.sharedRepository filemode value (0400).
-The owner of files must always have read and write permissions.
-ok 1 - shared = 0400 (faulty permission u-w)
-
-expecting success of 1301.2 'shared=1 does not clear bits preset by umask 002': 
-		test_when_finished "rm -rf sub" &&
-		mkdir sub && (
-			cd sub &&
-			umask $u &&
-			git init --shared=1 &&
-			test 1 = "$(git config core.sharedrepository)"
-		) &&
-		actual=$(ls -l sub/.git/HEAD) &&
-		case "$actual" in
-		-rw-rw-r--*)
-			: happy
-			;;
-		*)
-			echo Oops, .git/HEAD is not 0664 but $actual
-			false
-			;;
-		esac
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/sub/.git/
-ok 2 - shared=1 does not clear bits preset by umask 002
-
-expecting success of 1301.3 'shared=1 does not clear bits preset by umask 022': 
-		test_when_finished "rm -rf sub" &&
-		mkdir sub && (
-			cd sub &&
-			umask $u &&
-			git init --shared=1 &&
-			test 1 = "$(git config core.sharedrepository)"
-		) &&
-		actual=$(ls -l sub/.git/HEAD) &&
-		case "$actual" in
-		-rw-rw-r--*)
-			: happy
-			;;
-		*)
-			echo Oops, .git/HEAD is not 0664 but $actual
-			false
-			;;
-		esac
-	
-Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/sub/.git/
-ok 3 - shared=1 does not clear bits preset by umask 022
-
-expecting success of 1301.4 'shared=all': 
-	git init --template= --shared=all &&
-	test 2 = $(git config core.sharedrepository)
-
-Reinitialized existing shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/.git/
-ok 4 - shared=all
-
-expecting success of 1301.5 'template cannot set core.bare': 
-	test_when_finished "rm -rf subdir" &&
-	test_when_finished "rm -rf templates" &&
-	test_config core.bare true &&
-	umask 0022 &&
-	mkdir -p templates/ &&
-	cp .git/config templates/config &&
-	git init --template=templates subdir &&
-	test_path_is_missing subdir/HEAD
-
-Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/subdir/.git/
-ok 5 - template cannot set core.bare
-
-expecting success of 1301.6 'update-server-info honors core.sharedRepository': 
-	: > a1 &&
-	git add a1 &&
-	test_tick &&
-	git commit -m a1 &&
-	mkdir .git/info &&
-	umask 0277 &&
-	git update-server-info &&
-	actual="$(ls -l .git/info/refs)" &&
-	case "$actual" in
-	-r--r--r--*)
-		: happy
-		;;
-	*)
-		echo Oops, .git/info/refs is not 0444
-		false
-		;;
-	esac
-
-[main (root-commit) a2bd363] a1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a1
-ok 6 - update-server-info honors core.sharedRepository
-
-expecting success of 1301.7 'shared = 0660 (r--r-----) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 7 - shared = 0660 (r--r-----) ro
-
-expecting success of 1301.8 'shared = 0660 (rw-rw----) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 8 - shared = 0660 (rw-rw----) rw
-
-expecting success of 1301.9 'shared = 0640 (r--r-----) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 9 - shared = 0640 (r--r-----) ro
-
-expecting success of 1301.10 'shared = 0640 (rw-r-----) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 10 - shared = 0640 (rw-r-----) rw
-
-expecting success of 1301.11 'shared = 0600 (r--------) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 11 - shared = 0600 (r--------) ro
-
-expecting success of 1301.12 'shared = 0600 (rw-------) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 12 - shared = 0600 (rw-------) rw
-
-expecting success of 1301.13 'shared = 0666 (r--r--r--) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 13 - shared = 0666 (r--r--r--) ro
-
-expecting success of 1301.14 'shared = 0666 (rw-rw-rw-) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 14 - shared = 0666 (rw-rw-rw-) rw
-
-expecting success of 1301.15 'shared = 0664 (r--r--r--) ro': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$y"
-
-	
-ok 15 - shared = 0664 (r--r--r--) ro
-
-expecting success of 1301.16 'shared = 0664 (rw-rw-r--) rw': 
-
-		rm -f .git/info/refs &&
-		git update-server-info &&
-		actual="$(test_modebits .git/info/refs)" &&
-		test "x$actual" = "x-$x"
-
-	
-ok 16 - shared = 0664 (rw-rw-r--) rw
-
-expecting success of 1301.17 'info/refs respects umask in unshared repo': 
-	rm -f .git/info/refs &&
-	test_unconfig core.sharedrepository &&
-	umask 002 &&
-	git update-server-info &&
-	echo "-rw-rw-r--" >expect &&
-	test_modebits .git/info/refs >actual &&
-	test_cmp expect actual
-
-ok 17 - info/refs respects umask in unshared repo
-
-expecting success of 1301.18 'forced modes': 
-	test_when_finished "rm -rf new" &&
-	mkdir -p templates/hooks &&
-	echo update-server-info >templates/hooks/post-update &&
-	chmod +x templates/hooks/post-update &&
-	echo : >random-file &&
-	mkdir new &&
-	(
-		cd new &&
-		umask 002 &&
-		git init --shared=0660 --template=../templates &&
-		test_path_is_file .git/hooks/post-update &&
-		>frotz &&
-		git add frotz &&
-		git commit -a -m initial &&
-		git repack
-	) &&
-	# List repository files meant to be protected; note that
-	# COMMIT_EDITMSG does not matter---0mode is not about a
-	# repository with a work tree.
-	find new/.git -type f -name COMMIT_EDITMSG -prune -o -print |
-	xargs ls -ld >actual &&
-
-	# Everything must be unaccessible to others
-	test -z "$(sed -e "/^.......---/d" actual)" &&
-
-	# All directories must have either 2770 or 770
-	test -z "$(sed -n -e "/^drwxrw[sx]---/d" -e "/^d/p" actual)" &&
-
-	# post-update hook must be 0770
-	test -z "$(sed -n -e "/post-update/{
-		/^-rwxrwx---/d
-		p
-	}" actual)" &&
-
-	# All files inside objects must be accessible by us
-	test -z "$(sed -n -e "/objects\//{
-		/^d/d
-		/^-r.-r.----/d
-		p
-	}" actual)"
-
-Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/new/.git/
-[main (root-commit) e4c5dc6] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 frotz
-ok 18 - forced modes
-
-expecting success of 1301.19 'remote init does not use config from cwd': 
-	test_when_finished "rm -rf child.git" &&
-	git config core.sharedrepository 0666 &&
-	umask 0022 &&
-	git init --bare child.git &&
-	echo "-rw-r--r--" >expect &&
-	test_modebits child.git/config >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/child.git/
-ok 19 - remote init does not use config from cwd
-
-expecting success of 1301.20 're-init respects core.sharedrepository (local)': 
-	git config core.sharedrepository 0666 &&
-	umask 0022 &&
-	echo whatever >templates/foo &&
-	git init --template=templates &&
-	echo "-rw-rw-rw-" >expect &&
-	test_modebits .git/foo >actual &&
-	test_cmp expect actual
-
-Reinitialized existing shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/.git/
-ok 20 - re-init respects core.sharedrepository (local)
-
-expecting success of 1301.21 're-init respects core.sharedrepository (remote)': 
-	test_when_finished "rm -rf child.git" &&
-	umask 0022 &&
-	git init --bare --shared=0666 child.git &&
-	test_path_is_missing child.git/foo &&
-	git init --bare --template=templates child.git &&
-	echo "-rw-rw-rw-" >expect &&
-	test_modebits child.git/foo >actual &&
-	test_cmp expect actual
-
-Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/child.git/
-Reinitialized existing shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/child.git/
-ok 21 - re-init respects core.sharedrepository (remote)
-
-expecting success of 1301.22 'template can set core.sharedrepository': 
-	test_when_finished "rm -rf child.git" &&
-	umask 0022 &&
-	git config core.sharedrepository 0666 &&
-	cp .git/config templates/config &&
-	git init --bare --template=templates child.git &&
-	echo "-rw-rw-rw-" >expect &&
-	test_modebits child.git/HEAD >actual &&
-	test_cmp expect actual
-
-Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/child.git/
-ok 22 - template can set core.sharedrepository
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1302-repo-version.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/.git/
-expecting success of 1302.1 'setup': 
-	cat >test.patch <<-\EOF &&
-	diff --git a/test.txt b/test.txt
-	new file mode 100644
-	--- /dev/null
-	+++ b/test.txt
-	@@ -0,0 +1 @@
-	+123
-	EOF
-
-	test_create_repo "test" &&
-	test_create_repo "test2" &&
-	git config --file=test2/.git/config core.repositoryformatversion 99
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/test/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/test2/.git/
-ok 1 - setup
-
-expecting success of 1302.2 'gitdir selection on normal repos': 
-	if test_have_prereq DEFAULT_REPO_FORMAT
-	then
-		echo 0
-	else
-		echo 1
-	fi >expect &&
-	git config core.repositoryformatversion >actual &&
-	git -C test config core.repositoryformatversion >actual2 &&
-	test_cmp expect actual &&
-	test_cmp expect actual2
-
-checking prerequisite: DEFAULT_REPO_FORMAT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
-	test_have_prereq SHA1,REFFILES
-
-)
-checking prerequisite: SHA1
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-	case "$GIT_DEFAULT_HASH" in
-	sha1) true ;;
-	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
-	*) false ;;
-	esac
-
-)
-prerequisite SHA1 ok
-prerequisite DEFAULT_REPO_FORMAT ok
-ok 2 - gitdir selection on normal repos
-
-expecting success of 1302.3 'gitdir selection on unsupported repo': 
-	# Make sure it would stop at test2, not trash
-	test_expect_code 1 git -C test2 config core.repositoryformatversion
-
-warning: Expected git repo version <= 1, found 99
-ok 3 - gitdir selection on unsupported repo
-
-expecting success of 1302.4 'gitdir not required mode': 
-	git apply --stat test.patch &&
-	git -C test apply --stat ../test.patch &&
-	git -C test2 apply --stat ../test.patch
-
- test.txt |    1 +
- 1 file changed, 1 insertion(+)
- test.txt |    1 +
- 1 file changed, 1 insertion(+)
-warning: Expected git repo version <= 1, found 99
-warning: ignoring git dir '.git': Expected git repo version <= 1, found 99
- test.txt |    1 +
- 1 file changed, 1 insertion(+)
-ok 4 - gitdir not required mode
-
-expecting success of 1302.5 'gitdir required mode': 
-	git apply --check --index test.patch &&
-	git -C test apply --check --index ../test.patch &&
-	test_must_fail git -C test2 apply --check --index ../test.patch
-
-warning: Expected git repo version <= 1, found 99
-warning: ignoring git dir '.git': Expected git repo version <= 1, found 99
-error: '--index' outside a repository
-ok 5 - gitdir required mode
-
-expecting success of 1302.6 'allow version=0 ': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 0  >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
-ok 6 - allow version=0 
-
-expecting success of 1302.7 'allow version=1 ': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 1  >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
-ok 7 - allow version=1 
-
-expecting success of 1302.8 'allow version=1 noop': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 1 noop >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
-ok 8 - allow version=1 noop
-
-expecting success of 1302.9 'abort version=1 no-such-extension': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 1 no-such-extension >.git/config &&
-			check_abort
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
-fatal: unknown repository extension found:
-	no-such-extension
-ok 9 - abort version=1 no-such-extension
-
-expecting success of 1302.10 'allow version=0 no-such-extension': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 0 no-such-extension >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
-ok 10 - allow version=0 no-such-extension
-
-expecting success of 1302.11 'allow version=0 noop': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 0 noop >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
-ok 11 - allow version=0 noop
-
-expecting success of 1302.12 'abort version=0 noop-v1': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 0 noop-v1 >.git/config &&
-			check_abort
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
-fatal: repo version is 0, but v1-only extension found:
-	noop-v1
-ok 12 - abort version=0 noop-v1
-
-expecting success of 1302.13 'allow version=1 noop-v1': 
-		test_when_finished 'rm -rf extensions' &&
-		git init extensions &&
-		(
-			cd extensions &&
-			mkconfig 1 noop-v1 >.git/config &&
-			check_allow
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
-ok 13 - allow version=1 noop-v1
-
-expecting success of 1302.14 'precious-objects allowed': 
-	git config core.repositoryFormatVersion 1 &&
-	git config extensions.preciousObjects 1 &&
-	check_allow
-
-ok 14 - precious-objects allowed
-
-expecting success of 1302.15 'precious-objects blocks destructive repack': 
-	test_must_fail git repack -ad
-
-fatal: cannot delete packs in a precious-objects repo
-ok 15 - precious-objects blocks destructive repack
-
-expecting success of 1302.16 'other repacks are OK': 
-	test_commit foo &&
-	git repack
-
-[master (root-commit) ddd63c9] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-ok 16 - other repacks are OK
-
-expecting success of 1302.17 'precious-objects blocks prune': 
-	test_must_fail git prune
-
-fatal: cannot prune in a precious-objects repo
-ok 17 - precious-objects blocks prune
-
-expecting success of 1302.18 'gc runs without complaint': 
-	git gc
-
-ok 18 - gc runs without complaint
-
-# passed all 18 test(s)
-1..18
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1091-sparse-checkout-builtin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/.git/
-expecting success of 1091.1 'setup': 
-	git init repo &&
-	(
-		cd repo &&
-		echo "initial" >a &&
-		mkdir folder1 folder2 deep &&
-		mkdir deep/deeper1 deep/deeper2 &&
-		mkdir deep/deeper1/deepest &&
-		cp a folder1 &&
-		cp a folder2 &&
-		cp a deep &&
-		cp a deep/deeper1 &&
-		cp a deep/deeper2 &&
-		cp a deep/deeper1/deepest &&
-		git add . &&
-		git commit -m "initial commit"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/repo/.git/
-[main (root-commit) ebf8b57] initial commit
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- create mode 100644 a
- create mode 100644 deep/a
- create mode 100644 deep/deeper1/a
- create mode 100644 deep/deeper1/deepest/a
- create mode 100644 deep/deeper2/a
- create mode 100644 folder1/a
- create mode 100644 folder2/a
-ok 1 - setup
-
-expecting success of 1091.2 'git sparse-checkout list (not sparse)': 
-	test_must_fail git -C repo sparse-checkout list >list 2>err &&
-	test_must_be_empty list &&
-	test_grep "this worktree is not sparse" err
-
-fatal: this worktree is not sparse
-ok 2 - git sparse-checkout list (not sparse)
-
-expecting success of 1091.3 'git sparse-checkout list (not sparse)': 
-	git -C repo sparse-checkout set &&
-	rm repo/.git/info/sparse-checkout &&
-	git -C repo sparse-checkout list >list 2>err &&
-	test_must_be_empty list &&
-	test_grep "this worktree is not sparse (sparse-checkout file may not exist)" err
-
-warning: this worktree is not sparse (sparse-checkout file may not exist)
-ok 3 - git sparse-checkout list (not sparse)
-
-expecting success of 1091.4 'git sparse-checkout list (populated)': 
-	test_when_finished rm -f repo/.git/info/sparse-checkout &&
-	cat >repo/.git/info/sparse-checkout <<-\EOF &&
-	/folder1/*
-	/deep/
-	**/a
-	!*bin*
-	EOF
-	cp repo/.git/info/sparse-checkout expect &&
-	git -C repo sparse-checkout list >list &&
-	test_cmp expect list
-
-warning: unrecognized pattern: '/folder1/*'
-warning: disabling cone pattern matching
-ok 4 - git sparse-checkout list (populated)
-
-expecting success of 1091.5 'git sparse-checkout init': 
-	git -C repo sparse-checkout init --no-cone &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	test_cmp_config -C repo true core.sparsecheckout &&
-	check_files repo a
-
-ok 5 - git sparse-checkout init
-
-expecting success of 1091.6 'git sparse-checkout init in empty repo': 
-	test_when_finished rm -rf empty-repo blank-template &&
-	git init --template= empty-repo &&
-	git -C empty-repo sparse-checkout init
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/empty-repo/.git/
-ok 6 - git sparse-checkout init in empty repo
-
-expecting success of 1091.7 'git sparse-checkout list after init': 
-	git -C repo sparse-checkout list >actual &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	EOF
-	test_cmp expect actual
-
-ok 7 - git sparse-checkout list after init
-
-expecting success of 1091.8 'init with existing sparse-checkout': 
-	echo "*folder*" >> repo/.git/info/sparse-checkout &&
-	git -C repo sparse-checkout init &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	*folder*
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a folder1 folder2
-
-ok 8 - init with existing sparse-checkout
-
-expecting success of 1091.9 'clone --sparse': 
-	git clone --sparse "file://$(pwd)/repo" clone &&
-	git -C clone sparse-checkout reapply --no-cone &&
-	git -C clone sparse-checkout list >actual &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	EOF
-	test_cmp expect actual &&
-	check_files clone a
-
-Cloning into 'clone'...
-ok 9 - clone --sparse
-
-expecting success of 1091.10 'switching to cone mode with non-cone mode patterns': 
-	git init bad-patterns &&
-	(
-		cd bad-patterns &&
-		git sparse-checkout init --no-cone &&
-		git sparse-checkout add dir &&
-		git config --worktree core.sparseCheckoutCone true &&
-		test_must_fail git sparse-checkout add dir 2>err &&
-		grep "existing sparse-checkout patterns do not use cone mode" err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/bad-patterns/.git/
-fatal: existing sparse-checkout patterns do not use cone mode
-ok 10 - switching to cone mode with non-cone mode patterns
-
-expecting success of 1091.11 'interaction with clone --no-checkout (unborn index)': 
-	git clone --no-checkout "file://$(pwd)/repo" clone_no_checkout &&
-	git -C clone_no_checkout sparse-checkout init --cone &&
-	git -C clone_no_checkout sparse-checkout set folder1 &&
-
-	git -C clone_no_checkout sparse-checkout list >actual &&
-	cat >expect <<-\EOF &&
-	folder1
-	EOF
-	test_cmp expect actual &&
-
-	# nothing checked out, expect "No such file or directory"
-	! ls clone_no_checkout/* >actual &&
-	test_must_be_empty actual &&
-	test_path_is_missing clone_no_checkout/.git/index &&
-
-	# No branch is checked out until we manually switch to one
-	git -C clone_no_checkout switch main &&
-	test_path_is_file clone_no_checkout/.git/index &&
-	check_files clone_no_checkout a folder1
-
-Cloning into 'clone_no_checkout'...
-ls: cannot access 'clone_no_checkout/*': No such file or directory
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-ok 11 - interaction with clone --no-checkout (unborn index)
-
-expecting success of 1091.12 'set enables config': 
-	git init worktree-config &&
-	(
-		cd worktree-config &&
-		test_commit test file &&
-		test_path_is_missing .git/config.worktree &&
-		git sparse-checkout set nothing &&
-		test_path_is_file .git/config.worktree &&
-		test_cmp_config true core.sparseCheckout
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1091-sparse-checkout-builtin/worktree-config/.git/
-[main (root-commit) 236e830] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 12 - set enables config
-
-expecting success of 1091.13 'set sparse-checkout using builtin': 
-	git -C repo sparse-checkout set "/*" "!/*/" "*folder*" &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	*folder*
-	EOF
-	git -C repo sparse-checkout list >actual &&
-	test_cmp expect actual &&
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a folder1 folder2
-
-ok 13 - set sparse-checkout using builtin
-
-expecting success of 1091.14 'set sparse-checkout using --stdin': 
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/folder1/
-	/folder2/
-	EOF
-	git -C repo sparse-checkout set --stdin <expect &&
-	git -C repo sparse-checkout list >actual &&
-	test_cmp expect actual &&
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo "a folder1 folder2"
-
-ok 14 - set sparse-checkout using --stdin
-
-expecting success of 1091.15 'add to sparse-checkout': 
-	cat repo/.git/info/sparse-checkout >old &&
-	test_when_finished cp old repo/.git/info/sparse-checkout &&
-	cat >add <<-\EOF &&
-	pattern1
-	/folder1/
-	pattern2
-	EOF
-	cat old >expect &&
-	cat add >>expect &&
-	git -C repo sparse-checkout add --stdin <add &&
-	git -C repo sparse-checkout list >actual &&
-	test_cmp expect actual &&
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo "a folder1 folder2"
-
-ok 15 - add to sparse-checkout
-
-expecting success of 1091.16 'worktree: add copies sparse-checkout patterns': 
-	cat repo/.git/info/sparse-checkout >old &&
-	test_when_finished cp old repo/.git/info/sparse-checkout &&
-	test_when_finished git -C repo worktree remove ../worktree &&
-	git -C repo sparse-checkout set --no-cone "/*" &&
-	git -C repo worktree add --quiet ../worktree 2>err &&
-	test_must_be_empty err &&
-	new="$(git -C worktree rev-parse --git-path info/sparse-checkout)" &&
-	test_path_is_file "$new" &&
-	test_cmp repo/.git/info/sparse-checkout "$new" &&
-	git -C worktree sparse-checkout set --cone &&
-	test_cmp_config -C worktree true core.sparseCheckoutCone &&
-	test_must_fail git -C repo core.sparseCheckoutCone
-
-git: 'core.sparseCheckoutCone' is not a git command. See 'git --help'.
-ok 16 - worktree: add copies sparse-checkout patterns
-
-expecting success of 1091.17 'cone mode: match patterns': 
-	git -C repo config --worktree core.sparseCheckoutCone true &&
-	rm -rf repo/a repo/folder1 repo/folder2 &&
-	git -C repo read-tree -mu HEAD 2>err &&
-	test_grep ! "disabling cone patterns" err &&
-	git -C repo reset --hard &&
-	check_files repo a folder1 folder2
-
-HEAD is now at ebf8b57 initial commit
-ok 17 - cone mode: match patterns
-
-expecting success of 1091.18 'cone mode: warn on bad pattern': 
-	test_when_finished mv sparse-checkout repo/.git/info/ &&
-	cp repo/.git/info/sparse-checkout . &&
-	echo "!/deep/deeper/*/" >>repo/.git/info/sparse-checkout &&
-	git -C repo read-tree -mu HEAD 2>err &&
-	test_grep "unrecognized negative pattern" err
-
-warning: unrecognized negative pattern: '/deep/deeper/*'
-warning: unrecognized negative pattern: '/deep/deeper/*'
-ok 18 - cone mode: warn on bad pattern
-
-expecting success of 1091.19 'sparse-checkout disable': 
-	test_when_finished rm -rf repo/.git/info/sparse-checkout &&
-	git -C repo sparse-checkout disable &&
-	test_path_is_file repo/.git/info/sparse-checkout &&
-	git -C repo config --list >config &&
-	test_must_fail git config core.sparseCheckout &&
-	check_files repo a deep folder1 folder2
-
-ok 19 - sparse-checkout disable
-
-expecting success of 1091.20 'sparse-index enabled and disabled': 
-	git -C repo sparse-checkout init --cone --sparse-index &&
-	test_cmp_config -C repo true index.sparse &&
-	git -C repo ls-files --sparse >sparse &&
-	git -C repo sparse-checkout disable &&
-	git -C repo ls-files --sparse >full &&
-
-	cat >expect <<-\EOF &&
-	@@ -1,4 +1,7 @@
-	 a
-	-deep/
-	-folder1/
-	-folder2/
-	+deep/a
-	+deep/deeper1/a
-	+deep/deeper1/deepest/a
-	+deep/deeper2/a
-	+folder1/a
-	+folder2/a
-	EOF
-
-	diff -u sparse full | tail -n +3 >actual &&
-	test_cmp expect actual &&
-
-	git -C repo config --list >config &&
-	test_cmp_config -C repo false index.sparse
-
-ok 20 - sparse-index enabled and disabled
-
-expecting success of 1091.21 'cone mode: init and set': 
-	git -C repo sparse-checkout init --cone &&
-	git -C repo config --list >config &&
-	test_grep "core.sparsecheckoutcone=true" config &&
-	list_files repo >dir  &&
-	echo a >expect &&
-	test_cmp expect dir &&
-	git -C repo sparse-checkout set deep/deeper1/deepest/ 2>err &&
-	test_must_be_empty err &&
-	check_files repo a deep &&
-	check_files repo/deep a deeper1 &&
-	check_files repo/deep/deeper1 a deepest &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/deep/
-	!/deep/*/
-	/deep/deeper1/
-	!/deep/deeper1/*/
-	/deep/deeper1/deepest/
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	git -C repo sparse-checkout set --stdin 2>err <<-\EOF &&
-	folder1
-	folder2
-	EOF
-	test_must_be_empty err &&
-	check_files repo a folder1 folder2
-
-core.sparsecheckoutcone=true
-ok 21 - cone mode: init and set
-
-expecting success of 1091.22 'cone mode: list': 
-	cat >expect <<-\EOF &&
-	folder1
-	folder2
-	EOF
-	git -C repo sparse-checkout set --stdin <expect &&
-	git -C repo sparse-checkout list >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp expect actual
-
-ok 22 - cone mode: list
-
-expecting success of 1091.23 'cone mode: set with nested folders': 
-	git -C repo sparse-checkout set deep deep/deeper1/deepest 2>err &&
-	test_line_count = 0 err &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/deep/
-	EOF
-	test_cmp repo/.git/info/sparse-checkout expect
-
-ok 23 - cone mode: set with nested folders
-
-expecting success of 1091.24 'cone mode: add independent path': 
-	git -C repo sparse-checkout set deep/deeper1 &&
-	git -C repo sparse-checkout add --end-of-options folder1 &&
-	cat >expect <<-\EOF &&
-	/*
-	!/*/
-	/deep/
-	!/deep/*/
-	/deep/deeper1/
-	/folder1/
-	EOF
-	test_cmp expect repo/.git/info/sparse-checkout &&
-	check_files repo a deep folder1
-
-ok 24 - cone mode: add independent path
+ok 24 - cone mode: add independent path
 
 expecting success of 1091.25 'cone mode: add sibling path': 
 	git -C repo sparse-checkout set deep/deeper1 &&
@@ -60720,7 +59574,6 @@
 	check_files repo/deep/deeper1 a
 
 warning: disabling cone pattern matching
-warning: disabling cone pattern matching
 ok 47 - pattern-checks: non directory pattern
 
 expecting success of 1091.48 'pattern-checks: contained glob characters': 
@@ -60739,6 +59592,9 @@
 warning: disabling cone pattern matching
 warning: disabling cone pattern matching
 warning: disabling cone pattern matching
+warning: disabling cone pattern matching
+warning: disabling cone pattern matching
+warning: disabling cone pattern matching
 ok 48 - pattern-checks: contained glob characters
 
 expecting success of 1091.49 'pattern-checks: escaped characters': 
@@ -61143,28 +59999,547 @@
 1..72
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1304-default-acl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1304-default-acl/.git/
-expecting success of 1304.1 'checking for a working acl setup': 
-	if setfacl -m d:m:rwx -m u:root:rwx . &&
-	   getfacl . | grep user:root:rwx &&
-	   touch should-have-readable-acl &&
-	   getfacl should-have-readable-acl | grep -E "mask::?rw-"
+*** t1301-shared-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/.git/
+expecting success of 1301.1 'shared = 0400 (faulty permission u-w)': 
+	test_when_finished "rm -rf sub" &&
+	mkdir sub && (
+		cd sub &&
+		test_must_fail git init --shared=0400
+	)
+
+fatal: problem with core.sharedRepository filemode value (0400).
+The owner of files must always have read and write permissions.
+ok 1 - shared = 0400 (faulty permission u-w)
+
+expecting success of 1301.2 'shared=1 does not clear bits preset by umask 002': 
+		test_when_finished "rm -rf sub" &&
+		mkdir sub && (
+			cd sub &&
+			umask $u &&
+			git init --shared=1 &&
+			test 1 = "$(git config core.sharedrepository)"
+		) &&
+		actual=$(ls -l sub/.git/HEAD) &&
+		case "$actual" in
+		-rw-rw-r--*)
+			: happy
+			;;
+		*)
+			echo Oops, .git/HEAD is not 0664 but $actual
+			false
+			;;
+		esac
+	
+Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/sub/.git/
+ok 2 - shared=1 does not clear bits preset by umask 002
+
+expecting success of 1301.3 'shared=1 does not clear bits preset by umask 022': 
+		test_when_finished "rm -rf sub" &&
+		mkdir sub && (
+			cd sub &&
+			umask $u &&
+			git init --shared=1 &&
+			test 1 = "$(git config core.sharedrepository)"
+		) &&
+		actual=$(ls -l sub/.git/HEAD) &&
+		case "$actual" in
+		-rw-rw-r--*)
+			: happy
+			;;
+		*)
+			echo Oops, .git/HEAD is not 0664 but $actual
+			false
+			;;
+		esac
+	
+Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/sub/.git/
+ok 3 - shared=1 does not clear bits preset by umask 022
+
+expecting success of 1301.4 'shared=all': 
+	git init --template= --shared=all &&
+	test 2 = $(git config core.sharedrepository)
+
+Reinitialized existing shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/.git/
+ok 4 - shared=all
+
+expecting success of 1301.5 'template cannot set core.bare': 
+	test_when_finished "rm -rf subdir" &&
+	test_when_finished "rm -rf templates" &&
+	test_config core.bare true &&
+	umask 0022 &&
+	mkdir -p templates/ &&
+	cp .git/config templates/config &&
+	git init --template=templates subdir &&
+	test_path_is_missing subdir/HEAD
+
+Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/subdir/.git/
+ok 5 - template cannot set core.bare
+
+expecting success of 1301.6 'update-server-info honors core.sharedRepository': 
+	: > a1 &&
+	git add a1 &&
+	test_tick &&
+	git commit -m a1 &&
+	mkdir .git/info &&
+	umask 0277 &&
+	git update-server-info &&
+	actual="$(ls -l .git/info/refs)" &&
+	case "$actual" in
+	-r--r--r--*)
+		: happy
+		;;
+	*)
+		echo Oops, .git/info/refs is not 0444
+		false
+		;;
+	esac
+
+[main (root-commit) a2bd363] a1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a1
+ok 6 - update-server-info honors core.sharedRepository
+
+expecting success of 1301.7 'shared = 0660 (r--r-----) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 7 - shared = 0660 (r--r-----) ro
+
+expecting success of 1301.8 'shared = 0660 (rw-rw----) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 8 - shared = 0660 (rw-rw----) rw
+
+expecting success of 1301.9 'shared = 0640 (r--r-----) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 9 - shared = 0640 (r--r-----) ro
+
+expecting success of 1301.10 'shared = 0640 (rw-r-----) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 10 - shared = 0640 (rw-r-----) rw
+
+expecting success of 1301.11 'shared = 0600 (r--------) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 11 - shared = 0600 (r--------) ro
+
+expecting success of 1301.12 'shared = 0600 (rw-------) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 12 - shared = 0600 (rw-------) rw
+
+expecting success of 1301.13 'shared = 0666 (r--r--r--) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 13 - shared = 0666 (r--r--r--) ro
+
+expecting success of 1301.14 'shared = 0666 (rw-rw-rw-) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 14 - shared = 0666 (rw-rw-rw-) rw
+
+expecting success of 1301.15 'shared = 0664 (r--r--r--) ro': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$y"
+
+	
+ok 15 - shared = 0664 (r--r--r--) ro
+
+expecting success of 1301.16 'shared = 0664 (rw-rw-r--) rw': 
+
+		rm -f .git/info/refs &&
+		git update-server-info &&
+		actual="$(test_modebits .git/info/refs)" &&
+		test "x$actual" = "x-$x"
+
+	
+ok 16 - shared = 0664 (rw-rw-r--) rw
+
+expecting success of 1301.17 'info/refs respects umask in unshared repo': 
+	rm -f .git/info/refs &&
+	test_unconfig core.sharedrepository &&
+	umask 002 &&
+	git update-server-info &&
+	echo "-rw-rw-r--" >expect &&
+	test_modebits .git/info/refs >actual &&
+	test_cmp expect actual
+
+ok 17 - info/refs respects umask in unshared repo
+
+expecting success of 1301.18 'forced modes': 
+	test_when_finished "rm -rf new" &&
+	mkdir -p templates/hooks &&
+	echo update-server-info >templates/hooks/post-update &&
+	chmod +x templates/hooks/post-update &&
+	echo : >random-file &&
+	mkdir new &&
+	(
+		cd new &&
+		umask 002 &&
+		git init --shared=0660 --template=../templates &&
+		test_path_is_file .git/hooks/post-update &&
+		>frotz &&
+		git add frotz &&
+		git commit -a -m initial &&
+		git repack
+	) &&
+	# List repository files meant to be protected; note that
+	# COMMIT_EDITMSG does not matter---0mode is not about a
+	# repository with a work tree.
+	find new/.git -type f -name COMMIT_EDITMSG -prune -o -print |
+	xargs ls -ld >actual &&
+
+	# Everything must be unaccessible to others
+	test -z "$(sed -e "/^.......---/d" actual)" &&
+
+	# All directories must have either 2770 or 770
+	test -z "$(sed -n -e "/^drwxrw[sx]---/d" -e "/^d/p" actual)" &&
+
+	# post-update hook must be 0770
+	test -z "$(sed -n -e "/post-update/{
+		/^-rwxrwx---/d
+		p
+	}" actual)" &&
+
+	# All files inside objects must be accessible by us
+	test -z "$(sed -n -e "/objects\//{
+		/^d/d
+		/^-r.-r.----/d
+		p
+	}" actual)"
+
+Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/new/.git/
+[main (root-commit) e4c5dc6] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 frotz
+ok 18 - forced modes
+
+expecting success of 1301.19 'remote init does not use config from cwd': 
+	test_when_finished "rm -rf child.git" &&
+	git config core.sharedrepository 0666 &&
+	umask 0022 &&
+	git init --bare child.git &&
+	echo "-rw-r--r--" >expect &&
+	test_modebits child.git/config >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/child.git/
+ok 19 - remote init does not use config from cwd
+
+expecting success of 1301.20 're-init respects core.sharedrepository (local)': 
+	git config core.sharedrepository 0666 &&
+	umask 0022 &&
+	echo whatever >templates/foo &&
+	git init --template=templates &&
+	echo "-rw-rw-rw-" >expect &&
+	test_modebits .git/foo >actual &&
+	test_cmp expect actual
+
+Reinitialized existing shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/.git/
+ok 20 - re-init respects core.sharedrepository (local)
+
+expecting success of 1301.21 're-init respects core.sharedrepository (remote)': 
+	test_when_finished "rm -rf child.git" &&
+	umask 0022 &&
+	git init --bare --shared=0666 child.git &&
+	test_path_is_missing child.git/foo &&
+	git init --bare --template=templates child.git &&
+	echo "-rw-rw-rw-" >expect &&
+	test_modebits child.git/foo >actual &&
+	test_cmp expect actual
+
+Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/child.git/
+Reinitialized existing shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/child.git/
+ok 21 - re-init respects core.sharedrepository (remote)
+
+expecting success of 1301.22 'template can set core.sharedrepository': 
+	test_when_finished "rm -rf child.git" &&
+	umask 0022 &&
+	git config core.sharedrepository 0666 &&
+	cp .git/config templates/config &&
+	git init --bare --template=templates child.git &&
+	echo "-rw-rw-rw-" >expect &&
+	test_modebits child.git/HEAD >actual &&
+	test_cmp expect actual
+
+Initialized empty shared Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1301-shared-repo/child.git/
+ok 22 - template can set core.sharedrepository
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1302-repo-version.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/.git/
+expecting success of 1302.1 'setup': 
+	cat >test.patch <<-\EOF &&
+	diff --git a/test.txt b/test.txt
+	new file mode 100644
+	--- /dev/null
+	+++ b/test.txt
+	@@ -0,0 +1 @@
+	+123
+	EOF
+
+	test_create_repo "test" &&
+	test_create_repo "test2" &&
+	git config --file=test2/.git/config core.repositoryformatversion 99
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/test/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/test2/.git/
+ok 1 - setup
+
+expecting success of 1302.2 'gitdir selection on normal repos': 
+	if test_have_prereq DEFAULT_REPO_FORMAT
 	then
-		test_set_prereq SETFACL
-	fi
+		echo 0
+	else
+		echo 1
+	fi >expect &&
+	git config core.repositoryformatversion >actual &&
+	git -C test config core.repositoryformatversion >actual2 &&
+	test_cmp expect actual &&
+	test_cmp expect actual2
 
-t1304-default-acl.sh: 4: eval: setfacl: not found
-ok 1 - checking for a working acl setup
+checking prerequisite: DEFAULT_REPO_FORMAT
 
-ok 2 # skip Setup test repo (missing SETFACL)
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-DEFAULT_REPO_FORMAT" &&
+	test_have_prereq SHA1,REFFILES
 
-ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
+)
+checking prerequisite: SHA1
 
-ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
+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 4 test(s)
-1..4
+)
+prerequisite SHA1 ok
+prerequisite DEFAULT_REPO_FORMAT ok
+ok 2 - gitdir selection on normal repos
+
+expecting success of 1302.3 'gitdir selection on unsupported repo': 
+	# Make sure it would stop at test2, not trash
+	test_expect_code 1 git -C test2 config core.repositoryformatversion
+
+warning: Expected git repo version <= 1, found 99
+ok 3 - gitdir selection on unsupported repo
+
+expecting success of 1302.4 'gitdir not required mode': 
+	git apply --stat test.patch &&
+	git -C test apply --stat ../test.patch &&
+	git -C test2 apply --stat ../test.patch
+
+ test.txt |    1 +
+ 1 file changed, 1 insertion(+)
+ test.txt |    1 +
+ 1 file changed, 1 insertion(+)
+warning: Expected git repo version <= 1, found 99
+warning: ignoring git dir '.git': Expected git repo version <= 1, found 99
+ test.txt |    1 +
+ 1 file changed, 1 insertion(+)
+ok 4 - gitdir not required mode
+
+expecting success of 1302.5 'gitdir required mode': 
+	git apply --check --index test.patch &&
+	git -C test apply --check --index ../test.patch &&
+	test_must_fail git -C test2 apply --check --index ../test.patch
+
+warning: Expected git repo version <= 1, found 99
+warning: ignoring git dir '.git': Expected git repo version <= 1, found 99
+error: '--index' outside a repository
+ok 5 - gitdir required mode
+
+expecting success of 1302.6 'allow version=0 ': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 0  >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
+ok 6 - allow version=0 
+
+expecting success of 1302.7 'allow version=1 ': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 1  >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
+ok 7 - allow version=1 
+
+expecting success of 1302.8 'allow version=1 noop': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 1 noop >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
+ok 8 - allow version=1 noop
+
+expecting success of 1302.9 'abort version=1 no-such-extension': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 1 no-such-extension >.git/config &&
+			check_abort
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
+fatal: unknown repository extension found:
+	no-such-extension
+ok 9 - abort version=1 no-such-extension
+
+expecting success of 1302.10 'allow version=0 no-such-extension': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 0 no-such-extension >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
+ok 10 - allow version=0 no-such-extension
+
+expecting success of 1302.11 'allow version=0 noop': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 0 noop >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
+ok 11 - allow version=0 noop
+
+expecting success of 1302.12 'abort version=0 noop-v1': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 0 noop-v1 >.git/config &&
+			check_abort
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
+fatal: repo version is 0, but v1-only extension found:
+	noop-v1
+ok 12 - abort version=0 noop-v1
+
+expecting success of 1302.13 'allow version=1 noop-v1': 
+		test_when_finished 'rm -rf extensions' &&
+		git init extensions &&
+		(
+			cd extensions &&
+			mkconfig 1 noop-v1 >.git/config &&
+			check_allow
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1302-repo-version/extensions/.git/
+ok 13 - allow version=1 noop-v1
+
+expecting success of 1302.14 'precious-objects allowed': 
+	git config core.repositoryFormatVersion 1 &&
+	git config extensions.preciousObjects 1 &&
+	check_allow
+
+ok 14 - precious-objects allowed
+
+expecting success of 1302.15 'precious-objects blocks destructive repack': 
+	test_must_fail git repack -ad
+
+fatal: cannot delete packs in a precious-objects repo
+ok 15 - precious-objects blocks destructive repack
+
+expecting success of 1302.16 'other repacks are OK': 
+	test_commit foo &&
+	git repack
+
+[master (root-commit) ddd63c9] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+ok 16 - other repacks are OK
+
+expecting success of 1302.17 'precious-objects blocks prune': 
+	test_must_fail git prune
+
+fatal: cannot prune in a precious-objects repo
+ok 17 - precious-objects blocks prune
+
+expecting success of 1302.18 'gc runs without complaint': 
+	git gc
+
+ok 18 - gc runs without complaint
+
+# passed all 18 test(s)
+1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1303-wacky-config.sh ***
@@ -61267,379 +60642,28 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1306-xdg-files.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1306-xdg-files/.git/
-expecting success of 1306.1 'read config: xdg file exists and ~/.gitconfig doesn't': 
-	mkdir -p .config/git &&
-	echo "[alias]" >.config/git/config &&
-	echo "	myalias = !echo in_config" >>.config/git/config &&
-	echo in_config >expected &&
-	git myalias >actual &&
-	test_cmp expected actual
-
-ok 1 - read config: xdg file exists and ~/.gitconfig doesn't
-
-expecting success of 1306.2 'read config: xdg file exists and ~/.gitconfig exists': 
-	>.gitconfig &&
-	echo "[alias]" >.gitconfig &&
-	echo "	myalias = !echo in_gitconfig" >>.gitconfig &&
-	echo in_gitconfig >expected &&
-	git myalias >actual &&
-	test_cmp expected actual
-
-ok 2 - read config: xdg file exists and ~/.gitconfig exists
-
-expecting success of 1306.3 'read with --get: xdg file exists and ~/.gitconfig doesn't': 
-	rm .gitconfig &&
-	echo "[user]" >.config/git/config &&
-	echo "	name = read_config" >>.config/git/config &&
-	echo read_config >expected &&
-	git config --get user.name >actual &&
-	test_cmp expected actual
-
-ok 3 - read with --get: xdg file exists and ~/.gitconfig doesn't
-
-expecting success of 1306.4 '"$XDG_CONFIG_HOME overrides $HOME/.config/git': 
-	mkdir -p "$HOME"/xdg/git &&
-	echo "[user]name = in_xdg" >"$HOME"/xdg/git/config &&
-	echo in_xdg >expected &&
-	XDG_CONFIG_HOME="$HOME"/xdg git config --get-all user.name >actual &&
-	test_cmp expected actual
-
-ok 4 - "$XDG_CONFIG_HOME overrides $HOME/.config/git
-
-expecting success of 1306.5 'read with --get: xdg file exists and ~/.gitconfig exists': 
-	>.gitconfig &&
-	echo "[user]" >.gitconfig &&
-	echo "	name = read_gitconfig" >>.gitconfig &&
-	echo read_gitconfig >expected &&
-	git config --get user.name >actual &&
-	test_cmp expected actual
-
-ok 5 - read with --get: xdg file exists and ~/.gitconfig exists
-
-expecting success of 1306.6 'read with --list: xdg file exists and ~/.gitconfig doesn't': 
-	rm .gitconfig &&
-	echo user.name=read_config >expected &&
-	git config --global --list >actual &&
-	test_cmp expected actual
-
-ok 6 - read with --list: xdg file exists and ~/.gitconfig doesn't
-
-expecting success of 1306.7 'read with --list: xdg file exists and ~/.gitconfig exists': 
-	>.gitconfig &&
-	echo "[user]" >.gitconfig &&
-	echo "	name = read_gitconfig" >>.gitconfig &&
-	echo user.name=read_gitconfig >expected &&
-	git config --global --list >actual &&
-	test_cmp expected actual
-
-ok 7 - read with --list: xdg file exists and ~/.gitconfig exists
-
-expecting success of 1306.8 'Setup': 
-	git init git &&
-	cd git &&
-	echo foo >to_be_excluded
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1306-xdg-files/git/.git/
-ok 8 - Setup
-
-expecting success of 1306.9 'Exclusion of a file in the XDG ignore file': 
-	mkdir -p "$HOME"/.config/git/ &&
-	echo to_be_excluded >"$HOME"/.config/git/ignore &&
-	test_must_fail git add to_be_excluded
-
-The following paths are ignored by one of your .gitignore files:
-to_be_excluded
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 9 - Exclusion of a file in the XDG ignore file
-
-expecting success of 1306.10 '$XDG_CONFIG_HOME overrides $HOME/.config/git/ignore': 
-	mkdir -p "$HOME"/xdg/git &&
-	echo content >excluded_by_xdg_only &&
-	echo excluded_by_xdg_only >"$HOME"/xdg/git/ignore &&
-	test_when_finished "git read-tree --empty" &&
-	(XDG_CONFIG_HOME="$HOME/xdg" &&
-	 export XDG_CONFIG_HOME &&
-	 git add to_be_excluded &&
-	 test_must_fail git add excluded_by_xdg_only
-	)
-
-The following paths are ignored by one of your .gitignore files:
-excluded_by_xdg_only
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 10 - $XDG_CONFIG_HOME overrides $HOME/.config/git/ignore
-
-expecting success of 1306.11 'Exclusion in both XDG and local ignore files': 
-	echo to_be_excluded >.gitignore &&
-	test_must_fail git add to_be_excluded
-
-The following paths are ignored by one of your .gitignore files:
-to_be_excluded
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 11 - Exclusion in both XDG and local ignore files
-
-expecting success of 1306.12 'Exclusion in a non-XDG global ignore file': 
-	rm .gitignore &&
-	echo >"$HOME"/.config/git/ignore &&
-	echo to_be_excluded >"$HOME"/my_gitignore &&
-	git config core.excludesfile "$HOME"/my_gitignore &&
-	test_must_fail git add to_be_excluded
-
-The following paths are ignored by one of your .gitignore files:
-to_be_excluded
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 12 - Exclusion in a non-XDG global ignore file
-
-expecting success of 1306.13 'Checking XDG ignore file when HOME is unset': 
-	(sane_unset HOME &&
-	 git config --unset core.excludesfile &&
-	 git ls-files --exclude-standard --ignored --others >actual) &&
-	test_must_be_empty actual
-
-ok 13 - Checking XDG ignore file when HOME is unset
-
-expecting success of 1306.14 'Checking attributes in the XDG attributes file': 
-	echo foo >f &&
-	git check-attr -a f >actual &&
-	test_line_count -eq 0 actual &&
-	echo "f attr_f" >"$HOME"/.config/git/attributes &&
-	echo "f: attr_f: set" >expected &&
-	git check-attr -a f >actual &&
-	test_cmp expected actual
-
-ok 14 - Checking attributes in the XDG attributes file
-
-expecting success of 1306.15 'Checking XDG attributes when HOME is unset': 
-	(sane_unset HOME &&
-	 git check-attr -a f >actual) &&
-	test_must_be_empty actual
-
-ok 15 - Checking XDG attributes when HOME is unset
-
-expecting success of 1306.16 '$XDG_CONFIG_HOME overrides $HOME/.config/git/attributes': 
-	mkdir -p "$HOME"/xdg/git &&
-	echo "f attr_f=xdg" >"$HOME"/xdg/git/attributes &&
-	echo "f: attr_f: xdg" >expected &&
-	XDG_CONFIG_HOME="$HOME/xdg" git check-attr -a f >actual &&
-	test_cmp expected actual
-
-ok 16 - $XDG_CONFIG_HOME overrides $HOME/.config/git/attributes
-
-expecting success of 1306.17 'Checking attributes in both XDG and local attributes files': 
-	echo "f -attr_f" >.gitattributes &&
-	echo "f: attr_f: unset" >expected &&
-	git check-attr -a f >actual &&
-	test_cmp expected actual
-
-ok 17 - Checking attributes in both XDG and local attributes files
-
-expecting success of 1306.18 'Checking attributes in a non-XDG global attributes file': 
-	rm -f .gitattributes &&
-	echo "f attr_f=test" >"$HOME"/my_gitattributes &&
-	git config core.attributesfile "$HOME"/my_gitattributes &&
-	echo "f: attr_f: test" >expected &&
-	git check-attr -a f >actual &&
-	test_cmp expected actual
-
-ok 18 - Checking attributes in a non-XDG global attributes file
-
-expecting success of 1306.19 'write: xdg file exists and ~/.gitconfig doesn't': 
-	mkdir -p "$HOME"/.config/git &&
-	>"$HOME"/.config/git/config &&
-	rm -f "$HOME"/.gitconfig &&
-	git config --global user.name "write_config" &&
-	echo "[user]" >expected &&
-	echo "	name = write_config" >>expected &&
-	test_cmp expected "$HOME"/.config/git/config
-
-ok 19 - write: xdg file exists and ~/.gitconfig doesn't
-
-expecting success of 1306.20 'write: xdg file exists and ~/.gitconfig exists': 
-	>"$HOME"/.gitconfig &&
-	git config --global user.name "write_gitconfig" &&
-	echo "[user]" >expected &&
-	echo "	name = write_gitconfig" >>expected &&
-	test_cmp expected "$HOME"/.gitconfig
-
-ok 20 - write: xdg file exists and ~/.gitconfig exists
-
-expecting success of 1306.21 'write: ~/.config/git/ exists and config file doesn't': 
-	rm -f "$HOME"/.gitconfig &&
-	rm -f "$HOME"/.config/git/config &&
-	git config --global user.name "write_gitconfig" &&
-	echo "[user]" >expected &&
-	echo "	name = write_gitconfig" >>expected &&
-	test_cmp expected "$HOME"/.gitconfig
-
-ok 21 - write: ~/.config/git/ exists and config file doesn't
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1307-config-blob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1307-config-blob/.git/
-expecting success of 1307.1 'create config blob': 
-	cat >config <<-\EOF &&
-	[some]
-		value = 1
-	EOF
-	git add config &&
-	git commit -m foo
-
-[master (root-commit) 5571afa] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 config
-ok 1 - create config blob
-
-expecting success of 1307.2 'list config blob contents': 
-	echo some.value=1 >expect &&
-	git config --blob=HEAD:config --list >actual &&
-	test_cmp expect actual
-
-ok 2 - list config blob contents
-
-expecting success of 1307.3 'fetch value from blob': 
-	echo true >expect &&
-	git config --blob=HEAD:config --bool some.value >actual &&
-	test_cmp expect actual
-
-ok 3 - fetch value from blob
-
-expecting success of 1307.4 'reading non-existing value from blob is an error': 
-	test_must_fail git config --blob=HEAD:config non.existing
-
-ok 4 - reading non-existing value from blob is an error
-
-expecting success of 1307.5 'reading from blob and file is an error': 
-	test_must_fail git config --blob=HEAD:config --system --list
-
-error: only one config file at a time
-usage: git config [<options>]
-
-Config file location
-    --[no-]global         use global config file
-    --[no-]system         use system config file
-    --[no-]local          use repository config file
-    --[no-]worktree       use per-worktree config file
-    -f, --[no-]file <file>
-                          use given config file
-    --[no-]blob <blob-id> read config from given blob object
-
-Action
-    --[no-]get            get value: name [value-pattern]
-    --[no-]get-all        get all values: key [value-pattern]
-    --[no-]get-regexp     get values for regexp: name-regex [value-pattern]
-    --[no-]get-urlmatch   get value specific for the URL: section[.var] URL
-    --[no-]replace-all    replace all matching variables: name value [value-pattern]
-    --[no-]add            add a new variable: name value
-    --[no-]unset          remove a variable: name [value-pattern]
-    --[no-]unset-all      remove all matches: name [value-pattern]
-    --[no-]rename-section rename section: old-name new-name
-    --[no-]remove-section remove a section: name
-    -l, --[no-]list       list all
-    --[no-]fixed-value    use string equality when comparing values to 'value-pattern'
-    -e, --[no-]edit       open an editor
-    --[no-]get-color      find the color configured: slot [default]
-    --[no-]get-colorbool  find the color setting: slot [stdout-is-tty]
-
-Type
-    -t, --[no-]type <type>
-                          value is given this type
-    --bool                value is "true" or "false"
-    --int                 value is decimal number
-    --bool-or-int         value is --bool or --int
-    --bool-or-str         value is --bool or string
-    --path                value is a path (file or directory name)
-    --expiry-date         value is an expiry date
-
-Other
-    -z, --[no-]null       terminate values with NUL byte
-    --[no-]name-only      show variable names only
-    --[no-]includes       respect include directives on lookup
-    --[no-]show-origin    show origin of config (file, standard input, blob, command line)
-    --[no-]show-scope     show scope of config (worktree, local, global, system, command)
-    --[no-]default <value>
-                          with --get, use default value when missing entry
-    --[no-]comment <value>
-                          human-readable comment string (# will be prepended as needed)
-
-ok 5 - reading from blob and file is an error
-
-expecting success of 1307.6 'reading from missing ref is an error': 
-	test_must_fail git config --blob=HEAD:doesnotexist --list
-
-error: unable to resolve config blob 'HEAD:doesnotexist'
-fatal: error processing config file(s)
-ok 6 - reading from missing ref is an error
-
-expecting success of 1307.7 'reading from non-blob is an error': 
-	test_must_fail git config --blob=HEAD --list
-
-error: reference 'HEAD' does not point to a blob
-fatal: error processing config file(s)
-ok 7 - reading from non-blob is an error
-
-expecting success of 1307.8 'setting a value in a blob is an error': 
-	test_must_fail git config --blob=HEAD:config some.value foo
-
-fatal: writing config blobs is not supported
-ok 8 - setting a value in a blob is an error
-
-expecting success of 1307.9 'deleting a value in a blob is an error': 
-	test_must_fail git config --blob=HEAD:config --unset some.value
-
-fatal: writing config blobs is not supported
-ok 9 - deleting a value in a blob is an error
-
-expecting success of 1307.10 'editing a blob is an error': 
-	test_must_fail git config --blob=HEAD:config --edit
-
-fatal: editing blobs is not supported
-ok 10 - editing a blob is an error
-
-expecting success of 1307.11 'parse errors in blobs are properly attributed': 
-	cat >config <<-\EOF &&
-	[some]
-		value = "
-	EOF
-	git add config &&
-	git commit -m broken &&
-
-	test_must_fail git config --blob=HEAD:config some.value 2>err &&
-	test_grep "HEAD:config" err
-
-[master 91b4611] broken
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-error: bad config line 2 in blob HEAD:config
-ok 11 - parse errors in blobs are properly attributed
+*** t1304-default-acl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1304-default-acl/.git/
+expecting success of 1304.1 'checking for a working acl setup': 
+	if setfacl -m d:m:rwx -m u:root:rwx . &&
+	   getfacl . | grep user:root:rwx &&
+	   touch should-have-readable-acl &&
+	   getfacl should-have-readable-acl | grep -E "mask::?rw-"
+	then
+		test_set_prereq SETFACL
+	fi
 
-expecting success of 1307.12 'can parse blob ending with CR': 
-	test_commit --printf CR config "[some]key = value\\r" &&
-	echo value >expect &&
-	git config --blob=HEAD:config some.key >actual &&
-	test_cmp expect actual
+./test-lib.sh: line 1053: setfacl: command not found
+ok 1 - checking for a working acl setup
 
-[master f02e06a] CR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-ok 12 - can parse blob ending with CR
+ok 2 # skip Setup test repo (missing SETFACL)
 
-expecting success of 1307.13 'config --blob outside of a repository is an error': 
-	nongit test_must_fail git config --blob=foo --list
+ok 3 # skip Objects creation does not break ACLs with restrictive umask (missing SETFACL)
 
-fatal: --blob can only be used inside a git repository
-ok 13 - config --blob outside of a repository is an error
+ok 4 # skip git gc does not break ACLs with restrictive umask (missing SETFACL)
 
-# passed all 13 test(s)
-1..13
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1305-config-include.sh ***
@@ -65571,46 +64595,379 @@
 1..236
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1310-config-default.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1310-config-default/.git/
-expecting success of 1310.1 'uses --default when entry missing': 
-	echo quux >expect &&
-	git config -f config --default=quux core.foo >actual &&
-	test_cmp expect actual
+*** t1306-xdg-files.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1306-xdg-files/.git/
+expecting success of 1306.1 'read config: xdg file exists and ~/.gitconfig doesn't': 
+	mkdir -p .config/git &&
+	echo "[alias]" >.config/git/config &&
+	echo "	myalias = !echo in_config" >>.config/git/config &&
+	echo in_config >expected &&
+	git myalias >actual &&
+	test_cmp expected actual
 
-ok 1 - uses --default when entry missing
+ok 1 - read config: xdg file exists and ~/.gitconfig doesn't
 
-expecting success of 1310.2 'does not use --default when entry present': 
-	echo bar >expect &&
-	git -c core.foo=bar config --default=baz core.foo >actual &&
+expecting success of 1306.2 'read config: xdg file exists and ~/.gitconfig exists': 
+	>.gitconfig &&
+	echo "[alias]" >.gitconfig &&
+	echo "	myalias = !echo in_gitconfig" >>.gitconfig &&
+	echo in_gitconfig >expected &&
+	git myalias >actual &&
+	test_cmp expected actual
+
+ok 2 - read config: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.3 'read with --get: xdg file exists and ~/.gitconfig doesn't': 
+	rm .gitconfig &&
+	echo "[user]" >.config/git/config &&
+	echo "	name = read_config" >>.config/git/config &&
+	echo read_config >expected &&
+	git config --get user.name >actual &&
+	test_cmp expected actual
+
+ok 3 - read with --get: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.4 '"$XDG_CONFIG_HOME overrides $HOME/.config/git': 
+	mkdir -p "$HOME"/xdg/git &&
+	echo "[user]name = in_xdg" >"$HOME"/xdg/git/config &&
+	echo in_xdg >expected &&
+	XDG_CONFIG_HOME="$HOME"/xdg git config --get-all user.name >actual &&
+	test_cmp expected actual
+
+ok 4 - "$XDG_CONFIG_HOME overrides $HOME/.config/git
+
+expecting success of 1306.5 'read with --get: xdg file exists and ~/.gitconfig exists': 
+	>.gitconfig &&
+	echo "[user]" >.gitconfig &&
+	echo "	name = read_gitconfig" >>.gitconfig &&
+	echo read_gitconfig >expected &&
+	git config --get user.name >actual &&
+	test_cmp expected actual
+
+ok 5 - read with --get: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.6 'read with --list: xdg file exists and ~/.gitconfig doesn't': 
+	rm .gitconfig &&
+	echo user.name=read_config >expected &&
+	git config --global --list >actual &&
+	test_cmp expected actual
+
+ok 6 - read with --list: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.7 'read with --list: xdg file exists and ~/.gitconfig exists': 
+	>.gitconfig &&
+	echo "[user]" >.gitconfig &&
+	echo "	name = read_gitconfig" >>.gitconfig &&
+	echo user.name=read_gitconfig >expected &&
+	git config --global --list >actual &&
+	test_cmp expected actual
+
+ok 7 - read with --list: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.8 'Setup': 
+	git init git &&
+	cd git &&
+	echo foo >to_be_excluded
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1306-xdg-files/git/.git/
+ok 8 - Setup
+
+expecting success of 1306.9 'Exclusion of a file in the XDG ignore file': 
+	mkdir -p "$HOME"/.config/git/ &&
+	echo to_be_excluded >"$HOME"/.config/git/ignore &&
+	test_must_fail git add to_be_excluded
+
+The following paths are ignored by one of your .gitignore files:
+to_be_excluded
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 9 - Exclusion of a file in the XDG ignore file
+
+expecting success of 1306.10 '$XDG_CONFIG_HOME overrides $HOME/.config/git/ignore': 
+	mkdir -p "$HOME"/xdg/git &&
+	echo content >excluded_by_xdg_only &&
+	echo excluded_by_xdg_only >"$HOME"/xdg/git/ignore &&
+	test_when_finished "git read-tree --empty" &&
+	(XDG_CONFIG_HOME="$HOME/xdg" &&
+	 export XDG_CONFIG_HOME &&
+	 git add to_be_excluded &&
+	 test_must_fail git add excluded_by_xdg_only
+	)
+
+The following paths are ignored by one of your .gitignore files:
+excluded_by_xdg_only
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 10 - $XDG_CONFIG_HOME overrides $HOME/.config/git/ignore
+
+expecting success of 1306.11 'Exclusion in both XDG and local ignore files': 
+	echo to_be_excluded >.gitignore &&
+	test_must_fail git add to_be_excluded
+
+The following paths are ignored by one of your .gitignore files:
+to_be_excluded
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 11 - Exclusion in both XDG and local ignore files
+
+expecting success of 1306.12 'Exclusion in a non-XDG global ignore file': 
+	rm .gitignore &&
+	echo >"$HOME"/.config/git/ignore &&
+	echo to_be_excluded >"$HOME"/my_gitignore &&
+	git config core.excludesfile "$HOME"/my_gitignore &&
+	test_must_fail git add to_be_excluded
+
+The following paths are ignored by one of your .gitignore files:
+to_be_excluded
+hint: Use -f if you really want to add them.
+hint: Disable this message with "git config advice.addIgnoredFile false"
+ok 12 - Exclusion in a non-XDG global ignore file
+
+expecting success of 1306.13 'Checking XDG ignore file when HOME is unset': 
+	(sane_unset HOME &&
+	 git config --unset core.excludesfile &&
+	 git ls-files --exclude-standard --ignored --others >actual) &&
+	test_must_be_empty actual
+
+ok 13 - Checking XDG ignore file when HOME is unset
+
+expecting success of 1306.14 'Checking attributes in the XDG attributes file': 
+	echo foo >f &&
+	git check-attr -a f >actual &&
+	test_line_count -eq 0 actual &&
+	echo "f attr_f" >"$HOME"/.config/git/attributes &&
+	echo "f: attr_f: set" >expected &&
+	git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 14 - Checking attributes in the XDG attributes file
+
+expecting success of 1306.15 'Checking XDG attributes when HOME is unset': 
+	(sane_unset HOME &&
+	 git check-attr -a f >actual) &&
+	test_must_be_empty actual
+
+ok 15 - Checking XDG attributes when HOME is unset
+
+expecting success of 1306.16 '$XDG_CONFIG_HOME overrides $HOME/.config/git/attributes': 
+	mkdir -p "$HOME"/xdg/git &&
+	echo "f attr_f=xdg" >"$HOME"/xdg/git/attributes &&
+	echo "f: attr_f: xdg" >expected &&
+	XDG_CONFIG_HOME="$HOME/xdg" git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 16 - $XDG_CONFIG_HOME overrides $HOME/.config/git/attributes
+
+expecting success of 1306.17 'Checking attributes in both XDG and local attributes files': 
+	echo "f -attr_f" >.gitattributes &&
+	echo "f: attr_f: unset" >expected &&
+	git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 17 - Checking attributes in both XDG and local attributes files
+
+expecting success of 1306.18 'Checking attributes in a non-XDG global attributes file': 
+	rm -f .gitattributes &&
+	echo "f attr_f=test" >"$HOME"/my_gitattributes &&
+	git config core.attributesfile "$HOME"/my_gitattributes &&
+	echo "f: attr_f: test" >expected &&
+	git check-attr -a f >actual &&
+	test_cmp expected actual
+
+ok 18 - Checking attributes in a non-XDG global attributes file
+
+expecting success of 1306.19 'write: xdg file exists and ~/.gitconfig doesn't': 
+	mkdir -p "$HOME"/.config/git &&
+	>"$HOME"/.config/git/config &&
+	rm -f "$HOME"/.gitconfig &&
+	git config --global user.name "write_config" &&
+	echo "[user]" >expected &&
+	echo "	name = write_config" >>expected &&
+	test_cmp expected "$HOME"/.config/git/config
+
+ok 19 - write: xdg file exists and ~/.gitconfig doesn't
+
+expecting success of 1306.20 'write: xdg file exists and ~/.gitconfig exists': 
+	>"$HOME"/.gitconfig &&
+	git config --global user.name "write_gitconfig" &&
+	echo "[user]" >expected &&
+	echo "	name = write_gitconfig" >>expected &&
+	test_cmp expected "$HOME"/.gitconfig
+
+ok 20 - write: xdg file exists and ~/.gitconfig exists
+
+expecting success of 1306.21 'write: ~/.config/git/ exists and config file doesn't': 
+	rm -f "$HOME"/.gitconfig &&
+	rm -f "$HOME"/.config/git/config &&
+	git config --global user.name "write_gitconfig" &&
+	echo "[user]" >expected &&
+	echo "	name = write_gitconfig" >>expected &&
+	test_cmp expected "$HOME"/.gitconfig
+
+ok 21 - write: ~/.config/git/ exists and config file doesn't
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1307-config-blob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1307-config-blob/.git/
+expecting success of 1307.1 'create config blob': 
+	cat >config <<-\EOF &&
+	[some]
+		value = 1
+	EOF
+	git add config &&
+	git commit -m foo
+
+[master (root-commit) 5571afa] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 config
+ok 1 - create config blob
+
+expecting success of 1307.2 'list config blob contents': 
+	echo some.value=1 >expect &&
+	git config --blob=HEAD:config --list >actual &&
 	test_cmp expect actual
 
-ok 2 - does not use --default when entry present
+ok 2 - list config blob contents
 
-expecting success of 1310.3 'canonicalizes --default with appropriate type': 
+expecting success of 1307.3 'fetch value from blob': 
 	echo true >expect &&
-	git config -f config --default=yes --bool core.foo >actual &&
+	git config --blob=HEAD:config --bool some.value >actual &&
 	test_cmp expect actual
 
-ok 3 - canonicalizes --default with appropriate type
+ok 3 - fetch value from blob
 
-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 1307.4 'reading non-existing value from blob is an error': 
+	test_must_fail git config --blob=HEAD:config non.existing
 
-fatal: failed to format default config value: x
-ok 4 - dies when --default cannot be parsed
+ok 4 - reading non-existing value from blob is an error
 
-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 1307.5 'reading from blob and file is an error': 
+	test_must_fail git config --blob=HEAD:config --system --list
 
-error: --default is only applicable to --get
-ok 5 - does not allow --default without --get
+error: only one config file at a time
+usage: git config [<options>]
 
-# passed all 5 test(s)
-1..5
+Config file location
+    --[no-]global         use global config file
+    --[no-]system         use system config file
+    --[no-]local          use repository config file
+    --[no-]worktree       use per-worktree config file
+    -f, --[no-]file <file>
+                          use given config file
+    --[no-]blob <blob-id> read config from given blob object
+
+Action
+    --[no-]get            get value: name [value-pattern]
+    --[no-]get-all        get all values: key [value-pattern]
+    --[no-]get-regexp     get values for regexp: name-regex [value-pattern]
+    --[no-]get-urlmatch   get value specific for the URL: section[.var] URL
+    --[no-]replace-all    replace all matching variables: name value [value-pattern]
+    --[no-]add            add a new variable: name value
+    --[no-]unset          remove a variable: name [value-pattern]
+    --[no-]unset-all      remove all matches: name [value-pattern]
+    --[no-]rename-section rename section: old-name new-name
+    --[no-]remove-section remove a section: name
+    -l, --[no-]list       list all
+    --[no-]fixed-value    use string equality when comparing values to 'value-pattern'
+    -e, --[no-]edit       open an editor
+    --[no-]get-color      find the color configured: slot [default]
+    --[no-]get-colorbool  find the color setting: slot [stdout-is-tty]
+
+Type
+    -t, --[no-]type <type>
+                          value is given this type
+    --bool                value is "true" or "false"
+    --int                 value is decimal number
+    --bool-or-int         value is --bool or --int
+    --bool-or-str         value is --bool or string
+    --path                value is a path (file or directory name)
+    --expiry-date         value is an expiry date
+
+Other
+    -z, --[no-]null       terminate values with NUL byte
+    --[no-]name-only      show variable names only
+    --[no-]includes       respect include directives on lookup
+    --[no-]show-origin    show origin of config (file, standard input, blob, command line)
+    --[no-]show-scope     show scope of config (worktree, local, global, system, command)
+    --[no-]default <value>
+                          with --get, use default value when missing entry
+    --[no-]comment <value>
+                          human-readable comment string (# will be prepended as needed)
+
+ok 5 - reading from blob and file is an error
+
+expecting success of 1307.6 'reading from missing ref is an error': 
+	test_must_fail git config --blob=HEAD:doesnotexist --list
+
+error: unable to resolve config blob 'HEAD:doesnotexist'
+fatal: error processing config file(s)
+ok 6 - reading from missing ref is an error
+
+expecting success of 1307.7 'reading from non-blob is an error': 
+	test_must_fail git config --blob=HEAD --list
+
+error: reference 'HEAD' does not point to a blob
+fatal: error processing config file(s)
+ok 7 - reading from non-blob is an error
+
+expecting success of 1307.8 'setting a value in a blob is an error': 
+	test_must_fail git config --blob=HEAD:config some.value foo
+
+fatal: writing config blobs is not supported
+ok 8 - setting a value in a blob is an error
+
+expecting success of 1307.9 'deleting a value in a blob is an error': 
+	test_must_fail git config --blob=HEAD:config --unset some.value
+
+fatal: writing config blobs is not supported
+ok 9 - deleting a value in a blob is an error
+
+expecting success of 1307.10 'editing a blob is an error': 
+	test_must_fail git config --blob=HEAD:config --edit
+
+fatal: editing blobs is not supported
+ok 10 - editing a blob is an error
+
+expecting success of 1307.11 'parse errors in blobs are properly attributed': 
+	cat >config <<-\EOF &&
+	[some]
+		value = "
+	EOF
+	git add config &&
+	git commit -m broken &&
+
+	test_must_fail git config --blob=HEAD:config some.value 2>err &&
+	test_grep "HEAD:config" err
+
+[master 91b4611] broken
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+error: bad config line 2 in blob HEAD:config
+ok 11 - parse errors in blobs are properly attributed
+
+expecting success of 1307.12 'can parse blob ending with CR': 
+	test_commit --printf CR config "[some]key = value\\r" &&
+	echo value >expect &&
+	git config --blob=HEAD:config some.key >actual &&
+	test_cmp expect actual
+
+[master f02e06a] CR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+ok 12 - can parse blob ending with CR
+
+expecting success of 1307.13 'config --blob outside of a repository is an error': 
+	nongit test_must_fail git config --blob=foo --list
+
+fatal: --blob can only be used inside a git repository
+ok 13 - config --blob outside of a repository is an error
+
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1309-early-config.sh ***
@@ -65765,80 +65122,46 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1350-config-hooks-path.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1350-config-hooks-path/.git/
-expecting success of 1350.1 'set up a pre-commit hook in core.hooksPath': 
-	>actual &&
-	mkdir -p .git/custom-hooks &&
-	write_script .git/custom-hooks/pre-commit <<-\EOF &&
-	echo CUSTOM >>actual
-	EOF
-	test_hook --setup pre-commit <<-\EOF
-	echo NORMAL >>actual
-	EOF
+*** t1310-config-default.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1310-config-default/.git/
+expecting success of 1310.1 'uses --default when entry missing': 
+	echo quux >expect &&
+	git config -f config --default=quux core.foo >actual &&
+	test_cmp expect actual
 
-ok 1 - set up a pre-commit hook in core.hooksPath
+ok 1 - uses --default when entry missing
 
-expecting success of 1350.2 'Check that various forms of specifying core.hooksPath work': 
-	test_commit no_custom_hook &&
-	git config core.hooksPath .git/custom-hooks &&
-	test_commit have_custom_hook &&
-	git config core.hooksPath .git/custom-hooks/ &&
-	test_commit have_custom_hook_trailing_slash &&
-	git config core.hooksPath "$PWD/.git/custom-hooks" &&
-	test_commit have_custom_hook_abs_path &&
-	git config core.hooksPath "$PWD/.git/custom-hooks/" &&
-	test_commit have_custom_hook_abs_path_trailing_slash &&
-	cat >expect <<-\EOF &&
-	NORMAL
-	CUSTOM
-	CUSTOM
-	CUSTOM
-	CUSTOM
-	EOF
+expecting success of 1310.2 'does not use --default when entry present': 
+	echo bar >expect &&
+	git -c core.foo=bar config --default=baz core.foo >actual &&
 	test_cmp expect actual
 
-[master (root-commit) 51fec20] no_custom_hook
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 no_custom_hook.t
-[master d6f765a] have_custom_hook
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 have_custom_hook.t
-[master c8447a6] have_custom_hook_trailing_slash
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 have_custom_hook_trailing_slash.t
-[master acc1a92] have_custom_hook_abs_path
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 have_custom_hook_abs_path.t
-[master 3a47fb1] have_custom_hook_abs_path_trailing_slash
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 have_custom_hook_abs_path_trailing_slash.t
-ok 2 - Check that various forms of specifying core.hooksPath work
+ok 2 - does not use --default when entry present
 
-expecting success of 1350.3 'git rev-parse --git-path hooks': 
-	git config core.hooksPath .git/custom-hooks &&
-	git rev-parse --git-path hooks/abc >actual &&
-	test .git/custom-hooks/abc = "$(cat actual)"
+expecting success of 1310.3 'canonicalizes --default with appropriate type': 
+	echo true >expect &&
+	git config -f config --default=yes --bool core.foo >actual &&
+	test_cmp expect actual
 
-ok 3 - git rev-parse --git-path hooks
+ok 3 - canonicalizes --default with appropriate type
 
-expecting success of 1350.4 'core.hooksPath=/dev/null': 
-	git clone -c core.hooksPath=/dev/null . no-templates &&
-	value="$(git -C no-templates config --local core.hooksPath)" &&
-	# The Bash used by Git for Windows rewrites `/dev/null` to `nul`
-	{ test /dev/null = "$value" || test nul = "$value"; }
+expecting success of 1310.4 'dies when --default cannot be parsed': 
+	test_must_fail git config -f config --type=expiry-date --default=x --get \
+		not.a.section 2>error &&
+	test_grep "failed to format default config value" error
 
-Cloning into 'no-templates'...
-done.
-ok 4 - core.hooksPath=/dev/null
+fatal: failed to format default config value: x
+ok 4 - dies when --default cannot be parsed
 
-# passed all 4 test(s)
-1..4
+expecting success of 1310.5 'does not allow --default without --get': 
+	test_must_fail git config --default=quux --unset a.section >output 2>&1 &&
+	test_grep "\-\-default is only applicable to" output
+
+error: --default is only applicable to --get
+ok 5 - does not allow --default without --get
+
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1308-config-set.sh ***
@@ -66398,6 +65721,82 @@
 1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1350-config-hooks-path.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1350-config-hooks-path/.git/
+expecting success of 1350.1 'set up a pre-commit hook in core.hooksPath': 
+	>actual &&
+	mkdir -p .git/custom-hooks &&
+	write_script .git/custom-hooks/pre-commit <<-\EOF &&
+	echo CUSTOM >>actual
+	EOF
+	test_hook --setup pre-commit <<-\EOF
+	echo NORMAL >>actual
+	EOF
+
+ok 1 - set up a pre-commit hook in core.hooksPath
+
+expecting success of 1350.2 'Check that various forms of specifying core.hooksPath work': 
+	test_commit no_custom_hook &&
+	git config core.hooksPath .git/custom-hooks &&
+	test_commit have_custom_hook &&
+	git config core.hooksPath .git/custom-hooks/ &&
+	test_commit have_custom_hook_trailing_slash &&
+	git config core.hooksPath "$PWD/.git/custom-hooks" &&
+	test_commit have_custom_hook_abs_path &&
+	git config core.hooksPath "$PWD/.git/custom-hooks/" &&
+	test_commit have_custom_hook_abs_path_trailing_slash &&
+	cat >expect <<-\EOF &&
+	NORMAL
+	CUSTOM
+	CUSTOM
+	CUSTOM
+	CUSTOM
+	EOF
+	test_cmp expect actual
+
+[master (root-commit) 51fec20] no_custom_hook
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no_custom_hook.t
+[master d6f765a] have_custom_hook
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 have_custom_hook.t
+[master c8447a6] have_custom_hook_trailing_slash
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 have_custom_hook_trailing_slash.t
+[master acc1a92] have_custom_hook_abs_path
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 have_custom_hook_abs_path.t
+[master 3a47fb1] have_custom_hook_abs_path_trailing_slash
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 have_custom_hook_abs_path_trailing_slash.t
+ok 2 - Check that various forms of specifying core.hooksPath work
+
+expecting success of 1350.3 'git rev-parse --git-path hooks': 
+	git config core.hooksPath .git/custom-hooks &&
+	git rev-parse --git-path hooks/abc >actual &&
+	test .git/custom-hooks/abc = "$(cat actual)"
+
+ok 3 - git rev-parse --git-path hooks
+
+expecting success of 1350.4 'core.hooksPath=/dev/null': 
+	git clone -c core.hooksPath=/dev/null . no-templates &&
+	value="$(git -C no-templates config --local core.hooksPath)" &&
+	# The Bash used by Git for Windows rewrites `/dev/null` to `nul`
+	{ test /dev/null = "$value" || test nul = "$value"; }
+
+Cloning into 'no-templates'...
+done.
+ok 4 - core.hooksPath=/dev/null
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1401-symbolic-ref.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1401-symbolic-ref/.git/
 expecting success of 1401.1 'setup': 
@@ -67594,12870 +66993,15597 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1404-update-ref-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1404-update-ref-errors/.git/
-expecting success of 1404.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)
+*** t1400-update-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 -
 
-[master (root-commit) d31adcd] Initial
- Author: A U Thor <author@example.com>
-[master e6940ad] Second
- Author: A U Thor <author@example.com>
-[master c2327cb] Third
- Author: A U Thor <author@example.com>
+Switched to a new branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1400-update-ref/bare-repo/
+/build/reproducible-path/git-2.45.2/t/trash directory.t1400-update-ref
 ok 1 - setup
 
-expecting success of 1404.2 'existing loose ref is a simple prefix of new': 
+expecting success of 1400.2 'create refs/heads/main': 
+	git update-ref $m $A &&
+	test $A = $(git show-ref -s --verify $m)
 
-	prefix=refs/1l &&
-	test_update_rejected "a c e" false "b c/x d" \
-		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
+ok 2 - create refs/heads/main
 
+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)
 
-fatal: cannot lock ref 'refs/1l/c/x': 'refs/1l/c' exists; cannot create 'refs/1l/c/x'
-ok 2 - existing loose ref is a simple prefix of new
+ok 3 - create refs/heads/main with oldvalue verification
 
-expecting success of 1404.3 'existing packed ref is a simple prefix of new': 
+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)"
 
-	prefix=refs/1p &&
-	test_update_rejected "a c e" true "b c/x d" \
-		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
+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 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
 
-fatal: cannot lock ref 'refs/1p/c/x': 'refs/1p/c' exists; cannot create 'refs/1p/c/x'
-ok 3 - existing packed ref is a simple prefix of new
+ok 5 - delete refs/heads/main
 
-expecting success of 1404.4 'existing loose ref is a deeper prefix of new': 
+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
 
-	prefix=refs/2l &&
-	test_update_rejected "a c e" false "b c/x/y d" \
-		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
+ok 6 - delete refs/heads/main without oldvalue verification
 
+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
 
-fatal: cannot lock ref 'refs/2l/c/x/y': 'refs/2l/c' exists; cannot create 'refs/2l/c/x/y'
-ok 4 - existing loose ref is a deeper prefix of new
+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 1404.5 'existing packed ref is a deeper prefix of new': 
+expecting success of 1400.8 'create refs/heads/main (by HEAD)': 
+	git update-ref HEAD $A &&
+	test $A = $(git show-ref -s --verify $m)
 
-	prefix=refs/2p &&
-	test_update_rejected "a c e" true "b c/x/y d" \
-		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
+ok 8 - create refs/heads/main (by HEAD)
 
+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)
 
-fatal: cannot lock ref 'refs/2p/c/x/y': 'refs/2p/c' exists; cannot create 'refs/2p/c/x/y'
-ok 5 - existing packed ref is a deeper prefix of new
+ok 9 - create refs/heads/main (by HEAD) with oldvalue verification
 
-expecting success of 1404.6 'new ref is a simple prefix of existing loose': 
+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)
 
-	prefix=refs/3l &&
-	test_update_rejected "a c/x e" false "b c d" \
-		"$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
+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 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
 
-fatal: cannot lock ref 'refs/3l/c': 'refs/3l/c/x' exists; cannot create 'refs/3l/c'
-ok 6 - new ref is a simple prefix of existing loose
+ok 11 - delete refs/heads/main (by HEAD)
 
-expecting success of 1404.7 'new ref is a simple prefix of existing packed': 
+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
 
-	prefix=refs/3p &&
-	test_update_rejected "a c/x e" true "b c d" \
-		"$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
+102939797ab91a4f201d131418d2c9d919dcdd2c 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 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
 
-fatal: cannot lock ref 'refs/3p/c': 'refs/3p/c/x' exists; cannot create 'refs/3p/c'
-ok 7 - new ref is a simple prefix of existing packed
+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 1404.8 'new ref is a deeper prefix of existing loose': 
+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
 
-	prefix=refs/4l &&
-	test_update_rejected "a c/x/y e" false "b c d" \
-		"$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
+ok 14 - update-ref does not create reflogs by default
 
+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
 
-fatal: cannot lock ref 'refs/4l/c': 'refs/4l/c/x/y' exists; cannot create 'refs/4l/c'
-ok 8 - new ref is a deeper prefix of existing loose
+ok 15 - update-ref creates reflogs with --create-reflog
 
-expecting success of 1404.9 'new ref is a deeper prefix of existing packed': 
+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
 
-	prefix=refs/4p &&
-	test_update_rejected "a c/x/y e" true "b c d" \
-		"$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
+ok 16 - creates no reflog in bare repository
 
+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
 
-fatal: cannot lock ref 'refs/4p/c': 'refs/4p/c/x/y' exists; cannot create 'refs/4p/c'
-ok 9 - new ref is a deeper prefix of existing packed
+ok 17 - core.logAllRefUpdates=true creates reflog in bare repository
 
-expecting success of 1404.10 'one new ref is a simple prefix of another': 
+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
 
-	prefix=refs/5 &&
-	test_update_rejected "a e" false "b c c/x d" \
-		"cannot process $SQ$prefix/c$SQ and $SQ$prefix/c/x$SQ at the same time"
+ok 18 - core.logAllRefUpdates=true does not create reflog by default
 
+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
 
-fatal: cannot lock ref 'refs/5/c': cannot process 'refs/5/c' and 'refs/5/c/x' at the same time
-ok 10 - one new ref is a simple prefix of another
+ok 19 - core.logAllRefUpdates=always creates reflog by default
 
-expecting success of 1404.11 'D/F conflict prevents add long + delete short': 
-	df_test refs/df-al-ds --add-del foo/bar foo
+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
 
-fatal: cannot lock ref 'refs/df-al-ds/r/foo/bar': 'refs/df-al-ds/r/foo' exists; cannot create 'refs/df-al-ds/r/foo/bar'
-ok 11 - D/F conflict prevents add long + delete short
+ok 20 - core.logAllRefUpdates=always creates reflog for ORIG_HEAD
 
-expecting success of 1404.12 'D/F conflict prevents add short + delete long': 
-	df_test refs/df-as-dl --add-del foo foo/bar
+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
 
-fatal: cannot lock ref 'refs/df-as-dl/r/foo': 'refs/df-as-dl/r/foo/bar' exists; cannot create 'refs/df-as-dl/r/foo'
-ok 12 - D/F conflict prevents add short + delete long
+ok 21 - --no-create-reflog overrides core.logAllRefUpdates=always
 
-expecting success of 1404.13 'D/F conflict prevents delete long + add short': 
-	df_test refs/df-dl-as --del-add foo/bar foo
+expecting success of 1400.22 'create refs/heads/main (by HEAD)': 
+	git update-ref HEAD $A &&
+	test $A = $(git show-ref -s --verify $m)
 
-fatal: cannot lock ref 'refs/df-dl-as/r/foo': 'refs/df-dl-as/r/foo/bar' exists; cannot create 'refs/df-dl-as/r/foo'
-ok 13 - D/F conflict prevents delete long + add short
+ok 22 - create refs/heads/main (by HEAD)
 
-expecting success of 1404.14 'D/F conflict prevents delete short + add long': 
-	df_test refs/df-ds-al --del-add foo foo/bar
+expecting success of 1400.23 'pack refs': 
+	git pack-refs --all
 
-fatal: cannot lock ref 'refs/df-ds-al/r/foo/bar': 'refs/df-ds-al/r/foo' exists; cannot create 'refs/df-ds-al/r/foo/bar'
-ok 14 - D/F conflict prevents delete short + add long
+ok 23 - pack refs
 
-expecting success of 1404.15 'D/F conflict prevents add long + delete short packed': 
-	df_test refs/df-al-dsp --pack --add-del foo/bar foo
+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)
 
-fatal: cannot lock ref 'refs/df-al-dsp/r/foo/bar': 'refs/df-al-dsp/r/foo' exists; cannot create 'refs/df-al-dsp/r/foo/bar'
-ok 15 - D/F conflict prevents add long + delete short packed
+ok 24 - move refs/heads/main (by HEAD)
 
-expecting success of 1404.16 'D/F conflict prevents add short + delete long packed': 
-	df_test refs/df-as-dlp --pack --add-del foo foo/bar
+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
 
-fatal: cannot lock ref 'refs/df-as-dlp/r/foo': 'refs/df-as-dlp/r/foo/bar' exists; cannot create 'refs/df-as-dlp/r/foo'
-ok 16 - D/F conflict prevents add short + delete long packed
+ok 25 - delete refs/heads/main (by HEAD) should remove both packed and loose refs/heads/main
 
-expecting success of 1404.17 'D/F conflict prevents delete long packed + add short': 
-	df_test refs/df-dlp-as --pack --del-add foo/bar foo
+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
 
-fatal: cannot lock ref 'refs/df-dlp-as/r/foo': 'refs/df-dlp-as/r/foo/bar' exists; cannot create 'refs/df-dlp-as/r/foo'
-ok 17 - D/F conflict prevents delete long packed + add short
+[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 1404.18 'D/F conflict prevents delete short packed + add long': 
-	df_test refs/df-dsp-al --pack --del-add foo foo/bar
+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
 
-fatal: cannot lock ref 'refs/df-dsp-al/r/foo/bar': 'refs/df-dsp-al/r/foo' exists; cannot create 'refs/df-dsp-al/r/foo/bar'
-ok 18 - D/F conflict prevents delete short packed + add long
+[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 1404.19 'D/F conflict prevents indirect add long + delete short': 
-	df_test refs/df-ial-ds --sym-add --add-del foo/bar foo
+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
 
-fatal: cannot lock ref 'refs/df-ial-ds/s/symadd': 'refs/df-ial-ds/r/foo' exists; cannot create 'refs/df-ial-ds/r/foo/bar'
-ok 19 - D/F conflict prevents indirect add long + delete short
+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
 
-expecting success of 1404.20 'D/F conflict prevents indirect add long + indirect delete short': 
-	df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo
+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
 
-fatal: cannot lock ref 'refs/df-ial-ids/s/symadd': 'refs/df-ial-ids/r/foo' exists; cannot create 'refs/df-ial-ids/r/foo/bar'
-ok 20 - D/F conflict prevents indirect add long + indirect delete short
+refs/heads/self
+ok 29 - update-ref --no-deref -d can delete self-reference
 
-expecting success of 1404.21 'D/F conflict prevents indirect add short + indirect delete long': 
-	df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar
+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
 
-fatal: cannot lock ref 'refs/df-ias-idl/s/symadd': 'refs/df-ias-idl/r/foo/bar' exists; cannot create 'refs/df-ias-idl/r/foo'
-ok 21 - D/F conflict prevents indirect add short + indirect delete long
+refs/heads/bad
+ok 30 - update-ref --no-deref -d can delete reference to bad ref
 
-expecting success of 1404.22 'D/F conflict prevents indirect delete long + indirect add short': 
-	df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo
+expecting success of 1400.31 '(not) create HEAD with old sha1': 
+	test_must_fail git update-ref HEAD $A $B
 
-fatal: cannot lock ref 'refs/df-idl-ias/s/symadd': 'refs/df-idl-ias/r/foo/bar' exists; cannot create 'refs/df-idl-ias/r/foo'
-ok 22 - D/F conflict prevents indirect delete long + indirect add short
+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
 
-expecting success of 1404.23 'D/F conflict prevents indirect add long + delete short packed': 
-	df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo
+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
 
-fatal: cannot lock ref 'refs/df-ial-dsp/s/symadd': 'refs/df-ial-dsp/r/foo' exists; cannot create 'refs/df-ial-dsp/r/foo/bar'
-ok 23 - D/F conflict prevents indirect add long + delete short packed
+ok 32 - (not) prior created .git/refs/heads/main
 
-expecting success of 1404.24 'D/F conflict prevents indirect add long + indirect delete short packed': 
-	df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo
+expecting success of 1400.33 'create HEAD': 
+	git update-ref HEAD $A
 
-fatal: cannot lock ref 'refs/df-ial-idsp/s/symadd': 'refs/df-ial-idsp/r/foo' exists; cannot create 'refs/df-ial-idsp/r/foo/bar'
-ok 24 - D/F conflict prevents indirect add long + indirect delete short packed
+ok 33 - create HEAD
 
-expecting success of 1404.25 'D/F conflict prevents add long + indirect delete short packed': 
-	df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo
+expecting success of 1400.34 '(not) change HEAD with wrong SHA1': 
+	test_must_fail git update-ref HEAD $B $Z
 
-fatal: cannot lock ref 'refs/df-al-idsp/r/foo/bar': 'refs/df-al-idsp/r/foo' exists; cannot create 'refs/df-al-idsp/r/foo/bar'
-ok 25 - D/F conflict prevents add long + indirect delete short packed
+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 1404.26 'D/F conflict prevents indirect delete long packed + indirect add short': 
-	df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo
+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)
 
-fatal: cannot lock ref 'refs/df-idlp-ias/s/symadd': 'refs/df-idlp-ias/r/foo/bar' exists; cannot create 'refs/df-idlp-ias/r/foo'
-ok 26 - D/F conflict prevents indirect delete long packed + indirect add short
+ok 35 - (not) changed .git/refs/heads/main
 
-expecting success of 1404.27 'missing old value blocks update': 
-	prefix=refs/missing-update &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
-	EOF
-	printf "%s\n" "update $prefix/foo $E $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+expecting success of 1400.36 'clean up reflog': 
+	test-tool ref-store main delete-reflog $m
 
-ok 27 - missing old value blocks update
+ok 36 - clean up reflog
 
-expecting success of 1404.28 'incorrect old value blocks update': 
-	prefix=refs/incorrect-update &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
-	EOF
-	printf "%s\n" "update $prefix/foo $E $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+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 28 - incorrect old value blocks update
+ok 37 - create refs/heads/main (logged by touch)
 
-expecting success of 1404.29 'existing old value blocks create': 
-	prefix=refs/existing-create &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/foo$SQ: reference already exists
-	EOF
-	printf "%s\n" "create $prefix/foo $E" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+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)
 
-ok 29 - existing old value blocks create
+ok 38 - update refs/heads/main (logged by touch)
 
-expecting success of 1404.30 'incorrect old value blocks delete': 
-	prefix=refs/incorrect-delete &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
-	EOF
-	printf "%s\n" "delete $prefix/foo $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+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)
 
-ok 30 - incorrect old value blocks delete
+ok 39 - set refs/heads/main (logged by touch)
 
-expecting success of 1404.31 'missing old value blocks indirect update': 
-	prefix=refs/missing-indirect-update &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
-	EOF
-	printf "%s\n" "update $prefix/symref $E $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+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 31 - missing old value blocks indirect update
+ok 40 - verifying refs/heads/main's log (logged by touch)
 
-expecting success of 1404.32 'incorrect old value blocks indirect update': 
-	prefix=refs/incorrect-indirect-update &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
-	EOF
-	printf "%s\n" "update $prefix/symref $E $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+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 32 - incorrect old value blocks indirect update
+ok 41 - create refs/heads/main (logged by config)
 
-expecting success of 1404.33 'existing old value blocks indirect create': 
-	prefix=refs/existing-indirect-create &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
-	EOF
-	printf "%s\n" "create $prefix/symref $E" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+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 33 - existing old value blocks indirect create
+ok 42 - update refs/heads/main (logged by config)
 
-expecting success of 1404.34 'incorrect old value blocks indirect delete': 
-	prefix=refs/incorrect-indirect-delete &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
-	EOF
-	printf "%s\n" "delete $prefix/symref $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+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 34 - incorrect old value blocks indirect delete
+ok 43 - set refs/heads/main (logged by config)
 
-expecting success of 1404.35 'missing old value blocks indirect no-deref update': 
-	prefix=refs/missing-noderef-update &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/symref$SQ: reference is missing but expected $D
-	EOF
-	printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+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 35 - missing old value blocks indirect no-deref update
+ok 44 - verifying refs/heads/main's log (logged by config)
 
-expecting success of 1404.36 'incorrect old value blocks indirect no-deref update': 
-	prefix=refs/incorrect-noderef-update &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
-	EOF
-	printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+expecting success of 1400.45 'set up for querying the reflog': 
+	git update-ref -d $m &&
+	test-tool ref-store main delete-reflog $m &&
 
-ok 36 - incorrect old value blocks indirect no-deref update
+	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} &&
 
-expecting success of 1404.37 'existing old value blocks indirect no-deref create': 
-	prefix=refs/existing-noderef-create &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
+	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
-	printf "%s\n" "option no-deref" "create $prefix/symref $E" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+	test-tool ref-store main for-each-reflog-ent $m >actual &&
+	test_cmp expect actual
 
-ok 37 - existing old value blocks indirect no-deref create
+ok 45 - set up for querying the reflog
 
-expecting success of 1404.38 'incorrect old value blocks indirect no-deref delete': 
-	prefix=refs/incorrect-noderef-delete &&
-	git symbolic-ref $prefix/symref $prefix/foo &&
-	git update-ref $prefix/foo $C &&
-	cat >expected <<-EOF &&
-	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
-	EOF
-	printf "%s\n" "option no-deref" "delete $prefix/symref $D" |
-	test_must_fail git update-ref --stdin 2>output.err &&
-	test_cmp expected output.err
+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
 
-ok 38 - incorrect old value blocks indirect no-deref delete
+ok 46 - Query "main@{May 25 2005}" (before history)
 
-# passed all 38 test(s)
-1..38
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1405-main-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1405-main-ref-store/.git/
-expecting success of 1405.1 'setup': 
-	test_commit one
+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
 
-[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
+ok 47 - Query main@{2005-05-25} (before history)
 
-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
+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
 
-ok 2 - create_symref(FOO, refs/heads/main)
+ok 48 - Query "main@{May 26 2005 23:31:59}" (1 second before history)
 
-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 --
+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
 
-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)
+ok 49 - Query "main@{May 26 2005 23:32:00}" (exactly history start)
 
-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
+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
 
-[main (root-commit) ff283f4] recreate-main
+ok 50 - Query "main@{May 26 2005 23:32:30}" (first non-creation change)
+
+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 51 - Query "main@{2005-05-26 23:33:01}" (middle of history with gap)
+
+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 52 - Query "main@{2005-05-26 23:38:00}" (middle of history)
+
+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 53 - Query "main@{2005-05-26 23:43:00}" (exact end of history)
+
+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
+
+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)
+
+expecting success of 1400.55 'query reflog with gap': 
+	test_when_finished "git update-ref -d $m" &&
+
+	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} &&
+
+	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
+
+warning: log for ref refs/heads/main has gap after Thu, 26 May 2005 18:33:00 -0500
+ok 55 - query reflog with gap
+
+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)
+
+[main (root-commit) 0c23f5f] add
  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)
+ 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
 
-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
+expecting success of 1400.57 'git commit logged updates': 
+	test-tool ref-store main for-each-reflog-ent $m >actual &&
+	test_cmp expect actual
 
-ok 5 - for_each_ref(refs/heads/)
+ok 57 - git commit logged updates
 
-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
+expecting success of 1400.58 'git cat-file blob main:F (expect OTHER)': 
+	test OTHER = $(git cat-file blob main:F)
 
-ok 6 - for_each_ref() is sorted
+ok 58 - git cat-file blob main:F (expect OTHER)
 
-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
+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 7 - resolve_ref(new-main)
+ok 59 - git cat-file blob main@{2005-05-26 23:30}:F (expect TEST)
 
-expecting success of 1405.8 'verify_ref(new-main)': 
-	$RUN verify-ref refs/heads/new-main
+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 8 - verify_ref(new-main)
+ok 60 - git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)
 
-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
+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 9 - for_each_reflog()
+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 1405.10 'for_each_reflog_ent()': 
-	$RUN for-each-reflog-ent HEAD >actual &&
-	head -n1 actual | grep one &&
-	tail -n1 actual | grep recreate-main
+expecting success of 1400.62 'create pseudoref': 
+	git update-ref PSEUDOREF $A &&
+	test $A = $(git show-ref -s --verify PSEUDOREF)
 
-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()
+ok 62 - create pseudoref
 
-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
+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)
 
-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()
+ok 63 - overwrite pseudoref with no old value given
 
-expecting success of 1405.12 'reflog_exists(HEAD)': 
-	$RUN reflog-exists HEAD
+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)
 
-ok 12 - reflog_exists(HEAD)
+ok 64 - overwrite pseudoref with correct old value
 
-expecting success of 1405.13 'delete_reflog(HEAD)': 
-	$RUN delete-reflog HEAD &&
-	test_must_fail git reflog exists HEAD
+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 13 - delete_reflog(HEAD)
+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 1405.14 'create-reflog(HEAD)': 
-	$RUN create-reflog HEAD &&
-	git reflog exists HEAD
+expecting success of 1400.66 'delete pseudoref': 
+	git update-ref -d PSEUDOREF &&
+	test_must_fail git show-ref -s --verify PSEUDOREF
 
-ok 14 - create-reflog(HEAD)
+fatal: 'PSEUDOREF' - not a valid ref
+ok 66 - delete pseudoref
 
-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
+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
 
-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)
+error: cannot lock ref 'PSEUDOREF': is at 102939797ab91a4f201d131418d2c9d919dcdd2c but expected 56d5c1374e8028a1e122ab046ab7b98165342dc4
+ok 67 - do not delete pseudoref with wrong old value
 
-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 1400.68 'delete pseudoref with correct old value': 
+	git update-ref -d PSEUDOREF $A &&
+	test_must_fail git show-ref -s --verify PSEUDOREF
 
-HEAD is now at 12c332b bar-commit
-fatal: bad revision 'refs/heads/foo'
-ok 16 - delete_ref(refs/heads/foo)
+fatal: 'PSEUDOREF' - not a valid ref
+ok 68 - delete pseudoref with correct old value
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1406-submodule-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-	)
+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)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1406-submodule-ref-store/sub/.git/
-[main (root-commit) 50e526b] first
+ok 69 - create pseudoref with old OID zero
+
+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
+
+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 first.t
-Switched to a new branch 'new-main'
-ok 1 - setup
+ create mode 100644 path with space
+ok 71 - stdin test setup
 
-expecting success of 1406.2 'pack_refs() not allowed': 
-	test_must_fail $RUN pack-refs 3
+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: unknown function pack-refs
-ok 2 - pack_refs() not allowed
+usage: git update-ref [<options>] -d <refname> [<old-oid>]
+ok 72 - -z fails without --stdin
 
-expecting success of 1406.3 'create_symref() not allowed': 
-	test_must_fail $RUN create-symref FOO refs/heads/main nothing
+expecting success of 1400.73 'stdin works with no input': 
+	>stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse --verify -q $m
 
-BUG: refs/files-backend.c:146: operation create_symref requires abilities 0x2, but only have 0x5
-ok 3 - create_symref() not allowed
+536da9bc9e8e6d0baf01b41cf3cc49bb819559e6
+ok 73 - stdin works with no input
 
-expecting success of 1406.4 'delete_refs() not allowed': 
-	test_must_fail $RUN delete-refs 0 nothing FOO refs/tags/new-tag
+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
 
-BUG: refs/files-backend.c:146: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
-ok 4 - delete_refs() not allowed
+fatal: empty command in input
+ok 74 - stdin fails on empty line
 
-expecting success of 1406.5 'rename_refs() not allowed': 
-	test_must_fail $RUN rename-ref refs/heads/main refs/heads/new-main
+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
 
-BUG: refs/files-backend.c:146: operation rename_ref requires abilities 0x2, but only have 0x5
-ok 5 - rename_refs() not allowed
+fatal: whitespace before command:  
+ok 75 - stdin fails on only whitespace
 
-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
+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 6 - for_each_ref(refs/heads/)
+fatal: whitespace before command:  create refs/heads/a refs/heads/main
+ok 76 - stdin fails on leading whitespace
 
-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
+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 7 - for_each_ref() is sorted
+fatal: unknown command: unknown refs/heads/a
+ok 77 - stdin fails on unknown command
 
-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
+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 8 - resolve_ref(main)
+fatal: badly quoted argument: "main
+ok 78 - stdin fails on unbalanced quotes
 
-expecting success of 1406.9 'verify_ref(new-main)': 
-	$RUN verify-ref refs/heads/new-main
+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 9 - verify_ref(new-main)
+fatal: badly quoted argument: "ma\zn"
+ok 79 - stdin fails on invalid escape
 
-expecting success of 1406.10 'for_each_reflog()': 
-	$RUN for-each-reflog >actual &&
-	cat >expected <<-\EOF &&
-	HEAD
-	refs/heads/main
-	refs/heads/new-main
+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
+
+fatal: unexpected character after quoted argument: "refs/heads/a"main
+ok 80 - stdin fails on junk after quoted argument
+
+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: create: missing <ref>
+ok 81 - stdin fails create with no ref
+
+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
+
+fatal: create refs/heads/a: missing <new-oid>
+ok 82 - stdin fails create with no new value
+
+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
+
+fatal: create refs/heads/a: extra input:  refs/heads/main
+ok 83 - stdin fails create with too many arguments
+
+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
+
+fatal: update: missing <ref>
+ok 84 - stdin fails update with no ref
+
+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
+
+fatal: update refs/heads/a: missing <new-oid>
+ok 85 - stdin fails update with no new value
+
+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: update refs/heads/a: extra input:  refs/heads/main
+ok 86 - stdin fails update with too many arguments
+
+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
+
+fatal: delete: missing <ref>
+ok 87 - stdin fails delete with no ref
+
+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
+
+fatal: delete refs/heads/a: extra input:  refs/heads/main
+ok 88 - stdin fails delete with too many arguments
+
+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
+
+fatal: verify refs/heads/a: extra input:  refs/heads/main
+ok 89 - stdin fails verify with too many arguments
+
+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
+
+fatal: option unknown: unknown
+ok 90 - stdin fails option with unknown name
+
+expecting success of 1400.91 'stdin fails with duplicate refs': 
+	cat >stdin <<-EOF &&
+	create $a $m
+	create $b $m
+	create $a $m
 	EOF
-	test_cmp expected actual
+	test_must_fail git update-ref --stdin <stdin 2>err &&
+	test_grep "fatal: multiple updates for ref '$a' not allowed" err
 
-ok 10 - for_each_reflog()
+fatal: multiple updates for ref 'refs/heads/a' not allowed
+ok 91 - stdin fails with duplicate refs
 
-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
+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
 
-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()
+ok 92 - stdin create ref works
 
-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
+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
 
-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()
+ok 93 - stdin does not create reflogs by default
 
-expecting success of 1406.13 'reflog_exists(HEAD)': 
-	$RUN reflog-exists HEAD
+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 13 - reflog_exists(HEAD)
+ok 94 - stdin creates reflogs with --create-reflog
 
-expecting success of 1406.14 'delete_reflog() not allowed': 
-	test_must_fail $RUN delete-reflog HEAD
+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
 
-BUG: refs/files-backend.c:146: operation delete_reflog requires abilities 0x2, but only have 0x5
-ok 14 - delete_reflog() not allowed
+ok 95 - stdin succeeds with quoted argument
 
-expecting success of 1406.15 'create-reflog() not allowed': 
-	test_must_fail $RUN create-reflog HEAD
+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
 
-BUG: refs/files-backend.c:146: operation create_reflog requires abilities 0x2, but only have 0x5
-ok 15 - create-reflog() not allowed
+ok 96 - stdin succeeds with escaped character
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t0027-auto-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0027-auto-crlf/.git/
-expecting success of 0027.1 'ls-files --eol -o Text/Binary': 
-	test_when_finished "rm expect actual TeBi_*" &&
-	STRT=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA &&
-	STR=$STRT$STRT$STRT$STRT &&
-	printf "${STR}BBB\001" >TeBi_127_S &&
-	printf "${STR}BBBB\001">TeBi_128_S &&
-	printf "${STR}BBB\032" >TeBi_127_E &&
-	printf "\032${STR}BBB" >TeBi_E_127 &&
-	printf "${STR}BBBB\000">TeBi_128_N &&
-	printf "${STR}BBB\012">TeBi_128_L &&
-	printf "${STR}BBB\015">TeBi_127_C &&
-	printf "${STR}BB\015\012" >TeBi_126_CL &&
-	printf "${STR}BB\015\012\015" >TeBi_126_CLC &&
-	sort <<-\EOF >expect &&
-	i/ w/-text TeBi_127_S
-	i/ w/none TeBi_128_S
-	i/ w/none TeBi_127_E
-	i/ w/-text TeBi_E_127
-	i/ w/-text TeBi_128_N
-	i/ w/lf TeBi_128_L
-	i/ w/-text TeBi_127_C
-	i/ w/crlf TeBi_126_CL
-	i/ w/-text TeBi_126_CLC
+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
+
+ok 97 - stdin update ref creates with zero old value
+
+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
+
+ok 98 - stdin update ref creates with empty old value
+
+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
+
+ok 99 - stdin create ref works with path with space to blob
+
+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
+
+fatal: cannot lock ref 'refs/heads/c': unable to resolve reference 'refs/heads/c'
+ok 100 - stdin update ref fails with wrong old value
+
+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
+
+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
+
+fatal: create refs/heads/c: invalid <new-oid>: does-not-exist
+ok 102 - stdin create ref fails with bad new value
+
+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
+
+fatal: create refs/heads/c: zero <new-oid>
+ok 103 - stdin create ref fails with zero new value
+
+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 104 - stdin update ref works with right old value
+
+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: 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 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: delete refs/heads/a: zero <old-oid>
+ok 106 - stdin delete ref fails with zero old value
+
+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 ls-files --eol -o >tmp &&
-	sed -n -e "/TeBi_/{s!attr/[	]*!!g
-	s!	! !g
-	s!  *! !g
-	p
-	}" tmp | sort >actual &&
+	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
 
-ok 1 - ls-files --eol -o Text/Binary
+ok 107 - stdin update symref works option no-deref
 
-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 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
 
-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.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" ""        ""
-
-[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.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" ""        ""
-
-[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
+ok 108 - stdin delete symref works option no-deref
 
-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 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
 
-[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
+ok 109 - stdin update symref works flag --no-deref
 
-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 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
 
-[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
+ok 110 - stdin delete symref works flag --no-deref
 
-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 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
 
-[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
+ok 111 - stdin delete ref works with right old value
 
-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 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
 
-[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
+ok 112 - stdin update/create/verify combination works
 
-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 1400.113 'stdin verify succeeds for correct value': 
+	git rev-parse $m >expect &&
+	echo "verify $m $m" >stdin &&
+	git update-ref --stdin <stdin &&
+	git rev-parse $m >actual &&
+	test_cmp expect actual
 
-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=
+ok 113 - stdin verify succeeds for correct value
 
-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
+expecting success of 1400.114 'stdin verify succeeds for missing reference': 
+	echo "verify refs/heads/missing $Z" >stdin &&
+	git update-ref --stdin <stdin &&
+	test_must_fail git rev-parse --verify -q refs/heads/missing
 
-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
+ok 114 - stdin verify succeeds for missing reference
 
-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 
+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 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
+ok 115 - stdin verify treats no value as missing
 
-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
+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 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=
+fatal: cannot lock ref 'refs/heads/main': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
+ok 116 - stdin verify fails for wrong value
 
-expecting success of 0027.17 'commit file with mixed EOL onto CLRF attr= aeol= crlf=true': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 17 - commit file with mixed EOL onto CLRF attr= aeol= crlf=true
+expecting success of 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 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
+fatal: cannot lock ref 'refs/heads/main': reference already exists
+ok 117 - stdin verify fails for mistaken null value
 
-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 
+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 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
+fatal: cannot lock ref 'refs/heads/main': reference already exists
+ok 118 - stdin verify fails for mistaken empty value
 
-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 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
 
-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=
+ok 119 - stdin update refs works with identity updates
 
-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 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
 
-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
+fatal: cannot lock ref 'refs/heads/c': reference already exists
+ok 120 - stdin update refs fails with wrong old value
 
-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 
+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 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
+ok 121 - stdin delete refs works with packed and loose refs
 
-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 1400.122 'stdin -z works on empty input': 
+	>stdin &&
+	git update-ref -z --stdin <stdin &&
+	git rev-parse --verify -q $m
 
-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
+536da9bc9e8e6d0baf01b41cf3cc49bb819559e6
+ok 122 - stdin -z works on empty input
 
-expecting success of 0027.29 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 29 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false
+expecting success of 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 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
+fatal: whitespace before command: 
+ok 123 - stdin -z fails on empty line
 
-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 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 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
+fatal: empty command in input
+ok 124 - stdin -z fails on empty command
 
-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
+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 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
+fatal: whitespace before command:  
+ok 125 - stdin -z fails on only whitespace
 
-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
+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
 
-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
+fatal: whitespace before command:  create refs/heads/a
+ok 126 - stdin -z fails on leading whitespace
 
-expecting success of 0027.37 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true ': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 37 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true 
+expecting success of 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
 
-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
+fatal: unknown command: unknown refs/heads/a
+ok 127 - stdin -z fails on unknown command
 
-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 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
 
-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
+fatal: create: missing <ref>
+ok 128 - stdin -z fails create with no ref
 
-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 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 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
+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 0027.43 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input ': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 43 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input 
+expecting success of 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
 
-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
+fatal: unknown command: refs/heads/main
+ok 130 - stdin -z fails create with too many arguments
 
-expecting success of 0027.45 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 45 - setup commit NNO files
+expecting success of 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
 
-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
+fatal: update: missing <ref>
+ok 131 - stdin -z fails update with no ref
 
-expecting success of 0027.47 'commit NNO files attr= aeol= crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 47 - commit NNO files attr= aeol= crlf=false CRLF
+expecting success of 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 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
+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 0027.49 'commit NNO files attr= aeol= crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 49 - commit NNO files attr= aeol= crlf=false LF_mix_cr
+expecting success of 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
 
-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
+warning: update refs/heads/a: missing <new-oid>, treating as zero
+ok 133 - stdin -z emits warning with empty new value
 
-expecting success of 0027.51 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 51 - setup commit NNO files
+expecting success of 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
 
-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
+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 0027.53 'commit NNO files attr= aeol= crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 53 - commit NNO files attr= aeol= crlf=true CRLF
+expecting success of 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 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
+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 0027.55 'commit NNO files attr= aeol= crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 55 - commit NNO files attr= aeol= crlf=true LF_mix_cr
+expecting success of 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
 
-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
+fatal: unknown command: refs/heads/main
+ok 136 - stdin -z fails update with too many arguments
 
-expecting success of 0027.57 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 57 - setup commit NNO files
+expecting success of 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
 
-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
+fatal: delete: missing <ref>
+ok 137 - stdin -z fails delete with no ref
 
-expecting success of 0027.59 'commit NNO files attr= aeol= crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 59 - commit NNO files attr= aeol= crlf=input CRLF
+expecting success of 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 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
+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 0027.61 'commit NNO files attr= aeol= crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 61 - commit NNO files attr= aeol= crlf=input LF_mix_cr
+expecting success of 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
 
-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
+fatal: unknown command: refs/heads/main
+ok 139 - stdin -z fails delete with too many arguments
 
-expecting success of 0027.63 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 63 - setup commit NNO files
+expecting success of 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
 
-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
+fatal: unknown command: refs/heads/main
+ok 140 - stdin -z fails verify with too many arguments
 
-expecting success of 0027.65 'commit NNO files attr=auto aeol= crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 65 - commit NNO files attr=auto aeol= crlf=false CRLF
+expecting success of 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 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
+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 0027.67 'commit NNO files attr=auto aeol= crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 67 - commit NNO files attr=auto aeol= crlf=false LF_mix_cr
+expecting success of 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
 
-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
+fatal: option unknown: unknown
+ok 142 - stdin -z fails option with unknown name
 
-expecting success of 0027.69 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 69 - setup commit NNO files
+expecting success of 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
 
-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
+fatal: multiple updates for ref 'refs/heads/a' not allowed
+ok 143 - stdin -z fails with duplicate refs
 
-expecting success of 0027.71 'commit NNO files attr=auto aeol= crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 71 - commit NNO files attr=auto aeol= crlf=true CRLF
+expecting success of 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 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
+ok 144 - stdin -z create ref works
 
-expecting success of 0027.73 'commit NNO files attr=auto aeol= crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 73 - commit NNO files attr=auto aeol= crlf=true LF_mix_cr
+expecting success of 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
 
-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 145 - stdin -z update ref creates with zero old value
 
-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 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
 
-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
+ok 146 - stdin -z update ref creates with empty old value
 
-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 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 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
+ok 147 - stdin -z create ref works with path with space to blob
 
-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 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
 
-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
+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 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 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
 
-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
+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 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 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 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
+fatal: cannot lock ref 'refs/heads/c': reference already exists
+ok 150 - stdin -z create ref fails when ref exists
 
-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 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
 
-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
+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 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 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
 
-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
+fatal: create refs/heads/c: missing <new-oid>
+ok 152 - stdin -z create ref fails with empty new value
 
-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 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 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
+ok 153 - stdin -z update ref works with right old value
 
-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 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
 
-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
+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 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 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
 
-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
+fatal: delete refs/heads/a: zero <old-oid>
+ok 155 - stdin -z delete ref fails with zero old value
 
-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 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 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
+ok 156 - stdin -z update symref works option no-deref
 
-expecting success of 0027.97 'commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 97 - commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr
+expecting success of 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
 
-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
+ok 157 - stdin -z delete symref works option no-deref
 
-expecting success of 0027.99 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 99 - setup commit NNO files
+expecting success of 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
 
-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
+ok 158 - stdin -z delete ref works with right old value
 
-expecting success of 0027.101 'commit NNO files attr= aeol=lf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 101 - commit NNO files attr= aeol=lf crlf=true CRLF
+expecting success of 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 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
+ok 159 - stdin -z update/create/verify combination works
 
-expecting success of 0027.103 'commit NNO files attr= aeol=lf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 103 - commit NNO files attr= aeol=lf crlf=true LF_mix_cr
+expecting success of 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
 
-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
+ok 160 - stdin -z verify succeeds for correct value
 
-expecting success of 0027.105 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 105 - setup commit NNO files
+expecting success of 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
 
-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
+ok 161 - stdin -z verify succeeds for missing reference
 
-expecting success of 0027.107 'commit NNO files attr= aeol=crlf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 107 - commit NNO files attr= aeol=crlf crlf=true CRLF
+expecting success of 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 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
+ok 162 - stdin -z verify treats no value as missing
 
-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 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
 
-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
+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 0027.111 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 111 - setup commit NNO files
+expecting success of 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
 
-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
+fatal: cannot lock ref 'refs/heads/main': reference already exists
+ok 164 - stdin -z verify fails for mistaken null value
 
-expecting success of 0027.113 'commit NNO files attr=auto aeol=lf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 113 - commit NNO files attr=auto aeol=lf crlf=true CRLF
+expecting success of 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 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
+fatal: cannot lock ref 'refs/heads/main': reference already exists
+ok 165 - stdin -z verify fails for mistaken empty value
 
-expecting success of 0027.115 'commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 115 - commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr
+expecting success of 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
 
-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
+ok 166 - stdin -z update refs works with identity updates
 
-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 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
 
-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
+fatal: cannot lock ref 'refs/heads/c': reference already exists
+ok 167 - stdin -z update refs fails with wrong old value
 
-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 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 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
+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 0027.121 'commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 121 - commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr
+expecting success of 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
 
-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
+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 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 1400.170 'fails with duplicate ref update via symref': 
+	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
 
-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
+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
 
-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
+checking prerequisite: ULIMIT_FILE_DESCRIPTORS
 
-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
+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
 
-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
+)
+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
+)
 
-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
+102939797ab91a4f201d131418d2c9d919dcdd2c
+ok 171 - large transaction creating branches does not burst open file limit
 
-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 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
+)
 
-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
+ok 172 - large transaction deleting branches does not burst open file limit
 
-expecting success of 0027.131 'commit NNO files attr=text aeol=crlf crlf=true CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 131 - commit NNO files attr=text aeol=crlf crlf=true CRLF
+expecting success of 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 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
+[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	2024-11-14 19:28:18.340941807 +0000
++++ worktree-head	2024-11-14 19:28:18.240940788 +0000
+@@ -1 +1 @@
+-58a052250c09f010b95ad9bfe32f35d704eda1a0
++b62e0cb4990da3244885da90fe7d493334cca9f5
+ok 173 - handle per-worktree refs in refs/bisect
 
-expecting success of 0027.133 'commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 133 - commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr
+expecting success of 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
 
-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
+ok 174 - transaction handles empty commit
 
-expecting success of 0027.135 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 135 - setup commit NNO files
+expecting success of 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
 
-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
+ok 175 - transaction handles empty commit with missing prepare
 
-expecting success of 0027.137 'commit NNO files attr=-text aeol= crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 137 - commit NNO files attr=-text aeol= crlf=false CRLF
+expecting success of 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 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
+ok 176 - transaction handles sole commit
 
-expecting success of 0027.139 'commit NNO files attr=-text aeol= crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 139 - commit NNO files attr=-text aeol= crlf=false LF_mix_cr
+expecting success of 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
 
-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
+ok 177 - transaction handles empty abort
 
-expecting success of 0027.141 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 141 - setup commit NNO files
+expecting success of 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
 
-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
+fatal: transaction is closed
+ok 178 - transaction exits on multiple aborts
 
-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 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 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
+fatal: prepared transactions can only be closed
+ok 179 - transaction exits on start after prepare
 
-expecting success of 0027.145 'commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 145 - commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr
+expecting success of 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
 
-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
+ok 180 - transaction handles empty abort with missing prepare
 
-expecting success of 0027.147 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 147 - setup commit NNO files
+expecting success of 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
 
-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
+ok 181 - transaction handles sole abort
 
-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 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 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
+ok 182 - transaction can handle commit
 
-expecting success of 0027.151 'commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 151 - commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr
+expecting success of 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
 
-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
+ok 183 - transaction can handle abort
 
-expecting success of 0027.153 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 153 - setup commit NNO files
+expecting success of 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
 
-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
+ok 184 - transaction aborts by default
 
-expecting success of 0027.155 'commit NNO files attr= aeol=lf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 155 - commit NNO files attr= aeol=lf crlf=false CRLF
+expecting success of 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 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
+ok 185 - transaction with prepare aborts by default
 
-expecting success of 0027.157 'commit NNO files attr= aeol=lf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 157 - commit NNO files attr= aeol=lf crlf=false LF_mix_cr
+expecting success of 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
 
-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
+ok 186 - transaction can commit multiple times
 
-expecting success of 0027.159 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 159 - setup commit NNO files
+expecting success of 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
 
-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
+fatal: 'refs/heads/create-and-delete' - not a valid ref
+ok 187 - transaction can create and delete
 
-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 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 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
+ok 188 - transaction can commit after abort
 
-expecting success of 0027.163 'commit NNO files attr= aeol=crlf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 163 - commit NNO files attr= aeol=crlf crlf=false LF_mix_cr
+expecting success of 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
 
-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
+fatal: cannot restart ongoing transaction
+fatal: 'refs/heads/restart' - not a valid ref
+ok 189 - transaction cannot restart ongoing transaction
 
-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
+checking prerequisite: PIPE
 
-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
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
 
-expecting success of 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
+)
+prerequisite PIPE ok
+expecting success of 1400.190 'transaction flushes status updates': 
+	mkfifo in out &&
+	(git update-ref --stdin <in >out &) &&
 
-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
+	exec 9>in &&
+	exec 8<out &&
+	test_when_finished "exec 9>&-" &&
+	test_when_finished "exec 8<&-" &&
 
-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
+	echo "start" >&9 &&
+	echo "start: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected 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 170 - commit NNO files attr=auto aeol=lf crlf=false CRLF_nul
+	echo "create refs/heads/flush $A" >&9 &&
 
-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
+	echo prepare >&9 &&
+	echo "prepare: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual &&
 
-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
+	# 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 &&
 
-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
+	echo commit >&9 &&
+	echo "commit: ok" >expected &&
+	read line <&8 &&
+	echo "$line" >actual &&
+	test_cmp expected actual
 
-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
+fatal: update_ref failed for ref 'refs/heads/flush': cannot lock ref 'refs/heads/flush': Unable to create '/build/reproducible-path/git-2.45.2/t/trash directory.t1400-update-ref/.git/refs/heads/flush.lock': File exists.
+ok 190 - transaction flushes status updates
 
-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
+# passed all 190 test(s)
+1..190
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1404-update-ref-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1404-update-ref-errors/.git/
+expecting success of 1404.1 'setup': 
 
-expecting success of 0027.176 'commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 176 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul
+	git 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)
 
-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
+[master (root-commit) d31adcd] Initial
+ Author: A U Thor <author@example.com>
+[master e6940ad] Second
+ Author: A U Thor <author@example.com>
+[master c2327cb] Third
+ Author: A U Thor <author@example.com>
+ok 1 - setup
 
-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 1404.2 'existing loose ref is a simple prefix of new': 
 
-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
+	prefix=refs/1l &&
+	test_update_rejected "a c e" false "b c/x d" \
+		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
 
-expecting success of 0027.180 'commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 180 - commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF
 
-expecting success of 0027.181 'commit NNO files attr=text aeol=lf crlf=false LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 181 - commit NNO files attr=text aeol=lf crlf=false LF_mix_cr
+fatal: cannot lock ref 'refs/1l/c/x': 'refs/1l/c' exists; cannot create 'refs/1l/c/x'
+ok 2 - existing loose ref is a simple prefix of new
 
-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 1404.3 'existing packed ref is a simple prefix of new': 
 
-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
+	prefix=refs/1p &&
+	test_update_rejected "a c e" true "b c/x d" \
+		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x$SQ"
 
-expecting success of 0027.184 'commit NNO files crlf=false attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 184 - commit NNO files crlf=false attr=text LF
 
-expecting success of 0027.185 'commit NNO files attr=text aeol=crlf crlf=false CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 185 - commit NNO files attr=text aeol=crlf crlf=false CRLF
+fatal: cannot lock ref 'refs/1p/c/x': 'refs/1p/c' exists; cannot create 'refs/1p/c/x'
+ok 3 - existing packed ref is a simple prefix of new
 
-expecting success of 0027.186 'commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 186 - commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF
+expecting success of 1404.4 'existing loose ref is a deeper prefix of new': 
 
-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
+	prefix=refs/2l &&
+	test_update_rejected "a c e" false "b c/x/y d" \
+		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
 
-expecting success of 0027.188 'commit NNO files attr=text aeol=crlf crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 188 - commit NNO files attr=text aeol=crlf crlf=false CRLF_nul
 
-expecting success of 0027.189 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 189 - setup commit NNO files
+fatal: cannot lock ref 'refs/2l/c/x/y': 'refs/2l/c' exists; cannot create 'refs/2l/c/x/y'
+ok 4 - existing loose ref is a deeper prefix of new
 
-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 1404.5 'existing packed ref is a deeper prefix of new': 
 
-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
+	prefix=refs/2p &&
+	test_update_rejected "a c e" true "b c/x/y d" \
+		"$SQ$prefix/c$SQ exists; cannot create $SQ$prefix/c/x/y$SQ"
 
-expecting success of 0027.192 'commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 192 - commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF
 
-expecting success of 0027.193 'commit NNO files attr=-text aeol= crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 193 - commit NNO files attr=-text aeol= crlf=input LF_mix_cr
+fatal: cannot lock ref 'refs/2p/c/x/y': 'refs/2p/c' exists; cannot create 'refs/2p/c/x/y'
+ok 5 - existing packed ref is a deeper prefix of new
 
-expecting success of 0027.194 'commit NNO files attr=-text aeol= crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 194 - commit NNO files attr=-text aeol= crlf=input CRLF_nul
+expecting success of 1404.6 'new ref is a simple prefix of existing loose': 
 
-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
+	prefix=refs/3l &&
+	test_update_rejected "a c/x e" false "b c d" \
+		"$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
 
-expecting success of 0027.196 'commit NNO files crlf=input attr=-text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 196 - commit NNO files crlf=input attr=-text LF
 
-expecting success of 0027.197 'commit NNO files attr=-text aeol=lf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 197 - commit NNO files attr=-text aeol=lf crlf=input CRLF
+fatal: cannot lock ref 'refs/3l/c': 'refs/3l/c/x' exists; cannot create 'refs/3l/c'
+ok 6 - new ref is a simple prefix of existing loose
 
-expecting success of 0027.198 'commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 198 - commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF
+expecting success of 1404.7 'new ref is a simple prefix of existing packed': 
 
-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
+	prefix=refs/3p &&
+	test_update_rejected "a c/x e" true "b c d" \
+		"$SQ$prefix/c/x$SQ exists; cannot create $SQ$prefix/c$SQ"
 
-expecting success of 0027.200 'commit NNO files attr=-text aeol=lf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 200 - commit NNO files attr=-text aeol=lf crlf=input CRLF_nul
 
-expecting success of 0027.201 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 201 - setup commit NNO files
+fatal: cannot lock ref 'refs/3p/c': 'refs/3p/c/x' exists; cannot create 'refs/3p/c'
+ok 7 - new ref is a simple prefix of existing packed
 
-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 1404.8 'new ref is a deeper prefix of existing loose': 
 
-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
+	prefix=refs/4l &&
+	test_update_rejected "a c/x/y e" false "b c d" \
+		"$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
 
-expecting success of 0027.204 'commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 204 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF
 
-expecting success of 0027.205 'commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr': 
-		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
-	
-ok 205 - commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr
+fatal: cannot lock ref 'refs/4l/c': 'refs/4l/c/x/y' exists; cannot create 'refs/4l/c'
+ok 8 - new ref is a deeper prefix of existing loose
 
-expecting success of 0027.206 'commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 206 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul
+expecting success of 1404.9 'new ref is a deeper prefix of existing packed': 
 
-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
+	prefix=refs/4p &&
+	test_update_rejected "a c/x/y e" true "b c d" \
+		"$SQ$prefix/c/x/y$SQ exists; cannot create $SQ$prefix/c$SQ"
 
-expecting success of 0027.208 'commit NNO files crlf=input attr= LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 208 - commit NNO files crlf=input attr= LF
 
-expecting success of 0027.209 'commit NNO files attr= aeol=lf crlf=input CRLF': 
-		check_warning "$crlfwarn" ${pfx}_CRLF.err
-	
-ok 209 - commit NNO files attr= aeol=lf crlf=input CRLF
+fatal: cannot lock ref 'refs/4p/c': 'refs/4p/c/x/y' exists; cannot create 'refs/4p/c'
+ok 9 - new ref is a deeper prefix of existing packed
 
-expecting success of 0027.210 'commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 210 - commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF
+expecting success of 1404.10 'one new ref is a simple prefix of another': 
 
-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
+	prefix=refs/5 &&
+	test_update_rejected "a e" false "b c c/x d" \
+		"cannot process $SQ$prefix/c$SQ and $SQ$prefix/c/x$SQ at the same time"
 
-expecting success of 0027.212 'commit NNO files attr= aeol=lf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 212 - commit NNO files attr= aeol=lf crlf=input CRLF_nul
 
-expecting success of 0027.213 'setup commit NNO files': 
-		#Commit files on top of existing file
-		create_gitattributes "$attr" $aeol &&
-		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
-		do
-			fname=${pfx}_$f.txt &&
-			cp $f $fname &&
-			printf Z >>"$fname" &&
-			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
-			return 1
-		done
-	
-ok 213 - setup commit NNO files
+fatal: cannot lock ref 'refs/5/c': cannot process 'refs/5/c' and 'refs/5/c/x' at the same time
+ok 10 - one new ref is a simple prefix of another
 
-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 1404.11 'D/F conflict prevents add long + delete short': 
+	df_test refs/df-al-ds --add-del foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-al-ds/r/foo/bar': 'refs/df-al-ds/r/foo' exists; cannot create 'refs/df-al-ds/r/foo/bar'
+ok 11 - D/F conflict prevents add long + delete short
 
-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 1404.12 'D/F conflict prevents add short + delete long': 
+	df_test refs/df-as-dl --add-del foo foo/bar
 
-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
+fatal: cannot lock ref 'refs/df-as-dl/r/foo': 'refs/df-as-dl/r/foo/bar' exists; cannot create 'refs/df-as-dl/r/foo'
+ok 12 - D/F conflict prevents add short + delete long
 
-expecting success of 0027.218 'commit NNO files attr= aeol=crlf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 218 - commit NNO files attr= aeol=crlf crlf=input CRLF_nul
+expecting success of 1404.13 'D/F conflict prevents delete long + add short': 
+	df_test refs/df-dl-as --del-add foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-dl-as/r/foo': 'refs/df-dl-as/r/foo/bar' exists; cannot create 'refs/df-dl-as/r/foo'
+ok 13 - D/F conflict prevents delete long + add short
 
-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 1404.14 'D/F conflict prevents delete short + add long': 
+	df_test refs/df-ds-al --del-add foo foo/bar
 
-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
+fatal: cannot lock ref 'refs/df-ds-al/r/foo/bar': 'refs/df-ds-al/r/foo' exists; cannot create 'refs/df-ds-al/r/foo/bar'
+ok 14 - D/F conflict prevents delete short + add long
 
-expecting success of 0027.222 'commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 222 - commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF
+expecting success of 1404.15 'D/F conflict prevents add long + delete short packed': 
+	df_test refs/df-al-dsp --pack --add-del foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-al-dsp/r/foo/bar': 'refs/df-al-dsp/r/foo' exists; cannot create 'refs/df-al-dsp/r/foo/bar'
+ok 15 - D/F conflict prevents add long + delete short packed
 
-expecting success of 0027.224 'commit NNO files attr=auto aeol=lf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 224 - commit NNO files attr=auto aeol=lf crlf=input CRLF_nul
+expecting success of 1404.16 'D/F conflict prevents add short + delete long packed': 
+	df_test refs/df-as-dlp --pack --add-del foo foo/bar
 
-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
+fatal: cannot lock ref 'refs/df-as-dlp/r/foo': 'refs/df-as-dlp/r/foo/bar' exists; cannot create 'refs/df-as-dlp/r/foo'
+ok 16 - D/F conflict prevents add short + delete long packed
 
-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 1404.17 'D/F conflict prevents delete long packed + add short': 
+	df_test refs/df-dlp-as --pack --del-add foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-dlp-as/r/foo': 'refs/df-dlp-as/r/foo/bar' exists; cannot create 'refs/df-dlp-as/r/foo'
+ok 17 - D/F conflict prevents delete long packed + add short
 
-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 1404.18 'D/F conflict prevents delete short packed + add long': 
+	df_test refs/df-dsp-al --pack --del-add foo foo/bar
 
-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
+fatal: cannot lock ref 'refs/df-dsp-al/r/foo/bar': 'refs/df-dsp-al/r/foo' exists; cannot create 'refs/df-dsp-al/r/foo/bar'
+ok 18 - D/F conflict prevents delete short packed + add long
 
-expecting success of 0027.230 'commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 230 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul
+expecting success of 1404.19 'D/F conflict prevents indirect add long + delete short': 
+	df_test refs/df-ial-ds --sym-add --add-del foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-ial-ds/s/symadd': 'refs/df-ial-ds/r/foo' exists; cannot create 'refs/df-ial-ds/r/foo/bar'
+ok 19 - D/F conflict prevents indirect add long + delete short
 
-expecting success of 0027.232 'commit NNO files crlf=input attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 232 - commit NNO files crlf=input attr=text LF
+expecting success of 1404.20 'D/F conflict prevents indirect add long + indirect delete short': 
+	df_test refs/df-ial-ids --sym-add --sym-del --add-del foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-ial-ids/s/symadd': 'refs/df-ial-ids/r/foo' exists; cannot create 'refs/df-ial-ids/r/foo/bar'
+ok 20 - D/F conflict prevents indirect add long + indirect delete short
 
-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 1404.21 'D/F conflict prevents indirect add short + indirect delete long': 
+	df_test refs/df-ias-idl --sym-add --sym-del --add-del foo foo/bar
 
-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
+fatal: cannot lock ref 'refs/df-ias-idl/s/symadd': 'refs/df-ias-idl/r/foo/bar' exists; cannot create 'refs/df-ias-idl/r/foo'
+ok 21 - D/F conflict prevents indirect add short + indirect delete long
 
-expecting success of 0027.236 'commit NNO files attr=text aeol=lf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 236 - commit NNO files attr=text aeol=lf crlf=input CRLF_nul
+expecting success of 1404.22 'D/F conflict prevents indirect delete long + indirect add short': 
+	df_test refs/df-idl-ias --sym-add --sym-del --del-add foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-idl-ias/s/symadd': 'refs/df-idl-ias/r/foo/bar' exists; cannot create 'refs/df-idl-ias/r/foo'
+ok 22 - D/F conflict prevents indirect delete long + indirect add short
 
-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 1404.23 'D/F conflict prevents indirect add long + delete short packed': 
+	df_test refs/df-ial-dsp --sym-add --pack --add-del foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-ial-dsp/s/symadd': 'refs/df-ial-dsp/r/foo' exists; cannot create 'refs/df-ial-dsp/r/foo/bar'
+ok 23 - D/F conflict prevents indirect add long + delete short packed
 
-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 1404.24 'D/F conflict prevents indirect add long + indirect delete short packed': 
+	df_test refs/df-ial-idsp --sym-add --sym-del --pack --add-del foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-ial-idsp/s/symadd': 'refs/df-ial-idsp/r/foo' exists; cannot create 'refs/df-ial-idsp/r/foo/bar'
+ok 24 - D/F conflict prevents indirect add long + indirect delete short packed
 
-expecting success of 0027.242 'commit NNO files attr=text aeol=crlf crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 242 - commit NNO files attr=text aeol=crlf crlf=input CRLF_nul
+expecting success of 1404.25 'D/F conflict prevents add long + indirect delete short packed': 
+	df_test refs/df-al-idsp --sym-del --pack --add-del foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-al-idsp/r/foo/bar': 'refs/df-al-idsp/r/foo' exists; cannot create 'refs/df-al-idsp/r/foo/bar'
+ok 25 - D/F conflict prevents add long + indirect delete short packed
 
-expecting success of 0027.244 'commit NNO files crlf=false attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 244 - commit NNO files crlf=false attr=text LF
+expecting success of 1404.26 'D/F conflict prevents indirect delete long packed + indirect add short': 
+	df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo
 
-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
+fatal: cannot lock ref 'refs/df-idlp-ias/s/symadd': 'refs/df-idlp-ias/r/foo/bar' exists; cannot create 'refs/df-idlp-ias/r/foo'
+ok 26 - D/F conflict prevents indirect delete long packed + indirect add short
 
-expecting success of 0027.246 'commit NNO files attr=text aeol= crlf=false CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 246 - commit NNO files attr=text aeol= crlf=false CRLF_mix_LF
+expecting success of 1404.27 'missing old value blocks update': 
+	prefix=refs/missing-update &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: unable to resolve reference $SQ$prefix/foo$SQ
+	EOF
+	printf "%s\n" "update $prefix/foo $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-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
+ok 27 - missing old value blocks update
 
-expecting success of 0027.248 'commit NNO files attr=text aeol= crlf=false CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 248 - commit NNO files attr=text aeol= crlf=false CRLF_nul
+expecting success of 1404.28 'incorrect old value blocks update': 
+	prefix=refs/incorrect-update &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
+	EOF
+	printf "%s\n" "update $prefix/foo $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-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
+ok 28 - incorrect old value blocks update
 
-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 1404.29 'existing old value blocks create': 
+	prefix=refs/existing-create &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: reference already exists
+	EOF
+	printf "%s\n" "create $prefix/foo $E" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-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
+ok 29 - existing old value blocks create
 
-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 1404.30 'incorrect old value blocks delete': 
+	prefix=refs/incorrect-delete &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/foo$SQ: is at $C but expected $D
+	EOF
+	printf "%s\n" "delete $prefix/foo $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-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
+ok 30 - incorrect old value blocks delete
 
-expecting success of 0027.254 'commit NNO files attr=text aeol= crlf=true CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 254 - commit NNO files attr=text aeol= crlf=true CRLF_nul
+expecting success of 1404.31 'missing old value blocks indirect update': 
+	prefix=refs/missing-indirect-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: unable to resolve reference $SQ$prefix/foo$SQ
+	EOF
+	printf "%s\n" "update $prefix/symref $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-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
+ok 31 - missing old value blocks indirect update
 
-expecting success of 0027.256 'commit NNO files crlf=input attr=text LF': 
-		check_warning "$lfwarn" ${pfx}_LF.err
-	
-ok 256 - commit NNO files crlf=input attr=text LF
+expecting success of 1404.32 'incorrect old value blocks indirect update': 
+	prefix=refs/incorrect-indirect-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
+	EOF
+	printf "%s\n" "update $prefix/symref $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.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
+ok 32 - incorrect old value blocks indirect update
 
-expecting success of 0027.258 'commit NNO files attr=text aeol= crlf=input CRLF_mix_LF': 
-		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
-	
-ok 258 - commit NNO files attr=text aeol= crlf=input CRLF_mix_LF
+expecting success of 1404.33 'existing old value blocks indirect create': 
+	prefix=refs/existing-indirect-create &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
+	EOF
+	printf "%s\n" "create $prefix/symref $E" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-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
+ok 33 - existing old value blocks indirect create
 
-expecting success of 0027.260 'commit NNO files attr=text aeol= crlf=input CRLF_nul': 
-		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
-	
-ok 260 - commit NNO files attr=text aeol= crlf=input CRLF_nul
+expecting success of 1404.34 'incorrect old value blocks indirect delete': 
+	prefix=refs/incorrect-indirect-delete &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
+	EOF
+	printf "%s\n" "delete $prefix/symref $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-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
+ok 34 - incorrect old value blocks indirect delete
 
-[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 1404.35 'missing old value blocks indirect no-deref update': 
+	prefix=refs/missing-noderef-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: reference is missing but expected $D
+	EOF
+	printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-expecting success of 0027.262 'commit empty gitattribues': 
-	check_files_in_repo false ""      LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
-	check_files_in_repo true  ""      LF LF   LF          LF_mix_CR CRLF_nul &&
-	check_files_in_repo input ""      LF LF   LF          LF_mix_CR CRLF_nul
+ok 35 - missing old value blocks indirect no-deref update
 
-ok 262 - commit empty gitattribues
+expecting success of 1404.36 'incorrect old value blocks indirect no-deref update': 
+	prefix=refs/incorrect-noderef-update &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
+	EOF
+	printf "%s\n" "option no-deref" "update $prefix/symref $E $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-expecting success of 0027.263 'commit text=auto': 
-	check_files_in_repo false "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
-	check_files_in_repo true  "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
-	check_files_in_repo input "auto"  LF LF   LF          LF_mix_CR CRLF_nul
+ok 36 - incorrect old value blocks indirect no-deref update
 
-ok 263 - commit text=auto
+expecting success of 1404.37 'existing old value blocks indirect no-deref create': 
+	prefix=refs/existing-noderef-create &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: reference already exists
+	EOF
+	printf "%s\n" "option no-deref" "create $prefix/symref $E" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-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 37 - existing old value blocks indirect no-deref create
 
-ok 264 - commit text
+expecting success of 1404.38 'incorrect old value blocks indirect no-deref delete': 
+	prefix=refs/incorrect-noderef-delete &&
+	git symbolic-ref $prefix/symref $prefix/foo &&
+	git update-ref $prefix/foo $C &&
+	cat >expected <<-EOF &&
+	fatal: cannot lock ref $SQ$prefix/symref$SQ: is at $C but expected $D
+	EOF
+	printf "%s\n" "option no-deref" "delete $prefix/symref $D" |
+	test_must_fail git update-ref --stdin 2>output.err &&
+	test_cmp expected output.err
 
-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 38 - incorrect old value blocks indirect no-deref delete
 
-ok 265 - commit -text
+# passed all 38 test(s)
+1..38
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1406-submodule-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 1406.2 'pack_refs() not allowed': 
+	test_must_fail $RUN pack-refs 3
 
-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
+fatal: unknown function pack-refs
+ok 2 - pack_refs() not allowed
 
-expecting success of 0027.269 'compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 269 - compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt
+expecting success of 1406.3 'create_symref() not allowed': 
+	test_must_fail $RUN create-symref FOO refs/heads/main nothing
 
-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
+BUG: refs/files-backend.c:146: operation create_symref requires abilities 0x2, but only have 0x5
+ok 3 - create_symref() not allowed
 
-expecting success of 0027.271 'compare_files LF NNO_attr_-text_aeol__true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 271 - compare_files LF NNO_attr_-text_aeol__true_LF.txt
+expecting success of 1406.4 'delete_refs() not allowed': 
+	test_must_fail $RUN delete-refs 0 nothing FOO refs/tags/new-tag
 
-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
+BUG: refs/files-backend.c:146: operation ref_transaction_prepare requires abilities 0x2, but only have 0x5
+ok 4 - delete_refs() not allowed
 
-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 1406.5 'rename_refs() not allowed': 
+	test_must_fail $RUN rename-ref refs/heads/main refs/heads/new-main
 
-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
+BUG: refs/files-backend.c:146: operation rename_ref requires abilities 0x2, but only have 0x5
+ok 5 - rename_refs() not allowed
 
-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 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
 
-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
+ok 6 - for_each_ref(refs/heads/)
 
-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 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
 
-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
+ok 7 - for_each_ref() is sorted
 
-expecting success of 0027.279 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 279 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt
+expecting success of 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
 
-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
+ok 8 - resolve_ref(main)
 
-expecting success of 0027.281 'compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 281 - compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt
+expecting success of 1406.9 'verify_ref(new-main)': 
+	$RUN verify-ref refs/heads/new-main
 
-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
+ok 9 - verify_ref(new-main)
 
-expecting success of 0027.283 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 283 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
+expecting success of 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
 
-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
+ok 10 - for_each_reflog()
 
-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 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
 
-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
+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 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 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
 
-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
+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 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 1406.13 'reflog_exists(HEAD)': 
+	$RUN reflog-exists HEAD
 
-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
+ok 13 - reflog_exists(HEAD)
 
-expecting success of 0027.291 'compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 291 - compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt
+expecting success of 1406.14 'delete_reflog() not allowed': 
+	test_must_fail $RUN delete-reflog HEAD
 
-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
+BUG: refs/files-backend.c:146: operation delete_reflog requires abilities 0x2, but only have 0x5
+ok 14 - delete_reflog() not allowed
 
-expecting success of 0027.293 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 293 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
+expecting success of 1406.15 'create-reflog() not allowed': 
+	test_must_fail $RUN create-reflog HEAD
 
-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
+BUG: refs/files-backend.c:146: operation create_reflog requires abilities 0x2, but only have 0x5
+ok 15 - create-reflog() not allowed
 
-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
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1405-main-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1405-main-ref-store/.git/
+expecting success of 1405.1 'setup': 
+	test_commit one
 
-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
+[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 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 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
 
-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
+ok 2 - create_symref(FOO, refs/heads/main)
 
-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 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 --
 
-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
+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 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 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
 
-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
+[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 0027.303 'compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 303 - compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt
+expecting success of 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
 
-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
+ok 5 - for_each_ref(refs/heads/)
 
-expecting success of 0027.305 'compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 305 - compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt
+expecting success of 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
 
-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
+ok 6 - for_each_ref() is sorted
 
-expecting success of 0027.307 'compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 307 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt
+expecting success of 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
 
-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
+ok 7 - resolve_ref(new-main)
 
-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 1405.8 'verify_ref(new-main)': 
+	$RUN verify-ref refs/heads/new-main
 
-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
+ok 8 - verify_ref(new-main)
 
-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 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
 
-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
+ok 9 - for_each_reflog()
 
-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 1405.10 'for_each_reflog_ent()': 
+	$RUN for-each-reflog-ent HEAD >actual &&
+	head -n1 actual | grep one &&
+	tail -n1 actual | grep recreate-main
 
-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
+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 0027.315 'compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 315 - compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt
+expecting success of 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
 
-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
+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 0027.317 'compare_files CRLF NNO_attr__aeol__false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 317 - compare_files CRLF NNO_attr__aeol__false_CRLF.txt
+expecting success of 1405.12 'reflog_exists(HEAD)': 
+	$RUN reflog-exists HEAD
 
-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
+ok 12 - reflog_exists(HEAD)
 
-expecting success of 0027.319 'compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 319 - compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt
+expecting success of 1405.13 'delete_reflog(HEAD)': 
+	$RUN delete-reflog HEAD &&
+	test_must_fail git reflog exists HEAD
 
-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
+ok 13 - delete_reflog(HEAD)
 
-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 1405.14 'create-reflog(HEAD)': 
+	$RUN create-reflog HEAD &&
+	git reflog exists HEAD
 
-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
+ok 14 - create-reflog(HEAD)
 
-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 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
 
-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
+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 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 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 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 12c332b bar-commit
+fatal: bad revision 'refs/heads/foo'
+ok 16 - delete_ref(refs/heads/foo)
 
-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
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1407-worktree-ref-store.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1407-worktree-ref-store/.git/
+expecting success of 1407.1 'setup': 
+	test_commit first &&
+	git worktree add -b wt-main wt &&
+	(
+		cd wt &&
+		test_commit second
+	)
 
-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
+[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 0027.329 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 329 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt
+expecting success of 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
 
-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
+ok 2 - resolve_ref(<shared-ref>)
 
-expecting success of 0027.331 'compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 331 - compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt
+expecting success of 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 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
+	SHA1=`git rev-parse HEAD` &&
+	echo "$SHA1 refs/heads/main 0x1" >expected &&
+	$RMAIN resolve-ref HEAD 0 >actual &&
+	test_cmp expected actual
 
-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
+ok 3 - resolve_ref(<per-worktree-ref>)
 
-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 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 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
+	$RMAIN create-symref FOO refs/heads/wt-main nothing &&
+	echo refs/heads/wt-main >expected &&
+	git symbolic-ref FOO >actual &&
+	test_cmp expected actual
 
-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
+ok 4 - create_symref(FOO, refs/heads/main)
 
-expecting success of 0027.337 'compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 337 - compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1408-packed-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 
-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
+	git pack-refs --all &&
+	git for-each-ref >actual &&
+	echo "$one commit	refs/heads/main" >expect &&
+	test_cmp expect actual &&
 
-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
+	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 &&
 
-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
+	git for-each-ref >actual &&
+	echo "$two commit	refs/heads/main" >expect &&
+	test_cmp expect actual &&
 
-expecting success of 0027.341 'compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 341 - compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt
+	git reflog expire --expire=now --all &&
+	git prune &&
+	git tag -m v1.0 v1.0 main
 
-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
+[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 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 1408.2 'no error from stale entry in packed-refs': 
+	git describe main >actual 2>&1 &&
+	echo "v1.0" >expect &&
+	test_cmp expect actual
 
-expecting success of 0027.344 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 344 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt
+ok 2 - no error from stale entry in packed-refs
 
-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
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1409-avoid-packing-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1409-avoid-packing-refs/.git/
+expecting success of 1409.1 'setup': 
+	git commit --allow-empty -m "Commit A" &&
+	A=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m "Commit B" &&
+	B=$(git rev-parse HEAD) &&
+	git commit --allow-empty -m "Commit C" &&
+	C=$(git rev-parse HEAD)
 
-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
+[master (root-commit) 8d09622] Commit A
+ Author: A U Thor <author@example.com>
+[master 241b9d6] Commit B
+ Author: A U Thor <author@example.com>
+[master 8d1dbac] Commit C
+ Author: A U Thor <author@example.com>
+ok 1 - setup
 
-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 1409.2 'do not create packed-refs file gratuitously': 
+	test_path_is_missing .git/packed-refs &&
+	git update-ref refs/heads/foo $A &&
+	test_path_is_missing .git/packed-refs &&
+	git update-ref refs/heads/foo $B &&
+	test_path_is_missing .git/packed-refs &&
+	git update-ref refs/heads/foo $C $B &&
+	test_path_is_missing .git/packed-refs &&
+	git update-ref -d refs/heads/foo &&
+	test_path_is_missing .git/packed-refs
 
-expecting success of 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
+ok 2 - do not create packed-refs file gratuitously
 
-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 1409.3 'check that marking the packed-refs file works': 
+	git for-each-ref >expected &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	check_packed_refs_marked &&
+	git for-each-ref >actual &&
+	test_cmp expected actual &&
+	git pack-refs --all &&
+	! check_packed_refs_marked &&
+	git for-each-ref >actual2 &&
+	test_cmp expected actual2
 
-expecting success of 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
+ok 3 - check that marking the packed-refs file works
 
-expecting success of 0027.351 'compare_files LF NNO_attr_text_aeol__false_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 351 - compare_files LF NNO_attr_text_aeol__false_LF.txt
+expecting success of 1409.4 'leave packed-refs untouched on update of packed': 
+	git update-ref refs/heads/packed-update $A &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	git update-ref refs/heads/packed-update $B &&
+	check_packed_refs_marked
 
-expecting success of 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
+ok 4 - leave packed-refs untouched on update of packed
 
-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 1409.5 'leave packed-refs untouched on checked update of packed': 
+	git update-ref refs/heads/packed-checked-update $A &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	git update-ref refs/heads/packed-checked-update $B $A &&
+	check_packed_refs_marked
 
-expecting success of 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
+ok 5 - leave packed-refs untouched on checked update of packed
 
-expecting success of 0027.355 'compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 355 - compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt
+expecting success of 1409.6 'leave packed-refs untouched on verify of packed': 
+	git update-ref refs/heads/packed-verify $A &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	echo "verify refs/heads/packed-verify $A" | git update-ref --stdin &&
+	check_packed_refs_marked
 
-expecting success of 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
+ok 6 - leave packed-refs untouched on verify of packed
 
-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 1409.7 'touch packed-refs on delete of packed': 
+	git update-ref refs/heads/packed-delete $A &&
+	git pack-refs --all &&
+	mark_packed_refs &&
+	git update-ref -d refs/heads/packed-delete &&
+	! check_packed_refs_marked
 
-expecting success of 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
+ok 7 - touch packed-refs on delete of packed
 
-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 1409.8 'leave packed-refs untouched on update of loose': 
+	git pack-refs --all &&
+	git update-ref refs/heads/loose-update $A &&
+	mark_packed_refs &&
+	git update-ref refs/heads/loose-update $B &&
+	check_packed_refs_marked
 
-expecting success of 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
+ok 8 - leave packed-refs untouched on update of loose
 
-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 1409.9 'leave packed-refs untouched on checked update of loose': 
+	git pack-refs --all &&
+	git update-ref refs/heads/loose-checked-update $A &&
+	mark_packed_refs &&
+	git update-ref refs/heads/loose-checked-update $B $A &&
+	check_packed_refs_marked
 
-expecting success of 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
+ok 9 - leave packed-refs untouched on checked update of loose
 
-expecting success of 0027.363 'compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 363 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
+expecting success of 1409.10 'leave packed-refs untouched on verify of loose': 
+	git pack-refs --all &&
+	git update-ref refs/heads/loose-verify $A &&
+	mark_packed_refs &&
+	echo "verify refs/heads/loose-verify $A" | git update-ref --stdin &&
+	check_packed_refs_marked
 
-expecting success of 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
+ok 10 - leave packed-refs untouched on verify of loose
 
-expecting success of 0027.365 'compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 365 - compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt
+expecting success of 1409.11 'leave packed-refs untouched on delete of loose': 
+	git pack-refs --all &&
+	git update-ref refs/heads/loose-delete $A &&
+	mark_packed_refs &&
+	git update-ref -d refs/heads/loose-delete &&
+	check_packed_refs_marked
 
-expecting success of 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
+ok 11 - leave packed-refs untouched on delete of loose
 
-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
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1411-reflog-show.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1411-reflog-show/.git/
+expecting success of 1411.1 'setup': 
+	echo content >file &&
+	git add file &&
+	test_tick &&
+	git commit -m one
 
-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
+[main (root-commit) e46513e] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
 
-expecting success of 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 1411.2 'log -g shows reflog headers': 
+	git log -g -1 >tmp &&
+	grep ^Reflog <tmp >actual &&
+	test_cmp expect actual
 
-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
+ok 2 - log -g shows reflog headers
 
-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 1411.3 'oneline reflog format': 
+	git log -g -1 --oneline >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.372 'compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 372 - compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt
+ok 3 - oneline reflog format
 
-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 1411.4 'reflog default format': 
+	git reflog -1 >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 374 - compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt
+ok 4 - reflog default format
 
-expecting success of 0027.375 'compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 375 - compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt
+expecting success of 1411.5 'override reflog default format': 
+	git reflog --format=short -1 >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.376 'compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 376 - compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt
+ok 5 - override reflog default format
 
-expecting success of 0027.377 'compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 377 - compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt
+expecting success of 1411.6 'using @{now} syntax shows reflog date (multiline)': 
+	git log -g -1 HEAD@{now} >tmp &&
+	grep ^Reflog <tmp >actual &&
+	test_cmp expect actual
 
-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
+ok 6 - using @{now} syntax shows reflog date (multiline)
 
-expecting success of 0027.379 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 379 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt
+expecting success of 1411.7 'using @{now} syntax shows reflog date (oneline)': 
+	git log -g -1 --oneline HEAD@{now} >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.380 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 380 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt
+ok 7 - using @{now} syntax shows reflog date (oneline)
 
-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 1411.8 'using @{now} syntax shows reflog date (format=%gd)': 
+	git log -g -1 --format=%gd HEAD@{now} >actual &&
+	test_cmp expect actual
 
-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
+ok 8 - using @{now} syntax shows reflog date (format=%gd)
 
-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 1411.9 'using --date= shows reflog date (multiline)': 
+	git log -g -1 --date=default >tmp &&
+	grep ^Reflog <tmp >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.384 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 384 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt
+ok 9 - using --date= shows reflog date (multiline)
 
-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 1411.10 'using --date= shows reflog date (oneline)': 
+	git log -g -1 --oneline --date=default >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 386 - compare_files LF NNO_attr_auto_aeol__input_LF.txt
+ok 10 - using --date= shows reflog date (oneline)
 
-expecting success of 0027.387 'compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
-	
-ok 387 - compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt
+expecting success of 1411.11 'using --date= shows reflog date (format=%gd)': 
+	git log -g -1 --format=%gd --date=raw >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.388 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
-	
-ok 388 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt
+ok 11 - using --date= shows reflog date (format=%gd)
 
-expecting success of 0027.389 'compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 389 - compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt
+expecting success of 1411.12 'log.date does not invoke "--date" magic (multiline)': 
+	test_config log.date raw &&
+	git log -g -1 >tmp &&
+	grep ^Reflog <tmp >actual &&
+	test_cmp expect actual
 
-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
+ok 12 - log.date does not invoke "--date" magic (multiline)
 
-expecting success of 0027.391 'compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
-	
-ok 391 - compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt
+expecting success of 1411.13 'log.date does not invoke "--date" magic (oneline)': 
+	test_config log.date raw &&
+	git log -g -1 --oneline >actual &&
+	test_cmp expect actual
 
-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
+ok 13 - log.date does not invoke "--date" magic (oneline)
 
-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 1411.14 'log.date does not invoke "--date" magic (format=%gd)': 
+	test_config log.date raw &&
+	git log -g -1 --format=%gd >actual &&
+	test_cmp expect actual
 
-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
+ok 14 - log.date does not invoke "--date" magic (format=%gd)
 
-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 1411.15 '--date magic does not override explicit @{0} syntax': 
+	git log -g -1 --format=%gd --date=raw HEAD@{0} >actual &&
+	test_cmp expect actual
 
-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
+ok 15 - --date magic does not override explicit @{0} syntax
 
-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 1411.16 'empty reflog file': 
+	git branch empty &&
+	git reflog expire --expire=all refs/heads/empty &&
 
-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
+	git log -g empty >actual &&
+	test_must_be_empty actual
 
-expecting success of 0027.399 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt': 
-		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
-	
-ok 399 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt
+ok 16 - empty reflog file
 
-expecting success of 0027.400 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
-	
-ok 400 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt
+expecting success of 1411.17 'git log -g -p shows diffs vs. parents': 
+	test_commit two &&
+	git branch flipflop &&
+	git update-ref refs/heads/flipflop -m flip1 HEAD^ &&
+	git update-ref refs/heads/flipflop -m flop1 HEAD &&
+	git update-ref refs/heads/flipflop -m flip2 HEAD^ &&
+	git log -g -p flipflop >reflog &&
+	grep -v ^Reflog reflog >actual &&
+	git log -1 -p HEAD^ >log.one &&
+	git log -1 -p HEAD >log.two &&
+	(
+		cat log.one && echo &&
+		cat log.two && echo &&
+		cat log.one && echo &&
+		cat log.two
+	) >expect &&
+	test_cmp expect actual
 
-expecting success of 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
+[main fc3e0aa] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 17 - git log -g -p shows diffs vs. parents
 
-expecting success of 0027.402 'compare_files LF NNO_attr_text_aeol__input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1013-read-tree-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+		)
 	
-ok 402 - compare_files LF NNO_attr_text_aeol__input_CRLF.txt
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 1 - git read-tree -u -m --recurse-submodules: added submodule is checked out
 
-expecting success of 0027.403 'compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+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
+		)
 	
-ok 403 - compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 2 - git read-tree -u -m --recurse-submodules: added submodule is checked out in empty dir
 
-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
+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
+		)
 	
-ok 404 - compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+ok 3 - git read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule
 
-expecting success of 0027.405 'compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+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
+		)
 	
-ok 405 - compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+ok 4 - git read-tree -u -m --recurse-submodules: replace directory with submodule
 
-expecting success of 0027.406 'compare_files LF NNO_attr_text_aeol_lf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
+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
+		)
 	
-ok 406 - compare_files LF NNO_attr_text_aeol_lf_input_LF.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 5 - git read-tree -u -m --recurse-submodules: nested submodules are checked out
 
-expecting success of 0027.407 'compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
+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
+		)
 	
-ok 407 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 0027.408 'compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+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
+		)
 	
-ok 408 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
+ok 7 - git read-tree -u -m --recurse-submodules: removed submodule absorbs submodules .git directory
 
-expecting success of 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
+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
+		)
 	
-ok 409 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_input_LF_mix_CR.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 0027.410 'compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+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
+		)
 	
-ok 410 - compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u -m --recurse-submodules replace_sub1_with_file
+not ok 9 - git read-tree -u -m --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
 
-expecting success of 0027.411 'compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt': 
-		compare_files $lfname ${pfx}_LF.txt
+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
+		)
 	
-ok 411 - compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+ok 10 - git read-tree -u -m --recurse-submodules: worktrees of nested submodules are removed
 
-expecting success of 0027.412 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt': 
-		compare_files $crlfname ${pfx}_CRLF.txt
+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
+		)
 	
-ok 412 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 11 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule work tree
 
-expecting success of 0027.413 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt': 
-		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+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
+		)
 	
-ok 413 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+ok 12 - git read-tree -u -m --recurse-submodules: updating to a missing submodule commit fails
 
-expecting success of 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
+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
+		)
 	
-ok 414 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Switched to a new branch 'keep_branch'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+fatal: ref HEAD is not a symbolic ref
+ok 13 - git read-tree -u -m --recurse-submodules: submodule branch is not changed, detach HEAD instead
 
-expecting success of 0027.415 'compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt': 
-		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+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
+		)
 	
-ok 415 - compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+ok 14 - git read-tree -u -m --recurse-submodules: added submodule doesn't remove untracked file with same name
 
-expecting success of 0027.416 'setup config for checkout attr=-text ident= aeol= core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
+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
+		)
 	
-ok 416 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
-
-expecting success of 0027.417 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 417 - setup LF checkout  with -c core.eol=lf
-
-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
-
-expecting success of 0027.419 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 419 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-expecting success of 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
-
-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
+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 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
+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
+		)
 	
-ok 422 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=lf
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 423 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+not ok 17 - git read-tree -u -m --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
 
-expecting success of 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
+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
+		)
 	
-ok 424 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 18 - git read-tree -u -m --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
 
-expecting success of 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
+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
+		)
 	
-ok 425 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 19 - git -c submodule.recurse=true read-tree -u -m: modified submodule updates submodule work tree
 
-expecting success of 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
+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
+		)
 	
-ok 426 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 20 - git read-tree -u -m --recurse-submodules: modified submodule updates submodule recursively
 
-expecting success of 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
+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
+		)
 	
-ok 427 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 21 - git read-tree -u --reset --recurse-submodules: added submodule is checked out
 
-expecting success of 0027.428 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
+expecting success of 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
+		)
 	
-ok 428 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
-
-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
-
-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
-
-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
-
-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
-
-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
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 22 - git read-tree -u --reset --recurse-submodules: added submodule is checked out in empty dir
 
-expecting success of 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
+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
+		)
 	
-ok 434 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=lf
+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 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
+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
+		)
 	
-ok 435 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF
+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 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
+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
+		)
 	
-ok 436 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 25 - git read-tree -u --reset --recurse-submodules: nested submodules are checked out
 
-expecting success of 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
+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
+		)
 	
-ok 437 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 438 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
+ok 27 - git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory
 
-expecting success of 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
+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
+		)
 	
-ok 439 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 28 - git read-tree -u --reset --recurse-submodules: replace submodule with a file
 
-expecting success of 0027.440 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
+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
+		)
 	
-ok 440 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
-
-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
-
-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
-
-expecting success of 0027.443 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 443 - setup LF_mix_CR checkout  with -c core.eol=lf
-
-expecting success of 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 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
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 446 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=lf
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+ok 30 - git read-tree -u --reset --recurse-submodules: worktrees of nested submodules are removed
 
-expecting success of 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
+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
+		)
 	
-ok 447 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 448 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 449 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 450 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+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
 
-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
+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
+		)
 	
-ok 451 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 452 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
-
-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
-
-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
-
-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 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
-
-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
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 458 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=lf
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 459 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF
+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
 
-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
+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
+		)
 	
-ok 460 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 461 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 462 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 463 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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 0027.464 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
+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
+		)
 	
-ok 464 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
-
-expecting success of 0027.465 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 465 - setup LF checkout  with -c core.eol=lf
-
-expecting success of 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
-
-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
-
-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
-
-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
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 470 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=lf
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 471 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 472 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 473 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 474 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 475 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 476 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
-
-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 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
-
-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
-
-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
-
-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
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 482 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=lf
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 483 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 484 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 485 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+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 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
+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
+		)
 	
-ok 486 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 487 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 488 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
-
-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
-
-expecting success of 0027.490 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 490 - setup CRLF checkout  with -c core.eol=lf
-
-expecting success of 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
-
-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
-
-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
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 494 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=lf
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 495 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 496 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 497 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 498 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 499 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 0027.500 'setup config for checkout attr=-text ident= aeol= core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
+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
+		)
 	
-ok 500 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
-
-expecting success of 0027.501 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 501 - setup LF checkout  with -c core.eol=lf
-
-expecting success of 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
-
-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
-
-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
-
-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
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 506 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=lf
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 507 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-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
+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
+		)
 	
-ok 508 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF
+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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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
+		)
 	
-ok 509 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+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
 
-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
+# still have 10 known breakage(s)
+# passed all remaining 58 test(s)
+1..68
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1412-reflog-loop.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-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
+[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 0027.512 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 512 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
+expecting success of 1412.2 'setup reflog with alternating commits': 
+	git checkout -b topic &&
+	git reset one &&
+	git reset two &&
+	git reset one &&
+	git reset two
 
-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
+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 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
+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
 
-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
+ok 3 - reflog shows all entries
 
-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
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1413-reflog-detach.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1413-reflog-detach/.git/
+expecting success of 1413.1 'setup': 
+	test_tick &&
+	git commit --allow-empty -m initial &&
+	git branch side &&
+	test_tick &&
+	git commit --allow-empty -m second &&
+	"$TAR" cf .git-saved.tar .git
 
-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
+[main (root-commit) 66fe8b3] initial
+ Author: A U Thor <author@example.com>
+[main 5ce2b00] second
+ Author: A U Thor <author@example.com>
+ok 1 - setup
 
-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 1413.2 'baseline': 
+	reset_state &&
+	git rev-parse main main^ >expect &&
+	git log -g --format=%H >actual &&
+	test_cmp expect actual
 
-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
+ok 2 - baseline
 
-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
+expecting success of 1413.3 'switch to branch': 
+	reset_state &&
+	git rev-parse side main main^ >expect &&
+	git checkout side &&
+	git log -g --format=%H >actual &&
+	test_cmp expect actual
 
-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
+Switched to branch 'side'
+ok 3 - switch to branch
 
-expecting success of 0027.522 'checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 522 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_mix_CR
+expecting success of 1413.4 'detach to other': 
+	reset_state &&
+	git rev-parse main side main main^ >expect &&
+	git checkout side &&
+	git checkout main^0 &&
+	git log -g --format=%H >actual &&
+	test_cmp expect actual
 
-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
+Switched to branch 'side'
+Note: switching to 'main^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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 5ce2b00 second
+ok 4 - detach to other
 
-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 1413.5 'detach to self': 
+	reset_state &&
+	git rev-parse main main main^ >expect &&
+	git checkout main^0 &&
+	git log -g --format=%H >actual &&
+	test_cmp expect actual
 
-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
+Note: switching to 'main^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 5ce2b00 second
+ok 5 - detach to self
 
-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
+expecting success of 1413.6 'attach to self': 
+	reset_state &&
+	git rev-parse main main main main^ >expect &&
+	git checkout main^0 &&
+	git checkout main &&
+	git log -g --format=%H >actual &&
+	test_cmp expect actual
 
-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
+Note: switching to 'main^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to 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 548 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
+HEAD is now at 5ce2b00 second
+Switched to branch 'main'
+ok 6 - attach to self
 
-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
+expecting success of 1413.7 'attach to other': 
+	reset_state &&
+	git rev-parse side main main main^ >expect &&
+	git checkout main^0 &&
+	git checkout side &&
+	git log -g --format=%H >actual &&
+	test_cmp expect actual
 
-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
+Note: switching to 'main^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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 5ce2b00 second
+Previous HEAD position was 5ce2b00 second
+Switched to branch 'side'
+ok 7 - attach to other
 
-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
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1410-reflog.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 0027.559 'checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 559 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
+	test_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 &&
 
-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
+	test_chmod +x C &&
+	git add C &&
+	test_tick && git commit -m dragon &&
+	L=$(git rev-parse --verify HEAD) &&
+	check_fsck &&
 
-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
+	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 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
+	rm -f A/G &&
+	test_tick && git commit -a -m monkey &&
+	K=$(git rev-parse --verify HEAD) &&
+	check_fsck &&
 
-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
+	check_have A B C D E F G H I J K L &&
 
-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
+	git prune &&
 
-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
+	check_have A B C D E F G H I J K L &&
 
-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
+	check_fsck &&
 
-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
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-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
+[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 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 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 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
+usage: git reflog expire [--expire=<time>] [--expire-unreachable=<time>]
+ok 2 - correct usage on sub-command -h
 
-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
+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 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
+usage: git reflog [show] [<log-options>] [<ref>]
+ok 3 - correct usage on "git reflog show -h"
 
-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
+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 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
+	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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+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 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
+	check_have A B C D E F G H I J K L &&
 
-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
+	git prune &&
 
-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
+	check_have A B C D E F G H I J K L &&
 
-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
+	git reflog refs/heads/main >output &&
+	test_line_count = 5 output
 
-expecting success of 0027.581 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 581 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+HEAD is now at 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 0027.582 'checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 582 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_mix_CR
+expecting success of 1410.6 'corrupt and check': 
 
-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
+	corrupt $F &&
+	check_fsck "missing blob $F"
 
-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
 
-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
+missing blob 9ae84adb2704cbd49549e52169b4043871e13432
+ok 6 - corrupt and check
 
-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
+expecting success of 1410.7 'reflog expire --dry-run should not touch reflog': 
 
-expecting success of 0027.587 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 587 - setup LF_mix_CR checkout  with -c core.eol=lf
+	git reflog expire --dry-run \
+		--expire=$(($test_tick - 10000)) \
+		--expire-unreachable=$(($test_tick - 10000)) \
+		--stale-fix \
+		--all &&
 
-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
+	git reflog refs/heads/main >output &&
+	test_line_count = 5 output &&
 
-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
+	check_fsck "missing blob $F"
 
-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
+missing blob 9ae84adb2704cbd49549e52169b4043871e13432
+ok 7 - reflog expire --dry-run should not touch reflog
 
-expecting success of 0027.591 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
-	
-ok 591 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF
+expecting success of 1410.8 'reflog expire': 
 
-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
+	git reflog expire --verbose \
+		--expire=$(($test_tick - 10000)) \
+		--expire-unreachable=$(($test_tick - 10000)) \
+		--stale-fix \
+		--all &&
 
-expecting success of 0027.593 'checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 593 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+	git reflog refs/heads/main >output &&
+	test_line_count = 2 output &&
 
-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
+	check_fsck "dangling commit $K"
 
-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
+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 8 - reflog expire
 
-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
+expecting success of 1410.9 '--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 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
+	parent_oid=$(git rev-parse stale-fix^) &&
+	test_when_finished "recover $parent_oid" &&
+	corrupt $parent_oid &&
+	git reflog expire --stale-fix
 
-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
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 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
+ok 9 - --stale-fix handles missing objects generously
 
-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 1410.10 'prune and fsck': 
 
-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
+	git prune &&
+	check_fsck &&
 
-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
+	check_have A B C D E H L &&
+	check_dont_have F G I J K
 
-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
 
-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
+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 10 - prune and fsck
 
-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 1410.11 'recover and check': 
 
-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
+	recover $F &&
+	check_fsck "dangling blob $F"
 
-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
 
-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
+dangling blob 9ae84adb2704cbd49549e52169b4043871e13432
+ok 11 - recover and check
 
-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
+expecting success of 1410.12 'delete': 
+	echo 1 > C &&
+	test_tick &&
+	git commit -m rat C &&
 
-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
+	echo 2 > C &&
+	test_tick &&
+	git commit -m ox C &&
 
-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
+	echo 3 > C &&
+	test_tick &&
+	git commit -m tiger C &&
 
-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
+	HEAD_entry_count=$(git reflog | wc -l) &&
+	main_entry_count=$(git reflog show main | wc -l) &&
 
-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
+	test $HEAD_entry_count = 5 &&
+	test $main_entry_count = 5 &&
 
-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
 
-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
+	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 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
+	main_entry_count=$(wc -l < output) &&
 
-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
+	git reflog delete HEAD@{1} &&
+	test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
+	test $main_entry_count = $(git reflog show main | wc -l) &&
 
-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
+	HEAD_entry_count=$(git reflog | wc -l) &&
 
-expecting success of 0027.619 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 619 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+	git 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 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 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
+[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 12 - delete
 
-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
+expecting success of 1410.13 'rewind2': 
 
-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
+	test_tick && git reset --hard HEAD~2 &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-expecting success of 0027.624 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 624 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+HEAD is now at f392752 rat
+ok 13 - rewind2
 
-expecting success of 0027.625 'setup LF_nul checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 625 - setup LF_nul checkout  with -c core.eol=lf
+expecting success of 1410.14 '--expire=never': 
 
-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
+	git reflog expire --verbose \
+		--expire=never \
+		--expire-unreachable=never \
+		--all &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-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
+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 14 - --expire=never
 
-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
+expecting success of 1410.15 'gc.reflogexpire=never': 
+	test_config gc.reflogexpire never &&
+	test_config gc.reflogexpireunreachable never &&
 
-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
+	git reflog expire --verbose --all >output &&
+	test_line_count = 9 output &&
 
-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
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-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
+ok 15 - gc.reflogexpire=never
 
-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
+expecting success of 1410.16 'gc.reflogexpire=false': 
+	test_config gc.reflogexpire false &&
+	test_config gc.reflogexpireunreachable false &&
 
-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
+	git reflog expire --verbose --all &&
+	git reflog refs/heads/main >output &&
+	test_line_count = 4 output
 
-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
 
-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
+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 16 - gc.reflogexpire=false
 
-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 1410.17 'git reflog expire unknown reference': 
+	test_config gc.reflogexpire never &&
+	test_config gc.reflogexpireunreachable never &&
 
-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
+	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 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
+error: main@{123} points nowhere!
+error: does-not-exist points nowhere!
+ok 17 - git reflog expire unknown reference
 
-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
+expecting success of 1410.18 '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 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
+Switched to branch 'foo'
+ok 18 - checkout should not delete log for packed ref
 
-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
+expecting success of 1410.19 '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 0027.642 'checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
-	
-ok 642 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+	git 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 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
+	# 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 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
+Deleted branch one/two (was f392752).
+Deleted branch one (was f392752).
+ok 19 - stale dirs do not cause d/f conflicts (reflogs on)
 
-expecting success of 0027.645 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 645 - setup LF checkout  with -c core.eol=lf
+expecting success of 1410.20 '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 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
+	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 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
+	# 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
 
-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
+Deleted branch one/two (was f392752).
+Deleted branch one (was f392752).
+ok 20 - stale dirs do not cause d/f conflicts (reflogs off)
 
-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 1410.21 '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 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
+f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
+f392752 refs/tests/tree-in-reflog@{2}: Creating ref
+ok 21 - no segfaults for reflog containing non-commit sha1s
 
-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
+checking known breakage of 1410.22 'reflog with non-commit entries displays all entries': 
+	git reflog refs/tests/tree-in-reflog >actual &&
+	test_line_count = 3 actual
 
-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
+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 22 - reflog with non-commit entries displays all entries # TODO known breakage
 
-expecting success of 0027.653 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 653 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+expecting success of 1410.23 '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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 23 - continue walking past root commits
 
-expecting success of 0027.655 'checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
-	
-ok 655 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+expecting success of 1410.24 '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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 24 - expire with multiple worktrees
 
-expecting success of 0027.657 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 657 - setup LF checkout  with -c core.eol=lf
+expecting success of 1410.25 '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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 25 - expire one of multiple worktrees
 
-expecting success of 0027.659 'setup LF_mix_CR checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 659 - setup LF_mix_CR checkout  with -c core.eol=lf
+expecting success of 1410.26 '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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 26 - empty reflog
 
-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
+expecting success of 1410.27 '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 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
+		test_commit A &&
+		cat >expect <<-EOF &&
+		HEAD
+		refs/heads/main
 		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 reflog list >actual &&
+		test_cmp expect actual &&
 
-expecting success of 0027.663 'checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 663 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF
+		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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 27 - list reflogs
 
-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 1410.28 'list reflogs with worktree': 
+	test_when_finished "rm -rf repo" &&
+	git init repo &&
+	(
+		cd repo &&
 
-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
+		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 &&
 
-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
+		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 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
+		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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 28 - list reflogs with worktree
 
-expecting success of 0027.670 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 670 - setup CRLF checkout  with -c core.eol=lf
+expecting success of 1410.29 '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 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
+ok 29 - reflog list returns error with additional args
 
-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
+expecting success of 1410.30 '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
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 30 - reflog for symref with unborn target can be listed
 
-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
+expecting success of 1410.31 '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 ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
+		git reflog list >actual &&
 		test_cmp expect actual
-	
-ok 674 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=lf
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 with invalid object ID can be listed
 
-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
+# still have 1 known breakage(s)
+# passed all remaining 30 test(s)
+1..31
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1414-reflog-walk.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1414-reflog-walk/.git/
+expecting success of 1414.1 'set up some reflog entries': 
+	test_commit one &&
+	test_commit two &&
+	git checkout -b side HEAD^ &&
+	test_commit three &&
+	git merge --no-commit main &&
+	echo evil-merge-content >>one.t &&
+	test_tick &&
+	git commit --no-edit -a
 
-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
+[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 a new branch 'side'
+[side 897c206] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Automatic merge went well; stopped before committing as requested
+[side 6635cc5] Merge branch 'main' into side
+ Author: A U Thor <author@example.com>
+ok 1 - set up some reflog entries
 
-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
+expecting success of 1414.2 'set up expected reflog': 
+	cat >expect.all <<-EOF
+	HEAD@{0} commit (merge): Merge branch ${SQ}main${SQ} into side
+	HEAD@{1} commit: three
+	HEAD@{2} checkout: moving from main to side
+	HEAD@{3} commit: two
+	HEAD@{4} commit (initial): one
+	EOF
 
-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
+ok 2 - set up expected reflog
 
-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
+expecting success of 1414.3 'reflog walk shows expected logs': 
+	do_walk >actual &&
+	test_cmp expect.all actual
 
-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
+ok 3 - reflog walk shows expected logs
 
-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
+expecting success of 1414.4 'reflog can limit with --no-merges': 
+	grep -v merge expect.all >expect &&
+	do_walk --no-merges >actual &&
+	test_cmp expect actual
 
-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
+ok 4 - reflog can limit with --no-merges
 
-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
+expecting success of 1414.5 'reflog can limit with pathspecs': 
+	grep two expect.all >expect &&
+	do_walk -- two.t >actual &&
+	test_cmp expect actual
 
-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
+ok 5 - reflog can limit with pathspecs
 
-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
+expecting success of 1414.6 'pathspec limiting handles merges': 
+	# we pick up:
+	#   - the initial commit of one
+	#   - the checkout back to commit one
+	#   - the evil merge which touched one
+	sed -n "1p;3p;5p" expect.all >expect &&
+	do_walk -- one.t >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.687 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
-	
-ok 687 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF
+ok 6 - pathspec limiting handles merges
 
-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 1414.7 '--parents shows true parents': 
+	# convert newlines to spaces
+	echo $(git rev-parse HEAD HEAD^1 HEAD^2) >expect &&
+	git rev-list -g --parents -1 HEAD >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.689 'checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 689 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 7 - --parents shows true parents
 
-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 1414.8 'walking multiple reflogs shows all': 
+	# We expect to see all entries for all reflogs, but interleaved by
+	# date, with order on the command line breaking ties. We
+	# can use "sort" on the separate lists to generate this,
+	# but note two tricks:
+	#
+	#   1. We use "{" as the delimiter, which lets us skip to the reflog
+	#      date specifier as our second field, and then our "-n" numeric
+	#      sort ignores the bits after the timestamp.
+	#
+	#   2. POSIX leaves undefined whether this is a stable sort or not. So
+	#      we use "-k 1" to ensure that we see HEAD before main before
+	#      side when breaking ties.
+	{
+		do_walk --date=unix HEAD &&
+		do_walk --date=unix side &&
+		do_walk --date=unix main
+	} >expect.raw &&
+	sort -t "{" -k 2nr -k 1 <expect.raw >expect &&
+	do_walk --date=unix HEAD main side >actual &&
+	test_cmp expect actual
 
-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
+ok 8 - walking multiple reflogs shows all
 
-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 1414.9 'date-limiting does not interfere with other logs': 
+	do_walk HEAD@{1979-01-01} HEAD >actual &&
+	test_cmp expect.all actual
 
-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
+warning: log for 'HEAD' only goes back to Thu, 7 Apr 2005 15:13:13 -0700
+ok 9 - date-limiting does not interfere with other logs
 
-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 1414.10 'min/max age uses entry date to limit': 
+	# Flip between commits one and two so each ref update actually
+	# does something (and does not get optimized out). We know
+	# that the timestamps of those commits will be before our "min".
 
-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
+	git update-ref -m before refs/heads/minmax one &&
 
-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
+	test_tick &&
+	min=$test_tick &&
+	git update-ref -m min refs/heads/minmax two &&
 
-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
+	test_tick &&
+	max=$test_tick &&
+	git update-ref -m max refs/heads/minmax one &&
 
-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 0027.699 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF    crlf_false_attr__LF.txt
-	
-ok 699 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF
-
-expecting success of 0027.700 'checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 700 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF
+	test_tick &&
+	git update-ref -m after refs/heads/minmax two &&
 
-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
+	cat >expect <<-\EOF &&
+	max
+	min
+	EOF
+	git log -g --since=$min --until=$max --format=%gs minmax >actual &&
+	test_cmp expect actual
 
-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
+ok 10 - min/max age uses entry date to limit
 
-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 1414.11 'walk prefers reflog to ref tip': 
+	test_commit A &&
+	test_commit B &&
+	git reflog delete HEAD@{0} &&
+	head=$(git rev-parse HEAD) &&
+	git rev-parse A >expect &&
+	git log -g --format=%H -1 >actual &&
+	test_cmp expect actual
 
-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
+[side 2fdefc8] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[side 8a0211e] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ok 11 - walk prefers reflog to ref tip
 
-expecting success of 0027.705 'setup LF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 705 - setup LF checkout  with -c core.eol=lf
+expecting success of 1414.12 'rev-list -g complains when there are no reflogs': 
+	test_must_fail git rev-list -g
 
-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
+usage: git rev-list [<options>] <commit>... [--] [<path>...]
 
-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
+  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
+ok 12 - rev-list -g complains when there are no reflogs
 
-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
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1416-ref-transaction-hooks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+[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 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 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 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 63ac8e7 PRE
+ok 2 - hook allows updating ref if successful
 
-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 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
 
-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
+HEAD is now at 63ac8e7 PRE
+fatal: ref updates aborted by hook
+ok 3 - hook aborts updating ref in prepared state
 
-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
+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 HEAD
+		$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
 
-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
+HEAD is now at 63ac8e7 PRE
+ok 4 - hook gets all queued updates in prepared state
 
-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
+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 HEAD
+		$ZERO_OID $POST_OID refs/heads/main
+	EOF
+	git update-ref HEAD POST &&
+	test_cmp expect actual
 
-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
+HEAD is now at 63ac8e7 PRE
+ok 5 - hook gets all queued updates in committed state
 
-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 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
 
-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
+HEAD is now at 63ac8e7 PRE
+start: ok
+abort: ok
+ok 6 - hook gets all queued updates in aborted state
 
-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
+expecting success of 1416.7 'interleaving hook calls succeed': 
+	test_when_finished "rm -r target-repo.git" &&
 
-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
+	git init --bare target-repo.git &&
 
-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
+	test_hook -C target-repo.git reference-transaction <<-\EOF &&
+		echo $0 "$@" >>actual
+	EOF
 
-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
+	test_hook -C target-repo.git update <<-\EOF &&
+		echo $0 "$@" >>actual
+	EOF
 
-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
+	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 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
+	git push ./target-repo.git PRE POST &&
+	test_cmp expect target-repo.git/actual
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-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
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1415-worktree-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-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
+[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 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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 24b24cf initial
+ok 1 - setup
 
-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
+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 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
+ok 2 - refs/worktree are per-worktree
 
-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
+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 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
+ok 3 - resolve main-worktree/HEAD
 
-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 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
 
-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
+24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+warning: refname 'main-worktree/HEAD' is ambiguous.
+ok 4 - ambiguous main-worktree/HEAD
 
-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
+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 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
+ok 5 - resolve worktrees/xx/HEAD
 
-expecting success of 0027.744 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 744 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 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 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
+42fba42569eaa325aaade18832dfa5432d54ffd1
+warning: refname 'worktrees/wt1/HEAD' is ambiguous.
+ok 6 - ambiguous worktrees/xx/HEAD
 
-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 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 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
+ok 7 - reflog of main-worktree/HEAD
 
-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
+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 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
+ok 8 - reflog of worktrees/xx/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
+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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 0027.752 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 752 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
+expecting success of 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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1418-reflog-exists.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1418-reflog-exists/.git/
+expecting success of 1418.1 'setup': 
+	test_commit A
 
-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
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+ok 1 - setup
 
-expecting success of 0027.756 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 756 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 1418.2 'usage': 
+	test_expect_code 129 git reflog exists &&
+	test_expect_code 129 git reflog exists -h
 
-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
+usage: git reflog exists <ref>
 
-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
+usage: git reflog exists <ref>
 
-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
+ok 2 - usage
 
-expecting success of 0027.760 'checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 760 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+expecting success of 1418.3 'usage: unknown option': 
+	test_expect_code 129 git reflog exists --unknown-option
 
-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
+error: unknown option `unknown-option'
+usage: git reflog exists <ref>
 
-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
+ok 3 - usage: unknown option
 
-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
+expecting success of 1418.4 'reflog exists works': 
+	git reflog exists refs/heads/main &&
+	test_must_fail git reflog exists refs/heads/nonexistent
 
-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
+ok 4 - reflog exists works
 
-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
+expecting success of 1418.5 'reflog exists works with a "--" delimiter': 
+	git reflog exists -- refs/heads/main &&
+	test_must_fail git reflog exists -- refs/heads/nonexistent
 
-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
+ok 5 - reflog exists works with a "--" delimiter
 
-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 1418.6 'reflog exists works with a "--end-of-options" delimiter': 
+	git reflog exists --end-of-options refs/heads/main &&
+	test_must_fail git reflog exists --end-of-options refs/heads/nonexistent
 
-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
+ok 6 - reflog exists works with a "--end-of-options" delimiter
 
-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
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1419-exclude-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+	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 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
+	git update-ref --stdin <in &&
+	git pack-refs --all
 
-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
+[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 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 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 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
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-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
+ok 2 - excluded region in middle
 
-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
+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 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
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-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
+ok 3 - excluded region at beginning
 
-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
+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 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
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-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
+ok 4 - excluded region at end
 
-expecting success of 0027.782 'ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf': 
-		test_when_finished "rm expect actual" &&
-		sort <<-EOF >expect &&
-		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
-		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
-		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
-		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
-		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
-		EOF
-		git ls-files --eol crlf_false_attr__* >tmp &&
-		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
-		sort >actual &&
-		test_cmp expect actual
-	
-ok 782 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf
+expecting success of 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 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
+	test_cmp expect actual &&
+	assert_jumps 2 perf
 
-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
+ok 5 - disjoint excluded regions
 
-expecting success of 0027.785 'checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 785 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+expecting success of 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 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
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-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
+ok 6 - adjacent, non-overlapping excluded regions
 
-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
+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 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
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-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
+ok 7 - overlapping excluded regions
 
-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
+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 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
+	test_cmp expect actual &&
+	assert_jumps 1 perf
 
-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
+ok 8 - several overlapping excluded regions
 
-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
+expecting success of 1419.9 '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 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
+	test_cmp expect actual &&
+	assert_no_jumps perf
 
-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
+ok 9 - non-matching excluded section
 
-expecting success of 0027.797 'checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 797 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+expecting success of 1419.10 'meta-characters are discarded': 
+	for_each_ref__exclude refs/heads "refs/heads/ba*" >actual 2>perf &&
+	for_each_ref >expect &&
 
-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
+	test_cmp expect actual &&
+	assert_no_jumps perf
 
-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
+ok 10 - meta-characters are discarded
 
-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
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1420-lost-found.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1420-lost-found/.git/
+expecting success of 1420.1 'setup': 
+	git config core.logAllRefUpdates 0 &&
+	: > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m initial &&
+	echo 1 > file1 &&
+	echo 2 > file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m second &&
+	echo 3 > file3 &&
+	git add file3
 
-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
+[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 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
+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 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
+HEAD is now at 9bb1ae9 initial
+dangling blob 00750edc07d6415dcc07ae0351e9397b0222b7ba
+dangling commit 8ad33beea8de8e15812274614acd0a26d73b60f8
+ok 2 - lost and found something
 
-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
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1417-reflog-updateref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1417-reflog-updateref/.git/
+expecting success of 1417.1 'setup': 
+	git init -b main repo &&
+	(
+		cd repo &&
 
-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
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
 
-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 &&
+		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
-	
-ok 806 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=crlf
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 0027.808 'checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 808 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+expecting success of 1417.2 'get 'B' with 'git reflog delete --updateref HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 811 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 2 - get 'B' with 'git reflog delete --updateref HEAD@{0}'
 
-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
+expecting success of 1417.3 'get 'B' with 'git reflog delete --updateref HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-expecting success of 0027.815 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 815 - setup LF_mix_CR checkout  with -c core.eol=crlf
+			test_cmp expect actual
+		)
+	
+ok 3 - get 'B' with 'git reflog delete --updateref HEAD@{1}'
 
-expecting success of 0027.816 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 816 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 1417.4 'get 'C' with 'git reflog delete --updateref main@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 819 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 4 - get 'C' with 'git reflog delete --updateref main@{0}'
 
-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 1417.5 'get 'B' with 'git reflog delete --updateref main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 823 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 5 - get 'B' with 'git reflog delete --updateref main@{1}'
 
-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
+expecting success of 1417.6 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
+	
+ok 6 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'
 
-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 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 831 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 7 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'
 
-expecting success of 0027.832 'checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 832 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=CRLF
+expecting success of 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 835 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 8 - get 'C' with 'git reflog delete --updateref --rewrite main@{0}'
 
-expecting success of 0027.836 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 836 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
+expecting success of 1417.9 'get 'B' with 'git reflog delete --updateref --rewrite main@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
+	
+ok 9 - get 'B' with 'git reflog delete --updateref --rewrite main@{1}'
 
-expecting success of 0027.840 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 840 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 843 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
+error: HEAD@{0} points nowhere!
+ok 10 - get 'B' with 'test_must_fail git reflog expire HEAD@{0}'
 
-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
+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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 847 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+error: HEAD@{1} points nowhere!
+ok 11 - get 'B' with 'test_must_fail git reflog expire HEAD@{1}'
 
-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 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			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 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
+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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 855 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+error: main@{1} points nowhere!
+ok 13 - get 'B' with 'test_must_fail git reflog expire main@{1}'
 
-expecting success of 0027.856 'checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
-	
-ok 856 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+expecting success of 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 859 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+error: HEAD@{0} points nowhere!
+ok 14 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'
 
-expecting success of 0027.860 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=false': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 860 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
+expecting success of 1417.15 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'': 
+		test_when_finished "rm -rf copy" &&
+		cp -R repo copy &&
 
-expecting success of 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			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 0027.864 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 864 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+expecting success of 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 867 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF
+error: main@{0} points nowhere!
+ok 16 - get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'
 
-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 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >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
+			test_cmp expect actual
+		)
 	
-ok 871 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+error: main@{1} points nowhere!
+ok 17 - get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'
 
-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 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >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
+			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 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 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >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
+			test_cmp expect actual
+		)
 	
-ok 879 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+error: HEAD@{1} points nowhere!
+ok 19 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{1}'
 
-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 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
 	
-ok 883 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+error: main@{0} points nowhere!
+ok 20 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'
 
-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 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 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
+		(
+			cd copy &&
 
-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
+			$args &&
+			git rev-parse $exp >expect &&
+			git rev-parse HEAD >actual &&
 
-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
+			test_cmp expect actual
+		)
+	
+error: main@{1} points nowhere!
+ok 21 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'
 
-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
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1451-fsck-buffer.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1451-fsck-buffer/.git/
+expecting success of 1451.1 'create valid objects': 
+	git commit --allow-empty -m foo &&
+	commit=$(git rev-parse --verify HEAD) &&
+	tree=$(git rev-parse --verify HEAD^{tree})
 
-expecting success of 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
+[master (root-commit) 2093db0] foo
+ Author: A U Thor <author@example.com>
+ok 1 - create valid objects
 
-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
+expecting success of 1451.2 'reset input to empty': 
+		>base
 	
-ok 890 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=crlf
+ok 2 - reset input to empty
 
-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
+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 891 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF
+error: object fails fsck: missingTree: invalid format - expected 'tree' line
+ok 3 - truncated commit (missingTree, "")
 
-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
+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 892 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+error: object fails fsck: missingTree: invalid format - expected 'tree' line
+ok 4 - truncated commit (missingTree, "tr")
 
-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
+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 893 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+error: object fails fsck: missingTree: invalid format - expected 'tree' line
+ok 5 - truncated commit (missingTree, "tree")
 
-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
+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 894 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
+ok 6 - truncated commit (badTreeSha1, "tree ")
 
-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
+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
 	
-ok 895 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
+ok 7 - truncated commit (badTreeSha1, "tree 1234")
 
-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
+expecting success of 1451.8 'add tree line': 
+		echo "$content" >>base
 	
-ok 896 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
-
-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
-
-expecting success of 0027.898 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 898 - setup CRLF checkout  with -c core.eol=crlf
-
-expecting success of 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
-
-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
-
-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
+ok 8 - add tree line
 
-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
+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 902 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 9 - truncated commit (missingAuthor, "")
 
-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
+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 903 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 10 - truncated commit (missingAuthor, "par")
 
-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
+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 904 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 11 - truncated commit (missingAuthor, "parent")
 
-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
+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
 	
-ok 905 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
+ok 12 - truncated commit (badParentSha1, "parent ")
 
-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
+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 906 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
+ok 13 - truncated commit (badParentSha1, "parent 1234")
 
-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
+expecting success of 1451.14 'add parent line': 
+		echo "$content" >>base
 	
-ok 907 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 14 - add parent line
 
-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
+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 908 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
-
-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
-
-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 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 0027.912 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 912 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
-
-expecting success of 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
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 15 - truncated commit (missingAuthor, "")
 
-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
+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 914 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=crlf
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 16 - truncated commit (missingAuthor, "au")
 
-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
+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
 	
-ok 915 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF
+error: object fails fsck: missingAuthor: invalid format - expected 'author' line
+ok 17 - truncated commit (missingAuthor, "author")
 
-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
+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 916 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 18 - truncated commit (missingEmail, "author ")
 
-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
+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 917 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 19 - truncated commit (missingEmail, "author name")
 
-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
+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 918 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 20 - truncated commit (badEmail, "author name <")
 
-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
+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 919 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 21 - truncated commit (badEmail, "author name <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
+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 920 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
-
-expecting success of 0027.921 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 921 - setup LF checkout  with -c core.eol=crlf
-
-expecting success of 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
-
-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 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
-
-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
+error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 22 - truncated commit (missingSpaceBeforeDate, "author name <email>")
 
-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
+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 926 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=crlf
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 23 - truncated commit (badDate, "author name <email> ")
 
-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
+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 927 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 24 - truncated commit (badDate, "author name <email> 1234")
 
-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
+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 928 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 25 - truncated commit (badTimezone, "author name <email> 1234 ")
 
-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
+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 929 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 26 - truncated commit (badTimezone, "author name <email> 1234 +")
 
-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
+expecting success of 1451.27 'add author line': 
+		echo "$content" >>base
 	
-ok 930 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 27 - add author line
 
-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
+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
 	
-ok 931 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
+ok 28 - truncated commit (missingCommitter, "")
 
-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
+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 932 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
-
-expecting success of 0027.933 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 933 - setup LF checkout  with -c core.eol=crlf
-
-expecting success of 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
-
-expecting success of 0027.935 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 935 - setup LF_mix_CR checkout  with -c core.eol=crlf
-
-expecting success of 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
-
-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: object fails fsck: missingCommitter: invalid format - expected 'committer' line
+ok 29 - truncated commit (missingCommitter, "co")
 
-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
+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 938 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf
+error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
+ok 30 - truncated commit (missingCommitter, "committer")
 
-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
+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 939 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 31 - truncated commit (missingEmail, "committer ")
 
-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
+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
 	
-ok 940 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 32 - truncated commit (missingEmail, "committer name")
 
-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
+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 941 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 33 - truncated commit (badEmail, "committer name <")
 
-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
+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 942 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 34 - truncated commit (badEmail, "committer name <email")
 
-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
+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 943 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 35 - truncated commit (missingSpaceBeforeDate, "committer name <email>")
 
-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
+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 944 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
-
-expecting success of 0027.945 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 945 - setup LF checkout  with -c core.eol=crlf
-
-expecting success of 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 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 0027.948 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 948 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
-
-expecting success of 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
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 36 - truncated commit (badDate, "committer name <email> ")
 
-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
+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 950 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=crlf
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 37 - truncated commit (badDate, "committer name <email> 1234")
 
-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
+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 951 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 38 - truncated commit (badTimezone, "committer name <email> 1234 ")
 
-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
+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 952 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 39 - truncated commit (badTimezone, "committer name <email> 1234 +")
 
-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
+expecting success of 1451.40 'add committer line': 
+		echo "$content" >>base
 	
-ok 953 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 40 - add committer line
 
-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
+expecting success of 1451.41 'reset input to empty': 
+		>base
 	
-ok 954 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 41 - reset input to empty
 
-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
+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 955 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+error: object fails fsck: missingObject: invalid format - expected 'object' line
+ok 42 - truncated tag (missingObject, "")
 
-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
+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 956 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
-
-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 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
-
-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 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
-
-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
+error: object fails fsck: missingObject: invalid format - expected 'object' line
+ok 43 - truncated tag (missingObject, "obj")
 
-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
+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 962 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=crlf
+error: object fails fsck: missingObject: invalid format - expected 'object' line
+ok 44 - truncated tag (missingObject, "object")
 
-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
+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 963 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
+ok 45 - truncated tag (badObjectSha1, "object ")
 
-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
+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 964 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
+ok 46 - truncated tag (badObjectSha1, "object 1234")
 
-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
+expecting success of 1451.47 'add object line': 
+		echo "$content" >>base
 	
-ok 965 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 47 - add object line
 
-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
+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 966 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
+ok 48 - truncated tag (missingType, "")
 
-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
+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 967 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
+ok 49 - truncated tag (missingType, "ty")
 
-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
+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 968 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
-
-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 0027.970 'setup CRLF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 970 - setup CRLF checkout  with -c core.eol=crlf
-
-expecting success of 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 0027.972 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 972 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
-
-expecting success of 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
+error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
+ok 50 - truncated tag (missingType, "type")
 
-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
+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 974 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=crlf
+error: object fails fsck: badType: invalid 'type' value
+ok 51 - truncated tag (badType, "type ")
 
-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
+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 975 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF
+error: object fails fsck: badType: invalid 'type' value
+ok 52 - truncated tag (badType, "type com")
 
-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
+expecting success of 1451.53 'add type line': 
+		echo "$content" >>base
 	
-ok 976 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 53 - add type line
 
-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
+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 977 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
+ok 54 - truncated tag (missingTagEntry, "")
 
-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
+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 978 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
+ok 55 - truncated tag (missingTagEntry, "ta")
 
-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
+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 979 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
+ok 56 - truncated tag (missingTagEntry, "tag")
 
-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
+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 980 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
-
-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
-
-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 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
-
-expecting success of 0027.984 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 984 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
-
-expecting success of 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
+error: object fails fsck: badTagName: invalid 'tag' name: 
+ok 57 - truncated tag (badTagName, "tag ")
 
-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
+expecting success of 1451.58 'add tag line': 
+		echo "$content" >>base
 	
-ok 986 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf
+ok 58 - add tag line
 
-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
+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 987 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 59 - truncated tag (missingTagger, "")
 
-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
+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 988 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 60 - truncated tag (missingTagger, "ta")
 
-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
+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 989 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
+ok 61 - truncated tag (missingTagger, "tagger")
 
-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
+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 990 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 62 - truncated tag (missingEmail, "tagger ")
 
-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
+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 991 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+error: object fails fsck: missingEmail: invalid author/committer line - missing email
+ok 63 - truncated tag (missingEmail, "tagger name")
 
-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
+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 992 - setup config for checkout attr= ident= aeol= core.autocrlf=false
-
-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 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
-
-expecting success of 0027.995 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 995 - setup LF_mix_CR checkout  with -c core.eol=crlf
-
-expecting success of 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
-
-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
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 64 - truncated tag (badEmail, "tagger name <")
 
-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
+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 998 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=crlf
+error: object fails fsck: badEmail: invalid author/committer line - bad email
+ok 65 - truncated tag (badEmail, "tagger name <email")
 
-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
+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 999 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF
+error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
+ok 66 - truncated tag (missingSpaceBeforeDate, "tagger name <email>")
 
-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
+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
 	
-ok 1000 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 67 - truncated tag (badDate, "tagger name <email> ")
 
-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
+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 1001 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+error: object fails fsck: badDate: invalid author/committer line - bad date
+ok 68 - truncated tag (badDate, "tagger name <email> 1234")
 
-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
+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 1002 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 69 - truncated tag (badTimezone, "tagger name <email> 1234 ")
 
-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
+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 1003 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
+ok 70 - truncated tag (badTimezone, "tagger name <email> 1234 +")
 
-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 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 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
+error: object fails fsck: badTree: cannot be parsed as a tree
+ok 71 - truncated tree (short hash)
 
-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
+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 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
+error: object fails fsck: badTree: cannot be parsed as a tree
+ok 72 - truncated tree (missing nul)
 
-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
+# passed all 72 test(s)
+1..72
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1430-bad-ref-name.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 1 - setup
 
-expecting success of 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 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 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
+		from refs/heads/main
 
-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
+	INPUT_END
+	test_must_fail git fast-import <input
 
-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
+fatal: Branch name doesn't conform to GIT standards: .badbranchname
+fast-import: dumping crash report to .git/fast_import_crash_20752
+ok 2 - fast-import: fail on invalid branch name ".badbranchname"
 
-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 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 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
+		from refs/heads/main
 
-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
+	INPUT_END
+	test_must_fail git fast-import <input
 
-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
+fatal: Branch name doesn't conform to GIT standards: bad[branch]name
+fast-import: dumping crash report to .git/fast_import_crash_20787
+ok 3 - fast-import: fail on invalid branch name "bad[branch]name"
 
-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
+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 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
+warning: ignoring ref with broken name refs/heads/broken...ref
+ok 4 - git branch shows badly named ref as warning
 
-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
+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 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
+Deleted branch broken...ref (was broken).
+ok 5 - branch -d can delete badly named ref
 
-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 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
 
-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
+Deleted branch broken...ref (was broken).
+ok 6 - branch -D can delete badly named ref
 
-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 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 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
+error: branch '../../my-private-file' not found
+ok 7 - branch -D cannot delete non-ref in .git dir
 
-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
+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 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
+error: branch 'foo////./././../../../my-private-file' not found
+ok 8 - branch -D cannot delete ref in .git dir
 
-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 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
 
-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
+error: branch '/build/reproducible-path/git-2.45.2/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra' not found
+ok 9 - branch -D cannot delete absolute path
 
-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 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 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
+fatal: 'broken...ref' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config advice.refSyntax false"
+ok 10 - git branch cannot create a badly named ref
 
-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 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 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
+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 advice.refSyntax false"
+ok 11 - branch -m cannot rename to a bad ref name
 
-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
+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 &&
 
-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
+	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 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
+fatal: invalid branch name: 'broken...ref'
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config advice.refSyntax false"
+not ok 12 - branch -m can rename from a bad ref name # TODO known breakage
 
-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
+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 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
+fatal: invalid refspec 'HEAD:refs/heads/broken...ref'
+ok 13 - push cannot create a badly named ref
 
-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
+checking known breakage of 1430.14 'push --mirror can delete badly named ref': 
+	top=$(pwd) &&
+	git init src &&
+	git init dest &&
 
-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
+	(
+		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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1430-bad-ref-name/src/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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 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
+warning: ignoring dangling symref refs/tags/shadow
+ok 15 - rev-parse skips symref pointing to broken name
 
-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 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 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
+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 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
+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 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
+ok 17 - update-ref -d can delete broken name
 
-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
+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 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
+Deleted branch broken...ref (was broken).
+ok 18 - branch -d can delete broken name
 
-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 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 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
+	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
 
-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
+error: reference does not exist
+ok 19 - update-ref --no-deref -d can delete symref to broken name
 
-expecting success of 0027.1053 'setup LF checkout  with -c core.eol=crlf': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1053 - setup LF checkout  with -c core.eol=crlf
+expecting success of 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 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
+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 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 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 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
+error: reference does not exist
+ok 21 - update-ref --no-deref -d can delete dangling symref to broken name
 
-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 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 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
+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 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 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 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
+error: reference does not exist
+ok 23 - update-ref -d can delete broken name through symref
 
-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 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 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
+error: reference does not exist
+ok 24 - update-ref --no-deref -d can delete symref with broken name
 
-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
+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
 
-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
+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 0027.1065 'setup LF checkout  with -c core.eol=native': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1065 - setup LF checkout  with -c core.eol=native
+expecting success of 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 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
+error: reference does not exist
+ok 26 - update-ref --no-deref -d can delete dangling symref with broken name
 
-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 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 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
+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 0027.1069 'setup LF_nul checkout  with -c core.eol=native': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
-		
-ok 1069 - setup LF_nul checkout  with -c core.eol=native
+expecting success of 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 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
+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 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
+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 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
+error: refusing to update ref with bad name '/build/reproducible-path/git-2.45.2/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra'
+ok 29 - update-ref -d cannot delete absolute path
 
-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 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 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
+fatal: invalid ref format: ~a
+ok 30 - update-ref --stdin fails create with bad ref name
 
-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 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
 
-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
+fatal: invalid ref format: ~a
+ok 31 - update-ref --stdin fails update with bad ref name
 
-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
+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 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
+fatal: invalid ref format: ~a
+ok 32 - update-ref --stdin fails delete with bad ref name
 
-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
+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 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
+fatal: invalid ref format: ~a 
+ok 33 - update-ref --stdin -z fails create with bad ref name
 
-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
+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
 
-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
+fatal: invalid ref format: ~a
+ok 34 - update-ref --stdin -z fails update with bad ref name
 
-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 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 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
+fatal: invalid ref format: ~a
+ok 35 - update-ref --stdin -z fails delete with bad ref name
 
-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
+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 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
+fatal: 'HEAD' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config advice.refSyntax false"
+ok 36 - branch rejects HEAD as a branch name
 
-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 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 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
+fatal: 'HEAD' is not a valid branch name
+hint: See `man git check-ref-format`
+hint: Disable this message with "git config advice.refSyntax false"
+ok 37 - checkout -b rejects HEAD as a branch name
 
-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 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 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
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/HEAD
+ok 38 - update-ref can operate on refs/heads/HEAD
 
-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 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 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
+Deleted branch HEAD (was d79ce16).
+ok 39 - branch -d can remove refs/heads/HEAD
 
-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
+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
 
-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
-
-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
-
-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
+warning: renamed a misnamed branch 'HEAD' away
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/tail
+ok 40 - branch -m can rename refs/heads/HEAD
 
-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 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 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
+Deleted branch -dash (was d79ce16).
+ok 41 - branch -d can remove refs/heads/-dash
 
-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
+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 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
+warning: renamed a misnamed branch '-dash' away
+d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/dash
+ok 42 - branch -m can rename refs/heads/-dash
 
-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
+# still have 2 known breakage(s)
+# passed all remaining 40 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1501-work-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree/.git/
+expecting success of 1501.1 'setup': 
+	EMPTY_TREE=$(git write-tree) &&
+	EMPTY_BLOB=$(git hash-object -t blob --stdin </dev/null) &&
+	CHANGED_BLOB=$(echo changed | git hash-object -t blob --stdin) &&
+	EMPTY_BLOB7=$(echo $EMPTY_BLOB | sed "s/\(.......\).*/\1/") &&
+	CHANGED_BLOB7=$(echo $CHANGED_BLOB | sed "s/\(.......\).*/\1/") &&
 
-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
+	mkdir -p work/sub/dir &&
+	mkdir -p work2 &&
+	mv .git repo.git
 
-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
+ok 1 - setup
 
-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 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 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 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 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 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 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
+ok 2 - setup: helper for testing rev-parse
 
-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
+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 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
+ok 3 - setup: core.worktree = relative path
 
-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 1501.4 'outside': 
+	test_rev_parse false false false
 
-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
+ok 4 - outside
 
-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
+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 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
+'actual.prefix' is not empty, it contains:
 
-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
+ok 5 - inside work tree
 
-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
+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 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
+ok 6 - empty prefix is actually written out
 
-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
+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 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
+ok 7 - subdir of work tree
 
-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
+expecting success of 1501.8 'setup: core.worktree = absolute path': 
+	sane_unset GIT_WORK_TREE &&
+	GIT_DIR=$(pwd)/repo.git &&
+	GIT_CONFIG=$GIT_DIR/config &&
+	export GIT_DIR GIT_CONFIG &&
+	git config core.worktree "$(pwd)/work"
 
-expecting success of 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
+ok 8 - setup: core.worktree = absolute path
 
-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
+expecting success of 1501.9 'outside': 
+	test_rev_parse false false false &&
+	(
+		cd work2 &&
+		test_rev_parse false false false
+	)
 
-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
+ok 9 - outside
 
-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
+expecting success of 1501.10 'inside work tree': 
+	(
+		cd work &&
+		test_rev_parse false false true ""
+	)
 
-expecting success of 0027.1124 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true': 
-		create_gitattributes "$attr" $ident $aeol &&
-		git config core.autocrlf $crlf
-	
-ok 1124 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
+'actual.prefix' is not empty, it contains:
 
-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
+ok 10 - inside work tree
 
-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
+expecting success of 1501.11 'subdir of work tree': 
+	(
+		cd work/sub/dir &&
+		test_rev_parse false false true sub/dir/
+	)
 
-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
+ok 11 - subdir of work tree
 
-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
+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 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
+ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree)
 
-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
+expecting success of 1501.13 'outside': 
+	test_rev_parse false false false &&
+	(
+		cd work2 &&
+		test_rev_parse false false false
+	)
 
-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
+ok 13 - outside
 
-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
+expecting success of 1501.14 'inside work tree': 
+	(
+		cd work &&
+		GIT_WORK_TREE=. &&
+		test_rev_parse false false true ""
+	)
 
-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
+'actual.prefix' is not empty, it contains:
 
-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
+ok 14 - inside work tree
 
-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
+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 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
+ok 15 - subdir of work tree
 
-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
+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 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
+ok 16 - setup: GIT_WORK_TREE=absolute, below git dir
 
-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
+expecting success of 1501.17 'outside': 
+	echo outside &&
+	test_rev_parse false false false
 
-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
+outside
+ok 17 - outside
 
-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
+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 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
+ok 18 - in repo.git
 
-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
+expecting success of 1501.19 'inside work tree': 
+	(
+		cd repo.git/work &&
+		test_rev_parse false true true ""
+	)
 
-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
+'actual.prefix' is not empty, it contains:
 
-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
+ok 19 - inside work tree
 
-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
+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 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
+ok 20 - subdir of work tree
 
-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 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 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
+ok 21 - find work tree from repo
 
-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
+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 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 22 - find work tree from work tree
 
-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 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 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
+		git diff --exit-code tracked &&
+		echo changed >tracked &&
+		test_must_fail git diff --exit-code tracked
+	)
 
-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
+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 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 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 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
+	(
+		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 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
+ok 24 - diff-index respects work tree under .git dir
 
-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 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 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
+	(
+		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 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
+ok 25 - diff-files respects work tree under .git dir
 
-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 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
 
-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
+	(
+		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 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
+ok 26 - git diff respects work tree under .git dir
 
-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 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 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
+ok 27 - git grep
 
-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 1501.28 'git commit': 
+	(
+		cd repo.git &&
+		GIT_DIR=. GIT_WORK_TREE=work git commit -a -m done
+	)
 
-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
+[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 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 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 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
+fatal: /home: '/home' is outside repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree/repo.git/work'
+ok 29 - absolute pathspec should fail gracefully
 
-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 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 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
+git --git-dir=/build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree//repo.git --work-tree=/build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree add dummy_file
+ok 30 - make_relative_path handles double slashes in GIT_DIR
 
-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 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 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
+ok 31 - relative $GIT_WORK_TREE and git subprocesses
 
-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
+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 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
+cp: cannot stat 'repo.git/sharedindex.*': No such file or directory
+ok 32 - Multi-worktree setup
 
-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
+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 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
+ok 33 - GIT_DIR set (1)
 
-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 &&
+expecting success of 1501.34 'GIT_DIR set (2)': 
+	echo "gitdir: repo.git/repos/foo" >gitfile &&
+	echo "$(pwd)/repo.git" >repo.git/repos/foo/commondir &&
+	(
+		cd work &&
+		GIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&
+		test-tool path-utils real_path "$TRASH_DIRECTORY/repo.git" >expect &&
 		test_cmp expect actual
-	
-ok 1178 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native
+	)
 
-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
+ok 34 - GIT_DIR set (2)
 
-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
+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 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
+ok 35 - Auto discovery
 
-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 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 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 36 - $GIT_DIR/common overrides core.worktree
 
-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 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 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
+ok 37 - $GIT_WORK_TREE overrides $GIT_DIR/common
 
-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 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 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
+fatal: Invalid path '/.invalid': No such file or directory
+ok 38 - error out gracefully on invalid $GIT_WORK_TREE
 
-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
+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 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
+	GIT_DIR=relative/.git GIT_WORK_TREE=relative git reset HEAD^ &&
 
-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
+	git -C relative log -1 --format=%s >actual &&
+	echo one >expect &&
+	test_cmp expect actual
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree/relative/.git/
+[master (root-commit) 61ba98b] one
+ Author: A U Thor <author@example.com>
+[master 2b4e70d] two
+ Author: A U Thor <author@example.com>
+ok 39 - refs work with relative gitdir and work tree
 
-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
+# passed all 39 test(s)
+1..39
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1502-rev-parse-parseopt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 1 - setup optionspec
 
-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 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 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
+ok 2 - setup optionspec-no-switches
 
-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
+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 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
+ok 3 - setup optionspec-only-hidden-switches
 
-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
+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 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
+ok 4 - test --parseopt help output
 
-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 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 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
+ok 5 - test --parseopt help output no switches
 
-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 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 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
+ok 6 - test --parseopt help output hidden switches
 
-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
+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 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
+ok 7 - test --parseopt help-all output hidden switches
 
-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 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 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
+ok 8 - test --parseopt invalid switch help output
 
-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 1502.9 'setup expect.1': 
+	cat > expect <<EOF
+set -- --foo --bar 'ham' -b --aswitch -- 'arg'
+EOF
 
-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
+ok 9 - setup expect.1
 
-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 1502.10 'test --parseopt': 
+	git rev-parse --parseopt -- --foo --bar=ham --baz --aswitch arg < optionspec > output &&
+	test_cmp expect output
 
-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
+ok 10 - test --parseopt
 
-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 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 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 11 - test --parseopt with mixed options and arguments
 
-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 1502.12 'setup expect.2': 
+	cat > expect <<EOF
+set -- --foo -- 'arg' '--bar=ham'
+EOF
 
-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
+ok 12 - setup expect.2
 
-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
+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 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
+ok 13 - test --parseopt with --
 
-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
+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 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
+ok 14 - test --parseopt --stop-at-non-option
 
-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 1502.15 'setup expect.3': 
+	cat > expect <<EOF
+set -- --foo -- '--' 'arg' '--bar=ham'
+EOF
 
-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
+ok 15 - setup expect.3
 
-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 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 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
+ok 16 - test --parseopt --keep-dashdash
 
-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 1502.17 'setup expect.4': 
+	cat >expect <<EOF
+set -- --foo -- '--' 'arg' '--spam=ham'
+EOF
 
-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
+ok 17 - setup expect.4
 
-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 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 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
+ok 18 - test --parseopt --keep-dashdash --stop-at-non-option with --
 
-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
+expecting success of 1502.19 'setup expect.5': 
+	cat > expect <<EOF
+set -- --foo -- 'arg' '--spam=ham'
+EOF
 
-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
+ok 19 - setup expect.5
 
-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
+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 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
+ok 20 - test --parseopt --keep-dashdash --stop-at-non-option without --
 
-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
+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 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
+ok 21 - setup expect.6
 
-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
+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 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
+ok 22 - test --parseopt --stuck-long
 
-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
+expecting success of 1502.23 'setup expect.7': 
+	cat > expect <<EOF
+set -- --data='' -C --baz -- 'arg'
+EOF
 
-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
+ok 23 - setup expect.7
 
-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 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 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
+ok 24 - test --parseopt --stuck-long and empty optional argument
 
-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 1502.25 'setup expect.8': 
+	cat > expect <<EOF
+set -- --data --baz -- 'arg'
+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
+ok 25 - setup expect.8
 
-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
+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 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
+ok 26 - test --parseopt --stuck-long and long option with unset optional argument
 
-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
+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 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
+ok 27 - test --parseopt --stuck-long and short option with unset optional argument
 
-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
+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 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
+	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 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
+	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
+	test_cmp expect actual
 
-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
+ok 28 - test --parseopt help output: "wrapped" options normal "or:" lines
 
-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
+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 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
+ok 29 - test --parseopt invalid opt-spec
 
-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
+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 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
+	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
 
-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
+	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
+	test_cmp expect actual
 
-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
+ok 30 - test --parseopt help output: multi-line blurb after empty line
 
-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
+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 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
+ok 31 - test --parseopt help output for optionspec-neg
 
-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
+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 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
+ok 32 - test --parseopt valid options for optionspec-neg
 
-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
+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 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
+ok 33 - test --parseopt positivated option for optionspec-neg
 
-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
+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 1262 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=native
+ok 34 - test --parseopt invalid switch --no-positive-only help output for optionspec-neg
 
-expecting success of 0027.1263 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 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 1263 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 35 - test --parseopt invalid switch --negative help output for optionspec-neg
 
-expecting success of 0027.1264 'checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 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 1264 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 36 - test --parseopt invalid switch --no-no-negative help output for optionspec-neg
 
-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 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 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
+cat <<\EOF
+usage: some-command [options]
 
-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
+    --[no-]noble          The feudal switch.
 
-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
+EOF
+error: ambiguous option: no (could be --noble or --no-noble)
+ok 37 - ambiguous: --no matches both --noble and --no-noble
 
-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
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1500-rev-parse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+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 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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1273 - setup LF_nul checkout  with -c core.eol=native
+ok 2 - toplevel: --is-bare-repository
 
-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
+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 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
+			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 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
+			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 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 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 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
+			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 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
+			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 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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1282 - setup CRLF checkout  with -c core.eol=native
+ok 5 - toplevel: --show-prefix
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1285 - setup LF_nul checkout  with -c core.eol=native
+ok 6 - toplevel: --git-dir
 
-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
+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 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
+			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 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
+			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 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 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 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
+			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 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
+			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 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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1294 - setup CRLF checkout  with -c core.eol=native
+ok 9 - .git/: --is-inside-git-dir
 
-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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1297 - setup LF_nul checkout  with -c core.eol=native
+ok 10 - .git/: --is-inside-work-tree
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 11 - .git/: --show-prefix
 
-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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 12 - .git/: --git-dir
 
-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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1306 - setup CRLF checkout  with -c core.eol=native
+ok 13 - .git/: --absolute-git-dir
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1309 - setup LF_nul checkout  with -c core.eol=native
+ok 14 - .git/objects/: --is-bare-repository
 
-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
+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 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
+			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 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
+			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 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
+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 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
+			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 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
+			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 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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1318 - setup CRLF checkout  with -c core.eol=native
+ok 17 - .git/objects/: --show-prefix
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1321 - setup LF_nul checkout  with -c core.eol=native
+ok 18 - .git/objects/: --git-dir
 
-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 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 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
+			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 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
+			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 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
+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 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
+			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 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
+			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 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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1330 - setup CRLF checkout  with -c core.eol=native
+ok 21 - subdirectory: --is-inside-git-dir
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1333 - setup LF_nul checkout  with -c core.eol=native
+ok 22 - subdirectory: --is-inside-work-tree
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 23 - subdirectory: --show-prefix
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
+		
+ok 24 - subdirectory: --git-dir
 
-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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1342 - setup CRLF checkout  with -c core.eol=native
+ok 25 - subdirectory: --absolute-git-dir
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1345 - setup LF_nul checkout  with -c core.eol=native
+ok 26 - core.bare = true: --is-bare-repository
 
-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
+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 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
+			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 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
+			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 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 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 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
+			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 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
+			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 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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1354 - setup CRLF checkout  with -c core.eol=native
+ok 29 - core.bare undefined: --is-bare-repository
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1357 - setup LF_nul checkout  with -c core.eol=native
+ok 30 - core.bare undefined: --is-inside-git-dir
 
-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 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 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
+			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 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
+			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 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
+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 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
+			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 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
+			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 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
+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 &&
 
-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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1366 - setup CRLF checkout  with -c core.eol=native
+ok 33 - GIT_DIR=../.git, core.bare = false: --is-inside-git-dir
 
-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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1369 - setup LF_nul checkout  with -c core.eol=native
+ok 34 - GIT_DIR=../.git, core.bare = false: --is-inside-work-tree
 
-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 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 &&
 
-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
+			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 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
+			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
 
-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 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 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
+			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 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 "$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 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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1378 - setup CRLF checkout  with -c core.eol=native
+ok 37 - GIT_DIR=../.git, core.bare = false: --absolute-git-dir
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1381 - setup LF_nul checkout  with -c core.eol=native
+ok 38 - GIT_DIR=../.git, core.bare = true: --is-bare-repository
 
-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 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 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
+			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 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
+			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 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
+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 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
+			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 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
+			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 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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1390 - setup CRLF checkout  with -c core.eol=crlf
+ok 41 - GIT_DIR=../.git, core.bare = true: --show-prefix
 
-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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1393 - setup LF_nul checkout  with -c core.eol=crlf
+ok 42 - GIT_DIR=../.git, core.bare undefined: --is-bare-repository
 
-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 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 &&
 
-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
+			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 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
+			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 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 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 &&
 
-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
+			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 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
+			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
 
-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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1402 - setup CRLF checkout  with -c core.eol=lf
+ok 45 - GIT_DIR=../.git, core.bare undefined: --show-prefix
 
-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 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 &&
 
-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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1405 - setup LF_nul checkout  with -c core.eol=lf
+ok 46 - GIT_DIR=../repo.git, core.bare = false: --is-bare-repository
 
-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
+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 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
+			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 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
+			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 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
+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 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
+			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 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
+			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 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 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 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 
+			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 0027.1414 'setup CRLF checkout ': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1414 - setup CRLF checkout 
+ok 49 - GIT_DIR=../repo.git, core.bare = false: --show-prefix
 
-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 
+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 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 
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1417 - setup LF_nul checkout 
+ok 50 - GIT_DIR=../repo.git, core.bare = false: --git-dir
 
-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 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 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
+			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 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
+			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 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 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 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
+			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 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
+			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 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
+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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1426 - setup CRLF checkout  with -c core.eol=native
+ok 53 - GIT_DIR=../repo.git, core.bare = true: --is-inside-git-dir
 
-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 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 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
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1429 - setup LF_nul checkout  with -c core.eol=native
+ok 54 - GIT_DIR=../repo.git, core.bare = true: --is-inside-work-tree
 
-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 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 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
+			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 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
+			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 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 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 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
+			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 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
+			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 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 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 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 
+			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 0027.1438 'setup CRLF checkout ': 
-			rm -f crlf_false_attr__$f.txt &&
-			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-ok 1438 - setup CRLF checkout 
+ok 57 - GIT_DIR=../repo.git, core.bare undefined: --is-inside-git-dir
 
-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 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 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 
+			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 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
+			echo "$expect" >expect &&
+			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
+			test_cmp expect actual
 		
-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=
+ok 58 - GIT_DIR=../repo.git, core.bare undefined: --is-inside-work-tree
 
-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
+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 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
+			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 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
+			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 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 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 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
+ok 60 - rev-parse --path-format=absolute
 
-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 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 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
+ok 61 - rev-parse --path-format=relative
 
-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 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 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
+ok 62 - --path-format=relative does not affect --absolute-git-dir
 
-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
+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 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
+ok 63 - --path-format can change in the middle of the command line
 
-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
+expecting success of 1500.64 '--path-format does not segfault without an argument': 
+	test_must_fail git rev-parse --path-format
 
-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
+fatal: --path-format requires an argument
+ok 64 - --path-format does not segfault without an argument
 
-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
+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 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
+ok 65 - git-common-dir from worktree root
 
-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 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 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
+ok 66 - git-common-dir inside sub-dir
 
-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
+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 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 
+ok 67 - git-path from worktree root
 
-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 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 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 
+ok 68 - git-path inside sub-dir
 
-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 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 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 
+[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 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 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 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
+ok 70 - rev-parse --is-shallow-repository in non-shallow repo
 
-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 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 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
+fatal: unknown mode for --show-object-format: squeamish-ossifrage
+ok 71 - rev-parse --show-object-format in repo
 
-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 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 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
+ok 72 - rev-parse --show-ref-format
 
-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 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 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 
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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 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 
+ok 74 - --show-toplevel from subdir of working tree
 
-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 
+expecting success of 1500.75 '--show-toplevel from inside .git': 
+	test_must_fail git -C .git rev-parse --show-toplevel
 
-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 
+fatal: this operation must be run in a work tree
+ok 75 - --show-toplevel from inside .git
 
-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 1500.76 'showing the superproject correctly': 
+	git rev-parse --show-superproject-working-tree >out &&
+	test_must_be_empty out &&
 
-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
+	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 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
+	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 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
+	git -C super/dir/sub rev-parse --show-superproject-working-tree >out &&
+	test_cmp expect out
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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 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 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
+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 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
+ok 77 - rev-parse --since= unsqueezed ordering
 
-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 
+expecting success of 1500.78 'rev-parse --bisect includes bad, excludes good': 
+	test_commit_bulk 6 &&
 
-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 
+	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 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 
+	# 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 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 rev-parse --symbolic-full-name --bisect >actual &&
+	test_cmp expect actual
 
-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 
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 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=
+ok 78 - rev-parse --bisect includes bad, excludes good
 
-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
+# passed all 78 test(s)
+1..78
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1503-rev-parse-verify.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1503-rev-parse-verify/.git/
+expecting success of 1503.1 'set up basic repo with 1 file (hello) and 4 commits': 
+	add_line_into_file "1: Hello World" hello &&
+	HASH1=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "2: A new day for git" hello &&
+	HASH2=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "3: Another new day for git" hello &&
+	HASH3=$(git rev-parse --verify HEAD) &&
+	add_line_into_file "4: Ciao for now" hello &&
+	HASH4=$(git rev-parse --verify HEAD)
 
-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
+ok 1 - set up basic repo with 1 file (hello) and 4 commits
 
-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
+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 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
+ok 2 - works with one good rev
 
-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
+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 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
+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 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 
+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 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 
+ok 4 - fails silently when using -q
 
-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 
+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 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 
+ok 5 - fails silently when using -q with deleted reflogs
 
-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 
+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 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=
+ok 6 - fails silently when using -q with not enough reflogs
 
-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 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 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
+ok 7 - succeeds silently with -q and reflogs that do not go far back enough in time
 
-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
+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 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
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 8 - no stdout output on error
 
-expecting success of 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 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 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
+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 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
+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 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
+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 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
+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 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
+ok 11 - options can appear after --verify
 
-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 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 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
+ok 12 - verify respects --end-of-options
 
-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
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1505-rev-parse-last.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1505-rev-parse-last/.git/
+expecting success of 1505.1 'setup': 
 
-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
+	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 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 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
+[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 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
+expecting success of 1505.2 '@{-1} works': 
+	test_cmp_rev side @{-1}
 
-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
+ok 2 - @{-1} works
 
-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 1505.3 '@{-1}~2 works': 
+	test_cmp_rev side~2 @{-1}~2
 
-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
+ok 3 - @{-1}~2 works
 
-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 1505.4 '@{-1}^2 works': 
+	test_cmp_rev side^2 @{-1}^2
 
-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
+ok 4 - @{-1}^2 works
 
-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 1505.5 '@{-1}@{1} works': 
+	test_cmp_rev side@{1} @{-1}@{1}
 
-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 &&
+ok 5 - @{-1}@{1} works
+
+expecting success of 1505.6 '@{-2} works': 
+	test_cmp_rev main @{-2}
+
+ok 6 - @{-2} works
+
+expecting success of 1505.7 '@{-3} fails': 
+	test_must_fail git rev-parse @{-3}
+
+fatal: ambiguous argument '@{-3}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+@{-3}
+ok 7 - @{-3} fails
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1504-ceiling-dirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 1526 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=lf
+ok 1 - no_ceil: git rev-parse --show-prefix is ''
 
-expecting success of 0027.1527 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 1504.2 'ceil_empty: git rev-parse --show-prefix is ''': 
+		echo "$expect" >expect &&
+		git rev-parse --show-prefix >actual &&
+		test_cmp expect actual
 	
-ok 1527 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+ok 2 - ceil_empty: git rev-parse --show-prefix is ''
 
-expecting success of 0027.1528 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 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 1528 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+ok 3 - ceil_at_parent: git rev-parse --show-prefix is ''
 
-expecting success of 0027.1529 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 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 1529 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 4 - ceil_at_parent_slash: git rev-parse --show-prefix is ''
 
-expecting success of 0027.1530 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 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 1530 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 5 - ceil_at_trash: git rev-parse --show-prefix is ''
 
-expecting success of 0027.1531 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 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 1531 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+ok 6 - ceil_at_trash_slash: git rev-parse --show-prefix is ''
 
-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
+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 1532 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
-
-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 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
+ok 7 - ceil_at_sub: git rev-parse --show-prefix is ''
 
-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 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 ''
 
-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
+checking prerequisite: SYMLINKS
 
-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
+mkdir -p "$TRASH_DIRECTORY/prereq-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.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 &&
+)
+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 1538 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf
+ok 9 - subdir_no_ceil: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0027.1539 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+expecting success of 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 1539 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
+ok 10 - subdir_ceil_empty: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0027.1540 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 1504.11 'subdir_ceil_at_trash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 1540 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+fatal: not a git repository (or any of the parent directories): .git
+ok 11 - subdir_ceil_at_trash: prefix
 
-expecting success of 0027.1541 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 1504.12 'subdir_ceil_at_trash_slash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 1541 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+fatal: not a git repository (or any of the parent directories): .git
+ok 12 - subdir_ceil_at_trash_slash: prefix
 
-expecting success of 0027.1542 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 1504.13 'subdir_ceil_at_sub: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 1542 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+fatal: not a git repository (or any of the parent directories): .git
+ok 13 - subdir_ceil_at_sub: prefix
 
-expecting success of 0027.1543 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 1504.14 'subdir_ceil_at_sub_slash: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 1543 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+fatal: not a git repository (or any of the parent directories): .git
+ok 14 - subdir_ceil_at_sub_slash: prefix
 
-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
+expecting success of 1504.15 'subdir_ceil_at_top: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 1544 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
-
-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
-
-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 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
-
-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
+fatal: not a git repository (or any of the parent directories): .git
+ok 15 - subdir_ceil_at_top: prefix
 
-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
+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
 
-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 &&
+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 1550 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=lf
+ok 17 - subdir_ceil_at_top_no_resolve: git rev-parse --show-prefix is 'sub/dir/'
 
-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 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 1551 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+ok 18 - subdir_ceil_at_top_slash_no_resolve: git rev-parse --show-prefix is 'sub/dir/'
 
-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 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 1552 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+ok 19 - subdir_ceil_at_subdir: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0027.1553 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 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 1553 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 20 - subdir_ceil_at_subdir_slash: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0027.1554 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 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 1554 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 21 - subdir_ceil_at_su: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0027.1555 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 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 1555 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+ok 22 - subdir_ceil_at_su_slash: git rev-parse --show-prefix is 'sub/dir/'
 
-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
+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 1556 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
-
-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
-
-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 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
+ok 23 - subdir_ceil_at_sub_di: git rev-parse --show-prefix is 'sub/dir/'
 
-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 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/'
 
-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
+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 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 &&
+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 1562 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=lf
+ok 26 - subdir_ceil_at_subdi_slash: git rev-parse --show-prefix is 'sub/dir/'
 
-expecting success of 0027.1563 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF    crlf_false_attr__LF.txt
+expecting success of 1504.27 'second_of_two: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 1563 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF
+fatal: not a git repository (or any of the parent directories): .git
+ok 27 - second_of_two: prefix
 
-expecting success of 0027.1564 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 1504.28 'first_of_two: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 1564 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
+fatal: not a git repository (or any of the parent directories): .git
+ok 28 - first_of_two: prefix
 
-expecting success of 0027.1565 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 1504.29 'second_of_three: prefix': 
+		test_expect_code 128 git rev-parse --show-prefix
 	
-ok 1565 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+fatal: not a git repository (or any of the parent directories): .git
+ok 29 - second_of_three: prefix
 
-expecting success of 0027.1566 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 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 1566 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 30 - git_dir_specified: git rev-parse --show-prefix is ''
 
-expecting success of 0027.1567 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 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 1567 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
+ok 31 - sd_no_ceil: git rev-parse --show-prefix is 's/d/'
 
-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
+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 1568 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
+ok 32 - sd_ceil_empty: git rev-parse --show-prefix is 's/d/'
 
-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
+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 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 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
 
-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 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 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
+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
 
-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 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 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 &&
+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 1574 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=lf
+ok 38 - sd_ceil_at_sd_slash: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0027.1575 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 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 1575 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF
+ok 39 - sd_ceil_at_su: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0027.1576 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 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 1576 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF
+ok 40 - sd_ceil_at_su_slash: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0027.1577 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 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 1577 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 41 - sd_ceil_at_s_di: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0027.1578 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 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 1578 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 42 - sd_ceil_at_s_di_slash: git rev-parse --show-prefix is 's/d/'
 
-expecting success of 0027.1579 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 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 1579 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
+ok 43 - sd_ceil_at_sdi: git rev-parse --show-prefix is 's/d/'
 
-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
+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 1580 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
+ok 44 - sd_ceil_at_sdi_slash: git rev-parse --show-prefix is 's/d/'
 
-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
+# passed all 44 test(s)
+1..44
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1506-rev-parse-diagnosis.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+[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 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
+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) )
 
-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
+f719efd430d52bcfc8566a43b2eb655688d38871
+8510665149157c2bc901848c3e0b746954e9cbd9
+2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
+ok 2 - correct file objects
 
-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
+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
 
-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
+ok 3 - correct relative file objects (0)
 
-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
+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 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
+ok 4 - correct relative file objects (1)
 
-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
+expecting success of 1506.5 'correct relative file objects (2)': 
+	(
+		cd subdir &&
+		git rev-parse HEAD:../file.txt >result &&
+		test_cmp ../expected result
+	)
 
-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
+ok 5 - correct relative file objects (2)
 
-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
+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 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
+ok 6 - correct relative file objects (3)
 
-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 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
+	)
 
-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
+ok 7 - correct relative file objects (4)
 
-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 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
+	)
 
-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
+ok 8 - correct relative file objects (5)
 
-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
+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
+	)
 
-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
+ok 9 - correct relative file objects (6)
 
-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
+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
 
-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
+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 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
+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 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
+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 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
+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
 
-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
+: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 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 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 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
+fatal: log for 'main' only has 1 entries
+fatal: log for 'main' only has 1 entries
+ok 13 - invalid @{n} reference
 
-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 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
+	)
 
-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
+HEAD:./nonexistent.txt
+fatal: path 'subdir/nonexistent.txt' does not exist in 'HEAD'
+ok 14 - relative path not found
 
-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 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
 
-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
+fatal: '../file.txt' is outside repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t1506-rev-parse-diagnosis'
+ok 15 - relative path outside worktree
 
-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
+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
 
-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
+fatal: relative path syntax can't be used outside working tree
+ok 16 - relative path when cwd is outside worktree
 
-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
+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
 
-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
+fatal: HEAD:file.txt: no such path in the working tree.
+ok 17 - <commit>:file correctly diagnosed after a pathname
 
-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 1506.18 'dotdot is not an empty set': 
+	( H=$(git rev-parse HEAD) && echo $H && echo ^$H ) >expect &&
 
-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
+	git rev-parse HEAD.. >actual &&
+	test_cmp expect actual &&
 
-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
+	git rev-parse ..HEAD >actual &&
+	test_cmp expect actual &&
 
-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
+	echo .. >expect &&
+	git rev-parse .. >actual &&
+	test_cmp expect actual
 
-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
+ok 18 - dotdot is not an empty set
 
-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 1506.19 'dotdot does not peel endpoints': 
+	git tag -a -m "annote" 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 &&
 
-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
+	git rev-parse annotated..annotated >actual-with-two-dots &&
+	test_cmp expect-with-two-dots actual-with-two-dots &&
 
-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
+	git rev-parse annotated...annotated >actual-with-merge-base &&
+	test_cmp expect-with-merge-base actual-with-merge-base
 
-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
+ok 19 - dotdot does not peel endpoints
 
-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
+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 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
+fatal: bad revision 'foobar'
+ok 20 - arg before dashdash must be a revision (missing)
 
-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
+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
 
-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
+fatal: bad revision 'foobar'
+ok 21 - arg before dashdash must be a revision (file)
 
-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
+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 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
+ok 22 - arg before dashdash must be a revision (ambiguous)
 
-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 1506.23 'reject Nth parent if N is too high': 
+	test_must_fail git rev-parse HEAD^100000000000000000000000000000000
 
-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
+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 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 1506.24 'reject Nth ancestor if N is too high': 
+	test_must_fail git rev-parse HEAD~100000000000000000000000000000000
 
-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
+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 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
+expecting success of 1506.25 'pathspecs with wildcards are not ambiguous': 
+	echo "*.c" >expect &&
+	git rev-parse "*.c" >actual &&
+	test_cmp expect actual
 
-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
+ok 25 - pathspecs with wildcards are not ambiguous
 
-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
+expecting success of 1506.26 'backslash does not trigger wildcard rule': 
+	test_must_fail git rev-parse "foo\\bar"
 
-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
+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 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
+expecting success of 1506.27 'escaped char does not trigger wildcard rule': 
+	test_must_fail git rev-parse "foo\\*bar"
 
-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
+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 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
+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
 
-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
+ok 28 - arg after dashdash not interpreted as option
 
-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 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
 
-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
+--end-of-options
+fatal: bad revision '--not-real'
+ok 29 - arg after end-of-options not interpreted as option
 
-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 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
 
-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 30 - end-of-options still allows --
 
-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
+# passed all 30 test(s)
+1..30
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1507-rev-parse-upstream.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1507-rev-parse-upstream/.git/
+expecting success of 1507.1 'setup': 
 
-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
+	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 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
+[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 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 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 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
+ok 2 - @{upstream} resolves to correct full name
 
-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
+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 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
+ok 3 - @{u} resolves to correct full name
 
-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 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 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
+ok 4 - my-side@{upstream} resolves to correct full name
 
-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 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 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
+ok 5 - upstream of branch with @ in middle
 
-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
+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 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
+ok 6 - upstream of branch with @ at start
 
-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 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 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
+ok 7 - upstream of branch with @ at end
 
-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
+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 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
+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 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
+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 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
+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.45.2/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 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 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 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
+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 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 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 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
+[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.45.2/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 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
+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 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
+Note: switching to 'HEAD^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+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 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 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 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
+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 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 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
+)
 
-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
+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 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 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
 
-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
+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 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 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
 
-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
+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 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
+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
 
-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
+ok 17 - branch@{u} works when tracking a local branch
 
-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
+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
 
-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
+ok 18 - branch@{u} error message when no upstream
 
-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 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
 
-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
+ok 19 - @{u} error message when no upstream
 
-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 1507.20 '@{u} silent error when no upstream': 
+	test_must_fail git rev-parse --verify --quiet @{u} 2>actual &&
+	test_must_be_empty actual
 
-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 20 - @{u} silent error when no upstream
 
-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 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
 
-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
+ok 21 - branch@{u} error message with misspelt branch
 
-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
+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
 
-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
+Note: switching to 'HEAD^0'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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
+If you want to 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.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 -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at 8f489d0 3
+ok 22 - @{u} error message when not on a branch
 
-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 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 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
+ok 23 - branch@{u} error message if upstream branch not fetched
 
-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
+expecting success of 1507.24 'pull works when tracking a local branch': 
+(
+	cd clone &&
+	git checkout local-main &&
+	git pull
+)
 
-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
+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 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
+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
 
-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
+ok 25 - @{u} works when tracking a local branch
 
-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
+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
 
-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
+	    3
+	EOF
+	git log -1 -g other@{u} >actual &&
+	test_cmp expect actual
 
-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
+ok 26 - log -g other@{u}
 
-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 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
 
-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
+	    3
+	EOF
+	git log -1 -g other@{u}@{now} >actual &&
+	test_cmp expect actual
 
-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
+ok 27 - log -g other@{u}@{now}
 
-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 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
 
-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 &&
+[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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1509-root-work-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1509-root-work-tree/.git/
+1..0 # SKIP Test requiring writable / skipped. Read this test if you want to run it
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1508-at-combinations.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 1718 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=lf
+ok 2 - HEAD = refs/heads/new-branch
 
-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 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 1719 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+ok 3 - @{1} = new-one
 
-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 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 1720 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 4 - HEAD@{1} = new-one
 
-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 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 1721 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 5 - @{now} = new-two
 
-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 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 1722 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 6 - HEAD@{now} = new-two
 
-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 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 1723 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+ok 7 - @{-1} = refs/heads/old-branch
 
-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 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 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 8 - @{-1}@{0} = old-two
 
-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 &&
+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 1730 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=lf
+ok 9 - @{-1}@{1} = old-one
 
-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 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 1731 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+ok 10 - @{u} = refs/heads/upstream-branch
 
-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 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 1732 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+ok 11 - HEAD@{u} = refs/heads/upstream-branch
 
-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 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 1733 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 12 - @{u}@{1} = upstream-one
 
-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 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 1734 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 13 - @{-1}@{u} = refs/heads/main
 
-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 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 1735 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 14 - @{-1}@{u}@{1} = main-one
 
-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 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 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
+ok 15 - @ = new-two
 
-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
+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 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 &&
+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 1742 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=lf
+ok 17 - @@/at-test = refs/heads/@@/at-test
 
-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 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 1743 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF
+ok 18 - @/at-test = refs/heads/@/at-test
 
-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 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 1744 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF
+ok 19 - @at-test = refs/heads/@at-test
 
-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 1508.20 '@{u}@{-1} is nonsensical': 
+		test_must_fail git rev-parse --verify '@{u}@{-1}'
 	
-ok 1745 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+fatal: Needed a single revision
+ok 20 - @{u}@{-1} is nonsensical
 
-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 1508.21 '@{0}@{0} is nonsensical': 
+		test_must_fail git rev-parse --verify '@{0}@{0}'
 	
-ok 1746 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_mix_CR
+fatal: Needed a single revision
+ok 21 - @{0}@{0} is nonsensical
 
-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 1508.22 '@{1}@{u} is nonsensical': 
+		test_must_fail git rev-parse --verify '@{1}@{u}'
 	
-ok 1747 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
+fatal: no such branch: '@{1}'
+ok 22 - @{1}@{u} is nonsensical
 
-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 1508.23 'HEAD@{-1} is nonsensical': 
+		test_must_fail git rev-parse --verify 'HEAD@{-1}'
 	
-ok 1748 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
+fatal: Needed a single revision
+ok 23 - HEAD@{-1} is nonsensical
 
-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 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 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 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 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 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 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 1508.27 'switch to old-branch': 
+	git checkout old-branch
 
-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
+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 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 &&
+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 1754 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf
+ok 28 - HEAD = refs/heads/old-branch
 
-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 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 1755 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF
+ok 29 - HEAD@{1} = new-two
 
-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 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 1756 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
+ok 30 - @{1} = old-one
 
-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 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 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
+[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 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 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 1759 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
+ok 32 - @:normal = content
 
-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 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 1760 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
+ok 33 - @:fun@ny = content
 
-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 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 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
+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 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 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 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
+Reset branch 'newbranch'
+ok 35 - @{0} works with empty reflog
 
-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
+# passed all 35 test(s)
+1..35
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t0027-auto-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t0027-auto-crlf/.git/
+expecting success of 0027.1 'ls-files --eol -o Text/Binary': 
+	test_when_finished "rm expect actual TeBi_*" &&
+	STRT=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA &&
+	STR=$STRT$STRT$STRT$STRT &&
+	printf "${STR}BBB\001" >TeBi_127_S &&
+	printf "${STR}BBBB\001">TeBi_128_S &&
+	printf "${STR}BBB\032" >TeBi_127_E &&
+	printf "\032${STR}BBB" >TeBi_E_127 &&
+	printf "${STR}BBBB\000">TeBi_128_N &&
+	printf "${STR}BBB\012">TeBi_128_L &&
+	printf "${STR}BBB\015">TeBi_127_C &&
+	printf "${STR}BB\015\012" >TeBi_126_CL &&
+	printf "${STR}BB\015\012\015" >TeBi_126_CLC &&
+	sort <<-\EOF >expect &&
+	i/ w/-text TeBi_127_S
+	i/ w/none TeBi_128_S
+	i/ w/none TeBi_127_E
+	i/ w/-text TeBi_E_127
+	i/ w/-text TeBi_128_N
+	i/ w/lf TeBi_128_L
+	i/ w/-text TeBi_127_C
+	i/ w/crlf TeBi_126_CL
+	i/ w/-text TeBi_126_CLC
+	EOF
+	git ls-files --eol -o >tmp &&
+	sed -n -e "/TeBi_/{s!attr/[	]*!!g
+	s!	! !g
+	s!  *! !g
+	p
+	}" tmp | sort >actual &&
+	test_cmp expect actual
 
-expecting success of 0027.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
+ok 1 - ls-files --eol -o Text/Binary
 
-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
+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.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
+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.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
+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.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
+[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.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 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.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
+[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.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.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.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
+[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.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.6 'commit files attr=-text': 
+	commit_check_warn false "-text" ""       ""        ""        ""        "" &&
+	commit_check_warn true  "-text" ""       ""        ""        ""        "" &&
+	commit_check_warn input "-text" ""       ""        ""        ""        ""
 
-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
+[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.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
+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.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
+[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.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
+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.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
+[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.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.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 1781 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 9 - setup commit file with mixed EOL
 
-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.10 'commit file with mixed EOL onto LF crlf=false attr=': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1782 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 10 - commit file with mixed EOL onto LF crlf=false attr=
 
-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.11 'commit file with mixed EOL onto CLRF attr= aeol= crlf=false': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1783 - checkout attr= ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 11 - commit file with mixed EOL onto CLRF attr= aeol= crlf=false
 
-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.12 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-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 12 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=false
 
-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.13 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1790 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=lf
+ok 13 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=false 
 
-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.14 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1791 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF
+ok 14 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=false
 
-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.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 1792 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 15 - setup commit file with mixed EOL
 
-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.16 'commit file with mixed EOL onto LF crlf=true attr=': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1793 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 16 - commit file with mixed EOL onto LF crlf=true attr=
 
-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.17 'commit file with mixed EOL onto CLRF attr= aeol= crlf=true': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1794 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 17 - commit file with mixed EOL onto CLRF attr= aeol= crlf=true
 
-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.18 'commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=true': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1795 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 18 - commit file with mixed EOL onto CRLF_mix_LF attr= aeol= crlf=true
 
-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.19 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=true ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1796 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
+ok 19 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=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.20 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 20 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=true
 
-expecting success of 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.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 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.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=
 
-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.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 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
+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
 
-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.25 'commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=input ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1802 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=lf
+ok 25 - commit file with mixed EOL onto LF_mix_cr attr= aeol= crlf=input 
 
-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.26 'commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1803 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF
+ok 26 - commit file with mixed EOL onto CRLF_nul attr= aeol= crlf=input
 
-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.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 1804 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF
+ok 27 - setup commit file with mixed EOL
 
-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.28 'commit file with mixed EOL onto LF crlf=false attr=auto': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1805 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
+ok 28 - commit file with mixed EOL onto LF crlf=false attr=auto
 
-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.29 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1806 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
+ok 29 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=false
 
-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.30 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1807 - checkout attr=text ident aeol= core.autocrlf=true core.eol=lf file=LF_nul
+ok 30 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=false
 
-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.31 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=false ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1808 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
+ok 31 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=false 
 
-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.32 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=false': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 32 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=false
 
-expecting success of 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.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
 
-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.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
 
-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.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
 
-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
+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
 
-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.37 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1814 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=lf
+ok 37 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=true 
 
-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.38 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
 	
-ok 1815 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF
+ok 38 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=true
 
-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.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 1816 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF
+ok 39 - setup commit file with mixed EOL
 
-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.40 'commit file with mixed EOL onto LF crlf=input attr=auto': 
+		check_warning "$lfwarn" ${pfx}_LF.err
 	
-ok 1817 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 40 - commit file with mixed EOL onto LF crlf=input attr=auto
 
-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.41 'commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
 	
-ok 1818 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 41 - commit file with mixed EOL onto CLRF attr=auto aeol= crlf=input
 
-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.42 'commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
 	
-ok 1819 - checkout attr=text ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
+ok 42 - commit file with mixed EOL onto CRLF_mix_LF attr=auto aeol= crlf=input
 
-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.43 'commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=input ': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
 	
-ok 1820 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
+ok 43 - commit file with mixed EOL onto LF_mix_cr attr=auto aeol= crlf=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.44 'commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 44 - commit file with mixed EOL onto CRLF_nul attr=auto aeol= crlf=input
 
-expecting success of 0027.1822 'setup CRLF checkout  with -c core.eol=lf': 
-			rm -f crlf_false_attr__$f.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 45 - setup commit NNO files
+
+expecting success of 0027.46 'commit NNO files crlf=false attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 46 - commit NNO files crlf=false attr= LF
+
+expecting success of 0027.47 'commit NNO files attr= aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 47 - commit NNO files attr= aeol= crlf=false CRLF
+
+expecting success of 0027.48 'commit NNO files attr= aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 48 - commit NNO files attr= aeol= crlf=false CRLF_mix_LF
+
+expecting success of 0027.49 'commit NNO files attr= aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 49 - commit NNO files attr= aeol= crlf=false LF_mix_cr
+
+expecting success of 0027.50 'commit NNO files attr= aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 50 - commit NNO files attr= aeol= crlf=false CRLF_nul
+
+expecting success of 0027.51 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 51 - setup commit NNO files
+
+expecting success of 0027.52 'commit NNO files crlf=true attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 52 - commit NNO files crlf=true attr= LF
+
+expecting success of 0027.53 'commit NNO files attr= aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 53 - commit NNO files attr= aeol= crlf=true CRLF
+
+expecting success of 0027.54 'commit NNO files attr= aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 54 - commit NNO files attr= aeol= crlf=true CRLF_mix_LF
+
+expecting success of 0027.55 'commit NNO files attr= aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 55 - commit NNO files attr= aeol= crlf=true LF_mix_cr
+
+expecting success of 0027.56 'commit NNO files attr= aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 56 - commit NNO files attr= aeol= crlf=true CRLF_nul
+
+expecting success of 0027.57 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 57 - setup commit NNO files
+
+expecting success of 0027.58 'commit NNO files crlf=input attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 58 - commit NNO files crlf=input attr= LF
+
+expecting success of 0027.59 'commit NNO files attr= aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 59 - commit NNO files attr= aeol= crlf=input CRLF
+
+expecting success of 0027.60 'commit NNO files attr= aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 60 - commit NNO files attr= aeol= crlf=input CRLF_mix_LF
+
+expecting success of 0027.61 'commit NNO files attr= aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 61 - commit NNO files attr= aeol= crlf=input LF_mix_cr
+
+expecting success of 0027.62 'commit NNO files attr= aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 62 - commit NNO files attr= aeol= crlf=input CRLF_nul
+
+expecting success of 0027.63 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 63 - setup commit NNO files
+
+expecting success of 0027.64 'commit NNO files crlf=false attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 64 - commit NNO files crlf=false attr=auto LF
+
+expecting success of 0027.65 'commit NNO files attr=auto aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 65 - commit NNO files attr=auto aeol= crlf=false CRLF
+
+expecting success of 0027.66 'commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 66 - commit NNO files attr=auto aeol= crlf=false CRLF_mix_LF
+
+expecting success of 0027.67 'commit NNO files attr=auto aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 67 - commit NNO files attr=auto aeol= crlf=false LF_mix_cr
+
+expecting success of 0027.68 'commit NNO files attr=auto aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 68 - commit NNO files attr=auto aeol= crlf=false CRLF_nul
+
+expecting success of 0027.69 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 69 - setup commit NNO files
+
+expecting success of 0027.70 'commit NNO files crlf=true attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 70 - commit NNO files crlf=true attr=auto LF
+
+expecting success of 0027.71 'commit NNO files attr=auto aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 71 - commit NNO files attr=auto aeol= crlf=true CRLF
+
+expecting success of 0027.72 'commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 72 - commit NNO files attr=auto aeol= crlf=true CRLF_mix_LF
+
+expecting success of 0027.73 'commit NNO files attr=auto aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 73 - commit NNO files attr=auto aeol= crlf=true LF_mix_cr
+
+expecting success of 0027.74 'commit NNO files attr=auto aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 74 - commit NNO files attr=auto aeol= crlf=true CRLF_nul
+
+expecting success of 0027.75 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 75 - setup commit NNO files
+
+expecting success of 0027.76 'commit NNO files crlf=input attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 76 - commit NNO files crlf=input attr=auto LF
+
+expecting success of 0027.77 'commit NNO files attr=auto aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 77 - commit NNO files attr=auto aeol= crlf=input CRLF
+
+expecting success of 0027.78 'commit NNO files attr=auto aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 78 - commit NNO files attr=auto aeol= crlf=input CRLF_mix_LF
+
+expecting success of 0027.79 'commit NNO files attr=auto aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 79 - commit NNO files attr=auto aeol= crlf=input LF_mix_cr
+
+expecting success of 0027.80 'commit NNO files attr=auto aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 80 - commit NNO files attr=auto aeol= crlf=input CRLF_nul
+
+expecting success of 0027.81 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 81 - setup commit NNO files
+
+expecting success of 0027.82 'commit NNO files crlf=true attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 82 - commit NNO files crlf=true attr=-text LF
+
+expecting success of 0027.83 'commit NNO files attr=-text aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 83 - commit NNO files attr=-text aeol= crlf=true CRLF
+
+expecting success of 0027.84 'commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 84 - commit NNO files attr=-text aeol= crlf=true CRLF_mix_LF
+
+expecting success of 0027.85 'commit NNO files attr=-text aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 85 - commit NNO files attr=-text aeol= crlf=true LF_mix_cr
+
+expecting success of 0027.86 'commit NNO files attr=-text aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 86 - commit NNO files attr=-text aeol= crlf=true CRLF_nul
+
+expecting success of 0027.87 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 87 - setup commit NNO files
+
+expecting success of 0027.88 'commit NNO files crlf=true attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 88 - commit NNO files crlf=true attr=-text LF
+
+expecting success of 0027.89 'commit NNO files attr=-text aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 89 - commit NNO files attr=-text aeol=lf crlf=true CRLF
+
+expecting success of 0027.90 'commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 90 - commit NNO files attr=-text aeol=lf crlf=true CRLF_mix_LF
+
+expecting success of 0027.91 'commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 91 - commit NNO files attr=-text aeol=lf crlf=true LF_mix_cr
+
+expecting success of 0027.92 'commit NNO files attr=-text aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 92 - commit NNO files attr=-text aeol=lf crlf=true CRLF_nul
+
+expecting success of 0027.93 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 93 - setup commit NNO files
+
+expecting success of 0027.94 'commit NNO files crlf=true attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 94 - commit NNO files crlf=true attr=-text LF
+
+expecting success of 0027.95 'commit NNO files attr=-text aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 95 - commit NNO files attr=-text aeol=crlf crlf=true CRLF
+
+expecting success of 0027.96 'commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 96 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_mix_LF
+
+expecting success of 0027.97 'commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 97 - commit NNO files attr=-text aeol=crlf crlf=true LF_mix_cr
+
+expecting success of 0027.98 'commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 98 - commit NNO files attr=-text aeol=crlf crlf=true CRLF_nul
+
+expecting success of 0027.99 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 99 - setup commit NNO files
+
+expecting success of 0027.100 'commit NNO files crlf=true attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 100 - commit NNO files crlf=true attr= LF
+
+expecting success of 0027.101 'commit NNO files attr= aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 101 - commit NNO files attr= aeol=lf crlf=true CRLF
+
+expecting success of 0027.102 'commit NNO files attr= aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 102 - commit NNO files attr= aeol=lf crlf=true CRLF_mix_LF
+
+expecting success of 0027.103 'commit NNO files attr= aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 103 - commit NNO files attr= aeol=lf crlf=true LF_mix_cr
+
+expecting success of 0027.104 'commit NNO files attr= aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 104 - commit NNO files attr= aeol=lf crlf=true CRLF_nul
+
+expecting success of 0027.105 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 105 - setup commit NNO files
+
+expecting success of 0027.106 'commit NNO files crlf=true attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 106 - commit NNO files crlf=true attr= LF
+
+expecting success of 0027.107 'commit NNO files attr= aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 107 - commit NNO files attr= aeol=crlf crlf=true CRLF
+
+expecting success of 0027.108 'commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 108 - commit NNO files attr= aeol=crlf crlf=true CRLF_mix_LF
+
+expecting success of 0027.109 'commit NNO files attr= aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 109 - commit NNO files attr= aeol=crlf crlf=true LF_mix_cr
+
+expecting success of 0027.110 'commit NNO files attr= aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 110 - commit NNO files attr= aeol=crlf crlf=true CRLF_nul
+
+expecting success of 0027.111 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 111 - setup commit NNO files
+
+expecting success of 0027.112 'commit NNO files crlf=true attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 112 - commit NNO files crlf=true attr=auto LF
+
+expecting success of 0027.113 'commit NNO files attr=auto aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 113 - commit NNO files attr=auto aeol=lf crlf=true CRLF
+
+expecting success of 0027.114 'commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 114 - commit NNO files attr=auto aeol=lf crlf=true CRLF_mix_LF
+
+expecting success of 0027.115 'commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 115 - commit NNO files attr=auto aeol=lf crlf=true LF_mix_cr
+
+expecting success of 0027.116 'commit NNO files attr=auto aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 116 - commit NNO files attr=auto aeol=lf crlf=true CRLF_nul
+
+expecting success of 0027.117 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 117 - setup commit NNO files
+
+expecting success of 0027.118 'commit NNO files crlf=true attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 118 - commit NNO files crlf=true attr=auto LF
+
+expecting success of 0027.119 'commit NNO files attr=auto aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 119 - commit NNO files attr=auto aeol=crlf crlf=true CRLF
+
+expecting success of 0027.120 'commit NNO files attr=auto aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 120 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_mix_LF
+
+expecting success of 0027.121 'commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 121 - commit NNO files attr=auto aeol=crlf crlf=true LF_mix_cr
+
+expecting success of 0027.122 'commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 122 - commit NNO files attr=auto aeol=crlf crlf=true CRLF_nul
+
+expecting success of 0027.123 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 123 - setup commit NNO files
+
+expecting success of 0027.124 'commit NNO files crlf=true attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 124 - commit NNO files crlf=true attr=text LF
+
+expecting success of 0027.125 'commit NNO files attr=text aeol=lf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 125 - commit NNO files attr=text aeol=lf crlf=true CRLF
+
+expecting success of 0027.126 'commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 126 - commit NNO files attr=text aeol=lf crlf=true CRLF_mix_LF
+
+expecting success of 0027.127 'commit NNO files attr=text aeol=lf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 127 - commit NNO files attr=text aeol=lf crlf=true LF_mix_cr
+
+expecting success of 0027.128 'commit NNO files attr=text aeol=lf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 128 - commit NNO files attr=text aeol=lf crlf=true CRLF_nul
+
+expecting success of 0027.129 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 129 - setup commit NNO files
+
+expecting success of 0027.130 'commit NNO files crlf=true attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 130 - commit NNO files crlf=true attr=text LF
+
+expecting success of 0027.131 'commit NNO files attr=text aeol=crlf crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 131 - commit NNO files attr=text aeol=crlf crlf=true CRLF
+
+expecting success of 0027.132 'commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 132 - commit NNO files attr=text aeol=crlf crlf=true CRLF_mix_LF
+
+expecting success of 0027.133 'commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 133 - commit NNO files attr=text aeol=crlf crlf=true LF_mix_cr
+
+expecting success of 0027.134 'commit NNO files attr=text aeol=crlf crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 134 - commit NNO files attr=text aeol=crlf crlf=true CRLF_nul
+
+expecting success of 0027.135 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 135 - setup commit NNO files
+
+expecting success of 0027.136 'commit NNO files crlf=false attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 136 - commit NNO files crlf=false attr=-text LF
+
+expecting success of 0027.137 'commit NNO files attr=-text aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 137 - commit NNO files attr=-text aeol= crlf=false CRLF
+
+expecting success of 0027.138 'commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 138 - commit NNO files attr=-text aeol= crlf=false CRLF_mix_LF
+
+expecting success of 0027.139 'commit NNO files attr=-text aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 139 - commit NNO files attr=-text aeol= crlf=false LF_mix_cr
+
+expecting success of 0027.140 'commit NNO files attr=-text aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 140 - commit NNO files attr=-text aeol= crlf=false CRLF_nul
+
+expecting success of 0027.141 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 141 - setup commit NNO files
+
+expecting success of 0027.142 'commit NNO files crlf=false attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 142 - commit NNO files crlf=false attr=-text LF
+
+expecting success of 0027.143 'commit NNO files attr=-text aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 143 - commit NNO files attr=-text aeol=lf crlf=false CRLF
+
+expecting success of 0027.144 'commit NNO files attr=-text aeol=lf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 144 - commit NNO files attr=-text aeol=lf crlf=false CRLF_mix_LF
+
+expecting success of 0027.145 'commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 145 - commit NNO files attr=-text aeol=lf crlf=false LF_mix_cr
+
+expecting success of 0027.146 'commit NNO files attr=-text aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 146 - commit NNO files attr=-text aeol=lf crlf=false CRLF_nul
+
+expecting success of 0027.147 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 147 - setup commit NNO files
+
+expecting success of 0027.148 'commit NNO files crlf=false attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 148 - commit NNO files crlf=false attr=-text LF
+
+expecting success of 0027.149 'commit NNO files attr=-text aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 149 - commit NNO files attr=-text aeol=crlf crlf=false CRLF
+
+expecting success of 0027.150 'commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 150 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_mix_LF
+
+expecting success of 0027.151 'commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 151 - commit NNO files attr=-text aeol=crlf crlf=false LF_mix_cr
+
+expecting success of 0027.152 'commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 152 - commit NNO files attr=-text aeol=crlf crlf=false CRLF_nul
+
+expecting success of 0027.153 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 153 - setup commit NNO files
+
+expecting success of 0027.154 'commit NNO files crlf=false attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 154 - commit NNO files crlf=false attr= LF
+
+expecting success of 0027.155 'commit NNO files attr= aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 155 - commit NNO files attr= aeol=lf crlf=false CRLF
+
+expecting success of 0027.156 'commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 156 - commit NNO files attr= aeol=lf crlf=false CRLF_mix_LF
+
+expecting success of 0027.157 'commit NNO files attr= aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 157 - commit NNO files attr= aeol=lf crlf=false LF_mix_cr
+
+expecting success of 0027.158 'commit NNO files attr= aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 158 - commit NNO files attr= aeol=lf crlf=false CRLF_nul
+
+expecting success of 0027.159 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 159 - setup commit NNO files
+
+expecting success of 0027.160 'commit NNO files crlf=false attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 160 - commit NNO files crlf=false attr= LF
+
+expecting success of 0027.161 'commit NNO files attr= aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 161 - commit NNO files attr= aeol=crlf crlf=false CRLF
+
+expecting success of 0027.162 'commit NNO files attr= aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 162 - commit NNO files attr= aeol=crlf crlf=false CRLF_mix_LF
+
+expecting success of 0027.163 'commit NNO files attr= aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 163 - commit NNO files attr= aeol=crlf crlf=false LF_mix_cr
+
+expecting success of 0027.164 'commit NNO files attr= aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 164 - commit NNO files attr= aeol=crlf crlf=false CRLF_nul
+
+expecting success of 0027.165 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 165 - setup commit NNO files
+
+expecting success of 0027.166 'commit NNO files crlf=false attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 166 - commit NNO files crlf=false attr=auto LF
+
+expecting success of 0027.167 'commit NNO files attr=auto aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 167 - commit NNO files attr=auto aeol=lf crlf=false CRLF
+
+expecting success of 0027.168 'commit NNO files attr=auto aeol=lf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 168 - commit NNO files attr=auto aeol=lf crlf=false CRLF_mix_LF
+
+expecting success of 0027.169 'commit NNO files attr=auto aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 169 - commit NNO files attr=auto aeol=lf crlf=false LF_mix_cr
+
+expecting success of 0027.170 'commit NNO files attr=auto aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 170 - commit NNO files attr=auto aeol=lf crlf=false CRLF_nul
+
+expecting success of 0027.171 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 171 - setup commit NNO files
+
+expecting success of 0027.172 'commit NNO files crlf=false attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 172 - commit NNO files crlf=false attr=auto LF
+
+expecting success of 0027.173 'commit NNO files attr=auto aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 173 - commit NNO files attr=auto aeol=crlf crlf=false CRLF
+
+expecting success of 0027.174 'commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 174 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_mix_LF
+
+expecting success of 0027.175 'commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 175 - commit NNO files attr=auto aeol=crlf crlf=false LF_mix_cr
+
+expecting success of 0027.176 'commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 176 - commit NNO files attr=auto aeol=crlf crlf=false CRLF_nul
+
+expecting success of 0027.177 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 177 - setup commit NNO files
+
+expecting success of 0027.178 'commit NNO files crlf=false attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 178 - commit NNO files crlf=false attr=text LF
+
+expecting success of 0027.179 'commit NNO files attr=text aeol=lf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 179 - commit NNO files attr=text aeol=lf crlf=false CRLF
+
+expecting success of 0027.180 'commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 180 - commit NNO files attr=text aeol=lf crlf=false CRLF_mix_LF
+
+expecting success of 0027.181 'commit NNO files attr=text aeol=lf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 181 - commit NNO files attr=text aeol=lf crlf=false LF_mix_cr
+
+expecting success of 0027.182 'commit NNO files attr=text aeol=lf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 182 - commit NNO files attr=text aeol=lf crlf=false CRLF_nul
+
+expecting success of 0027.183 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 183 - setup commit NNO files
+
+expecting success of 0027.184 'commit NNO files crlf=false attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 184 - commit NNO files crlf=false attr=text LF
+
+expecting success of 0027.185 'commit NNO files attr=text aeol=crlf crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 185 - commit NNO files attr=text aeol=crlf crlf=false CRLF
+
+expecting success of 0027.186 'commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 186 - commit NNO files attr=text aeol=crlf crlf=false CRLF_mix_LF
+
+expecting success of 0027.187 'commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 187 - commit NNO files attr=text aeol=crlf crlf=false LF_mix_cr
+
+expecting success of 0027.188 'commit NNO files attr=text aeol=crlf crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 188 - commit NNO files attr=text aeol=crlf crlf=false CRLF_nul
+
+expecting success of 0027.189 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 189 - setup commit NNO files
+
+expecting success of 0027.190 'commit NNO files crlf=input attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 190 - commit NNO files crlf=input attr=-text LF
+
+expecting success of 0027.191 'commit NNO files attr=-text aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 191 - commit NNO files attr=-text aeol= crlf=input CRLF
+
+expecting success of 0027.192 'commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 192 - commit NNO files attr=-text aeol= crlf=input CRLF_mix_LF
+
+expecting success of 0027.193 'commit NNO files attr=-text aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 193 - commit NNO files attr=-text aeol= crlf=input LF_mix_cr
+
+expecting success of 0027.194 'commit NNO files attr=-text aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 194 - commit NNO files attr=-text aeol= crlf=input CRLF_nul
+
+expecting success of 0027.195 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 195 - setup commit NNO files
+
+expecting success of 0027.196 'commit NNO files crlf=input attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 196 - commit NNO files crlf=input attr=-text LF
+
+expecting success of 0027.197 'commit NNO files attr=-text aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 197 - commit NNO files attr=-text aeol=lf crlf=input CRLF
+
+expecting success of 0027.198 'commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 198 - commit NNO files attr=-text aeol=lf crlf=input CRLF_mix_LF
+
+expecting success of 0027.199 'commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 199 - commit NNO files attr=-text aeol=lf crlf=input LF_mix_cr
+
+expecting success of 0027.200 'commit NNO files attr=-text aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 200 - commit NNO files attr=-text aeol=lf crlf=input CRLF_nul
+
+expecting success of 0027.201 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 201 - setup commit NNO files
+
+expecting success of 0027.202 'commit NNO files crlf=input attr=-text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 202 - commit NNO files crlf=input attr=-text LF
+
+expecting success of 0027.203 'commit NNO files attr=-text aeol=crlf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 203 - commit NNO files attr=-text aeol=crlf crlf=input CRLF
+
+expecting success of 0027.204 'commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 204 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_mix_LF
+
+expecting success of 0027.205 'commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 205 - commit NNO files attr=-text aeol=crlf crlf=input LF_mix_cr
+
+expecting success of 0027.206 'commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 206 - commit NNO files attr=-text aeol=crlf crlf=input CRLF_nul
+
+expecting success of 0027.207 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 207 - setup commit NNO files
+
+expecting success of 0027.208 'commit NNO files crlf=input attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 208 - commit NNO files crlf=input attr= LF
+
+expecting success of 0027.209 'commit NNO files attr= aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 209 - commit NNO files attr= aeol=lf crlf=input CRLF
+
+expecting success of 0027.210 'commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 210 - commit NNO files attr= aeol=lf crlf=input CRLF_mix_LF
+
+expecting success of 0027.211 'commit NNO files attr= aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 211 - commit NNO files attr= aeol=lf crlf=input LF_mix_cr
+
+expecting success of 0027.212 'commit NNO files attr= aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 212 - commit NNO files attr= aeol=lf crlf=input CRLF_nul
+
+expecting success of 0027.213 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 213 - setup commit NNO files
+
+expecting success of 0027.214 'commit NNO files crlf=input attr= LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 214 - commit NNO files crlf=input attr= LF
+
+expecting success of 0027.215 'commit NNO files attr= aeol=crlf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 215 - commit NNO files attr= aeol=crlf crlf=input CRLF
+
+expecting success of 0027.216 'commit NNO files attr= aeol=crlf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 216 - commit NNO files attr= aeol=crlf crlf=input CRLF_mix_LF
+
+expecting success of 0027.217 'commit NNO files attr= aeol=crlf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 217 - commit NNO files attr= aeol=crlf crlf=input LF_mix_cr
+
+expecting success of 0027.218 'commit NNO files attr= aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 218 - commit NNO files attr= aeol=crlf crlf=input CRLF_nul
+
+expecting success of 0027.219 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 219 - setup commit NNO files
+
+expecting success of 0027.220 'commit NNO files crlf=input attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 220 - commit NNO files crlf=input attr=auto LF
+
+expecting success of 0027.221 'commit NNO files attr=auto aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 221 - commit NNO files attr=auto aeol=lf crlf=input CRLF
+
+expecting success of 0027.222 'commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 222 - commit NNO files attr=auto aeol=lf crlf=input CRLF_mix_LF
+
+expecting success of 0027.223 'commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 223 - commit NNO files attr=auto aeol=lf crlf=input LF_mix_cr
+
+expecting success of 0027.224 'commit NNO files attr=auto aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 224 - commit NNO files attr=auto aeol=lf crlf=input CRLF_nul
+
+expecting success of 0027.225 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 225 - setup commit NNO files
+
+expecting success of 0027.226 'commit NNO files crlf=input attr=auto LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 226 - commit NNO files crlf=input attr=auto LF
+
+expecting success of 0027.227 'commit NNO files attr=auto aeol=crlf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 227 - commit NNO files attr=auto aeol=crlf crlf=input CRLF
+
+expecting success of 0027.228 'commit NNO files attr=auto aeol=crlf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 228 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_mix_LF
+
+expecting success of 0027.229 'commit NNO files attr=auto aeol=crlf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 229 - commit NNO files attr=auto aeol=crlf crlf=input LF_mix_cr
+
+expecting success of 0027.230 'commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 230 - commit NNO files attr=auto aeol=crlf crlf=input CRLF_nul
+
+expecting success of 0027.231 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 231 - setup commit NNO files
+
+expecting success of 0027.232 'commit NNO files crlf=input attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 232 - commit NNO files crlf=input attr=text LF
+
+expecting success of 0027.233 'commit NNO files attr=text aeol=lf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 233 - commit NNO files attr=text aeol=lf crlf=input CRLF
+
+expecting success of 0027.234 'commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 234 - commit NNO files attr=text aeol=lf crlf=input CRLF_mix_LF
+
+expecting success of 0027.235 'commit NNO files attr=text aeol=lf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 235 - commit NNO files attr=text aeol=lf crlf=input LF_mix_cr
+
+expecting success of 0027.236 'commit NNO files attr=text aeol=lf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 236 - commit NNO files attr=text aeol=lf crlf=input CRLF_nul
+
+expecting success of 0027.237 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 237 - setup commit NNO files
+
+expecting success of 0027.238 'commit NNO files crlf=input attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 238 - commit NNO files crlf=input attr=text LF
+
+expecting success of 0027.239 'commit NNO files attr=text aeol=crlf crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 239 - commit NNO files attr=text aeol=crlf crlf=input CRLF
+
+expecting success of 0027.240 'commit NNO files attr=text aeol=crlf crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 240 - commit NNO files attr=text aeol=crlf crlf=input CRLF_mix_LF
+
+expecting success of 0027.241 'commit NNO files attr=text aeol=crlf crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 241 - commit NNO files attr=text aeol=crlf crlf=input LF_mix_cr
+
+expecting success of 0027.242 'commit NNO files attr=text aeol=crlf crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 242 - commit NNO files attr=text aeol=crlf crlf=input CRLF_nul
+
+expecting success of 0027.243 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 243 - setup commit NNO files
+
+expecting success of 0027.244 'commit NNO files crlf=false attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 244 - commit NNO files crlf=false attr=text LF
+
+expecting success of 0027.245 'commit NNO files attr=text aeol= crlf=false CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 245 - commit NNO files attr=text aeol= crlf=false CRLF
+
+expecting success of 0027.246 'commit NNO files attr=text aeol= crlf=false CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 246 - commit NNO files attr=text aeol= crlf=false CRLF_mix_LF
+
+expecting success of 0027.247 'commit NNO files attr=text aeol= crlf=false LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 247 - commit NNO files attr=text aeol= crlf=false LF_mix_cr
+
+expecting success of 0027.248 'commit NNO files attr=text aeol= crlf=false CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 248 - commit NNO files attr=text aeol= crlf=false CRLF_nul
+
+expecting success of 0027.249 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 249 - setup commit NNO files
+
+expecting success of 0027.250 'commit NNO files crlf=true attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 250 - commit NNO files crlf=true attr=text LF
+
+expecting success of 0027.251 'commit NNO files attr=text aeol= crlf=true CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 251 - commit NNO files attr=text aeol= crlf=true CRLF
+
+expecting success of 0027.252 'commit NNO files attr=text aeol= crlf=true CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 252 - commit NNO files attr=text aeol= crlf=true CRLF_mix_LF
+
+expecting success of 0027.253 'commit NNO files attr=text aeol= crlf=true LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 253 - commit NNO files attr=text aeol= crlf=true LF_mix_cr
+
+expecting success of 0027.254 'commit NNO files attr=text aeol= crlf=true CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 254 - commit NNO files attr=text aeol= crlf=true CRLF_nul
+
+expecting success of 0027.255 'setup commit NNO files': 
+		#Commit files on top of existing file
+		create_gitattributes "$attr" $aeol &&
+		for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+		do
+			fname=${pfx}_$f.txt &&
+			cp $f $fname &&
+			printf Z >>"$fname" &&
+			git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" ||
+			return 1
+		done
+	
+ok 255 - setup commit NNO files
+
+expecting success of 0027.256 'commit NNO files crlf=input attr=text LF': 
+		check_warning "$lfwarn" ${pfx}_LF.err
+	
+ok 256 - commit NNO files crlf=input attr=text LF
+
+expecting success of 0027.257 'commit NNO files attr=text aeol= crlf=input CRLF': 
+		check_warning "$crlfwarn" ${pfx}_CRLF.err
+	
+ok 257 - commit NNO files attr=text aeol= crlf=input CRLF
+
+expecting success of 0027.258 'commit NNO files attr=text aeol= crlf=input CRLF_mix_LF': 
+		check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+	
+ok 258 - commit NNO files attr=text aeol= crlf=input CRLF_mix_LF
+
+expecting success of 0027.259 'commit NNO files attr=text aeol= crlf=input LF_mix_cr': 
+		check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+	
+ok 259 - commit NNO files attr=text aeol= crlf=input LF_mix_cr
+
+expecting success of 0027.260 'commit NNO files attr=text aeol= crlf=input CRLF_nul': 
+		check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+	
+ok 260 - commit NNO files attr=text aeol= crlf=input CRLF_nul
+
+expecting success of 0027.261 'commit NNO and cleanup': 
+	git commit -m "commit files on top of NNO" &&
+	rm -f *.txt &&
+	git -c core.autocrlf=false reset --hard
+
+[main 35da0ca] commit files on top of NNO
+ Author: A U Thor <author@example.com>
+ 210 files changed, 332 insertions(+), 362 deletions(-)
+HEAD is now at 35da0ca commit files on top of NNO
+ok 261 - commit NNO and cleanup
+
+expecting success of 0027.262 'commit empty gitattribues': 
+	check_files_in_repo false ""      LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
+	check_files_in_repo true  ""      LF LF   LF          LF_mix_CR CRLF_nul &&
+	check_files_in_repo input ""      LF LF   LF          LF_mix_CR CRLF_nul
+
+ok 262 - commit empty gitattribues
+
+expecting success of 0027.263 'commit text=auto': 
+	check_files_in_repo false "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
+	check_files_in_repo true  "auto"  LF LF   LF          LF_mix_CR CRLF_nul &&
+	check_files_in_repo input "auto"  LF LF   LF          LF_mix_CR CRLF_nul
+
+ok 263 - commit text=auto
+
+expecting success of 0027.264 'commit text': 
+	check_files_in_repo false "text"  LF LF   LF          LF_mix_CR LF_nul &&
+	check_files_in_repo true  "text"  LF LF   LF          LF_mix_CR LF_nul &&
+	check_files_in_repo input "text"  LF LF   LF          LF_mix_CR LF_nul
+
+ok 264 - commit text
+
+expecting success of 0027.265 'commit -text': 
+	check_files_in_repo false "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
+	check_files_in_repo true  "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul &&
+	check_files_in_repo input "-text" LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+
+ok 265 - commit -text
+
+expecting success of 0027.266 'compare_files LF NNO_attr__aeol__true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 266 - compare_files LF NNO_attr__aeol__true_LF.txt
+
+expecting success of 0027.267 'compare_files CRLF NNO_attr__aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 267 - compare_files CRLF NNO_attr__aeol__true_CRLF.txt
+
+expecting success of 0027.268 'compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 268 - compare_files CRLF_mix_LF NNO_attr__aeol__true_CRLF_mix_LF.txt
+
+expecting success of 0027.269 'compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 269 - compare_files LF_mix_CR NNO_attr__aeol__true_LF_mix_CR.txt
+
+expecting success of 0027.270 'compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 270 - compare_files CRLF_nul NNO_attr__aeol__true_CRLF_nul.txt
+
+expecting success of 0027.271 'compare_files LF NNO_attr_-text_aeol__true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 271 - compare_files LF NNO_attr_-text_aeol__true_LF.txt
+
+expecting success of 0027.272 'compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 272 - compare_files CRLF NNO_attr_-text_aeol__true_CRLF.txt
+
+expecting success of 0027.273 'compare_files CRLF_mix_LF NNO_attr_-text_aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 273 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__true_CRLF_mix_LF.txt
+
+expecting success of 0027.274 'compare_files LF_mix_CR NNO_attr_-text_aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 274 - compare_files LF_mix_CR NNO_attr_-text_aeol__true_LF_mix_CR.txt
+
+expecting success of 0027.275 'compare_files CRLF_nul NNO_attr_-text_aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 275 - compare_files CRLF_nul NNO_attr_-text_aeol__true_CRLF_nul.txt
+
+expecting success of 0027.276 'compare_files LF NNO_attr_-text_aeol_lf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 276 - compare_files LF NNO_attr_-text_aeol_lf_true_LF.txt
+
+expecting success of 0027.277 'compare_files CRLF NNO_attr_-text_aeol_lf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 277 - compare_files CRLF NNO_attr_-text_aeol_lf_true_CRLF.txt
+
+expecting success of 0027.278 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 278 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.279 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 279 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_true_LF_mix_CR.txt
+
+expecting success of 0027.280 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 280 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_true_CRLF_nul.txt
+
+expecting success of 0027.281 'compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 281 - compare_files LF NNO_attr_-text_aeol_crlf_true_LF.txt
+
+expecting success of 0027.282 'compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 282 - compare_files CRLF NNO_attr_-text_aeol_crlf_true_CRLF.txt
+
+expecting success of 0027.283 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 283 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.284 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 284 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_true_LF_mix_CR.txt
+
+expecting success of 0027.285 'compare_files CRLF_nul NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 285 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_true_CRLF_nul.txt
+
+expecting success of 0027.286 'compare_files LF NNO_attr_auto_aeol__true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 286 - compare_files LF NNO_attr_auto_aeol__true_LF.txt
+
+expecting success of 0027.287 'compare_files CRLF NNO_attr_auto_aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 287 - compare_files CRLF NNO_attr_auto_aeol__true_CRLF.txt
+
+expecting success of 0027.288 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 288 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__true_CRLF_mix_LF.txt
+
+expecting success of 0027.289 'compare_files LF_mix_CR NNO_attr_auto_aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 289 - compare_files LF_mix_CR NNO_attr_auto_aeol__true_LF_mix_CR.txt
+
+expecting success of 0027.290 'compare_files CRLF_nul NNO_attr_auto_aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 290 - compare_files CRLF_nul NNO_attr_auto_aeol__true_CRLF_nul.txt
+
+expecting success of 0027.291 'compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 291 - compare_files LF NNO_attr_auto_aeol_lf_true_LF.txt
+
+expecting success of 0027.292 'compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 292 - compare_files CRLF NNO_attr_auto_aeol_lf_true_CRLF.txt
+
+expecting success of 0027.293 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 293 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.294 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 294 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_true_LF_mix_CR.txt
+
+expecting success of 0027.295 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 295 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_true_CRLF_nul.txt
+
+expecting success of 0027.296 'compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 296 - compare_files LF NNO_attr_auto_aeol_crlf_true_LF.txt
+
+expecting success of 0027.297 'compare_files CRLF NNO_attr_auto_aeol_crlf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 297 - compare_files CRLF NNO_attr_auto_aeol_crlf_true_CRLF.txt
+
+expecting success of 0027.298 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 298 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.299 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 299 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_true_LF_mix_CR.txt
+
+expecting success of 0027.300 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 300 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_true_CRLF_nul.txt
+
+expecting success of 0027.301 'compare_files LF NNO_attr_text_aeol__true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 301 - compare_files LF NNO_attr_text_aeol__true_LF.txt
+
+expecting success of 0027.302 'compare_files LF NNO_attr_text_aeol__true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 302 - compare_files LF NNO_attr_text_aeol__true_CRLF.txt
+
+expecting success of 0027.303 'compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 303 - compare_files LF NNO_attr_text_aeol__true_CRLF_mix_LF.txt
+
+expecting success of 0027.304 'compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 304 - compare_files LF_mix_CR NNO_attr_text_aeol__true_LF_mix_CR.txt
+
+expecting success of 0027.305 'compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 305 - compare_files LF_nul NNO_attr_text_aeol__true_CRLF_nul.txt
+
+expecting success of 0027.306 'compare_files LF NNO_attr_text_aeol_lf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 306 - compare_files LF NNO_attr_text_aeol_lf_true_LF.txt
+
+expecting success of 0027.307 'compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 307 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF.txt
+
+expecting success of 0027.308 'compare_files LF NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 308 - compare_files LF NNO_attr_text_aeol_lf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.309 'compare_files LF_mix_CR NNO_attr_text_aeol_lf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 309 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_true_LF_mix_CR.txt
+
+expecting success of 0027.310 'compare_files LF_nul NNO_attr_text_aeol_lf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 310 - compare_files LF_nul NNO_attr_text_aeol_lf_true_CRLF_nul.txt
+
+expecting success of 0027.311 'compare_files LF NNO_attr_text_aeol_crlf_true_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 311 - compare_files LF NNO_attr_text_aeol_crlf_true_LF.txt
+
+expecting success of 0027.312 'compare_files LF NNO_attr_text_aeol_crlf_true_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 312 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF.txt
+
+expecting success of 0027.313 'compare_files LF NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 313 - compare_files LF NNO_attr_text_aeol_crlf_true_CRLF_mix_LF.txt
+
+expecting success of 0027.314 'compare_files LF_mix_CR NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 314 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_true_LF_mix_CR.txt
+
+expecting success of 0027.315 'compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 315 - compare_files LF_nul NNO_attr_text_aeol_crlf_true_CRLF_nul.txt
+
+expecting success of 0027.316 'compare_files LF NNO_attr__aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 316 - compare_files LF NNO_attr__aeol__false_LF.txt
+
+expecting success of 0027.317 'compare_files CRLF NNO_attr__aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 317 - compare_files CRLF NNO_attr__aeol__false_CRLF.txt
+
+expecting success of 0027.318 'compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 318 - compare_files CRLF_mix_LF NNO_attr__aeol__false_CRLF_mix_LF.txt
+
+expecting success of 0027.319 'compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 319 - compare_files LF_mix_CR NNO_attr__aeol__false_LF_mix_CR.txt
+
+expecting success of 0027.320 'compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 320 - compare_files CRLF_nul NNO_attr__aeol__false_CRLF_nul.txt
+
+expecting success of 0027.321 'compare_files LF NNO_attr_-text_aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 321 - compare_files LF NNO_attr_-text_aeol__false_LF.txt
+
+expecting success of 0027.322 'compare_files CRLF NNO_attr_-text_aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 322 - compare_files CRLF NNO_attr_-text_aeol__false_CRLF.txt
+
+expecting success of 0027.323 'compare_files CRLF_mix_LF NNO_attr_-text_aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 323 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__false_CRLF_mix_LF.txt
+
+expecting success of 0027.324 'compare_files LF_mix_CR NNO_attr_-text_aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 324 - compare_files LF_mix_CR NNO_attr_-text_aeol__false_LF_mix_CR.txt
+
+expecting success of 0027.325 'compare_files CRLF_nul NNO_attr_-text_aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 325 - compare_files CRLF_nul NNO_attr_-text_aeol__false_CRLF_nul.txt
+
+expecting success of 0027.326 'compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 326 - compare_files LF NNO_attr_-text_aeol_lf_false_LF.txt
+
+expecting success of 0027.327 'compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 327 - compare_files CRLF NNO_attr_-text_aeol_lf_false_CRLF.txt
+
+expecting success of 0027.328 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 328 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.329 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 329 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_false_LF_mix_CR.txt
+
+expecting success of 0027.330 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 330 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_false_CRLF_nul.txt
+
+expecting success of 0027.331 'compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 331 - compare_files LF NNO_attr_-text_aeol_crlf_false_LF.txt
+
+expecting success of 0027.332 'compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 332 - compare_files CRLF NNO_attr_-text_aeol_crlf_false_CRLF.txt
+
+expecting success of 0027.333 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 333 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.334 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 334 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_false_LF_mix_CR.txt
+
+expecting success of 0027.335 'compare_files CRLF_nul NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 335 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_false_CRLF_nul.txt
+
+expecting success of 0027.336 'compare_files LF NNO_attr_auto_aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 336 - compare_files LF NNO_attr_auto_aeol__false_LF.txt
+
+expecting success of 0027.337 'compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 337 - compare_files CRLF NNO_attr_auto_aeol__false_CRLF.txt
+
+expecting success of 0027.338 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 338 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__false_CRLF_mix_LF.txt
+
+expecting success of 0027.339 'compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 339 - compare_files LF_mix_CR NNO_attr_auto_aeol__false_LF_mix_CR.txt
+
+expecting success of 0027.340 'compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 340 - compare_files CRLF_nul NNO_attr_auto_aeol__false_CRLF_nul.txt
+
+expecting success of 0027.341 'compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 341 - compare_files LF NNO_attr_auto_aeol_lf_false_LF.txt
+
+expecting success of 0027.342 'compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 342 - compare_files CRLF NNO_attr_auto_aeol_lf_false_CRLF.txt
+
+expecting success of 0027.343 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 343 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.344 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 344 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_false_LF_mix_CR.txt
+
+expecting success of 0027.345 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 345 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_false_CRLF_nul.txt
+
+expecting success of 0027.346 'compare_files LF NNO_attr_auto_aeol_crlf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 346 - compare_files LF NNO_attr_auto_aeol_crlf_false_LF.txt
+
+expecting success of 0027.347 'compare_files CRLF NNO_attr_auto_aeol_crlf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 347 - compare_files CRLF NNO_attr_auto_aeol_crlf_false_CRLF.txt
+
+expecting success of 0027.348 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 348 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.349 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 349 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_false_LF_mix_CR.txt
+
+expecting success of 0027.350 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 350 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_false_CRLF_nul.txt
+
+expecting success of 0027.351 'compare_files LF NNO_attr_text_aeol__false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 351 - compare_files LF NNO_attr_text_aeol__false_LF.txt
+
+expecting success of 0027.352 'compare_files LF NNO_attr_text_aeol__false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 352 - compare_files LF NNO_attr_text_aeol__false_CRLF.txt
+
+expecting success of 0027.353 'compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 353 - compare_files LF NNO_attr_text_aeol__false_CRLF_mix_LF.txt
+
+expecting success of 0027.354 'compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 354 - compare_files LF_mix_CR NNO_attr_text_aeol__false_LF_mix_CR.txt
+
+expecting success of 0027.355 'compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 355 - compare_files LF_nul NNO_attr_text_aeol__false_CRLF_nul.txt
+
+expecting success of 0027.356 'compare_files LF NNO_attr_text_aeol_lf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 356 - compare_files LF NNO_attr_text_aeol_lf_false_LF.txt
+
+expecting success of 0027.357 'compare_files LF NNO_attr_text_aeol_lf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 357 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF.txt
+
+expecting success of 0027.358 'compare_files LF NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 358 - compare_files LF NNO_attr_text_aeol_lf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.359 'compare_files LF_mix_CR NNO_attr_text_aeol_lf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 359 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_false_LF_mix_CR.txt
+
+expecting success of 0027.360 'compare_files LF_nul NNO_attr_text_aeol_lf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 360 - compare_files LF_nul NNO_attr_text_aeol_lf_false_CRLF_nul.txt
+
+expecting success of 0027.361 'compare_files LF NNO_attr_text_aeol_crlf_false_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 361 - compare_files LF NNO_attr_text_aeol_crlf_false_LF.txt
+
+expecting success of 0027.362 'compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 362 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF.txt
+
+expecting success of 0027.363 'compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 363 - compare_files LF NNO_attr_text_aeol_crlf_false_CRLF_mix_LF.txt
+
+expecting success of 0027.364 'compare_files LF_mix_CR NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 364 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_false_LF_mix_CR.txt
+
+expecting success of 0027.365 'compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 365 - compare_files LF_nul NNO_attr_text_aeol_crlf_false_CRLF_nul.txt
+
+expecting success of 0027.366 'compare_files LF NNO_attr__aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 366 - compare_files LF NNO_attr__aeol__input_LF.txt
+
+expecting success of 0027.367 'compare_files CRLF NNO_attr__aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 367 - compare_files CRLF NNO_attr__aeol__input_CRLF.txt
+
+expecting success of 0027.368 'compare_files CRLF_mix_LF NNO_attr__aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 368 - compare_files CRLF_mix_LF NNO_attr__aeol__input_CRLF_mix_LF.txt
+
+expecting success of 0027.369 'compare_files LF_mix_CR NNO_attr__aeol__input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 369 - compare_files LF_mix_CR NNO_attr__aeol__input_LF_mix_CR.txt
+
+expecting success of 0027.370 'compare_files CRLF_nul NNO_attr__aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 370 - compare_files CRLF_nul NNO_attr__aeol__input_CRLF_nul.txt
+
+expecting success of 0027.371 'compare_files LF NNO_attr_-text_aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 371 - compare_files LF NNO_attr_-text_aeol__input_LF.txt
+
+expecting success of 0027.372 'compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 372 - compare_files CRLF NNO_attr_-text_aeol__input_CRLF.txt
+
+expecting success of 0027.373 'compare_files CRLF_mix_LF NNO_attr_-text_aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 373 - compare_files CRLF_mix_LF NNO_attr_-text_aeol__input_CRLF_mix_LF.txt
+
+expecting success of 0027.374 'compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 374 - compare_files LF_mix_CR NNO_attr_-text_aeol__input_LF_mix_CR.txt
+
+expecting success of 0027.375 'compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 375 - compare_files CRLF_nul NNO_attr_-text_aeol__input_CRLF_nul.txt
+
+expecting success of 0027.376 'compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 376 - compare_files LF NNO_attr_-text_aeol_lf_input_LF.txt
+
+expecting success of 0027.377 'compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 377 - compare_files CRLF NNO_attr_-text_aeol_lf_input_CRLF.txt
+
+expecting success of 0027.378 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 378 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_lf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.379 'compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 379 - compare_files LF_mix_CR NNO_attr_-text_aeol_lf_input_LF_mix_CR.txt
+
+expecting success of 0027.380 'compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 380 - compare_files CRLF_nul NNO_attr_-text_aeol_lf_input_CRLF_nul.txt
+
+expecting success of 0027.381 'compare_files LF NNO_attr_-text_aeol_crlf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 381 - compare_files LF NNO_attr_-text_aeol_crlf_input_LF.txt
+
+expecting success of 0027.382 'compare_files CRLF NNO_attr_-text_aeol_crlf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 382 - compare_files CRLF NNO_attr_-text_aeol_crlf_input_CRLF.txt
+
+expecting success of 0027.383 'compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 383 - compare_files CRLF_mix_LF NNO_attr_-text_aeol_crlf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.384 'compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 384 - compare_files LF_mix_CR NNO_attr_-text_aeol_crlf_input_LF_mix_CR.txt
+
+expecting success of 0027.385 'compare_files CRLF_nul NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 385 - compare_files CRLF_nul NNO_attr_-text_aeol_crlf_input_CRLF_nul.txt
+
+expecting success of 0027.386 'compare_files LF NNO_attr_auto_aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 386 - compare_files LF NNO_attr_auto_aeol__input_LF.txt
+
+expecting success of 0027.387 'compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 387 - compare_files CRLF NNO_attr_auto_aeol__input_CRLF.txt
+
+expecting success of 0027.388 'compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 388 - compare_files CRLF_mix_LF NNO_attr_auto_aeol__input_CRLF_mix_LF.txt
+
+expecting success of 0027.389 'compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 389 - compare_files LF_mix_CR NNO_attr_auto_aeol__input_LF_mix_CR.txt
+
+expecting success of 0027.390 'compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 390 - compare_files CRLF_nul NNO_attr_auto_aeol__input_CRLF_nul.txt
+
+expecting success of 0027.391 'compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 391 - compare_files LF NNO_attr_auto_aeol_lf_input_LF.txt
+
+expecting success of 0027.392 'compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 392 - compare_files CRLF NNO_attr_auto_aeol_lf_input_CRLF.txt
+
+expecting success of 0027.393 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 393 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_lf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.394 'compare_files LF_mix_CR NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 394 - compare_files LF_mix_CR NNO_attr_auto_aeol_lf_input_LF_mix_CR.txt
+
+expecting success of 0027.395 'compare_files CRLF_nul NNO_attr_auto_aeol_lf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 395 - compare_files CRLF_nul NNO_attr_auto_aeol_lf_input_CRLF_nul.txt
+
+expecting success of 0027.396 'compare_files LF NNO_attr_auto_aeol_crlf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 396 - compare_files LF NNO_attr_auto_aeol_crlf_input_LF.txt
+
+expecting success of 0027.397 'compare_files CRLF NNO_attr_auto_aeol_crlf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 397 - compare_files CRLF NNO_attr_auto_aeol_crlf_input_CRLF.txt
+
+expecting success of 0027.398 'compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 398 - compare_files CRLF_mix_LF NNO_attr_auto_aeol_crlf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.399 'compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 399 - compare_files LF_mix_CR NNO_attr_auto_aeol_crlf_input_LF_mix_CR.txt
+
+expecting success of 0027.400 'compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 400 - compare_files CRLF_nul NNO_attr_auto_aeol_crlf_input_CRLF_nul.txt
+
+expecting success of 0027.401 'compare_files LF NNO_attr_text_aeol__input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 401 - compare_files LF NNO_attr_text_aeol__input_LF.txt
+
+expecting success of 0027.402 'compare_files LF NNO_attr_text_aeol__input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 402 - compare_files LF NNO_attr_text_aeol__input_CRLF.txt
+
+expecting success of 0027.403 'compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 403 - compare_files LF NNO_attr_text_aeol__input_CRLF_mix_LF.txt
+
+expecting success of 0027.404 'compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 404 - compare_files LF_mix_CR NNO_attr_text_aeol__input_LF_mix_CR.txt
+
+expecting success of 0027.405 'compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 405 - compare_files LF_nul NNO_attr_text_aeol__input_CRLF_nul.txt
+
+expecting success of 0027.406 'compare_files LF NNO_attr_text_aeol_lf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 406 - compare_files LF NNO_attr_text_aeol_lf_input_LF.txt
+
+expecting success of 0027.407 'compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 407 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF.txt
+
+expecting success of 0027.408 'compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 408 - compare_files LF NNO_attr_text_aeol_lf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.409 'compare_files LF_mix_CR NNO_attr_text_aeol_lf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 409 - compare_files LF_mix_CR NNO_attr_text_aeol_lf_input_LF_mix_CR.txt
+
+expecting success of 0027.410 'compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 410 - compare_files LF_nul NNO_attr_text_aeol_lf_input_CRLF_nul.txt
+
+expecting success of 0027.411 'compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt': 
+		compare_files $lfname ${pfx}_LF.txt
+	
+ok 411 - compare_files LF NNO_attr_text_aeol_crlf_input_LF.txt
+
+expecting success of 0027.412 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt': 
+		compare_files $crlfname ${pfx}_CRLF.txt
+	
+ok 412 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF.txt
+
+expecting success of 0027.413 'compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt': 
+		compare_files $lfmixcrlf ${pfx}_CRLF_mix_LF.txt
+	
+ok 413 - compare_files LF NNO_attr_text_aeol_crlf_input_CRLF_mix_LF.txt
+
+expecting success of 0027.414 'compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt': 
+		compare_files $lfmixcr ${pfx}_LF_mix_CR.txt
+	
+ok 414 - compare_files LF_mix_CR NNO_attr_text_aeol_crlf_input_LF_mix_CR.txt
+
+expecting success of 0027.415 'compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt': 
+		compare_files $crlfnul ${pfx}_CRLF_nul.txt
+	
+ok 415 - compare_files LF_nul NNO_attr_text_aeol_crlf_input_CRLF_nul.txt
+
+expecting success of 0027.416 'setup config for checkout attr=-text ident= aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 416 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
+
+expecting success of 0027.417 'setup LF checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 1822 - setup CRLF checkout  with -c core.eol=lf
+ok 417 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1823 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+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 1823 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 418 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1824 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+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 1824 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 419 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1825 'setup LF_nul checkout  with -c core.eol=lf': 
+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 1825 - setup LF_nul checkout  with -c core.eol=lf
+ok 420 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1826 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf': 
+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 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
@@ -80472,70 +82598,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1826 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=lf
+ok 422 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=lf
 
-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.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 1827 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF
+ok 423 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1828 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1828 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF
+ok 424 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1829 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1829 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
+ok 425 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1830 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.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 1830 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
+ok 426 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1831 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul': 
-		compare_ws_file eol_lf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.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 1831 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=lf file=LF_nul
+ok 427 - checkout attr=-text  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1832 '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 1832 - 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.1833 '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 1833 - setup LF checkout  with -c core.eol=crlf
+ok 429 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1834 '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 1834 - setup CRLF checkout  with -c core.eol=crlf
+ok 430 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1835 '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 1835 - 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.1836 '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 1836 - 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.1837 '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 1837 - setup LF_nul checkout  with -c core.eol=crlf
+ok 433 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1838 '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
@@ -80550,70 +82676,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1838 - 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.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.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 1839 - 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.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.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 1840 - 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.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.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 1841 - 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.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.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 1842 - 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.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.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 1843 - 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.1844 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.440 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1844 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
+ok 440 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1845 '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 1845 - setup LF checkout  with -c core.eol=crlf
+ok 441 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1846 '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 1846 - setup CRLF checkout  with -c core.eol=crlf
+ok 442 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1847 '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 1847 - 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.1848 '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 1848 - 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.1849 '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 1849 - setup LF_nul checkout  with -c core.eol=crlf
+ok 445 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1850 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=true 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
@@ -80628,70 +82754,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1850 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf
+ok 446 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=lf
 
-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.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 1851 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
+ok 447 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1852 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1852 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+ok 448 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1853 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1853 - checkout attr=-text ident aeol=lf core.autocrlf=true 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.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.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 1854 - checkout attr=-text ident aeol=lf core.autocrlf=true 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.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.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 1855 - checkout attr=-text ident aeol=lf core.autocrlf=true 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.1856 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.452 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1856 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
+ok 452 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1857 '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 1857 - setup LF checkout  with -c core.eol=crlf
+ok 453 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1858 '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 1858 - setup CRLF checkout  with -c core.eol=crlf
+ok 454 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1859 '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 1859 - 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.1860 '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 1860 - 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.1861 '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 1861 - setup LF_nul checkout  with -c core.eol=crlf
+ok 457 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1862 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true 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
@@ -80706,70 +82832,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1862 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf
+ok 458 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=lf
 
-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.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 1863 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 459 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1864 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1864 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 460 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1865 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1865 - checkout attr=-text ident aeol=crlf core.autocrlf=true 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.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.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 1866 - checkout attr=-text ident aeol=crlf core.autocrlf=true 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.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.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 1867 - checkout attr=-text ident aeol=crlf core.autocrlf=true 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.1868 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.464 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1868 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
+ok 464 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1869 'setup LF checkout  with -c core.eol=crlf': 
+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 1869 - setup LF checkout  with -c core.eol=crlf
+ok 465 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1870 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1870 - setup CRLF checkout  with -c core.eol=crlf
+ok 466 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1871 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1871 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 467 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1872 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1872 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 468 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1873 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1873 - setup LF_nul checkout  with -c core.eol=crlf
+ok 469 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1874 'ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf': 
+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
@@ -80784,70 +82910,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1874 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=crlf
+ok 470 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=lf
 
-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.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 1875 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
+ok 471 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1876 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1876 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+ok 472 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1877 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1877 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf 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.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.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 1878 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf 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.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.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 1879 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 475 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1880 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.476 'setup config for checkout attr=auto ident= aeol=lf 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
+ok 476 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.1881 'setup LF checkout  with -c core.eol=crlf': 
+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 1881 - setup LF checkout  with -c core.eol=crlf
+ok 477 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1882 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1882 - setup CRLF checkout  with -c core.eol=crlf
+ok 478 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1883 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1883 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 479 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1884 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1884 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 480 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1885 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1885 - setup LF_nul checkout  with -c core.eol=crlf
+ok 481 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1886 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf': 
+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
@@ -80862,70 +82988,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1886 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf
+ok 482 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=lf
 
-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.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 1887 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 483 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1888 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1888 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 484 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1889 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1889 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf 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.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.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 1890 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf 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.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.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 1891 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 487 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1892 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.488 'setup config for checkout attr=auto ident= aeol=crlf 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
+ok 488 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.1893 'setup LF checkout  with -c core.eol=crlf': 
+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 1893 - setup LF checkout  with -c core.eol=crlf
+ok 489 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1894 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1894 - setup CRLF checkout  with -c core.eol=crlf
+ok 490 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1895 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1895 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 491 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1896 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1896 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 492 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1897 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1897 - setup LF_nul checkout  with -c core.eol=crlf
+ok 493 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1898 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf': 
+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
@@ -80940,70 +83066,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1898 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf
+ok 494 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=lf
 
-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.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 1899 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF
+ok 495 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.1900 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1900 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
+ok 496 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.1901 'checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1901 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf 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.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.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 1902 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf 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.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.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 1903 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 499 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.1904 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.500 'setup config for checkout attr=-text ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1904 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
+ok 500 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.1905 'setup LF checkout  with -c core.eol=crlf': 
+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 1905 - setup LF checkout  with -c core.eol=crlf
+ok 501 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1906 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1906 - setup CRLF checkout  with -c core.eol=crlf
+ok 502 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1907 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1907 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 503 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1908 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1908 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 504 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1909 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1909 - setup LF_nul checkout  with -c core.eol=crlf
+ok 505 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1910 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf': 
+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
@@ -81018,70 +83144,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1910 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf
+ok 506 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=lf
 
-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.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 1911 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF
+ok 507 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1912 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1912 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF
+ok 508 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1913 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1913 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 509 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1914 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.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 1914 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 510 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1915 'checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.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 1915 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
+ok 511 - checkout attr=-text  aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1916 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.512 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1916 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
+ok 512 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1917 'setup LF checkout  with -c core.eol=crlf': 
+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 1917 - setup LF checkout  with -c core.eol=crlf
+ok 513 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1918 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1918 - setup CRLF checkout  with -c core.eol=crlf
+ok 514 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1919 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1919 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 515 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1920 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1920 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 516 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1921 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1921 - setup LF_nul checkout  with -c core.eol=crlf
+ok 517 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1922 'ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf': 
+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
@@ -81096,70 +83222,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1922 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=crlf
+ok 518 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=lf
 
-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.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 1923 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 519 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1924 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1924 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 520 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1925 'checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1925 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf 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.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.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 1926 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf 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.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.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 1927 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 523 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1928 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.524 'setup config for checkout attr=-text ident= aeol=crlf 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
+ok 524 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1929 'setup LF checkout  with -c core.eol=crlf': 
+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 1929 - setup LF checkout  with -c core.eol=crlf
+ok 525 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1930 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1930 - setup CRLF checkout  with -c core.eol=crlf
+ok 526 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1931 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1931 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 527 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1932 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1932 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 528 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1933 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1933 - setup LF_nul checkout  with -c core.eol=crlf
+ok 529 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1934 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf': 
+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
@@ -81174,70 +83300,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1934 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf
+ok 530 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=lf
 
-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.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 1935 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
+ok 531 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1936 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1936 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 532 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1937 'checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1937 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf 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.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.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 1938 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf 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.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.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 1939 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 535 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1940 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.536 'setup config for checkout attr=text ident= aeol=lf 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
+ok 536 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1941 'setup LF checkout  with -c core.eol=crlf': 
+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 1941 - setup LF checkout  with -c core.eol=crlf
+ok 537 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1942 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1942 - setup CRLF checkout  with -c core.eol=crlf
+ok 538 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1943 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1943 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 539 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1944 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1944 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 540 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1945 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1945 - setup LF_nul checkout  with -c core.eol=crlf
+ok 541 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1946 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf': 
+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
@@ -81252,70 +83378,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1946 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf
+ok 542 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=lf
 
-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.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 1947 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+ok 543 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1948 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1948 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+ok 544 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1949 'checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1949 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf 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.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.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 1950 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf 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.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.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 1951 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 547 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1952 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.548 'setup config for checkout attr=text ident= aeol=crlf 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
+ok 548 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1953 'setup LF checkout  with -c core.eol=crlf': 
+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 1953 - setup LF checkout  with -c core.eol=crlf
+ok 549 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1954 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1954 - setup CRLF checkout  with -c core.eol=crlf
+ok 550 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1955 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1955 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 551 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1956 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1956 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 552 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1957 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1957 - setup LF_nul checkout  with -c core.eol=crlf
+ok 553 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1958 'ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf': 
+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
@@ -81330,70 +83456,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1958 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf
+ok 554 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=lf
 
-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.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 1959 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
+ok 555 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1960 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1960 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 556 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1961 'checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1961 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf 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.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.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 1962 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf 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.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.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 1963 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 559 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1964 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.560 'setup config for checkout attr=auto ident= aeol=lf 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
+ok 560 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.1965 'setup LF checkout  with -c core.eol=crlf': 
+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 1965 - setup LF checkout  with -c core.eol=crlf
+ok 561 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1966 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1966 - setup CRLF checkout  with -c core.eol=crlf
+ok 562 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1967 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1967 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 563 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1968 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1968 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 564 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1969 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1969 - setup LF_nul checkout  with -c core.eol=crlf
+ok 565 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1970 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf': 
+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
@@ -81408,70 +83534,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1970 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf
+ok 566 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=lf
 
-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.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 1971 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+ok 567 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1972 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1972 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+ok 568 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1973 'checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1973 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf 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.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.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 1974 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf 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.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.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 1975 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 571 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1976 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false': 
+expecting success of 0027.572 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1976 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
+ok 572 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.1977 'setup LF checkout  with -c core.eol=crlf': 
+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 1977 - setup LF checkout  with -c core.eol=crlf
+ok 573 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1978 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1978 - setup CRLF checkout  with -c core.eol=crlf
+ok 574 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1979 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1979 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 575 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1980 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1980 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 576 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1981 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1981 - setup LF_nul checkout  with -c core.eol=crlf
+ok 577 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1982 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf': 
+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
@@ -81486,70 +83612,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1982 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf
+ok 578 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=lf
 
-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.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 1983 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF
+ok 579 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.1984 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1984 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
+ok 580 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.1985 'checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1985 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf 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.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.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 1986 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf 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.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.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 1987 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 583 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.1988 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false': 
+expecting success of 0027.584 'setup config for checkout attr=-text ident= aeol= core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 1988 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
+ok 584 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.1989 'setup LF checkout  with -c core.eol=crlf': 
+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 1989 - setup LF checkout  with -c core.eol=crlf
+ok 585 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1990 'setup CRLF checkout  with -c core.eol=crlf': 
+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 1990 - setup CRLF checkout  with -c core.eol=crlf
+ok 586 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.1991 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 1991 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 587 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.1992 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 1992 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 588 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.1993 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 1993 - setup LF_nul checkout  with -c core.eol=crlf
+ok 589 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.1994 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf': 
+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
@@ -81564,70 +83690,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 1994 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf
+ok 590 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=lf
 
-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.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 1995 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
+ok 591 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.1996 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 1996 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
+ok 592 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.1997 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 1997 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 593 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.1998 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.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 1998 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 594 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.1999 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.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 1999 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF_nul
+ok 595 - checkout attr=-text  aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2000 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input': 
+expecting success of 0027.596 'setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2000 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
+ok 596 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.2001 'setup LF checkout  with -c core.eol=crlf': 
+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 2001 - setup LF checkout  with -c core.eol=crlf
+ok 597 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2002 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2002 - setup CRLF checkout  with -c core.eol=crlf
+ok 598 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2003 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2003 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 599 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2004 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2004 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 600 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2005 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2005 - setup LF_nul checkout  with -c core.eol=crlf
+ok 601 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2006 'ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=crlf': 
+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
@@ -81642,70 +83768,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2006 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=crlf
+ok 602 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=lf
 
-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.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 2007 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 603 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2008 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2008 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 604 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2009 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2009 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf 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.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.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 2010 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf 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.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.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 2011 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 607 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2012 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.608 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2012 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
+ok 608 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2013 'setup LF checkout  with -c core.eol=crlf': 
+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 2013 - setup LF checkout  with -c core.eol=crlf
+ok 609 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2014 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2014 - setup CRLF checkout  with -c core.eol=crlf
+ok 610 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2015 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2015 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 611 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2016 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2016 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 612 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2017 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2017 - setup LF_nul checkout  with -c core.eol=crlf
+ok 613 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2018 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf': 
+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
@@ -81720,70 +83846,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2018 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf
+ok 614 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=lf
 
-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.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 2019 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
+ok 615 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2020 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2020 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 616 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2021 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2021 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf 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.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.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 2022 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf 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.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.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 2023 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 619 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2024 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.620 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2024 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
+ok 620 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.2025 'setup LF checkout  with -c core.eol=crlf': 
+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 2025 - setup LF checkout  with -c core.eol=crlf
+ok 621 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2026 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2026 - setup CRLF checkout  with -c core.eol=crlf
+ok 622 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2027 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2027 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 623 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2028 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2028 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 624 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2029 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2029 - setup LF_nul checkout  with -c core.eol=crlf
+ok 625 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2030 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf': 
+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
@@ -81798,70 +83924,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2030 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf
+ok 626 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=lf
 
-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.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 2031 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+ok 627 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2032 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2032 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+ok 628 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2033 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2033 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf 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.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.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 2034 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf 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.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.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 2035 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 631 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2036 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.632 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2036 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
+ok 632 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2037 'setup LF checkout  with -c core.eol=crlf': 
+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 2037 - setup LF checkout  with -c core.eol=crlf
+ok 633 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2038 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2038 - setup CRLF checkout  with -c core.eol=crlf
+ok 634 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2039 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2039 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 635 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2040 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2040 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 636 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2041 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2041 - setup LF_nul checkout  with -c core.eol=crlf
+ok 637 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2042 'ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf': 
+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
@@ -81876,70 +84002,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2042 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf
+ok 638 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=lf
 
-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.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 2043 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
+ok 639 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2044 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2044 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 640 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2045 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2045 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf 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.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.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 2046 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf 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.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.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 2047 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 643 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2048 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.644 'setup config for checkout attr=auto ident= aeol=lf 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
+ok 644 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.2049 'setup LF checkout  with -c core.eol=crlf': 
+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 2049 - setup LF checkout  with -c core.eol=crlf
+ok 645 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2050 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2050 - setup CRLF checkout  with -c core.eol=crlf
+ok 646 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2051 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2051 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 647 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2052 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2052 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 648 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2053 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2053 - setup LF_nul checkout  with -c core.eol=crlf
+ok 649 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2054 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf': 
+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
@@ -81954,70 +84080,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2054 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf
+ok 650 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=lf
 
-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.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 2055 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+ok 651 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2056 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2056 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+ok 652 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2057 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2057 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf 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.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.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 2058 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf 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.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.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 2059 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 655 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2060 'setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input': 
+expecting success of 0027.656 'setup config for checkout attr=auto ident= aeol=crlf 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
+ok 656 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2061 'setup LF checkout  with -c core.eol=crlf': 
+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 2061 - setup LF checkout  with -c core.eol=crlf
+ok 657 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2062 'setup CRLF checkout  with -c core.eol=crlf': 
+expecting success of 0027.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 2062 - setup CRLF checkout  with -c core.eol=crlf
+ok 658 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2063 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+expecting success of 0027.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 2063 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 659 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2064 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.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 2064 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 660 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2065 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.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 2065 - setup LF_nul checkout  with -c core.eol=crlf
+ok 661 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2066 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf': 
+expecting success of 0027.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
@@ -82032,70 +84158,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2066 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf
+ok 662 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=lf
 
-expecting success of 0027.2067 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+expecting success of 0027.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 2067 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
+ok 663 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF
 
-expecting success of 0027.2068 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2068 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
+ok 664 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=CRLF
 
-expecting success of 0027.2069 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2069 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf 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.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.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 2070 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf 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.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.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 2071 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 667 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2072 'setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input': 
+expecting success of 0027.668 'setup config for checkout attr= ident= aeol= core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2072 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=input
+ok 668 - setup config for checkout attr= ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2073 'setup LF checkout  with -c core.eol=crlf': 
+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 2073 - setup LF checkout  with -c core.eol=crlf
+ok 669 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2074 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2074 - setup CRLF checkout  with -c core.eol=crlf
+ok 670 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2075 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2075 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 671 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2076 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2076 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 672 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2077 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2077 - setup LF_nul checkout  with -c core.eol=crlf
+ok 673 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2078 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf': 
+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
@@ -82110,70 +84236,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2078 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf
+ok 674 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=lf
 
-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.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 2079 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF
+ok 675 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF
 
-expecting success of 0027.2080 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2080 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
+ok 676 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-expecting success of 0027.2081 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2081 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 677 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2082 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.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 2082 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 678 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2083 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.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 2083 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
+ok 679 - checkout attr=  aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-expecting success of 0027.2084 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
+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 2084 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
+ok 680 - setup config for checkout attr= ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2085 'setup LF checkout  with -c core.eol=crlf': 
+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 2085 - setup LF checkout  with -c core.eol=crlf
+ok 681 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2086 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2086 - setup CRLF checkout  with -c core.eol=crlf
+ok 682 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2087 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2087 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 683 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2088 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2088 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 684 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2089 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2089 - setup LF_nul checkout  with -c core.eol=crlf
+ok 685 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2090 'ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf': 
+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
@@ -82188,70 +84314,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2090 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=crlf
+ok 686 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=lf
 
-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.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 2091 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 687 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2092 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2092 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 688 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2093 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_false_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2093 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 689 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2094 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.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 2094 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 690 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2095 'checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.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 2095 - checkout attr= ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 691 - checkout attr=  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2096 'setup config for checkout attr= ident=ident aeol= core.autocrlf=true': 
+expecting success of 0027.692 'setup config for checkout attr=auto ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2096 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
+ok 692 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2097 'setup LF checkout  with -c core.eol=crlf': 
+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 2097 - setup LF checkout  with -c core.eol=crlf
+ok 693 - setup LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2098 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2098 - setup CRLF checkout  with -c core.eol=crlf
+ok 694 - setup CRLF checkout  with -c core.eol=lf
 
-expecting success of 0027.2099 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2099 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 695 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2100 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2100 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 696 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2101 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2101 - setup LF_nul checkout  with -c core.eol=crlf
+ok 697 - setup LF_nul checkout  with -c core.eol=lf
 
-expecting success of 0027.2102 'ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=crlf': 
+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
@@ -82266,70 +84392,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2102 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=crlf
+ok 698 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=lf
 
-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.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 2103 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 699 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF
 
-expecting success of 0027.2104 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF': 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2104 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 700 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF
 
-expecting success of 0027.2105 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF': 
-		compare_ws_file eol_crlf_crlf_true_attr__ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2105 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 701 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.2106 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR': 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.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 2106 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 702 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.2107 'checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_true_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.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 2107 - checkout attr= ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 703 - checkout attr=auto  aeol= core.autocrlf=true core.eol=lf file=LF_nul
 
-expecting success of 0027.2108 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
+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 2108 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
+ok 704 - 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.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 2109 - setup LF checkout  with -c core.eol=crlf
+ok 705 - 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.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 2110 - setup CRLF checkout  with -c core.eol=crlf
+ok 706 - 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.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 2111 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 707 - 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.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 2112 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 708 - 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.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 2113 - setup LF_nul checkout  with -c core.eol=crlf
+ok 709 - 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.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
@@ -82344,70 +84470,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2114 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=crlf
+ok 710 - 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.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 2115 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 711 - 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.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 2116 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 712 - 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.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 2117 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 713 - 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.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 2118 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 714 - 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.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 2119 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 715 - 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.716 'setup config for checkout attr=text ident= aeol= core.autocrlf=input': 
 		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 716 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2121 'setup LF checkout  with -c core.eol=crlf': 
+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 2121 - setup LF checkout  with -c core.eol=crlf
+ok 717 - 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.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 2122 - setup CRLF checkout  with -c core.eol=crlf
+ok 718 - 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.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 2123 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 719 - 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.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 2124 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 720 - 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.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 2125 - setup LF_nul checkout  with -c core.eol=crlf
+ok 721 - 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.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
@@ -82422,70 +84548,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2126 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=crlf
+ok 722 - ls-files --eol attr=text  aeol= core.autocrlf=input 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.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 2127 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF
+ok 723 - checkout attr=text  aeol= core.autocrlf=input 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.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 2128 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF
+ok 724 - checkout attr=text  aeol= core.autocrlf=input 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.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 2129 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
+ok 725 - checkout attr=text  aeol= core.autocrlf=input 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.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 2130 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_mix_CR
+ok 726 - checkout attr=text  aeol= core.autocrlf=input 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.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 2131 - checkout attr=text ident aeol= core.autocrlf=true core.eol=crlf file=LF_nul
+ok 727 - checkout attr=text  aeol= core.autocrlf=input 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.728 'setup config for checkout attr=auto 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
+ok 728 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2133 'setup LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.729 'setup LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2133 - setup LF checkout  with -c core.eol=crlf
+ok 729 - 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.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 2134 - setup CRLF checkout  with -c core.eol=crlf
+ok 730 - 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.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 2135 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 731 - setup LF_mix_CR checkout  with -c core.eol=lf
 
-expecting success of 0027.2136 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+expecting success of 0027.732 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2136 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 732 - setup CRLF_mix_LF checkout  with -c core.eol=lf
 
-expecting success of 0027.2137 'setup LF_nul checkout  with -c core.eol=crlf': 
+expecting success of 0027.733 'setup LF_nul checkout  with -c core.eol=lf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2137 - setup LF_nul checkout  with -c core.eol=crlf
+ok 733 - 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.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
@@ -82500,70 +84626,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2138 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=crlf
+ok 734 - ls-files --eol attr=auto  aeol= core.autocrlf=input 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.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 2139 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 735 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2140 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 736 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2141 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 737 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2142 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 738 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_mix_CR
 
-expecting success of 0027.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.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 2143 - checkout attr=text ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 739 - checkout attr=auto  aeol= core.autocrlf=input core.eol=lf file=LF_nul
 
-expecting success of 0027.2144 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input': 
+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 2144 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
+ok 740 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2145 'setup LF checkout  with -c core.eol=crlf': 
+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 2145 - setup LF checkout  with -c core.eol=crlf
+ok 741 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2146 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2146 - setup CRLF checkout  with -c core.eol=crlf
+ok 742 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2147 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2147 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 743 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2148 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2148 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 744 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2149 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2149 - setup LF_nul checkout  with -c core.eol=crlf
+ok 745 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2150 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf': 
+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
@@ -82578,70 +84704,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2150 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=crlf
+ok 746 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=crlf
 
-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.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 2151 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF
+ok 747 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf 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.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 2152 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
+ok 748 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf 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.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 2153 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
+ok 749 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf 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.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 2154 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_mix_CR
+ok 750 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf 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.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 2155 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=crlf file=LF_nul
+ok 751 - checkout attr=-text  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2156 '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 2156 - 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.2157 '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 2157 - setup LF checkout  with -c core.eol=native
+ok 753 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2158 '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 2158 - setup CRLF checkout  with -c core.eol=native
+ok 754 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2159 '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 2159 - 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.2160 '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 2160 - 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.2161 '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 2161 - setup LF_nul checkout  with -c core.eol=native
+ok 757 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2162 '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
@@ -82656,70 +84782,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2162 - 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.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.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 2163 - 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.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.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 2164 - 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.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.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 2165 - 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.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.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 2166 - 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.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.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 2167 - 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.2168 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true': 
+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 2168 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=true
+ok 764 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2169 '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 2169 - setup LF checkout  with -c core.eol=native
+ok 765 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2170 '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 2170 - setup CRLF checkout  with -c core.eol=native
+ok 766 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2171 '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 2171 - 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.2172 '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 2172 - 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.2173 '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 2173 - setup LF_nul checkout  with -c core.eol=native
+ok 769 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2174 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=true 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
@@ -82734,70 +84860,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2174 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=native
+ok 770 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf
 
-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.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 2175 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 771 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf 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.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 2176 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 772 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=crlf 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.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 2177 - checkout attr=-text ident aeol=lf core.autocrlf=true 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.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.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 2178 - checkout attr=-text ident aeol=lf core.autocrlf=true 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.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.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 2179 - checkout attr=-text ident aeol=lf core.autocrlf=true 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.2180 'setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true': 
+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 2180 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=true
+ok 776 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2181 '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 2181 - setup LF checkout  with -c core.eol=native
+ok 777 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2182 '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 2182 - setup CRLF checkout  with -c core.eol=native
+ok 778 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2183 '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 2183 - 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.2184 '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 2184 - 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.2185 '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 2185 - setup LF_nul checkout  with -c core.eol=native
+ok 781 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2186 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true 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
@@ -82812,70 +84938,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2186 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=true core.eol=native
+ok 782 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=crlf
 
-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.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 2187 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 783 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf 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.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 2188 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 784 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=crlf 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.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 2189 - checkout attr=-text ident aeol=crlf core.autocrlf=true 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.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.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 2190 - checkout attr=-text ident aeol=crlf core.autocrlf=true 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.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.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 2191 - checkout attr=-text ident aeol=crlf core.autocrlf=true 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.2192 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
+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 2192 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
+ok 788 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2193 'setup LF checkout  with -c core.eol=native': 
+expecting success of 0027.789 'setup LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2193 - setup LF checkout  with -c core.eol=native
+ok 789 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2194 'setup CRLF checkout  with -c core.eol=native': 
+expecting success of 0027.790 'setup CRLF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2194 - setup CRLF checkout  with -c core.eol=native
+ok 790 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2195 'setup LF_mix_CR checkout  with -c core.eol=native': 
+expecting success of 0027.791 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2195 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 791 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2196 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+expecting success of 0027.792 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2196 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 792 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2197 'setup LF_nul checkout  with -c core.eol=native': 
+expecting success of 0027.793 'setup LF_nul checkout  with -c core.eol=crlf': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2197 - setup LF_nul checkout  with -c core.eol=native
+ok 793 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2198 'ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native': 
+expecting success of 0027.794 'ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=crlf': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -82890,70 +85016,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2198 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native
+ok 794 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=crlf
 
-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.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 2199 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 795 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf 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.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 2200 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 796 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf 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.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 2201 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 797 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2202 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 798 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.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.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 2203 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+ok 799 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2204 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
+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 2204 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
+ok 800 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2205 'setup LF checkout  with -c core.eol=native': 
+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 2205 - setup LF checkout  with -c core.eol=native
+ok 801 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2206 'setup CRLF checkout  with -c core.eol=native': 
+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 2206 - setup CRLF checkout  with -c core.eol=native
+ok 802 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2207 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2207 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 803 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2208 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2208 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 804 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2209 'setup LF_nul checkout  with -c core.eol=native': 
+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 2209 - setup LF_nul checkout  with -c core.eol=native
+ok 805 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2210 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native': 
+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
@@ -82968,70 +85094,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2210 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native
+ok 806 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=crlf
 
-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.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 2211 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 807 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf 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.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 2212 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 808 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf file=CRLF
 
-expecting success of 0027.2213 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
-	
-ok 2213 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
+expecting success of 0027.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 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.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 2214 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native 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.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.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 2215 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
+ok 811 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=crlf 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.812 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2216 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=true
+ok 812 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2217 'setup LF checkout  with -c core.eol=native': 
+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 2217 - setup LF checkout  with -c core.eol=native
+ok 813 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2218 'setup CRLF checkout  with -c core.eol=native': 
+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 2218 - setup CRLF checkout  with -c core.eol=native
+ok 814 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2219 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2219 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 815 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2220 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2220 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 816 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2221 'setup LF_nul checkout  with -c core.eol=native': 
+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 2221 - setup LF_nul checkout  with -c core.eol=native
+ok 817 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2222 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native': 
+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
@@ -83046,70 +85172,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2222 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native
+ok 818 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf
 
-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.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 2223 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF
+ok 819 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf 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.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 2224 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
+ok 820 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf 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.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 2225 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native 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.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.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 2226 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native 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.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.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 2227 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
+ok 823 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=crlf 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.824 'setup config for checkout attr=-text ident= aeol= 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 824 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2229 '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 2229 - setup LF checkout  with -c core.eol=native
+ok 825 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2230 '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 2230 - setup CRLF checkout  with -c core.eol=native
+ok 826 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2231 '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 2231 - 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.2232 '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 2232 - 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.2233 '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 2233 - setup LF_nul checkout  with -c core.eol=native
+ok 829 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2234 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true 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
@@ -83124,70 +85250,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2234 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native
+ok 830 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=crlf
 
-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.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 2235 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF
+ok 831 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf 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.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 2236 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
+ok 832 - checkout attr=-text  aeol= core.autocrlf=false core.eol=crlf 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.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 2237 - checkout attr=auto ident aeol=crlf core.autocrlf=true 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.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.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 2238 - checkout attr=auto ident aeol=crlf core.autocrlf=true 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.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.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 2239 - checkout attr=auto ident aeol=crlf core.autocrlf=true 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.2240 'setup config for checkout attr=-text 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 2240 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
+ok 836 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2241 'setup LF checkout  with -c core.eol=native': 
+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 2241 - setup LF checkout  with -c core.eol=native
+ok 837 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2242 'setup CRLF checkout  with -c core.eol=native': 
+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 2242 - setup CRLF checkout  with -c core.eol=native
+ok 838 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2243 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2243 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 839 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2244 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2244 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 840 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2245 'setup LF_nul checkout  with -c core.eol=native': 
+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 2245 - setup LF_nul checkout  with -c core.eol=native
+ok 841 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2246 'ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native': 
+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
@@ -83202,70 +85328,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2246 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native
+ok 842 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=crlf
 
-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.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 2247 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 843 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf 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.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 2248 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 844 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf 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.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 2249 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native 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.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.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 2250 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native 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.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.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 2251 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 847 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=crlf 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.848 'setup config for checkout attr=-text ident= aeol=crlf 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 848 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2253 '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 2253 - setup LF checkout  with -c core.eol=native
+ok 849 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2254 '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 2254 - setup CRLF checkout  with -c core.eol=native
+ok 850 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2255 '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 2255 - 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.2256 '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 2256 - 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.2257 '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 2257 - setup LF_nul checkout  with -c core.eol=native
+ok 853 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2258 'ls-files --eol attr=-text ident aeol=lf 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
@@ -83280,70 +85406,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2258 - ls-files --eol attr=-text ident aeol=lf 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.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.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 2259 - checkout attr=-text ident aeol=lf 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.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.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 2260 - checkout attr=-text ident aeol=lf 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.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.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 2261 - checkout attr=-text ident aeol=lf 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.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.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 2262 - checkout attr=-text ident aeol=lf 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.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.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 2263 - checkout attr=-text ident aeol=lf 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.2264 'setup config for checkout attr=-text ident=ident aeol=crlf 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 2264 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
+ok 860 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2265 'setup LF checkout  with -c core.eol=native': 
+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 2265 - setup LF checkout  with -c core.eol=native
+ok 861 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2266 'setup CRLF checkout  with -c core.eol=native': 
+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 2266 - setup CRLF checkout  with -c core.eol=native
+ok 862 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2267 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2267 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 863 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2268 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2268 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 864 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2269 'setup LF_nul checkout  with -c core.eol=native': 
+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 2269 - setup LF_nul checkout  with -c core.eol=native
+ok 865 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2270 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native': 
+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
@@ -83358,70 +85484,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2270 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native
+ok 866 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=crlf
 
-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.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 2271 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 867 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf 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.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 2272 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 868 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf 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.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 2273 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native 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.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.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 2274 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native 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.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.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 2275 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 871 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=crlf 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.872 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2276 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
+ok 872 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2277 'setup LF checkout  with -c core.eol=native': 
+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 2277 - setup LF checkout  with -c core.eol=native
+ok 873 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2278 'setup CRLF checkout  with -c core.eol=native': 
+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 2278 - setup CRLF checkout  with -c core.eol=native
+ok 874 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2279 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2279 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 875 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2280 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2280 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 876 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2281 'setup LF_nul checkout  with -c core.eol=native': 
+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 2281 - setup LF_nul checkout  with -c core.eol=native
+ok 877 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2282 'ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native': 
+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
@@ -83436,70 +85562,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2282 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native
+ok 878 - ls-files --eol attr=text  aeol=crlf core.autocrlf=false core.eol=crlf
 
-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.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 2283 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 879 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf 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.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 2284 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 880 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf 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.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 2285 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native 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.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.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 2286 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native 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.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.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 2287 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+ok 883 - checkout attr=text  aeol=crlf core.autocrlf=false core.eol=crlf 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.884 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2288 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
+ok 884 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2289 'setup LF checkout  with -c core.eol=native': 
+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 2289 - setup LF checkout  with -c core.eol=native
+ok 885 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2290 'setup CRLF checkout  with -c core.eol=native': 
+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 2290 - setup CRLF checkout  with -c core.eol=native
+ok 886 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2291 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2291 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 887 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2292 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2292 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 888 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2293 'setup LF_nul checkout  with -c core.eol=native': 
+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 2293 - setup LF_nul checkout  with -c core.eol=native
+ok 889 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2294 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native': 
+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
@@ -83514,70 +85640,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2294 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native
+ok 890 - ls-files --eol attr=auto  aeol=lf core.autocrlf=false core.eol=crlf
 
-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.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 2295 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 891 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf 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.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 2296 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 892 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf 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.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 2297 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native 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.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.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 2298 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native 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.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.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 2299 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 895 - checkout attr=auto  aeol=lf core.autocrlf=false core.eol=crlf 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.896 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2300 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
+ok 896 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2301 'setup LF checkout  with -c core.eol=native': 
+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 2301 - setup LF checkout  with -c core.eol=native
+ok 897 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2302 'setup CRLF checkout  with -c core.eol=native': 
+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 2302 - setup CRLF checkout  with -c core.eol=native
+ok 898 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2303 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2303 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 899 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2304 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2304 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 900 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2305 'setup LF_nul checkout  with -c core.eol=native': 
+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 2305 - setup LF_nul checkout  with -c core.eol=native
+ok 901 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2306 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native': 
+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
@@ -83592,70 +85718,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2306 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native
+ok 902 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf
 
-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.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 2307 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF
+ok 903 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf 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.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 2308 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
+ok 904 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf 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.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 2309 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 905 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2310 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 906 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.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.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 2311 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
+ok 907 - checkout attr=auto  aeol=crlf core.autocrlf=false core.eol=crlf 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.908 'setup config for checkout attr=-text ident= aeol= 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 908 - setup config for checkout attr=-text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2313 'setup LF checkout  with -c core.eol=native': 
+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 2313 - setup LF checkout  with -c core.eol=native
+ok 909 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2314 'setup CRLF checkout  with -c core.eol=native': 
+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 2314 - setup CRLF checkout  with -c core.eol=native
+ok 910 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2315 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2315 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 911 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2316 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2316 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 912 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2317 'setup LF_nul checkout  with -c core.eol=native': 
+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 2317 - setup LF_nul checkout  with -c core.eol=native
+ok 913 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2318 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=native': 
+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
@@ -83670,70 +85796,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2318 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=false core.eol=native
+ok 914 - ls-files --eol attr=-text  aeol= core.autocrlf=input core.eol=crlf
 
-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.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 2319 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF
+ok 915 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf 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.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 2320 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
+ok 916 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf 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.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 2321 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 917 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf 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.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 2322 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 918 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf 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.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 2323 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
+ok 919 - checkout attr=-text  aeol= core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 0027.2324 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input': 
+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 2324 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
+ok 920 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.2325 'setup LF checkout  with -c core.eol=native': 
+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 2325 - setup LF checkout  with -c core.eol=native
+ok 921 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2326 'setup CRLF checkout  with -c core.eol=native': 
+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 2326 - setup CRLF checkout  with -c core.eol=native
+ok 922 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2327 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2327 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 923 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2328 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2328 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 924 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2329 'setup LF_nul checkout  with -c core.eol=native': 
+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 2329 - setup LF_nul checkout  with -c core.eol=native
+ok 925 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2330 'ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=native': 
+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
@@ -83748,70 +85874,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2330 - ls-files --eol attr=-text ident aeol= core.autocrlf=input core.eol=native
+ok 926 - ls-files --eol attr=-text  aeol=lf core.autocrlf=input core.eol=crlf
 
-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.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 2331 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF
+ok 927 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf 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.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 2332 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 928 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf 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.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 2333 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 929 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2334 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 930 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.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.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 2335 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 931 - checkout attr=-text  aeol=lf core.autocrlf=input core.eol=crlf 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.932 'setup config for checkout attr=-text ident= aeol=crlf 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 932 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2337 'setup LF checkout  with -c core.eol=native': 
+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 2337 - setup LF checkout  with -c core.eol=native
+ok 933 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2338 'setup CRLF checkout  with -c core.eol=native': 
+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 2338 - setup CRLF checkout  with -c core.eol=native
+ok 934 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2339 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2339 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 935 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2340 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2340 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 936 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2341 'setup LF_nul checkout  with -c core.eol=native': 
+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 2341 - setup LF_nul checkout  with -c core.eol=native
+ok 937 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2342 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=native': 
+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
@@ -83826,70 +85952,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2342 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=input core.eol=native
+ok 938 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf
 
-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.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 2343 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 939 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf 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.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 2344 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 940 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf 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.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 2345 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 941 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2346 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 942 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.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.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 2347 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 943 - checkout attr=-text  aeol=crlf core.autocrlf=input core.eol=crlf 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.944 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2348 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
+ok 944 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.2349 'setup LF checkout  with -c core.eol=native': 
+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 2349 - setup LF checkout  with -c core.eol=native
+ok 945 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2350 'setup CRLF checkout  with -c core.eol=native': 
+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 2350 - setup CRLF checkout  with -c core.eol=native
+ok 946 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2351 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2351 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 947 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2352 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2352 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 948 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2353 'setup LF_nul checkout  with -c core.eol=native': 
+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 2353 - setup LF_nul checkout  with -c core.eol=native
+ok 949 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2354 'ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=native': 
+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
@@ -83904,70 +86030,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2354 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=input core.eol=native
+ok 950 - ls-files --eol attr=text  aeol=lf core.autocrlf=input core.eol=crlf
 
-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.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 2355 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 951 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf 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.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 2356 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 952 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf 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.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 2357 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 953 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2358 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 954 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.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.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 2359 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 955 - checkout attr=text  aeol=lf core.autocrlf=input core.eol=crlf 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.956 'setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2360 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
+ok 956 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2361 'setup LF checkout  with -c core.eol=native': 
+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 2361 - setup LF checkout  with -c core.eol=native
+ok 957 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2362 'setup CRLF checkout  with -c core.eol=native': 
+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 2362 - setup CRLF checkout  with -c core.eol=native
+ok 958 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2363 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2363 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 959 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2364 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2364 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 960 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2365 'setup LF_nul checkout  with -c core.eol=native': 
+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 2365 - setup LF_nul checkout  with -c core.eol=native
+ok 961 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2366 'ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=native': 
+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
@@ -83982,70 +86108,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2366 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=native
+ok 962 - ls-files --eol attr=text  aeol=crlf core.autocrlf=input core.eol=crlf
 
-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.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 2367 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 963 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf 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.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 2368 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 964 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf 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.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 2369 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 965 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2370 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 966 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.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.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 2371 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 967 - checkout attr=text  aeol=crlf core.autocrlf=input core.eol=crlf 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.968 'setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2372 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
+ok 968 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=input
 
-expecting success of 0027.2373 'setup LF checkout  with -c core.eol=native': 
+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 2373 - setup LF checkout  with -c core.eol=native
+ok 969 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2374 'setup CRLF checkout  with -c core.eol=native': 
+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 2374 - setup CRLF checkout  with -c core.eol=native
+ok 970 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2375 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2375 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 971 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2376 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2376 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 972 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2377 'setup LF_nul checkout  with -c core.eol=native': 
+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 2377 - setup LF_nul checkout  with -c core.eol=native
+ok 973 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2378 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=native': 
+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
@@ -84060,70 +86186,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2378 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=input core.eol=native
+ok 974 - ls-files --eol attr=auto  aeol=lf core.autocrlf=input core.eol=crlf
 
-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.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 2379 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 975 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf 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.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 2380 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 976 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf 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.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 2381 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 977 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2382 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 978 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.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.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 2383 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 979 - checkout attr=auto  aeol=lf core.autocrlf=input core.eol=crlf 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.980 'setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2384 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=input
+ok 980 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=input
 
-expecting success of 0027.2385 'setup LF checkout  with -c core.eol=native': 
+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 2385 - setup LF checkout  with -c core.eol=native
+ok 981 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2386 'setup CRLF checkout  with -c core.eol=native': 
+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 2386 - setup CRLF checkout  with -c core.eol=native
+ok 982 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2387 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2387 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 983 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2388 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2388 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 984 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2389 'setup LF_nul checkout  with -c core.eol=native': 
+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 2389 - setup LF_nul checkout  with -c core.eol=native
+ok 985 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2390 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=native': 
+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
@@ -84138,70 +86264,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2390 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=input core.eol=native
+ok 986 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf
 
-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.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 2391 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF
+ok 987 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf 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.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 2392 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF
+ok 988 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf 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.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 2393 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 989 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2394 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 990 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 0027.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.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 2395 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
+ok 991 - checkout attr=auto  aeol=crlf core.autocrlf=input core.eol=crlf 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.992 'setup config for checkout attr= ident= aeol= core.autocrlf=false': 
 		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 992 - setup config for checkout attr= ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2397 'setup LF checkout  with -c core.eol=native': 
+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 2397 - setup LF checkout  with -c core.eol=native
+ok 993 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2398 'setup CRLF checkout  with -c core.eol=native': 
+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 2398 - setup CRLF checkout  with -c core.eol=native
+ok 994 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2399 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2399 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 995 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2400 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2400 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 996 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2401 'setup LF_nul checkout  with -c core.eol=native': 
+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 2401 - setup LF_nul checkout  with -c core.eol=native
+ok 997 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2402 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=native': 
+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
@@ -84216,70 +86342,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2402 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=input core.eol=native
+ok 998 - ls-files --eol attr=  aeol= core.autocrlf=false core.eol=crlf
 
-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.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 2403 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF
+ok 999 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf 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.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 2404 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
+ok 1000 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf 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.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 2405 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1001 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf 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.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 2406 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1002 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf 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.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 2407 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
+ok 1003 - checkout attr=  aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-expecting success of 0027.2408 'setup config for checkout attr= ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1004 'setup config for checkout attr= ident= aeol= core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2408 - setup config for checkout attr= ident=ident aeol= core.autocrlf=false
+ok 1004 - setup config for checkout attr= ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2409 'setup LF checkout  with -c core.eol=native': 
+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 2409 - setup LF checkout  with -c core.eol=native
+ok 1005 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2410 'setup CRLF checkout  with -c core.eol=native': 
+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 2410 - setup CRLF checkout  with -c core.eol=native
+ok 1006 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2411 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2411 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1007 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2412 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2412 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1008 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2413 'setup LF_nul checkout  with -c core.eol=native': 
+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 2413 - setup LF_nul checkout  with -c core.eol=native
+ok 1009 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2414 'ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native': 
+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
@@ -84294,70 +86420,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2414 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native
+ok 1010 - ls-files --eol attr=  aeol= core.autocrlf=true core.eol=crlf
 
-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.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 2415 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 1011 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf 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.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 2416 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 1012 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf 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.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 2417 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1013 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf 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.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 2418 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1014 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf 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.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 2419 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 1015 - checkout attr=  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2420 'setup config for checkout attr= ident=ident aeol= core.autocrlf=true': 
+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 2420 - setup config for checkout attr= ident=ident aeol= core.autocrlf=true
+ok 1016 - setup config for checkout attr=auto ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2421 'setup LF checkout  with -c core.eol=native': 
+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 2421 - setup LF checkout  with -c core.eol=native
+ok 1017 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2422 'setup CRLF checkout  with -c core.eol=native': 
+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 2422 - setup CRLF checkout  with -c core.eol=native
+ok 1018 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2423 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2423 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1019 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 0027.2424 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2424 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1020 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 0027.2425 'setup LF_nul checkout  with -c core.eol=native': 
+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 2425 - setup LF_nul checkout  with -c core.eol=native
+ok 1021 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 0027.2426 'ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native': 
+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
@@ -84372,70 +86498,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2426 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native
+ok 1022 - ls-files --eol attr=auto  aeol= core.autocrlf=true core.eol=crlf
 
-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.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 2427 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 1023 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf 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.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 2428 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 1024 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf 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.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 2429 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1025 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf 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.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 2430 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1026 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf 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.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 2431 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 1027 - checkout attr=auto  aeol= core.autocrlf=true core.eol=crlf file=LF_nul
 
-expecting success of 0027.2432 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
+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 2432 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
+ok 1028 - 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.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 2433 - setup LF checkout  with -c core.eol=native
+ok 1029 - 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.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 2434 - setup CRLF checkout  with -c core.eol=native
+ok 1030 - 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.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 2435 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1031 - 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.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 2436 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1032 - 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.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 2437 - setup LF_nul checkout  with -c core.eol=native
+ok 1033 - 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.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
@@ -84450,70 +86576,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2438 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native
+ok 1034 - 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.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 2439 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 1035 - 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.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 2440 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 1036 - 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.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 2441 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1037 - 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.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 2442 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1038 - 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.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 2443 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 1039 - 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.1040 'setup config for checkout attr=text ident= aeol= core.autocrlf=input': 
 		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 1040 - setup config for checkout attr=text ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2445 'setup LF checkout  with -c core.eol=native': 
+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 2445 - setup LF checkout  with -c core.eol=native
+ok 1041 - 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.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 2446 - setup CRLF checkout  with -c core.eol=native
+ok 1042 - 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.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 2447 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1043 - 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.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 2448 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1044 - 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.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 2449 - setup LF_nul checkout  with -c core.eol=native
+ok 1045 - 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.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
@@ -84528,70 +86654,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2450 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native
+ok 1046 - ls-files --eol attr=text  aeol= core.autocrlf=input 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.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 2451 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF
+ok 1047 - checkout attr=text  aeol= core.autocrlf=input 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.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 2452 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF
+ok 1048 - checkout attr=text  aeol= core.autocrlf=input 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.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 2453 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
+ok 1049 - checkout attr=text  aeol= core.autocrlf=input 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.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 2454 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
+ok 1050 - checkout attr=text  aeol= core.autocrlf=input 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.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 2455 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
+ok 1051 - checkout attr=text  aeol= core.autocrlf=input 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.1052 'setup config for checkout attr=auto 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
+ok 1052 - setup config for checkout attr=auto ident= aeol= core.autocrlf=input
 
-expecting success of 0027.2457 'setup LF checkout  with -c core.eol=native': 
+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 2457 - setup LF checkout  with -c core.eol=native
+ok 1053 - 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.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 2458 - setup CRLF checkout  with -c core.eol=native
+ok 1054 - 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.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 2459 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1055 - 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.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 2460 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1056 - 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.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 2461 - setup LF_nul checkout  with -c core.eol=native
+ok 1057 - 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.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
@@ -84606,70 +86732,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2462 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native
+ok 1058 - ls-files --eol attr=auto  aeol= core.autocrlf=input 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.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 2463 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF
+ok 1059 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2464 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 1060 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2465 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1061 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2466 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1062 - checkout attr=auto  aeol= core.autocrlf=input 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.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 2467 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 1063 - checkout attr=auto  aeol= core.autocrlf=input 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.1064 'setup config for checkout attr=-text ident= aeol= 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 1064 - setup config for checkout attr=-text ident= aeol= core.autocrlf=true
 
-expecting success of 0027.2469 'setup LF checkout  with -c core.eol=native': 
+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 2469 - setup LF checkout  with -c core.eol=native
+ok 1065 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2470 'setup CRLF checkout  with -c core.eol=native': 
+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 2470 - setup CRLF checkout  with -c core.eol=native
+ok 1066 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2471 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2471 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1067 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2472 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2472 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1068 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2473 'setup LF_nul checkout  with -c core.eol=native': 
+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 2473 - setup LF_nul checkout  with -c core.eol=native
+ok 1069 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2474 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native': 
+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
@@ -84684,70 +86810,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2474 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native
+ok 1070 - ls-files --eol attr=-text  aeol= core.autocrlf=true core.eol=native
 
-expecting success of 0027.2475 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+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 2475 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF
+ok 1071 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.2476 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+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 2476 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF
+ok 1072 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.2477 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+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 2477 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
+ok 1073 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.2478 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+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 2478 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
+ok 1074 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.2479 'checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul': 
-		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+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 2479 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul
+ok 1075 - checkout attr=-text  aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2480 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+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 2480 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 1076 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2481 'setup LF checkout  with -c core.eol=crlf': 
+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 2481 - setup LF checkout  with -c core.eol=crlf
+ok 1077 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2482 'setup CRLF checkout  with -c core.eol=crlf': 
+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 2482 - setup CRLF checkout  with -c core.eol=crlf
+ok 1078 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2483 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+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 2483 - setup LF_mix_CR checkout  with -c core.eol=crlf
+ok 1079 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2484 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+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 2484 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+ok 1080 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2485 'setup LF_nul checkout  with -c core.eol=crlf': 
+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 2485 - setup LF_nul checkout  with -c core.eol=crlf
+ok 1081 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2486 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf': 
+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
@@ -84762,70 +86888,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2486 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf
+ok 1082 - ls-files --eol attr=-text  aeol=lf core.autocrlf=true core.eol=native
 
-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.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 2487 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF
+ok 1083 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native 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.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 2488 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
+ok 1084 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native 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.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 2489 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
+ok 1085 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2490 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
+ok 1086 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.2491 'checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul': 
-		compare_ws_file eol_crlf_crlf_false_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.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 2491 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
+ok 1087 - checkout attr=-text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2492 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+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 2492 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 1088 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2493 'setup LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1089 'setup LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2493 - setup LF checkout  with -c core.eol=lf
+ok 1089 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2494 'setup CRLF checkout  with -c core.eol=lf': 
+expecting success of 0027.1090 'setup CRLF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2494 - setup CRLF checkout  with -c core.eol=lf
+ok 1090 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2495 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+expecting success of 0027.1091 'setup LF_mix_CR checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2495 - setup LF_mix_CR checkout  with -c core.eol=lf
+ok 1091 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2496 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+expecting success of 0027.1092 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2496 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+ok 1092 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2497 'setup LF_nul checkout  with -c core.eol=lf': 
+expecting success of 0027.1093 'setup LF_nul checkout  with -c core.eol=native': 
 			rm -f crlf_false_attr__$f.txt &&
 			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
 		
-ok 2497 - setup LF_nul checkout  with -c core.eol=lf
+ok 1093 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2498 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf': 
+expecting success of 0027.1094 'ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native': 
 		test_when_finished "rm expect actual" &&
 		sort <<-EOF >expect &&
 		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
@@ -84840,70 +86966,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2498 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf
+ok 1094 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=true core.eol=native
 
-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.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 2499 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF
+ok 1095 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native 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.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 2500 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
+ok 1096 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native 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.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 2501 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
+ok 1097 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2502 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
+ok 1098 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.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.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 2503 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
+ok 1099 - checkout attr=-text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2504 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+expecting success of 0027.1100 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=true': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2504 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 1100 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2505 'setup LF checkout ': 
+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 2505 - setup LF checkout 
+ok 1101 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2506 'setup CRLF checkout ': 
+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 2506 - setup CRLF checkout 
+ok 1102 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2507 'setup LF_mix_CR checkout ': 
+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 2507 - setup LF_mix_CR checkout 
+ok 1103 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2508 'setup CRLF_mix_LF checkout ': 
+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 2508 - setup CRLF_mix_LF checkout 
+ok 1104 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2509 'setup LF_nul checkout ': 
+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 2509 - setup LF_nul checkout 
+ok 1105 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2510 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=': 
+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
@@ -84918,70 +87044,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2510 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=
+ok 1106 - ls-files --eol attr=text  aeol=lf core.autocrlf=true core.eol=native
 
-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.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 2511 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF
+ok 1107 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native 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.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 2512 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF
+ok 1108 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native 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.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 2513 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 1109 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2514 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+ok 1110 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.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.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 2515 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_nul
+ok 1111 - checkout attr=text  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2516 'setup config for checkout attr=text ident=ident aeol= core.autocrlf=false': 
+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 2516 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
+ok 1112 - setup config for checkout attr=text ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2517 'setup LF checkout  with -c core.eol=native': 
+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 2517 - setup LF checkout  with -c core.eol=native
+ok 1113 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2518 'setup CRLF checkout  with -c core.eol=native': 
+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 2518 - setup CRLF checkout  with -c core.eol=native
+ok 1114 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2519 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2519 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1115 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2520 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2520 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1116 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2521 'setup LF_nul checkout  with -c core.eol=native': 
+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 2521 - setup LF_nul checkout  with -c core.eol=native
+ok 1117 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2522 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=native': 
+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
@@ -84996,70 +87122,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2522 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=native
+ok 1118 - ls-files --eol attr=text  aeol=crlf core.autocrlf=true core.eol=native
 
-expecting success of 0027.2523 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ LF    crlf_false_attr__LF.txt
+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 2523 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 1119 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.2524 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+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 2524 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 1120 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.2525 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+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 2525 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1121 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2526 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1122 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.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.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 2527 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 1123 - checkout attr=text  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2528 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false': 
+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 2528 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false
+ok 1124 - setup config for checkout attr=auto ident= aeol=lf core.autocrlf=true
 
-expecting success of 0027.2529 'setup LF checkout ': 
+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 2529 - setup LF checkout 
+ok 1125 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2530 'setup CRLF checkout ': 
+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 2530 - setup CRLF checkout 
+ok 1126 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2531 'setup LF_mix_CR checkout ': 
+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 2531 - setup LF_mix_CR checkout 
+ok 1127 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2532 'setup CRLF_mix_LF checkout ': 
+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 2532 - setup CRLF_mix_LF checkout 
+ok 1128 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2533 'setup LF_nul checkout ': 
+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 2533 - setup LF_nul checkout 
+ok 1129 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2534 'ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=': 
+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
@@ -85074,70 +87200,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2534 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=
+ok 1130 - ls-files --eol attr=auto  aeol=lf core.autocrlf=true core.eol=native
 
-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.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 2535 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF
+ok 1131 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native 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.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 2536 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF
+ok 1132 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native 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.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 2537 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 1133 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2538 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_mix_CR
+ok 1134 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.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.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 2539 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=LF_nul
+ok 1135 - checkout attr=auto  aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2540 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false': 
+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 2540 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=false
+ok 1136 - setup config for checkout attr=auto ident= aeol=crlf core.autocrlf=true
 
-expecting success of 0027.2541 'setup LF checkout  with -c core.eol=native': 
+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 2541 - setup LF checkout  with -c core.eol=native
+ok 1137 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2542 'setup CRLF checkout  with -c core.eol=native': 
+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 2542 - setup CRLF checkout  with -c core.eol=native
+ok 1138 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2543 'setup LF_mix_CR checkout  with -c core.eol=native': 
+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 2543 - setup LF_mix_CR checkout  with -c core.eol=native
+ok 1139 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2544 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+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 2544 - setup CRLF_mix_LF checkout  with -c core.eol=native
+ok 1140 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2545 'setup LF_nul checkout  with -c core.eol=native': 
+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 2545 - setup LF_nul checkout  with -c core.eol=native
+ok 1141 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2546 'ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=native': 
+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
@@ -85152,70 +87278,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2546 - ls-files --eol attr=auto ident aeol= core.autocrlf=false core.eol=native
+ok 1142 - ls-files --eol attr=auto  aeol=crlf core.autocrlf=true core.eol=native
 
-expecting success of 0027.2547 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ LF    crlf_false_attr__LF.txt
+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 2547 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF
+ok 1143 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 0027.2548 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+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 2548 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF
+ok 1144 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 0027.2549 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
-		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+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 2549 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
+ok 1145 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2550 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
+ok 1146 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 0027.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.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 2551 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul
+ok 1147 - checkout attr=auto  aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 0027.2552 'setup config for checkout attr= ident=ident aeol=lf core.autocrlf=false': 
+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 2552 - setup config for checkout attr= ident=ident aeol=lf core.autocrlf=false
+ok 1148 - setup config for checkout attr=-text ident= aeol= core.autocrlf=false
 
-expecting success of 0027.2553 'setup LF checkout ': 
+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 2553 - setup LF checkout 
+ok 1149 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2554 'setup CRLF checkout ': 
+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 2554 - setup CRLF checkout 
+ok 1150 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2555 'setup LF_mix_CR checkout ': 
+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 2555 - setup LF_mix_CR checkout 
+ok 1151 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2556 'setup CRLF_mix_LF checkout ': 
+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 2556 - setup CRLF_mix_LF checkout 
+ok 1152 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2557 'setup LF_nul checkout ': 
+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 2557 - setup LF_nul checkout 
+ok 1153 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2558 'ls-files --eol attr= ident aeol=lf core.autocrlf=false core.eol=': 
+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
@@ -85230,70 +87356,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2558 - ls-files --eol attr= ident aeol=lf core.autocrlf=false core.eol=
+ok 1154 - ls-files --eol attr=-text  aeol= core.autocrlf=false core.eol=native
 
-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.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 2559 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF
+ok 1155 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native 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.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 2560 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF
+ok 1156 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native 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.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 2561 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 1157 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native 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.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 2562 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_mix_CR
+ok 1158 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native 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.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 2563 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_nul
+ok 1159 - checkout attr=-text  aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.2564 'setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=false': 
+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 2564 - setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=false
+ok 1160 - setup config for checkout attr=-text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2565 'setup LF checkout ': 
+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 2565 - setup LF checkout 
+ok 1161 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2566 'setup CRLF checkout ': 
+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 2566 - setup CRLF checkout 
+ok 1162 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2567 'setup LF_mix_CR checkout ': 
+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 2567 - setup LF_mix_CR checkout 
+ok 1163 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2568 'setup CRLF_mix_LF checkout ': 
+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 2568 - setup CRLF_mix_LF checkout 
+ok 1164 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2569 'setup LF_nul checkout ': 
+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 2569 - setup LF_nul checkout 
+ok 1165 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2570 'ls-files --eol attr= ident aeol=crlf core.autocrlf=false core.eol=': 
+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
@@ -85308,70 +87434,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2570 - ls-files --eol attr= ident aeol=crlf core.autocrlf=false core.eol=
+ok 1166 - ls-files --eol attr=-text  aeol=lf core.autocrlf=false core.eol=native
 
-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.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 2571 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF
+ok 1167 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native 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.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 2572 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF
+ok 1168 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native 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.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 2573 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF_mix_LF
+ok 1169 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2574 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_mix_CR
+ok 1170 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.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.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 2575 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_nul
+ok 1171 - checkout attr=-text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.2576 'setup config for checkout attr= ident=ident aeol=lf core.autocrlf=true': 
+expecting success of 0027.1172 'setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2576 - setup config for checkout attr= ident=ident aeol=lf core.autocrlf=true
+ok 1172 - setup config for checkout attr=-text ident= aeol=crlf core.autocrlf=false
 
-expecting success of 0027.2577 'setup LF checkout ': 
+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 2577 - setup LF checkout 
+ok 1173 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2578 'setup CRLF checkout ': 
+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 2578 - setup CRLF checkout 
+ok 1174 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2579 'setup LF_mix_CR checkout ': 
+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 2579 - setup LF_mix_CR checkout 
+ok 1175 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2580 'setup CRLF_mix_LF checkout ': 
+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 2580 - setup CRLF_mix_LF checkout 
+ok 1176 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2581 'setup LF_nul checkout ': 
+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 2581 - setup LF_nul checkout 
+ok 1177 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2582 'ls-files --eol attr= ident aeol=lf core.autocrlf=true core.eol=': 
+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
@@ -85386,70 +87512,70 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2582 - ls-files --eol attr= ident aeol=lf core.autocrlf=true core.eol=
+ok 1178 - ls-files --eol attr=-text  aeol=crlf core.autocrlf=false core.eol=native
 
-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.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 2583 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF
+ok 1179 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native 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.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 2584 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF
+ok 1180 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native 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.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 2585 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF_mix_LF
+ok 1181 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.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.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 2586 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_mix_CR
+ok 1182 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.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.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 2587 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=LF_nul
+ok 1183 - checkout attr=-text  aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 0027.2588 'setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=true': 
+expecting success of 0027.1184 'setup config for checkout attr=text ident= aeol=lf core.autocrlf=false': 
 		create_gitattributes "$attr" $ident $aeol &&
 		git config core.autocrlf $crlf
 	
-ok 2588 - setup config for checkout attr= ident=ident aeol=crlf core.autocrlf=true
+ok 1184 - setup config for checkout attr=text ident= aeol=lf core.autocrlf=false
 
-expecting success of 0027.2589 'setup LF checkout ': 
+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 2589 - setup LF checkout 
+ok 1185 - setup LF checkout  with -c core.eol=native
 
-expecting success of 0027.2590 'setup CRLF checkout ': 
+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 2590 - setup CRLF checkout 
+ok 1186 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 0027.2591 'setup LF_mix_CR checkout ': 
+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 2591 - setup LF_mix_CR checkout 
+ok 1187 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 0027.2592 'setup CRLF_mix_LF checkout ': 
+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 2592 - setup CRLF_mix_LF checkout 
+ok 1188 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 0027.2593 'setup LF_nul checkout ': 
+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 2593 - setup LF_nul checkout 
+ok 1189 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 0027.2594 'ls-files --eol attr= ident aeol=crlf core.autocrlf=true core.eol=': 
+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
@@ -85464,10350 +87590,9384 @@
 		sort >actual &&
 		test_cmp expect actual
 	
-ok 2594 - ls-files --eol attr= ident aeol=crlf core.autocrlf=true core.eol=
+ok 1190 - ls-files --eol attr=text  aeol=lf core.autocrlf=false core.eol=native
 
-expecting success of 0027.2595 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF    crlf_false_attr__LF.txt
+expecting success of 0027.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 2595 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF
+ok 1191 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 0027.2596 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+expecting success of 0027.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 2596 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF
+ok 1192 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 0027.2597 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF': 
-		compare_ws_file eol__crlf_true_attr__ CRLF crlf_false_attr__CRLF_mix_LF.txt
+expecting success of 0027.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 2597 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=CRLF_mix_LF
+ok 1193 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 0027.2598 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR': 
-		compare_ws_file eol__crlf_true_attr__ CRLF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+expecting success of 0027.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 2598 - checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_mix_CR
+ok 1194 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-expecting success of 0027.2599 'checkout attr= ident aeol=crlf core.autocrlf=true core.eol= file=LF_nul': 
-		compare_ws_file eol__crlf_true_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
+expecting success of 0027.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 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1407-worktree-ref-store.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1407-worktree-ref-store/.git/
-expecting success of 1407.1 'setup': 
-	test_commit first &&
-	git worktree add -b wt-main wt &&
-	(
-		cd wt &&
-		test_commit second
-	)
-
-[main (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Preparing worktree (new branch 'wt-main')
-HEAD is now at 50e526b first
-[wt-main d662100] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-ok 1 - setup
+ok 1195 - checkout attr=text  aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-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
+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
 
-ok 2 - resolve_ref(<shared-ref>)
+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 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 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
 
-	SHA1=`git rev-parse HEAD` &&
-	echo "$SHA1 refs/heads/main 0x1" >expected &&
-	$RMAIN resolve-ref HEAD 0 >actual &&
-	test_cmp expected actual
+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
 
-ok 3 - resolve_ref(<per-worktree-ref>)
+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 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 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
 
-	$RMAIN create-symref FOO refs/heads/wt-main nothing &&
-	echo refs/heads/wt-main >expected &&
-	git symbolic-ref FOO >actual &&
-	test_cmp expected actual
+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
 
-ok 4 - create_symref(FOO, refs/heads/main)
+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
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1408-packed-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
+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
 
-	git pack-refs --all &&
-	git for-each-ref >actual &&
-	echo "$one commit	refs/heads/main" >expect &&
-	test_cmp expect actual &&
+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
 
-	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 &&
+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
 
-	git for-each-ref >actual &&
-	echo "$two commit	refs/heads/main" >expect &&
-	test_cmp expect actual &&
+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
 
-	git reflog expire --expire=now --all &&
-	git prune &&
-	git tag -m v1.0 v1.0 main
+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
 
-[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 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 1408.2 'no error from stale entry in packed-refs': 
-	git describe main >actual 2>&1 &&
-	echo "v1.0" >expect &&
-	test_cmp expect actual
+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
 
-ok 2 - no error from stale entry in packed-refs
+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
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1409-avoid-packing-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1409-avoid-packing-refs/.git/
-expecting success of 1409.1 'setup': 
-	git commit --allow-empty -m "Commit A" &&
-	A=$(git rev-parse HEAD) &&
-	git commit --allow-empty -m "Commit B" &&
-	B=$(git rev-parse HEAD) &&
-	git commit --allow-empty -m "Commit C" &&
-	C=$(git rev-parse HEAD)
+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
 
-[master (root-commit) 8d09622] Commit A
- Author: A U Thor <author@example.com>
-[master 241b9d6] Commit B
- Author: A U Thor <author@example.com>
-[master 8d1dbac] Commit C
- Author: A U Thor <author@example.com>
-ok 1 - setup
+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
 
-expecting success of 1409.2 'do not create packed-refs file gratuitously': 
-	test_path_is_missing .git/packed-refs &&
-	git update-ref refs/heads/foo $A &&
-	test_path_is_missing .git/packed-refs &&
-	git update-ref refs/heads/foo $B &&
-	test_path_is_missing .git/packed-refs &&
-	git update-ref refs/heads/foo $C $B &&
-	test_path_is_missing .git/packed-refs &&
-	git update-ref -d refs/heads/foo &&
-	test_path_is_missing .git/packed-refs
+expecting success of 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
 
-ok 2 - do not create packed-refs file gratuitously
+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 1409.3 'check that marking the packed-refs file works': 
-	git for-each-ref >expected &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	check_packed_refs_marked &&
-	git for-each-ref >actual &&
-	test_cmp expected actual &&
-	git pack-refs --all &&
-	! check_packed_refs_marked &&
-	git for-each-ref >actual2 &&
-	test_cmp expected actual2
+expecting success of 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 3 - check that marking the packed-refs file works
+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 1409.4 'leave packed-refs untouched on update of packed': 
-	git update-ref refs/heads/packed-update $A &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	git update-ref refs/heads/packed-update $B &&
-	check_packed_refs_marked
+expecting success of 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
 
-ok 4 - leave packed-refs untouched on update of packed
+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
 
-expecting success of 1409.5 'leave packed-refs untouched on checked update of packed': 
-	git update-ref refs/heads/packed-checked-update $A &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	git update-ref refs/heads/packed-checked-update $B $A &&
-	check_packed_refs_marked
+expecting success of 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
 
-ok 5 - leave packed-refs untouched on checked update of packed
+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
 
-expecting success of 1409.6 'leave packed-refs untouched on verify of packed': 
-	git update-ref refs/heads/packed-verify $A &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	echo "verify refs/heads/packed-verify $A" | git update-ref --stdin &&
-	check_packed_refs_marked
+expecting success of 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
 
-ok 6 - leave packed-refs untouched on verify of packed
+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
 
-expecting success of 1409.7 'touch packed-refs on delete of packed': 
-	git update-ref refs/heads/packed-delete $A &&
-	git pack-refs --all &&
-	mark_packed_refs &&
-	git update-ref -d refs/heads/packed-delete &&
-	! check_packed_refs_marked
+expecting success of 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
 
-ok 7 - touch packed-refs on delete of packed
+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
 
-expecting success of 1409.8 'leave packed-refs untouched on update of loose': 
-	git pack-refs --all &&
-	git update-ref refs/heads/loose-update $A &&
-	mark_packed_refs &&
-	git update-ref refs/heads/loose-update $B &&
-	check_packed_refs_marked
+expecting success of 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
 
-ok 8 - leave packed-refs untouched on update of loose
+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
 
-expecting success of 1409.9 'leave packed-refs untouched on checked update of loose': 
-	git pack-refs --all &&
-	git update-ref refs/heads/loose-checked-update $A &&
-	mark_packed_refs &&
-	git update-ref refs/heads/loose-checked-update $B $A &&
-	check_packed_refs_marked
+expecting success of 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
 
-ok 9 - leave packed-refs untouched on checked update of loose
+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
 
-expecting success of 1409.10 'leave packed-refs untouched on verify of loose': 
-	git pack-refs --all &&
-	git update-ref refs/heads/loose-verify $A &&
-	mark_packed_refs &&
-	echo "verify refs/heads/loose-verify $A" | git update-ref --stdin &&
-	check_packed_refs_marked
+expecting success of 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
 
-ok 10 - leave packed-refs untouched on verify of loose
+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
 
-expecting success of 1409.11 'leave packed-refs untouched on delete of loose': 
-	git pack-refs --all &&
-	git update-ref refs/heads/loose-delete $A &&
-	mark_packed_refs &&
-	git update-ref -d refs/heads/loose-delete &&
-	check_packed_refs_marked
+expecting success of 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
 
-ok 11 - leave packed-refs untouched on delete of loose
+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
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1411-reflog-show.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1411-reflog-show/.git/
-expecting success of 1411.1 'setup': 
-	echo content >file &&
-	git add file &&
-	test_tick &&
-	git commit -m one
+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
 
-[main (root-commit) e46513e] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
+expecting success of 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 1411.2 'log -g shows reflog headers': 
-	git log -g -1 >tmp &&
-	grep ^Reflog <tmp >actual &&
-	test_cmp expect actual
+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
 
-ok 2 - log -g shows reflog headers
+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 1411.3 'oneline reflog format': 
-	git log -g -1 --oneline >actual &&
-	test_cmp expect actual
+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
 
-ok 3 - oneline reflog format
+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
 
-expecting success of 1411.4 'reflog default format': 
-	git reflog -1 >actual &&
-	test_cmp expect actual
+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
 
-ok 4 - reflog default format
+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
 
-expecting success of 1411.5 'override reflog default format': 
-	git reflog --format=short -1 >actual &&
-	test_cmp expect actual
+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
 
-ok 5 - override reflog default format
+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 1411.6 'using @{now} syntax shows reflog date (multiline)': 
-	git log -g -1 HEAD@{now} >tmp &&
-	grep ^Reflog <tmp >actual &&
-	test_cmp expect actual
+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
 
-ok 6 - using @{now} syntax shows reflog date (multiline)
+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 1411.7 'using @{now} syntax shows reflog date (oneline)': 
-	git log -g -1 --oneline HEAD@{now} >actual &&
-	test_cmp expect actual
+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
 
-ok 7 - using @{now} syntax shows reflog date (oneline)
+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 1411.8 'using @{now} syntax shows reflog date (format=%gd)': 
-	git log -g -1 --format=%gd HEAD@{now} >actual &&
-	test_cmp expect actual
+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
 
-ok 8 - using @{now} syntax shows reflog date (format=%gd)
+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 1411.9 'using --date= shows reflog date (multiline)': 
-	git log -g -1 --date=default >tmp &&
-	grep ^Reflog <tmp >actual &&
-	test_cmp expect actual
+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
 
-ok 9 - using --date= shows reflog date (multiline)
+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 1411.10 'using --date= shows reflog date (oneline)': 
-	git log -g -1 --oneline --date=default >actual &&
-	test_cmp expect actual
+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
 
-ok 10 - using --date= shows reflog date (oneline)
+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 1411.11 'using --date= shows reflog date (format=%gd)': 
-	git log -g -1 --format=%gd --date=raw >actual &&
-	test_cmp expect actual
+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
 
-ok 11 - using --date= shows reflog date (format=%gd)
+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 1411.12 'log.date does not invoke "--date" magic (multiline)': 
-	test_config log.date raw &&
-	git log -g -1 >tmp &&
-	grep ^Reflog <tmp >actual &&
-	test_cmp expect actual
+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
 
-ok 12 - log.date does not invoke "--date" magic (multiline)
+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 1411.13 'log.date does not invoke "--date" magic (oneline)': 
-	test_config log.date raw &&
-	git log -g -1 --oneline >actual &&
-	test_cmp expect actual
+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
 
-ok 13 - log.date does not invoke "--date" magic (oneline)
+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
 
-expecting success of 1411.14 'log.date does not invoke "--date" magic (format=%gd)': 
-	test_config log.date raw &&
-	git log -g -1 --format=%gd >actual &&
-	test_cmp expect actual
+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
 
-ok 14 - log.date does not invoke "--date" magic (format=%gd)
+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
 
-expecting success of 1411.15 '--date magic does not override explicit @{0} syntax': 
-	git log -g -1 --format=%gd --date=raw HEAD@{0} >actual &&
-	test_cmp expect actual
+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
 
-ok 15 - --date magic does not override explicit @{0} syntax
+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 1411.16 'empty reflog file': 
-	git branch empty &&
-	git reflog expire --expire=all refs/heads/empty &&
+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 log -g empty >actual &&
-	test_must_be_empty actual
+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
 
-ok 16 - empty reflog file
+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
 
-expecting success of 1411.17 'git log -g -p shows diffs vs. parents': 
-	test_commit two &&
-	git branch flipflop &&
-	git update-ref refs/heads/flipflop -m flip1 HEAD^ &&
-	git update-ref refs/heads/flipflop -m flop1 HEAD &&
-	git update-ref refs/heads/flipflop -m flip2 HEAD^ &&
-	git log -g -p flipflop >reflog &&
-	grep -v ^Reflog reflog >actual &&
-	git log -1 -p HEAD^ >log.one &&
-	git log -1 -p HEAD >log.two &&
-	(
-		cat log.one && echo &&
-		cat log.two && echo &&
-		cat log.one && echo &&
-		cat log.two
-	) >expect &&
-	test_cmp expect actual
+expecting success of 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
 
-[main fc3e0aa] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 17 - git log -g -p shows diffs vs. parents
+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
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1412-reflog-loop.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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
 
-[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 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
 
-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
+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
 
-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 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
 
-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
+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
 
-ok 3 - reflog shows all entries
+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
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1413-reflog-detach.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1413-reflog-detach/.git/
-expecting success of 1413.1 'setup': 
-	test_tick &&
-	git commit --allow-empty -m initial &&
-	git branch side &&
-	test_tick &&
-	git commit --allow-empty -m second &&
-	"$TAR" cf .git-saved.tar .git
+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
 
-[main (root-commit) 66fe8b3] initial
- Author: A U Thor <author@example.com>
-[main 5ce2b00] second
- Author: A U Thor <author@example.com>
-ok 1 - setup
+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
 
-expecting success of 1413.2 'baseline': 
-	reset_state &&
-	git rev-parse main main^ >expect &&
-	git log -g --format=%H >actual &&
-	test_cmp expect actual
+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
 
-ok 2 - baseline
+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
 
-expecting success of 1413.3 'switch to branch': 
-	reset_state &&
-	git rev-parse side main main^ >expect &&
-	git checkout side &&
-	git log -g --format=%H >actual &&
-	test_cmp expect actual
+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
 
-Switched to branch 'side'
-ok 3 - switch to branch
+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
 
-expecting success of 1413.4 'detach to other': 
-	reset_state &&
-	git rev-parse main side main main^ >expect &&
-	git checkout side &&
-	git checkout main^0 &&
-	git log -g --format=%H >actual &&
-	test_cmp expect actual
+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
 
-Switched to branch 'side'
-Note: switching to 'main^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 5ce2b00 second
-ok 4 - detach to other
+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 1413.5 'detach to self': 
-	reset_state &&
-	git rev-parse main main main^ >expect &&
-	git checkout main^0 &&
-	git log -g --format=%H >actual &&
-	test_cmp expect actual
+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
 
-Note: switching to 'main^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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 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.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 switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 5ce2b00 second
-ok 5 - detach to self
+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
 
-expecting success of 1413.6 'attach to self': 
-	reset_state &&
-	git rev-parse main main main main^ >expect &&
-	git checkout main^0 &&
-	git checkout main &&
-	git log -g --format=%H >actual &&
-	test_cmp expect actual
+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
 
-Note: switching to 'main^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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 switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 5ce2b00 second
-Switched to branch 'main'
-ok 6 - attach to self
+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
 
-expecting success of 1413.7 'attach to other': 
-	reset_state &&
-	git rev-parse side main main main^ >expect &&
-	git checkout main^0 &&
-	git checkout side &&
-	git log -g --format=%H >actual &&
-	test_cmp expect actual
+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
 
-Note: switching to 'main^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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 switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 5ce2b00 second
-Previous HEAD position was 5ce2b00 second
-Switched to branch 'side'
-ok 7 - attach to other
+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
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1414-reflog-walk.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1414-reflog-walk/.git/
-expecting success of 1414.1 'set up some reflog entries': 
-	test_commit one &&
-	test_commit two &&
-	git checkout -b side HEAD^ &&
-	test_commit three &&
-	git merge --no-commit main &&
-	echo evil-merge-content >>one.t &&
-	test_tick &&
-	git commit --no-edit -a
+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
 
-[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 a new branch 'side'
-[side 897c206] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Automatic merge went well; stopped before committing as requested
-[side 6635cc5] Merge branch 'main' into side
- Author: A U Thor <author@example.com>
-ok 1 - set up some reflog entries
+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 1414.2 'set up expected reflog': 
-	cat >expect.all <<-EOF
-	HEAD@{0} commit (merge): Merge branch ${SQ}main${SQ} into side
-	HEAD@{1} commit: three
-	HEAD@{2} checkout: moving from main to side
-	HEAD@{3} commit: two
-	HEAD@{4} commit (initial): one
-	EOF
+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
 
-ok 2 - set up expected reflog
+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 1414.3 'reflog walk shows expected logs': 
-	do_walk >actual &&
-	test_cmp expect.all actual
+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
 
-ok 3 - reflog walk shows expected logs
+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 1414.4 'reflog can limit with --no-merges': 
-	grep -v merge expect.all >expect &&
-	do_walk --no-merges >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
 
-ok 4 - reflog can limit with --no-merges
+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 1414.5 'reflog can limit with pathspecs': 
-	grep two expect.all >expect &&
-	do_walk -- two.t >actual &&
-	test_cmp expect actual
+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
 
-ok 5 - reflog can limit with pathspecs
+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 1414.6 'pathspec limiting handles merges': 
-	# we pick up:
-	#   - the initial commit of one
-	#   - the checkout back to commit one
-	#   - the evil merge which touched one
-	sed -n "1p;3p;5p" expect.all >expect &&
-	do_walk -- one.t >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
 
-ok 6 - pathspec limiting handles merges
+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 1414.7 '--parents shows true parents': 
-	# convert newlines to spaces
-	echo $(git rev-parse HEAD HEAD^1 HEAD^2) >expect &&
-	git rev-list -g --parents -1 HEAD >actual &&
-	test_cmp expect actual
+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
 
-ok 7 - --parents shows true parents
+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 1414.8 'walking multiple reflogs shows all': 
-	# We expect to see all entries for all reflogs, but interleaved by
-	# date, with order on the command line breaking ties. We
-	# can use "sort" on the separate lists to generate this,
-	# but note two tricks:
-	#
-	#   1. We use "{" as the delimiter, which lets us skip to the reflog
-	#      date specifier as our second field, and then our "-n" numeric
-	#      sort ignores the bits after the timestamp.
-	#
-	#   2. POSIX leaves undefined whether this is a stable sort or not. So
-	#      we use "-k 1" to ensure that we see HEAD before main before
-	#      side when breaking ties.
-	{
-		do_walk --date=unix HEAD &&
-		do_walk --date=unix side &&
-		do_walk --date=unix main
-	} >expect.raw &&
-	sort -t "{" -k 2nr -k 1 <expect.raw >expect &&
-	do_walk --date=unix HEAD main side >actual &&
-	test_cmp expect 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
 
-ok 8 - walking multiple reflogs shows all
+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
 
-expecting success of 1414.9 'date-limiting does not interfere with other logs': 
-	do_walk HEAD@{1979-01-01} HEAD >actual &&
-	test_cmp expect.all actual
+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
 
-warning: log for 'HEAD' only goes back to Thu, 7 Apr 2005 15:13:13 -0700
-ok 9 - date-limiting does not interfere with other logs
+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
 
-expecting success of 1414.10 'min/max age uses entry date to limit': 
-	# Flip between commits one and two so each ref update actually
-	# does something (and does not get optimized out). We know
-	# that the timestamps of those commits will be before our "min".
+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
 
-	git update-ref -m before refs/heads/minmax one &&
+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
 
-	test_tick &&
-	min=$test_tick &&
-	git update-ref -m min refs/heads/minmax two &&
+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
 
-	test_tick &&
-	max=$test_tick &&
-	git update-ref -m max refs/heads/minmax one &&
+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
 
-	test_tick &&
-	git update-ref -m after refs/heads/minmax two &&
+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
 
-	cat >expect <<-\EOF &&
-	max
-	min
-	EOF
-	git log -g --since=$min --until=$max --format=%gs minmax >actual &&
-	test_cmp expect actual
+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
 
-ok 10 - min/max age uses entry date to limit
+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
 
-expecting success of 1414.11 'walk prefers reflog to ref tip': 
-	test_commit A &&
-	test_commit B &&
-	git reflog delete HEAD@{0} &&
-	head=$(git rev-parse HEAD) &&
-	git rev-parse A >expect &&
-	git log -g --format=%H -1 >actual &&
-	test_cmp expect 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
 
-[side 2fdefc8] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[side 8a0211e] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ok 11 - walk prefers reflog to ref tip
+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
 
-expecting success of 1414.12 'rev-list -g complains when there are no reflogs': 
-	test_must_fail git rev-list -g
+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
 
-usage: git rev-list [<options>] <commit>... [--] [<path>...]
+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
 
-  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
-ok 12 - rev-list -g complains when there are no reflogs
+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
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1415-worktree-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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
 
-[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 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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 24b24cf initial
-ok 1 - setup
+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
 
-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 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
 
-ok 2 - refs/worktree are per-worktree
+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
 
-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 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
 
-ok 3 - resolve main-worktree/HEAD
+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
 
-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
+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
 
-24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-warning: refname 'main-worktree/HEAD' is ambiguous.
-ok 4 - ambiguous main-worktree/HEAD
+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
 
-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 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
 
-ok 5 - resolve worktrees/xx/HEAD
+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
 
-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 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
 
-42fba42569eaa325aaade18832dfa5432d54ffd1
-warning: refname 'worktrees/wt1/HEAD' is ambiguous.
-ok 6 - ambiguous worktrees/xx/HEAD
+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 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 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
 
-ok 7 - reflog of main-worktree/HEAD
+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 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 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
 
-ok 8 - reflog of worktrees/xx/HEAD
+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 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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-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
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1416-ref-transaction-hooks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-[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 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
 
-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 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
 
-HEAD is now at 63ac8e7 PRE
-ok 2 - hook allows updating ref if successful
+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
 
-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
+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
 
-HEAD is now at 63ac8e7 PRE
-fatal: ref updates aborted by hook
-ok 3 - hook aborts updating ref in prepared state
+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
 
-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 HEAD
-		$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
+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
 
-HEAD is now at 63ac8e7 PRE
-ok 4 - hook gets all queued updates in prepared state
+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
 
-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 HEAD
-		$ZERO_OID $POST_OID refs/heads/main
-	EOF
-	git update-ref HEAD POST &&
-	test_cmp expect actual
+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 63ac8e7 PRE
-ok 5 - hook gets all queued updates in committed state
+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 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
+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
 
-HEAD is now at 63ac8e7 PRE
-start: ok
-abort: ok
-ok 6 - hook gets all queued updates in aborted state
+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
 
-expecting success of 1416.7 'interleaving hook calls succeed': 
-	test_when_finished "rm -r target-repo.git" &&
+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
 
-	git init --bare target-repo.git &&
+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
 
-	test_hook -C target-repo.git reference-transaction <<-\EOF &&
-		echo $0 "$@" >>actual
-	EOF
+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_hook -C target-repo.git update <<-\EOF &&
-		echo $0 "$@" >>actual
-	EOF
+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
 
-	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 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
 
-	git push ./target-repo.git PRE POST &&
-	test_cmp expect target-repo.git/actual
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1418-reflog-exists.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1418-reflog-exists/.git/
-expecting success of 1418.1 'setup': 
-	test_commit A
+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
 
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-ok 1 - setup
+expecting success of 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 1418.2 'usage': 
-	test_expect_code 129 git reflog exists &&
-	test_expect_code 129 git reflog exists -h
+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
 
-usage: git reflog exists <ref>
+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
 
-usage: git reflog exists <ref>
+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
 
-ok 2 - usage
+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 1418.3 'usage: unknown option': 
-	test_expect_code 129 git reflog exists --unknown-option
+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
 
-error: unknown option `unknown-option'
-usage: git reflog exists <ref>
+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
 
-ok 3 - usage: unknown option
+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 1418.4 'reflog exists works': 
-	git reflog exists refs/heads/main &&
-	test_must_fail git reflog exists refs/heads/nonexistent
+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
 
-ok 4 - reflog exists works
+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 1418.5 'reflog exists works with a "--" delimiter': 
-	git reflog exists -- refs/heads/main &&
-	test_must_fail git reflog exists -- refs/heads/nonexistent
+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
 
-ok 5 - reflog exists works with a "--" delimiter
+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 1418.6 'reflog exists works with a "--end-of-options" delimiter': 
-	git reflog exists --end-of-options refs/heads/main &&
-	test_must_fail git reflog exists --end-of-options refs/heads/nonexistent
+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
 
-ok 6 - reflog exists works with a "--end-of-options" delimiter
+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
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1410-reflog.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-	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 &&
+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_chmod +x C &&
-	git add C &&
-	test_tick && git commit -m dragon &&
-	L=$(git rev-parse --verify HEAD) &&
-	check_fsck &&
+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
 
-	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 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
 
-	rm -f A/G &&
-	test_tick && git commit -a -m monkey &&
-	K=$(git rev-parse --verify HEAD) &&
-	check_fsck &&
+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
 
-	check_have A B C D E F G H I J K L &&
+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 
 
-	git prune &&
+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 
 
-	check_have A B C D E F G H I J K L &&
+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 
 
-	check_fsck &&
+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 
 
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
+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 
 
-[main (root-commit) 07fcc4f] rabbit
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 A/B/E
- create mode 100644 A/D
- create mode 100644 C
-[main 7d1a0b8] dragon
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 C
-[main 15ab5f0] sheep
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+), 2 deletions(-)
- delete mode 100644 A/B/E
- create mode 100644 A/G
- delete mode 100755 C
- create mode 100644 F
-[main 3ac530f] monkey
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 A/G
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-tree
-tree
-blob
-blob
-blob
-blob
-blob
-commit
-tree
-commit
-commit
-commit
-ok 1 - setup
-
-expecting success of 1410.2 'correct usage on sub-command -h': 
-	test_expect_code 129 git reflog expire -h >err &&
-	grep "git reflog expire" err
+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=
 
-usage: git reflog expire [--expire=<time>] [--expire-unreachable=<time>]
-ok 2 - correct usage on sub-command -h
+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
 
-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 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
 
-usage: git reflog [show] [<log-options>] [<ref>]
-ok 3 - correct usage on "git reflog show -h"
+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 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 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
 
-	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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-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 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
 
-	check_have A B C D E F G H I J K L &&
+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
 
-	git prune &&
+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
 
-	check_have A B C D E F G H I J K L &&
+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
 
-	git reflog refs/heads/main >output &&
-	test_line_count = 5 output
+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 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 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 1410.6 'corrupt and check': 
+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
 
-	corrupt $F &&
-	check_fsck "missing blob $F"
+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
 
+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
 
-missing blob 9ae84adb2704cbd49549e52169b4043871e13432
-ok 6 - corrupt and check
+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
 
-expecting success of 1410.7 'reflog expire --dry-run should not touch reflog': 
+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
 
-	git reflog expire --dry-run \
-		--expire=$(($test_tick - 10000)) \
-		--expire-unreachable=$(($test_tick - 10000)) \
-		--stale-fix \
-		--all &&
+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
 
-	git reflog refs/heads/main >output &&
-	test_line_count = 5 output &&
+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 
 
-	check_fsck "missing blob $F"
+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 
 
-missing blob 9ae84adb2704cbd49549e52169b4043871e13432
-ok 7 - reflog expire --dry-run should not touch reflog
+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 1410.8 'reflog expire': 
+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 
 
-	git reflog expire --verbose \
-		--expire=$(($test_tick - 10000)) \
-		--expire-unreachable=$(($test_tick - 10000)) \
-		--stale-fix \
-		--all &&
+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 
 
-	git reflog refs/heads/main >output &&
-	test_line_count = 2 output &&
+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=
 
-	check_fsck "dangling commit $K"
+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
 
-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 8 - reflog expire
+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 1410.9 '--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 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
 
-	parent_oid=$(git rev-parse stale-fix^) &&
-	test_when_finished "recover $parent_oid" &&
-	corrupt $parent_oid &&
-	git reflog expire --stale-fix
+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
 
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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 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
 
-ok 9 - --stale-fix handles missing objects generously
+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 1410.10 'prune and fsck': 
+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
 
-	git prune &&
-	check_fsck &&
+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
 
-	check_have A B C D E H L &&
-	check_dont_have F G I J K
+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
 
+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
 
-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 10 - prune and fsck
+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 1410.11 'recover and check': 
+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
 
-	recover $F &&
-	check_fsck "dangling blob $F"
+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
 
+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
 
-dangling blob 9ae84adb2704cbd49549e52169b4043871e13432
-ok 11 - recover and check
+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 1410.12 'delete': 
-	echo 1 > C &&
-	test_tick &&
-	git commit -m rat C &&
+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
 
-	echo 2 > C &&
-	test_tick &&
-	git commit -m ox C &&
+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
 
-	echo 3 > C &&
-	test_tick &&
-	git commit -m tiger C &&
+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
 
-	HEAD_entry_count=$(git reflog | wc -l) &&
-	main_entry_count=$(git reflog show main | wc -l) &&
+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 
 
-	test $HEAD_entry_count = 5 &&
-	test $main_entry_count = 5 &&
+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 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 
 
-	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 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 
 
-	main_entry_count=$(wc -l < output) &&
+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 
 
-	git reflog delete HEAD@{1} &&
-	test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
-	test $main_entry_count = $(git reflog show main | wc -l) &&
+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=
 
-	HEAD_entry_count=$(git reflog | wc -l) &&
+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
 
-	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 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 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
 
-[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 12 - delete
+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 1410.13 'rewind2': 
+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
 
-	test_tick && git reset --hard HEAD~2 &&
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
+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
 
-HEAD is now at f392752 rat
-ok 13 - rewind2
+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 
 
-expecting success of 1410.14 '--expire=never': 
+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 reflog expire --verbose \
-		--expire=never \
-		--expire-unreachable=never \
-		--all &&
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
+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 
 
-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 14 - --expire=never
+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 
 
-expecting success of 1410.15 'gc.reflogexpire=never': 
-	test_config gc.reflogexpire never &&
-	test_config gc.reflogexpireunreachable never &&
+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 
 
-	git reflog expire --verbose --all >output &&
-	test_line_count = 9 output &&
+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=
 
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
+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
 
-ok 15 - gc.reflogexpire=never
+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 1410.16 'gc.reflogexpire=false': 
-	test_config gc.reflogexpire false &&
-	test_config gc.reflogexpireunreachable false &&
+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
 
-	git reflog expire --verbose --all &&
-	git reflog refs/heads/main >output &&
-	test_line_count = 4 output
+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 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
 
-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 16 - gc.reflogexpire=false
+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 1410.17 'git reflog expire unknown reference': 
-	test_config gc.reflogexpire never &&
-	test_config gc.reflogexpireunreachable never &&
+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 
 
-	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 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 
 
-error: main@{123} points nowhere!
-error: does-not-exist points nowhere!
-ok 17 - git reflog expire unknown reference
+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 
 
-expecting success of 1410.18 '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 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 
 
-Switched to branch 'foo'
-ok 18 - checkout should not delete log for packed ref
+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 1410.19 '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 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 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 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
 
-	# 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 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
 
-Deleted branch one/two (was f392752).
-Deleted branch one (was f392752).
-ok 19 - stale dirs do not cause d/f conflicts (reflogs on)
+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
 
-expecting success of 1410.20 '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 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
 
-	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 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
 
-	# 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
+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
 
-Deleted branch one/two (was f392752).
-Deleted branch one (was f392752).
-ok 20 - stale dirs do not cause d/f conflicts (reflogs off)
+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 
 
-expecting success of 1410.21 '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 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 
 
-f392752 refs/tests/tree-in-reflog@{0}: Restoring to commit
-f392752 refs/tests/tree-in-reflog@{2}: Creating ref
-ok 21 - no segfaults for reflog containing non-commit sha1s
+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 
 
-checking known breakage of 1410.22 'reflog with non-commit entries displays all entries': 
-	git reflog refs/tests/tree-in-reflog >actual &&
-	test_line_count = 3 actual
+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 
 
-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 22 - reflog with non-commit entries displays all entries # TODO known breakage
+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 
 
-expecting success of 1410.23 '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
+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
-		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 &&
+		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=
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 23 - continue walking past root commits
+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 1410.24 '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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 24 - expire with multiple worktrees
+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
 
-expecting success of 1410.25 '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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 25 - expire one of multiple worktrees
+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 1410.26 '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
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 26 - empty reflog
+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
 
-expecting success of 1410.27 '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 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_commit A &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/main
-		EOF
-		git reflog list >actual &&
-		test_cmp expect actual &&
+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
 
-		git branch b &&
-		cat >expect <<-EOF &&
-		HEAD
-		refs/heads/b
-		refs/heads/main
+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
+
+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 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 reflog list >actual &&
+		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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 27 - list reflogs
+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 1410.28 'list reflogs with worktree': 
-	test_when_finished "rm -rf repo" &&
-	git init repo &&
-	(
-		cd repo &&
+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
 
-		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 &&
+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
 
-		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 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
 
-		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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 28 - list reflogs with worktree
+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
 
-expecting success of 1410.29 '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 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
 
-ok 29 - reflog list returns error with additional args
+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
 
-expecting success of 1410.30 '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
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 30 - reflog for symref with unborn target can be listed
+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
 
-expecting success of 1410.31 '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
+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 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 reflog list >actual &&
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
 		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 with invalid object ID can be listed
+	
+ok 1526 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=lf
 
-# still have 1 known breakage(s)
-# passed all remaining 30 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1420-lost-found.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1420-lost-found/.git/
-expecting success of 1420.1 'setup': 
-	git config core.logAllRefUpdates 0 &&
-	: > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m initial &&
-	echo 1 > file1 &&
-	echo 2 > file2 &&
-	git add file1 file2 &&
-	test_tick &&
-	git commit -m second &&
-	echo 3 > file3 &&
-	git add file3
+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
 
-[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 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
 
-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 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
 
-HEAD is now at 9bb1ae9 initial
-dangling blob 00750edc07d6415dcc07ae0351e9397b0222b7ba
-dangling commit 8ad33beea8de8e15812274614acd0a26d73b60f8
-ok 2 - lost and found something
+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
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1419-exclude-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-	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 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
 
-	git update-ref --stdin <in &&
-	git pack-refs --all
+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
 
-[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 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
 
-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 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
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+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
 
-ok 2 - excluded region in middle
+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
 
-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 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
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+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
 
-ok 3 - excluded region at beginning
+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 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 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
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+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
 
-ok 4 - excluded region at end
+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
 
-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 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
 
-	test_cmp expect actual &&
-	assert_jumps 2 perf
+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
 
-ok 5 - disjoint excluded regions
+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 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 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
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+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
 
-ok 6 - adjacent, non-overlapping excluded regions
+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
 
-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 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
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+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
 
-ok 7 - overlapping excluded regions
+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 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 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
 
-	test_cmp expect actual &&
-	assert_jumps 1 perf
+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
 
-ok 8 - several overlapping excluded regions
+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
 
-expecting success of 1419.9 '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 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
 
-	test_cmp expect actual &&
-	assert_no_jumps perf
+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
 
-ok 9 - non-matching excluded section
+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 1419.10 'meta-characters are discarded': 
-	for_each_ref__exclude refs/heads "refs/heads/ba*" >actual 2>perf &&
-	for_each_ref >expect &&
+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
 
-	test_cmp expect actual &&
-	assert_no_jumps perf
+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
 
-ok 10 - meta-characters are discarded
+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
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1400-update-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 -
+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
 
-Switched to a new branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1400-update-ref/bare-repo/
-/build/reproducible-path/git-2.45.2/t/trash directory.t1400-update-ref
-ok 1 - setup
+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
 
-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 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
 
-ok 2 - create refs/heads/main
+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
 
-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)
+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
 
-ok 3 - create refs/heads/main with oldvalue verification
+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 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)"
+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
 
-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 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
 
-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 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
 
-ok 5 - delete refs/heads/main
+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 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 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
 
-ok 6 - delete refs/heads/main without oldvalue verification
+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 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 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
 
-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 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 1400.8 'create refs/heads/main (by HEAD)': 
-	git update-ref HEAD $A &&
-	test $A = $(git show-ref -s --verify $m)
+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
 
-ok 8 - create refs/heads/main (by HEAD)
+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
 
-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 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
 
-ok 9 - create refs/heads/main (by HEAD) with oldvalue verification
+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
 
-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 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
 
-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 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
 
-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
+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
 
-ok 11 - delete refs/heads/main (by HEAD)
+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
 
-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 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
 
-102939797ab91a4f201d131418d2c9d919dcdd2c 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 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
 
-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 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
 
-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 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
 
-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 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
 
-ok 14 - update-ref does not create reflogs by default
+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
 
-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 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
 
-ok 15 - update-ref creates reflogs with --create-reflog
+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
 
-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 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
 
-ok 16 - creates no reflog in bare repository
+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 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 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
 
-ok 17 - core.logAllRefUpdates=true creates reflog in bare repository
+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 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 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
 
-ok 18 - core.logAllRefUpdates=true does not create reflog by default
+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
 
-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 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
 
-ok 19 - core.logAllRefUpdates=always creates reflog by default
+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
 
-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 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
 
-ok 20 - core.logAllRefUpdates=always creates reflog for ORIG_HEAD
+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
 
-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 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
 
-ok 21 - --no-create-reflog overrides core.logAllRefUpdates=always
+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
 
-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 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
 
-ok 22 - create refs/heads/main (by HEAD)
+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 1400.23 'pack refs': 
-	git pack-refs --all
+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
 
-ok 23 - pack refs
+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 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 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
 
-ok 24 - move refs/heads/main (by HEAD)
+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 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 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
 
-ok 25 - delete refs/heads/main (by HEAD) should remove both packed and loose refs/heads/main
+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
 
-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 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
 
-[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 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
 
-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 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
 
-[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 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 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 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
 
-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
+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 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 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
 
-refs/heads/self
-ok 29 - update-ref --no-deref -d can delete self-reference
+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 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 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
 
-refs/heads/bad
-ok 30 - update-ref --no-deref -d can delete reference to bad ref
+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 1400.31 '(not) create HEAD with old sha1': 
-	test_must_fail git update-ref HEAD $A $B
+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
 
-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
+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 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
+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
 
-ok 32 - (not) prior created .git/refs/heads/main
+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 1400.33 'create HEAD': 
-	git update-ref HEAD $A
+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
 
-ok 33 - create HEAD
+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 1400.34 '(not) change HEAD with wrong SHA1': 
-	test_must_fail git update-ref HEAD $B $Z
+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
 
-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 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 1400.35 '(not) changed .git/refs/heads/main': 
-	test_when_finished "git update-ref -d $m" &&
-	! test $B = $(git show-ref -s --verify $m)
+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
 
-ok 35 - (not) changed .git/refs/heads/main
+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 1400.36 'clean up reflog': 
-	test-tool ref-store main delete-reflog $m
+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
 
-ok 36 - clean up reflog
+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 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 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
 
-ok 37 - create refs/heads/main (logged by touch)
+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 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 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
 
-ok 38 - update refs/heads/main (logged by touch)
+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 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 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
 
-ok 39 - set refs/heads/main (logged by touch)
+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 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 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
 
-ok 40 - verifying refs/heads/main's log (logged by touch)
+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 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)
+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
 
-ok 41 - create refs/heads/main (logged by config)
+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 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 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
 
-ok 42 - update refs/heads/main (logged by config)
+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
 
-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 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
 
-ok 43 - set refs/heads/main (logged by config)
+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 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 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
 
-ok 44 - verifying refs/heads/main's log (logged by config)
+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 1400.45 'set up for querying the reflog': 
-	git update-ref -d $m &&
-	test-tool ref-store main delete-reflog $m &&
+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
 
-	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} &&
+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
 
-	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 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
 
-ok 45 - set up for querying the reflog
+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 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 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
 
-ok 46 - Query "main@{May 25 2005}" (before history)
+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 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 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
 
-ok 47 - Query main@{2005-05-25} (before history)
+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
 
-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 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
 
-ok 48 - Query "main@{May 26 2005 23:31:59}" (1 second before history)
+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 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 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
 
-ok 49 - Query "main@{May 26 2005 23:32:00}" (exactly history start)
+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
 
-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 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
 
-ok 50 - Query "main@{May 26 2005 23:32:30}" (first non-creation change)
+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
 
-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 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
 
-ok 51 - Query "main@{2005-05-26 23:33:01}" (middle of history with gap)
+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 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 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
 
-ok 52 - Query "main@{2005-05-26 23:38:00}" (middle of history)
+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 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 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
 
-ok 53 - Query "main@{2005-05-26 23:43:00}" (exact end of history)
+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
 
-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 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
 
-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)
+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
 
-expecting success of 1400.55 'query reflog with gap': 
-	test_when_finished "git update-ref -d $m" &&
+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
 
-	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} &&
+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
 
-	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 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
 
-warning: log for ref refs/heads/main has gap after Thu, 26 May 2005 18:33:00 -0500
-ok 55 - query reflog with gap
+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 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 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
 
-[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
+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 1400.57 'git commit logged updates': 
-	test-tool ref-store main for-each-reflog-ent $m >actual &&
-	test_cmp expect actual
+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
 
-ok 57 - git commit logged updates
+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 1400.58 'git cat-file blob main:F (expect OTHER)': 
-	test OTHER = $(git cat-file blob main:F)
+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
 
-ok 58 - git cat-file blob main:F (expect OTHER)
+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
 
-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 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
 
-ok 59 - git cat-file blob main@{2005-05-26 23:30}:F (expect TEST)
+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
 
-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 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
 
-ok 60 - git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)
+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
 
-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 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
 
-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 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
 
-expecting success of 1400.62 'create pseudoref': 
-	git update-ref PSEUDOREF $A &&
-	test $A = $(git show-ref -s --verify PSEUDOREF)
+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
 
-ok 62 - create pseudoref
+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 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 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
 
-ok 63 - overwrite pseudoref with no old value given
+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 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 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
 
-ok 64 - overwrite pseudoref with correct old value
+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
 
-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 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
 
-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 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
 
-expecting success of 1400.66 'delete pseudoref': 
-	git update-ref -d PSEUDOREF &&
-	test_must_fail git show-ref -s --verify PSEUDOREF
+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
 
-fatal: 'PSEUDOREF' - not a valid ref
-ok 66 - delete pseudoref
+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
 
-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 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
 
-error: cannot lock ref 'PSEUDOREF': is at 102939797ab91a4f201d131418d2c9d919dcdd2c but expected 56d5c1374e8028a1e122ab046ab7b98165342dc4
-ok 67 - do not delete pseudoref with wrong old value
+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
 
-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
+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
 
-fatal: 'PSEUDOREF' - not a valid ref
-ok 68 - delete pseudoref with correct old value
+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 1400.69 'create pseudoref with old OID zero': 
-	git update-ref PSEUDOREF $A $Z &&
-	test $A = $(git show-ref -s --verify PSEUDOREF)
+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
 
-ok 69 - create pseudoref with old OID zero
+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 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 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
 
-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 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 1400.71 'stdin test setup': 
-	echo "$pws" >"$pws" &&
-	git add -- "$pws" &&
-	git commit -m "$pws"
+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
 
-[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
+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
 
-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 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
 
-usage: git update-ref [<options>] -d <refname> [<old-oid>]
-ok 72 - -z fails without --stdin
+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
 
-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 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
 
-536da9bc9e8e6d0baf01b41cf3cc49bb819559e6
-ok 73 - stdin works with no input
+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
 
-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 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
 
-fatal: empty command in input
-ok 74 - stdin fails on empty line
+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 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 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
 
-fatal: whitespace before command:  
-ok 75 - stdin fails on only whitespace
+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 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 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
 
-fatal: whitespace before command:  create refs/heads/a refs/heads/main
-ok 76 - stdin fails on leading whitespace
+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 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 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
 
-fatal: unknown command: unknown refs/heads/a
-ok 77 - stdin fails on unknown command
+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 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 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
 
-fatal: badly quoted argument: "main
-ok 78 - stdin fails on unbalanced quotes
+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 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 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
 
-fatal: badly quoted argument: "ma\zn"
-ok 79 - stdin fails on invalid escape
+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 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 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
 
-fatal: unexpected character after quoted argument: "refs/heads/a"main
-ok 80 - stdin fails on junk after quoted argument
+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 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 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
 
-fatal: create: missing <ref>
-ok 81 - stdin fails create with no ref
+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 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 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
 
-fatal: create refs/heads/a: missing <new-oid>
-ok 82 - stdin fails create with no new value
+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
 
-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 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
 
-fatal: create refs/heads/a: extra input:  refs/heads/main
-ok 83 - stdin fails create with too many arguments
+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
 
-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 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
 
-fatal: update: missing <ref>
-ok 84 - stdin fails update with no ref
+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
 
-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 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
 
-fatal: update refs/heads/a: missing <new-oid>
-ok 85 - stdin fails update with no new value
+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
 
-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 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
 
-fatal: update refs/heads/a: extra input:  refs/heads/main
-ok 86 - stdin fails update with too many arguments
+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 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 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
 
-fatal: delete: missing <ref>
-ok 87 - stdin fails delete with no ref
+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 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 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
 
-fatal: delete refs/heads/a: extra input:  refs/heads/main
-ok 88 - stdin fails delete with too many arguments
+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
 
-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 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
 
-fatal: verify refs/heads/a: extra input:  refs/heads/main
-ok 89 - stdin fails verify with too many arguments
+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
 
-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 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
 
-fatal: option unknown: unknown
-ok 90 - stdin fails option with unknown name
+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
 
-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 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
 
-fatal: multiple updates for ref 'refs/heads/a' not allowed
-ok 91 - stdin fails with duplicate refs
+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
 
-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 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
 
-ok 92 - stdin create ref works
+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 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 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
 
-ok 93 - stdin does not create reflogs by default
+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 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 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
 
-ok 94 - stdin creates reflogs with --create-reflog
+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
 
-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 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
 
-ok 95 - stdin succeeds with quoted argument
+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
 
-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 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
 
-ok 96 - stdin succeeds with escaped character
+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 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 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
 
-ok 97 - stdin update ref creates with zero old value
+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
 
-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 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
 
-ok 98 - stdin update ref creates with empty old value
+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 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 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
 
-ok 99 - stdin create ref works with path with space to blob
+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 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 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
 
-fatal: cannot lock ref 'refs/heads/c': unable to resolve reference 'refs/heads/c'
-ok 100 - stdin update ref fails with wrong old value
+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
 
-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 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
 
-fatal: update refs/heads/c: invalid <old-oid>: does-not-exist
-ok 101 - stdin update ref fails with bad old value
+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
 
-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 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
 
-fatal: create refs/heads/c: invalid <new-oid>: does-not-exist
-ok 102 - stdin create ref fails with bad new value
+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
 
-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 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
 
-fatal: create refs/heads/c: zero <new-oid>
-ok 103 - stdin create ref fails with zero new value
+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 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 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
 
-ok 104 - stdin update ref works with right old value
+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 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 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
 
-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 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 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 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
 
-fatal: delete refs/heads/a: zero <old-oid>
-ok 106 - stdin delete ref fails with zero old value
+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
 
-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 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
 
-ok 107 - stdin update symref works option no-deref
+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
 
-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 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
 
-ok 108 - stdin delete symref works option no-deref
+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 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 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
 
-ok 109 - stdin update symref works flag --no-deref
+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
 
-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 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
 
-ok 110 - stdin delete symref works flag --no-deref
+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 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 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
 
-ok 111 - stdin delete ref works with right old value
+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 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 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
 
-ok 112 - stdin update/create/verify combination works
+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 1400.113 'stdin verify succeeds for correct value': 
-	git rev-parse $m >expect &&
-	echo "verify $m $m" >stdin &&
-	git update-ref --stdin <stdin &&
-	git rev-parse $m >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
 
-ok 113 - stdin verify succeeds for correct value
+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
 
-expecting success of 1400.114 'stdin verify succeeds for missing reference': 
-	echo "verify refs/heads/missing $Z" >stdin &&
-	git update-ref --stdin <stdin &&
-	test_must_fail git rev-parse --verify -q refs/heads/missing
+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
 
-ok 114 - stdin verify succeeds for missing reference
+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 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 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
 
-ok 115 - stdin verify treats no value as missing
+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
 
-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 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
 
-fatal: cannot lock ref 'refs/heads/main': is at 536da9bc9e8e6d0baf01b41cf3cc49bb819559e6 but expected 29d1ccdc7ee9fe415beb2415b6206b8a20f76b1c
-ok 116 - stdin verify fails for wrong value
+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 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 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
 
-fatal: cannot lock ref 'refs/heads/main': reference already exists
-ok 117 - stdin verify fails for mistaken null value
+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 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 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
 
-fatal: cannot lock ref 'refs/heads/main': reference already exists
-ok 118 - stdin verify fails for mistaken empty value
+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
 
-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
+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
 
-ok 119 - stdin update refs works with identity updates
+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
 
-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
+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
 
-fatal: cannot lock ref 'refs/heads/c': reference already exists
-ok 120 - stdin update refs fails with wrong old value
+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
 
-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 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
 
-ok 121 - stdin delete refs works with packed and loose refs
+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 1400.122 'stdin -z works on empty input': 
-	>stdin &&
-	git update-ref -z --stdin <stdin &&
-	git rev-parse --verify -q $m
+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
 
-536da9bc9e8e6d0baf01b41cf3cc49bb819559e6
-ok 122 - stdin -z works on empty 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 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 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
 
-fatal: whitespace before command: 
-ok 123 - stdin -z fails on empty line
+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 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 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
 
-fatal: empty command in input
-ok 124 - stdin -z fails on empty command
+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
 
-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 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
 
-fatal: whitespace before command:  
-ok 125 - stdin -z fails on only whitespace
+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
 
-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
+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
 
-fatal: whitespace before command:  create refs/heads/a
-ok 126 - stdin -z fails on leading whitespace
+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 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
+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
 
-fatal: unknown command: unknown refs/heads/a
-ok 127 - stdin -z fails on unknown command
+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
 
-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
+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
 
-fatal: create: missing <ref>
-ok 128 - stdin -z fails create with no ref
+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 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 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
 
-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 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 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
+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
 
-fatal: unknown command: refs/heads/main
-ok 130 - stdin -z fails create with too many arguments
+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 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
+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
 
-fatal: update: missing <ref>
-ok 131 - stdin -z fails update with no ref
+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
 
-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 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
 
-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 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 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
+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: update refs/heads/a: missing <new-oid>, treating as zero
-ok 133 - stdin -z emits warning with empty new value
+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
 
-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
+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
 
-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 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 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 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
 
-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 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 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
+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
 
-fatal: unknown command: refs/heads/main
-ok 136 - stdin -z fails update with too many arguments
+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 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
+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
 
-fatal: delete: missing <ref>
-ok 137 - stdin -z fails delete with no ref
+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
 
-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 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
 
-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 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
 
-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
+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
 
-fatal: unknown command: refs/heads/main
-ok 139 - stdin -z fails delete with too many arguments
+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 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
+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
 
-fatal: unknown command: refs/heads/main
-ok 140 - stdin -z fails verify with too many arguments
+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 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 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
 
-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 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 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
+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
 
-fatal: option unknown: unknown
-ok 142 - stdin -z fails option with unknown name
+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
 
-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
+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
 
-fatal: multiple updates for ref 'refs/heads/a' not allowed
-ok 143 - stdin -z fails with duplicate refs
+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 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 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
 
-ok 144 - stdin -z create ref works
+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 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
+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
 
-ok 145 - stdin -z update ref creates with zero old value
+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
 
-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
+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
 
-ok 146 - stdin -z update ref creates with empty old value
+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
 
-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 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
 
-ok 147 - stdin -z create ref works with path with space to blob
+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 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
+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
 
-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 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 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
+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
 
-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 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
 
-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 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
 
-fatal: cannot lock ref 'refs/heads/c': reference already exists
-ok 150 - stdin -z create ref fails when ref exists
+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 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
+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
 
-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 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 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
+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
 
-fatal: create refs/heads/c: missing <new-oid>
-ok 152 - stdin -z create ref fails with empty new value
+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 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 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
 
-ok 153 - stdin -z update ref works with right old value
+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 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
+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
 
-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 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 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
+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
 
-fatal: delete refs/heads/a: zero <old-oid>
-ok 155 - stdin -z delete ref fails with zero old value
+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
 
-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 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
 
-ok 156 - stdin -z update symref works option no-deref
+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
 
-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
+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
 
-ok 157 - stdin -z delete symref works option no-deref
+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
 
-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
+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
 
-ok 158 - stdin -z delete ref works with right old value
+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 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 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
 
-ok 159 - stdin -z update/create/verify combination works
+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 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
+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
 
-ok 160 - stdin -z verify succeeds for correct value
+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 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
+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
 
-ok 161 - stdin -z verify succeeds for missing reference
+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
 
-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 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
 
-ok 162 - stdin -z verify treats no value as missing
+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
 
-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
+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
 
-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 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
 
-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
+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
 
-fatal: cannot lock ref 'refs/heads/main': reference already exists
-ok 164 - stdin -z verify fails for mistaken null value
+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 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 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
 
-fatal: cannot lock ref 'refs/heads/main': reference already exists
-ok 165 - stdin -z verify fails for mistaken empty value
+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 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
+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
 
-ok 166 - stdin -z update refs works with identity updates
+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 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
+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
 
-fatal: cannot lock ref 'refs/heads/c': reference already exists
-ok 167 - stdin -z update refs fails with wrong old value
+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 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 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
 
-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 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 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
+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
 
-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 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 1400.170 'fails with duplicate ref update via symref': 
-	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
+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
 
-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
+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
 
-checking prerequisite: ULIMIT_FILE_DESCRIPTORS
+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
 
-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
+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
 
-)
-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
-)
+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
 
-102939797ab91a4f201d131418d2c9d919dcdd2c
-ok 171 - large transaction creating branches does not burst open file limit
+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 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
-)
+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
 
-ok 172 - large transaction deleting branches does not burst open file limit
+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
 
-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 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
 
-[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-12-18 01:32:59.418773267 +0000
-+++ worktree-head	2025-12-18 01:32:59.314773267 +0000
-@@ -1 +1 @@
--58a052250c09f010b95ad9bfe32f35d704eda1a0
-+b62e0cb4990da3244885da90fe7d493334cca9f5
-ok 173 - handle per-worktree refs in refs/bisect
+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 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
+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
 
-ok 174 - transaction handles empty commit
+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 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
+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
 
-ok 175 - transaction handles empty commit with missing prepare
+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 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 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
 
-ok 176 - transaction handles sole commit
+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 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
+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
 
-ok 177 - transaction handles empty abort
+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 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
+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
 
-fatal: transaction is closed
-ok 178 - transaction exits on multiple aborts
+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
 
-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 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
 
-fatal: prepared transactions can only be closed
-ok 179 - transaction exits on start after prepare
+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 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
+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
 
-ok 180 - transaction handles empty abort with missing prepare
+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
 
-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
+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
 
-ok 181 - transaction handles sole abort
+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 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 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
 
-ok 182 - transaction can handle commit
+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 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
+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
 
-ok 183 - transaction can handle abort
+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 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
+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
 
-ok 184 - transaction aborts by default
+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
 
-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 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
 
-ok 185 - transaction with prepare aborts by default
+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
 
-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
+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
 
-ok 186 - transaction can commit multiple times
+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 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
+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
 
-fatal: 'refs/heads/create-and-delete' - not a valid ref
-ok 187 - transaction can create and delete
+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 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 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
 
-ok 188 - transaction can commit after abort
+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 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
+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
 
-fatal: cannot restart ongoing transaction
-fatal: 'refs/heads/restart' - not a valid ref
-ok 189 - transaction cannot restart ongoing transaction
+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
 
-checking prerequisite: PIPE
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
-	# test whether the filesystem supports FIFOs
-	test_have_prereq !MINGW,!CYGWIN &&
-	rm -f testfifo && mkfifo testfifo
+expecting success of 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
 
-)
-prerequisite PIPE ok
-expecting success of 1400.190 'transaction flushes status updates': 
-	mkfifo in out &&
-	(git update-ref --stdin <in >out &) &&
+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
 
-	exec 9>in &&
-	exec 8<out &&
-	test_when_finished "exec 9>&-" &&
-	test_when_finished "exec 8<&-" &&
+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
 
-	echo "start" >&9 &&
-	echo "start: ok" >expected &&
-	read line <&8 &&
-	echo "$line" >actual &&
-	test_cmp expected actual &&
+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
 
-	echo "create refs/heads/flush $A" >&9 &&
+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
 
-	echo prepare >&9 &&
-	echo "prepare: ok" >expected &&
-	read line <&8 &&
-	echo "$line" >actual &&
-	test_cmp expected actual &&
+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
 
-	# 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 &&
+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
 
-	echo commit >&9 &&
-	echo "commit: ok" >expected &&
-	read line <&8 &&
-	echo "$line" >actual &&
-	test_cmp expected actual
+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
 
-fatal: update_ref failed for ref 'refs/heads/flush': cannot lock ref 'refs/heads/flush': Unable to create '/build/reproducible-path/git-2.45.2/t/trash directory.t1400-update-ref/.git/refs/heads/flush.lock': File exists.
-ok 190 - transaction flushes status updates
+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
 
-# passed all 190 test(s)
-1..190
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1417-reflog-updateref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1417-reflog-updateref/.git/
-expecting success of 1417.1 'setup': 
-	git init -b main repo &&
-	(
-		cd repo &&
+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
 
-		test_commit A &&
-		test_commit B &&
-		test_commit C &&
+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
 
-		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 &&
+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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1417-reflog-updateref/repo/.git/
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-HEAD is now at d9df450 B
-ok 1 - setup
-
-expecting success of 1417.2 'get 'B' with 'git reflog delete --updateref HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
-
-		(
-			cd copy &&
+	
+ok 1958 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=crlf
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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 2 - get 'B' with 'git reflog delete --updateref HEAD@{0}'
+ok 1960 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 1417.3 'get 'B' with 'git reflog delete --updateref HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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 3 - get 'B' with 'git reflog delete --updateref HEAD@{1}'
+ok 1964 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
 
-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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
-	
-ok 4 - get 'C' with 'git reflog delete --updateref main@{0}'
+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 1417.5 'get 'B' with 'git reflog delete --updateref main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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 5 - get 'B' with 'git reflog delete --updateref main@{1}'
+ok 1972 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 1417.6 'get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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 6 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{0}'
+ok 1976 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
 
-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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
-	
-ok 7 - get 'B' with 'git reflog delete --updateref --rewrite HEAD@{1}'
+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 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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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 8 - get 'C' with 'git reflog delete --updateref --rewrite main@{0}'
+ok 1984 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 1417.9 'get 'B' with 'git reflog delete --updateref --rewrite main@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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 9 - get 'B' with 'git reflog delete --updateref --rewrite main@{1}'
+ok 1988 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=false
 
-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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
-	
-error: HEAD@{0} points nowhere!
-ok 10 - get 'B' with 'test_must_fail git reflog expire HEAD@{0}'
+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 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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0027.1995 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 1995 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=LF
 
-			test_cmp expect actual
-		)
+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
 	
-error: HEAD@{1} points nowhere!
-ok 11 - get 'B' with 'test_must_fail git reflog expire HEAD@{1}'
+ok 1996 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=crlf file=CRLF
 
-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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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
 	
-error: main@{0} points nowhere!
-ok 12 - get 'B' with 'test_must_fail git reflog expire main@{0}'
+ok 2000 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=input
 
-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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0027.2003 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2003 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-			test_cmp expect actual
-		)
-	
-error: main@{1} points nowhere!
-ok 13 - get 'B' with 'test_must_fail git reflog expire main@{1}'
+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 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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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
 	
-error: HEAD@{0} points nowhere!
-ok 14 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{0}'
+ok 2008 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=crlf file=CRLF
 
-expecting success of 1417.15 'get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'': 
-		test_when_finished "rm -rf copy" &&
-		cp -R repo copy &&
+expecting success of 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+expecting success of 0027.2012 'setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
 	
-error: HEAD@{1} points nowhere!
-ok 15 - get 'B' with 'test_must_fail git reflog expire --updateref HEAD@{1}'
+ok 2012 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=input
 
-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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
-	
-error: main@{0} points nowhere!
-ok 16 - get 'B' with 'test_must_fail git reflog expire --updateref main@{0}'
+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 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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0027.2019 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2019 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF
 
-			test_cmp expect actual
-		)
+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
 	
-error: main@{1} points nowhere!
-ok 17 - get 'B' with 'test_must_fail git reflog expire --updateref main@{1}'
+ok 2020 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=crlf file=CRLF
 
-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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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
 	
-error: HEAD@{0} points nowhere!
-ok 18 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite HEAD@{0}'
+ok 2024 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=input
 
-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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			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 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 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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+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
 
-			test_cmp expect actual
-		)
+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
 	
-error: main@{0} points nowhere!
-ok 20 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{0}'
+ok 2032 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF
 
-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 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
 
-		(
-			cd copy &&
+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
 
-			$args &&
-			git rev-parse $exp >expect &&
-			git rev-parse HEAD >actual &&
+expecting success of 0027.2035 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2035 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
-			test_cmp expect actual
-		)
+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
 	
-error: main@{1} points nowhere!
-ok 21 - get 'B' with 'test_must_fail git reflog expire --updateref --rewrite main@{1}'
+ok 2036 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=input
 
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1430-bad-ref-name.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 1 - setup
+expecting success of 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 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 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
 
-		from refs/heads/main
+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
 
-	INPUT_END
-	test_must_fail git fast-import <input
+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
 
-fatal: Branch name doesn't conform to GIT standards: .badbranchname
-fast-import: dumping crash report to .git/fast_import_crash_17160
-ok 2 - fast-import: fail on invalid branch name ".badbranchname"
+expecting success of 0027.2042 'ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2042 - ls-files --eol attr=text ident aeol=lf core.autocrlf=input core.eol=crlf
 
-expecting success of 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 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
 
-		from refs/heads/main
+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
 
-	INPUT_END
-	test_must_fail git fast-import <input
+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
 
-fatal: Branch name doesn't conform to GIT standards: bad[branch]name
-fast-import: dumping crash report to .git/fast_import_crash_17258
-ok 3 - fast-import: fail on invalid branch name "bad[branch]name"
+expecting success of 0027.2046 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR': 
+		compare_ws_file eol_crlf_crlf_input_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2046 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=crlf file=LF_mix_CR
 
-expecting success of 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 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
 
-warning: ignoring ref with broken name refs/heads/broken...ref
-ok 4 - git branch shows badly named ref as warning
+expecting success of 0027.2048 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2048 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=input
 
-expecting success of 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 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
 
-Deleted branch broken...ref (was broken).
-ok 5 - branch -d can delete badly named ref
+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 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
+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
 
-Deleted branch broken...ref (was broken).
-ok 6 - branch -D can delete badly named ref
+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 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 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
 
-error: branch '../../my-private-file' not found
-ok 7 - branch -D cannot delete non-ref in .git dir
+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
 
-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 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
 
-error: branch 'foo////./././../../../my-private-file' not found
-ok 8 - branch -D cannot delete ref in .git dir
+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
 
-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
+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
 
-error: branch '/build/reproducible-path/git-2.45.2/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra' not found
-ok 9 - branch -D cannot delete absolute path
+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 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 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
 
-fatal: 'broken...ref' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config advice.refSyntax false"
-ok 10 - git branch cannot create a badly named ref
+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 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 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
 
-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 advice.refSyntax false"
-ok 11 - branch -m cannot rename to a bad ref name
+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
 
-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 &&
+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
 
-	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 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
 
-fatal: invalid branch name: 'broken...ref'
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config advice.refSyntax false"
-not ok 12 - branch -m can rename from a bad ref name # TODO known breakage
+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 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 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
 
-fatal: invalid refspec 'HEAD:refs/heads/broken...ref'
-ok 13 - push cannot create a badly named ref
+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
 
-checking known breakage of 1430.14 'push --mirror can delete badly named ref': 
-	top=$(pwd) &&
-	git init src &&
-	git init dest &&
+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
 
-	(
-		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
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1430-bad-ref-name/src/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-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 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
 
-warning: ignoring dangling symref refs/tags/shadow
-ok 15 - rev-parse skips symref pointing to broken name
+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
 
-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 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
 
-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 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 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 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
 
-ok 17 - update-ref -d can delete broken name
+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 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 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
 
-Deleted branch broken...ref (was broken).
-ok 18 - branch -d can delete broken name
+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 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 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
 
-	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
+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
 
-error: reference does not exist
-ok 19 - update-ref --no-deref -d can delete symref to broken name
+expecting success of 0027.2081 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2081 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 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 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
 
-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 0027.2083 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul': 
+		compare_ws_file eol_crlf_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2083 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=crlf file=LF_nul
 
-expecting success of 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 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
 
-error: reference does not exist
-ok 21 - update-ref --no-deref -d can delete dangling symref to broken name
+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 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 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
 
-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 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 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 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
 
-error: reference does not exist
-ok 23 - update-ref -d can delete broken name through symref
+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 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 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
 
-error: reference does not exist
-ok 24 - update-ref --no-deref -d can delete symref with broken name
+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
 
-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
+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
 
-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 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
 
-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 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
 
-error: reference does not exist
-ok 26 - update-ref --no-deref -d can delete dangling symref with broken name
+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
 
-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 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
 
-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 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 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 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
 
-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 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 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 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
 
-error: refusing to update ref with bad name '/build/reproducible-path/git-2.45.2/t/trash directory.t1430-bad-ref-name/.git/refs/heads/extra'
-ok 29 - update-ref -d cannot delete absolute path
+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 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 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
 
-fatal: invalid ref format: ~a
-ok 30 - update-ref --stdin fails create with bad ref name
+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
 
-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
+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
 
-fatal: invalid ref format: ~a
-ok 31 - update-ref --stdin fails update with bad ref name
+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
 
-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 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
 
-fatal: invalid ref format: ~a
-ok 32 - update-ref --stdin fails delete with bad ref name
+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
 
-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 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
 
-fatal: invalid ref format: ~a 
-ok 33 - update-ref --stdin -z fails create with bad ref name
+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
 
-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
+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
 
-fatal: invalid ref format: ~a
-ok 34 - update-ref --stdin -z fails update with bad ref name
+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
 
-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 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
 
-fatal: invalid ref format: ~a
-ok 35 - update-ref --stdin -z fails delete with bad ref name
+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 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 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
 
-fatal: 'HEAD' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config advice.refSyntax false"
-ok 36 - branch rejects HEAD as a branch name
+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
 
-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 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
 
-fatal: 'HEAD' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config advice.refSyntax false"
-ok 37 - checkout -b rejects HEAD as a branch name
+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
 
-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 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
 
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/HEAD
-ok 38 - update-ref can operate on refs/heads/HEAD
+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
 
-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 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
 
-Deleted branch HEAD (was d79ce16).
-ok 39 - branch -d can remove refs/heads/HEAD
+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
 
-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
+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
 
-warning: renamed a misnamed branch 'HEAD' away
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/tail
-ok 40 - branch -m can rename refs/heads/HEAD
+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 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 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
 
-Deleted branch -dash (was d79ce16).
-ok 41 - branch -d can remove refs/heads/-dash
+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 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 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: renamed a misnamed branch '-dash' away
-d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 refs/heads/dash
-ok 42 - branch -m can rename refs/heads/-dash
+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
 
-# still have 2 known breakage(s)
-# passed all remaining 40 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1501-work-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree/.git/
-expecting success of 1501.1 'setup': 
-	EMPTY_TREE=$(git write-tree) &&
-	EMPTY_BLOB=$(git hash-object -t blob --stdin </dev/null) &&
-	CHANGED_BLOB=$(echo changed | git hash-object -t blob --stdin) &&
-	EMPTY_BLOB7=$(echo $EMPTY_BLOB | sed "s/\(.......\).*/\1/") &&
-	CHANGED_BLOB7=$(echo $CHANGED_BLOB | sed "s/\(.......\).*/\1/") &&
+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
 
-	mkdir -p work/sub/dir &&
-	mkdir -p work2 &&
-	mv .git repo.git
+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
 
-ok 1 - setup
+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
 
-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 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
 
-		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 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
 
-		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 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
 
-ok 2 - setup: helper for testing rev-parse
+expecting success of 0027.2134 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2134 - setup CRLF checkout  with -c core.eol=crlf
 
-expecting success of 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 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
 
-ok 3 - setup: core.worktree = relative path
+expecting success of 0027.2136 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2136 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
 
-expecting success of 1501.4 'outside': 
-	test_rev_parse false false false
+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
 
-ok 4 - outside
+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 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 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
 
-'actual.prefix' is not empty, it contains:
+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
 
-ok 5 - inside work tree
+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 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 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
 
-ok 6 - empty prefix is actually written out
+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 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 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
 
-ok 7 - subdir of work tree
+expecting success of 0027.2145 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2145 - setup LF checkout  with -c core.eol=crlf
 
-expecting success of 1501.8 'setup: core.worktree = absolute path': 
-	sane_unset GIT_WORK_TREE &&
-	GIT_DIR=$(pwd)/repo.git &&
-	GIT_CONFIG=$GIT_DIR/config &&
-	export GIT_DIR GIT_CONFIG &&
-	git config core.worktree "$(pwd)/work"
+expecting success of 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
 
-ok 8 - setup: core.worktree = absolute path
+expecting success of 0027.2147 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2147 - setup LF_mix_CR checkout  with -c core.eol=crlf
 
-expecting success of 1501.9 'outside': 
-	test_rev_parse false false false &&
-	(
-		cd work2 &&
-		test_rev_parse false false false
-	)
+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
 
-ok 9 - outside
+expecting success of 0027.2149 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2149 - setup LF_nul checkout  with -c core.eol=crlf
 
-expecting success of 1501.10 'inside work tree': 
-	(
-		cd work &&
-		test_rev_parse false false true ""
-	)
+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
 
-'actual.prefix' is not empty, it contains:
+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
 
-ok 10 - inside work tree
+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
 
-expecting success of 1501.11 'subdir of work tree': 
-	(
-		cd work/sub/dir &&
-		test_rev_parse false false true sub/dir/
-	)
+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
 
-ok 11 - subdir of work tree
+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
 
-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 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
 
-ok 12 - setup: GIT_WORK_TREE=relative (override core.worktree)
+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 1501.13 'outside': 
-	test_rev_parse false false false &&
-	(
-		cd work2 &&
-		test_rev_parse false false false
-	)
+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
 
-ok 13 - outside
+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 1501.14 'inside work tree': 
-	(
-		cd work &&
-		GIT_WORK_TREE=. &&
-		test_rev_parse false false true ""
-	)
+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
 
-'actual.prefix' is not empty, it contains:
+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
 
-ok 14 - inside work tree
+expecting success of 0027.2161 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2161 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 1501.15 'subdir of work tree': 
-	(
-		cd work/sub/dir &&
-		GIT_WORK_TREE=../.. &&
-		test_rev_parse false false true sub/dir/
-	)
+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
 
-ok 15 - subdir of work tree
+expecting success of 0027.2163 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2163 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=LF
 
-expecting success of 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 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
 
-ok 16 - setup: GIT_WORK_TREE=absolute, below git dir
+expecting success of 0027.2165 'checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2165 - checkout attr=-text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 1501.17 'outside': 
-	echo outside &&
-	test_rev_parse false false 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
 
-outside
-ok 17 - outside
+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 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 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
 
-ok 18 - in repo.git
+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 1501.19 'inside work tree': 
-	(
-		cd repo.git/work &&
-		test_rev_parse false true true ""
-	)
+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
 
-'actual.prefix' is not empty, it contains:
+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
 
-ok 19 - inside work tree
+expecting success of 0027.2172 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2172 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 1501.20 'subdir of work tree': 
-	(
-		cd repo.git/work/sub/dir &&
-		test_rev_parse false true true sub/dir/
-	)
+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
 
-ok 20 - subdir of work tree
+expecting success of 0027.2174 'ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2174 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=true core.eol=native
 
-expecting success of 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 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
 
-ok 21 - find work tree from repo
+expecting success of 0027.2176 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2176 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 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 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
 
-ok 22 - find work tree from work tree
+expecting success of 0027.2178 'checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2178 - checkout attr=-text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 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 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
 
-		git diff --exit-code tracked &&
-		echo changed >tracked &&
-		test_must_fail git diff --exit-code tracked
-	)
+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
 
-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 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 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 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
 
-	(
-		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 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
 
-ok 24 - diff-index respects work tree under .git dir
+expecting success of 0027.2184 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2184 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-	(
-		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 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
 
-ok 25 - diff-files respects work tree under .git dir
+expecting success of 0027.2187 'checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_true_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2187 - checkout attr=-text ident aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-expecting success of 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
+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
 
-	(
-		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 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
 
-ok 26 - git diff respects work tree under .git dir
+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 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 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
 
-ok 27 - git grep
+expecting success of 0027.2192 'setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2192 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=true
 
-expecting success of 1501.28 'git commit': 
-	(
-		cd repo.git &&
-		GIT_DIR=. GIT_WORK_TREE=work git commit -a -m done
-	)
+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
 
-[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 0027.2194 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2194 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-fatal: /home: '/home' is outside repository at '/build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree/repo.git/work'
-ok 29 - absolute pathspec should fail gracefully
+expecting success of 0027.2196 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2196 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-git --git-dir=/build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree//repo.git --work-tree=/build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree add dummy_file
-ok 30 - make_relative_path handles double slashes in GIT_DIR
+expecting success of 0027.2198 'ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2198 - ls-files --eol attr=text ident aeol=lf core.autocrlf=true core.eol=native
 
-expecting success of 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 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
 
-ok 31 - relative $GIT_WORK_TREE and git subprocesses
+expecting success of 0027.2200 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2200 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 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 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
 
-cp: cannot stat 'repo.git/sharedindex.*': No such file or directory
-ok 32 - Multi-worktree setup
+expecting success of 0027.2202 'checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr_text_ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2202 - checkout attr=text ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 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 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
 
-ok 33 - GIT_DIR set (1)
+expecting success of 0027.2204 'setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2204 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=true
 
-expecting success of 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 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
 
-ok 34 - GIT_DIR set (2)
+expecting success of 0027.2206 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2206 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 35 - Auto discovery
+expecting success of 0027.2208 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2208 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 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 &&
+expecting success of 0027.2209 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2209 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2210 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
 		test_cmp expect actual
-	)
+	
+ok 2210 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=true core.eol=native
 
-ok 36 - $GIT_DIR/common overrides core.worktree
+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 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 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
 
-ok 37 - $GIT_WORK_TREE overrides $GIT_DIR/common
+expecting success of 0027.2213 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2213 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 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 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
 
-fatal: Invalid path '/.invalid': No such file or directory
-ok 38 - error out gracefully on invalid $GIT_WORK_TREE
+expecting success of 0027.2215 'checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_true_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2215 - checkout attr=text ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 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 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
 
-	GIT_DIR=relative/.git GIT_WORK_TREE=relative git reset 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
 
-	git -C relative log -1 --format=%s >actual &&
-	echo one >expect &&
-	test_cmp expect actual
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1501-work-tree/relative/.git/
-[master (root-commit) 61ba98b] one
- Author: A U Thor <author@example.com>
-[master 2b4e70d] two
- Author: A U Thor <author@example.com>
-ok 39 - refs work with relative gitdir and work tree
+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
 
-# passed all 39 test(s)
-1..39
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1451-fsck-buffer.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1451-fsck-buffer/.git/
-expecting success of 1451.1 'create valid objects': 
-	git commit --allow-empty -m foo &&
-	commit=$(git rev-parse --verify HEAD) &&
-	tree=$(git rev-parse --verify HEAD^{tree})
+expecting success of 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
 
-[master (root-commit) 2093db0] foo
- Author: A U Thor <author@example.com>
-ok 1 - create valid objects
+expecting success of 0027.2221 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2221 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 1451.2 'reset input to empty': 
-		>base
+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 2 - reset input to empty
+ok 2222 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=true core.eol=native
 
-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 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
 	
-error: object fails fsck: missingTree: invalid format - expected 'tree' line
-ok 3 - truncated commit (missingTree, "")
+ok 2223 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF
 
-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 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
 	
-error: object fails fsck: missingTree: invalid format - expected 'tree' line
-ok 4 - truncated commit (missingTree, "tr")
+ok 2224 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF
 
-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 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
 	
-error: object fails fsck: missingTree: invalid format - expected 'tree' line
-ok 5 - truncated commit (missingTree, "tree")
+ok 2225 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-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 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
 	
-error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
-ok 6 - truncated commit (badTreeSha1, "tree ")
+ok 2226 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-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 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
 	
-error: object fails fsck: badTreeSha1: invalid 'tree' line format - bad sha1
-ok 7 - truncated commit (badTreeSha1, "tree 1234")
+ok 2227 - checkout attr=auto ident aeol=lf core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 1451.8 'add tree line': 
-		echo "$content" >>base
+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 8 - add tree line
+ok 2228 - setup config for checkout attr=auto ident=ident aeol=crlf core.autocrlf=true
 
-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 0027.2229 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2229 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2230 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2230 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2231 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2231 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2232 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2232 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2233 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2233 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2234 'ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 9 - truncated commit (missingAuthor, "")
+ok 2234 - ls-files --eol attr=auto ident aeol=crlf core.autocrlf=true core.eol=native
 
-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 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
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 10 - truncated commit (missingAuthor, "par")
+ok 2235 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF
 
-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 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
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 11 - truncated commit (missingAuthor, "parent")
+ok 2236 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF
 
-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 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
 	
-error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
-ok 12 - truncated commit (badParentSha1, "parent ")
+ok 2237 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-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 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
 	
-error: object fails fsck: badParentSha1: invalid 'parent' line format - bad sha1
-ok 13 - truncated commit (badParentSha1, "parent 1234")
+ok 2238 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 1451.14 'add parent line': 
-		echo "$content" >>base
+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 14 - add parent line
+ok 2239 - checkout attr=auto ident aeol=crlf core.autocrlf=true core.eol=native file=LF_nul
 
-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 0027.2240 'setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 15 - truncated commit (missingAuthor, "")
+ok 2240 - setup config for checkout attr=-text ident=ident aeol= core.autocrlf=false
 
-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 0027.2241 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2241 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2242 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2242 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2243 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2243 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2244 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2244 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2245 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2245 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2246 'ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 16 - truncated commit (missingAuthor, "au")
+ok 2246 - ls-files --eol attr=-text ident aeol= core.autocrlf=false core.eol=native
 
-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 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
 	
-error: object fails fsck: missingAuthor: invalid format - expected 'author' line
-ok 17 - truncated commit (missingAuthor, "author")
+ok 2247 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF
 
-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 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
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 18 - truncated commit (missingEmail, "author ")
+ok 2248 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF
 
-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 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
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 19 - truncated commit (missingEmail, "author name")
+ok 2249 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-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 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
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 20 - truncated commit (badEmail, "author name <")
+ok 2250 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_mix_CR
 
-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 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
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 21 - truncated commit (badEmail, "author name <email")
+ok 2251 - checkout attr=-text ident aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-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 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
 	
-error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 22 - truncated commit (missingSpaceBeforeDate, "author name <email>")
+ok 2252 - setup config for checkout attr=-text ident=ident aeol=lf core.autocrlf=false
 
-expecting success of 1451.23 'truncated commit (badDate, "author name <email> ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 23 - truncated commit (badDate, "author name <email> ")
+expecting success of 0027.2253 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2253 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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 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 1451.25 'truncated commit (badTimezone, "author name <email> 1234 ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 25 - truncated commit (badTimezone, "author name <email> 1234 ")
+expecting success of 0027.2255 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2255 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 1451.26 'truncated commit (badTimezone, "author name <email> 1234 +")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 26 - truncated commit (badTimezone, "author name <email> 1234 +")
+expecting success of 0027.2256 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2256 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 1451.27 'add author line': 
-		echo "$content" >>base
-	
-ok 27 - add author line
+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 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 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
 	
-error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
-ok 28 - truncated commit (missingCommitter, "")
+ok 2258 - ls-files --eol attr=-text ident aeol=lf core.autocrlf=false core.eol=native
 
-expecting success of 1451.29 'truncated commit (missingCommitter, "co")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 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
 	
-error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
-ok 29 - truncated commit (missingCommitter, "co")
+ok 2259 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 1451.30 'truncated commit (missingCommitter, "committer")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
+expecting success of 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
 	
-error: object fails fsck: missingCommitter: invalid format - expected 'committer' line
-ok 30 - truncated commit (missingCommitter, "committer")
+ok 2260 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-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 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
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 31 - truncated commit (missingEmail, "committer ")
+ok 2261 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-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 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
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 32 - truncated commit (missingEmail, "committer name")
+ok 2262 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-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
+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
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 33 - truncated commit (badEmail, "committer name <")
+ok 2263 - checkout attr=-text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-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
+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
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 34 - truncated commit (badEmail, "committer name <email")
+ok 2264 - setup config for checkout attr=-text ident=ident aeol=crlf core.autocrlf=false
 
-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 0027.2265 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2265 - setup LF checkout  with -c core.eol=native
 
-expecting success of 1451.36 'truncated commit (badDate, "committer name <email> ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 36 - truncated commit (badDate, "committer name <email> ")
+expecting success of 0027.2266 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2266 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 1451.37 'truncated commit (badDate, "committer name <email> 1234")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 37 - truncated commit (badDate, "committer name <email> 1234")
+expecting success of 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 1451.38 'truncated commit (badTimezone, "committer name <email> 1234 ")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 38 - truncated commit (badTimezone, "committer name <email> 1234 ")
+expecting success of 0027.2268 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2268 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 1451.39 'truncated commit (badTimezone, "committer name <email> 1234 +")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 39 - truncated commit (badTimezone, "committer name <email> 1234 +")
+expecting success of 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 1451.40 'add committer line': 
-		echo "$content" >>base
+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 40 - add committer line
+ok 2270 - ls-files --eol attr=-text ident aeol=crlf core.autocrlf=false core.eol=native
 
-expecting success of 1451.41 'reset input to empty': 
-		>base
+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 41 - reset input to empty
+ok 2271 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
 
-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
+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
 	
-error: object fails fsck: missingObject: invalid format - expected 'object' line
-ok 42 - truncated tag (missingObject, "")
+ok 2272 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
-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
+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
 	
-error: object fails fsck: missingObject: invalid format - expected 'object' line
-ok 43 - truncated tag (missingObject, "obj")
+ok 2273 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-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
+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
 	
-error: object fails fsck: missingObject: invalid format - expected 'object' line
-ok 44 - truncated tag (missingObject, "object")
+ok 2274 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-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
+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
 	
-error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
-ok 45 - truncated tag (badObjectSha1, "object ")
+ok 2275 - checkout attr=-text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
-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
+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
 	
-error: object fails fsck: badObjectSha1: invalid 'object' line format - bad sha1
-ok 46 - truncated tag (badObjectSha1, "object 1234")
+ok 2276 - setup config for checkout attr=text ident=ident aeol=lf core.autocrlf=false
 
-expecting success of 1451.47 'add object line': 
-		echo "$content" >>base
-	
-ok 47 - add object line
+expecting success of 0027.2277 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2277 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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 0027.2278 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2278 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 1451.49 'truncated tag (missingType, "ty")': 
-		# do not pipe into hash-object here; we want to increase
-		# the chance that it uses a fixed-size buffer or mmap,
-		# and a pipe would be read into a strbuf.
-		{
-			cat base &&
-			echo "$content"
-		} >input &&
-		test_must_fail git hash-object -t "$type" input 2>err &&
-		grep "$fsck" err
-	
-error: object fails fsck: missingTypeEntry: invalid format - expected 'type' line
-ok 49 - truncated tag (missingType, "ty")
+expecting success of 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 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 0027.2280 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2280 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 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
+expecting success of 0027.2281 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2281 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2282 'ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
 	
-error: object fails fsck: badType: invalid 'type' value
-ok 51 - truncated tag (badType, "type ")
+ok 2282 - ls-files --eol attr=text ident aeol=lf core.autocrlf=false core.eol=native
 
-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
+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
 	
-error: object fails fsck: badType: invalid 'type' value
-ok 52 - truncated tag (badType, "type com")
+ok 2283 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 1451.53 'add type line': 
-		echo "$content" >>base
+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 53 - add type line
+ok 2284 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-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
+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
 	
-error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
-ok 54 - truncated tag (missingTagEntry, "")
+ok 2285 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-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
+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
 	
-error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
-ok 55 - truncated tag (missingTagEntry, "ta")
+ok 2286 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-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
+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
 	
-error: object fails fsck: missingTagEntry: invalid format - expected 'tag' line
-ok 56 - truncated tag (missingTagEntry, "tag")
+ok 2287 - checkout attr=text ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-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
+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
 	
-error: object fails fsck: badTagName: invalid 'tag' name: 
-ok 57 - truncated tag (badTagName, "tag ")
+ok 2288 - setup config for checkout attr=text ident=ident aeol=crlf core.autocrlf=false
 
-expecting success of 1451.58 'add tag line': 
-		echo "$content" >>base
+expecting success of 0027.2289 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2289 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2290 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2290 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2291 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2291 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2292 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2292 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2293 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2293 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2294 'ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 58 - add tag line
+ok 2294 - ls-files --eol attr=text ident aeol=crlf core.autocrlf=false core.eol=native
 
-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
+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
 	
-error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 59 - truncated tag (missingTagger, "")
+ok 2295 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF
 
-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
+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
 	
-error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 60 - truncated tag (missingTagger, "ta")
+ok 2296 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF
 
-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
+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
 	
-error: object fails fsck: missingTaggerEntry: invalid format - expected 'tagger' line
-ok 61 - truncated tag (missingTagger, "tagger")
+ok 2297 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-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
+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
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 62 - truncated tag (missingEmail, "tagger ")
+ok 2298 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-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
+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
 	
-error: object fails fsck: missingEmail: invalid author/committer line - missing email
-ok 63 - truncated tag (missingEmail, "tagger name")
+ok 2299 - checkout attr=text ident aeol=crlf core.autocrlf=false core.eol=native file=LF_nul
 
-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
+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
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 64 - truncated tag (badEmail, "tagger name <")
+ok 2300 - setup config for checkout attr=auto ident=ident aeol=lf core.autocrlf=false
 
-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
+expecting success of 0027.2301 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2301 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2302 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2302 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2303 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2303 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2304 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2304 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2305 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2305 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2306 'ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
 	
-error: object fails fsck: badEmail: invalid author/committer line - bad email
-ok 65 - truncated tag (badEmail, "tagger name <email")
+ok 2306 - ls-files --eol attr=auto ident aeol=lf core.autocrlf=false core.eol=native
 
-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
+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
 	
-error: object fails fsck: missingSpaceBeforeDate: invalid author/committer line - missing space before date
-ok 66 - truncated tag (missingSpaceBeforeDate, "tagger name <email>")
+ok 2307 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF
 
-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
+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
 	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 67 - truncated tag (badDate, "tagger name <email> ")
+ok 2308 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF
 
-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
+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
 	
-error: object fails fsck: badDate: invalid author/committer line - bad date
-ok 68 - truncated tag (badDate, "tagger name <email> 1234")
+ok 2309 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-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
+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
 	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 69 - truncated tag (badTimezone, "tagger name <email> 1234 ")
+ok 2310 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_mix_CR
 
-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
+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
 	
-error: object fails fsck: badTimezone: invalid author/committer line - bad time zone
-ok 70 - truncated tag (badTimezone, "tagger name <email> 1234 +")
+ok 2311 - checkout attr=auto ident aeol=lf core.autocrlf=false core.eol=native file=LF_nul
 
-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 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
 
-error: object fails fsck: badTree: cannot be parsed as a tree
-ok 71 - truncated tree (short hash)
+expecting success of 0027.2313 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2313 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-error: object fails fsck: badTree: cannot be parsed as a tree
-ok 72 - truncated tree (missing nul)
+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
 
-# passed all 72 test(s)
-1..72
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1503-rev-parse-verify.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1503-rev-parse-verify/.git/
-expecting success of 1503.1 'set up basic repo with 1 file (hello) and 4 commits': 
-	add_line_into_file "1: Hello World" hello &&
-	HASH1=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "2: A new day for git" hello &&
-	HASH2=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "3: Another new day for git" hello &&
-	HASH3=$(git rev-parse --verify HEAD) &&
-	add_line_into_file "4: Ciao for now" hello &&
-	HASH4=$(git rev-parse --verify HEAD)
+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
 
-ok 1 - set up basic repo with 1 file (hello) and 4 commits
+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 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 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
 
-ok 2 - works with one good rev
+expecting success of 0027.2319 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2319 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=LF
 
-expecting success of 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 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
 
-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 0027.2321 'checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2321 - checkout attr=auto ident aeol=crlf core.autocrlf=false core.eol=native file=CRLF_mix_LF
 
-expecting success of 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 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
 
-ok 4 - fails silently when using -q
+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 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 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
 
-ok 5 - fails silently when using -q with deleted reflogs
+expecting success of 0027.2325 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2325 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 6 - fails silently when using -q with not enough reflogs
+expecting success of 0027.2327 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2327 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 7 - succeeds silently with -q and reflogs that do not go far back enough in time
+expecting success of 0027.2329 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2329 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 8 - no stdout output on error
+expecting success of 0027.2331 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2331 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF
 
-expecting success of 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 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
 
-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 0027.2333 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2333 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 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 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
 
-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 0027.2335 'checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2335 - checkout attr=-text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 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 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
 
-ok 11 - options can appear after --verify
+expecting success of 0027.2337 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2337 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 12 - verify respects --end-of-options
+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
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1502-rev-parse-parseopt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-ok 1 - setup optionspec
+expecting success of 0027.2341 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2341 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 2 - setup optionspec-no-switches
+expecting success of 0027.2343 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2343 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 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 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
 
-ok 3 - setup optionspec-only-hidden-switches
+expecting success of 0027.2345 'checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2345 - checkout attr=-text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 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 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
 
-ok 4 - test --parseopt help output
+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 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 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
 
-ok 5 - test --parseopt help output no switches
+expecting success of 0027.2349 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2349 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 6 - test --parseopt help output hidden switches
+expecting success of 0027.2351 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2351 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 7 - test --parseopt help-all output hidden switches
+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 1502.8 'test --parseopt invalid switch help output': 
-	{
-		cat <<-\EOF &&
-		error: unknown option `does-not-exist'
+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
-		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
+		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
 
-ok 8 - test --parseopt invalid switch help output
+expecting success of 0027.2355 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF    crlf_false_attr__LF.txt
+	
+ok 2355 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 1502.9 'setup expect.1': 
-	cat > expect <<EOF
-set -- --foo --bar 'ham' -b --aswitch -- 'arg'
-EOF
+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
 
-ok 9 - setup expect.1
+expecting success of 0027.2357 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2357 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 1502.10 'test --parseopt': 
-	git rev-parse --parseopt -- --foo --bar=ham --baz --aswitch arg < optionspec > output &&
-	test_cmp expect output
+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
 
-ok 10 - test --parseopt
+expecting success of 0027.2359 'checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_-text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2359 - checkout attr=-text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 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 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
 
-ok 11 - test --parseopt with mixed options and arguments
+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 1502.12 'setup expect.2': 
-	cat > expect <<EOF
-set -- --foo -- 'arg' '--bar=ham'
-EOF
+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
 
-ok 12 - setup expect.2
+expecting success of 0027.2363 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2363 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 1502.13 'test --parseopt with --': 
-	git rev-parse --parseopt -- --foo -- arg --bar=ham < optionspec > output &&
-	test_cmp expect output
+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
 
-ok 13 - test --parseopt with --
+expecting success of 0027.2365 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2365 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 14 - test --parseopt --stop-at-non-option
+expecting success of 0027.2367 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF    crlf_false_attr__LF.txt
+	
+ok 2367 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 1502.15 'setup expect.3': 
-	cat > expect <<EOF
-set -- --foo -- '--' 'arg' '--bar=ham'
-EOF
+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
 
-ok 15 - setup expect.3
+expecting success of 0027.2369 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2369 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 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 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
 
-ok 16 - test --parseopt --keep-dashdash
+expecting success of 0027.2371 'checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2371 - checkout attr=text ident aeol=lf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 1502.17 'setup expect.4': 
-	cat >expect <<EOF
-set -- --foo -- '--' 'arg' '--spam=ham'
-EOF
+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
 
-ok 17 - setup expect.4
+expecting success of 0027.2373 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2373 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 18 - test --parseopt --keep-dashdash --stop-at-non-option with --
+expecting success of 0027.2375 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2375 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 1502.19 'setup expect.5': 
-	cat > expect <<EOF
-set -- --foo -- 'arg' '--spam=ham'
-EOF
+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
 
-ok 19 - setup expect.5
+expecting success of 0027.2377 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2377 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 20 - test --parseopt --keep-dashdash --stop-at-non-option without --
+expecting success of 0027.2379 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2379 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 1502.21 'setup expect.6': 
-	cat > expect <<EOF
-set -- --foo --bar='z' --baz -C'Z' --data='A' -- 'arg'
-EOF
+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
 
-ok 21 - setup expect.6
+expecting success of 0027.2381 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2381 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 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 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
 
-ok 22 - test --parseopt --stuck-long
+expecting success of 0027.2383 'checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_text_ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2383 - checkout attr=text ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 1502.23 'setup expect.7': 
-	cat > expect <<EOF
-set -- --data='' -C --baz -- 'arg'
-EOF
+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
 
-ok 23 - setup expect.7
+expecting success of 0027.2385 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2385 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 24 - test --parseopt --stuck-long and empty optional argument
+expecting success of 0027.2387 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2387 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 1502.25 'setup expect.8': 
-	cat > expect <<EOF
-set -- --data --baz -- 'arg'
-EOF
+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
 
-ok 25 - setup expect.8
+expecting success of 0027.2389 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2389 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 26 - test --parseopt --stuck-long and long option with unset optional argument
+expecting success of 0027.2391 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF    crlf_false_attr__LF.txt
+	
+ok 2391 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 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 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
 
-ok 27 - test --parseopt --stuck-long and short option with unset optional argument
+expecting success of 0027.2393 'checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2393 - checkout attr=auto ident aeol=lf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 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 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
 
-	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 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
 
-	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
-	test_cmp expect actual
+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 28 - test --parseopt help output: "wrapped" options normal "or:" lines
+expecting success of 0027.2397 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2397 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-ok 29 - test --parseopt invalid opt-spec
+expecting success of 0027.2399 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2399 - setup LF_mix_CR checkout  with -c core.eol=native
 
-expecting success of 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 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
 
-	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
+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
 
-	test_must_fail git rev-parse --parseopt -- -h <spec >actual &&
-	test_cmp expect actual
+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
 
-ok 30 - test --parseopt help output: multi-line blurb after empty line
+expecting success of 0027.2403 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF    crlf_false_attr__LF.txt
+	
+ok 2403 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF
 
-expecting success of 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 0027.2404 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2404 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF
 
-ok 31 - test --parseopt help output for optionspec-neg
+expecting success of 0027.2405 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ CRLF_mix_LF crlf_false_attr__CRLF_mix_LF.txt
+	
+ok 2405 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 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 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
 
-ok 32 - test --parseopt valid options for optionspec-neg
+expecting success of 0027.2407 'checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_input_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2407 - checkout attr=auto ident aeol=crlf core.autocrlf=input core.eol=native file=LF_nul
 
-expecting success of 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 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
 
-ok 33 - test --parseopt positivated option for optionspec-neg
+expecting success of 0027.2409 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2409 - setup LF checkout  with -c core.eol=native
 
-expecting success of 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
+expecting success of 0027.2410 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2410 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2411 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2411 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2412 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2412 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2413 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2413 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2414 'ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
 	
-ok 34 - test --parseopt invalid switch --no-positive-only help output for optionspec-neg
+ok 2414 - ls-files --eol attr= ident aeol= core.autocrlf=false core.eol=native
 
-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
+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 35 - test --parseopt invalid switch --negative help output for optionspec-neg
+ok 2415 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=LF
 
-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
+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 36 - test --parseopt invalid switch --no-no-negative help output for optionspec-neg
+ok 2416 - checkout attr= ident aeol= core.autocrlf=false core.eol=native file=CRLF
 
-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 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
 
-cat <<\EOF
-usage: some-command [options]
+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
 
-    --[no-]noble          The feudal switch.
+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
 
-EOF
-error: ambiguous option: no (could be --noble or --no-noble)
-ok 37 - ambiguous: --no matches both --noble and --no-noble
+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
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1505-rev-parse-last.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1505-rev-parse-last/.git/
-expecting success of 1505.1 'setup': 
+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
 
-	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 0027.2422 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2422 - setup CRLF checkout  with -c core.eol=native
 
+expecting success of 0027.2423 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2423 - setup LF_mix_CR checkout  with -c core.eol=native
 
-[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 0027.2424 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2424 - setup CRLF_mix_LF checkout  with -c core.eol=native
 
-expecting success of 1505.2 '@{-1} works': 
-	test_cmp_rev side @{-1}
+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
 
-ok 2 - @{-1} works
+expecting success of 0027.2426 'ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
+		test_cmp expect actual
+	
+ok 2426 - ls-files --eol attr= ident aeol= core.autocrlf=true core.eol=native
 
-expecting success of 1505.3 '@{-1}~2 works': 
-	test_cmp_rev side~2 @{-1}~2
+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
 
-ok 3 - @{-1}~2 works
+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 1505.4 '@{-1}^2 works': 
-	test_cmp_rev side^2 @{-1}^2
+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
 
-ok 4 - @{-1}^2 works
+expecting success of 0027.2430 'checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR': 
+		compare_ws_file eol_native_crlf_true_attr__ LF_mix_CR   crlf_false_attr__LF_mix_CR.txt
+	
+ok 2430 - checkout attr= ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 1505.5 '@{-1}@{1} works': 
-	test_cmp_rev side@{1} @{-1}@{1}
+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
 
-ok 5 - @{-1}@{1} works
+expecting success of 0027.2432 'setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true': 
+		create_gitattributes "$attr" $ident $aeol &&
+		git config core.autocrlf $crlf
+	
+ok 2432 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=true
 
-expecting success of 1505.6 '@{-2} works': 
-	test_cmp_rev main @{-2}
+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
 
-ok 6 - @{-2} works
+expecting success of 0027.2434 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2434 - setup CRLF checkout  with -c core.eol=native
 
-expecting success of 1505.7 '@{-3} fails': 
-	test_must_fail git rev-parse @{-3}
+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
 
-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 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
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1504-ceiling-dirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 0027.2437 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2437 - setup LF_nul checkout  with -c core.eol=native
 
-expecting success of 1504.2 'ceil_empty: git rev-parse --show-prefix is ''': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >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 2 - ceil_empty: git rev-parse --show-prefix is ''
+ok 2438 - ls-files --eol attr=auto ident aeol= core.autocrlf=true core.eol=native
 
-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
+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 3 - ceil_at_parent: git rev-parse --show-prefix is ''
+ok 2439 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF
 
-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
+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 4 - ceil_at_parent_slash: git rev-parse --show-prefix is ''
+ok 2440 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF
 
-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
+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 5 - ceil_at_trash: git rev-parse --show-prefix is ''
+ok 2441 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-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
+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 6 - ceil_at_trash_slash: git rev-parse --show-prefix is ''
+ok 2442 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-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
+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 7 - ceil_at_sub: git rev-parse --show-prefix is ''
+ok 2443 - checkout attr=auto ident aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-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
+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 8 - ceil_at_sub_slash: git rev-parse --show-prefix is ''
+ok 2444 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=true
 
-checking prerequisite: SYMLINKS
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-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.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
 
-)
-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 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 1504.10 'subdir_ceil_empty: git rev-parse --show-prefix is 'sub/dir/'': 
-		echo "$expect" >expect &&
-		git rev-parse --show-prefix >actual &&
+expecting success of 0027.2448 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2448 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2449 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2449 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2450 'ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
 		test_cmp expect actual
 	
-ok 10 - subdir_ceil_empty: git rev-parse --show-prefix is 'sub/dir/'
+ok 2450 - ls-files --eol attr=text ident aeol= core.autocrlf=true core.eol=native
 
-expecting success of 1504.11 'subdir_ceil_at_trash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 11 - subdir_ceil_at_trash: prefix
+ok 2451 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF
 
-expecting success of 1504.12 'subdir_ceil_at_trash_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 12 - subdir_ceil_at_trash_slash: prefix
+ok 2452 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF
 
-expecting success of 1504.13 'subdir_ceil_at_sub: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 13 - subdir_ceil_at_sub: prefix
+ok 2453 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=CRLF_mix_LF
 
-expecting success of 1504.14 'subdir_ceil_at_sub_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 14 - subdir_ceil_at_sub_slash: prefix
+ok 2454 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_mix_CR
 
-expecting success of 1504.15 'subdir_ceil_at_top: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 15 - subdir_ceil_at_top: prefix
+ok 2455 - checkout attr=text ident aeol= core.autocrlf=true core.eol=native file=LF_nul
 
-expecting success of 1504.16 'subdir_ceil_at_top_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 16 - subdir_ceil_at_top_slash: prefix
+ok 2456 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=input
 
-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 &&
+expecting success of 0027.2457 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2457 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2458 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2458 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2459 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2459 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2460 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2460 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2461 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2461 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2462 'ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
 		test_cmp expect actual
 	
-ok 17 - subdir_ceil_at_top_no_resolve: git rev-parse --show-prefix is 'sub/dir/'
+ok 2462 - ls-files --eol attr=text ident aeol= core.autocrlf=input core.eol=native
 
-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
+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 18 - subdir_ceil_at_top_slash_no_resolve: git rev-parse --show-prefix is 'sub/dir/'
+ok 2463 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF
 
-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
+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 19 - subdir_ceil_at_subdir: git rev-parse --show-prefix is 'sub/dir/'
+ok 2464 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF
 
-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
+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 20 - subdir_ceil_at_subdir_slash: git rev-parse --show-prefix is 'sub/dir/'
+ok 2465 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-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
+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 21 - subdir_ceil_at_su: git rev-parse --show-prefix is 'sub/dir/'
+ok 2466 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
-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
+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 22 - subdir_ceil_at_su_slash: git rev-parse --show-prefix is 'sub/dir/'
+ok 2467 - checkout attr=text ident aeol= core.autocrlf=input core.eol=native file=LF_nul
 
-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
+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 23 - subdir_ceil_at_sub_di: git rev-parse --show-prefix is 'sub/dir/'
+ok 2468 - setup config for checkout attr=auto ident=ident aeol= core.autocrlf=input
 
-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 &&
+expecting success of 0027.2469 'setup LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2469 - setup LF checkout  with -c core.eol=native
+
+expecting success of 0027.2470 'setup CRLF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2470 - setup CRLF checkout  with -c core.eol=native
+
+expecting success of 0027.2471 'setup LF_mix_CR checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2471 - setup LF_mix_CR checkout  with -c core.eol=native
+
+expecting success of 0027.2472 'setup CRLF_mix_LF checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2472 - setup CRLF_mix_LF checkout  with -c core.eol=native
+
+expecting success of 0027.2473 'setup LF_nul checkout  with -c core.eol=native': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2473 - setup LF_nul checkout  with -c core.eol=native
+
+expecting success of 0027.2474 'ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
 		test_cmp expect actual
 	
-ok 24 - subdir_ceil_at_sub_di_slash: git rev-parse --show-prefix is 'sub/dir/'
+ok 2474 - ls-files --eol attr=auto ident aeol= core.autocrlf=input core.eol=native
 
-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
+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 25 - subdir_ceil_at_subdi: git rev-parse --show-prefix is 'sub/dir/'
+ok 2475 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF
 
-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
+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 26 - subdir_ceil_at_subdi_slash: git rev-parse --show-prefix is 'sub/dir/'
+ok 2476 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF
 
-expecting success of 1504.27 'second_of_two: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 27 - second_of_two: prefix
+ok 2477 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=CRLF_mix_LF
 
-expecting success of 1504.28 'first_of_two: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 28 - first_of_two: prefix
+ok 2478 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_mix_CR
 
-expecting success of 1504.29 'second_of_three: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 29 - second_of_three: prefix
+ok 2479 - checkout attr=auto ident aeol= core.autocrlf=input core.eol=native file=LF_nul
 
-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
+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 30 - git_dir_specified: git rev-parse --show-prefix is ''
+ok 2480 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
 
-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 &&
+expecting success of 0027.2481 'setup LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2481 - setup LF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2482 'setup CRLF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2482 - setup CRLF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2483 'setup LF_mix_CR checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2483 - setup LF_mix_CR checkout  with -c core.eol=crlf
+
+expecting success of 0027.2484 'setup CRLF_mix_LF checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2484 - setup CRLF_mix_LF checkout  with -c core.eol=crlf
+
+expecting success of 0027.2485 'setup LF_nul checkout  with -c core.eol=crlf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2485 - setup LF_nul checkout  with -c core.eol=crlf
+
+expecting success of 0027.2486 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
 		test_cmp expect actual
 	
-ok 31 - sd_no_ceil: git rev-parse --show-prefix is 's/d/'
+ok 2486 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=crlf
 
-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
+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 32 - sd_ceil_empty: git rev-parse --show-prefix is 's/d/'
+ok 2487 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF
 
-expecting success of 1504.33 'sd_ceil_at_trash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 33 - sd_ceil_at_trash: prefix
+ok 2488 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF
 
-expecting success of 1504.34 'sd_ceil_at_trash_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 34 - sd_ceil_at_trash_slash: prefix
+ok 2489 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=CRLF_mix_LF
 
-expecting success of 1504.35 'sd_ceil_at_s: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 35 - sd_ceil_at_s: prefix
+ok 2490 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_mix_CR
 
-expecting success of 1504.36 'sd_ceil_at_s_slash: prefix': 
-		test_expect_code 128 git rev-parse --show-prefix
+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
 	
-fatal: not a git repository (or any of the parent directories): .git
-ok 36 - sd_ceil_at_s_slash: prefix
+ok 2491 - checkout attr=text ident aeol= core.autocrlf=false core.eol=crlf file=LF_nul
 
-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
+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 37 - sd_ceil_at_sd: git rev-parse --show-prefix is 's/d/'
+ok 2492 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
 
-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 &&
+expecting success of 0027.2493 'setup LF checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2493 - setup LF checkout  with -c core.eol=lf
+
+expecting success of 0027.2494 'setup CRLF checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2494 - setup CRLF checkout  with -c core.eol=lf
+
+expecting success of 0027.2495 'setup LF_mix_CR checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2495 - setup LF_mix_CR checkout  with -c core.eol=lf
+
+expecting success of 0027.2496 'setup CRLF_mix_LF checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2496 - setup CRLF_mix_LF checkout  with -c core.eol=lf
+
+expecting success of 0027.2497 'setup LF_nul checkout  with -c core.eol=lf': 
+			rm -f crlf_false_attr__$f.txt &&
+			git ${ceol:+-c core.eol=$ceol} checkout -- crlf_false_attr__$f.txt
+		
+ok 2497 - setup LF_nul checkout  with -c core.eol=lf
+
+expecting success of 0027.2498 'ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf': 
+		test_when_finished "rm expect actual" &&
+		sort <<-EOF >expect &&
+		i/crlf w/$(stats_ascii $crlfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF.txt
+		i/mixed w/$(stats_ascii $lfmixcrlf) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_mix_LF.txt
+		i/lf w/$(stats_ascii $lfname) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF.txt
+		i/-text w/$(stats_ascii $lfmixcr) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_mix_CR.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__CRLF_nul.txt
+		i/-text w/$(stats_ascii $crlfnul) attr/$(attr_ascii $attr $aeol) crlf_false_attr__LF_nul.txt
+		EOF
+		git ls-files --eol crlf_false_attr__* >tmp &&
+		sed -e "s/	/ /g" -e "s/  */ /g" tmp |
+		sort >actual &&
 		test_cmp expect actual
 	
-ok 38 - sd_ceil_at_sd_slash: git rev-parse --show-prefix is 's/d/'
+ok 2498 - ls-files --eol attr=text ident aeol= core.autocrlf=false core.eol=lf
 
-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
+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 39 - sd_ceil_at_su: git rev-parse --show-prefix is 's/d/'
+ok 2499 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF
 
-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
+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 40 - sd_ceil_at_su_slash: git rev-parse --show-prefix is 's/d/'
+ok 2500 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF
 
-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
+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 41 - sd_ceil_at_s_di: git rev-parse --show-prefix is 's/d/'
+ok 2501 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=CRLF_mix_LF
 
-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
+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 42 - sd_ceil_at_s_di_slash: git rev-parse --show-prefix is 's/d/'
+ok 2502 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_mix_CR
 
-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
+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 43 - sd_ceil_at_sdi: git rev-parse --show-prefix is 's/d/'
+ok 2503 - checkout attr=text ident aeol= core.autocrlf=false core.eol=lf file=LF_nul
 
-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
+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 44 - sd_ceil_at_sdi_slash: git rev-parse --show-prefix is 's/d/'
+ok 2504 - setup config for checkout attr=text ident=ident aeol= core.autocrlf=false
 
-# passed all 44 test(s)
-1..44
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1500-rev-parse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 
 
-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 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 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 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 
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 2 - toplevel: --is-bare-repository
+ok 2509 - setup LF_nul checkout 
 
-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 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=
 
-			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 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
 
-			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 0027.2512 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2512 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 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 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
 
-			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 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
 
-			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 0027.2515 'checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr_text_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2515 - checkout attr=text ident aeol= core.autocrlf=false core.eol= file=LF_nul
 
-expecting success of 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 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
 
-			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 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
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 5 - toplevel: --show-prefix
+ok 2518 - setup CRLF checkout  with -c core.eol=native
 
-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 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
 
-			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 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
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 6 - toplevel: --git-dir
+ok 2521 - setup LF_nul checkout  with -c core.eol=native
 
-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 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
 
-			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 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
 
-			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 0027.2524 'checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_text_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2524 - checkout attr=text ident aeol= core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 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 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
 
-			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 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
 
-			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 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 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 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
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 9 - .git/: --is-inside-git-dir
+ok 2530 - setup CRLF checkout 
 
-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 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 
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 10 - .git/: --is-inside-work-tree
+ok 2533 - setup LF_nul checkout 
 
-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 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=
 
-			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 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
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 11 - .git/: --show-prefix
+expecting success of 0027.2536 'checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2536 - checkout attr=auto ident aeol= core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 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 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
 
-			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 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
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 12 - .git/: --git-dir
+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 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 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
 
-			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 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
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 13 - .git/: --absolute-git-dir
+ok 2542 - setup CRLF checkout  with -c core.eol=native
 
-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 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
 
-			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 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
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 14 - .git/objects/: --is-bare-repository
+ok 2545 - setup LF_nul checkout  with -c core.eol=native
 
-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 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
 
-			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 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
 
-			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 0027.2548 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2548 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=CRLF
 
-expecting success of 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 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
 
-			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 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
 
-			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 0027.2551 'checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul': 
+		compare_ws_file eol_native_crlf_false_attr_auto_ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2551 - checkout attr=auto ident aeol= core.autocrlf=false core.eol=native file=LF_nul
 
-expecting success of 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 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
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 17 - .git/objects/: --show-prefix
+ok 2554 - setup CRLF checkout 
 
-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 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 
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 18 - .git/objects/: --git-dir
+ok 2557 - setup LF_nul checkout 
 
-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 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=
 
-			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 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
 
-			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 0027.2560 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2560 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 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 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
 
-			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 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
 
-			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 0027.2563 'checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr__ LF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2563 - checkout attr= ident aeol=lf core.autocrlf=false core.eol= file=LF_nul
 
-expecting success of 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 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
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect 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 21 - subdirectory: --is-inside-git-dir
+ok 2566 - setup CRLF checkout 
 
-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 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 
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 22 - subdirectory: --is-inside-work-tree
+ok 2569 - setup LF_nul checkout 
 
-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 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=
 
-			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 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
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 23 - subdirectory: --show-prefix
+expecting success of 0027.2572 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_false_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2572 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=CRLF
 
-expecting success of 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 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
 
-			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 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
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
-		
-ok 24 - subdirectory: --git-dir
+expecting success of 0027.2575 'checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_nul': 
+		compare_ws_file eol__crlf_false_attr__ CRLF_nul   crlf_false_attr__LF_nul.txt
+	
+ok 2575 - checkout attr= ident aeol=crlf core.autocrlf=false core.eol= file=LF_nul
 
-expecting success of 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 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
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 25 - subdirectory: --absolute-git-dir
+ok 2578 - setup CRLF checkout 
 
-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 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 
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 26 - core.bare = true: --is-bare-repository
+ok 2581 - setup LF_nul checkout 
 
-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 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=
 
-			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 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
 
-			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 0027.2584 'checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF': 
+		compare_ws_file eol__crlf_true_attr__ CRLF  crlf_false_attr__CRLF.txt
+	
+ok 2584 - checkout attr= ident aeol=lf core.autocrlf=true core.eol= file=CRLF
 
-expecting success of 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 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
 
-			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 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
 
-			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 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 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 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
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 29 - core.bare undefined: --is-bare-repository
+ok 2590 - setup CRLF checkout 
 
-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 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 
 
-			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 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 
 
-			echo "$expect" >expect &&
-			git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
-			test_cmp expect actual
+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 30 - core.bare undefined: --is-inside-git-dir
+ok 2593 - setup LF_nul checkout 
 
-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 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=
 
-			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 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
 
-			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 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 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 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
 
-			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 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
 
-			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 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 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 &&
+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
 
-			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 2600 - ls-files --eol -d -z
 
-			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
+# passed all 2600 test(s)
+1..2600
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1511-rev-parse-caret.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-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 &&
+[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
 
-			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 1511.2 'ref^{non-existent}': 
+	test_must_fail git rev-parse ref^{non-existent}
 
-			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
+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 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 &&
+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
 
-			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 3 - ref^{}
 
-			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
+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}
 
-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 &&
+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}
 
-			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 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}
 
-			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
+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 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 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
 
-			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 &&
+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}
 
-			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 1511.7 'ref^{/.}': 
+	git rev-parse main >expected &&
+	git rev-parse main^{/.} >actual &&
+	test_cmp expected actual
 
-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 7 - ref^{/.}
 
-			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 1511.8 'ref^{/non-existent}': 
+	test_must_fail git rev-parse main^{/non-existent}
 
-			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
+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 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 1511.9 'ref^{/Initial}': 
+	git rev-parse ref >expected &&
+	git rev-parse main^{/Initial} >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 &&
+ok 9 - ref^{/Initial}
 
-			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 1511.10 'ref^{/!Exp}': 
+	test_must_fail git rev-parse main^{/!Exp}
 
-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 &&
+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}
 
-			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 1511.11 'ref^{/!}': 
+	test_must_fail git rev-parse main^{/!}
 
-			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
+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 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 1511.12 'ref^{/!!Exp}': 
+	git rev-parse expref >expected &&
+	git rev-parse main^{/!!Exp} >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 &&
+ok 12 - ref^{/!!Exp}
 
-			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 1511.13 'ref^{/!-}': 
+	test_must_fail git rev-parse main^{/!-}
 
-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 &&
+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^{/!-}
 
-			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 1511.14 'ref^{/!-.}': 
+	test_must_fail git rev-parse main^{/!-.}
 
-			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
+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 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 &&
+expecting success of 1511.15 'ref^{/!-non-existent}': 
+	git rev-parse main >expected &&
+	git rev-parse main^{/!-non-existent} >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 &&
+ok 15 - ref^{/!-non-existent}
 
-			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 1511.16 'ref^{/!-Changed}': 
+	git rev-parse expref >expected &&
+	git rev-parse main^{/!-Changed} >actual &&
+	test_cmp expected 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 &&
+ok 16 - ref^{/!-Changed}
 
-			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 "$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
-
-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 &&
-
-			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 "$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 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 &&
-
-			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 "$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
-
-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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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 &&
-
-			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 "$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 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
-
-ok 60 - rev-parse --path-format=absolute
-
-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 61 - rev-parse --path-format=relative
-
-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
-
-ok 62 - --path-format=relative does not affect --absolute-git-dir
-
-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
-
-ok 63 - --path-format can change in the middle of the command line
-
-expecting success of 1500.64 '--path-format does not segfault without an argument': 
-	test_must_fail git rev-parse --path-format
-
-fatal: --path-format requires an argument
-ok 64 - --path-format does not segfault without an argument
-
-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
-
-ok 65 - git-common-dir from worktree root
-
-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
-
-ok 66 - git-common-dir inside sub-dir
-
-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 67 - git-path from worktree root
-
-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
-
-ok 68 - git-path inside sub-dir
-
-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
-
-[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 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
-
-ok 70 - rev-parse --is-shallow-repository in non-shallow repo
-
-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
-
-fatal: unknown mode for --show-object-format: squeamish-ossifrage
-ok 71 - rev-parse --show-object-format in repo
-
-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
-
-ok 72 - rev-parse --show-ref-format
-
-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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 1500.74 '--show-toplevel from subdir of working tree': 
-	pwd >expect &&
-	git -C sub/dir rev-parse --show-toplevel >actual &&
-	test_cmp expect actual
-
-ok 74 - --show-toplevel from subdir of working tree
-
-expecting success of 1500.75 '--show-toplevel from inside .git': 
-	test_must_fail git -C .git rev-parse --show-toplevel
-
-fatal: this operation must be run in a work tree
-ok 75 - --show-toplevel from inside .git
-
-expecting success of 1500.76 'showing the superproject correctly': 
-	git rev-parse --show-superproject-working-tree >out &&
-	test_must_be_empty out &&
-
-	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_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 &&
-
-	git -C super/dir/sub rev-parse --show-superproject-working-tree >out &&
-	test_cmp expect out
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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 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 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
-
-ok 77 - rev-parse --since= unsqueezed ordering
-
-expecting success of 1500.78 'rev-parse --bisect includes bad, excludes good': 
-	test_commit_bulk 6 &&
-
-	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 &&
-
-	# 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
-
-	git rev-parse --symbolic-full-name --bisect >actual &&
-	test_cmp expect actual
-
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
----------------------------------------------------------------------
-
-ok 78 - rev-parse --bisect includes bad, excludes good
-
-# passed all 78 test(s)
-1..78
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1506-rev-parse-diagnosis.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-
-[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 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) )
-
-f719efd430d52bcfc8566a43b2eb655688d38871
-8510665149157c2bc901848c3e0b746954e9cbd9
-2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
-ok 2 - correct file objects
-
-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
-
-ok 3 - correct relative file objects (0)
-
-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
-
-ok 4 - correct relative file objects (1)
-
-expecting success of 1506.5 'correct relative file objects (2)': 
-	(
-		cd subdir &&
-		git rev-parse HEAD:../file.txt >result &&
-		test_cmp ../expected result
-	)
-
-ok 5 - correct relative file objects (2)
-
-expecting success of 1506.6 'correct relative file objects (3)': 
-	(
-		cd subdir &&
-		git rev-parse HEAD:../subdir/../file.txt >result &&
-		test_cmp ../expected result
-	)
-
-ok 6 - correct relative file objects (3)
-
-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
-	)
-
-ok 7 - correct relative file objects (4)
-
-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 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.45.2/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 "annote" 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1509-root-work-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1509-root-work-tree/.git/
-1..0 # SKIP Test requiring writable / skipped. Read this test if you want to run it
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1507-rev-parse-upstream.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1508-at-combinations.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1511-rev-parse-caret.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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}
 
@@ -95815,1048 +96975,6 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1513-rev-parse-prefix.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1512-rev-parse-disambiguation.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1512-rev-parse-disambiguation/.git/
-expecting success of 1512.1 'ambiguous blob output': 
-	git init --bare blob.prefix &&
-	(
-		cd blob.prefix &&
-
-		# Both start with "dead..", under both SHA-1 and SHA-256
-		echo brocdnra | git hash-object -w --stdin &&
-		echo brigddsv | git hash-object -w --stdin &&
-
-		# Both start with "beef.."
-		echo 1agllotbh | git hash-object -w --stdin &&
-		echo 1bbfctrkc | git hash-object -w --stdin
-	) &&
-
-	test_must_fail git -C blob.prefix rev-parse dead &&
-	test_cmp_failed_rev_parse blob.prefix beef <<-\EOF
-	error: short object ID beef... is ambiguous
-	hint: The candidates are:
-	hint:   beef... blob
-	hint:   beef... blob
-	fatal: ambiguous argument 'beef...': unknown revision or path not in the working tree.
-	Use '--' to separate paths from revisions, like this:
-	'git <command> [<revision>...] -- [<file>...]'
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1512-rev-parse-disambiguation/blob.prefix/
-dead7b21a85f6dc7a24cbc4bb04a008db70bc04a
-dead9d36640e108d9eb449ed5966fd0c6d4e6b7f
-beefc9be42a87abd92326257a995bf20a24c788f
-beef2b0b99a5a8a36d91ea9ecd766af6352eafd9
-error: short object ID dead is ambiguous
-hint: The candidates are:
-hint:   dead7b2 blob
-hint:   dead9d3 blob
-fatal: ambiguous argument 'dead': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-dead
-beef
-ok 1 - ambiguous blob output
-
-expecting success of 1512.2 'ambiguous loose bad object parsed as OBJ_BAD': 
-	git init --bare blob.bad &&
-	(
-		cd blob.bad &&
-
-		# Both have the prefix "bad0"
-		echo xyzfaowcoh | git hash-object -t bad -w --stdin --literally &&
-		echo xyzhjpyvwl | git hash-object -t bad -w --stdin --literally
-	) &&
-
-	test_cmp_failed_rev_parse blob.bad bad0 <<-\EOF
-	error: short object ID bad0... is ambiguous
-	fatal: invalid object type
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1512-rev-parse-disambiguation/blob.bad/
-bad0bd4672dee1b4d3b8088534ed5a0362bc8d59
-bad0853730d9d114ac789f0ce89039d224bf66c9
-ok 2 - ambiguous loose bad object parsed as OBJ_BAD
-
-expecting success of 1512.3 'ambigous zlib corrupt loose blob': 
-	git init --bare blob.corrupt &&
-	(
-		cd blob.corrupt &&
-
-		# Both have the prefix "cafe"
-		echo bnkxmdwz | git hash-object -w --stdin &&
-		oid=$(echo bmwsjxzi | git hash-object -w --stdin) &&
-
-		oidf=objects/$(test_oid_to_path "$oid") &&
-		chmod 755 $oidf &&
-		echo broken >$oidf
-	) &&
-
-	test_cmp_failed_rev_parse blob.corrupt cafe <<-\EOF
-	error: short object ID cafe... is ambiguous
-	error: inflate: data stream error (incorrect header check)
-	error: unable to unpack cafe... header
-	error: inflate: data stream error (incorrect header check)
-	error: unable to unpack cafe... header
-	hint: The candidates are:
-	hint:   cafe... [bad object]
-	hint:   cafe... blob
-	fatal: ambiguous argument 'cafe...': unknown revision or path not in the working tree.
-	Use '--' to separate paths from revisions, like this:
-	'git <command> [<revision>...] -- [<file>...]'
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1512-rev-parse-disambiguation/blob.corrupt/
-cafe3f2e27174acdf9aa3a394d73714cdcf533d9
-cafe
-ok 3 - ambigous zlib corrupt loose blob
-
-checking prerequisite: SHA1
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SHA1" &&
-	case "$GIT_DEFAULT_HASH" in
-	sha1) true ;;
-	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
-	*) false ;;
-	esac
-
-)
-prerequisite SHA1 ok
-expecting success of 1512.4 'blob and tree': 
-	test_tick &&
-	(
-		test_write_lines 0 1 2 3 4 5 6 7 8 9 &&
-		echo &&
-		echo b1rwzyc3
-	) >a0blgqsjc &&
-
-	# create one blob 0000000000b36
-	git add a0blgqsjc &&
-
-	# create one tree 0000000000cdc
-	git write-tree
-
-0000000000cdcf04beb2fab69e65622616294984
-ok 4 - blob and tree
-
-expecting success of 1512.5 'warn ambiguity when no candidate matches type hint': 
-	test_must_fail git rev-parse --verify 000000000^{commit} 2>actual &&
-	test_grep "short object ID 000000000 is ambiguous" actual
-
-error: short object ID 000000000 is ambiguous
-ok 5 - warn ambiguity when no candidate matches type hint
-
-expecting success of 1512.6 'disambiguate tree-ish': 
-	# feed tree-ish in an unambiguous way
-	git rev-parse --verify 0000000000cdc:a0blgqsjc &&
-
-	# ambiguous at the object name level, but there is only one
-	# such tree-ish (the other is a blob)
-	git rev-parse --verify 000000000:a0blgqsjc
-
-0000000000b36b6aa7ea4b75318ed078f55505c3
-0000000000b36b6aa7ea4b75318ed078f55505c3
-ok 6 - disambiguate tree-ish
-
-expecting success of 1512.7 'disambiguate blob': 
-	sed -e "s/|$//" >patch <<-EOF &&
-	diff --git a/frotz b/frotz
-	index 000000000..ffffff 100644
-	--- a/frotz
-	+++ b/frotz
-	@@ -10,3 +10,4 @@
-	 9
-	 |
-	 b1rwzyc3
-	+irwry
-	EOF
-	(
-		GIT_INDEX_FILE=frotz &&
-		export GIT_INDEX_FILE &&
-		git apply --build-fake-ancestor frotz patch &&
-		git cat-file blob :frotz >actual
-	) &&
-	test_cmp a0blgqsjc actual
-
-ok 7 - disambiguate blob
-
-expecting success of 1512.8 'disambiguate tree': 
-	commit=$(echo "d7xm" | git commit-tree 000000000) &&
-	# this commit is fffff2e and not ambiguous with the 00000* objects
-	test $(git rev-parse $commit^{tree}) = $(git rev-parse 0000000000cdc)
-
-ok 8 - disambiguate tree
-
-expecting success of 1512.9 'first commit': 
-	# create one commit 0000000000e4f
-	git commit -m a2onsxbvj
-
-[main (root-commit) 0000000000e] a2onsxbvj
- Author: A U Thor <author@example.com>
- 1 file changed, 12 insertions(+)
- create mode 100644 a0blgqsjc
-ok 9 - first commit
-
-expecting success of 1512.10 'disambiguate commit-ish': 
-	# feed commit-ish in an unambiguous way
-	git rev-parse --verify 0000000000e4f^{commit} &&
-
-	# ambiguous at the object name level, but there is only one
-	# such commit (the others are tree and blob)
-	git rev-parse --verify 000000000^{commit} &&
-
-	# likewise
-	git rev-parse --verify 000000000^0
-
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-ok 10 - disambiguate commit-ish
-
-expecting success of 1512.11 'disambiguate commit': 
-	commit=$(echo "hoaxj" | git commit-tree 0000000000cdc -p 000000000) &&
-	# this commit is ffffffd8 and not ambiguous with the 00000* objects
-	test $(git rev-parse $commit^) = $(git rev-parse 0000000000e4f)
-
-ok 11 - disambiguate commit
-
-expecting success of 1512.12 'log name1..name2 takes only commit-ishes on both ends': 
-	# These are underspecified from the prefix-length point of view
-	# to disambiguate the commit with other objects, but there is only
-	# one commit that has 00000* prefix at this point.
-	git log 000000000..000000000 &&
-	git log ..000000000 &&
-	git log 000000000.. &&
-	git log 000000000...000000000 &&
-	git log ...000000000 &&
-	git log 000000000...
-
-ok 12 - log name1..name2 takes only commit-ishes on both ends
-
-expecting success of 1512.13 'rev-parse name1..name2 takes only commit-ishes on both ends': 
-	# Likewise.
-	git rev-parse 000000000..000000000 &&
-	git rev-parse ..000000000 &&
-	git rev-parse 000000000..
-
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-ok 13 - rev-parse name1..name2 takes only commit-ishes on both ends
-
-expecting success of 1512.14 'git log takes only commit-ish': 
-	# Likewise.
-	git log 000000000
-
-commit 0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    a2onsxbvj
-ok 14 - git log takes only commit-ish
-
-expecting success of 1512.15 'git reset takes only commit-ish': 
-	# Likewise.
-	git reset 000000000
-
-ok 15 - git reset takes only commit-ish
-
-expecting success of 1512.16 'first tag': 
-	# create one tag 0000000000f8f
-	git tag -a -m j7cp83um v1.0.0
-
-ok 16 - first tag
-
-checking known breakage of 1512.17 'two semi-ambiguous commit-ish': 
-	# At this point, we have a tag 0000000000f8f that points
-	# at a commit 0000000000e4f, and a tree and a blob that
-	# share 0000000000 prefix with these tag and commit.
-	#
-	# Once the parser becomes ultra-smart, it could notice that
-	# 0000000000 before ^{commit} name many different objects, but
-	# that only two (HEAD and v1.0.0 tag) can be peeled to commit,
-	# and that peeling them down to commit yield the same commit
-	# without ambiguity.
-	git rev-parse --verify 0000000000^{commit} &&
-
-	# likewise
-	git log 0000000000..0000000000 &&
-	git log ..0000000000 &&
-	git log 0000000000.. &&
-	git log 0000000000...0000000000 &&
-	git log ...0000000000 &&
-	git log 0000000000...
-
-error: short object ID 0000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f tag 2005-04-07 - v1.0.0
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-fatal: Needed a single revision
-not ok 17 - two semi-ambiguous commit-ish # TODO known breakage
-
-checking known breakage of 1512.18 'three semi-ambiguous tree-ish': 
-	# Likewise for tree-ish.  HEAD, v1.0.0 and HEAD^{tree} share
-	# the prefix but peeling them to tree yields the same thing
-	git rev-parse --verify 0000000000^{tree}
-
-error: short object ID 0000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f tag 2005-04-07 - v1.0.0
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000000c tree
-fatal: Needed a single revision
-not ok 18 - three semi-ambiguous tree-ish # TODO known breakage
-
-expecting success of 1512.19 'parse describe name': 
-	# feed an unambiguous describe name
-	git rev-parse --verify v1.0.0-0-g0000000000e4f &&
-
-	# ambiguous at the object name level, but there is only one
-	# such commit (others are blob, tree and tag)
-	git rev-parse --verify v1.0.0-0-g000000000
-
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-ok 19 - parse describe name
-
-expecting success of 1512.20 'more history': 
-	# commit 0000000000043
-	git mv a0blgqsjc d12cr3h8t &&
-	echo h62xsjeu >>d12cr3h8t &&
-	git add d12cr3h8t &&
-
-	test_tick &&
-	git commit -m czy8f73t &&
-
-	# commit 00000000008ec
-	git mv d12cr3h8t j000jmpzn &&
-	echo j08bekfvt >>j000jmpzn &&
-	git add j000jmpzn &&
-
-	test_tick &&
-	git commit -m ioiley5o &&
-
-	# commit 0000000005b0
-	git checkout v1.0.0^0 &&
-	git mv a0blgqsjc f5518nwu &&
-
-	test_write_lines h62xsjeu j08bekfvt kg7xflhm >>f5518nwu &&
-	git add f5518nwu &&
-
-	test_tick &&
-	git commit -m b3wettvi &&
-	side=$(git rev-parse HEAD) &&
-
-	# commit 000000000066
-	git checkout main &&
-
-	# If you use recursive, merge will fail and you will need to
-	# clean up a0blgqsjc as well.  If you use resolve, merge will
-	# succeed.
-	test_might_fail git merge --no-commit -s recursive $side &&
-	git rm -f f5518nwu j000jmpzn &&
-
-	test_might_fail git rm -f a0blgqsjc &&
-	(
-		git cat-file blob $side:f5518nwu &&
-		echo j3l0i9s6
-	) >ab2gs879 &&
-	git add ab2gs879 &&
-
-	test_tick &&
-	git commit -m ad2uee
-
-
-[main 00000000000] czy8f73t
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename a0blgqsjc => d12cr3h8t (76%)
-[main 00000000008] ioiley5o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename d12cr3h8t => j000jmpzn (79%)
-Note: switching to 'v1.0.0^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 0000000000e a2onsxbvj
-[detached HEAD 0000000005] b3wettvi
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- rename a0blgqsjc => f5518nwu (51%)
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  0000000005 b3wettvi
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 0000000005
-
-Switched to branch 'main'
-Auto-merging a0blgqsjc
-CONFLICT (rename/rename): a0blgqsjc renamed to j000jmpzn in HEAD and to f5518nwu in 0000000005b0d85f595e1a98533157ea161798da.
-Automatic merge failed; fix conflicts and then commit the result.
-rm 'f5518nwu'
-rm 'j000jmpzn'
-rm 'a0blgqsjc'
-[main 00000000006] ad2uee
- Author: A U Thor <author@example.com>
-ok 20 - more history
-
-checking known breakage of 1512.21 'parse describe name taking advantage of generation': 
-	# ambiguous at the object name level, but there is only one
-	# such commit at generation 0
-	git rev-parse --verify v1.0.0-0-g000000000 &&
-
-	# likewise for generation 2 and 4
-	git rev-parse --verify v1.0.0-2-g000000000 &&
-	git rev-parse --verify v1.0.0-4-g000000000
-
-fatal: Needed a single revision
-not ok 21 - parse describe name taking advantage of generation # TODO known breakage
-
-expecting success of 1512.22 'parse describe name not ignoring ambiguity': 
-	# ambiguous at the object name level, and there are two such
-	# commits at generation 1
-	test_must_fail git rev-parse --verify v1.0.0-1-g000000000
-
-fatal: Needed a single revision
-ok 22 - parse describe name not ignoring ambiguity
-
-expecting success of 1512.23 'ambiguous commit-ish': 
-	# Now there are many commits that begin with the
-	# common prefix, none of these should pick one at
-	# random.  They all should result in ambiguity errors.
-	test_must_fail git rev-parse --verify 00000000^{commit} &&
-
-	# likewise
-	test_must_fail git log 000000000..000000000 &&
-	test_must_fail git log ..000000000 &&
-	test_must_fail git log 000000000.. &&
-	test_must_fail git log 000000000...000000000 &&
-	test_must_fail git log ...000000000 &&
-	test_must_fail git log 000000000...
-
-error: short object ID 00000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: Needed a single revision
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '000000000..000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '..000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '000000000..': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '000000000...000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '...000000000': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-error: short object ID 000000000 is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-fatal: ambiguous argument '000000000...': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 23 - ambiguous commit-ish
-
-expecting success of 1512.24 'ambiguous tags peel to treeish': 
-	test_must_fail git rev-parse 0000000000f^{tree}
-
-error: short object ID 0000000000f is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   0000000000fd tree
-fatal: ambiguous argument '0000000000f^{tree}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-0000000000f^{tree}
-ok 24 - ambiguous tags peel to treeish
-
-expecting success of 1512.25 'rev-parse --disambiguate': 
-	# The test creates 16 objects that share the prefix and two
-	# commits created by commit-tree in earlier tests share a
-	# different prefix.
-	git rev-parse --disambiguate=000000000 >actual &&
-	test_line_count = 16 actual &&
-	test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
-
-ok 25 - rev-parse --disambiguate
-
-expecting success of 1512.26 'rev-parse --disambiguate drops duplicates': 
-	git rev-parse --disambiguate=000000000 >expect &&
-	git pack-objects .git/objects/pack/pack <expect &&
-	git rev-parse --disambiguate=000000000 >actual &&
-	test_cmp expect actual
-
-bdfb78b16a1cd3c3b1ebf4cca29330c92a46fc43
-ok 26 - rev-parse --disambiguate drops duplicates
-
-expecting success of 1512.27 'ambiguous 40-hex ref': 
-	TREE=$(git mktree </dev/null) &&
-	REF=$(git rev-parse HEAD) &&
-	VAL=$(git commit-tree $TREE </dev/null) &&
-	git update-ref refs/heads/$REF $VAL &&
-	test $(git rev-parse $REF 2>err) = $REF &&
-	grep "refname.*${REF}.*ambiguous" err
-
-warning: refname '0000000000663a70a94c2b280b575855256220fa' is ambiguous.
-ok 27 - ambiguous 40-hex ref
-
-expecting success of 1512.28 'ambiguous short sha1 ref': 
-	TREE=$(git mktree </dev/null) &&
-	REF=$(git rev-parse --short HEAD) &&
-	VAL=$(git commit-tree $TREE </dev/null) &&
-	git update-ref refs/heads/$REF $VAL &&
-	test $(git rev-parse $REF 2>err) = $VAL &&
-	grep "refname.*${REF}.*ambiguous" err
-
-warning: refname '00000000006' is ambiguous.
-ok 28 - ambiguous short sha1 ref
-
-expecting success of 1512.29 'ambiguity errors are not repeated (raw)': 
-	test_must_fail git rev-parse 00000 2>stderr &&
-	grep "is ambiguous" stderr >errors &&
-	test_line_count = 1 errors
-
-00000
-ok 29 - ambiguity errors are not repeated (raw)
-
-expecting success of 1512.30 'ambiguity errors are not repeated (treeish)': 
-	test_must_fail git rev-parse 00000:foo 2>stderr &&
-	grep "is ambiguous" stderr >errors &&
-	test_line_count = 1 errors
-
-00000:foo
-ok 30 - ambiguity errors are not repeated (treeish)
-
-expecting success of 1512.31 'ambiguity errors are not repeated (peel)': 
-	test_must_fail git rev-parse 00000^{commit} 2>stderr &&
-	grep "is ambiguous" stderr >errors &&
-	test_line_count = 1 errors
-
-00000^{commit}
-ok 31 - ambiguity errors are not repeated (peel)
-
-expecting success of 1512.32 'ambiguity hints': 
-	test_must_fail git rev-parse 000000000 2>stderr &&
-	grep ^hint: stderr >hints &&
-	# 16 candidates, plus one intro line
-	test_line_count = 17 hints
-
-000000000
-ok 32 - ambiguity hints
-
-expecting success of 1512.33 'ambiguity hints respect type': 
-	test_must_fail git rev-parse 000000000^{commit} 2>stderr &&
-	grep ^hint: stderr >hints &&
-	# 5 commits, 1 tag (which is a committish), plus intro line
-	test_line_count = 7 hints
-
-000000000^{commit}
-ok 33 - ambiguity hints respect type
-
-expecting success of 1512.34 'failed type-selector still shows hint': 
-	# these two blobs share the same prefix "ee3d", but neither
-	# will pass for a commit
-	echo 851 | git hash-object --stdin -w &&
-	echo 872 | git hash-object --stdin -w &&
-	test_must_fail git rev-parse ee3d^{commit} 2>stderr &&
-	grep ^hint: stderr >hints &&
-	test_line_count = 3 hints
-
-ee3de9906b5e9a4a369e91cba4235487a7e10351
-ee3d8abaa95a7395b373892b2593de2f426814e2
-ee3d^{commit}
-ok 34 - failed type-selector still shows hint
-
-expecting success of 1512.35 'core.disambiguate config can prefer types': 
-	# ambiguous between tree and tag
-	sha1=0000000000f &&
-	test_must_fail git rev-parse $sha1 &&
-	git rev-parse $sha1^{commit} &&
-	git -c core.disambiguate=committish rev-parse $sha1
-
-error: short object ID 0000000000f is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   0000000000fd tree
-hint:   0000000000f2 blob
-fatal: ambiguous argument '0000000000f': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-0000000000f
-0000000000e4f9fbd19cf1e932319e5ad0d1d00b
-0000000000f8f5507ab27a0d7bd3c75c0f64ffe0
-ok 35 - core.disambiguate config can prefer types
-
-expecting success of 1512.36 'core.disambiguate does not override context': 
-	# treeish ambiguous between tag and tree
-	test_must_fail \
-		git -c core.disambiguate=committish rev-parse $sha1^{tree}
-
-error: short object ID 0000000000f is ambiguous
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   0000000000fd tree
-fatal: ambiguous argument '0000000000f^{tree}': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-0000000000f^{tree}
-ok 36 - core.disambiguate does not override context
-
-expecting success of 1512.37 'ambiguous commits are printed by type first, then hash order': 
-	test_must_fail git rev-parse 0000 2>stderr &&
-	grep ^hint: stderr >hints &&
-	grep 0000 hints >objects &&
-	cat >expected <<-\EOF &&
-	tag
-	commit
-	tree
-	blob
-	EOF
-	awk "{print \$3}" <objects >objects.types &&
-	uniq <objects.types >objects.types.uniq &&
-	test_cmp expected objects.types.uniq &&
-	for type in tag commit tree blob
-	do
-		grep $type objects >$type.objects &&
-		sort $type.objects >$type.objects.sorted &&
-		test_cmp $type.objects.sorted $type.objects || return 1
-	done
-
-0000
-ok 37 - ambiguous commits are printed by type first, then hash order
-
-expecting success of 1512.38 'cat-file --batch and --batch-check show ambiguous': 
-	echo "0000 ambiguous" >expect &&
-	echo 0000 | git cat-file --batch-check >actual 2>err &&
-	test_cmp expect actual &&
-	test_grep hint: err &&
-	echo 0000 | git cat-file --batch >actual 2>err &&
-	test_cmp expect actual &&
-	test_grep hint: err
-
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-hint:   000000000002 tree
-hint:   00000000005 tree
-hint:   00000000009 tree
-hint:   0000000000c tree
-hint:   0000000000fd tree
-hint:   00000000001 blob
-hint:   00000000003 blob
-hint:   0000000000a blob
-hint:   0000000000b blob
-hint:   0000000000f2 blob
-hint: The candidates are:
-hint:   0000000000f8 tag 2005-04-07 - v1.0.0
-hint:   000000000004 commit 2005-04-07 - czy8f73t
-hint:   00000000006 commit 2005-04-07 - ad2uee
-hint:   00000000008 commit 2005-04-07 - ioiley5o
-hint:   0000000000e commit 2005-04-07 - a2onsxbvj
-hint:   0000000005 commit 2005-04-07 - b3wettvi
-hint:   000000000002 tree
-hint:   00000000005 tree
-hint:   00000000009 tree
-hint:   0000000000c tree
-hint:   0000000000fd tree
-hint:   00000000001 blob
-hint:   00000000003 blob
-hint:   0000000000a blob
-hint:   0000000000b blob
-hint:   0000000000f2 blob
-ok 38 - cat-file --batch and --batch-check show ambiguous
-
-# still have 3 known breakage(s)
-# passed all remaining 35 test(s)
-1..38
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1515-rev-parse-outside-repo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1514-rev-parse-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1514-rev-parse-push/parent.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1601-index-bogus.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1450-fsck.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1450-fsck/.git/
 expecting success of 1450.1 'setup': 
@@ -98470,7 +98588,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.359e-05 s, 29.8 kB/s
+1 byte copied, 0.0099611 s, 0.1 kB/s
 error: .git/objects/pack/pack-8be9f6a4139bcddd74c3d2ed343bb71e87863c4b.pack pack checksum mismatch
 ok 79 - fsck fails on corrupt packfile
 
@@ -98714,619 +98832,1314 @@
 1..94
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1600-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1600-index/.git/
-expecting success of 1600.1 'setup': 
-	echo 1 >a
+*** t1513-rev-parse-prefix.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 1600.2 'bogus GIT_INDEX_VERSION issues warning': 
-	(
-		rm -f .git/index &&
-		GIT_INDEX_VERSION=2bogus &&
-		export GIT_INDEX_VERSION &&
-		git add a 2>err &&
-		sed "s/[0-9]//" err >actual.err &&
-		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
-			warning: GIT_INDEX_VERSION set, but the value is invalid.
-			Using version Z
-		EOF
-		test_cmp expect.err actual.err
-	)
+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 - bogus GIT_INDEX_VERSION issues warning
+ok 2 - empty prefix -- file
 
-expecting success of 1600.3 'out of bounds GIT_INDEX_VERSION issues warning': 
-	(
-		rm -f .git/index &&
-		GIT_INDEX_VERSION=1 &&
-		export GIT_INDEX_VERSION &&
-		git add a 2>err &&
-		sed "s/[0-9]//" err >actual.err &&
-		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
-			warning: GIT_INDEX_VERSION set, but the value is invalid.
-			Using version Z
-		EOF
-		test_cmp expect.err actual.err
-	)
+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 - out of bounds GIT_INDEX_VERSION issues warning
+ok 3 - valid prefix -- file
 
-expecting success of 1600.4 'no warning with bogus GIT_INDEX_VERSION and existing index': 
-	(
-		GIT_INDEX_VERSION=1 &&
-		export GIT_INDEX_VERSION &&
-		git add a 2>actual.err &&
-		test_must_be_empty actual.err
-	)
+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 - no warning with bogus GIT_INDEX_VERSION and existing index
+ok 4 - valid prefix -- ../file
 
-expecting success of 1600.5 'out of bounds index.version issues warning': 
-	(
-		sane_unset GIT_INDEX_VERSION &&
-		rm -f .git/index &&
-		git config --add index.version 1 &&
-		git add a 2>err &&
-		sed "s/[0-9]//" err >actual.err &&
-		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
-			warning: index.version set, but the value is invalid.
-			Using version Z
-		EOF
-		test_cmp expect.err actual.err
-	)
+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 - out of bounds index.version issues warning
+ok 5 - empty prefix HEAD:./path
 
-expecting success of 1600.6 'index.skipHash config option': 
-	rm -f .git/index &&
-	git -c index.skipHash=true add a &&
-	test_trailing_hash .git/index >hash &&
-	echo $(test_oid zero) >expect &&
-	test_cmp expect hash &&
-	git fsck &&
+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
 
-	rm -f .git/index &&
-	git -c feature.manyFiles=true add a &&
-	test_trailing_hash .git/index >hash &&
-	cmp expect hash &&
+ok 6 - valid prefix HEAD:./path
 
-	rm -f .git/index &&
-	git -c feature.manyFiles=true \
-	    -c index.skipHash=false add a &&
-	test_trailing_hash .git/index >hash &&
-	! cmp expect hash &&
+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
 
-	test_commit start &&
-	git -c protocol.file.allow=always submodule add ./ sub &&
-	git config index.skipHash false &&
-	git -C sub config index.skipHash true &&
-	rm -f .git/modules/sub/index &&
-	>sub/file &&
-	git -C sub add a &&
-	test_trailing_hash .git/modules/sub/index >hash &&
-	test_cmp expect hash &&
-	git -C sub fsck
+ok 7 - valid prefix HEAD:../path
 
-warning: index.version set, but the value is invalid.
-Using version 3
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-warning: index.version set, but the value is invalid.
-Using version 3
-warning: index.version set, but the value is invalid.
-Using version 3
-expect hash differ: char 1, line 1
-[master (root-commit) 6d6aa2c] start
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 start.t
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1600-index/sub'...
-done.
-ok 6 - index.skipHash config option
+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
 
-expecting success of 1600.7 'index version config precedence': 
-	test_index_version 0 false 0 2 &&
-	test_index_version 2 false 0 2 &&
-	test_index_version 3 false 0 2 &&
-	test_index_version 4 false 0 4 &&
-	test_index_version 2 false 4 4 &&
-	test_index_version 2 true 0 2 &&
-	test_index_version 0 true 0 4 &&
-	test_index_version 0 true 2 2
+ok 8 - prefix ignored with HEAD:top
 
-ok 7 - index version config precedence
+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
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1800-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1800-hook/.git/
-expecting success of 1800.1 'git hook usage': 
-	test_expect_code 129 git hook &&
-	test_expect_code 129 git hook run &&
-	test_expect_code 129 git hook run -h &&
-	test_expect_code 129 git hook run --unknown 2>err &&
-	grep "unknown option" err
+ok 9 - disambiguate path with valid prefix
 
-error: need a subcommand
-usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+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
 
-usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+ok 10 - file and refs with prefix
 
-    --[no-]ignore-missing silently ignore missing requested <hook-name>
-    --[no-]to-stdin <path>
-                          file to read into hooks' stdin
+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
 
-usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+ok 11 - two-levels deep
 
-    --[no-]ignore-missing silently ignore missing requested <hook-name>
-    --[no-]to-stdin <path>
-                          file to read into hooks' stdin
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1514-rev-parse-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-error: unknown option `unknown'
-ok 1 - git hook usage
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1514-rev-parse-push/parent.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+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}
 
-ok 2 - git hook run: nonexistent hook
+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 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
+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 - git hook run: nonexistent hook with --ignore-missing
+ok 3 - @{push} with default=simple
 
-expecting success of 1800.4 'git hook run: basic': 
-	test_hook test-hook <<-EOF &&
-	echo Test hook
-	EOF
+expecting success of 1514.4 'triangular @{push} fails with default=simple': 
+	test_config push.default simple &&
+	test_must_fail git rev-parse topic@{push}
 
-	cat >expect <<-\EOF &&
-	Test hook
-	EOF
-	git hook run test-hook 2>actual &&
-	test_cmp expect actual
+fatal: cannot resolve 'simple' push to a single destination
+ok 4 - triangular @{push} fails with default=simple
 
-ok 4 - git hook run: basic
+expecting success of 1514.5 '@{push} with default=current': 
+	test_config push.default current &&
+	resolve topic@{push} refs/remotes/origin/topic
 
-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
+ok 5 - @{push} with default=current
 
-	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
+expecting success of 1514.6 '@{push} with default=matching': 
+	test_config push.default matching &&
+	resolve topic@{push} refs/remotes/origin/topic
 
-ok 5 - git hook run: stdout and stderr both write to our stderr
+ok 6 - @{push} with default=matching
 
-expecting success of 1800.6 'git hook run: exit code 1 is passed along': 
-		test_hook test-hook <<-EOF &&
-		exit $code
-		EOF
+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
 
-		test_expect_code $code git hook run test-hook
-	
-ok 6 - git hook run: exit code 1 is passed along
+ok 7 - @{push} with pushremote defined
 
-expecting success of 1800.7 'git hook run: exit code 2 is passed along': 
-		test_hook test-hook <<-EOF &&
-		exit $code
-		EOF
+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
 
-		test_expect_code $code git hook run test-hook
-	
-ok 7 - git hook run: exit code 2 is passed along
+To parent.git
+ * [new branch]      main -> magic/main
+ * [new branch]      topic -> magic/topic
+ok 8 - @{push} with push refspecs
 
-expecting success of 1800.8 'git hook run: exit code 128 is passed along': 
-		test_hook test-hook <<-EOF &&
-		exit $code
-		EOF
+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}
 
-		test_expect_code $code git hook run test-hook
-	
-ok 8 - git hook run: exit code 128 is passed along
+Note: switching to 'HEAD^0'.
 
-expecting success of 1800.9 'git hook run: exit code 129 is passed along': 
-		test_hook test-hook <<-EOF &&
-		exit $code
-		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_expect_code $code git hook run test-hook
-	
-ok 9 - git hook run: exit code 129 is passed along
+If you want to 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 1800.10 'git hook run arg u ments without -- is not allowed': 
-	test_expect_code 129 git hook run test-hook arg u ments
+  git switch -c <new-branch-name>
 
-usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+Or undo this operation with:
 
-    --[no-]ignore-missing silently ignore missing requested <hook-name>
-    --[no-]to-stdin <path>
-                          file to read into hooks' stdin
+  git switch -
 
-ok 10 - git hook run arg u ments without -- is not allowed
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1800.11 'git hook run -- pass arguments': 
-	test_hook test-hook <<-\EOF &&
-	echo $1
-	echo $2
-	EOF
+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
 
-	cat >expect <<-EOF &&
-	arg
-	u ments
-	EOF
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1512-rev-parse-disambiguation.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1512-rev-parse-disambiguation/.git/
+expecting success of 1512.1 'ambiguous blob output': 
+	git init --bare blob.prefix &&
+	(
+		cd blob.prefix &&
 
-	git hook run test-hook -- arg "u ments" 2>actual &&
-	test_cmp expect actual
+		# 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 &&
 
-ok 11 - git hook run -- pass arguments
+		# Both start with "beef.."
+		echo 1agllotbh | git hash-object -w --stdin &&
+		echo 1bbfctrkc | git hash-object -w --stdin
+	) &&
 
-expecting success of 1800.12 'git hook run -- out-of-repo runs excluded': 
-	test_hook test-hook <<-EOF &&
-	echo Test hook
+	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
 
-	nongit test_must_fail git hook run test-hook
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1512-rev-parse-disambiguation/blob.prefix/
+dead7b21a85f6dc7a24cbc4bb04a008db70bc04a
+dead9d36640e108d9eb449ed5966fd0c6d4e6b7f
+beefc9be42a87abd92326257a995bf20a24c788f
+beef2b0b99a5a8a36d91ea9ecd766af6352eafd9
+error: short object ID dead is ambiguous
+hint: The candidates are:
+hint:   dead7b2 blob
+hint:   dead9d3 blob
+fatal: ambiguous argument 'dead': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+dead
+beef
+ok 1 - ambiguous blob output
 
-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 1512.2 'ambiguous loose bad object parsed as OBJ_BAD': 
+	git init --bare blob.bad &&
+	(
+		cd blob.bad &&
 
-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
+		# 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
+	) &&
 
-	cat >expect <<-\EOF &&
-	Test hook
-	Hook ran one
-	Hook ran two
-	Hook ran three
-	Hook ran four
+	test_cmp_failed_rev_parse blob.bad bad0 <<-\EOF
+	error: short object ID bad0... is ambiguous
+	fatal: invalid object type
 	EOF
 
-	test_hook test-hook <<-EOF &&
-	echo Test hook
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1512-rev-parse-disambiguation/blob.bad/
+bad0bd4672dee1b4d3b8088534ed5a0362bc8d59
+bad0853730d9d114ac789f0ce89039d224bf66c9
+ok 2 - ambiguous loose bad object parsed as OBJ_BAD
 
-	# 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
+expecting success of 1512.3 'ambigous zlib corrupt loose blob': 
+	git init --bare blob.corrupt &&
+	(
+		cd blob.corrupt &&
 
-ok 13 - git -c core.hooksPath=<PATH> hook run
+		# Both have the prefix "cafe"
+		echo bnkxmdwz | git hash-object -w --stdin &&
+		oid=$(echo bmwsjxzi | git hash-object -w --stdin) &&
 
-checking prerequisite: TTY
+		oidf=objects/$(test_oid_to_path "$oid") &&
+		chmod 755 $oidf &&
+		echo broken >$oidf
+	) &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+	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
 
-	# 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.45.2/t/trash directory.t1512-rev-parse-disambiguation/blob.corrupt/
+cafe3f2e27174acdf9aa3a394d73714cdcf533d9
+cafe
+ok 3 - ambigous zlib corrupt loose blob
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+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 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
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1800-hook/repo/.git/
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ok 14 - git hook run: stdout and stderr are connected to a TTY
+	# create one blob 0000000000b36
+	git add a0blgqsjc &&
 
-expecting success of 1800.15 'git commit: stdout and stderr are connected to a TTY': 
-	test_hook_tty commit -m"B.new"
+	# create one tree 0000000000cdc
+	git write-tree
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1800-hook/repo/.git/
-[master (root-commit) a3899a0] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master 7763d60] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[master 990192d] B.new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ok 15 - git commit: stdout and stderr are connected to a TTY
+0000000000cdcf04beb2fab69e65622616294984
+ok 4 - blob and tree
 
-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 &&
+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
 
-	test_expect_code 1 git \
-		-c core.hooksPath=bad-hooks \
-		hook run test-hook >out 2>err &&
-	test_must_be_empty out &&
+error: short object ID 000000000 is ambiguous
+ok 5 - warn ambiguity when no candidate matches type hint
 
-	# 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
+expecting success of 1512.6 'disambiguate tree-ish': 
+	# feed tree-ish in an unambiguous way
+	git rev-parse --verify 0000000000cdc:a0blgqsjc &&
 
-fatal: cannot exec 'bad-hooks/test-hook': No such file or directory
-ok 16 - git hook run a hook with a bad shebang
+	# 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 1800.17 'stdin to hooks': 
-	write_script .git/hooks/test-hook <<-\EOF &&
-	echo BEGIN stdin
-	cat
-	echo END stdin
-	EOF
+0000000000b36b6aa7ea4b75318ed078f55505c3
+0000000000b36b6aa7ea4b75318ed078f55505c3
+ok 6 - disambiguate tree-ish
 
-	cat >expect <<-EOF &&
-	BEGIN stdin
-	hello
-	END stdin
+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
 
-	echo hello >input &&
-	git hook run --to-stdin=input test-hook 2>actual &&
-	test_cmp expect actual
+ok 7 - disambiguate blob
 
-ok 17 - stdin to hooks
+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)
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2000-conflict-when-checking-files-out.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.
+ok 8 - disambiguate tree
 
-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 1512.9 'first commit': 
+	# create one commit 0000000000e4f
+	git commit -m a2onsxbvj
 
-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.
+[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 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 1512.10 'disambiguate commit-ish': 
+	# feed commit-ish in an unambiguous way
+	git rev-parse --verify 0000000000e4f^{commit} &&
 
-checking prerequisite: SYMLINKS
+	# 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} &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+	# likewise
+	git rev-parse --verify 000000000^0
 
-)
-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/
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+ok 10 - disambiguate commit-ish
 
-first
-second
-ok 5 - checkout-index -f twice with --prefix
+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 2000.6 'git update-index --add path2/file0': git update-index --add path2/file0
-ok 6 - git update-index --add path2/file0
+ok 11 - disambiguate commit
 
-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 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...
 
-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 12 - log name1..name2 takes only commit-ishes on both ends
 
-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 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..
 
-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.
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+^0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+ok 13 - rev-parse name1..name2 takes only commit-ishes on both ends
 
-expecting success of 2000.11 'add a symlink': test_ln_s_add path2 path3
-ok 11 - add a symlink
+expecting success of 1512.14 'git log takes only commit-ish': 
+	# Likewise.
+	git log 000000000
 
-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
+commit 0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
 
-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.
+    a2onsxbvj
+ok 14 - git log takes only commit-ish
 
-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
+expecting success of 1512.15 'git reset takes only commit-ish': 
+	# Likewise.
+	git reset 000000000
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1700-split-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+ok 15 - git reset takes only commit-ish
 
-	base_v3 sha1:39d890139ee5356c7ef572216cebcd27aa41f9df
-	base_v3 sha256:c9baeadf905112bf6c17aefbd7d02267afd70ded613c30cafed2d40cb506e1ed
+expecting success of 1512.16 'first tag': 
+	# create one tag 0000000000f8f
+	git tag -a -m j7cp83um v1.0.0
 
-	own_v4 sha1:432ef4b63f32193984f339431fd50ca796493569
-	own_v4 sha256:6738ac6319c25b694afa7bcc313deb182d1a59b68bf7a47b4296de83478c0420
+ok 16 - first tag
 
-	base_v4 sha1:508851a7f0dfa8691e9f69c7f055865389012491
-	base_v4 sha256:3177d4adfdd4b6904f7e921d91d715a471c0dde7cf6a4bba574927f02b699508
-	EOF
+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} &&
 
-ok 1 - setup
+	# likewise
+	git log 0000000000..0000000000 &&
+	git log ..0000000000 &&
+	git log 0000000000.. &&
+	git log 0000000000...0000000000 &&
+	git log ...0000000000 &&
+	git log 0000000000...
 
-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) &&
+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
 
-	# 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 &&
+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}
 
-	cat >expect <<-EOF &&
-	own $own
-	base $base
-	replacements:
-	deletions:
-	EOF
-	test_cmp expect actual
+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 2 - enable split index
+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 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 &&
+	# 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
 
-	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
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+ok 19 - parse describe name
 
-ok 3 - add one file
+expecting success of 1512.20 'more history': 
+	# commit 0000000000043
+	git mv a0blgqsjc d12cr3h8t &&
+	echo h62xsjeu >>d12cr3h8t &&
+	git add d12cr3h8t &&
 
-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 &&
+	test_tick &&
+	git commit -m czy8f73t &&
 
-	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
+	# commit 00000000008ec
+	git mv d12cr3h8t j000jmpzn &&
+	echo j08bekfvt >>j000jmpzn &&
+	git add j000jmpzn &&
 
-ok 4 - disable split index
+	test_tick &&
+	git commit -m ioiley5o &&
 
-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 &&
+	# commit 0000000005b0
+	git checkout v1.0.0^0 &&
+	git mv a0blgqsjc f5518nwu &&
 
-	test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
-	cat >expect <<-EOF &&
-	$BASE
-	replacements:
-	deletions:
-	EOF
-	test_cmp expect actual
+	test_write_lines h62xsjeu j08bekfvt kg7xflhm >>f5518nwu &&
+	git add f5518nwu &&
 
-ok 5 - enable split index again, "one" now belongs to base index"
+	test_tick &&
+	git commit -m b3wettvi &&
+	side=$(git rev-parse HEAD) &&
 
-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 &&
+	# commit 000000000066
+	git checkout main &&
 
-	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
+	# If you use recursive, merge will fail and you will need to
+	# clean up a0blgqsjc as well.  If you use resolve, merge will
+	# succeed.
+	test_might_fail git merge --no-commit -s recursive $side &&
+	git rm -f f5518nwu j000jmpzn &&
 
-ok 6 - modify original file, base index untouched
+	test_might_fail git rm -f a0blgqsjc &&
+	(
+		git cat-file blob $side:f5518nwu &&
+		echo j3l0i9s6
+	) >ab2gs879 &&
+	git add ab2gs879 &&
 
-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_tick &&
+	git commit -m ad2uee
 
-	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
+
+[main 00000000000] czy8f73t
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename a0blgqsjc => d12cr3h8t (76%)
+[main 00000000008] ioiley5o
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename d12cr3h8t => j000jmpzn (79%)
+Note: switching to 'v1.0.0^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 0000000000e a2onsxbvj
+[detached HEAD 0000000005] b3wettvi
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ rename a0blgqsjc => f5518nwu (51%)
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  0000000005 b3wettvi
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 0000000005
+
+Switched to branch 'main'
+Auto-merging a0blgqsjc
+CONFLICT (rename/rename): a0blgqsjc renamed to j000jmpzn in HEAD and to f5518nwu in 0000000005b0d85f595e1a98533157ea161798da.
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'f5518nwu'
+rm 'j000jmpzn'
+rm 'a0blgqsjc'
+[main 00000000006] ad2uee
+ Author: A U Thor <author@example.com>
+ok 20 - more history
+
+checking known breakage of 1512.21 'parse describe name taking advantage of generation': 
+	# ambiguous at the object name level, but there is only one
+	# such commit at generation 0
+	git rev-parse --verify v1.0.0-0-g000000000 &&
+
+	# likewise for generation 2 and 4
+	git rev-parse --verify v1.0.0-2-g000000000 &&
+	git rev-parse --verify v1.0.0-4-g000000000
+
+fatal: Needed a single revision
+not ok 21 - parse describe name taking advantage of generation # TODO known breakage
+
+expecting success of 1512.22 'parse describe name not ignoring ambiguity': 
+	# ambiguous at the object name level, and there are two such
+	# commits at generation 1
+	test_must_fail git rev-parse --verify v1.0.0-1-g000000000
+
+fatal: Needed a single revision
+ok 22 - parse describe name not ignoring ambiguity
+
+expecting success of 1512.23 'ambiguous commit-ish': 
+	# Now there are many commits that begin with the
+	# common prefix, none of these should pick one at
+	# random.  They all should result in ambiguity errors.
+	test_must_fail git rev-parse --verify 00000000^{commit} &&
+
+	# likewise
+	test_must_fail git log 000000000..000000000 &&
+	test_must_fail git log ..000000000 &&
+	test_must_fail git log 000000000.. &&
+	test_must_fail git log 000000000...000000000 &&
+	test_must_fail git log ...000000000 &&
+	test_must_fail git log 000000000...
+
+error: short object ID 00000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: Needed a single revision
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '000000000..000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '..000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '000000000..': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '000000000...000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '...000000000': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+error: short object ID 000000000 is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+fatal: ambiguous argument '000000000...': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 23 - ambiguous commit-ish
+
+expecting success of 1512.24 'ambiguous tags peel to treeish': 
+	test_must_fail git rev-parse 0000000000f^{tree}
+
+error: short object ID 0000000000f is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   0000000000fd tree
+fatal: ambiguous argument '0000000000f^{tree}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+0000000000f^{tree}
+ok 24 - ambiguous tags peel to treeish
+
+expecting success of 1512.25 'rev-parse --disambiguate': 
+	# The test creates 16 objects that share the prefix and two
+	# commits created by commit-tree in earlier tests share a
+	# different prefix.
+	git rev-parse --disambiguate=000000000 >actual &&
+	test_line_count = 16 actual &&
+	test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
+
+ok 25 - rev-parse --disambiguate
+
+expecting success of 1512.26 'rev-parse --disambiguate drops duplicates': 
+	git rev-parse --disambiguate=000000000 >expect &&
+	git pack-objects .git/objects/pack/pack <expect &&
+	git rev-parse --disambiguate=000000000 >actual &&
+	test_cmp expect actual
+
+bdfb78b16a1cd3c3b1ebf4cca29330c92a46fc43
+ok 26 - rev-parse --disambiguate drops duplicates
+
+expecting success of 1512.27 'ambiguous 40-hex ref': 
+	TREE=$(git mktree </dev/null) &&
+	REF=$(git rev-parse HEAD) &&
+	VAL=$(git commit-tree $TREE </dev/null) &&
+	git update-ref refs/heads/$REF $VAL &&
+	test $(git rev-parse $REF 2>err) = $REF &&
+	grep "refname.*${REF}.*ambiguous" err
+
+warning: refname '0000000000663a70a94c2b280b575855256220fa' is ambiguous.
+ok 27 - ambiguous 40-hex ref
+
+expecting success of 1512.28 'ambiguous short sha1 ref': 
+	TREE=$(git mktree </dev/null) &&
+	REF=$(git rev-parse --short HEAD) &&
+	VAL=$(git commit-tree $TREE </dev/null) &&
+	git update-ref refs/heads/$REF $VAL &&
+	test $(git rev-parse $REF 2>err) = $VAL &&
+	grep "refname.*${REF}.*ambiguous" err
+
+warning: refname '00000000006' is ambiguous.
+ok 28 - ambiguous short sha1 ref
+
+expecting success of 1512.29 'ambiguity errors are not repeated (raw)': 
+	test_must_fail git rev-parse 00000 2>stderr &&
+	grep "is ambiguous" stderr >errors &&
+	test_line_count = 1 errors
+
+00000
+ok 29 - ambiguity errors are not repeated (raw)
+
+expecting success of 1512.30 'ambiguity errors are not repeated (treeish)': 
+	test_must_fail git rev-parse 00000:foo 2>stderr &&
+	grep "is ambiguous" stderr >errors &&
+	test_line_count = 1 errors
+
+00000:foo
+ok 30 - ambiguity errors are not repeated (treeish)
+
+expecting success of 1512.31 'ambiguity errors are not repeated (peel)': 
+	test_must_fail git rev-parse 00000^{commit} 2>stderr &&
+	grep "is ambiguous" stderr >errors &&
+	test_line_count = 1 errors
+
+00000^{commit}
+ok 31 - ambiguity errors are not repeated (peel)
+
+expecting success of 1512.32 'ambiguity hints': 
+	test_must_fail git rev-parse 000000000 2>stderr &&
+	grep ^hint: stderr >hints &&
+	# 16 candidates, plus one intro line
+	test_line_count = 17 hints
+
+000000000
+ok 32 - ambiguity hints
+
+expecting success of 1512.33 'ambiguity hints respect type': 
+	test_must_fail git rev-parse 000000000^{commit} 2>stderr &&
+	grep ^hint: stderr >hints &&
+	# 5 commits, 1 tag (which is a committish), plus intro line
+	test_line_count = 7 hints
+
+000000000^{commit}
+ok 33 - ambiguity hints respect type
+
+expecting success of 1512.34 'failed type-selector still shows hint': 
+	# these two blobs share the same prefix "ee3d", but neither
+	# will pass for a commit
+	echo 851 | git hash-object --stdin -w &&
+	echo 872 | git hash-object --stdin -w &&
+	test_must_fail git rev-parse ee3d^{commit} 2>stderr &&
+	grep ^hint: stderr >hints &&
+	test_line_count = 3 hints
+
+ee3de9906b5e9a4a369e91cba4235487a7e10351
+ee3d8abaa95a7395b373892b2593de2f426814e2
+ee3d^{commit}
+ok 34 - failed type-selector still shows hint
+
+expecting success of 1512.35 'core.disambiguate config can prefer types': 
+	# ambiguous between tree and tag
+	sha1=0000000000f &&
+	test_must_fail git rev-parse $sha1 &&
+	git rev-parse $sha1^{commit} &&
+	git -c core.disambiguate=committish rev-parse $sha1
+
+error: short object ID 0000000000f is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   0000000000fd tree
+hint:   0000000000f2 blob
+fatal: ambiguous argument '0000000000f': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+0000000000f
+0000000000e4f9fbd19cf1e932319e5ad0d1d00b
+0000000000f8f5507ab27a0d7bd3c75c0f64ffe0
+ok 35 - core.disambiguate config can prefer types
+
+expecting success of 1512.36 'core.disambiguate does not override context': 
+	# treeish ambiguous between tag and tree
+	test_must_fail \
+		git -c core.disambiguate=committish rev-parse $sha1^{tree}
+
+error: short object ID 0000000000f is ambiguous
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   0000000000fd tree
+fatal: ambiguous argument '0000000000f^{tree}': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+0000000000f^{tree}
+ok 36 - core.disambiguate does not override context
+
+expecting success of 1512.37 'ambiguous commits are printed by type first, then hash order': 
+	test_must_fail git rev-parse 0000 2>stderr &&
+	grep ^hint: stderr >hints &&
+	grep 0000 hints >objects &&
+	cat >expected <<-\EOF &&
+	tag
+	commit
+	tree
+	blob
+	EOF
+	awk "{print \$3}" <objects >objects.types &&
+	uniq <objects.types >objects.types.uniq &&
+	test_cmp expected objects.types.uniq &&
+	for type in tag commit tree blob
+	do
+		grep $type objects >$type.objects &&
+		sort $type.objects >$type.objects.sorted &&
+		test_cmp $type.objects.sorted $type.objects || return 1
+	done
+
+0000
+ok 37 - ambiguous commits are printed by type first, then hash order
+
+expecting success of 1512.38 'cat-file --batch and --batch-check show ambiguous': 
+	echo "0000 ambiguous" >expect &&
+	echo 0000 | git cat-file --batch-check >actual 2>err &&
+	test_cmp expect actual &&
+	test_grep hint: err &&
+	echo 0000 | git cat-file --batch >actual 2>err &&
+	test_cmp expect actual &&
+	test_grep hint: err
+
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+hint:   000000000002 tree
+hint:   00000000005 tree
+hint:   00000000009 tree
+hint:   0000000000c tree
+hint:   0000000000fd tree
+hint:   00000000001 blob
+hint:   00000000003 blob
+hint:   0000000000a blob
+hint:   0000000000b blob
+hint:   0000000000f2 blob
+hint: The candidates are:
+hint:   0000000000f8 tag 2005-04-07 - v1.0.0
+hint:   000000000004 commit 2005-04-07 - czy8f73t
+hint:   00000000006 commit 2005-04-07 - ad2uee
+hint:   00000000008 commit 2005-04-07 - ioiley5o
+hint:   0000000000e commit 2005-04-07 - a2onsxbvj
+hint:   0000000005 commit 2005-04-07 - b3wettvi
+hint:   000000000002 tree
+hint:   00000000005 tree
+hint:   00000000009 tree
+hint:   0000000000c tree
+hint:   0000000000fd tree
+hint:   00000000001 blob
+hint:   00000000003 blob
+hint:   0000000000a blob
+hint:   0000000000b blob
+hint:   0000000000f2 blob
+ok 38 - cat-file --batch and --batch-check show ambiguous
+
+# still have 3 known breakage(s)
+# passed all remaining 35 test(s)
+1..38
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1515-rev-parse-outside-repo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1601-index-bogus.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1600-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1600-index/.git/
+expecting success of 1600.1 'setup': 
+	echo 1 >a
+
+ok 1 - setup
+
+expecting success of 1600.2 'bogus GIT_INDEX_VERSION issues warning': 
+	(
+		rm -f .git/index &&
+		GIT_INDEX_VERSION=2bogus &&
+		export GIT_INDEX_VERSION &&
+		git add a 2>err &&
+		sed "s/[0-9]//" err >actual.err &&
+		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+			warning: GIT_INDEX_VERSION set, but the value is invalid.
+			Using version Z
+		EOF
+		test_cmp expect.err actual.err
+	)
+
+ok 2 - bogus GIT_INDEX_VERSION issues warning
+
+expecting success of 1600.3 'out of bounds GIT_INDEX_VERSION issues warning': 
+	(
+		rm -f .git/index &&
+		GIT_INDEX_VERSION=1 &&
+		export GIT_INDEX_VERSION &&
+		git add a 2>err &&
+		sed "s/[0-9]//" err >actual.err &&
+		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+			warning: GIT_INDEX_VERSION set, but the value is invalid.
+			Using version Z
+		EOF
+		test_cmp expect.err actual.err
+	)
+
+ok 3 - out of bounds GIT_INDEX_VERSION issues warning
+
+expecting success of 1600.4 'no warning with bogus GIT_INDEX_VERSION and existing index': 
+	(
+		GIT_INDEX_VERSION=1 &&
+		export GIT_INDEX_VERSION &&
+		git add a 2>actual.err &&
+		test_must_be_empty actual.err
+	)
+
+ok 4 - no warning with bogus GIT_INDEX_VERSION and existing index
+
+expecting success of 1600.5 'out of bounds index.version issues warning': 
+	(
+		sane_unset GIT_INDEX_VERSION &&
+		rm -f .git/index &&
+		git config --add index.version 1 &&
+		git add a 2>err &&
+		sed "s/[0-9]//" err >actual.err &&
+		sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
+			warning: index.version set, but the value is invalid.
+			Using version Z
+		EOF
+		test_cmp expect.err actual.err
+	)
+
+ok 5 - out of bounds index.version issues warning
+
+expecting success of 1600.6 'index.skipHash config option': 
+	rm -f .git/index &&
+	git -c index.skipHash=true add a &&
+	test_trailing_hash .git/index >hash &&
+	echo $(test_oid zero) >expect &&
+	test_cmp expect hash &&
+	git fsck &&
+
+	rm -f .git/index &&
+	git -c feature.manyFiles=true add a &&
+	test_trailing_hash .git/index >hash &&
+	cmp expect hash &&
+
+	rm -f .git/index &&
+	git -c feature.manyFiles=true \
+	    -c index.skipHash=false add a &&
+	test_trailing_hash .git/index >hash &&
+	! cmp expect hash &&
+
+	test_commit start &&
+	git -c protocol.file.allow=always submodule add ./ sub &&
+	git config index.skipHash false &&
+	git -C sub config index.skipHash true &&
+	rm -f .git/modules/sub/index &&
+	>sub/file &&
+	git -C sub add a &&
+	test_trailing_hash .git/modules/sub/index >hash &&
+	test_cmp expect hash &&
+	git -C sub fsck
+
+warning: index.version set, but the value is invalid.
+Using version 3
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+warning: index.version set, but the value is invalid.
+Using version 3
+warning: index.version set, but the value is invalid.
+Using version 3
+expect hash differ: char 1, line 1
+[master (root-commit) 6d6aa2c] start
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 start.t
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1600-index/sub'...
+done.
+ok 6 - index.skipHash config option
+
+expecting success of 1600.7 'index version config precedence': 
+	test_index_version 0 false 0 2 &&
+	test_index_version 2 false 0 2 &&
+	test_index_version 3 false 0 2 &&
+	test_index_version 4 false 0 4 &&
+	test_index_version 2 false 4 4 &&
+	test_index_version 2 true 0 2 &&
+	test_index_version 0 true 0 4 &&
+	test_index_version 0 true 2 2
+
+ok 7 - index version config precedence
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1700-split-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
@@ -99830,7 +100643,7 @@
 	test_cmp expect actual
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1700-split-index/reading-alternate-location/.git/
-renamed './reading-alternate-location/.git/sharedindex.15660b77b4d274d05050119efcfbcbbeead7b849' -> '.git/sharedindex.15660b77b4d274d05050119efcfbcbbeead7b849'
+renamed './reading-alternate-location/.git/sharedindex.dc41edf794857a2bfb19ee2c6b2453d89379975e' -> '.git/sharedindex.dc41edf794857a2bfb19ee2c6b2453d89379975e'
 ok 28 - reading split index at alternate location
 
 expecting success of 1700.29 'GIT_TEST_SPLIT_INDEX works': 
@@ -99850,6 +100663,281 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t1800-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1800-hook/.git/
+expecting success of 1800.1 'git hook usage': 
+	test_expect_code 129 git hook &&
+	test_expect_code 129 git hook run &&
+	test_expect_code 129 git hook run -h &&
+	test_expect_code 129 git hook run --unknown 2>err &&
+	grep "unknown option" err
+
+error: need a subcommand
+usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+
+usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+
+    --[no-]ignore-missing silently ignore missing requested <hook-name>
+    --[no-]to-stdin <path>
+                          file to read into hooks' stdin
+
+usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+
+    --[no-]ignore-missing silently ignore missing requested <hook-name>
+    --[no-]to-stdin <path>
+                          file to read into hooks' stdin
+
+error: unknown option `unknown'
+ok 1 - git hook usage
+
+expecting success of 1800.2 'git hook run: nonexistent hook': 
+	cat >stderr.expect <<-\EOF &&
+	error: cannot find a hook named test-hook
+	EOF
+	test_expect_code 1 git hook run test-hook 2>stderr.actual &&
+	test_cmp stderr.expect stderr.actual
+
+ok 2 - git hook run: nonexistent hook
+
+expecting success of 1800.3 'git hook run: nonexistent hook with --ignore-missing': 
+	git hook run --ignore-missing does-not-exist 2>stderr.actual &&
+	test_must_be_empty stderr.actual
+
+ok 3 - git hook run: nonexistent hook with --ignore-missing
+
+expecting success of 1800.4 'git hook run: basic': 
+	test_hook test-hook <<-EOF &&
+	echo Test hook
+	EOF
+
+	cat >expect <<-\EOF &&
+	Test hook
+	EOF
+	git hook run test-hook 2>actual &&
+	test_cmp expect actual
+
+ok 4 - git hook run: basic
+
+expecting success of 1800.5 'git hook run: stdout and stderr both write to our stderr': 
+	test_hook test-hook <<-EOF &&
+	echo >&1 Will end up on stderr
+	echo >&2 Will end up on stderr
+	EOF
+
+	cat >stderr.expect <<-\EOF &&
+	Will end up on stderr
+	Will end up on stderr
+	EOF
+	git hook run test-hook >stdout.actual 2>stderr.actual &&
+	test_cmp stderr.expect stderr.actual &&
+	test_must_be_empty stdout.actual
+
+ok 5 - git hook run: stdout and stderr both write to our stderr
+
+expecting success of 1800.6 'git hook run: exit code 1 is passed along': 
+		test_hook test-hook <<-EOF &&
+		exit $code
+		EOF
+
+		test_expect_code $code git hook run test-hook
+	
+ok 6 - git hook run: exit code 1 is passed along
+
+expecting success of 1800.7 'git hook run: exit code 2 is passed along': 
+		test_hook test-hook <<-EOF &&
+		exit $code
+		EOF
+
+		test_expect_code $code git hook run test-hook
+	
+ok 7 - git hook run: exit code 2 is passed along
+
+expecting success of 1800.8 'git hook run: exit code 128 is passed along': 
+		test_hook test-hook <<-EOF &&
+		exit $code
+		EOF
+
+		test_expect_code $code git hook run test-hook
+	
+ok 8 - git hook run: exit code 128 is passed along
+
+expecting success of 1800.9 'git hook run: exit code 129 is passed along': 
+		test_hook test-hook <<-EOF &&
+		exit $code
+		EOF
+
+		test_expect_code $code git hook run test-hook
+	
+ok 9 - git hook run: exit code 129 is passed along
+
+expecting success of 1800.10 'git hook run arg u ments without -- is not allowed': 
+	test_expect_code 129 git hook run test-hook arg u ments
+
+usage: git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]
+
+    --[no-]ignore-missing silently ignore missing requested <hook-name>
+    --[no-]to-stdin <path>
+                          file to read into hooks' stdin
+
+ok 10 - git hook run arg u ments without -- is not allowed
+
+expecting success of 1800.11 'git hook run -- pass arguments': 
+	test_hook test-hook <<-\EOF &&
+	echo $1
+	echo $2
+	EOF
+
+	cat >expect <<-EOF &&
+	arg
+	u ments
+	EOF
+
+	git hook run test-hook -- arg "u ments" 2>actual &&
+	test_cmp expect actual
+
+ok 11 - git hook run -- pass arguments
+
+expecting success of 1800.12 'git hook run -- out-of-repo runs excluded': 
+	test_hook test-hook <<-EOF &&
+	echo Test hook
+	EOF
+
+	nongit test_must_fail git hook run test-hook
+
+fatal: not a git repository (or any of the parent directories): .git
+ok 12 - git hook run -- out-of-repo runs excluded
+
+expecting success of 1800.13 'git -c core.hooksPath=<PATH> hook run': 
+	mkdir my-hooks &&
+	write_script my-hooks/test-hook <<-\EOF &&
+	echo Hook ran $1
+	EOF
+
+	cat >expect <<-\EOF &&
+	Test hook
+	Hook ran one
+	Hook ran two
+	Hook ran three
+	Hook ran four
+	EOF
+
+	test_hook test-hook <<-EOF &&
+	echo Test hook
+	EOF
+
+	# Test various ways of specifying the path. See also
+	# t1350-config-hooks-path.sh
+	>actual &&
+	git hook run test-hook -- ignored 2>>actual &&
+	git -c core.hooksPath=my-hooks hook run test-hook -- one 2>>actual &&
+	git -c core.hooksPath=my-hooks/ hook run test-hook -- two 2>>actual &&
+	git -c core.hooksPath="$PWD/my-hooks" hook run test-hook -- three 2>>actual &&
+	git -c core.hooksPath="$PWD/my-hooks/" hook run test-hook -- four 2>>actual &&
+	test_cmp expect actual
+
+ok 13 - git -c core.hooksPath=<PATH> hook run
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 1800.14 'git hook run: stdout and stderr are connected to a TTY': 
+	test_hook_tty hook run pre-commit
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1800-hook/repo/.git/
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ok 14 - git hook run: stdout and stderr are connected to a TTY
+
+expecting success of 1800.15 'git commit: stdout and stderr are connected to a TTY': 
+	test_hook_tty commit -m"B.new"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1800-hook/repo/.git/
+[master (root-commit) a3899a0] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master 7763d60] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[master 990192d] B.new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ok 15 - git commit: stdout and stderr are connected to a TTY
+
+expecting success of 1800.16 'git hook run a hook with a bad shebang': 
+	test_when_finished "rm -rf bad-hooks" &&
+	mkdir bad-hooks &&
+	write_script bad-hooks/test-hook "/bad/path/no/spaces" </dev/null &&
+
+	test_expect_code 1 git \
+		-c core.hooksPath=bad-hooks \
+		hook run test-hook >out 2>err &&
+	test_must_be_empty out &&
+
+	# TODO: We should emit the same (or at least a more similar)
+	# error on MINGW (essentially Git for Windows) and all other
+	# platforms.. See the OS-specific code in start_command()
+	grep -E "^(error|fatal): cannot (exec|spawn) .*bad-hooks/test-hook" err
+
+fatal: cannot exec 'bad-hooks/test-hook': No such file or directory
+ok 16 - git hook run a hook with a bad shebang
+
+expecting success of 1800.17 'stdin to hooks': 
+	write_script .git/hooks/test-hook <<-\EOF &&
+	echo BEGIN stdin
+	cat
+	echo END stdin
+	EOF
+
+	cat >expect <<-EOF &&
+	BEGIN stdin
+	hello
+	END stdin
+	EOF
+
+	echo hello >input &&
+	git hook run --to-stdin=input test-hook 2>actual &&
+	test_cmp expect actual
+
+ok 17 - stdin to hooks
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2002-checkout-cache-u.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2002-checkout-cache-u/.git/
 expecting success of 2002.1 'preparation': 
@@ -99877,6 +100965,78 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2000-conflict-when-checking-files-out.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2003-checkout-cache-mkdir.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2003-checkout-cache-mkdir/.git/
 expecting success of 2003.1 'setup': 
@@ -100154,7 +101314,7 @@
 	git checkout-index --stage=all -- path1 &&
 	test_path_is_missing path1
 
-.merge_file_O5G0uT .merge_file_Phqs89 .merge_file_b3k43a	path1
+.merge_file_FzaMkO .merge_file_UOfVJy .merge_file_C0Ot4l	path1
 ok 10 - --stage=all implies --temp
 
 expecting success of 2004.11 'overriding --stage=all resets implied --temp': 
@@ -100310,6 +101470,87 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2007-checkout-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2007-checkout-symlink/.git/
+expecting success of 2007.1 'setup': 
+
+	mkdir frotz &&
+	echo hello >frotz/filfre &&
+	git add frotz/filfre &&
+	test_tick &&
+	git commit -m "main has file frotz/filfre" &&
+
+	git branch side &&
+
+	echo goodbye >nitfol &&
+	git add nitfol &&
+	test_tick &&
+	git commit -m "main adds file nitfol" &&
+
+	git checkout side &&
+
+	git rm --cached frotz/filfre &&
+	mv frotz xyzzy &&
+	test_ln_s_add xyzzy frotz &&
+	git add xyzzy/filfre &&
+	test_tick &&
+	git commit -m "side moves frotz/ to xyzzy/ and adds frotz->xyzzy/"
+
+
+[main (root-commit) 608bc3a] main has file frotz/filfre
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 frotz/filfre
+[main f539081] main adds file nitfol
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 nitfol
+Switched to branch 'side'
+rm 'frotz/filfre'
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[side dc669bf] side moves frotz/ to xyzzy/ and adds frotz->xyzzy/
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 120000 frotz
+ rename {frotz => xyzzy}/filfre (100%)
+ok 1 - setup
+
+expecting success of 2007.2 'switch from symlink to dir': 
+
+	git checkout main
+
+
+Switched to branch 'main'
+ok 2 - switch from symlink to dir
+
+expecting success of 2007.3 'Remove temporary directories & switch to main': 
+	rm -fr frotz xyzzy nitfol &&
+	git checkout -f main
+
+Already on 'main'
+ok 3 - Remove temporary directories & switch to main
+
+expecting success of 2007.4 'switch from dir to symlink': 
+
+	git checkout side
+
+
+Switched to branch 'side'
+ok 4 - switch from dir to symlink
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2006-checkout-index-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2006-checkout-index-basic/.git/
 expecting success of 2006.1 'checkout-index --gobbledegook': 
@@ -100399,7 +101640,7 @@
 	test_grep "unable to read sha1 file of file ($missing_blob)" stderr &&
 	test_grep "unable to read sha1 file of symlink ($missing_blob)" stderr
 
-.merge_file_JSTZPd	file
+.merge_file_mWD6XD	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
@@ -100430,87 +101671,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2007-checkout-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2007-checkout-symlink/.git/
-expecting success of 2007.1 'setup': 
-
-	mkdir frotz &&
-	echo hello >frotz/filfre &&
-	git add frotz/filfre &&
-	test_tick &&
-	git commit -m "main has file frotz/filfre" &&
-
-	git branch side &&
-
-	echo goodbye >nitfol &&
-	git add nitfol &&
-	test_tick &&
-	git commit -m "main adds file nitfol" &&
-
-	git checkout side &&
-
-	git rm --cached frotz/filfre &&
-	mv frotz xyzzy &&
-	test_ln_s_add xyzzy frotz &&
-	git add xyzzy/filfre &&
-	test_tick &&
-	git commit -m "side moves frotz/ to xyzzy/ and adds frotz->xyzzy/"
-
-
-[main (root-commit) 608bc3a] main has file frotz/filfre
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 frotz/filfre
-[main f539081] main adds file nitfol
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nitfol
-Switched to branch 'side'
-rm 'frotz/filfre'
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[side dc669bf] side moves frotz/ to xyzzy/ and adds frotz->xyzzy/
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 frotz
- rename {frotz => xyzzy}/filfre (100%)
-ok 1 - setup
-
-expecting success of 2007.2 'switch from symlink to dir': 
-
-	git checkout main
-
-
-Switched to branch 'main'
-ok 2 - switch from symlink to dir
-
-expecting success of 2007.3 'Remove temporary directories & switch to main': 
-	rm -fr frotz xyzzy nitfol &&
-	git checkout -f main
-
-Already on 'main'
-ok 3 - Remove temporary directories & switch to main
-
-expecting success of 2007.4 'switch from dir to symlink': 
-
-	git checkout side
-
-
-Switched to branch 'side'
-ok 4 - switch from dir to symlink
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2008-checkout-subdir.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2008-checkout-subdir/.git/
 expecting success of 2008.1 'setup': 
@@ -101295,6 +102455,432 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2015-checkout-unborn.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2015-checkout-unborn/parent/.git/
+[main (root-commit) 5d770fe] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+From parent
+ * [new branch]      main       -> origin
+ok 1 - setup
+
+expecting success of 2015.2 'checkout from unborn preserves untracked files': 
+	echo precious >expect &&
+	echo precious >file &&
+	test_must_fail git checkout -b new origin &&
+	test_cmp expect file
+
+error: The following untracked working tree files would be overwritten by checkout:
+	file
+Please move or remove them before you switch branches.
+Aborting
+ok 2 - checkout from unborn preserves untracked files
+
+expecting success of 2015.3 'checkout from unborn preserves index contents': 
+	echo precious >expect &&
+	echo precious >file &&
+	git add file &&
+	test_must_fail git checkout -b new origin &&
+	test_cmp expect file &&
+	git show :file >file &&
+	test_cmp expect file
+
+error: Your local changes to the following files would be overwritten by checkout:
+	file
+Please commit your changes or stash them before you switch branches.
+Aborting
+ok 3 - checkout from unborn preserves index contents
+
+expecting success of 2015.4 'checkout from unborn merges identical index contents': 
+	echo content >file &&
+	git add file &&
+	git checkout -b new origin
+
+Switched to a new branch 'new'
+ok 4 - checkout from unborn merges identical index contents
+
+expecting success of 2015.5 'checking out another branch from unborn state': 
+	git checkout --orphan newroot &&
+	git checkout -b anothername &&
+	test_must_fail git show-ref --verify refs/heads/newroot &&
+	git symbolic-ref HEAD >actual &&
+	echo refs/heads/anothername >expect &&
+	test_cmp expect actual
+
+Switched to a new branch 'newroot'
+Switched to a new branch 'anothername'
+fatal: 'refs/heads/newroot' - not a valid ref
+ok 5 - checking out another branch from unborn state
+
+expecting success of 2015.6 'checking out in a newly created repo': 
+	test_create_repo empty &&
+	(
+		cd empty &&
+		git symbolic-ref HEAD >expect &&
+		test_must_fail git checkout &&
+		git symbolic-ref HEAD >actual &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2016-checkout-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+The selected hunks do not apply to the index!
+Nothing was applied.
+
+(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,?]? Apply them to the worktree anyway? 
+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
+The selected hunks do not apply to the index!
+(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,?]? Apply them to the worktree anyway? 
+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
+The selected hunks do not apply to the index!
+Nothing was applied.
+
+(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,?]? Apply them to the worktree anyway? 
+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
+The selected hunks do not apply to the index!
+(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,?]? Apply them to the worktree anyway? 
+ok 9 - git checkout -p @ with NO staged changes: apply
+
+expecting success of 2016.10 'git checkout -p @ with change already staged': 
+		set_state dir/foo index index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git checkout -p $opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head head &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from index and worktree [y,n,q,a,d,e,p,?]? 
+ok 10 - git checkout -p @ with change already staged
+
+expecting success of 2016.11 'git checkout -p HEAD^...': 
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git checkout -p HEAD^... &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 11 - git checkout -p HEAD^...
+
+expecting success of 2016.12 'git checkout -p HEAD^': 
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git checkout -p HEAD^ &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 12 - git checkout -p HEAD^
+
+expecting success of 2016.13 'git checkout -p handles deletion': 
+	set_state dir/foo work index &&
+	rm dir/foo &&
+	test_write_lines n y | git checkout -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+deleted file mode 100644
+index 9015a7a..0000000
+--- a/dir/foo
++++ /dev/null
+@@ -1 +0,0 @@
+-index
+(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
+ok 13 - git checkout -p handles deletion
+
+expecting success of 2016.14 'path limiting works: dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git checkout -p dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 14 - path limiting works: dir
+
+expecting success of 2016.15 'path limiting works: -- dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git checkout -p -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 15 - path limiting works: -- dir
+
+expecting success of 2016.16 'path limiting works: HEAD^ -- dir': 
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | git checkout -p HEAD^ -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
+
+diff --git b/dir/foo a/dir/foo
+index 564b12f..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-head
++parent
+(1/1) Apply this hunk to index and worktree [y,n,q,a,d,e,p,?]? 
+ok 16 - path limiting works: HEAD^ -- dir
+
+expecting success of 2016.17 'path limiting works: foo inside dir': 
+	set_state dir/foo work head &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | (cd dir && git checkout -p foo) &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 17 - path limiting works: foo inside dir
+
+expecting success of 2016.18 'none of this moved HEAD': 
+	verify_saved_head
+
+ok 18 - none of this moved HEAD
+
+expecting success of 2016.19 'empty tree can be handled': 
+	test_when_finished "git reset --hard" &&
+	git checkout -p $(test_oid empty_tree) --
+
+diff --git b/bar a/bar
+deleted file mode 100644
+index 8c999e6..0000000
+--- b/bar
++++ /dev/null
+@@ -1 +0,0 @@
+-bar_work
+(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
+diff --git b/dir/foo a/dir/foo
+deleted file mode 100644
+index 564b12f..0000000
+--- b/dir/foo
++++ /dev/null
+@@ -1 +0,0 @@
+-head
+(1/1) Apply deletion to index and worktree [y,n,q,a,d,p,?]? 
+HEAD is now at 3319288 second
+ok 19 - empty tree can be handled
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t1510-repo-setup.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1510-repo-setup/.git/
 expecting success of 1510.1 '#0: nonbare repo, no explicit configuration': 
@@ -102695,94 +104281,6 @@
 1..109
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2015-checkout-unborn.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2015-checkout-unborn/parent/.git/
-[main (root-commit) 5d770fe] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-From parent
- * [new branch]      main       -> origin
-ok 1 - setup
-
-expecting success of 2015.2 'checkout from unborn preserves untracked files': 
-	echo precious >expect &&
-	echo precious >file &&
-	test_must_fail git checkout -b new origin &&
-	test_cmp expect file
-
-error: The following untracked working tree files would be overwritten by checkout:
-	file
-Please move or remove them before you switch branches.
-Aborting
-ok 2 - checkout from unborn preserves untracked files
-
-expecting success of 2015.3 'checkout from unborn preserves index contents': 
-	echo precious >expect &&
-	echo precious >file &&
-	git add file &&
-	test_must_fail git checkout -b new origin &&
-	test_cmp expect file &&
-	git show :file >file &&
-	test_cmp expect file
-
-error: Your local changes to the following files would be overwritten by checkout:
-	file
-Please commit your changes or stash them before you switch branches.
-Aborting
-ok 3 - checkout from unborn preserves index contents
-
-expecting success of 2015.4 'checkout from unborn merges identical index contents': 
-	echo content >file &&
-	git add file &&
-	git checkout -b new origin
-
-Switched to a new branch 'new'
-ok 4 - checkout from unborn merges identical index contents
-
-expecting success of 2015.5 'checking out another branch from unborn state': 
-	git checkout --orphan newroot &&
-	git checkout -b anothername &&
-	test_must_fail git show-ref --verify refs/heads/newroot &&
-	git symbolic-ref HEAD >actual &&
-	echo refs/heads/anothername >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'newroot'
-Switched to a new branch 'anothername'
-fatal: 'refs/heads/newroot' - not a valid ref
-ok 5 - checking out another branch from unborn state
-
-expecting success of 2015.6 'checking out in a newly created repo': 
-	test_create_repo empty &&
-	(
-		cd empty &&
-		git symbolic-ref HEAD >expect &&
-		test_must_fail git checkout &&
-		git symbolic-ref HEAD >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2017-checkout-orphan.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2017-checkout-orphan/.git/
 expecting success of 2017.1 'Setup': 
@@ -102995,342 +104493,958 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2016-checkout-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
+*** t1701-racy-split-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1701-racy-split-index/.git/
+expecting success of 1701.1 'setup': 
+	# Only split the index when the test explicitly says so.
+	sane_unset GIT_TEST_SPLIT_INDEX &&
+	git config splitIndex.maxPercentChange 100 &&
+
+	echo "cached content" >racy-file &&
+	git add racy-file &&
 	git commit -m initial &&
-	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
+	echo something >other-file &&
+	# No raciness with this file.
+	test-tool chmtime =-20 other-file &&
+
+	echo "+cached content" >expect
+
+[master (root-commit) a4904a4] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 racy-file
 ok 1 - setup
 
-expecting success of 2016.2 'saying "n" does nothing': 
-	set_and_save_state dir/foo work head &&
-	test_write_lines n n | git checkout -p &&
-	verify_saved_state bar &&
-	verify_saved_state dir/foo
+expecting success of 1701.2 'split the index while adding a racily clean file #0': 
+		rm -f .git/index .git/sharedindex.* &&
 
-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
+		# 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 2016.3 'git checkout -p': 
-	test_write_lines n y | git checkout -p &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+		# 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 &&
 
-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
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-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
+		# 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
 
-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 1701.3 'split the index while adding a racily clean file #1': 
+		rm -f .git/index .git/sharedindex.* &&
 
-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
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
 	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-The selected hunks do not apply to the index!
-Nothing was applied.
+ok 3 - split the index while adding a racily clean file #1
 
-(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,?]? Apply them to the worktree anyway? 
-ok 5 - git checkout -p HEAD with NO staged changes: abort
+expecting success of 1701.4 'split the index while adding a racily clean file #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-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
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
 	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-The selected hunks do not apply to the index!
-(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,?]? Apply them to the worktree anyway? 
-ok 6 - git checkout -p HEAD with NO staged changes: apply
+ok 4 - split the index while adding a racily clean file #2
 
-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
+expecting success of 1701.5 'split the index while adding a racily clean file #3': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
 	
-(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
+ok 5 - split the index while adding a racily clean file #3
 
-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
+expecting success of 1701.6 'split the index while adding a racily clean file #4': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second (so both writes to racy-file result in the same
+		# mtime) to create the interesting racy situation.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
 	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-The selected hunks do not apply to the index!
-Nothing was applied.
+ok 6 - split the index while adding a racily clean file #4
 
-(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,?]? Apply them to the worktree anyway? 
-ok 8 - git checkout -p @ with NO staged changes: abort
+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 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
+		git update-index --split-index &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
 	
-error: patch failed: dir/foo:1
-error: dir/foo: patch does not apply
-The selected hunks do not apply to the index!
-(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,?]? Apply them to the worktree anyway? 
-ok 9 - git checkout -p @ with NO staged changes: apply
+ok 7 - add a racily clean file to an already split index #0
 
-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
+expecting success of 1701.8 'add a racily clean file to an already split index #1': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		git update-index --split-index &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
 	
-(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
+ok 8 - add a racily clean file to an already split index #1
 
-expecting success of 2016.11 'git checkout -p HEAD^...': 
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines n y n | git checkout -p HEAD^... &&
-	verify_saved_state bar &&
-	verify_state dir/foo parent parent
+expecting success of 1701.9 'add a racily clean file to an already split index #2': 
+		rm -f .git/index .git/sharedindex.* &&
 
-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^...
+		git update-index --split-index &&
 
-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
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-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^
+		# 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 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
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-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
+		# 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 2016.14 'path limiting works: dir': 
-	set_state dir/foo work head &&
-	test_write_lines y n | git checkout -p dir &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 1701.10 'add a racily clean file to an already split index #3': 
+		rm -f .git/index .git/sharedindex.* &&
 
-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
+		git update-index --split-index &&
 
-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
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-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
+		# 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 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
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-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
+		# Subsequent git commands should notice that racy-file
+		# and the split index have the same mtime, and check
+		# the content of the file to see if it is actually
+		# clean.
+		check_cached_diff
+	
+ok 10 - add a racily clean file to an already split index #3
 
-expecting success of 2016.17 'path limiting works: foo inside dir': 
-	set_state dir/foo work head &&
-	# the third n is to get out in case it mistakenly does not apply
-	test_write_lines y n n | (cd dir && git checkout -p foo) &&
-	verify_saved_state bar &&
-	verify_state dir/foo head head
+expecting success of 1701.11 'add a racily clean file to an already split index #4': 
+		rm -f .git/index .git/sharedindex.* &&
 
-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
+		git update-index --split-index &&
 
-expecting success of 2016.18 'none of this moved HEAD': 
-	verify_saved_head
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
 
-ok 18 - none of this moved HEAD
+		# 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 2016.19 'empty tree can be handled': 
-	test_when_finished "git reset --hard" &&
-	git checkout -p $(test_oid empty_tree) --
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
 
-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
+		# 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
 
-# passed all 19 test(s)
-1..19
+expecting success of 1701.12 'split the index when the index contains a racily clean cache entry #0': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 12 - split the index when the index contains a racily clean cache entry #0
+
+expecting success of 1701.13 'split the index when the index contains a racily clean cache entry #1': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 13 - split the index when the index contains a racily clean cache entry #1
+
+expecting success of 1701.14 'split the index when the index contains a racily clean cache entry #2': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 14 - split the index when the index contains a racily clean cache entry #2
+
+expecting success of 1701.15 'split the index when the index contains a racily clean cache entry #3': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 15 - split the index when the index contains a racily clean cache entry #3
+
+expecting success of 1701.16 'split the index when the index contains a racily clean cache entry #4': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update and split the index when the index contains
+		# the racily clean cache entry of racy-file.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --split-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data in the replacement cache entry and that it
+		# doesnt match with the file the worktree.
+		check_cached_diff
+	
+ok 16 - split the index when the index contains a racily clean cache entry #4
+
+expecting success of 1701.17 'update the split index when it contains a new racily clean cache entry #0': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		git update-index --split-index &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 17 - update the split index when it contains a new racily clean cache entry #0
+
+expecting success of 1701.18 'update the split index when it contains a new racily clean cache entry #1': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		git update-index --split-index &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 18 - update the split index when it contains a new racily clean cache entry #1
+
+expecting success of 1701.19 'update the split index when it contains a new racily clean cache entry #2': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		git update-index --split-index &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 19 - update the split index when it contains a new racily clean cache entry #2
+
+expecting success of 1701.20 'update the split index when it contains a new racily clean cache entry #3': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		git update-index --split-index &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 20 - update the split index when it contains a new racily clean cache entry #3
+
+expecting success of 1701.21 'update the split index when it contains a new racily clean cache entry #4': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		git update-index --split-index &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update the split index.  The cache entry of racy-file
+		# will be stored only in the split index.
+		git update-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the split index.
+		# An updated cache entry with smudged stat data should
+		# be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 21 - update the split index when it contains a new racily clean cache entry #4
+
+expecting success of 1701.22 'update the split index when a racily clean cache entry is stored only in the shared index #0': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 22 - update the split index when a racily clean cache entry is stored only in the shared index #0
+
+expecting success of 1701.23 'update the split index when a racily clean cache entry is stored only in the shared index #1': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 23 - update the split index when a racily clean cache entry is stored only in the shared index #1
+
+expecting success of 1701.24 'update the split index when a racily clean cache entry is stored only in the shared index #2': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 24 - update the split index when a racily clean cache entry is stored only in the shared index #2
+
+expecting success of 1701.25 'update the split index when a racily clean cache entry is stored only in the shared index #3': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 25 - update the split index when a racily clean cache entry is stored only in the shared index #3
+
+expecting success of 1701.26 'update the split index when a racily clean cache entry is stored only in the shared index #4': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index when the racily clean cache
+		# entry of racy-file is only stored in the shared index.
+		# A corresponding replacement cache entry with smudged
+		# stat data should be added to the new split index.
+		git update-index --add other-file &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 26 - update the split index when a racily clean cache entry is stored only in the shared index #4
+
+expecting success of 1701.27 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #0': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 27 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #0
+
+expecting success of 1701.28 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #1': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 28 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #1
+
+expecting success of 1701.29 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #2': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 29 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #2
+
+expecting success of 1701.30 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #3': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 30 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #3
+
+expecting success of 1701.31 'update the split index after unpack trees() copied a racily clean cache entry from the shared index #4': 
+		rm -f .git/index .git/sharedindex.* &&
+
+		# The next three commands must be run within the same
+		# second.
+		echo "cached content" >racy-file &&
+
+		# Update and split the index.  The cache entry of
+		# racy-file will be stored only in the shared index.
+		git update-index --split-index --add racy-file &&
+
+		# File size must stay the same.
+		echo "dirty worktree" >racy-file &&
+
+		# Now wait a bit to ensure that the split index written
+		# below will get a more recent mtime than racy-file.
+		sleep 1 &&
+
+		# Update the split index after unpack_trees() copied the
+		# racily clean cache entry of racy-file from the shared
+		# index.  A corresponding replacement cache entry
+		# with smudged stat data should be added to the new
+		# split index.
+		git read-tree -m HEAD &&
+
+		# Subsequent git commands should notice the smudged
+		# stat data.
+		check_cached_diff
+	
+ok 31 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #4
+
+# passed all 31 test(s)
+1..31
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2019-checkout-ambiguous-ref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2019-checkout-ambiguous-ref/.git/
+expecting success of 2019.1 'setup ambiguous refs': 
+	test_commit branch file &&
+	git branch ambiguity &&
+	git branch vagueness &&
+	test_commit tag file &&
+	git tag ambiguity &&
+	git tag vagueness HEAD:file &&
+	test_commit other file
+
+[master (root-commit) c291a6e] branch
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master a40f7cf] tag
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 3b61e26] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup ambiguous refs
+
+expecting success of 2019.2 'checkout ambiguous ref succeeds': 
+	git checkout ambiguity 2>stderr
+
+ok 2 - checkout ambiguous ref succeeds
+
+expecting success of 2019.3 'checkout produces ambiguity warning': 
+	grep "warning.*ambiguous" stderr
+
+warning: refname 'ambiguity' is ambiguous.
+ok 3 - checkout produces ambiguity warning
+
+expecting success of 2019.4 'checkout chooses branch over tag': 
+	echo refs/heads/ambiguity >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	echo branch >expect &&
+	test_cmp expect file
+
+ok 4 - checkout chooses branch over tag
+
+expecting success of 2019.5 'checkout reports switch to branch': 
+	test_grep "Switched to branch" stderr &&
+	test_grep ! "^HEAD is now at" stderr
+
+Switched to branch 'ambiguity'
+ok 5 - checkout reports switch to branch
+
+expecting success of 2019.6 'checkout vague ref succeeds': 
+	git checkout vagueness 2>stderr &&
+	test_set_prereq VAGUENESS_SUCCESS
+
+ok 6 - checkout vague ref succeeds
+
+expecting success of 2019.7 'checkout produces ambiguity warning': 
+	grep "warning.*ambiguous" stderr
+
+warning: refname 'vagueness' is ambiguous.
+ok 7 - checkout produces ambiguity warning
+
+expecting success of 2019.8 'checkout chooses branch over tag': 
+	echo refs/heads/vagueness >expect &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expect actual &&
+	echo branch >expect &&
+	test_cmp expect file
+
+ok 8 - checkout chooses branch over tag
+
+expecting success of 2019.9 'checkout reports switch to branch': 
+	test_grep "Switched to branch" stderr &&
+	test_grep ! "^HEAD is now at" stderr
+
+Switched to branch 'vagueness'
+ok 9 - checkout reports switch to branch
+
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2018-checkout-branch.sh ***
@@ -103731,2477 +105845,549 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2019-checkout-ambiguous-ref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2019-checkout-ambiguous-ref/.git/
-expecting success of 2019.1 'setup ambiguous refs': 
-	test_commit branch file &&
-	git branch ambiguity &&
-	git branch vagueness &&
-	test_commit tag file &&
-	git tag ambiguity &&
-	git tag vagueness HEAD:file &&
-	test_commit other file
+*** t2021-checkout-overwrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2021-checkout-overwrite/.git/
+expecting success of 2021.1 'setup': 
 
-[master (root-commit) c291a6e] branch
+	mkdir -p a/b/c &&
+	>a/b/c/d &&
+	git add -A &&
+	git commit -m base &&
+	git tag start
+
+[master (root-commit) 6ef9cb1] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master a40f7cf] tag
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/b/c/d
+ok 1 - setup
+
+expecting success of 2021.2 'create a commit where dir a/b changed to file': 
+
+	git checkout -b file &&
+	rm -rf a/b &&
+	>a/b &&
+	git add -A &&
+	git commit -m "dir to file"
+
+Switched to a new branch 'file'
+[file ef05f50] dir to file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 3b61e26] other
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a/{b/c/d => b} (100%)
+ok 2 - create a commit where dir a/b changed to file
+
+expecting success of 2021.3 'checkout commit with dir must not remove untracked a/b': 
+
+	git rm --cached a/b &&
+	git commit -m "un-track the file" &&
+	test_must_fail git checkout start &&
+	test -f a/b
+
+rm 'a/b'
+[file 1d595a3] un-track the file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup ambiguous refs
+ 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 2019.2 'checkout ambiguous ref succeeds': 
-	git checkout ambiguity 2>stderr
+expecting success of 2021.4 'create a commit where dir a/b changed to symlink': 
 
-ok 2 - checkout ambiguous ref succeeds
+	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 2019.3 'checkout produces ambiguity warning': 
-	grep "warning.*ambiguous" stderr
+Switched to a new branch 'symlink'
+checking prerequisite: SYMLINKS
 
-warning: refname 'ambiguity' is ambiguous.
-ok 3 - checkout produces ambiguity warning
+mkdir -p "$TRASH_DIRECTORY/prereq-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 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
+)
+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
 
-ok 4 - checkout chooses branch over tag
+expecting success of 2021.5 'checkout commit with dir must not remove untracked a/b': 
 
-expecting success of 2019.5 'checkout reports switch to branch': 
-	test_grep "Switched to branch" stderr &&
-	test_grep ! "^HEAD is now at" stderr
+	git rm --cached a/b &&
+	git commit -m "un-track the symlink" &&
+	test_must_fail git checkout start
 
-Switched to branch 'ambiguity'
-ok 5 - checkout reports switch to branch
+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 2019.6 'checkout vague ref succeeds': 
-	git checkout vagueness 2>stderr &&
-	test_set_prereq VAGUENESS_SUCCESS
+expecting success of 2021.6 'the symlink remained': 
 
-ok 6 - checkout vague ref succeeds
+	test -h a/b
 
-expecting success of 2019.7 'checkout produces ambiguity warning': 
-	grep "warning.*ambiguous" stderr
+ok 6 - the symlink remained
 
-warning: refname 'vagueness' is ambiguous.
-ok 7 - checkout produces ambiguity warning
+expecting success of 2021.7 'cleanup after previous symlink tests': 
+	rm a/b
 
-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 7 - cleanup after previous symlink tests
 
-ok 8 - checkout chooses branch over tag
+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 2019.9 'checkout reports switch to branch': 
-	test_grep "Switched to branch" stderr &&
-	test_grep ! "^HEAD is now at" stderr
+Note: switching to 'start'.
 
-Switched to branch 'vagueness'
-ok 9 - checkout reports switch 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 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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1013-read-tree-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
+*** t2022-checkout-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2022-checkout-paths/.git/
+expecting success of 2022.1 'setup': 
+	mkdir dir &&
+	>dir/main &&
+	echo common >dir/common &&
+	git add dir/main dir/common &&
+	test_tick && git commit -m "main has dir/main" &&
+	git checkout -b next &&
+	git mv dir/main dir/next0 &&
+	echo next >dir/next1 &&
+	git add dir &&
+	test_tick && git commit -m "next has dir/next but not dir/main"
+
+[main (root-commit) 0ea9f56] main has dir/main
  Author: A U Thor <author@example.com>
- 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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
+ 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>
- 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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
+ 2 files changed, 1 insertion(+)
+ rename dir/{main => next0} (100%)
+ create mode 100644 dir/next1
+ok 1 - setup
+
+expecting success of 2022.2 'checking out paths out of a tree does not clobber unrelated paths': 
+	git checkout next &&
+	git reset --hard &&
+	rm dir/next0 &&
+	cat dir/common >expect.common &&
+	echo modified >expect.next1 &&
+	cat expect.next1 >dir/next1 &&
+	echo untracked >expect.next2 &&
+	cat expect.next2 >dir/next2 &&
+
+	git checkout main dir &&
+
+	test_cmp expect.common dir/common &&
+	test_path_is_file dir/main &&
+	git diff --exit-code main dir/main &&
+
+	test_path_is_missing dir/next0 &&
+	test_cmp expect.next1 dir/next1 &&
+	test_path_is_file dir/next2 &&
+	test_must_fail git ls-files --error-unmatch dir/next2 &&
+	test_cmp expect.next2 dir/next2
+
+Already on 'next'
+HEAD is now at 30942f7 next has dir/next but not dir/main
+Updated 1 path from 4e95d5f
+error: pathspec 'dir/next2' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 2 - checking out paths out of a tree does not clobber unrelated paths
+
+expecting success of 2022.3 'do not touch unmerged entries matching $path but not in $tree': 
+	git checkout next &&
+	git reset --hard &&
+
+	cat dir/common >expect.common &&
+	EMPTY_SHA1=$(git hash-object -w --stdin </dev/null) &&
+	git rm dir/next0 &&
+	cat >expect.next0 <<-EOF &&
+	100644 $EMPTY_SHA1 1	dir/next0
+	100644 $EMPTY_SHA1 2	dir/next0
+	EOF
+	git update-index --index-info <expect.next0 &&
+
+	git checkout main dir &&
+
+	test_cmp expect.common dir/common &&
+	test_path_is_file dir/main &&
+	git diff --exit-code main dir/main &&
+	git ls-files -s dir/next0 >actual.next0 &&
+	test_cmp expect.next0 actual.next0
+
+Already on 'next'
+A	dir/main
+D	dir/next0
+M	dir/next1
+HEAD is now at 30942f7 next has dir/next but not dir/main
+rm 'dir/next0'
+Updated 1 path from 4e95d5f
+ok 3 - do not touch unmerged entries matching $path but not in $tree
+
+expecting success of 2022.4 'do not touch files that are already up-to-date': 
+	git reset --hard &&
+	echo one >file1 &&
+	echo two >file2 &&
+	git add file1 file2 &&
+	git commit -m base &&
+	echo modified >file1 &&
+	test-tool chmtime =1000000000 file2 &&
+	git update-index -q --refresh &&
+	git checkout HEAD -- file1 file2 &&
+	echo one >expect &&
+	test_cmp expect file1 &&
+	echo "1000000000" >expect &&
+	test-tool chmtime --get file2 >actual &&
+	test_cmp expect actual
+
+HEAD is now at 30942f7 next has dir/next but not dir/main
+[next 567e06c] base
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
+ 2 files changed, 2 insertions(+)
  create mode 100644 file1
  create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
+ok 4 - do not touch files that are already up-to-date
+
+expecting success of 2022.5 'checkout HEAD adds deleted intent-to-add file back to index': 
+	echo "nonempty" >nonempty &&
+	>empty &&
+	git add nonempty empty &&
+	git commit -m "create files to be deleted" &&
+	git rm --cached nonempty empty &&
+	git add -N nonempty empty &&
+	git checkout HEAD nonempty empty &&
+	git diff --cached --exit-code
+
+[next 6bd1da2] create files to be deleted
  Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
+ 2 files changed, 1 insertion(+)
+ create mode 100644 empty
+ create mode 100644 nonempty
+rm 'empty'
+rm 'nonempty'
+Updated 2 paths from cb321d9
+ok 5 - checkout HEAD adds deleted intent-to-add file back to index
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2023-checkout-m.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+
+[main (root-commit) 7a8c5bf] both.txt
  Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ 1 file changed, 1 insertion(+)
+ create mode 100644 both.txt
+[main caa44c2] modified_in_main
  Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 8422e32] added_in_main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
+ 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(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+[topic d46615c] added_in_topic
  Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 each.txt
+ok 1 - setup
+
+expecting success of 2023.2 'git merge main': 
+    test_must_fail git merge main
+
+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 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
+
+ok 3 - -m restores 2-way conflicted+resolved file
+
+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
+
+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 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.45.2/t/trash directory.t2023-checkout-m/co-force/.git/
+[main (root-commit) b7442a0] a
  Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[main 7529dfa] b
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ 1 file changed, 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2020-checkout-detach.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main 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
-
-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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+Deleted tag 'four' (was fd8d77e)
+ok 1 - setup
 
-expecting success of 1013.3 'git read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-ok 3 - git read-tree -u -m --recurse-submodules: replace tracked file with submodule checks out submodule
+expecting success of 2020.2 'checkout branch does not detach': 
+	reset &&
+	git checkout branch &&
+	check_not_detached
 
-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
+Already on 'main'
+Switched to branch 'branch'
+ok 2 - checkout branch does not 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.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 '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
+Switched to branch 'main'
+ok 3 - checkout HEAD 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
-		)
+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 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+Already on 'main'
+ok 4 - checkout @ no-op/don't detach
 
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
-ok 7 - git read-tree -u -m --recurse-submodules: removed submodule absorbs submodules .git directory
+expecting success of 2020.5 'checkout tag detaches': 
+	reset &&
+	git checkout tag &&
+	check_detached
 
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+Already on 'main'
+Note: switching to 'tag'.
 
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+If you want to 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.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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+  git switch -c <new-branch-name>
 
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+Or undo this operation with:
 
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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
+HEAD is now at fd8d77e four
+ok 5 - checkout tag detaches
 
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+expecting success of 2020.6 'checkout branch by full name detaches': 
+	reset &&
+	git checkout refs/heads/branch &&
+	check_detached
 
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+Switched to branch 'main'
+Note: switching to 'refs/heads/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+If you want to 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.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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-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
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 1013.24 'git read-tree -u --reset --recurse-submodules: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-ok 24 - git read-tree -u --reset --recurse-submodules: replace directory with submodule
-
-expecting success of 1013.25 'git read-tree -u --reset --recurse-submodules: nested submodules are checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 25 - git read-tree -u --reset --recurse-submodules: nested submodules are checked out
-
-expecting success of 1013.26 'git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-ok 26 - git read-tree -u --reset --recurse-submodules: removed submodule removes submodules working tree
-
-expecting success of 1013.27 'git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/.git/modules/sub1'
-ok 27 - git read-tree -u --reset --recurse-submodules: removed submodule absorbs submodules .git directory
-
-expecting success of 1013.28 'git read-tree -u --reset --recurse-submodules: replace submodule with a file': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 28 - git read-tree -u --reset --recurse-submodules: replace submodule with a file
-
-checking known breakage of 1013.29 'git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/untrackedfile &&
-			test_must_fail $command replace_sub1_with_file &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test -f sub1/untracked_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u --reset --recurse-submodules replace_sub1_with_file
-not ok 29 - git read-tree -u --reset --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
-
-expecting success of 1013.30 'git read-tree -u --reset --recurse-submodules: worktrees of nested submodules are removed': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t no_submodule origin/no_submodule &&
-			$command no_submodule &&
-			test_superproject_content origin/no_submodule &&
-			test_path_is_missing sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
-			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-ok 30 - git read-tree -u --reset --recurse-submodules: worktrees of nested submodules are removed
-
-expecting success of 1013.31 'git read-tree -u --reset --recurse-submodules: modified submodule updates submodule work tree': 
-		prolog &&
-		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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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 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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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 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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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 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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
-
-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.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t1013-read-tree-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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 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
-
-# still have 10 known breakage(s)
-# passed all remaining 58 test(s)
-1..68
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2021-checkout-overwrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2021-checkout-overwrite/.git/
-expecting success of 2021.1 'setup': 
-
-	mkdir -p a/b/c &&
-	>a/b/c/d &&
-	git add -A &&
-	git commit -m base &&
-	git tag start
-
-[master (root-commit) 6ef9cb1] base
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/b/c/d
-ok 1 - setup
-
-expecting success of 2021.2 'create a commit where dir a/b changed to file': 
-
-	git checkout -b file &&
-	rm -rf a/b &&
-	>a/b &&
-	git add -A &&
-	git commit -m "dir to file"
-
-Switched to a new branch 'file'
-[file ef05f50] dir to file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a/{b/c/d => b} (100%)
-ok 2 - create a commit where dir a/b changed to file
-
-expecting success of 2021.3 'checkout commit with dir must not remove untracked a/b': 
-
-	git rm --cached a/b &&
-	git commit -m "un-track the file" &&
-	test_must_fail git checkout start &&
-	test -f a/b
-
-rm 'a/b'
-[file 1d595a3] un-track the file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 a/b
-error: The following untracked working tree files would be overwritten by checkout:
-	a/b
-Please move or remove them before you switch branches.
-Aborting
-ok 3 - checkout commit with dir must not remove untracked a/b
-
-expecting success of 2021.4 'create a commit where dir a/b changed to symlink': 
-
-	rm -rf a/b &&	# cleanup if previous test failed
-	git checkout -f -b symlink start &&
-	rm -rf a/b &&
-	git add -A &&
-	test_ln_s_add foo a/b &&
-	git commit -m "dir to symlink"
-
-Switched to a new branch 'symlink'
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[symlink 6de6f3e] dir to symlink
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 a/b
- delete mode 100644 a/b/c/d
-ok 4 - create a commit where dir a/b changed to symlink
-
-expecting success of 2021.5 'checkout commit with dir must not remove untracked a/b': 
-
-	git rm --cached a/b &&
-	git commit -m "un-track the symlink" &&
-	test_must_fail git checkout start
-
-rm 'a/b'
-[symlink 43da882] un-track the symlink
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 120000 a/b
-error: The following untracked working tree files would be overwritten by checkout:
-	a/b
-Please move or remove them before you switch branches.
-Aborting
-ok 5 - checkout commit with dir must not remove untracked a/b
-
-expecting success of 2021.6 'the symlink remained': 
-
-	test -h a/b
-
-ok 6 - the symlink remained
-
-expecting success of 2021.7 'cleanup after previous symlink tests': 
-	rm a/b
-
-ok 7 - cleanup after previous symlink tests
-
-expecting success of 2021.8 'checkout -f must not follow symlinks when removing entries': 
-	git checkout -f start &&
-	mkdir dir &&
-	>dir/f &&
-	git add dir/f &&
-	git commit -m "add dir/f" &&
-	mv dir untracked &&
-	ln -s untracked dir &&
-	git checkout -f HEAD~ &&
-	test_path_is_file untracked/f
-
-Note: switching to 'start'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6ef9cb1 base
-[detached HEAD 63af845] add dir/f
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir/f
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  63af845 add dir/f
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 63af845
-
-HEAD is now at 6ef9cb1 base
-ok 8 - checkout -f must not follow symlinks when removing entries
-
-expecting success of 2021.9 'checkout --overwrite-ignore should succeed if only ignored files in the way': 
-	git checkout -b df_conflict &&
-	test_commit contents some_dir &&
-	git checkout start &&
-	mkdir some_dir &&
-	echo autogenerated information >some_dir/ignore &&
-	echo ignore >.git/info/exclude &&
-	git checkout --overwrite-ignore df_conflict &&
-	test_path_is_file some_dir
-
-Switched to a new branch 'df_conflict'
-[df_conflict aa83f36] contents
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 some_dir
-Note: switching to 'start'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6ef9cb1 base
-Previous HEAD position was 6ef9cb1 base
-Switched to branch 'df_conflict'
-ok 9 - checkout --overwrite-ignore should succeed if only ignored files in the way
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2022-checkout-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2022-checkout-paths/.git/
-expecting success of 2022.1 'setup': 
-	mkdir dir &&
-	>dir/main &&
-	echo common >dir/common &&
-	git add dir/main dir/common &&
-	test_tick && git commit -m "main has dir/main" &&
-	git checkout -b next &&
-	git mv dir/main dir/next0 &&
-	echo next >dir/next1 &&
-	git add dir &&
-	test_tick && git commit -m "next has dir/next but not dir/main"
-
-[main (root-commit) 0ea9f56] main has dir/main
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 dir/common
- create mode 100644 dir/main
-Switched to a new branch 'next'
-[next 30942f7] next has dir/next but not dir/main
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename dir/{main => next0} (100%)
- create mode 100644 dir/next1
-ok 1 - setup
-
-expecting success of 2022.2 'checking out paths out of a tree does not clobber unrelated paths': 
-	git checkout next &&
-	git reset --hard &&
-	rm dir/next0 &&
-	cat dir/common >expect.common &&
-	echo modified >expect.next1 &&
-	cat expect.next1 >dir/next1 &&
-	echo untracked >expect.next2 &&
-	cat expect.next2 >dir/next2 &&
-
-	git checkout main dir &&
-
-	test_cmp expect.common dir/common &&
-	test_path_is_file dir/main &&
-	git diff --exit-code main dir/main &&
-
-	test_path_is_missing dir/next0 &&
-	test_cmp expect.next1 dir/next1 &&
-	test_path_is_file dir/next2 &&
-	test_must_fail git ls-files --error-unmatch dir/next2 &&
-	test_cmp expect.next2 dir/next2
-
-Already on 'next'
-HEAD is now at 30942f7 next has dir/next but not dir/main
-Updated 1 path from 4e95d5f
-error: pathspec 'dir/next2' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 2 - checking out paths out of a tree does not clobber unrelated paths
-
-expecting success of 2022.3 'do not touch unmerged entries matching $path but not in $tree': 
-	git checkout next &&
-	git reset --hard &&
-
-	cat dir/common >expect.common &&
-	EMPTY_SHA1=$(git hash-object -w --stdin </dev/null) &&
-	git rm dir/next0 &&
-	cat >expect.next0 <<-EOF &&
-	100644 $EMPTY_SHA1 1	dir/next0
-	100644 $EMPTY_SHA1 2	dir/next0
-	EOF
-	git update-index --index-info <expect.next0 &&
-
-	git checkout main dir &&
-
-	test_cmp expect.common dir/common &&
-	test_path_is_file dir/main &&
-	git diff --exit-code main dir/main &&
-	git ls-files -s dir/next0 >actual.next0 &&
-	test_cmp expect.next0 actual.next0
-
-Already on 'next'
-A	dir/main
-D	dir/next0
-M	dir/next1
-HEAD is now at 30942f7 next has dir/next but not dir/main
-rm 'dir/next0'
-Updated 1 path from 4e95d5f
-ok 3 - do not touch unmerged entries matching $path but not in $tree
-
-expecting success of 2022.4 'do not touch files that are already up-to-date': 
-	git reset --hard &&
-	echo one >file1 &&
-	echo two >file2 &&
-	git add file1 file2 &&
-	git commit -m base &&
-	echo modified >file1 &&
-	test-tool chmtime =1000000000 file2 &&
-	git update-index -q --refresh &&
-	git checkout HEAD -- file1 file2 &&
-	echo one >expect &&
-	test_cmp expect file1 &&
-	echo "1000000000" >expect &&
-	test-tool chmtime --get file2 >actual &&
-	test_cmp expect actual
-
-HEAD is now at 30942f7 next has dir/next but not dir/main
-[next 567e06c] base
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
-ok 4 - do not touch files that are already up-to-date
-
-expecting success of 2022.5 'checkout HEAD adds deleted intent-to-add file back to index': 
-	echo "nonempty" >nonempty &&
-	>empty &&
-	git add nonempty empty &&
-	git commit -m "create files to be deleted" &&
-	git rm --cached nonempty empty &&
-	git add -N nonempty empty &&
-	git checkout HEAD nonempty empty &&
-	git diff --cached --exit-code
-
-[next 6bd1da2] create files to be deleted
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 empty
- create mode 100644 nonempty
-rm 'empty'
-rm 'nonempty'
-Updated 2 paths from cb321d9
-ok 5 - checkout HEAD adds deleted intent-to-add file back to index
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2023-checkout-m.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-
-[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 2023.2 'git merge main': 
-    test_must_fail git merge main
-
-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 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
-
-ok 3 - -m restores 2-way conflicted+resolved file
-
-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
-
-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 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.45.2/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
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2025-checkout-no-overlay.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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>
-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 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 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 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 &&
-
-	git checkout --no-overlay file3-1 "*file3" &&
-	echo file3-1 >expect &&
-	test_path_is_file subdir/file3 &&
-	test_cmp expect subdir/file3
-
-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
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2020-checkout-detach.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-Deleted tag 'four' (was fd8d77e)
-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
+HEAD is now at fd8d77e four
+ok 6 - checkout branch by full name detaches
 
 expecting success of 2020.7 'checkout non-ref detaches': 
 	reset &&
@@ -106660,73 +106846,89 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2027-checkout-track.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2027-checkout-track/.git/
-expecting success of 2027.1 'setup': 
-	test_commit one &&
-	test_commit two
+*** t2025-checkout-no-overlay.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2025-checkout-no-overlay/.git/
+expecting success of 2025.1 'setup': 
+	git commit --allow-empty -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
+[master (root-commit) 8b2b4f6] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
 ok 1 - setup
 
-expecting success of 2027.2 'checkout --track -b creates a new tracking branch': 
-	git checkout --track -b branch1 main &&
-	test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
-	test $(git config --get branch.branch1.remote) = . &&
-	test $(git config --get branch.branch1.merge) = refs/heads/main
+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
 
-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 - checkout --no-overlay deletes files not in <tree-ish>
 
-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 2025.3 'checkout --no-overlay removing last file from directory': 
+	git checkout --no-overlay HEAD -- dir/file1 &&
+	test_path_is_missing dir
 
-fatal: '--track' cannot be used with updating paths
-ok 3 - checkout --track -b rejects an extra path argument
+ok 3 - checkout --no-overlay removing last file from directory
 
-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 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
 
-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
+fatal: options '-p' and '--overlay' cannot be used together
+ok 4 - checkout -p --overlay is disallowed
 
-# passed all 4 test(s)
-1..4
+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 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 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 &&
+
+	git checkout --no-overlay file3-1 "*file3" &&
+	echo file3-1 >expect &&
+	test_path_is_file subdir/file3 &&
+	test_cmp expect subdir/file3
+
+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
+
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2026-checkout-pathspec-file.sh ***
@@ -106929,6 +107131,75 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2027-checkout-track.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2027-checkout-track/.git/
+expecting success of 2027.1 'setup': 
+	test_commit one &&
+	test_commit two
+
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 1 - setup
+
+expecting success of 2027.2 'checkout --track -b creates a new tracking branch': 
+	git checkout --track -b branch1 main &&
+	test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
+	test $(git config --get branch.branch1.remote) = . &&
+	test $(git config --get branch.branch1.merge) = refs/heads/main
+
+Switched to a new branch 'branch1'
+branch 'branch1' set up to track 'main'.
+ok 2 - checkout --track -b creates a new tracking branch
+
+expecting success of 2027.3 'checkout --track -b rejects an extra path argument': 
+	test_must_fail git checkout --track -b branch2 main one.t 2>err &&
+	test_grep "cannot be used with updating paths" err
+
+fatal: '--track' cannot be used with updating paths
+ok 3 - checkout --track -b rejects an extra path argument
+
+expecting success of 2027.4 'checkout --track -b overrides autoSetupMerge=inherit': 
+	# Set up tracking config on main
+	test_config branch.main.remote origin &&
+	test_config branch.main.merge refs/heads/some-branch &&
+	test_config branch.autoSetupMerge inherit &&
+	# With --track=inherit, we copy the tracking config from main
+	git checkout --track=inherit -b b1 main &&
+	test_cmp_config origin branch.b1.remote &&
+	test_cmp_config refs/heads/some-branch branch.b1.merge &&
+	# With branch.autoSetupMerge=inherit, we do the same
+	git checkout -b b2 main &&
+	test_cmp_config origin branch.b2.remote &&
+	test_cmp_config refs/heads/some-branch branch.b2.merge &&
+	# But --track overrides this
+	git checkout --track -b b3 main &&
+	test_cmp_config . branch.b3.remote &&
+	test_cmp_config refs/heads/main branch.b3.merge &&
+	# And --track=direct does as well
+	git checkout --track=direct -b b4 main &&
+	test_cmp_config . branch.b4.remote &&
+	test_cmp_config refs/heads/main branch.b4.merge
+
+Switched to a new branch 'b1'
+branch 'b1' set up to track 'origin/some-branch'.
+Switched to a new branch 'b2'
+branch 'b2' set up to track 'origin/some-branch'.
+Switched to a new branch 'b3'
+branch 'b3' set up to track 'main'.
+Switched to a new branch 'b4'
+branch 'b4' set up to track 'main'.
+ok 4 - checkout --track -b overrides autoSetupMerge=inherit
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2050-git-dir-relative.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2050-git-dir-relative/.git/
 expecting success of 2050.1 'Setting up post-commit hook': 
@@ -107850,1354 +108121,4236 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2030-unresolve-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t1092-sparse-checkout-compatibility.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1092-sparse-checkout-compatibility/.git/
+expecting success of 1092.1 'setup': 
+	git init initial-repo &&
+	(
+		GIT_TEST_SPARSE_INDEX=0 &&
+		cd initial-repo &&
+		echo a >a &&
+		echo "after deep" >e &&
+		echo "after folder1" >g &&
+		echo "after x" >z &&
+		mkdir folder1 folder2 deep before x &&
+		echo "before deep" >before/a &&
+		echo "before deep again" >before/b &&
+		mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
+		mkdir deep/deeper1/deepest &&
+		mkdir deep/deeper1/deepest2 &&
+		mkdir deep/deeper1/deepest3 &&
+		echo "after deeper1" >deep/e &&
+		echo "after deepest" >deep/deeper1/e &&
+		cp a folder1 &&
+		cp a folder2 &&
+		cp a x &&
+		cp a deep &&
+		cp a deep/before &&
+		cp a deep/deeper1 &&
+		cp a deep/deeper2 &&
+		cp a deep/later &&
+		cp a deep/deeper1/deepest &&
+		cp a deep/deeper1/deepest2 &&
+		cp a deep/deeper1/deepest3 &&
+		cp -r deep/deeper1/ deep/deeper2 &&
+		mkdir deep/deeper1/0 &&
+		mkdir deep/deeper1/0/0 &&
+		touch deep/deeper1/0/1 &&
+		touch deep/deeper1/0/0/0 &&
+		>folder1- &&
+		>folder1.x &&
+		>folder10 &&
+		cp -r deep/deeper1/0 folder1 &&
+		cp -r deep/deeper1/0 folder2 &&
+		echo >>folder1/0/0/0 &&
+		echo >>folder2/0/1 &&
+		git add . &&
+		git commit -m "initial commit" &&
+		git checkout -b base &&
+		for dir in folder1 folder2 deep
+		do
+			git checkout -b update-$dir base &&
+			echo "updated $dir" >$dir/a &&
+			git commit -a -m "update $dir" || return 1
+		done &&
 
-[main (root-commit) 7b271e3] initial
+		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.45.2/t/trash directory.t1092-sparse-checkout-compatibility/initial-repo/.git/
+[master (root-commit) 703fd3e] initial commit
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 binary
- create mode 100644 fi/le
-[main 9a00f99] second
+ 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>
- 2 files changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'side'
-[side b18340d] third
+ 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 branch 'another'
-[another cf4d985] fourth
+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 branch 'add-add'
-[add-add b851e77] fifth
+Switched to a new branch 'rename-base'
+[rename-base 5914bd8] add interesting rename content
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-differently
-Switched to branch 'main'
+ 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 2030.2 'add records switch clears': 
-	prime_resolve_undo &&
-	test_tick &&
-	git commit -m merged &&
-	echo committing keeps &&
-	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
-	git checkout second^0 &&
-	echo switching clears &&
-	check_resolve_undo cleared
-
-HEAD is now at 9a00f99 second
-Note: switching to 'second^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 1092.2 'sparse-index contents': 
+	init_repos &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	# Remove deep, add three other directories.
+	test_sparse_checkout_set \
+		"folder1 folder2 x" \
+		"before deep" &&
 
-  git switch -c <new-branch-name>
+	# Remove folder1, add deep
+	test_sparse_checkout_set \
+		"deep folder2 x" \
+		"before folder1" &&
 
-Or undo this operation with:
+	# Replace deep with deep/deeper2 (dropping deep/deeper1)
+	# Add folder1
+	test_sparse_checkout_set \
+		"deep/deeper2 folder1 folder2 x" \
+		"before deep/deeper1" &&
 
-  git switch -
+	# 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" &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	# Drop down to only files at root
+	test_sparse_checkout_set \
+		"" \
+		"before deep folder1 folder2 x" &&
 
-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:
+	# 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
 
-  b3a51df merged
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 1092.3 'expanded in-memory index matches full index': 
+	init_repos &&
+	test_sparse_match git ls-files --stage
 
- git branch <new-branch-name> b3a51df
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 3 - expanded in-memory index matches full index
 
-HEAD is now at 9a00f99 second
-switching clears
-ok 2 - add records switch clears
+expecting success of 1092.4 'root directory cannot be sparse': 
+	init_repos &&
 
-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 &&
+	# Remove all in-cone files and directories from the index, collapse index
+	# with `git sparse-checkout reapply`
+	git -C sparse-index rm -r . &&
+	git -C sparse-index sparse-checkout reapply &&
 
-	echo merge clears upfront &&
-	test_must_fail git merge fourth^0 &&
-	check_resolve_undo nuked &&
+	# 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
 
-	git rm -f fi/le &&
-	echo resolving records &&
-	check_resolve_undo recorded fi/le initial:fi/le HEAD:fi/le fourth:fi/le &&
+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
 
-	git reset --hard &&
-	echo resetting discards &&
-	check_resolve_undo discarded
+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 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
+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 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 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
 
-	echo plumbing clear &&
-	git update-index --clear-resolve-undo &&
-	check_resolve_undo cleared
+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
 
-HEAD is now at 70d285e merged
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  70d285e merged
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 1092.8 'add, commit, checkout': 
+	init_repos &&
 
- git branch <new-branch-name> 70d285e
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+	run_on_all ../edit-contents README.md &&
 
-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
+	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 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
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
-HEAD is now at 894de51 merged
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	run_on_all ../edit-contents README.md &&
 
-  894de51 merged
+	test_all_match git add -A &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Extend README.md" &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
 
- git branch <new-branch-name> 894de51
+	run_on_all ../edit-contents deep/newfile &&
 
-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
+	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 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
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout -
 
-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
+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 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
+expecting success of 1092.9 'deep changes during checkout': 
+	init_repos &&
 
-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
+	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 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 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 9 - deep changes during checkout
 
-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 1092.10 'checkout with modified sparse directory': 
+	init_repos &&
 
-  739b00c record to nuke MERGE_HEAD
+	test_all_match git checkout rename-in-to-out -- . &&
+	test_sparse_match git sparse-checkout reapply &&
+	test_all_match git checkout base
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 10 - checkout with modified sparse directory
 
- git branch <new-branch-name> 739b00c
+expecting success of 1092.11 'checkout orphan then non-orphan': 
+	init_repos &&
 
-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
+	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 2030.9 'unmerge removal after committing': 
-	prime_resolve_undo remove &&
-	git commit -m "record to nuke MERGE_HEAD" &&
-	git update-index --unresolve fi/le &&
-	git ls-files --resolve-undo fi/le >actual &&
-	test_must_be_empty actual &&
-	git ls-files -u >actual &&
-	test_line_count = 3 actual
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 11 - checkout orphan then non-orphan
 
-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 1092.12 'add outside sparse cone': 
+	init_repos &&
 
-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
+	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 76cfeff record to nuke MERGE_HEAD
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+hint: * Disable or modify the sparsity rules.
+hint: * Disable or modify the sparsity rules.
+ok 12 - add outside sparse cone
 
-  76cfeff record to nuke MERGE_HEAD
+expecting success of 1092.13 'commit including unstaged changes': 
+	init_repos &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+	write_script edit-file <<-\EOF &&
+	echo $1 >$2
+	EOF
 
- git branch <new-branch-name> 76cfeff
+	run_on_all ../edit-file 1 a &&
+	run_on_all ../edit-file 1 deep/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
+	test_all_match git commit -m "-a" -a &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	run_on_all ../edit-file 2 a &&
+	run_on_all ../edit-file 2 deep/a &&
 
-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_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 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
+	run_on_all ../edit-file 3 a &&
+	run_on_all ../edit-file 3 deep/a &&
 
-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)
+	test_all_match git commit -m "--amend" -a --amend &&
+	test_all_match git status --porcelain=v2
 
-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
+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
 
-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 1092.14 'status/add: outside sparse cone': 
+	init_repos &&
 
-expecting success of 2030.14 'resolve-undo keeps blobs from gc': 
-	git checkout -f main &&
+	# 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 &&
 
-	# 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 &&
+	test_sparse_match git status &&
 
-	# 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
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
 	EOF
+	run_on_all ../edit-contents folder1/a &&
+	run_on_all ../edit-contents folder1/new &&
 
-	# 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 &&
+	test_sparse_match git status --porcelain=v2 &&
 
-	# 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 &&
+	# 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 &&
 
-	# These three blob objects are now reachable only from the resolve-undo
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
+	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} &&
 
-	# 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 &&
+	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}
 
-	# 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 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
 
-	# And they should go away when gc runs.
-	git gc --prune=now &&
-	git fsck --unreachable >cruft &&
-	test_must_be_empty cruft &&
+expecting success of 1092.15 'checkout and reset --hard': 
+	init_repos &&
 
-	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
+	test_all_match git checkout update-folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-Already on 'main'
-HEAD is now at d92f3b1 add differently
-Switched to branch 'side'
-ok 14 - resolve-undo keeps blobs from gc
+	test_all_match git checkout update-deep &&
+	test_all_match git status --porcelain=v2 &&
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2070-restore.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+	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
 
-[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
+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 2070.2 'restore without pathspec is not ok': 
-	test_must_fail git restore &&
-	test_must_fail git restore --source=first
+expecting success of 1092.16 'diff --cached': 
+	init_repos &&
 
-fatal: you must specify path(s) to restore
-fatal: you must specify path(s) to restore
-ok 2 - restore without pathspec is not ok
+	write_script edit-contents <<-\EOF &&
+	echo text >>README.md
+	EOF
+	run_on_all ../edit-contents &&
 
-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
+	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
 
-ok 3 - restore a file, ignoring branch of same name
+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 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 1092.17 'diff with renames and conflicts': 
+	init_repos &&
 
-HEAD is now at a46c920 second
-ok 4 - restore a file on worktree from another ref
+	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 2070.5 'restore a file in the index from another ref': 
-	test_when_finished git reset --hard &&
-	git cat-file blob first:./first.t >expected &&
-	git restore --source=first --staged first.t &&
-	git show :first.t >actual &&
-	test_cmp expected actual &&
-	git cat-file blob HEAD:./first.t >expected &&
-	test_cmp expected first.t
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 17 - diff with renames and conflicts
 
-HEAD is now at a46c920 second
-ok 5 - restore a file in the index from another ref
+expecting success of 1092.18 'diff with directory/file conflicts': 
+	init_repos &&
 
-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
+	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 a46c920 second
-ok 6 - restore a file in both the index and worktree from another ref
+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 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 1092.19 'log with pathspec outside sparse definition': 
+	init_repos &&
 
-HEAD is now at a46c920 second
-ok 7 - restore --staged uses HEAD as source
+	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 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
+	test_all_match git checkout update-folder1 &&
+	test_all_match git log -- folder1/a
 
-HEAD is now at a46c920 second
-ok 8 - restore --worktree --staged uses HEAD as source
+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 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 1092.20 'blame with pathspec inside sparse definition': 
+	init_repos &&
 
-		echo dirty >>common &&
-		test_must_fail git restore . &&
+	for file in a \
+			deep/a \
+			deep/deeper1/a \
+			deep/deeper1/deepest/a
+	do
+		test_all_match git blame $file || return 1
+	done
 
-		git restore --ignore-unmerged --quiet . >output 2>&1 &&
-		git diff common >diff-output &&
-		test_must_be_empty output &&
-		test_must_be_empty diff-output
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2070-restore/unmerged/.git/
-[main (root-commit) b83edd8] common
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 common
- create mode 100644 unmerged
-Switched to a new branch 'first'
-[first 753ae86] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'second'
-[second 06de6fa] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging unmerged
-CONFLICT (content): Merge conflict in unmerged
-Automatic merge failed; fix conflicts and then commit the result.
-error: path 'unmerged' is unmerged
-ok 9 - restore --ignore-unmerged ignores unmerged entries
+expecting success of 1092.21 'blame with pathspec outside sparse definition': 
+	init_repos &&
+	test_sparse_match git sparse-checkout set &&
 
-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
+	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
 
-[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
+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 2070.11 'restore --staged invalidates cache tree for deletions': 
-	test_when_finished git reset --hard &&
-	>new1 &&
-	>new2 &&
-	git add new1 new2 &&
+expecting success of 1092.22 'checkout and reset (mixed)': 
+	init_repos &&
 
-	# 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^ &&
+	test_all_match git checkout -b reset-test update-deep &&
+	test_all_match git reset deepest &&
 
-	git restore --staged new1 &&
-	git commit -m "just new2" &&
-	git rev-parse HEAD:new2 &&
-	test_must_fail git rev-parse HEAD:new1
+	# 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
 
-[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
+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 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
+expecting success of 1092.23 'checkout and reset (merge)': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
 	EOF
-	test_cmp expect file
 
-ok 12 - restore --merge to unresolve
+	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 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
+	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
 
-ok 13 - restore --merge to unresolve after (mistaken) resolution
+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 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 1092.24 'checkout and reset (keep)': 
+	init_repos &&
 
-rm 'file'
-ok 14 - restore --merge to unresolve after (mistaken) resolution
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-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
+	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 &&
 
-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
+	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
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2072-restore-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2072-restore-pathspec-file/.git/
-expecting success of 2072.1 'setup': 
-	test_commit file0 &&
+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)
 
-	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 1092.25 'reset with pathspecs inside sparse definition': 
+	init_repos &&
 
-	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" &&
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
 
-	git tag checkpoint
+	test_all_match git checkout -b reset-test update-deep &&
+	run_on_all ../edit-contents deep/a &&
 
-[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
+	test_all_match git reset base -- deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-expecting success of 2072.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
+	test_all_match git reset base -- nonexistent-file &&
+	test_all_match git status --porcelain=v2 &&
 
-	echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 &&
+	test_all_match git reset deepest -- deep &&
+	test_all_match git status --porcelain=v2
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	EOF
-	verify_expect
+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
 
-HEAD is now at 4c6d82b files 2
-ok 2 - --pathspec-from-file from stdin
+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 2072.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
+	test_sparse_match git reset update-folder1 -- folder1 &&
+	git -C full-checkout reset update-folder1 -- folder1 &&
+	test_all_match git ls-files -s -- folder1 &&
 
-	echo fileA.t >list &&
-	git restore --pathspec-from-file=list --source=HEAD^1 &&
+	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
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	EOF
-	verify_expect
+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
 
-HEAD is now at 4c6d82b files 2
-ok 3 - --pathspec-from-file from file
+expecting success of 1092.27 'reset with wildcard pathspec': 
+	init_repos &&
 
-expecting success of 2072.4 'NUL delimiters': 
-	restore_checkpoint &&
+	test_all_match git reset update-deep -- deep\* &&
+	test_all_match git ls-files -s -- deep &&
 
-	printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 &&
+	test_all_match git reset deepest -- deep\*\*\* &&
+	test_all_match git ls-files -s -- deep &&
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
+	# The following `git reset`s result in updating the index on files with
+	# `skip-worktree` enabled. To avoid failing due to discrepencies in reported
+	# "modified" files, `test_sparse_match` reset is performed separately from
+	# "full-checkout" reset, then the index contents of all repos are verified.
 
-HEAD is now at 4c6d82b files 2
-ok 4 - NUL delimiters
+	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 2072.5 'LF delimiters': 
-	restore_checkpoint &&
+	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 &&
 
-	printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+	test_sparse_match git reset base -- folder1/\* &&
+	git -C full-checkout reset base -- folder1/\* &&
+	test_all_match git ls-files -s -- folder1
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
-	EOF
-	verify_expect
+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
 
-HEAD is now at 4c6d82b files 2
-ok 5 - LF delimiters
+expecting success of 1092.28 'reset hard with removed sparse dir': 
+	init_repos &&
 
-expecting success of 2072.6 'no trailing delimiter': 
-	restore_checkpoint &&
+	run_on_all git rm -r --sparse folder1 &&
+	test_all_match git status --porcelain=v2 &&
 
-	printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+	test_all_match git reset --hard &&
+	test_all_match git status --porcelain=v2 &&
 
 	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
+	folder1/
 	EOF
-	verify_expect
 
-HEAD is now at 4c6d82b files 2
-ok 6 - no trailing delimiter
+	git -C sparse-index ls-files --sparse folder1 >out &&
+	test_cmp expect out
 
-expecting success of 2072.7 'CRLF delimiters': 
-	restore_checkpoint &&
+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
 
-	printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+expecting success of 1092.29 'update-index modify outside sparse definition': 
+	init_repos &&
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
-	 M fileB.t
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
 	EOF
-	verify_expect
 
-HEAD is now at 4c6d82b files 2
-ok 7 - CRLF delimiters
+	# 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 2072.8 'quotes': 
-	restore_checkpoint &&
+	# 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 &&
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+	# 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
 
-	git restore --pathspec-from-file=list --source=HEAD^1 &&
+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
 
-	cat >expect <<-\EOF &&
-	 M fileA.t
+expecting success of 1092.30 'update-index --add outside sparse definition': 
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
 	EOF
-	verify_expect
 
-HEAD is now at 4c6d82b files 2
-ok 8 - quotes
+	# Create folder1, add new file
+	run_on_sparse mkdir -p folder1 &&
+	run_on_all ../edit-contents folder1/b &&
 
-expecting success of 2072.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
+	# 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
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+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
 
-	test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
+expecting success of 1092.31 'update-index --remove outside sparse definition': 
+	init_repos &&
 
-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
+	# 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 2072.10 'only touches what was listed': 
-	restore_checkpoint &&
+	# Reset the state
+	test_all_match git reset --hard &&
 
-	printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+	# 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 &&
 
-	cat >expect <<-\EOF &&
-	 M fileB.t
-	 M fileC.t
+	# Reset the state
+	test_all_match git reset --hard &&
+
+	# --force-remove supercedes --ignore-skip-worktree-entries, removing
+	# a skip-worktree file from the index (and disk) when both are specified
+	# with --remove
+	test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a &&
+	cat >expect <<-EOF &&
+	D	folder1/a
 	EOF
-	verify_expect
+	test_sparse_match git diff --cached --name-status &&
+	test_cmp expect sparse-checkout-out
 
-HEAD is now at 4c6d82b files 2
-ok 10 - only touches what was listed
+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 2072.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	>empty_list &&
+expecting success of 1092.32 'update-index with directories': 
+	init_repos &&
 
-	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 &&
+	# 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 &&
 
-	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 &&
+	# 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
 
-	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 &&
+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
 
-	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 1092.33 'update-index --again file outside sparse definition': 
+	init_repos &&
 
-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
+	test_all_match git checkout -b test-reupdate &&
 
-expecting success of 2072.12 'wildcard pathspec matches file in subdirectory': 
-	restore_checkpoint &&
+	# Update HEAD without modifying the index to introduce a difference in
+	# folder1/a
+	test_sparse_match git reset --soft update-folder1 &&
 
-	echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 &&
-	cat >expect <<-\EOF &&
-	 M dir1/file
+	# 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
-	verify_expect
+	test_sparse_match git diff --name-status &&
+	test_cmp expect sparse-checkout-out
 
-HEAD is now at 4c6d82b files 2
-ok 12 - wildcard pathspec matches file in subdirectory
+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
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2081-parallel-checkout-collisions.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2081-parallel-checkout-collisions/.git/
-checking prerequisite: CASE_INSENSITIVE_FS
+expecting success of 1092.34 'update-index --cacheinfo': 
+	init_repos &&
 
-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
+	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) &&
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 1 # skip setup (missing CASE_INSENSITIVE_FS)
+	test_all_match git update-index --cacheinfo 100644 $deep_a_oid deep/a &&
+	test_all_match git status --porcelain=v2 &&
 
-ok 2 # skip worker detects basename collision (missing CASE_INSENSITIVE_FS)
+	# Cannot add sparse directory, even in sparse index case
+	test_all_match test_must_fail git update-index --add --cacheinfo 040000 $folder2_oid folder2/ &&
 
-ok 3 # skip worker detects dirname collision (missing CASE_INSENSITIVE_FS)
+	# 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 &&
 
-checking prerequisite: SYMLINKS
+	# 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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 34 - update-index --cacheinfo
 
-)
-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 1092.35 ''read-tree -mu base HEAD update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-ok 5 # skip collision report on clone (w/ racy file creation) (missing CASE_INSENSITIVE_FS)
+		# 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 &&
 
-ok 6 # skip collision report on clone (w/ colliding peer after the detected entry) (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,!MINGW,!CYGWIN)
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2071-restore-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+		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
 
-[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
+	
+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 2071.2 'restore -p without pathspec is fine': 
-	echo q >cmd &&
-	git restore -p <cmd
+expecting success of 1092.36 ''read-tree -mu update-folder1 update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-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
+		# 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 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
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-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
+		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 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
+	
+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
 
-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 1092.37 ''read-tree -mu update-folder2' with files outside sparse definition': 
+		init_repos &&
 
-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
+		# 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 &&
 
-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
+		test_all_match git read-tree --reset -u HEAD &&
+		test_all_match git status --porcelain=v2 &&
 
-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
+		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 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=@
+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 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 1092.38 'read-tree --merge with edit/edit conflicts in sparse directories': 
+	init_repos &&
 
-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^
+	# 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 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
+	test_all_match git reset --hard &&
 
-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^...
+	test_all_match git read-tree -mu rename-base update-folder2 &&
+	test_all_match git status --porcelain=v2 &&
 
-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
+	test_all_match git reset --hard &&
 
-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
+	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 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
+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
 
-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 1092.39 'read-tree --prefix': 
+	init_repos &&
 
-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
+	# 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 &&
 
-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
+	# 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 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
+	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 &&
 
-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
+	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 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
+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
 
-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 1092.40 'read-tree --merge with directory-file conflicts': 
+	init_repos &&
 
-expecting success of 2071.15 'none of this moved HEAD': 
-	verify_saved_head
+	test_all_match git checkout -b test-branch rename-base &&
 
-ok 15 - none of this moved HEAD
+	# Although the index matches, without --no-sparse-checkout, outside-of-
+	# definition files will not exist on disk for sparse checkouts
+	test_sparse_match git read-tree -mu rename-out-to-out &&
+	test_sparse_match git status --porcelain=v2 &&
+	test_path_is_missing sparse-checkout/folder2 &&
+	test_path_is_missing sparse-index/folder2 &&
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2100-update-cache-badpath.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2100-update-cache-badpath/.git/
-checking prerequisite: SYMLINKS
+	test_sparse_match git read-tree --reset -u HEAD &&
+	test_sparse_match git status --porcelain=v2 &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+	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
 
-)
-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.
+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 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 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	2024-11-14 19:28:59.073356783 +0000
++++ sparse-index-err	2024-11-14 19:28:59.133357395 +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":"20241114T192908.777923Z-H5c947e1c-P00000668","thread":"main","time":"2024-11-14T19:29:08.780477Z","file":"sparse-index.c","line":210,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20241114T192908.777923Z-H5c947e1c-P00000668","thread":"main","time":"2024-11-14T19:29:08.780640Z","file":"sparse-index.c","line":224,"repo":1,"t_rel":0.000163,"nesting":1,"category":"index","label":"convert_to_sparse"}
+{"event":"region_enter","sid":"20241114T192908.777923Z-H5c947e1c-P00000668","thread":"main","time":"2024-11-14T19:29:08.779245Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20241114T192908.777923Z-H5c947e1c-P00000668","thread":"main","time":"2024-11-14T19:29:08.780950Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20241114T192908.777923Z-H5c947e1c-P00000668","thread":"main","time":"2024-11-14T19:29:08.779962Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.000716,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20241114T192908.777923Z-H5c947e1c-P00000668","thread":"main","time":"2024-11-14T19:29:08.785446Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.004497,"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":"20241114T192908.859524Z-H5c947e1c-P00000693","thread":"main","time":"2024-11-14T19:29:08.860546Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20241114T192908.859524Z-H5c947e1c-P00000693","thread":"main","time":"2024-11-14T19:29:08.861251Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.000704,"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":"20241114T192909.150240Z-H5c947e1c-P00000745","thread":"main","time":"2024-11-14T19:29:09.151130Z","file":"sparse-index.c","line":338,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20241114T192909.150240Z-H5c947e1c-P00000745","thread":"main","time":"2024-11-14T19:29:09.151827Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.000697,"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":"20241114T192909.195155Z-H5c947e1c-P0000076a","thread":"main","time":"2024-11-14T19:29:09.195916Z","file":"sparse-index.c","line":210,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
+{"event":"region_leave","sid":"20241114T192909.195155Z-H5c947e1c-P0000076a","thread":"main","time":"2024-11-14T19:29:09.196164Z","file":"sparse-index.c","line":224,"repo":1,"t_rel":0.000248,"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': 
+	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 &&
+
+	# 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 &&
+
+	# 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
+
+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
+
+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":"20241114T192927.896105Z-H5c947e1c-P00002c1f","thread":"main","time":"2024-11-14T19:29:27.901633Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20241114T192927.896105Z-H5c947e1c-P00002c1f","thread":"main","time":"2024-11-14T19:29:27.902982Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20241114T192927.960934Z-H5c947e1c-P00002c36","thread":"main","time":"2024-11-14T19:29:27.966838Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20241114T192927.960934Z-H5c947e1c-P00002c36","thread":"main","time":"2024-11-14T19:29:27.977692Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20241114T192928.040496Z-H5c947e1c-P00002c50","thread":"main","time":"2024-11-14T19:29:28.041705Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20241114T192928.040496Z-H5c947e1c-P00002c50","thread":"main","time":"2024-11-14T19:29:28.043329Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+ok 77 - rm pathspec expands index when necessary
+
+expecting success of 1092.78 'sparse index is not expanded: rm': 
+	init_repos &&
+
+	ensure_not_expanded rm deep/a &&
+
+	# test in-cone wildcard
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded rm deep/* &&
+
+	# test recursive rm
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded rm -r deep
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 78 - sparse index is not expanded: rm
+
+expecting success of 1092.79 'grep with and --cached': 
+	init_repos &&
+
+	test_all_match git grep --cached a &&
+	test_all_match git grep --cached a -- "folder1/*"
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 79 - grep with and --cached
+
+expecting success of 1092.80 'grep is not expanded': 
+	init_repos &&
+
+	ensure_not_expanded grep a &&
+	ensure_not_expanded grep a -- deep/* &&
+
+	# All files within the folder1/* pathspec are sparse,
+	# so this command does not find any matches
+	ensure_not_expanded ! grep a -- folder1/* &&
+
+	# test out-of-cone pathspec with or without wildcard
+	ensure_not_expanded grep --cached a -- "folder1/a" &&
+	ensure_not_expanded grep --cached a -- "folder1/*" &&
+
+	# test in-cone pathspec with or without wildcard
+	ensure_not_expanded grep --cached a -- "deep/a" &&
+	ensure_not_expanded grep --cached a -- "deep/*"
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+ok 80 - grep is not expanded
+
+checking known breakage of 1092.81 'grep within submodules is not expanded': 
+	init_repos_as_submodules &&
+
+	# do not use ensure_not_expanded() here, becasue `grep` should be
+	# run in the superproject, not in "./sparse-index"
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
+	git grep --cached --recurse-submodules a -- "*/folder1/*" &&
+	test_region ! index ensure_full_index trace2.txt
+
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+HEAD is now at 703fd3e initial commit
+Adding existing repo at 'full-checkout' to the index
+Adding existing repo at 'sparse-checkout' to the index
+Adding existing repo at 'sparse-index' to the index
+ 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
+ 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
+full-checkout/folder1/a:a
+sparse-checkout/folder1/a:a
+sparse-index/folder1/a:a
+{"event":"region_enter","sid":"20241114T192931.548593Z-H5c947e1c-P00003367","thread":"main","time":"2024-11-14T19:29:31.551523Z","file":"sparse-index.c","line":338,"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)
+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
+
+# still have 2 known breakage(s)
+# passed all remaining 93 test(s)
+1..95
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2030-unresolve-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2030-unresolve-info/.git/
+expecting success of 2030.1 'setup': 
+	mkdir fi &&
+	printf "a\0a" >binary &&
+	git add binary &&
+	test_commit initial fi/le first &&
+	git branch side &&
+	git branch another &&
+	printf "a\0b" >binary &&
+	git add binary &&
+	test_commit second fi/le second &&
+	git checkout side &&
+	test_commit third fi/le third &&
+	git branch add-add &&
+	git checkout another &&
+	test_commit fourth fi/le fourth &&
+	git checkout add-add &&
+	test_commit fifth add-differently &&
+	git checkout main
+
+[main (root-commit) 7b271e3] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 binary
+ create mode 100644 fi/le
+[main 9a00f99] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'side'
+[side b18340d] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'another'
+[another cf4d985] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'add-add'
+[add-add b851e77] fifth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 add-differently
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 2030.2 'add records switch clears': 
+	prime_resolve_undo &&
+	test_tick &&
+	git commit -m merged &&
+	echo committing keeps &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	git checkout second^0 &&
+	echo switching clears &&
+	check_resolve_undo cleared
+
+HEAD is now at 9a00f99 second
+Note: switching to 'second^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD b3a51df] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  b3a51df merged
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> b3a51df
+
+HEAD is now at 9a00f99 second
+switching clears
+ok 2 - add records switch clears
+
+expecting success of 2030.3 'rm records reset clears': 
+	prime_resolve_undo &&
+	test_tick &&
+	git commit -m merged &&
+	echo committing keeps &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+
+	echo merge clears upfront &&
+	test_must_fail git merge fourth^0 &&
+	check_resolve_undo nuked &&
+
+	git rm -f fi/le &&
+	echo resolving records &&
+	check_resolve_undo recorded fi/le initial:fi/le HEAD:fi/le fourth:fi/le &&
+
+	git reset --hard &&
+	echo resetting discards &&
+	check_resolve_undo discarded
+
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 70d285e] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+merge clears upfront
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'fi/le'
+resolving records
+HEAD is now at 70d285e merged
+resetting discards
+ok 3 - rm records reset clears
+
+expecting success of 2030.4 'plumbing clears': 
+	prime_resolve_undo &&
+	test_tick &&
+	git commit -m merged &&
+	echo committing keeps &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+
+	echo plumbing clear &&
+	git update-index --clear-resolve-undo &&
+	check_resolve_undo cleared
+
+HEAD is now at 70d285e merged
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  70d285e merged
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 70d285e
+
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 894de51] merged
+ Author: A U Thor <author@example.com>
+committing keeps
+plumbing clear
+ok 4 - plumbing clears
+
+expecting success of 2030.5 'add records checkout -m undoes': 
+	prime_resolve_undo &&
+	git diff HEAD &&
+	git checkout --conflict=merge fi/le &&
+	echo checkout used the record and removed it &&
+	check_resolve_undo removed &&
+	echo the index and the work tree is unmerged again &&
+	git diff >actual &&
+	grep "^++<<<<<<<" actual
+
+HEAD is now at 894de51 merged
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  894de51 merged
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 894de51
+
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+diff --git a/fi/le b/fi/le
+index e019be0..8dca2f8 100644
+--- a/fi/le
++++ b/fi/le
+@@ -1 +1 @@
+-second
++different
+Recreated 1 merge conflict
+checkout used the record and removed it
+the index and the work tree is unmerged again
+++<<<<<<< ours
+ok 5 - add records checkout -m undoes
+
+expecting success of 2030.6 'unmerge with plumbing': 
+	prime_resolve_undo &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
+
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - unmerge with plumbing
+
+expecting success of 2030.7 'unmerge can be done even after committing': 
+	prime_resolve_undo &&
+	git commit -m "record to nuke MERGE_HEAD" &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
+
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+[detached HEAD 739b00c] record to nuke MERGE_HEAD
+ Author: A U Thor <author@example.com>
+ok 7 - unmerge can be done even after committing
+
+expecting success of 2030.8 'unmerge removal': 
+	prime_resolve_undo remove &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
+
+HEAD is now at 739b00c record to nuke MERGE_HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  739b00c record to nuke MERGE_HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 739b00c
+
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'fi/le'
+ok 8 - unmerge removal
+
+expecting success of 2030.9 'unmerge removal after committing': 
+	prime_resolve_undo remove &&
+	git commit -m "record to nuke MERGE_HEAD" &&
+	git update-index --unresolve fi/le &&
+	git ls-files --resolve-undo fi/le >actual &&
+	test_must_be_empty actual &&
+	git ls-files -u >actual &&
+	test_line_count = 3 actual
+
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Automatic merge failed; fix conflicts and then commit the result.
+rm 'fi/le'
+[detached HEAD 76cfeff] record to nuke MERGE_HEAD
+ Author: A U Thor <author@example.com>
+ok 9 - unmerge removal after committing
+
+expecting success of 2030.10 'rerere and rerere forget': 
+	mkdir .git/rr-cache &&
+	prime_resolve_undo &&
+	echo record the resolution &&
+	git rerere &&
+	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+	rerere_id=${rerere_id%/postimage} &&
+	test -f .git/rr-cache/$rerere_id/postimage &&
+	git checkout -m fi/le &&
+	echo resurrect the conflict &&
+	grep "^=======" fi/le &&
+	echo reresolve the conflict &&
+	git rerere &&
+	test "z$(cat fi/le)" = zdifferent &&
+	echo register the resolution again &&
+	git add fi/le &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	test -z "$(git ls-files -u)" &&
+	git rerere forget fi/le &&
+	! test -f .git/rr-cache/$rerere_id/postimage &&
+	tr "\0" "\n" <.git/MERGE_RR >actual &&
+	echo "$rerere_id	fi/le" >expect &&
+	test_cmp expect actual
+
+HEAD is now at 76cfeff record to nuke MERGE_HEAD
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  76cfeff record to nuke MERGE_HEAD
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 76cfeff
+
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+record the resolution
+Recorded resolution for 'fi/le'.
+Recreated 1 merge conflict
+resurrect the conflict
+=======
+reresolve the conflict
+Resolved 'fi/le' using previous resolution.
+register the resolution again
+Updated preimage for 'fi/le'
+Forgot resolution for 'fi/le'
+ok 10 - rerere and rerere forget
+
+expecting success of 2030.11 'rerere and rerere forget (subdirectory)': 
+	rm -fr .git/rr-cache &&
+	mkdir .git/rr-cache &&
+	prime_resolve_undo &&
+	echo record the resolution &&
+	(cd fi && git rerere) &&
+	rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+	rerere_id=${rerere_id%/postimage} &&
+	test -f .git/rr-cache/$rerere_id/postimage &&
+	(cd fi && git checkout -m le) &&
+	echo resurrect the conflict &&
+	grep "^=======" fi/le &&
+	echo reresolve the conflict &&
+	(cd fi && git rerere) &&
+	test "z$(cat fi/le)" = zdifferent &&
+	echo register the resolution again &&
+	(cd fi && git add le) &&
+	check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+	test -z "$(git ls-files -u)" &&
+	(cd fi && git rerere forget le) &&
+	! test -f .git/rr-cache/$rerere_id/postimage &&
+	tr "\0" "\n" <.git/MERGE_RR >actual &&
+	echo "$rerere_id	fi/le" >expect &&
+	test_cmp expect actual
+
+HEAD is now at 9a00f99 second
+HEAD is now at 9a00f99 second
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+record the resolution
+Recorded resolution for 'fi/le'.
+Recreated 1 merge conflict
+resurrect the conflict
+=======
+reresolve the conflict
+Resolved 'fi/le' using previous resolution.
+register the resolution again
+Updated preimage for 'fi/le'
+Forgot resolution for 'fi/le'
+ok 11 - rerere and rerere forget (subdirectory)
+
+expecting success of 2030.12 'rerere forget (binary)': 
+	git checkout -f side &&
+	test_commit --printf binary binary "a\0c" &&
+	test_must_fail git merge second &&
+	git rerere forget binary
+
+Previous HEAD position was 9a00f99 second
+Switched to branch 'side'
+[side ebd12fa] binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+warning: Cannot merge binary files: binary (HEAD vs. second)
+Auto-merging binary
+CONFLICT (content): Merge conflict in binary
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+error: could not parse conflict hunks in 'binary'
+ok 12 - rerere forget (binary)
+
+expecting success of 2030.13 'rerere forget (add-add conflict)': 
+	git checkout -f main &&
+	echo main >add-differently &&
+	git add add-differently &&
+	git commit -m "add differently" &&
+	test_must_fail git merge fifth &&
+	git rerere forget add-differently 2>actual &&
+	test_grep "no remembered" actual
+
+Switched to branch 'main'
+[main d92f3b1] add differently
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 add-differently
+Auto-merging add-differently
+CONFLICT (add/add): Merge conflict in add-differently
+Auto-merging fi/le
+CONFLICT (content): Merge conflict in fi/le
+Recorded preimage for 'add-differently'
+Recorded preimage for 'fi/le'
+Automatic merge failed; fix conflicts and then commit the result.
+error: no remembered resolution for 'add-differently'
+ok 13 - rerere forget (add-add conflict)
+
+expecting success of 2030.14 'resolve-undo keeps blobs from gc': 
+	git checkout -f main &&
+
+	# First make sure we do not have any cruft left in the object store
+	git repack -a -d &&
+	git prune --expire=now &&
+	git prune-packed &&
+	git gc --prune=now &&
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+
+	# Now add three otherwise unreferenced blob objects to the index
+	git reset --hard &&
+	B1=$(echo "resolve undo test data 1" | git hash-object -w --stdin) &&
+	B2=$(echo "resolve undo test data 2" | git hash-object -w --stdin) &&
+	B3=$(echo "resolve undo test data 3" | git hash-object -w --stdin) &&
+	git update-index --add --index-info <<-EOF &&
+	100644 $B1 1	frotz
+	100644 $B2 2	frotz
+	100644 $B3 3	frotz
+	EOF
+
+	# These three blob objects are reachable (only) from the index
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+	# and they should be protected from GC
+	git gc --prune=now &&
+	git cat-file -e $B1 &&
+	git cat-file -e $B2 &&
+	git cat-file -e $B3 &&
+
+	# Now resolve the conflicted path
+	B0=$(echo "resolve undo test data 0" | git hash-object -w --stdin) &&
+	git update-index --add --cacheinfo 100644,$B0,frotz &&
+
+	# These three blob objects are now reachable only from the resolve-undo
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+
+	# and they should survive GC
+	git gc --prune=now &&
+	git cat-file -e $B0 &&
+	git cat-file -e $B1 &&
+	git cat-file -e $B2 &&
+	git cat-file -e $B3 &&
+
+	# Now we switch away, which nukes resolve-undo, and
+	# blobs B0..B3 would become dangling.  fsck should
+	# notice that they are now unreachable.
+	git checkout -f side &&
+	git fsck --unreachable >cruft &&
+	sort cruft >actual &&
+	sort <<-EOF >expect &&
+	unreachable blob $B0
+	unreachable blob $B1
+	unreachable blob $B2
+	unreachable blob $B3
+	EOF
+	test_cmp expect actual &&
+
+	# And they should go away when gc runs.
+	git gc --prune=now &&
+	git fsck --unreachable >cruft &&
+	test_must_be_empty cruft &&
+
+	test_must_fail git cat-file -e $B0 &&
+	test_must_fail git cat-file -e $B1 &&
+	test_must_fail git cat-file -e $B2 &&
+	test_must_fail git cat-file -e $B3
+
+Already on 'main'
+HEAD is now at d92f3b1 add differently
+Switched to branch 'side'
+ok 14 - resolve-undo keeps blobs from gc
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2070-restore.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2070-restore/.git/
+expecting success of 2070.1 'setup': 
+	test_commit first &&
+	echo first-and-a-half >>first.t &&
+	git add first.t &&
+	test_commit second &&
+	echo one >one &&
+	echo two >two &&
+	echo untracked >untracked &&
+	echo ignored >ignored &&
+	echo /ignored >.gitignore &&
+	git add one two .gitignore &&
+	git update-ref refs/heads/one main
+
+[main (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[main a46c920] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 second.t
+ok 1 - setup
+
+expecting success of 2070.2 'restore without pathspec is not ok': 
+	test_must_fail git restore &&
+	test_must_fail git restore --source=first
+
+fatal: you must specify path(s) to restore
+fatal: you must specify path(s) to restore
+ok 2 - restore without pathspec is not ok
+
+expecting success of 2070.3 'restore a file, ignoring branch of same name': 
+	cat one >expected &&
+	echo dirty >>one &&
+	git restore one &&
+	test_cmp expected one
+
+ok 3 - restore a file, ignoring branch of same name
+
+expecting success of 2070.4 'restore a file on worktree from another ref': 
+	test_when_finished git reset --hard &&
+	git cat-file blob first:./first.t >expected &&
+	git restore --source=first first.t &&
+	test_cmp expected first.t &&
+	git cat-file blob HEAD:./first.t >expected &&
+	git show :first.t >actual &&
+	test_cmp expected actual
+
+HEAD is now at a46c920 second
+ok 4 - restore a file on worktree from another ref
+
+expecting success of 2070.5 'restore a file in the index from another ref': 
+	test_when_finished git reset --hard &&
+	git cat-file blob first:./first.t >expected &&
+	git restore --source=first --staged first.t &&
+	git show :first.t >actual &&
+	test_cmp expected actual &&
+	git cat-file blob HEAD:./first.t >expected &&
+	test_cmp expected first.t
+
+HEAD is now at a46c920 second
+ok 5 - restore a file in the index from another ref
+
+expecting success of 2070.6 'restore a file in both the index and worktree from another ref': 
+	test_when_finished git reset --hard &&
+	git cat-file blob first:./first.t >expected &&
+	git restore --source=first --staged --worktree first.t &&
+	git show :first.t >actual &&
+	test_cmp expected actual &&
+	test_cmp expected first.t
+
+HEAD is now at a46c920 second
+ok 6 - restore a file in both the index and worktree from another ref
+
+expecting success of 2070.7 'restore --staged uses HEAD as source': 
+	test_when_finished git reset --hard &&
+	git cat-file blob :./first.t >expected &&
+	echo index-dirty >>first.t &&
+	git add first.t &&
+	git restore --staged first.t &&
+	git cat-file blob :./first.t >actual &&
+	test_cmp expected actual
+
+HEAD is now at a46c920 second
+ok 7 - restore --staged uses HEAD as source
+
+expecting success of 2070.8 'restore --worktree --staged uses HEAD as source': 
+	test_when_finished git reset --hard &&
+	git show HEAD:./first.t >expected &&
+	echo dirty >>first.t &&
+	git add first.t &&
+	git restore --worktree --staged first.t &&
+	git show :./first.t >actual &&
+	test_cmp expected actual &&
+	test_cmp expected first.t
+
+HEAD is now at a46c920 second
+ok 8 - restore --worktree --staged uses HEAD as source
+
+expecting success of 2070.9 'restore --ignore-unmerged ignores unmerged entries': 
+	git init unmerged &&
+	(
+		cd unmerged &&
+		echo one >unmerged &&
+		echo one >common &&
+		git add unmerged common &&
+		git commit -m common &&
+		git switch -c first &&
+		echo first >unmerged &&
+		git commit -am first &&
+		git switch -c second main &&
+		echo second >unmerged &&
+		git commit -am second &&
+		test_must_fail git merge first &&
+
+		echo dirty >>common &&
+		test_must_fail git restore . &&
+
+		git restore --ignore-unmerged --quiet . >output 2>&1 &&
+		git diff common >diff-output &&
+		test_must_be_empty output &&
+		test_must_be_empty diff-output
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2070-restore/unmerged/.git/
+[main (root-commit) b83edd8] common
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 common
+ create mode 100644 unmerged
+Switched to a new branch 'first'
+[first 753ae86] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'second'
+[second 06de6fa] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging unmerged
+CONFLICT (content): Merge conflict in unmerged
+Automatic merge failed; fix conflicts and then commit the result.
+error: path 'unmerged' is unmerged
+ok 9 - restore --ignore-unmerged ignores unmerged entries
+
+expecting success of 2070.10 'restore --staged adds deleted intent-to-add file back to index': 
+	echo "nonempty" >nonempty &&
+	>empty &&
+	git add nonempty empty &&
+	git commit -m "create files to be deleted" &&
+	git rm --cached nonempty empty &&
+	git add -N nonempty empty &&
+	git restore --staged nonempty empty &&
+	git diff --cached --exit-code
+
+[main 94e3084] create files to be deleted
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 empty
+ create mode 100644 nonempty
+rm 'empty'
+rm 'nonempty'
+ok 10 - restore --staged adds deleted intent-to-add file back to index
+
+expecting success of 2070.11 'restore --staged invalidates cache tree for deletions': 
+	test_when_finished git reset --hard &&
+	>new1 &&
+	>new2 &&
+	git add new1 new2 &&
+
+	# It is important to commit and then reset here, so that the index
+	# contains a valid cache-tree for the "both" tree.
+	git commit -m both &&
+	git reset --soft HEAD^ &&
+
+	git restore --staged new1 &&
+	git commit -m "just new2" &&
+	git rev-parse HEAD:new2 &&
+	test_must_fail git rev-parse HEAD:new1
+
+[main 19f4790] both
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 new1
+ create mode 100644 new2
+[main 2c4724a] just new2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 new2
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+fatal: path 'new1' exists on disk, but not in 'HEAD'
+HEAD:new1
+HEAD is now at 2c4724a just new2
+ok 11 - restore --staged invalidates cache tree for deletions
+
+expecting success of 2070.12 'restore --merge to unresolve': 
+	O=$(echo original | git hash-object -w --stdin) &&
+	A=$(echo ourside | git hash-object -w --stdin) &&
+	B=$(echo theirside | git hash-object -w --stdin) &&
+	{
+		echo "100644 $O 1	file" &&
+		echo "100644 $A 2	file" &&
+		echo "100644 $B 3	file"
+	} | git update-index --index-info &&
+	echo nothing >file &&
+	git restore --worktree --merge file &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
+
+ok 12 - restore --merge to unresolve
+
+expecting success of 2070.13 'restore --merge to unresolve after (mistaken) resolution': 
+	O=$(echo original | git hash-object -w --stdin) &&
+	A=$(echo ourside | git hash-object -w --stdin) &&
+	B=$(echo theirside | git hash-object -w --stdin) &&
+	{
+		echo "100644 $O 1	file" &&
+		echo "100644 $A 2	file" &&
+		echo "100644 $B 3	file"
+	} | git update-index --index-info &&
+	echo nothing >file &&
+	git add file &&
+	git restore --worktree --merge file &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
+
+ok 13 - restore --merge to unresolve after (mistaken) resolution
+
+expecting success of 2070.14 'restore --merge to unresolve after (mistaken) resolution': 
+	O=$(echo original | git hash-object -w --stdin) &&
+	A=$(echo ourside | git hash-object -w --stdin) &&
+	B=$(echo theirside | git hash-object -w --stdin) &&
+	{
+		echo "100644 $O 1	file" &&
+		echo "100644 $A 2	file" &&
+		echo "100644 $B 3	file"
+	} | git update-index --index-info &&
+	git rm -f file &&
+	git restore --worktree --merge file &&
+	cat >expect <<-\EOF &&
+	<<<<<<< ours
+	ourside
+	=======
+	theirside
+	>>>>>>> theirs
+	EOF
+	test_cmp expect file
+
+rm 'file'
+ok 14 - restore --merge to unresolve after (mistaken) resolution
+
+expecting success of 2070.15 'restore with merge options are incompatible with certain options': 
+	for opts in \
+		"--staged --ours" \
+		"--staged --theirs" \
+		"--staged --merge" \
+		"--source=HEAD --ours" \
+		"--source=HEAD --theirs" \
+		"--source=HEAD --merge" \
+		"--staged --conflict=diff3" \
+		"--staged --worktree --ours" \
+		"--staged --worktree --theirs" \
+		"--staged --worktree --merge" \
+		"--staged --worktree --conflict=zdiff3"
+	do
+		test_must_fail git restore $opts . 2>err &&
+		grep "cannot be used" err || return
+	done
+
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--merge' or '--conflict' cannot be used with --staged
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+fatal: '--merge', '--ours', or '--theirs' cannot be used when checking out of a tree
+fatal: '--merge' or '--conflict' cannot be used with --staged
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--ours' or '--theirs' cannot be used with --staged
+fatal: '--merge' or '--conflict' cannot be used with --staged
+fatal: '--merge' or '--conflict' cannot be used with --staged
+ok 15 - restore with merge options are incompatible with certain options
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2081-parallel-checkout-collisions.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2081-parallel-checkout-collisions/.git/
+checking prerequisite: CASE_INSENSITIVE_FS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+	echo good >CamelCase &&
+	echo bad >camelcase &&
+	test "$(cat CamelCase)" != good
+
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 1 # skip setup (missing CASE_INSENSITIVE_FS)
+
+ok 2 # skip worker detects basename collision (missing CASE_INSENSITIVE_FS)
+
+ok 3 # skip worker detects dirname collision (missing CASE_INSENSITIVE_FS)
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+ok 4 # skip do not follow symlinks colliding with leading dir (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
+
+ok 5 # skip collision report on clone (w/ racy file creation) (missing CASE_INSENSITIVE_FS)
+
+ok 6 # skip collision report on clone (w/ colliding peer after the detected entry) (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,!MINGW,!CYGWIN)
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2072-restore-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2072-restore-pathspec-file/.git/
+expecting success of 2072.1 'setup': 
+	test_commit file0 &&
+
+	mkdir dir1 &&
+	echo 1 >dir1/file &&
+	echo 1 >fileA.t &&
+	echo 1 >fileB.t &&
+	echo 1 >fileC.t &&
+	echo 1 >fileD.t &&
+	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 1" &&
+
+	echo 2 >dir1/file &&
+	echo 2 >fileA.t &&
+	echo 2 >fileB.t &&
+	echo 2 >fileC.t &&
+	echo 2 >fileD.t &&
+	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 2" &&
+
+	git tag checkpoint
+
+[master (root-commit) ad2e047] file0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file0.t
+[master 17aa47d] files 1
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir1/file
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ create mode 100644 fileC.t
+ create mode 100644 fileD.t
+[master 4c6d82b] files 2
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+ok 1 - setup
+
+expecting success of 2072.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
+
+	echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 2 - --pathspec-from-file from stdin
+
+expecting success of 2072.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 3 - --pathspec-from-file from file
+
+expecting success of 2072.4 'NUL delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 4 - NUL delimiters
+
+expecting success of 2072.5 'LF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 5 - LF delimiters
+
+expecting success of 2072.6 'no trailing delimiter': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 6 - no trailing delimiter
+
+expecting success of 2072.7 'CRLF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 7 - CRLF delimiters
+
+expecting success of 2072.8 'quotes': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 8 - quotes
+
+expecting success of 2072.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
+
+HEAD is now at 4c6d82b files 2
+error: pathspec '"file\101.t"
+' did not match any file(s) known to git
+ok 9 - quotes not compatible with --pathspec-file-nul
+
+expecting success of 2072.10 'only touches what was listed': 
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileB.t
+	 M fileC.t
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 10 - only touches what was listed
+
+expecting success of 2072.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
+
+	test_must_fail git restore --pathspec-from-file=list --patch --source=HEAD^1 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err &&
+
+	test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+
+	test_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+
+	test_must_fail git restore --pathspec-from-file=empty_list --source=HEAD^1 2>err &&
+	test_grep -e "you must specify path(s) to restore" err
+
+HEAD is now at 4c6d82b files 2
+fatal: options '--pathspec-from-file' and '--patch' cannot be used together
+fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
+fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
+fatal: you must specify path(s) to restore
+ok 11 - error conditions
+
+expecting success of 2072.12 'wildcard pathspec matches file in subdirectory': 
+	restore_checkpoint &&
+
+	echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+	cat >expect <<-\EOF &&
+	 M dir1/file
+	EOF
+	verify_expect
+
+HEAD is now at 4c6d82b files 2
+ok 12 - wildcard pathspec matches file in subdirectory
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2071-restore-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2071-restore-patch/.git/
+expecting success of 2071.1 'setup': 
+	mkdir dir &&
+	echo parent >dir/foo &&
+	echo dummy >bar &&
+	git add bar dir/foo &&
+	git commit -m initial &&
+	test_tick &&
+	test_commit second dir/foo head &&
+	set_and_save_state bar bar_work bar_index &&
+	save_head
+
+[master (root-commit) 758b165] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 dir/foo
+[master 3319288] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 2071.2 'restore -p without pathspec is fine': 
+	echo q >cmd &&
+	git restore -p <cmd
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 2 - restore -p without pathspec is fine
+
+expecting success of 2071.3 'saying "n" does nothing': 
+	set_and_save_state dir/foo work head &&
+	test_write_lines n n | git restore -p &&
+	verify_saved_state bar &&
+	verify_saved_state dir/foo
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 3 - saying "n" does nothing
+
+expecting success of 2071.4 'git restore -p': 
+	set_and_save_state dir/foo work head &&
+	test_write_lines n y | git restore -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 4 - git restore -p
+
+expecting success of 2071.5 'git restore -p with staged changes': 
+	set_state dir/foo work index &&
+	test_write_lines n y | git restore -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+index 9015a7a..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-index
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 5 - git restore -p with staged changes
+
+expecting success of 2071.6 'git restore -p --source=HEAD': 
+		set_state dir/foo work index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git restore -p --source=$opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head index &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 6 - git restore -p --source=HEAD
+
+expecting success of 2071.7 'git restore -p --source=@': 
+		set_state dir/foo work index &&
+		# the third n is to get out in case it mistakenly does not apply
+		test_write_lines n y n | git restore -p --source=$opt >output &&
+		verify_saved_state bar &&
+		verify_state dir/foo head index &&
+		test_grep "Discard" output
+	
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 7 - git restore -p --source=@
+
+expecting success of 2071.8 'git restore -p --source=HEAD^': 
+	set_state dir/foo work index &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git restore -p --source=HEAD^ &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent index
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+diff --git b/dir/foo a/dir/foo
+index b8f99f5..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-work
++parent
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+ok 8 - git restore -p --source=HEAD^
+
+expecting success of 2071.9 'git restore -p --source=HEAD^...': 
+	set_state dir/foo work index &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git restore -p --source=HEAD^... &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent index
+
+diff --git b/bar a/bar
+index 8c999e6..421376d 100644
+--- b/bar
++++ a/bar
+@@ -1 +1 @@
+-bar_work
++dummy
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+diff --git b/dir/foo a/dir/foo
+index b8f99f5..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-work
++parent
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+ok 9 - git restore -p --source=HEAD^...
+
+expecting success of 2071.10 'git restore -p handles deletion': 
+	set_state dir/foo work index &&
+	rm dir/foo &&
+	test_write_lines n y | git restore -p &&
+	verify_saved_state bar &&
+	verify_state dir/foo index index
+
+diff --git a/bar b/bar
+index 7780244..8c999e6 100644
+--- a/bar
++++ b/bar
+@@ -1 +1 @@
+-bar_index
++bar_work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+diff --git a/dir/foo b/dir/foo
+deleted file mode 100644
+index 9015a7a..0000000
+--- a/dir/foo
++++ /dev/null
+@@ -1 +0,0 @@
+-index
+(1/1) Discard deletion from worktree [y,n,q,a,d,p,?]? 
+ok 10 - git restore -p handles deletion
+
+expecting success of 2071.11 'path limiting works: dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git restore -p dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 11 - path limiting works: dir
+
+expecting success of 2071.12 'path limiting works: -- dir': 
+	set_state dir/foo work head &&
+	test_write_lines y n | git restore -p -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 12 - path limiting works: -- dir
+
+expecting success of 2071.13 'path limiting works: HEAD^ -- dir': 
+	set_state dir/foo work head &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | git restore -p --source=HEAD^ -- dir &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent head
+
+diff --git b/dir/foo a/dir/foo
+index b8f99f5..9676f5b 100644
+--- b/dir/foo
++++ a/dir/foo
+@@ -1 +1 @@
+-work
++parent
+(1/1) Apply this hunk to worktree [y,n,q,a,d,e,p,?]? 
+ok 13 - path limiting works: HEAD^ -- dir
+
+expecting success of 2071.14 'path limiting works: foo inside dir': 
+	set_state dir/foo work head &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines y n n | (cd dir && git restore -p foo) &&
+	verify_saved_state bar &&
+	verify_state dir/foo head head
+
+diff --git a/dir/foo b/dir/foo
+index 564b12f..b8f99f5 100644
+--- a/dir/foo
++++ b/dir/foo
+@@ -1 +1 @@
+-head
++work
+(1/1) Discard this hunk from worktree [y,n,q,a,d,e,p,?]? 
+ok 14 - path limiting works: foo inside dir
+
+expecting success of 2071.15 'none of this moved HEAD': 
+	verify_saved_head
+
+ok 15 - none of this moved HEAD
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2100-update-cache-badpath.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2100-update-cache-badpath/.git/
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 2100.1 'git update-index --add to add various paths.': git update-index --add -- path0 path1 path2/file2 path3/file3
+ok 1 - git update-index --add to add various paths.
+
+expecting success of 2100.2 'git update-index to add conflicting path path0/file0 should fail.': test_must_fail git update-index --add -- path0/file0
+error: 'path0/file0' appears as both a file and as a directory
+error: path0/file0: cannot add to the index - missing --add option?
+fatal: Unable to process path path0/file0
+ok 2 - git update-index to add conflicting path path0/file0 should fail.
 
 expecting success of 2100.3 'git update-index to add conflicting path path1/file1 should fail.': test_must_fail git update-index --add -- path1/file1
 error: 'path1/file1' appears as both a file and as a directory
@@ -109221,6 +112374,130 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2101-update-index-reupdate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2101-update-index-reupdate/.git/
+expecting success of 2101.1 'update-index --add': 
+	echo hello world >file1 &&
+	echo goodbye people >file2 &&
+	git update-index --add file1 file2 &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object file1) 0	file1
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+
+ok 1 - update-index --add
+
+expecting success of 2101.2 'update-index --again': 
+	rm -f file1 &&
+	echo hello everybody >file2 &&
+	if git update-index --again
+	then
+		echo should have refused to remove file1
+		exit 1
+	else
+		echo happy - failed as expected
+	fi &&
+	git ls-files -s >current &&
+	cmp current expected
+
+error: file1: does not exist and --remove not passed
+fatal: Unable to process path file1
+happy - failed as expected
+ok 2 - update-index --again
+
+expecting success of 2101.3 'update-index --remove --again': 
+	git update-index --remove --again &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+
+ok 3 - update-index --remove --again
+
+expecting success of 2101.4 'first commit': git commit -m initial
+[master (root-commit) 823d2a7] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+ok 4 - first commit
+
+expecting success of 2101.5 'update-index again': 
+	mkdir -p dir1 &&
+	echo hello world >dir1/file3 &&
+	echo goodbye people >file2 &&
+	git update-index --add file2 dir1/file3 &&
+	echo hello everybody >file2 &&
+	echo happy >dir1/file3 &&
+	git update-index --again &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $(git hash-object file2) 0	file2
+	EOF
+	cmp current expected
+
+ok 5 - update-index again
+
+expecting success of 2101.6 'update-index --update from subdir': 
+	echo not so happy >file2 &&
+	(cd dir1 &&
+	cat ../file2 >file3 &&
+	git update-index --again
+	) &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $file2 0	file2
+	EOF
+	test_cmp expected current
+
+ok 6 - update-index --update from subdir
+
+expecting success of 2101.7 'update-index --update with pathspec': 
+	echo very happy >file2 &&
+	cat file2 >dir1/file3 &&
+	git update-index --again dir1/ &&
+	git ls-files -s >current &&
+	cat >expected <<-EOF &&
+	100644 $(git hash-object dir1/file3) 0	dir1/file3
+	100644 $file2 0	file2
+	EOF
+	cmp current expected
+
+ok 7 - update-index --update with pathspec
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2102-update-index-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2102-update-index-symlinks/.git/
+expecting success of 2102.1 'preparation': 
+git config core.symlinks false &&
+l=$(printf file | git hash-object -t blob -w --stdin) &&
+echo "120000 $l	symlink" | git update-index --index-info
+ok 1 - preparation
+
+expecting success of 2102.2 'modify the symbolic link': 
+printf new-file > symlink &&
+git update-index symlink
+ok 2 - modify the symbolic link
+
+expecting success of 2102.3 'the index entry must still be a symbolic link': 
+case "$(git ls-files --stage --cached symlink)" in
+120000" "*symlink) echo pass;;
+*) echo fail; git ls-files --stage --cached symlink; false;;
+esac
+pass
+ok 3 - the index entry must still be a symbolic link
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2082-parallel-checkout-attributes.sh ***
 expecting success of 2082.1 'parallel-checkout with ident': 
 	set_checkout_config 2 0 &&
@@ -109453,128 +112730,51 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2101-update-index-reupdate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2101-update-index-reupdate/.git/
-expecting success of 2101.1 'update-index --add': 
-	echo hello world >file1 &&
-	echo goodbye people >file2 &&
-	git update-index --add file1 file2 &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object file1) 0	file1
-	100644 $(git hash-object file2) 0	file2
-	EOF
-	cmp current expected
-
-ok 1 - update-index --add
-
-expecting success of 2101.2 'update-index --again': 
-	rm -f file1 &&
-	echo hello everybody >file2 &&
-	if git update-index --again
-	then
-		echo should have refused to remove file1
-		exit 1
-	else
-		echo happy - failed as expected
-	fi &&
-	git ls-files -s >current &&
-	cmp current expected
-
-error: file1: does not exist and --remove not passed
-fatal: Unable to process path file1
-happy - failed as expected
-ok 2 - update-index --again
-
-expecting success of 2101.3 'update-index --remove --again': 
-	git update-index --remove --again &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object file2) 0	file2
-	EOF
-	cmp current expected
-
-ok 3 - update-index --remove --again
+*** t2105-update-index-gitfile.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2105-update-index-gitfile/.git/
+expecting success of 2105.1 'submodule with absolute .git file': 
+	mkdir sub1 &&
+	(cd sub1 &&
+	 git init &&
+	 REAL="$(pwd)/.real" &&
+	 mv .git "$REAL" &&
+	 echo "gitdir: $REAL" >.git &&
+	 test_commit first)
 
-expecting success of 2101.4 'first commit': git commit -m initial
-[master (root-commit) 823d2a7] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2105-update-index-gitfile/sub1/.git/
+[master (root-commit) 50e526b] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 4 - first commit
-
-expecting success of 2101.5 'update-index again': 
-	mkdir -p dir1 &&
-	echo hello world >dir1/file3 &&
-	echo goodbye people >file2 &&
-	git update-index --add file2 dir1/file3 &&
-	echo hello everybody >file2 &&
-	echo happy >dir1/file3 &&
-	git update-index --again &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object dir1/file3) 0	dir1/file3
-	100644 $(git hash-object file2) 0	file2
-	EOF
-	cmp current expected
-
-ok 5 - update-index again
-
-expecting success of 2101.6 'update-index --update from subdir': 
-	echo not so happy >file2 &&
-	(cd dir1 &&
-	cat ../file2 >file3 &&
-	git update-index --again
-	) &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object dir1/file3) 0	dir1/file3
-	100644 $file2 0	file2
-	EOF
-	test_cmp expected current
+ create mode 100644 first.t
+ok 1 - submodule with absolute .git file
 
-ok 6 - update-index --update from subdir
+expecting success of 2105.2 'add gitlink to absolute .git file': 
+	git update-index --add -- sub1
 
-expecting success of 2101.7 'update-index --update with pathspec': 
-	echo very happy >file2 &&
-	cat file2 >dir1/file3 &&
-	git update-index --again dir1/ &&
-	git ls-files -s >current &&
-	cat >expected <<-EOF &&
-	100644 $(git hash-object dir1/file3) 0	dir1/file3
-	100644 $file2 0	file2
-	EOF
-	cmp current expected
+ok 2 - add gitlink to absolute .git file
 
-ok 7 - update-index --update with pathspec
+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)
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2102-update-index-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2102-update-index-symlinks/.git/
-expecting success of 2102.1 'preparation': 
-git config core.symlinks false &&
-l=$(printf file | git hash-object -t blob -w --stdin) &&
-echo "120000 $l	symlink" | git update-index --index-info
-ok 1 - preparation
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2105-update-index-gitfile/sub2/.git/
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+ok 3 - submodule with relative .git file
 
-expecting success of 2102.2 'modify the symbolic link': 
-printf new-file > symlink &&
-git update-index symlink
-ok 2 - modify the symbolic link
+expecting success of 2105.4 'add gitlink to relative .git file': 
+	git update-index --add -- sub2
 
-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 4 - add gitlink to relative .git file
 
-# passed all 3 test(s)
-1..3
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2104-update-index-skip-worktree.sh ***
@@ -109775,53 +112975,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2105-update-index-gitfile.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2105-update-index-gitfile/.git/
-expecting success of 2105.1 'submodule with absolute .git file': 
-	mkdir sub1 &&
-	(cd sub1 &&
-	 git init &&
-	 REAL="$(pwd)/.real" &&
-	 mv .git "$REAL" &&
-	 echo "gitdir: $REAL" >.git &&
-	 test_commit first)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2105-update-index-gitfile/sub1/.git/
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-ok 1 - submodule with absolute .git file
-
-expecting success of 2105.2 'add gitlink to absolute .git file': 
-	git update-index --add -- sub1
-
-ok 2 - add gitlink to absolute .git file
-
-expecting success of 2105.3 'submodule with relative .git file': 
-	mkdir sub2 &&
-	(cd sub2 &&
-	 git init &&
-	 mv .git .real &&
-	 echo "gitdir: .real" >.git &&
-	 test_commit first)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2105-update-index-gitfile/sub2/.git/
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-ok 3 - submodule with relative .git file
-
-expecting success of 2105.4 'add gitlink to relative .git file': 
-	git update-index --add -- sub2
-
-ok 4 - add gitlink to relative .git file
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2106-update-index-assume-unchanged.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2106-update-index-assume-unchanged/.git/
 expecting success of 2106.1 'setup': 
@@ -109859,88 +113012,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2108-update-index-refresh-racy.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
-
-[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 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
-
-ok 2 - --refresh has no racy timestamps to fix
-
-expecting success of 2108.3 '--refresh should fix racy timestamp': 
-	reset_files &&
-	update_assert_changed --refresh
-
---- .git/test-mtime-expect	2025-12-18 01:33:29.834773267 +0000
-+++ .git/test-mtime-actual	2025-12-18 01:33:29.838773267 +0000
-@@ -1 +1 @@
--1234567890
-+1766021609
-ok 3 - --refresh should fix racy timestamp
-
-expecting success of 2108.4 '--really-refresh should fix racy timestamp': 
-	reset_files &&
-	update_assert_changed --really-refresh
-
---- .git/test-mtime-expect	2025-12-18 01:33:29.878773267 +0000
-+++ .git/test-mtime-actual	2025-12-18 01:33:29.882773267 +0000
-@@ -1 +1 @@
--1234567890
-+1766021609
-ok 4 - --really-refresh should fix racy timestamp
-
-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
-
-other: needs update
---- .git/test-mtime-expect	2025-12-18 01:33:29.934773267 +0000
-+++ .git/test-mtime-actual	2025-12-18 01:33:29.938773267 +0000
-@@ -1 +1 @@
--1234567890
-+1766021609
-ok 5 - --refresh should fix racy timestamp if other file needs update
-
-expecting success of 2108.6 '--refresh should fix racy timestamp if racy file needs update': 
-	reset_files &&
-	echo content2 >file &&
-	test_set_magic_mtime file &&
-	update_assert_changed --refresh
-
-file: needs update
---- .git/test-mtime-expect	2025-12-18 01:33:29.990773267 +0000
-+++ .git/test-mtime-actual	2025-12-18 01:33:29.990773267 +0000
-@@ -1 +1 @@
--1234567890
-+1766021609
-ok 6 - --refresh should fix racy timestamp if racy file needs update
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2107-update-index-basic.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2107-update-index-basic/.git/
 expecting success of 2107.1 'update-index --nonsense fails': 
@@ -110135,191 +113206,83 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2201-add-update-typechange.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
-
-	test_tick &&
-	git commit -m initial
-
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+*** t2108-update-index-refresh-racy.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
 
-)
-prerequisite SYMLINKS ok
-[master (root-commit) 8dc0761] initial
+[master (root-commit) 4c25839] initial import
  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
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 other
 ok 1 - setup
 
-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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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
+ok 2 - --refresh has no racy timestamps to fix
 
-expecting success of 2201.3 'diff-files': 
-	git diff-files --raw >actual &&
-	test_cmp expect-files actual
+expecting success of 2108.3 '--refresh should fix racy timestamp': 
+	reset_files &&
+	update_assert_changed --refresh
 
-ok 3 - diff-files
+--- .git/test-mtime-expect	2024-11-14 19:29:52.369899729 +0000
++++ .git/test-mtime-actual	2024-11-14 19:29:52.389899934 +0000
+@@ -1 +1 @@
+-1234567890
++1731612592
+ok 3 - --refresh should fix racy timestamp
 
-expecting success of 2201.4 'diff-index': 
-	git diff-index --raw HEAD -- >actual &&
-	test_cmp expect-index actual
+expecting success of 2108.4 '--really-refresh should fix racy timestamp': 
+	reset_files &&
+	update_assert_changed --really-refresh
 
-ok 4 - diff-index
+--- .git/test-mtime-expect	2024-11-14 19:29:52.521901278 +0000
++++ .git/test-mtime-actual	2024-11-14 19:29:52.529901360 +0000
+@@ -1 +1 @@
+-1234567890
++1731612592
+ok 4 - --really-refresh should fix racy timestamp
 
-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 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
 
-ok 5 - add -u
+other: needs update
+--- .git/test-mtime-expect	2024-11-14 19:29:52.757903682 +0000
++++ .git/test-mtime-actual	2024-11-14 19:29:52.773903845 +0000
+@@ -1 +1 @@
+-1234567890
++1731612592
+ok 5 - --refresh should fix racy timestamp if other file needs update
 
-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 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
 
-[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
+file: needs update
+--- .git/test-mtime-expect	2024-11-14 19:29:53.105907227 +0000
++++ .git/test-mtime-actual	2024-11-14 19:29:53.121907391 +0000
+@@ -1 +1 @@
+-1234567890
++1731612593
+ok 6 - --refresh should fix racy timestamp if racy file needs update
 
 # passed all 6 test(s)
 1..6
@@ -110602,6 +113565,196 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2201-add-update-typechange.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
+
+	test_tick &&
+	git commit -m initial
+
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master (root-commit) 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
+
+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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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 2201.3 'diff-files': 
+	git diff-files --raw >actual &&
+	test_cmp expect-files actual
+
+ok 3 - diff-files
+
+expecting success of 2201.4 'diff-index': 
+	git diff-index --raw HEAD -- >actual &&
+	test_cmp expect-index actual
+
+ok 4 - diff-index
+
+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
+
+ok 5 - add -u
+
+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
+
+[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
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2202-add-addremove.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2202-add-addremove/.git/
 expecting success of 2202.1 'setup': 
@@ -110667,378 +113820,271 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2204-add-ignored.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t2205-add-worktree-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 1 - setup
+	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 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
+	cat >expect-tracked-unsorted <<-EOF &&
+	../file-tracked
+	../outside-tracked/file
+	file-tracked
+	inside-tracked/file
+	EOF
 
-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
+	cat >expect-untracked-unsorted <<-EOF &&
+	../file-untracked
+	../outside-untracked/file
+	file-untracked
+	inside-untracked/file
+	EOF
 
-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
+	cat >expect-all-dir-unsorted <<-EOF &&
+	../file-untracked
+	../file-tracked
+	../outside-untracked/
+	../outside-tracked/
+	./
+	EOF
 
-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*
+	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
 
-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
+	cat >.gitignore <<-EOF
+	.gitignore
+	actual-*
+	expect-*
+	EOF
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test1/repo/.git/
+ok 1 - 1a: setup--config worktree
 
-expecting success of 2204.8 'complaints for ignored ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 8 - complaints for ignored ign with unignored file
+expecting success of 2205.2 '1b: pre-add all': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-all-unsorted &&
+	sort actual-all-unsorted >actual-all &&
+	sort expect-all-unsorted >expect-all &&
+	test_cmp expect-all actual-all
+	)
 
-expecting success of 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
+ok 2 - 1b: pre-add all
 
-expecting success of 2204.10 'complaints for ignored dir/ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 10 - complaints for ignored dir/ign
+expecting success of 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 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
+ok 3 - 1c: pre-add dir all
 
-expecting success of 2204.12 'complaints for ignored dir/ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 12 - complaints for ignored dir/ign with unignored file
+expecting success of 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 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
+ok 4 - 1d: post-add tracked
 
-expecting success of 2204.14 'complaints for ignored dir/sub': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 14 - complaints for ignored dir/sub
+expecting success of 2205.5 '1e: post-add untracked': 
+	(
+	cd test1 &&
+	local parent_dir="$(pwd)" &&
+	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-untracked-unsorted &&
+	sort actual-untracked-unsorted >actual-untracked &&
+	sort expect-untracked-unsorted >expect-untracked &&
+	test_cmp expect-untracked actual-untracked
+	)
 
-expecting success of 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
+ok 5 - 1e: post-add untracked
 
-expecting success of 2204.16 'complaints for ignored dir/sub with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 16 - complaints for ignored dir/sub with unignored file
+expecting success of 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 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
+	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 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
+	cat >expect-tracked-unsorted <<-EOF &&
+	repo/file-tracked
+	repo/inside-tracked/file
+	EOF
 
-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
+	cat >expect-untracked-unsorted <<-EOF &&
+	repo/file-untracked
+	repo/inside-untracked/file
+	repo/repo-inside/
+	repo-outside/
+	EOF
 
-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
+	cat >expect-all-dir-unsorted <<-EOF &&
+	repo/
+	repo-outside/
+	EOF
 
-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
+	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
 
-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
+	cat >.gitignore <<-EOF
+	.gitignore
+	actual-*
+	expect-*
+	EOF
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test2/repo/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test2/repo-outside/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test2/repo/repo-inside/.git/
+ok 6 - 2a: setup--set git-dir
 
-expecting success of 2204.24 'complaints for ignored sub/file with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 24 - complaints for ignored sub/file with unignored file
+expecting success of 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 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
+ok 7 - 2b: pre-add all
 
-expecting success of 2204.26 'complaints for ignored sub': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 26 - complaints for ignored sub
+expecting success of 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 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
+ok 8 - 2c: pre-add dir all
 
-expecting success of 2204.28 'complaints for ignored sub with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 28 - complaints for ignored sub with unignored file
-
-expecting success of 2204.29 'complaints for ignored sub with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 29 - complaints for ignored sub with unignored file output
-
-expecting success of 2204.30 'complaints for ignored sub/file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 30 - complaints for ignored sub/file
-
-expecting success of 2204.31 'complaints for ignored sub/file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 31 - complaints for ignored sub/file output
-
-expecting success of 2204.32 'complaints for ignored sub/file with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 32 - complaints for ignored sub/file with unignored file
-
-expecting success of 2204.33 'complaints for ignored sub/file with unignored file output': 
-		test_grep -e "Use -f if" err
-	
-hint: Use -f if you really want to add them.
-ok 33 - complaints for ignored sub/file with unignored file output
-
-expecting success of 2204.34 'complaints for ignored sub/ign': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 34 - complaints for ignored sub/ign
+expecting success of 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 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
+ok 9 - 2d: post-add tracked
 
-expecting success of 2204.36 'complaints for ignored sub/ign with unignored file': 
-		rm -f .git/index &&
-		test_must_fail git add "$i" file 2>err &&
-		git ls-files "$i" >out &&
-		test_must_be_empty out
-	
-ok 36 - complaints for ignored sub/ign with unignored file
+expecting success of 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
+	)
 
-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
+ok 10 - 2e: post-add untracked
 
-expecting success of 2204.38 'complaints for ignored sub in dir': 
-		rm -f .git/index &&
-		(
-			cd dir &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 38 - complaints for ignored sub in dir
+expecting success of 2205.11 '3a: setup--add repo dir': 
+	mkdir test3 &&
+	(
+	cd test3 &&
+	test_create_repo repo &&
 
-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
+	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 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
+	cat >.gitignore <<-EOF &&
+	.gitignore
+	actual-*
+	expect-*
+	*ignored
+	EOF
 
-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
+	cat >expect-tracked-unsorted <<-EOF &&
+	repo/file-tracked
+	repo/inside-tracked/file
+	EOF
 
-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
+	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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test3/repo/.git/
+ok 11 - 3a: setup--add repo dir
 
-expecting success of 2204.44 'complaints for ignored ign in sub': 
-		rm -f .git/index &&
-		(
-			cd sub &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 44 - complaints for ignored ign in sub
+expecting success of 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 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
+ok 12 - 3b: ignored
 
-expecting success of 2204.46 'complaints for ignored file in sub': 
-		rm -f .git/index &&
-		(
-			cd sub &&
-			test_must_fail git add "$i" 2>err &&
-			git ls-files "$i" >out &&
-			test_must_be_empty out
-		)
-	
-ok 46 - complaints for ignored file in sub
+expecting success of 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
+	)
 
-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
+ok 13 - 3c: add repo
 
-# passed all 47 test(s)
-1..47
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2203-add-intent.sh ***
@@ -111452,527 +114498,378 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2205-add-worktree-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/.git/
-expecting success of 2205.1 '1a: setup--config worktree': 
-	mkdir test1 &&
-	(
-	cd test1 &&
-	test_create_repo repo &&
-	git --git-dir="repo/.git" config core.worktree "$(pwd)" &&
-
-	mkdir -p outside-tracked outside-untracked &&
-	mkdir -p repo/inside-tracked repo/inside-untracked &&
-	>file-tracked &&
-	>file-untracked &&
-	>outside-tracked/file &&
-	>outside-untracked/file &&
-	>repo/file-tracked &&
-	>repo/file-untracked &&
-	>repo/inside-tracked/file &&
-	>repo/inside-untracked/file &&
-
-	cat >expect-tracked-unsorted <<-EOF &&
-	../file-tracked
-	../outside-tracked/file
-	file-tracked
-	inside-tracked/file
-	EOF
-
-	cat >expect-untracked-unsorted <<-EOF &&
-	../file-untracked
-	../outside-untracked/file
-	file-untracked
-	inside-untracked/file
-	EOF
-
-	cat >expect-all-dir-unsorted <<-EOF &&
-	../file-untracked
-	../file-tracked
-	../outside-untracked/
-	../outside-tracked/
-	./
-	EOF
+*** t2204-add-ignored.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+ok 1 - setup
 
-	cat >.gitignore <<-EOF
-	.gitignore
-	actual-*
-	expect-*
-	EOF
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test1/repo/.git/
-ok 1 - 1a: setup--config worktree
+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 2205.2 '1b: pre-add all': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-all-unsorted &&
-	sort actual-all-unsorted >actual-all &&
-	sort expect-all-unsorted >expect-all &&
-	test_cmp expect-all actual-all
-	)
+expecting success of 2204.4 'no complaints for unignored dir': 
+		rm -f .git/index &&
+		git add "$i" &&
+		git ls-files "$i" >out &&
+		test -s out
+	
+ok 4 - no complaints for unignored dir
 
-ok 2 - 1b: pre-add all
+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 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 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 3 - 1c: pre-add dir all
+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 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 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 4 - 1d: post-add tracked
+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 2205.5 '1e: post-add untracked': 
-	(
-	cd test1 &&
-	local parent_dir="$(pwd)" &&
-	git -C repo ls-files -o --exclude-standard "$parent_dir" >actual-untracked-unsorted &&
-	sort actual-untracked-unsorted >actual-untracked &&
-	sort expect-untracked-unsorted >expect-untracked &&
-	test_cmp expect-untracked actual-untracked
-	)
+expecting success of 2204.10 'complaints for ignored dir/ign': 
+		rm -f .git/index &&
+		test_must_fail git add "$i" 2>err &&
+		git ls-files "$i" >out &&
+		test_must_be_empty out
+	
+ok 10 - complaints for ignored dir/ign
 
-ok 5 - 1e: post-add untracked
+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 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 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
 
-	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 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
 
-	cat >expect-tracked-unsorted <<-EOF &&
-	repo/file-tracked
-	repo/inside-tracked/file
-	EOF
+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
 
-	cat >expect-untracked-unsorted <<-EOF &&
-	repo/file-untracked
-	repo/inside-untracked/file
-	repo/repo-inside/
-	repo-outside/
-	EOF
+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
 
-	cat >expect-all-dir-unsorted <<-EOF &&
-	repo/
-	repo-outside/
-	EOF
+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
 
-	cat expect-tracked-unsorted expect-untracked-unsorted >expect-all-unsorted &&
+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
 
-	cat >.gitignore <<-EOF
-	.gitignore
-	actual-*
-	expect-*
-	EOF
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test2/repo/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test2/repo-outside/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test2/repo/repo-inside/.git/
-ok 6 - 2a: setup--set git-dir
+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 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 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 7 - 2b: pre-add all
+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 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 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 8 - 2c: pre-add dir all
+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 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 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 9 - 2d: post-add tracked
+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 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
-	)
+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 10 - 2e: post-add untracked
+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 2205.11 '3a: setup--add repo dir': 
-	mkdir test3 &&
-	(
-	cd test3 &&
-	test_create_repo repo &&
+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
 
-	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 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
 
-	cat >.gitignore <<-EOF &&
-	.gitignore
-	actual-*
-	expect-*
-	*ignored
-	EOF
+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
 
-	cat >expect-tracked-unsorted <<-EOF &&
-	repo/file-tracked
-	repo/inside-tracked/file
-	EOF
+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
 
-	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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2205-add-worktree-config/test3/repo/.git/
-ok 11 - 3a: setup--add repo dir
+expecting success of 2204.33 'complaints for ignored sub/file with unignored file output': 
+		test_grep -e "Use -f if" err
+	
+hint: Use -f if you really want to add them.
+ok 33 - complaints for ignored sub/file with unignored file output
 
-expecting success of 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 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 12 - 3b: ignored
+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 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
-	)
+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
 
-ok 13 - 3c: add repo
+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
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2300-cd-to-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2300-cd-to-toplevel/.git/
-expecting success of 2300.1 'at physical root': 
+expecting success of 2204.38 'complaints for ignored sub in dir': 
+		rm -f .git/index &&
 		(
-			cd 'repo' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
+			cd dir &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
 		)
 	
-ok 1 - at physical root
+ok 38 - complaints for ignored sub in dir
 
-expecting success of 2300.2 'at physical subdir': 
+expecting success of 2204.39 'complaints for ignored sub in dir output': 
 		(
-			cd 'repo/sub/dir' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
+			cd dir &&
+			test_grep -e "Use -f if" err
 		)
 	
-ok 2 - at physical subdir
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+hint: Use -f if you really want to add them.
+ok 39 - complaints for ignored sub in dir output
 
-)
-prerequisite SYMLINKS ok
-expecting success of 2300.3 'at symbolic root': 
+expecting success of 2204.40 'complaints for ignored sub/file in dir': 
+		rm -f .git/index &&
 		(
-			cd 'symrepo' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
+			cd dir &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
 		)
 	
-ok 3 - at symbolic root
+ok 40 - complaints for ignored sub/file in dir
 
-expecting success of 2300.4 'at symbolic subdir': 
+expecting success of 2204.41 'complaints for ignored sub/file in dir output': 
 		(
-			cd 'subdir-link' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
+			cd dir &&
+			test_grep -e "Use -f if" err
 		)
 	
-ok 4 - at symbolic subdir
+hint: Use -f if you really want to add them.
+ok 41 - complaints for ignored sub/file in dir output
 
-expecting success of 2300.5 'at internal symbolic subdir': 
+expecting success of 2204.42 'complaints for ignored sub/ign in dir': 
+		rm -f .git/index &&
 		(
-			cd 'internal-link' &&
-			PATH="$EXEC_PATH:$PATH" &&
-			. git-sh-setup &&
-			cd_to_toplevel &&
-			[ "$(pwd -P)" = "$TOPLEVEL" ]
+			cd dir &&
+			test_must_fail git add "$i" 2>err &&
+			git ls-files "$i" >out &&
+			test_must_be_empty out
 		)
 	
-ok 5 - at internal symbolic subdir
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2401-worktree-prune.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2401-worktree-prune/.git/
-expecting success of 2401.1 'initialize': 
-	git commit --allow-empty -m init
-
-[main (root-commit) 50572bf] init
- Author: A U Thor <author@example.com>
-ok 1 - initialize
-
-expecting success of 2401.2 'worktree prune on normal repo': 
-	git worktree prune &&
-	test_must_fail git worktree prune abc
-
-usage: git worktree prune [-n] [-v] [--expire <expire>]
-
-    -n, --[no-]dry-run    do not remove, show only
-    -v, --[no-]verbose    report pruned working trees
-    --[no-]expire <expiry-date>
-                          expire working trees older than <time>
-
-ok 2 - worktree prune on normal repo
-
-expecting success of 2401.3 'prune files inside $GIT_DIR/worktrees': 
-	mkdir .git/worktrees &&
-	: >.git/worktrees/abc &&
-	git worktree prune --verbose 2>actual &&
-	cat >expect <<EOF &&
-Removing worktrees/abc: not a valid directory
-EOF
-	test_cmp expect actual &&
-	! test -f .git/worktrees/abc &&
-	! test -d .git/worktrees
-
-ok 3 - prune files inside $GIT_DIR/worktrees
-
-expecting success of 2401.4 'prune directories without gitdir': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	cat >expect <<EOF &&
-Removing worktrees/def: gitdir file does not exist
-EOF
-	git worktree prune --verbose 2>actual &&
-	test_cmp expect actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
-
-ok 4 - prune directories without gitdir
-
-checking prerequisite: SANITY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
-
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
-
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
-
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
-
-)
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 2401.5 'prune directories with unreadable gitdir': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	: >.git/worktrees/def/gitdir &&
-	chmod u-r .git/worktrees/def/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "Removing worktrees/def: unable to read gitdir file" actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
-
-Removing worktrees/def: unable to read gitdir file (Permission denied)
-ok 5 - prune directories with unreadable gitdir
-
-expecting success of 2401.6 'prune directories with invalid gitdir': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	: >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "Removing worktrees/def: invalid gitdir file" actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
-
-Removing worktrees/def: invalid gitdir file
-ok 6 - prune directories with invalid gitdir
-
-expecting success of 2401.7 'prune directories with gitdir pointing to nowhere': 
-	mkdir -p .git/worktrees/def/abc &&
-	: >.git/worktrees/def/def &&
-	echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
-	git worktree prune --verbose 2>actual &&
-	test_grep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
-	! test -d .git/worktrees/def &&
-	! test -d .git/worktrees
-
-Removing worktrees/def: gitdir file points to non-existent location
-ok 7 - prune directories with gitdir pointing to nowhere
-
-expecting success of 2401.8 'not prune locked checkout': 
-	test_when_finished rm -r .git/worktrees &&
-	mkdir -p .git/worktrees/ghi &&
-	: >.git/worktrees/ghi/locked &&
-	git worktree prune &&
-	test -d .git/worktrees/ghi
-
-ok 8 - not prune locked checkout
-
-expecting success of 2401.9 'not prune recent checkouts': 
-	test_when_finished rm -r .git/worktrees &&
-	git worktree add jlm HEAD &&
-	test -d .git/worktrees/jlm &&
-	rm -rf jlm &&
-	git worktree prune --verbose --expire=2.days.ago &&
-	test -d .git/worktrees/jlm
-
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-ok 9 - not prune recent checkouts
-
-expecting success of 2401.10 'not prune proper checkouts': 
-	test_when_finished rm -r .git/worktrees &&
-	git worktree add --detach "$PWD/nop" main &&
-	git worktree prune &&
-	test -d .git/worktrees/nop
+ok 42 - complaints for ignored sub/ign in dir
 
-Preparing worktree (detached HEAD 50572bf)
-HEAD is now at 50572bf init
-ok 10 - not prune proper checkouts
+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 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 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
 
-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 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 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
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 2204.47 'complaints for ignored file in sub output': 
+		(
+			cd sub &&
+			test_grep -e "Use -f if" err
+		)
+	
+hint: Use -f if you really want to add them.
+ok 47 - complaints for ignored file in sub output
 
-# passed all 12 test(s)
-1..12
+# passed all 47 test(s)
+1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2080-parallel-checkout-basics.sh ***
@@ -112437,396 +115334,260 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2402-worktree-list.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/.git/
-expecting success of 2402.1 'setup': 
-	test_commit init
-
-[main (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-ok 1 - setup
-
-expecting success of 2402.2 'rev-parse --git-common-dir on main worktree': 
-	git rev-parse --git-common-dir >actual &&
-	echo .git >expected &&
-	test_cmp expected actual &&
-	mkdir sub &&
-	git -C sub rev-parse --git-common-dir >actual2 &&
-	echo ../.git >expected2 &&
-	test_cmp expected2 actual2
-
-ok 2 - rev-parse --git-common-dir on main worktree
-
-expecting success of 2402.3 'rev-parse --git-path objects linked worktree': 
-	echo "$(git rev-parse --show-toplevel)/.git/objects" >expect &&
-	test_when_finished "rm -rf linked-tree actual expect && git worktree prune" &&
-	git worktree add --detach linked-tree main &&
-	git -C linked-tree rev-parse --git-path objects >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 3 - rev-parse --git-path objects linked worktree
-
-expecting success of 2402.4 '"list" all worktrees from main': 
-	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
-	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
-	git worktree add --detach here main &&
-	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 4 - "list" all worktrees from main
-
-expecting success of 2402.5 '"list" all worktrees from linked': 
-	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
-	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
-	git worktree add --detach here main &&
-	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
-	git -C here worktree list >out &&
-	sed "s/  */ /g" <out >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 5 - "list" all worktrees from linked
-
-expecting success of 2402.6 '"list" all worktrees --porcelain': 
-	echo "worktree $(git rev-parse --show-toplevel)" >expect &&
-	echo "HEAD $(git rev-parse HEAD)" >>expect &&
-	echo "branch $(git symbolic-ref HEAD)" >>expect &&
-	echo >>expect &&
-	test_when_finished "rm -rf here actual expect && git worktree prune" &&
-	git worktree add --detach here main &&
-	echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
-	echo "HEAD $(git rev-parse HEAD)" >>expect &&
-	echo "detached" >>expect &&
-	echo >>expect &&
-	git worktree list --porcelain >actual &&
-	test_cmp expect actual
-
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 6 - "list" all worktrees --porcelain
+*** t2300-cd-to-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2300-cd-to-toplevel/.git/
+expecting success of 2300.1 'at physical root': 
+		(
+			cd 'repo' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 1 - at physical root
 
-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 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
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 7 - "list" all worktrees --porcelain -z
+checking prerequisite: SYMLINKS
 
-expecting success of 2402.8 '"list" -z fails without --porcelain': 
-	test_must_fail git worktree list -z
+mkdir -p "$TRASH_DIRECTORY/prereq-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: the option '-z' requires '--porcelain'
-ok 8 - "list" -z fails without --porcelain
+)
+prerequisite SYMLINKS ok
+expecting success of 2300.3 'at symbolic root': 
+		(
+			cd 'symrepo' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 3 - at symbolic root
 
-expecting success of 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 2300.4 'at symbolic subdir': 
+		(
+			cd 'subdir-link' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 4 - at symbolic subdir
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/locked    2519212 (detached HEAD) locked
-ok 9 - "list" all worktrees with locked annotation
+expecting success of 2300.5 'at internal symbolic subdir': 
+		(
+			cd 'internal-link' &&
+			PATH="$EXEC_PATH:$PATH" &&
+			. git-sh-setup &&
+			cd_to_toplevel &&
+			[ "$(pwd -P)" = "$TOPLEVEL" ]
+		)
+	
+ok 5 - at internal symbolic subdir
 
-expecting success of 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
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2401-worktree-prune.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2401-worktree-prune/.git/
+expecting success of 2401.1 'initialize': 
+	git commit --allow-empty -m init
 
-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
+[main (root-commit) 50572bf] init
+ Author: A U Thor <author@example.com>
+ok 1 - initialize
 
-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 2401.2 'worktree prune on normal repo': 
+	git worktree prune &&
+	test_must_fail git worktree prune abc
 
-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
+usage: git worktree prune [-n] [-v] [--expire <expire>]
 
-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$"
+    -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>
 
-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.45.2/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
-ok 12 - "list" all worktrees with prunable annotation
+ok 2 - worktree prune on normal repo
 
-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 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
 
-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
+ok 3 - prune files inside $GIT_DIR/worktrees
 
-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 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
 
-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.45.2/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"
+ok 4 - prune directories without gitdir
 
-expecting success of 2402.15 '"list" --verbose and --porcelain mutually exclusive': 
-	test_must_fail git worktree list --verbose --porcelain
+checking prerequisite: SANITY
 
-fatal: options '--verbose' and '--porcelain' cannot be used together
-ok 15 - "list" --verbose and --porcelain mutually exclusive
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-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
+	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"
 
-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.45.2/t/trash directory.t2402-worktree-list/locked1  2519212 (detached HEAD) locked
-ok 16 - "list" all worktrees --verbose with locked
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-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
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 17 - "list" all worktrees --verbose with prunable
+)
+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 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^
+Removing worktrees/def: unable to read gitdir file (Permission denied)
+ok 5 - prune directories with unreadable gitdir
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/bare1/
-[main 7c81006] File1: add data
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-To bare1
- * [new branch]      main -> main
-HEAD is now at 2519212 init
-ok 18 - bare repo setup
+expecting success of 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 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
+Removing worktrees/def: invalid gitdir file
+ok 6 - prune directories with invalid gitdir
 
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 19 - "list" all worktrees from bare main
+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 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
+Removing worktrees/def: gitdir file points to non-existent location
+ok 7 - prune directories with gitdir pointing to nowhere
 
-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 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 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 8 - not prune locked checkout
 
-Preparing worktree (detached HEAD 7c81006)
-HEAD is now at 7c81006 File1: add data
-ok 21 - "list" all worktrees from linked with a bare main
+expecting success of 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 2402.22 'bare repo cleanup': 
-	rm -rf bare1
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+ok 9 - not prune recent checkouts
 
-ok 22 - bare repo cleanup
+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 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
+Preparing worktree (detached HEAD 50572bf)
+HEAD is now at 50572bf init
+ok 10 - not prune proper checkouts
 
-		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
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2402-worktree-list/broken-main         0000000 (error)
-ok 23 - broken main worktree still at the top
+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 2402.24 'linked worktrees are 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
+expecting success of 2401.12 'prune duplicate (main/linked)': 
+	test_when_finished rm -fr repo wt &&
+	test_create_repo repo &&
+	test_commit -C repo x &&
+	git -C repo worktree add --detach ../wt &&
+	rm -fr wt &&
+	mv repo wt &&
+	git -C wt worktree prune --verbose 2>actual &&
+	test_grep "duplicate entry" actual &&
+	! test -d .git/worktrees/wt
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/sorted/main/.git/
-[main (root-commit) d8ef111] new
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 new.t
-Preparing worktree (new branch 'first')
-HEAD is now at d8ef111 new
-Preparing worktree (new branch 'second')
-HEAD is now at d8ef111 new
-ok 24 - linked worktrees are sorted
-
-expecting success of 2402.25 'worktree path when called in .git directory': 
-	git worktree list >list1 &&
-	git -C .git worktree list >list2 &&
-	test_cmp list1 list2
-
-ok 25 - worktree path when called in .git directory
+ 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)
 
-# passed all 25 test(s)
-1..25
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2404-worktree-config.sh ***
@@ -113315,279 +116076,396 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2406-worktree-repair.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/
-expecting success of 2406.1 'setup': 
+*** t2402-worktree-list.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/.git/
+expecting success of 2402.1 'setup': 
 	test_commit init
 
-[master (root-commit) 2519212] 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 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
+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
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-ok 2 - skip missing worktree
+ok 2 - rev-parse --git-common-dir on main worktree
 
-expecting success of 2406.3 'worktree path not directory': 
-	test_when_finished "git worktree prune" &&
-	git worktree add --detach notdir &&
-	rm -rf notdir &&
-	>notdir &&
-	test_must_fail git worktree repair >out 2>err &&
-	test_must_be_empty out &&
-	test_grep "not a directory" err
+expecting success of 2402.3 'rev-parse --git-path objects linked worktree': 
+	echo "$(git rev-parse --show-toplevel)/.git/objects" >expect &&
+	test_when_finished "rm -rf linked-tree actual expect && git worktree prune" &&
+	git worktree add --detach linked-tree main &&
+	git -C linked-tree rev-parse --git-path objects >actual &&
+	test_cmp expect actual
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-error: not a directory: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/notdir
-ok 3 - worktree path not directory
+ok 3 - rev-parse --git-path objects linked worktree
 
-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 2402.4 '"list" all worktrees from main': 
+	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
+	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
+	git worktree add --detach here main &&
+	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/repo/.git/
-error: .git is not a file: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/repo
-ok 4 - don't clobber .git repo
+ok 4 - "list" all worktrees from main
 
-expecting success of 2406.5 'repair missing .git file': 
-	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken"
+expecting success of 2402.5 '"list" all worktrees from linked': 
+	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
+	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
+	git worktree add --detach here main &&
+	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git -C here worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/corrupt
-ok 5 - repair missing .git file
+ok 5 - "list" all worktrees from linked
 
-expecting success of 2406.6 'repair bogus .git file': 
-	test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \
-		".git file broken"
+expecting success of 2402.6 '"list" all worktrees --porcelain': 
+	echo "worktree $(git rev-parse --show-toplevel)" >expect &&
+	echo "HEAD $(git rev-parse HEAD)" >>expect &&
+	echo "branch $(git symbolic-ref HEAD)" >>expect &&
+	echo >>expect &&
+	test_when_finished "rm -rf here actual expect && git worktree prune" &&
+	git worktree add --detach here main &&
+	echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
+	echo "HEAD $(git rev-parse HEAD)" >>expect &&
+	echo "detached" >>expect &&
+	echo >>expect &&
+	git worktree list --porcelain >actual &&
+	test_cmp expect actual
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/corrupt
-ok 6 - repair bogus .git file
+ok 6 - "list" all worktrees --porcelain
 
-expecting success of 2406.7 'repair incorrect .git file': 
-	test_when_finished "rm -rf other && git worktree prune" &&
-	test_create_repo other &&
-	other=$(git -C other rev-parse --absolute-git-dir) &&
-	test_corrupt_gitfile "echo \"gitdir: $other\" >corrupt/.git" \
-		".git file incorrect"
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2406-worktree-repair/corrupt
-ok 7 - repair incorrect .git file
+ok 7 - "list" all worktrees --porcelain -z
 
-expecting success of 2406.8 'repair .git file from main/.git': 
-	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git
+expecting success of 2402.8 '"list" -z fails without --porcelain': 
+	test_must_fail git worktree list -z
 
-Preparing worktree (detached HEAD 2519212)
-HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/corrupt
-ok 8 - repair .git file from main/.git
+fatal: the option '-z' requires '--porcelain'
+ok 8 - "list" -z fails without --porcelain
 
-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 2402.9 '"list" all worktrees with locked annotation': 
+	test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
+	git worktree add --detach locked main &&
+	git worktree add --detach unlocked main &&
+	git worktree lock locked &&
+	test_when_finished "git worktree unlock locked" &&
+	git worktree list >out &&
+	grep "/locked  *[0-9a-f].* locked$" out &&
+	! grep "/unlocked  *[0-9a-f].* locked$" out
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-repair: .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/corrupt
-ok 9 - repair .git file from linked worktree
+/build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/locked    2519212 (detached HEAD) locked
+ok 9 - "list" all worktrees with locked annotation
 
-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 &&
+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
 
-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.45.2/t/trash directory.t2406-worktree-repair/corrupt
-ok 10 - repair .git file from bare.git
-
-expecting success of 2406.11 'invalid worktree path': 
-	test_must_fail git worktree repair /notvalid >out 2>err &&
-	test_must_be_empty out &&
-	test_grep "not a valid path" err
-
-error: not a valid path: /notvalid
-ok 11 - invalid worktree path
-
-expecting success of 2406.12 'repo not found; .git not file': 
-	test_when_finished "rm -rf not-a-worktree" &&
-	test_create_repo not-a-worktree &&
-	test_must_fail git worktree repair not-a-worktree >out 2>err &&
-	test_must_be_empty out &&
-	test_grep ".git is not a file" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2406-worktree-repair/not-a-worktree/.git
-ok 12 - repo not found; .git not file
-
-expecting success of 2406.13 'repo not found; .git not referencing repo': 
-	test_when_finished "rm -rf side not-a-repo && git worktree prune" &&
-	git worktree add --detach side &&
-	sed s,\.git/worktrees/side$,not-a-repo, side/.git >side/.newgit &&
-	mv side/.newgit side/.git &&
-	mkdir not-a-repo &&
-	test_must_fail git worktree repair side 2>err &&
-	test_grep ".git file does not reference a repository" err
-
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-error: unable to locate repository; .git file does not reference a repository: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/side/.git
-ok 13 - repo not found; .git not referencing repo
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 10 - "list" all worktrees --porcelain with locked
 
-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
+expecting success of 2402.11 '"list" all worktrees --porcelain with locked reason newline escaped': 
+	test_when_finished "rm -rf locked_lf locked_crlf out actual expect && git worktree prune" &&
+	printf "locked \"locked\\\\r\\\\nreason\"\n" >expect &&
+	printf "locked \"locked\\\\nreason\"\n" >>expect &&
+	git worktree add --detach locked_lf &&
+	git worktree add --detach locked_crlf &&
+	git worktree lock locked_lf --reason "$(printf "locked\nreason")" &&
+	test_when_finished "git worktree unlock locked_lf" &&
+	git worktree lock locked_crlf --reason "$(printf "locked\r\nreason")" &&
+	test_when_finished "git worktree unlock locked_crlf" &&
+	git worktree list --porcelain >out &&
+	grep "^locked" out >actual &&
+	test_cmp expect actual
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-error: unable to locate repository; .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/moved/.git
-ok 14 - repo not found; .git file broken
+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 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 2402.12 '"list" all worktrees with prunable annotation': 
+	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	git worktree add --detach unprunable &&
+	rm -rf prunable &&
+	git worktree list >out &&
+	grep "/prunable  *[0-9a-f].* prunable$" out &&
+	! grep "/unprunable  *[0-9a-f].* prunable$"
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-repair: gitdir unreadable: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
-ok 15 - repair broken gitdir
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/prunable    2519212 (detached HEAD) prunable
+ok 12 - "list" all worktrees with prunable annotation
 
-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 2402.13 '"list" all worktrees --porcelain with prunable': 
+	test_when_finished "rm -rf prunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	rm -rf prunable &&
+	git worktree list --porcelain >out &&
+	sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable &&
+	test_grep "^prunable gitdir file points to non-existent location$" only_prunable
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-repair: gitdir incorrect: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
-ok 16 - repair incorrect gitdir
+prunable gitdir file points to non-existent location
+ok 13 - "list" all worktrees --porcelain with prunable
 
-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
+expecting success of 2402.14 '"list" all worktrees with prunable consistent with "prune"': 
+	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	git worktree add --detach unprunable &&
+	rm -rf prunable &&
+	git worktree list >out &&
+	grep "/prunable  *[0-9a-f].* prunable$" out &&
+	! grep "/unprunable  *[0-9a-f].* unprunable$" out &&
+	git worktree prune --verbose 2>out &&
+	test_grep "^Removing worktrees/prunable" out &&
+	test_grep ! "^Removing worktrees/unprunable" out
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-repair: gitdir incorrect: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
-ok 17 - repair gitdir (implicit) from linked worktree
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.45.2/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 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
+expecting success of 2402.15 '"list" --verbose and --porcelain mutually exclusive': 
+	test_must_fail git worktree list --verbose --porcelain
+
+fatal: options '--verbose' and '--porcelain' cannot be used together
+ok 15 - "list" --verbose and --porcelain mutually exclusive
+
+expecting success of 2402.16 '"list" all worktrees --verbose with locked': 
+	test_when_finished "rm -rf locked1 locked2 out actual expect && git worktree prune" &&
+	git worktree add locked1 --detach &&
+	git worktree add locked2 --detach &&
+	git worktree lock locked1 &&
+	test_when_finished "git worktree unlock locked1" &&
+	git worktree lock locked2 --reason "with reason" &&
+	test_when_finished "git worktree unlock locked2" &&
+	echo "$(git -C locked2 rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+	printf "\tlocked: with reason\n" >>expect &&
+	git worktree list --verbose >out &&
+	grep "/locked1  *[0-9a-f].* locked$" out &&
+	sed -n "s/  */ /g;/\/locked2  *[0-9a-f].*$/,/locked: .*$/p" <out >actual &&
+	test_cmp actual expect
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-ok 18 - unable to repair gitdir (implicit) from main worktree
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/locked1  2519212 (detached HEAD) locked
+ok 16 - "list" all worktrees --verbose with locked
 
-expecting success of 2406.19 'repair multiple gitdir files': 
-	test_when_finished "rm -rf orig1 orig2 moved1 moved2 &&
-		git worktree prune" &&
-	git worktree add --detach orig1 &&
-	git worktree add --detach orig2 &&
-	sed s,orig1/\.git$,moved1/.git, .git/worktrees/orig1/gitdir >expect1 &&
-	sed s,orig2/\.git$,moved2/.git, .git/worktrees/orig2/gitdir >expect2 &&
-	mv orig1 moved1 &&
-	mv orig2 moved2 &&
-	git worktree repair moved1 moved2 2>err &&
-	test_cmp expect1 .git/worktrees/orig1/gitdir &&
-	test_cmp expect2 .git/worktrees/orig2/gitdir &&
-	test_grep "gitdir incorrect:.*orig1/gitdir$" err &&
-	test_grep "gitdir incorrect:.*orig2/gitdir$" err
+expecting success of 2402.17 '"list" all worktrees --verbose with prunable': 
+	test_when_finished "rm -rf prunable out actual expect && git worktree prune" &&
+	git worktree add prunable --detach &&
+	echo "$(git -C prunable rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+	printf "\tprunable: gitdir file points to non-existent location\n" >>expect &&
+	rm -rf prunable &&
+	git worktree list --verbose >out &&
+	sed -n "s/  */ /g;/\/prunable  *[0-9a-f].*$/,/prunable: .*$/p" <out >actual &&
+	test_cmp actual expect
 
 Preparing worktree (detached HEAD 2519212)
 HEAD is now at 2519212 init
-Preparing worktree (detached HEAD 2519212)
+ok 17 - "list" all worktrees --verbose with prunable
+
+expecting success of 2402.18 'bare repo setup': 
+	git init --bare bare1 &&
+	echo "data" >file1 &&
+	git add file1 &&
+	git commit -m"File1: add data" &&
+	git push bare1 main &&
+	git reset --hard HEAD^
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-repair: gitdir incorrect: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig1/gitdir
-repair: gitdir incorrect: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig2/gitdir
-ok 19 - repair multiple gitdir files
+ok 18 - bare repo setup
 
-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
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/main/.git/
-[master (root-commit) f54694c] init
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 19 - "list" all worktrees from bare main
+
+expecting success of 2402.20 '"list" all worktrees --porcelain from bare main': 
+	test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there main &&
+	echo "worktree $(pwd)/bare1" >expect &&
+	echo "bare" >>expect &&
+	echo >>expect &&
+	echo "worktree $(git -C there rev-parse --show-toplevel)" >>expect &&
+	echo "HEAD $(git -C there rev-parse HEAD)" >>expect &&
+	echo "detached" >>expect &&
+	echo >>expect &&
+	git -C bare1 worktree list --porcelain >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 20 - "list" all worktrees --porcelain from bare main
+
+expecting success of 2402.21 '"list" all worktrees from linked with a bare main': 
+	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
+	git -C bare1 worktree add --detach ../there main &&
+	echo "$(pwd)/bare1 (bare)" >expect &&
+	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
+	git -C there worktree list >out &&
+	sed "s/  */ /g" <out >actual &&
+	test_cmp expect actual
+
+Preparing worktree (detached HEAD 7c81006)
+HEAD is now at 7c81006 File1: add data
+ok 21 - "list" all worktrees from linked with a bare main
+
+expecting success of 2402.22 'bare repo cleanup': 
+	rm -rf bare1
+
+ok 22 - bare repo cleanup
+
+expecting success of 2402.23 'broken main worktree still at the top': 
+	git init broken-main &&
+	(
+		cd broken-main &&
+		test_commit new &&
+		git worktree add linked &&
+		cat >expected <<-EOF &&
+		worktree $(pwd)
+		HEAD $ZERO_OID
+
+		EOF
+		cd linked &&
+		echo "worktree $(pwd)" >expected &&
+		(cd ../ && test-tool ref-store main create-symref HEAD .broken ) &&
+		git worktree list --porcelain >out &&
+		head -n 3 out >actual &&
+		test_cmp ../expected actual &&
+		git worktree list >out &&
+		head -n 1 out >actual.2 &&
+		grep -F "(error)" actual.2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 init.t
-Preparing worktree (detached HEAD f54694c)
-HEAD is now at f54694c init
-repair: gitdir incorrect: .git/worktrees/side/gitdir
-repair: .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/sidemoved
-ok 20 - repair moved main and linked worktrees
+ create mode 100644 new.t
+Preparing worktree (new branch 'linked')
+HEAD is now at 3325ee1 new
+/build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/broken-main         0000000 (error)
+ok 23 - broken main worktree still at the top
 
-# passed all 20 test(s)
-1..20
+expecting success of 2402.24 'linked worktrees are sorted': 
+	mkdir sorted &&
+	git init sorted/main &&
+	(
+		cd sorted/main &&
+		test_tick &&
+		test_commit new &&
+		git worktree add ../first &&
+		git worktree add ../second &&
+		git worktree list --porcelain >out &&
+		grep ^worktree out >actual
+	) &&
+	cat >expected <<-EOF &&
+	worktree $(pwd)/sorted/main
+	worktree $(pwd)/sorted/first
+	worktree $(pwd)/sorted/second
+	EOF
+	test_cmp expected sorted/main/actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2402-worktree-list/sorted/main/.git/
+[main (root-commit) d8ef111] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+Preparing worktree (new branch 'first')
+HEAD is now at d8ef111 new
+Preparing worktree (new branch 'second')
+HEAD is now at d8ef111 new
+ok 24 - linked worktrees are sorted
+
+expecting success of 2402.25 'worktree path when called in .git directory': 
+	git worktree list >list1 &&
+	git -C .git worktree list >list2 &&
+	test_cmp list1 list2
+
+ok 25 - worktree path when called in .git directory
+
+# passed all 25 test(s)
+1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2405-worktree-submodule.sh ***
@@ -113752,876 +116630,279 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1701-racy-split-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1701-racy-split-index/.git/
-expecting success of 1701.1 'setup': 
-	# Only split the index when the test explicitly says so.
-	sane_unset GIT_TEST_SPLIT_INDEX &&
-	git config splitIndex.maxPercentChange 100 &&
-
-	echo "cached content" >racy-file &&
-	git add racy-file &&
-	git commit -m initial &&
-
-	echo something >other-file &&
-	# No raciness with this file.
-	test-tool chmtime =-20 other-file &&
-
-	echo "+cached content" >expect
+*** t2406-worktree-repair.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/
+expecting success of 2406.1 'setup': 
+	test_commit init
 
-[master (root-commit) a4904a4] initial
+[master (root-commit) 2519212] init
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 racy-file
+ create mode 100644 init.t
 ok 1 - setup
 
-expecting success of 1701.2 'split the index while adding a racily clean file #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 2 - split the index while adding a racily clean file #0
-
-expecting success of 1701.3 'split the index while adding a racily clean file #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 3 - split the index while adding a racily clean file #1
-
-expecting success of 1701.4 'split the index while adding a racily clean file #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 4 - split the index while adding a racily clean file #2
-
-expecting success of 1701.5 'split the index while adding a racily clean file #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 5 - split the index while adding a racily clean file #3
-
-expecting success of 1701.6 'split the index while adding a racily clean file #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second (so both writes to racy-file result in the same
-		# mtime) to create the interesting racy situation.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 6 - split the index while adding a racily clean file #4
-
-expecting success of 1701.7 'add a racily clean file to an already split index #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 7 - add a racily clean file to an already split index #0
-
-expecting success of 1701.8 'add a racily clean file to an already split index #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 8 - add a racily clean file to an already split index #1
-
-expecting success of 1701.9 'add a racily clean file to an already split index #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 9 - add a racily clean file to an already split index #2
-
-expecting success of 1701.10 'add a racily clean file to an already split index #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 10 - add a racily clean file to an already split index #3
-
-expecting success of 1701.11 'add a racily clean file to an already split index #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Subsequent git commands should notice that racy-file
-		# and the split index have the same mtime, and check
-		# the content of the file to see if it is actually
-		# clean.
-		check_cached_diff
-	
-ok 11 - add a racily clean file to an already split index #4
-
-expecting success of 1701.12 'split the index when the index contains a racily clean cache entry #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 12 - split the index when the index contains a racily clean cache entry #0
-
-expecting success of 1701.13 'split the index when the index contains a racily clean cache entry #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 13 - split the index when the index contains a racily clean cache entry #1
-
-expecting success of 1701.14 'split the index when the index contains a racily clean cache entry #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 14 - split the index when the index contains a racily clean cache entry #2
-
-expecting success of 1701.15 'split the index when the index contains a racily clean cache entry #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 15 - split the index when the index contains a racily clean cache entry #3
-
-expecting success of 1701.16 'split the index when the index contains a racily clean cache entry #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update and split the index when the index contains
-		# the racily clean cache entry of racy-file.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --split-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data in the replacement cache entry and that it
-		# doesnt match with the file the worktree.
-		check_cached_diff
-	
-ok 16 - split the index when the index contains a racily clean cache entry #4
-
-expecting success of 1701.17 'update the split index when it contains a new racily clean cache entry #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 17 - update the split index when it contains a new racily clean cache entry #0
-
-expecting success of 1701.18 'update the split index when it contains a new racily clean cache entry #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 18 - update the split index when it contains a new racily clean cache entry #1
-
-expecting success of 1701.19 'update the split index when it contains a new racily clean cache entry #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 19 - update the split index when it contains a new racily clean cache entry #2
-
-expecting success of 1701.20 'update the split index when it contains a new racily clean cache entry #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 20 - update the split index when it contains a new racily clean cache entry #3
-
-expecting success of 1701.21 'update the split index when it contains a new racily clean cache entry #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		git update-index --split-index &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update the split index.  The cache entry of racy-file
-		# will be stored only in the split index.
-		git update-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the split index.
-		# An updated cache entry with smudged stat data should
-		# be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 21 - update the split index when it contains a new racily clean cache entry #4
-
-expecting success of 1701.22 'update the split index when a racily clean cache entry is stored only in the shared index #0': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 22 - update the split index when a racily clean cache entry is stored only in the shared index #0
-
-expecting success of 1701.23 'update the split index when a racily clean cache entry is stored only in the shared index #1': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 23 - update the split index when a racily clean cache entry is stored only in the shared index #1
-
-expecting success of 1701.24 'update the split index when a racily clean cache entry is stored only in the shared index #2': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 24 - update the split index when a racily clean cache entry is stored only in the shared index #2
-
-expecting success of 1701.25 'update the split index when a racily clean cache entry is stored only in the shared index #3': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
-
-		# Update the split index when the racily clean cache
-		# entry of racy-file is only stored in the shared index.
-		# A corresponding replacement cache entry with smudged
-		# stat data should be added to the new split index.
-		git update-index --add other-file &&
-
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 25 - update the split index when a racily clean cache entry is stored only in the shared index #3
-
-expecting success of 1701.26 'update the split index when a racily clean cache entry is stored only in the shared index #4': 
-		rm -f .git/index .git/sharedindex.* &&
-
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
-
-		# Update and split the index.  The cache entry of
-		# racy-file will be stored only in the shared index.
-		git update-index --split-index --add racy-file &&
-
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
-
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+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
 
-		# 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 &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 2 - skip missing worktree
 
-		# 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 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 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.* &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: not a directory: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/notdir
+ok 3 - worktree path not directory
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+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
 
-		# 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 &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/repo/.git/
+error: .git is not a file: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/repo
+ok 4 - don't clobber .git repo
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+expecting success of 2406.5 'repair missing .git file': 
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken"
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/corrupt
+ok 5 - repair missing .git file
 
-		# 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 2406.6 'repair bogus .git file': 
+	test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \
+		".git file broken"
 
-		# 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
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/corrupt
+ok 6 - repair bogus .git file
 
-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.* &&
+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"
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2406-worktree-repair/corrupt
+ok 7 - repair incorrect .git 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 &&
+expecting success of 2406.8 'repair .git file from main/.git': 
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/corrupt
+ok 8 - repair .git file from main/.git
 
-		# 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 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
 
-		# 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 &&
+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.45.2/t/trash directory.t2406-worktree-repair/corrupt
+ok 9 - repair .git file from linked worktree
 
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 28 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #1
+expecting success of 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
 
-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.* &&
+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.45.2/t/trash directory.t2406-worktree-repair/corrupt
+ok 10 - repair .git file from bare.git
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+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
 
-		# 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 &&
+error: not a valid path: /notvalid
+ok 11 - invalid worktree path
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+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
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2406-worktree-repair/not-a-worktree/.git
+ok 12 - repo not found; .git not file
 
-		# 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 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
 
-		# 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
+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.45.2/t/trash directory.t2406-worktree-repair/side/.git
+ok 13 - repo not found; .git not referencing repo
 
-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 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
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+error: unable to locate repository; .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/moved/.git
+ok 14 - repo not found; .git file broken
 
-		# 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 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
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir unreadable: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 15 - repair broken gitdir
 
-		# 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 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
 
-		# 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 &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 16 - repair incorrect gitdir
 
-		# Subsequent git commands should notice the smudged
-		# stat data.
-		check_cached_diff
-	
-ok 30 - update the split index after unpack trees() copied a racily clean cache entry from the shared index #3
+expecting success of 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
 
-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.* &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+repair: gitdir incorrect: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig/gitdir
+ok 17 - repair gitdir (implicit) from linked worktree
 
-		# The next three commands must be run within the same
-		# second.
-		echo "cached content" >racy-file &&
+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
 
-		# 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 &&
+Preparing worktree (detached HEAD 2519212)
+HEAD is now at 2519212 init
+ok 18 - unable to repair gitdir (implicit) from main worktree
 
-		# File size must stay the same.
-		echo "dirty worktree" >racy-file &&
+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
 
-		# Now wait a bit to ensure that the split index written
-		# below will get a more recent mtime than racy-file.
-		sleep 1 &&
+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.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig1/gitdir
+repair: gitdir incorrect: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/.git/worktrees/orig2/gitdir
+ok 19 - repair multiple gitdir files
 
-		# 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 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
 
-		# 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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: .git/worktrees/side/gitdir
+repair: .git file broken: /build/reproducible-path/git-2.45.2/t/trash directory.t2406-worktree-repair/sidemoved
+ok 20 - repair moved main and linked worktrees
 
-# passed all 31 test(s)
-1..31
+# passed all 20 test(s)
+1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2407-worktree-heads.sh ***
@@ -114946,7 +117227,7 @@
 			return 1
 	done
 
-fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t2407-worktree-heads/wt-1'
+fatal: cannot force update the branch 'fake-1' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t2407-worktree-heads/wt-3'
 fatal: cannot force update the branch 'fake-2' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t2407-worktree-heads/wt-4'
 ok 10 - refuse to overwrite when in error states
 
@@ -115231,259 +117512,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3001-ls-files-others-exclude.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3001-ls-files-others-exclude/.git/
-expecting success of 3001.1 'git ls-files --others with various exclude options.': 
-	git ls-files --others \
-       --exclude=\*.6 \
-       --exclude-per-directory=.gitignore \
-       --exclude-from=.git/ignore \
-	>output &&
-	test_cmp expect output
-
-ok 1 - git ls-files --others with various exclude options.
-
-expecting success of 3001.2 'git ls-files --others with \r\n line endings.': 
-	git ls-files --others \
-       --exclude=\*.6 \
-       --exclude-per-directory=.gitignore \
-       --exclude-from=.git/ignore \
-	>output &&
-	test_cmp expect output
-
-ok 2 - git ls-files --others with \r\n line endings.
-
-expecting success of 3001.3 'setup skip-worktree gitignore': 
-	git add $allignores &&
-	git update-index --skip-worktree $allignores &&
-	rm $allignores
-
-ok 3 - setup skip-worktree gitignore
-
-expecting success of 3001.4 'git ls-files --others with various exclude options.': 
-	git ls-files --others \
-       --exclude=\*.6 \
-       --exclude-per-directory=.gitignore \
-       --exclude-from=.git/ignore \
-	>output &&
-	test_cmp expect output
-
-ok 4 - git ls-files --others with various exclude options.
-
-expecting success of 3001.5 'restore gitignore': 
-	git checkout --ignore-skip-worktree-bits $allignores &&
-	rm .git/index
-
-Updated 3 paths from the index
-ok 5 - restore gitignore
-
-expecting success of 3001.6 'git status honors core.excludesfile': test_cmp expect output
-ok 6 - git status honors core.excludesfile
-
-expecting success of 3001.7 'trailing slash in exclude allows directory match(1)': 
-
-	git ls-files --others --exclude=one/ >output &&
-	if grep "^one/" output
-	then
-		echo Ooops
-		false
-	else
-		: happy
-	fi
-
-
-ok 7 - trailing slash in exclude allows directory match(1)
-
-expecting success of 3001.8 'trailing slash in exclude allows directory match (2)': 
-
-	git ls-files --others --exclude=one/two/ >output &&
-	if grep "^one/two/" output
-	then
-		echo Ooops
-		false
-	else
-		: happy
-	fi
-
-
-ok 8 - trailing slash in exclude allows directory match (2)
-
-expecting success of 3001.9 'trailing slash in exclude forces directory match (1)': 
-
-	>two &&
-	git ls-files --others --exclude=two/ >output &&
-	grep "^two" output
-
-
-two
-ok 9 - trailing slash in exclude forces directory match (1)
-
-expecting success of 3001.10 'trailing slash in exclude forces directory match (2)': 
-
-	git ls-files --others --exclude=one/a.1/ >output &&
-	grep "^one/a.1" output
-
-
-one/a.1
-ok 10 - trailing slash in exclude forces directory match (2)
-
-expecting success of 3001.11 'negated exclude matches can override previous ones': 
-
-	git ls-files --others --exclude="a.*" --exclude="!a.1" >output &&
-	grep "^a.1" output
-
-a.1
-ok 11 - negated exclude matches can override previous ones
-
-expecting success of 3001.12 'excluded directory overrides content patterns': 
-
-	git ls-files --others --exclude="one" --exclude="!one/a.1" >output &&
-	if grep "^one/a.1" output
-	then
-		false
-	fi
-
-ok 12 - excluded directory overrides content patterns
-
-expecting success of 3001.13 'negated directory doesn't affect content patterns': 
-
-	git ls-files --others --exclude="!one" --exclude="one/a.1" >output &&
-	if grep "^one/a.1" output
-	then
-		false
-	fi
-
-ok 13 - negated directory doesn't affect content patterns
-
-expecting success of 3001.14 'subdirectory ignore (setup)': 
-	mkdir -p top/l1/l2 &&
-	(
-		cd top &&
-		git init &&
-		echo /.gitignore >.gitignore &&
-		echo l1 >>.gitignore &&
-		echo l2 >l1/.gitignore &&
-		>l1/l2/l1
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3001-ls-files-others-exclude/top/.git/
-ok 14 - subdirectory ignore (setup)
-
-expecting success of 3001.15 'subdirectory ignore (toplevel)': 
-	(
-		cd top &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
-
-ok 15 - subdirectory ignore (toplevel)
-
-expecting success of 3001.16 'subdirectory ignore (l1/l2)': 
-	(
-		cd top/l1/l2 &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
-
-ok 16 - subdirectory ignore (l1/l2)
-
-expecting success of 3001.17 'subdirectory ignore (l1)': 
-	(
-		cd top/l1 &&
-		git ls-files -o --exclude-standard
-	) >actual &&
-	test_must_be_empty actual
-
-ok 17 - subdirectory ignore (l1)
-
-expecting success of 3001.18 'show/hide empty ignored directory (setup)': 
-	rm top/l1/l2/l1 &&
-	rm top/l1/.gitignore
-
-ok 18 - show/hide empty ignored directory (setup)
-
-expecting success of 3001.19 'show empty ignored directory with --directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory
-	) >actual &&
-	echo l1/ >expect &&
-	test_cmp expect actual
-
-ok 19 - show empty ignored directory with --directory
-
-expecting success of 3001.20 'hide empty ignored directory with --no-empty-directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory --no-empty-directory
-	) >actual &&
-	test_must_be_empty actual
-
-ok 20 - hide empty ignored directory with --no-empty-directory
-
-expecting success of 3001.21 'show/hide empty ignored sub-directory (setup)': 
-	> top/l1/tracked &&
-	(
-		cd top &&
-		git add -f l1/tracked
-	)
-
-ok 21 - show/hide empty ignored sub-directory (setup)
-
-expecting success of 3001.22 'show empty ignored sub-directory with --directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory
-	) >actual &&
-	echo l1/l2/ >expect &&
-	test_cmp expect actual
-
-ok 22 - show empty ignored sub-directory with --directory
-
-expecting success of 3001.23 'hide empty ignored sub-directory with --no-empty-directory': 
-	(
-		cd top &&
-		git ls-files -o -i --exclude l1 --directory --no-empty-directory
-	) >actual &&
-	test_must_be_empty actual
-
-ok 23 - hide empty ignored sub-directory with --no-empty-directory
-
-expecting success of 3001.24 'pattern matches prefix completely': 
-	git ls-files -i -o --exclude "/three/a.3[abc]" >actual &&
-	test_must_be_empty actual
-
-ok 24 - pattern matches prefix completely
-
-expecting success of 3001.25 'ls-files with "**" patterns': 
-	cat <<-\EOF >expect &&
-	a.1
-	one/a.1
-	one/two/a.1
-	three/a.1
-	EOF
-	git ls-files -o -i --exclude "**/a.1" >actual &&
-	test_cmp expect actual
-
-ok 25 - ls-files with "**" patterns
-
-expecting success of 3001.26 'ls-files with "**" patterns and --directory': 
-	# Expectation same as previous test
-	git ls-files --directory -o -i --exclude "**/a.1" >actual &&
-	test_cmp expect actual
-
-ok 26 - ls-files with "**" patterns and --directory
-
-expecting success of 3001.27 'ls-files with "**" patterns and no slashes': 
-	git ls-files -o -i --exclude "one**a.1" >actual &&
-	test_must_be_empty actual
-
-ok 27 - ls-files with "**" patterns and no slashes
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t2500-untracked-overwriting.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2500-untracked-overwriting/.git/
 expecting success of 2500.1 'reset --hard will nuke untracked files/dirs': 
@@ -115974,6 +118002,259 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3001-ls-files-others-exclude.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3001-ls-files-others-exclude/.git/
+expecting success of 3001.1 'git ls-files --others with various exclude options.': 
+	git ls-files --others \
+       --exclude=\*.6 \
+       --exclude-per-directory=.gitignore \
+       --exclude-from=.git/ignore \
+	>output &&
+	test_cmp expect output
+
+ok 1 - git ls-files --others with various exclude options.
+
+expecting success of 3001.2 'git ls-files --others with \r\n line endings.': 
+	git ls-files --others \
+       --exclude=\*.6 \
+       --exclude-per-directory=.gitignore \
+       --exclude-from=.git/ignore \
+	>output &&
+	test_cmp expect output
+
+ok 2 - git ls-files --others with \r\n line endings.
+
+expecting success of 3001.3 'setup skip-worktree gitignore': 
+	git add $allignores &&
+	git update-index --skip-worktree $allignores &&
+	rm $allignores
+
+ok 3 - setup skip-worktree gitignore
+
+expecting success of 3001.4 'git ls-files --others with various exclude options.': 
+	git ls-files --others \
+       --exclude=\*.6 \
+       --exclude-per-directory=.gitignore \
+       --exclude-from=.git/ignore \
+	>output &&
+	test_cmp expect output
+
+ok 4 - git ls-files --others with various exclude options.
+
+expecting success of 3001.5 'restore gitignore': 
+	git checkout --ignore-skip-worktree-bits $allignores &&
+	rm .git/index
+
+Updated 3 paths from the index
+ok 5 - restore gitignore
+
+expecting success of 3001.6 'git status honors core.excludesfile': test_cmp expect output
+ok 6 - git status honors core.excludesfile
+
+expecting success of 3001.7 'trailing slash in exclude allows directory match(1)': 
+
+	git ls-files --others --exclude=one/ >output &&
+	if grep "^one/" output
+	then
+		echo Ooops
+		false
+	else
+		: happy
+	fi
+
+
+ok 7 - trailing slash in exclude allows directory match(1)
+
+expecting success of 3001.8 'trailing slash in exclude allows directory match (2)': 
+
+	git ls-files --others --exclude=one/two/ >output &&
+	if grep "^one/two/" output
+	then
+		echo Ooops
+		false
+	else
+		: happy
+	fi
+
+
+ok 8 - trailing slash in exclude allows directory match (2)
+
+expecting success of 3001.9 'trailing slash in exclude forces directory match (1)': 
+
+	>two &&
+	git ls-files --others --exclude=two/ >output &&
+	grep "^two" output
+
+
+two
+ok 9 - trailing slash in exclude forces directory match (1)
+
+expecting success of 3001.10 'trailing slash in exclude forces directory match (2)': 
+
+	git ls-files --others --exclude=one/a.1/ >output &&
+	grep "^one/a.1" output
+
+
+one/a.1
+ok 10 - trailing slash in exclude forces directory match (2)
+
+expecting success of 3001.11 'negated exclude matches can override previous ones': 
+
+	git ls-files --others --exclude="a.*" --exclude="!a.1" >output &&
+	grep "^a.1" output
+
+a.1
+ok 11 - negated exclude matches can override previous ones
+
+expecting success of 3001.12 'excluded directory overrides content patterns': 
+
+	git ls-files --others --exclude="one" --exclude="!one/a.1" >output &&
+	if grep "^one/a.1" output
+	then
+		false
+	fi
+
+ok 12 - excluded directory overrides content patterns
+
+expecting success of 3001.13 'negated directory doesn't affect content patterns': 
+
+	git ls-files --others --exclude="!one" --exclude="one/a.1" >output &&
+	if grep "^one/a.1" output
+	then
+		false
+	fi
+
+ok 13 - negated directory doesn't affect content patterns
+
+expecting success of 3001.14 'subdirectory ignore (setup)': 
+	mkdir -p top/l1/l2 &&
+	(
+		cd top &&
+		git init &&
+		echo /.gitignore >.gitignore &&
+		echo l1 >>.gitignore &&
+		echo l2 >l1/.gitignore &&
+		>l1/l2/l1
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3001-ls-files-others-exclude/top/.git/
+ok 14 - subdirectory ignore (setup)
+
+expecting success of 3001.15 'subdirectory ignore (toplevel)': 
+	(
+		cd top &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
+
+ok 15 - subdirectory ignore (toplevel)
+
+expecting success of 3001.16 'subdirectory ignore (l1/l2)': 
+	(
+		cd top/l1/l2 &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
+
+ok 16 - subdirectory ignore (l1/l2)
+
+expecting success of 3001.17 'subdirectory ignore (l1)': 
+	(
+		cd top/l1 &&
+		git ls-files -o --exclude-standard
+	) >actual &&
+	test_must_be_empty actual
+
+ok 17 - subdirectory ignore (l1)
+
+expecting success of 3001.18 'show/hide empty ignored directory (setup)': 
+	rm top/l1/l2/l1 &&
+	rm top/l1/.gitignore
+
+ok 18 - show/hide empty ignored directory (setup)
+
+expecting success of 3001.19 'show empty ignored directory with --directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory
+	) >actual &&
+	echo l1/ >expect &&
+	test_cmp expect actual
+
+ok 19 - show empty ignored directory with --directory
+
+expecting success of 3001.20 'hide empty ignored directory with --no-empty-directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory --no-empty-directory
+	) >actual &&
+	test_must_be_empty actual
+
+ok 20 - hide empty ignored directory with --no-empty-directory
+
+expecting success of 3001.21 'show/hide empty ignored sub-directory (setup)': 
+	> top/l1/tracked &&
+	(
+		cd top &&
+		git add -f l1/tracked
+	)
+
+ok 21 - show/hide empty ignored sub-directory (setup)
+
+expecting success of 3001.22 'show empty ignored sub-directory with --directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory
+	) >actual &&
+	echo l1/l2/ >expect &&
+	test_cmp expect actual
+
+ok 22 - show empty ignored sub-directory with --directory
+
+expecting success of 3001.23 'hide empty ignored sub-directory with --no-empty-directory': 
+	(
+		cd top &&
+		git ls-files -o -i --exclude l1 --directory --no-empty-directory
+	) >actual &&
+	test_must_be_empty actual
+
+ok 23 - hide empty ignored sub-directory with --no-empty-directory
+
+expecting success of 3001.24 'pattern matches prefix completely': 
+	git ls-files -i -o --exclude "/three/a.3[abc]" >actual &&
+	test_must_be_empty actual
+
+ok 24 - pattern matches prefix completely
+
+expecting success of 3001.25 'ls-files with "**" patterns': 
+	cat <<-\EOF >expect &&
+	a.1
+	one/a.1
+	one/two/a.1
+	three/a.1
+	EOF
+	git ls-files -o -i --exclude "**/a.1" >actual &&
+	test_cmp expect actual
+
+ok 25 - ls-files with "**" patterns
+
+expecting success of 3001.26 'ls-files with "**" patterns and --directory': 
+	# Expectation same as previous test
+	git ls-files --directory -o -i --exclude "**/a.1" >actual &&
+	test_cmp expect actual
+
+ok 26 - ls-files with "**" patterns and --directory
+
+expecting success of 3001.27 'ls-files with "**" patterns and no slashes': 
+	git ls-files -o -i --exclude "one**a.1" >actual &&
+	test_must_be_empty actual
+
+ok 27 - ls-files with "**" patterns and no slashes
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3002-ls-files-dashpath.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3002-ls-files-dashpath/.git/
 expecting success of 3002.1 'setup': 
@@ -116171,6 +118452,439 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2501-cwd-empty.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/.git/
+expecting success of 2501.1 'setup': 
+	test_commit init &&
+
+	git branch fd_conflict &&
+
+	mkdir -p foo/bar &&
+	test_commit foo/bar/baz &&
+
+	git revert HEAD &&
+	git tag reverted &&
+
+	git checkout fd_conflict &&
+	mkdir dirORfile &&
+	test_commit dirORfile/foo &&
+
+	git rm -r dirORfile &&
+	echo not-a-directory >dirORfile &&
+	git add dirORfile &&
+	git commit -m dirORfile &&
+
+	git switch -c df_conflict HEAD~1 &&
+	test_commit random_file &&
+
+	git switch -c undo_fd_conflict fd_conflict &&
+	git revert HEAD
+
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[master f4c5aab] foo/bar/baz
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar/baz.t
+[master 968d1fe] Revert "foo/bar/baz"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+Switched to branch 'fd_conflict'
+[fd_conflict d7f9e78] dirORfile/foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dirORfile/foo.t
+rm 'dirORfile/foo.t'
+[fd_conflict 9658629] dirORfile
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 dirORfile
+ delete mode 100644 dirORfile/foo.t
+Switched to a new branch 'df_conflict'
+[df_conflict d90d7a3] random_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 random_file.t
+Switched to a new branch 'undo_fd_conflict'
+[undo_fd_conflict 46c1835] Revert "dirORfile"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 dirORfile
+ create mode 100644 dirORfile/foo.t
+ok 1 - setup
+
+expecting success of 2501.2 'checkout does not clean cwd incidentally': 
+	test_incidental_dir_removal git checkout init
+
+Note: switching to 'foo/bar/baz^{commit}'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f4c5aab foo/bar/baz
+Previous HEAD position was f4c5aab foo/bar/baz
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 2519212 init
+ok 2 - checkout does not clean cwd incidentally
+
+expecting success of 2501.3 'checkout fails if cwd needs to be removed': 
+	test_required_dir_removal git checkout fd_conflict
+
+Previous HEAD position was 2519212 init
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 3 - checkout fails if cwd needs to be removed
+
+expecting success of 2501.4 'reset --hard does not clean cwd incidentally': 
+	test_incidental_dir_removal git reset --hard init
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+HEAD is now at 2519212 init
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 2519212 init
+ok 4 - reset --hard does not clean cwd incidentally
+
+expecting success of 2501.5 'reset --hard fails if cwd needs to be removed': 
+	test_required_dir_removal git reset --hard fd_conflict
+
+Previous HEAD position was 2519212 init
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove 'dirORfile' since it is the current working directory.
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 5 - reset --hard fails if cwd needs to be removed
+
+expecting success of 2501.6 'merge does not clean cwd incidentally': 
+	test_incidental_dir_removal git merge reverted
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+Updating f4c5aab..968d1fe
+Fast-forward
+ foo/bar/baz.t | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 968d1fe Revert "foo/bar/baz"
+ok 6 - merge does not clean cwd incidentally
+
+expecting success of 2501.7 'merge fails if cwd needs to be removed; recursive friendly': 
+	git checkout foo/bar/baz &&
+	test_when_finished "git clean -fdx" &&
+
+	mkdir dirORfile &&
+	(
+		cd dirORfile &&
+
+		test_must_fail git merge fd_conflict 2>../error
+	) &&
+
+	test_path_is_dir dirORfile &&
+	grep "Refusing to remove the current working directory" error
+
+Previous HEAD position was 968d1fe Revert "foo/bar/baz"
+HEAD is now at f4c5aab foo/bar/baz
+error: Refusing to remove the current working directory:
+Removing dirORfile/
+Removing error
+ok 7 - merge fails if cwd needs to be removed; recursive friendly
+
+expecting success of 2501.8 'merge fails if cwd needs to be removed': 
+	test_required_dir_removal git merge fd_conflict
+
+Previous HEAD position was f4c5aab foo/bar/baz
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+ok 8 - merge fails if cwd needs to be removed
+
+expecting success of 2501.9 'cherry-pick does not clean cwd incidentally': 
+	test_incidental_dir_removal git cherry-pick reverted
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+[detached HEAD d0d1a1f] Revert "foo/bar/baz"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at d0d1a1f Revert "foo/bar/baz"
+ok 9 - cherry-pick does not clean cwd incidentally
+
+expecting success of 2501.10 'cherry-pick fails if cwd needs to be removed': 
+	test_required_dir_removal git cherry-pick fd_conflict
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  d0d1a1f Revert "foo/bar/baz"
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> d0d1a1f
+
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 10 - cherry-pick fails if cwd needs to be removed
+
+expecting success of 2501.11 'rebase does not clean cwd incidentally': 
+	test_incidental_dir_removal git rebase reverted
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+
                                                                                
Successfully rebased and updated detached HEAD.
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at 968d1fe Revert "foo/bar/baz"
+ok 11 - rebase does not clean cwd incidentally
+
+expecting success of 2501.12 'rebase fails if cwd needs to be removed': 
+	test_required_dir_removal git rebase fd_conflict
+
+Previous HEAD position was 968d1fe Revert "foo/bar/baz"
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 12 - rebase fails if cwd needs to be removed
+
+expecting success of 2501.13 'revert does not clean cwd incidentally': 
+	test_incidental_dir_removal git revert HEAD
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+[detached HEAD f0f8756] Revert "foo/bar/baz"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 foo/bar/baz.t
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
+HEAD is now at f0f8756 Revert "foo/bar/baz"
+ok 13 - revert does not clean cwd incidentally
+
+expecting success of 2501.14 'revert fails if cwd needs to be removed': 
+	test_required_dir_removal git revert undo_fd_conflict
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  f0f8756 Revert "foo/bar/baz"
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> f0f8756
+
+HEAD is now at d90d7a3 random_file
+error: Refusing to remove the current working directory:
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
+?? error
+Removing error
+Removing foo/
+ok 14 - revert fails if cwd needs to be removed
+
+expecting success of 2501.15 'rm does not clean cwd incidentally': 
+	test_incidental_dir_removal git rm bar/baz.t
+
+Previous HEAD position was d90d7a3 random_file
+HEAD is now at f4c5aab foo/bar/baz
+rm 'foo/bar/baz.t'
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
+D  foo/bar/baz.t
+HEAD is now at f4c5aab foo/bar/baz
+ok 15 - rm does not clean cwd incidentally
+
+expecting success of 2501.16 'apply does not remove cwd incidentally': 
+	git diff HEAD HEAD~1 >patch &&
+	test_incidental_dir_removal git apply ../patch
+
+HEAD is now at f4c5aab foo/bar/baz
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
+ D foo/bar/baz.t
+?? patch
+HEAD is now at f4c5aab foo/bar/baz
+ok 16 - apply does not remove cwd incidentally
+
+expecting success of 2501.17 'clean does not remove cwd incidentally': 
+	test_incidental_untracked_dir_removal \
+		git -C .. clean -fd -e warnings . >warnings &&
+	grep "Refusing to remove current working directory" warnings
+
+HEAD is now at f4c5aab foo/bar/baz
+Refusing to remove current working directory
+HEAD is now at f4c5aab foo/bar/baz
+ok 17 - clean does not remove cwd incidentally
+
+expecting success of 2501.18 'stash does not remove cwd incidentally': 
+	test_incidental_untracked_dir_removal \
+		git stash --include-untracked
+
+HEAD is now at f4c5aab foo/bar/baz
+Saved working directory and index state WIP on (no branch): f4c5aab foo/bar/baz
+Refusing to remove current working directory
+/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/untracked
+HEAD is now at f4c5aab foo/bar/baz
+ok 18 - stash does not remove cwd incidentally
+
+expecting success of 2501.19 '`rm -rf dir` only removes a subset of dir': 
+	test_when_finished "rm -rf a/" &&
+
+	mkdir -p a/b/c &&
+	>a/b/c/untracked &&
+	>a/b/c/tracked &&
+	git add a/b/c/tracked &&
+
+	(
+		cd a/b &&
+		git rm -rf ../b
+	) &&
+
+	test_path_is_dir a/b &&
+	test_path_is_missing a/b/c/tracked &&
+	test_path_is_file a/b/c/untracked
+
+rm 'a/b/c/tracked'
+ok 19 - `rm -rf dir` only removes a subset of dir
+
+expecting success of 2501.20 '`rm -rf dir` even with only tracked files will remove something else': 
+	test_when_finished "rm -rf a/" &&
+
+	mkdir -p a/b/c &&
+	>a/b/c/tracked &&
+	git add a/b/c/tracked &&
+
+	(
+		cd a/b &&
+		git rm -rf ../b
+	) &&
+
+	test_path_is_missing a/b/c/tracked &&
+	test_path_is_missing a/b/c &&
+	test_path_is_dir a/b
+
+rm 'a/b/c/tracked'
+ok 20 - `rm -rf dir` even with only tracked files will remove something else
+
+expecting success of 2501.21 'git version continues working from a deleted dir': 
+	mkdir tmp &&
+	(
+		cd tmp &&
+		rm -rf ../tmp &&
+		git version
+	)
+
+shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory
+git version 2.45.2
+ok 21 - git version continues working from a deleted dir
+
+expecting success of 2501.22 'rm -r with -C leaves submodule if cwd inside': 
+	test_submodule_removal dir git -C .. rm -r my_submodule/
+
+HEAD is now at f4c5aab foo/bar/baz
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
+fatal: could not remove 'my_submodule'
+rm 'my_submodule'
+HEAD is now at f4c5aab foo/bar/baz
+ok 22 - rm -r with -C leaves submodule if cwd inside
+
+expecting success of 2501.23 'rm -r leaves submodule if cwd inside': 
+	test_submodule_removal dir \
+		git --git-dir=../.git --work-tree=.. rm -r ../my_submodule/
+
+HEAD is now at f4c5aab foo/bar/baz
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
+fatal: could not remove 'my_submodule'
+rm 'my_submodule'
+HEAD is now at f4c5aab foo/bar/baz
+ok 23 - rm -r leaves submodule if cwd inside
+
+expecting success of 2501.24 'rm -rf removes submodule even if cwd inside': 
+	test_submodule_removal missing \
+		git --git-dir=../.git --work-tree=.. rm -rf ../my_submodule/
+
+HEAD is now at f4c5aab foo/bar/baz
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
+rm 'my_submodule'
+HEAD is now at f4c5aab foo/bar/baz
+ok 24 - rm -rf removes submodule even if cwd inside
+
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3005-ls-files-relative.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3005-ls-files-relative/.git/
 expecting success of 3005.1 'prepare': 
@@ -116275,2891 +118989,9 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t1092-sparse-checkout-compatibility.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t1092-sparse-checkout-compatibility/.git/
-expecting success of 1092.1 'setup': 
-	git init initial-repo &&
-	(
-		GIT_TEST_SPARSE_INDEX=0 &&
-		cd initial-repo &&
-		echo a >a &&
-		echo "after deep" >e &&
-		echo "after folder1" >g &&
-		echo "after x" >z &&
-		mkdir folder1 folder2 deep before x &&
-		echo "before deep" >before/a &&
-		echo "before deep again" >before/b &&
-		mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
-		mkdir deep/deeper1/deepest &&
-		mkdir deep/deeper1/deepest2 &&
-		mkdir deep/deeper1/deepest3 &&
-		echo "after deeper1" >deep/e &&
-		echo "after deepest" >deep/deeper1/e &&
-		cp a folder1 &&
-		cp a folder2 &&
-		cp a x &&
-		cp a deep &&
-		cp a deep/before &&
-		cp a deep/deeper1 &&
-		cp a deep/deeper2 &&
-		cp a deep/later &&
-		cp a deep/deeper1/deepest &&
-		cp a deep/deeper1/deepest2 &&
-		cp a deep/deeper1/deepest3 &&
-		cp -r deep/deeper1/ deep/deeper2 &&
-		mkdir deep/deeper1/0 &&
-		mkdir deep/deeper1/0/0 &&
-		touch deep/deeper1/0/1 &&
-		touch deep/deeper1/0/0/0 &&
-		>folder1- &&
-		>folder1.x &&
-		>folder10 &&
-		cp -r deep/deeper1/0 folder1 &&
-		cp -r deep/deeper1/0 folder2 &&
-		echo >>folder1/0/0/0 &&
-		echo >>folder2/0/1 &&
-		git add . &&
-		git commit -m "initial commit" &&
-		git checkout -b base &&
-		for dir in folder1 folder2 deep
-		do
-			git checkout -b update-$dir base &&
-			echo "updated $dir" >$dir/a &&
-			git commit -a -m "update $dir" || return 1
-		done &&
-
-		git checkout -b rename-base base &&
-		cat >folder1/larger-content <<-\EOF &&
-		matching
-		lines
-		help
-		inexact
-		renames
-		EOF
-		cp folder1/larger-content folder2/ &&
-		cp folder1/larger-content deep/deeper1/ &&
-		git add . &&
-		git commit -m "add interesting rename content" &&
-
-		git checkout -b rename-out-to-out rename-base &&
-		mv folder1/a folder2/b &&
-		mv folder1/larger-content folder2/edited-content &&
-		echo >>folder2/edited-content &&
-		echo >>folder2/0/1 &&
-		echo stuff >>deep/deeper1/a &&
-		git add . &&
-		git commit -m "rename folder1/... to folder2/..." &&
-
-		git checkout -b rename-out-to-in rename-base &&
-		mv folder1/a deep/deeper1/b &&
-		echo more stuff >>deep/deeper1/a &&
-		rm folder2/0/1 &&
-		mkdir folder2/0/1 &&
-		echo >>folder2/0/1/1 &&
-		mv folder1/larger-content deep/deeper1/edited-content &&
-		echo >>deep/deeper1/edited-content &&
-		git add . &&
-		git commit -m "rename folder1/... to deep/deeper1/..." &&
-
-		git checkout -b rename-in-to-out rename-base &&
-		mv deep/deeper1/a folder1/b &&
-		echo >>folder2/0/1 &&
-		rm -rf folder1/0/0 &&
-		echo >>folder1/0/0 &&
-		mv deep/deeper1/larger-content folder1/edited-content &&
-		echo >>folder1/edited-content &&
-		git add . &&
-		git commit -m "rename deep/deeper1/... to folder1/..." &&
-
-		git checkout -b df-conflict-1 base &&
-		rm -rf folder1 &&
-		echo content >folder1 &&
-		git add . &&
-		git commit -m "dir to file" &&
-
-		git checkout -b df-conflict-2 base &&
-		rm -rf folder2 &&
-		echo content >folder2 &&
-		git add . &&
-		git commit -m "dir to file" &&
-
-		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.45.2/t/trash directory.t1092-sparse-checkout-compatibility/initial-repo/.git/
-[master (root-commit) 703fd3e] initial commit
- Author: A U Thor <author@example.com>
- 33 files changed, 26 insertions(+)
- create mode 100644 a
- create mode 100644 before/a
- create mode 100644 before/b
- create mode 100644 deep/a
- create mode 100644 deep/before/a
- create mode 100644 deep/deeper1/0/0/0
- create mode 100644 deep/deeper1/0/1
- create mode 100644 deep/deeper1/a
- create mode 100644 deep/deeper1/deepest/a
- create mode 100644 deep/deeper1/deepest2/a
- create mode 100644 deep/deeper1/deepest3/a
- create mode 100644 deep/deeper1/e
- create mode 100644 deep/deeper2/a
- create mode 100644 deep/deeper2/deeper1/a
- create mode 100644 deep/deeper2/deeper1/deepest/a
- create mode 100644 deep/deeper2/deeper1/deepest2/a
- create mode 100644 deep/deeper2/deeper1/deepest3/a
- create mode 100644 deep/deeper2/deeper1/e
- create mode 100644 deep/e
- create mode 100644 deep/later/a
- create mode 100644 e
- create mode 100644 folder1-
- create mode 100644 folder1.x
- create mode 100644 folder1/0/0/0
- create mode 100644 folder1/0/1
- create mode 100644 folder1/a
- create mode 100644 folder10
- create mode 100644 folder2/0/0/0
- create mode 100644 folder2/0/1
- create mode 100644 folder2/a
- create mode 100644 g
- create mode 100644 x/a
- create mode 100644 z
-Switched to a new branch 'base'
-Switched to a new branch 'update-folder1'
-[update-folder1 fa14324] update folder1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'update-folder2'
-[update-folder2 2805da4] update folder2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'update-deep'
-[update-deep ac61adf] update deep
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'rename-base'
-[rename-base 5914bd8] add interesting rename content
- Author: A U Thor <author@example.com>
- 3 files changed, 15 insertions(+)
- create mode 100644 deep/deeper1/larger-content
- create mode 100644 folder1/larger-content
- create mode 100644 folder2/larger-content
-Switched to a new branch 'rename-out-to-out'
-[rename-out-to-out 4a04e79] rename folder1/... to folder2/...
- Author: A U Thor <author@example.com>
- 4 files changed, 3 insertions(+)
- rename folder1/a => folder2/b (100%)
- rename folder1/larger-content => folder2/edited-content (97%)
-Switched to a new branch 'rename-out-to-in'
-[rename-out-to-in d11c5fe] rename folder1/... to deep/deeper1/...
- 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 discrepencies in reported
-	# "modified" files, `test_sparse_match` reset is performed separately from
-	# "full-checkout" reset, then the index contents of all repos are verified.
-
-	test_sparse_match git reset update-folder1 -- \*/a &&
-	git -C full-checkout reset update-folder1 -- \*/a &&
-	test_all_match git ls-files -s -- deep/a folder1/a &&
-
-	test_sparse_match git reset update-folder2 -- folder\* &&
-	git -C full-checkout reset update-folder2 -- folder\* &&
-	test_all_match git ls-files -s -- folder10 folder1 folder2 &&
-
-	test_sparse_match git reset base -- folder1/\* &&
-	git -C full-checkout reset base -- folder1/\* &&
-	test_all_match git ls-files -s -- folder1
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Unstaged changes after reset:
-M	folder1/a
-Unstaged changes after reset:
-M	folder2/a
-Unstaged changes after reset:
-M	folder2/a
-ok 27 - reset with wildcard pathspec
-
-expecting success of 1092.28 'reset hard with removed sparse dir': 
-	init_repos &&
-
-	run_on_all git rm -r --sparse folder1 &&
-	test_all_match git status --porcelain=v2 &&
-
-	test_all_match git reset --hard &&
-	test_all_match git status --porcelain=v2 &&
-
-	cat >expect <<-\EOF &&
-	folder1/
-	EOF
-
-	git -C sparse-index ls-files --sparse folder1 >out &&
-	test_cmp expect out
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 28 - reset hard with removed sparse dir
-
-expecting success of 1092.29 'update-index modify outside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Create & modify folder1/a
-	# Note that this setup is a manual way of reaching the erroneous
-	# condition in which a `skip-worktree` enabled, outside-of-cone file
-	# exists on disk. It is used here to ensure `update-index` is stable
-	# and behaves predictably if such a condition occurs.
-	run_on_sparse mkdir -p folder1 &&
-	run_on_sparse cp ../initial-repo/folder1/a folder1/a &&
-	run_on_all ../edit-contents folder1/a &&
-
-	# If file has skip-worktree enabled, but the file is present, it is
-	# treated the same as if skip-worktree is disabled
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-
-	# When skip-worktree is disabled (even on files outside sparse cone), file
-	# is updated in the index
-	test_sparse_match git update-index --no-skip-worktree folder1/a &&
-	test_all_match git status --porcelain=v2 &&
-	test_all_match git update-index folder1/a &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 29 - update-index modify outside sparse definition
-
-expecting success of 1092.30 'update-index --add outside sparse definition': 
-	init_repos &&
-
-	write_script edit-contents <<-\EOF &&
-	echo text >>$1
-	EOF
-
-	# Create folder1, add new file
-	run_on_sparse mkdir -p folder1 &&
-	run_on_all ../edit-contents folder1/b &&
-
-	# The *untracked* out-of-cone file is added to the index because it does
-	# not have a `skip-worktree` bit to signal that it should be ignored
-	# (unlike in `git add`, which will fail due to the file being outside
-	# the sparse checkout definition).
-	test_all_match git update-index --add folder1/b &&
-	test_all_match git status --porcelain=v2
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 30 - update-index --add outside sparse definition
-
-expecting success of 1092.31 'update-index --remove outside sparse definition': 
-	init_repos &&
-
-	# When --ignore-skip-worktree-entries is _not_ specified:
-	# out-of-cone, not-on-disk files are removed from the index
-	test_sparse_match git update-index --remove folder1/a &&
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --cached --name-status &&
-	test_cmp expect sparse-checkout-out &&
-
-	# 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 &&
-
-	# Reset the state
-	test_all_match git reset --hard &&
-
-	# --force-remove supercedes --ignore-skip-worktree-entries, removing
-	# a skip-worktree file from the index (and disk) when both are specified
-	# with --remove
-	test_sparse_match git update-index --force-remove --ignore-skip-worktree-entries folder1/a &&
-	cat >expect <<-EOF &&
-	D	folder1/a
-	EOF
-	test_sparse_match git diff --cached --name-status &&
-	test_cmp expect sparse-checkout-out
-
-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-12-18 01:33:20.126773267 +0000
-+++ sparse-index-err	2025-12-18 01:33:20.134773267 +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":"20251218T013323.107745Z-Hfbad846e-P0000207a","thread":"main","time":"2025-12-18T01:33:23.110980Z","file":"sparse-index.c","line":210,"repo":1,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20251218T013323.107745Z-Hfbad846e-P0000207a","thread":"main","time":"2025-12-18T01:33:23.111209Z","file":"sparse-index.c","line":224,"repo":1,"t_rel":0.000230,"nesting":1,"category":"index","label":"convert_to_sparse"}
-{"event":"region_enter","sid":"20251218T013323.107745Z-Hfbad846e-P0000207a","thread":"main","time":"2025-12-18T01:33:23.109480Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20251218T013323.107745Z-Hfbad846e-P0000207a","thread":"main","time":"2025-12-18T01:33:23.111606Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20251218T013323.107745Z-Hfbad846e-P0000207a","thread":"main","time":"2025-12-18T01:33:23.110448Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.000966,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20251218T013323.107745Z-Hfbad846e-P0000207a","thread":"main","time":"2025-12-18T01:33:23.111876Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.000270,"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":"20251218T013323.121483Z-Hfbad846e-P00002094","thread":"main","time":"2025-12-18T01:33:23.122599Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20251218T013323.121483Z-Hfbad846e-P00002094","thread":"main","time":"2025-12-18T01:33:23.123852Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.001252,"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":"20251218T013323.302070Z-Hfbad846e-P00002219","thread":"main","time":"2025-12-18T01:33:23.303345Z","file":"sparse-index.c","line":338,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20251218T013323.302070Z-Hfbad846e-P00002219","thread":"main","time":"2025-12-18T01:33:23.304447Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.001101,"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":"20251218T013323.322905Z-Hfbad846e-P0000222f","thread":"main","time":"2025-12-18T01:33:23.323848Z","file":"sparse-index.c","line":210,"repo":1,"nesting":2,"category":"index","label":"convert_to_sparse"}
-{"event":"region_leave","sid":"20251218T013323.322905Z-Hfbad846e-P0000222f","thread":"main","time":"2025-12-18T01:33:23.324079Z","file":"sparse-index.c","line":224,"repo":1,"t_rel":0.000231,"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': 
-	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 &&
-
-	# 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 &&
-
-	# 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
-
-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
-
-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":"20251218T013332.570404Z-Hfbad846e-P000062c3","thread":"main","time":"2025-12-18T01:33:32.572132Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20251218T013332.570404Z-Hfbad846e-P000062c3","thread":"main","time":"2025-12-18T01:33:32.573900Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20251218T013332.591854Z-Hfbad846e-P000062ea","thread":"main","time":"2025-12-18T01:33:32.593020Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20251218T013332.591854Z-Hfbad846e-P000062ea","thread":"main","time":"2025-12-18T01:33:32.595439Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20251218T013332.618660Z-Hfbad846e-P0000631a","thread":"main","time":"2025-12-18T01:33:32.619747Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20251218T013332.618660Z-Hfbad846e-P0000631a","thread":"main","time":"2025-12-18T01:33:32.621531Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-ok 77 - rm pathspec expands index when necessary
-
-expecting success of 1092.78 'sparse index is not expanded: rm': 
-	init_repos &&
-
-	ensure_not_expanded rm deep/a &&
-
-	# test in-cone wildcard
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm deep/* &&
-
-	# test recursive rm
-	git -C sparse-index reset --hard &&
-	ensure_not_expanded rm -r deep
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 78 - sparse index is not expanded: rm
-
-expecting success of 1092.79 'grep with and --cached': 
-	init_repos &&
-
-	test_all_match git grep --cached a &&
-	test_all_match git grep --cached a -- "folder1/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 79 - grep with and --cached
-
-expecting success of 1092.80 'grep is not expanded': 
-	init_repos &&
-
-	ensure_not_expanded grep a &&
-	ensure_not_expanded grep a -- deep/* &&
-
-	# All files within the folder1/* pathspec are sparse,
-	# so this command does not find any matches
-	ensure_not_expanded ! grep a -- folder1/* &&
-
-	# test out-of-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "folder1/a" &&
-	ensure_not_expanded grep --cached a -- "folder1/*" &&
-
-	# test in-cone pathspec with or without wildcard
-	ensure_not_expanded grep --cached a -- "deep/a" &&
-	ensure_not_expanded grep --cached a -- "deep/*"
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-ok 80 - grep is not expanded
-
-checking known breakage of 1092.81 'grep within submodules is not expanded': 
-	init_repos_as_submodules &&
-
-	# do not use ensure_not_expanded() here, becasue `grep` should be
-	# run in the superproject, not in "./sparse-index"
-	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
-	git grep --cached --recurse-submodules a -- "*/folder1/*" &&
-	test_region ! index ensure_full_index trace2.txt
-
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-HEAD is now at 703fd3e initial commit
-Adding existing repo at 'full-checkout' to the index
-Adding existing repo at 'sparse-checkout' to the index
-Adding existing repo at 'sparse-index' to the index
- 703fd3e56687611d5c0264e6f007e18e96f794bf full-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-checkout (heads/base)
- 703fd3e56687611d5c0264e6f007e18e96f794bf sparse-index (heads/base)
-full-checkout/folder1/a:a
-sparse-checkout/folder1/a:a
-sparse-index/folder1/a:a
-{"event":"region_enter","sid":"20251218T013333.726813Z-Hfbad846e-P00006d8b","thread":"main","time":"2025-12-18T01:33:33.729998Z","file":"sparse-index.c","line":338,"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)
-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
-
-# still have 2 known breakage(s)
-# passed all remaining 93 test(s)
-1..95
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3008-ls-files-lazy-init-name-hash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3008-ls-files-lazy-init-name-hash/.git/
-expecting success of 3008.1 'no buffer overflow in lazy_init_name_hash': 
+*** t3008-ls-files-lazy-init-name-hash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3008-ls-files-lazy-init-name-hash/.git/
+expecting success of 3008.1 'no buffer overflow in lazy_init_name_hash': 
 	(
 	    test_seq $LAZY_THREAD_COST | sed "s/^/a_/" &&
 	    echo b/b/b &&
@@ -119170,446 +119002,13 @@
 	git update-index --index-info &&
 	test-tool lazy-init-name-hash -m
 
-0.000923 0.000655 4002 multi 2
+0.000922 0.002246 4002 multi 2
 ok 1 - no buffer overflow in lazy_init_name_hash
 
 # passed all 1 test(s)
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2501-cwd-empty.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/.git/
-expecting success of 2501.1 'setup': 
-	test_commit init &&
-
-	git branch fd_conflict &&
-
-	mkdir -p foo/bar &&
-	test_commit foo/bar/baz &&
-
-	git revert HEAD &&
-	git tag reverted &&
-
-	git checkout fd_conflict &&
-	mkdir dirORfile &&
-	test_commit dirORfile/foo &&
-
-	git rm -r dirORfile &&
-	echo not-a-directory >dirORfile &&
-	git add dirORfile &&
-	git commit -m dirORfile &&
-
-	git switch -c df_conflict HEAD~1 &&
-	test_commit random_file &&
-
-	git switch -c undo_fd_conflict fd_conflict &&
-	git revert HEAD
-
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master f4c5aab] foo/bar/baz
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar/baz.t
-[master 968d1fe] Revert "foo/bar/baz"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-Switched to branch 'fd_conflict'
-[fd_conflict d7f9e78] dirORfile/foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dirORfile/foo.t
-rm 'dirORfile/foo.t'
-[fd_conflict 9658629] dirORfile
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- create mode 100644 dirORfile
- delete mode 100644 dirORfile/foo.t
-Switched to a new branch 'df_conflict'
-[df_conflict d90d7a3] random_file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 random_file.t
-Switched to a new branch 'undo_fd_conflict'
-[undo_fd_conflict 46c1835] Revert "dirORfile"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 dirORfile
- create mode 100644 dirORfile/foo.t
-ok 1 - setup
-
-expecting success of 2501.2 'checkout does not clean cwd incidentally': 
-	test_incidental_dir_removal git checkout init
-
-Note: switching to 'foo/bar/baz^{commit}'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at f4c5aab foo/bar/baz
-Previous HEAD position was f4c5aab foo/bar/baz
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 2519212 init
-ok 2 - checkout does not clean cwd incidentally
-
-expecting success of 2501.3 'checkout fails if cwd needs to be removed': 
-	test_required_dir_removal git checkout fd_conflict
-
-Previous HEAD position was 2519212 init
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 3 - checkout fails if cwd needs to be removed
-
-expecting success of 2501.4 'reset --hard does not clean cwd incidentally': 
-	test_incidental_dir_removal git reset --hard init
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-HEAD is now at 2519212 init
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 2519212 init
-ok 4 - reset --hard does not clean cwd incidentally
-
-expecting success of 2501.5 'reset --hard fails if cwd needs to be removed': 
-	test_required_dir_removal git reset --hard fd_conflict
-
-Previous HEAD position was 2519212 init
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove 'dirORfile' since it is the current working directory.
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 5 - reset --hard fails if cwd needs to be removed
-
-expecting success of 2501.6 'merge does not clean cwd incidentally': 
-	test_incidental_dir_removal git merge reverted
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-Updating f4c5aab..968d1fe
-Fast-forward
- foo/bar/baz.t | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 968d1fe Revert "foo/bar/baz"
-ok 6 - merge does not clean cwd incidentally
-
-expecting success of 2501.7 'merge fails if cwd needs to be removed; recursive friendly': 
-	git checkout foo/bar/baz &&
-	test_when_finished "git clean -fdx" &&
-
-	mkdir dirORfile &&
-	(
-		cd dirORfile &&
-
-		test_must_fail git merge fd_conflict 2>../error
-	) &&
-
-	test_path_is_dir dirORfile &&
-	grep "Refusing to remove the current working directory" error
-
-Previous HEAD position was 968d1fe Revert "foo/bar/baz"
-HEAD is now at f4c5aab foo/bar/baz
-error: Refusing to remove the current working directory:
-Removing dirORfile/
-Removing error
-ok 7 - merge fails if cwd needs to be removed; recursive friendly
-
-expecting success of 2501.8 'merge fails if cwd needs to be removed': 
-	test_required_dir_removal git merge fd_conflict
-
-Previous HEAD position was f4c5aab foo/bar/baz
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-ok 8 - merge fails if cwd needs to be removed
-
-expecting success of 2501.9 'cherry-pick does not clean cwd incidentally': 
-	test_incidental_dir_removal git cherry-pick reverted
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-[detached HEAD d0d1a1f] Revert "foo/bar/baz"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at d0d1a1f Revert "foo/bar/baz"
-ok 9 - cherry-pick does not clean cwd incidentally
-
-expecting success of 2501.10 'cherry-pick fails if cwd needs to be removed': 
-	test_required_dir_removal git cherry-pick fd_conflict
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  d0d1a1f Revert "foo/bar/baz"
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> d0d1a1f
-
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 10 - cherry-pick fails if cwd needs to be removed
-
-expecting success of 2501.11 'rebase does not clean cwd incidentally': 
-	test_incidental_dir_removal git rebase reverted
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-
                                                                                
Successfully rebased and updated detached HEAD.
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at 968d1fe Revert "foo/bar/baz"
-ok 11 - rebase does not clean cwd incidentally
-
-expecting success of 2501.12 'rebase fails if cwd needs to be removed': 
-	test_required_dir_removal git rebase fd_conflict
-
-Previous HEAD position was 968d1fe Revert "foo/bar/baz"
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 12 - rebase fails if cwd needs to be removed
-
-expecting success of 2501.13 'revert does not clean cwd incidentally': 
-	test_incidental_dir_removal git revert HEAD
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-[detached HEAD f0f8756] Revert "foo/bar/baz"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 foo/bar/baz.t
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
-HEAD is now at f0f8756 Revert "foo/bar/baz"
-ok 13 - revert does not clean cwd incidentally
-
-expecting success of 2501.14 'revert fails if cwd needs to be removed': 
-	test_required_dir_removal git revert undo_fd_conflict
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  f0f8756 Revert "foo/bar/baz"
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> f0f8756
-
-HEAD is now at d90d7a3 random_file
-error: Refusing to remove the current working directory:
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/dirORfile
-?? error
-Removing error
-Removing foo/
-ok 14 - revert fails if cwd needs to be removed
-
-expecting success of 2501.15 'rm does not clean cwd incidentally': 
-	test_incidental_dir_removal git rm bar/baz.t
-
-Previous HEAD position was d90d7a3 random_file
-HEAD is now at f4c5aab foo/bar/baz
-rm 'foo/bar/baz.t'
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
-D  foo/bar/baz.t
-HEAD is now at f4c5aab foo/bar/baz
-ok 15 - rm does not clean cwd incidentally
-
-expecting success of 2501.16 'apply does not remove cwd incidentally': 
-	git diff HEAD HEAD~1 >patch &&
-	test_incidental_dir_removal git apply ../patch
-
-HEAD is now at f4c5aab foo/bar/baz
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/foo
- D foo/bar/baz.t
-?? patch
-HEAD is now at f4c5aab foo/bar/baz
-ok 16 - apply does not remove cwd incidentally
-
-expecting success of 2501.17 'clean does not remove cwd incidentally': 
-	test_incidental_untracked_dir_removal \
-		git -C .. clean -fd -e warnings . >warnings &&
-	grep "Refusing to remove current working directory" warnings
-
-HEAD is now at f4c5aab foo/bar/baz
-Refusing to remove current working directory
-HEAD is now at f4c5aab foo/bar/baz
-ok 17 - clean does not remove cwd incidentally
-
-expecting success of 2501.18 'stash does not remove cwd incidentally': 
-	test_incidental_untracked_dir_removal \
-		git stash --include-untracked
-
-HEAD is now at f4c5aab foo/bar/baz
-Saved working directory and index state WIP on (no branch): f4c5aab foo/bar/baz
-Refusing to remove current working directory
-/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/untracked
-HEAD is now at f4c5aab foo/bar/baz
-ok 18 - stash does not remove cwd incidentally
-
-expecting success of 2501.19 '`rm -rf dir` only removes a subset of dir': 
-	test_when_finished "rm -rf a/" &&
-
-	mkdir -p a/b/c &&
-	>a/b/c/untracked &&
-	>a/b/c/tracked &&
-	git add a/b/c/tracked &&
-
-	(
-		cd a/b &&
-		git rm -rf ../b
-	) &&
-
-	test_path_is_dir a/b &&
-	test_path_is_missing a/b/c/tracked &&
-	test_path_is_file a/b/c/untracked
-
-rm 'a/b/c/tracked'
-ok 19 - `rm -rf dir` only removes a subset of dir
-
-expecting success of 2501.20 '`rm -rf dir` even with only tracked files will remove something else': 
-	test_when_finished "rm -rf a/" &&
-
-	mkdir -p a/b/c &&
-	>a/b/c/tracked &&
-	git add a/b/c/tracked &&
-
-	(
-		cd a/b &&
-		git rm -rf ../b
-	) &&
-
-	test_path_is_missing a/b/c/tracked &&
-	test_path_is_missing a/b/c &&
-	test_path_is_dir a/b
-
-rm 'a/b/c/tracked'
-ok 20 - `rm -rf dir` even with only tracked files will remove something else
-
-expecting success of 2501.21 'git version continues working from a deleted dir': 
-	mkdir tmp &&
-	(
-		cd tmp &&
-		rm -rf ../tmp &&
-		git version
-	)
-
-sh: 0: getcwd() failed: No such file or directory
-git version 2.45.2
-ok 21 - git version continues working from a deleted dir
-
-expecting success of 2501.22 'rm -r with -C leaves submodule if cwd inside': 
-	test_submodule_removal dir git -C .. rm -r my_submodule/
-
-HEAD is now at f4c5aab foo/bar/baz
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
-fatal: could not remove 'my_submodule'
-rm 'my_submodule'
-HEAD is now at f4c5aab foo/bar/baz
-ok 22 - rm -r with -C leaves submodule if cwd inside
-
-expecting success of 2501.23 'rm -r leaves submodule if cwd inside': 
-	test_submodule_removal dir \
-		git --git-dir=../.git --work-tree=.. rm -r ../my_submodule/
-
-HEAD is now at f4c5aab foo/bar/baz
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
-fatal: could not remove 'my_submodule'
-rm 'my_submodule'
-HEAD is now at f4c5aab foo/bar/baz
-ok 23 - rm -r leaves submodule if cwd inside
-
-expecting success of 2501.24 'rm -rf removes submodule even if cwd inside': 
-	test_submodule_removal missing \
-		git --git-dir=../.git --work-tree=.. rm -rf ../my_submodule/
-
-HEAD is now at f4c5aab foo/bar/baz
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2501-cwd-empty/my_submodule/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t2501-cwd-empty/.git/modules/my_submodule'
-rm 'my_submodule'
-HEAD is now at f4c5aab foo/bar/baz
-ok 24 - rm -rf removes submodule even if cwd inside
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3009-ls-files-others-nonsubmodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3009-ls-files-others-nonsubmodule/.git/
 expecting success of 3009.1 'setup: directories': 
@@ -119765,92 +119164,472 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3012-ls-files-dedup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3012-ls-files-dedup/.git/
-expecting success of 3012.1 'setup': 
-	>a.txt &&
-	>b.txt &&
-	>delete.txt &&
-	git add a.txt b.txt delete.txt &&
-	git commit -m base &&
-	echo a >a.txt &&
-	echo b >b.txt &&
-	echo delete >delete.txt &&
-	git add a.txt b.txt delete.txt &&
-	git commit -m tip &&
-	git tag tip &&
-	git reset --hard HEAD^ &&
-	echo change >a.txt &&
-	git commit -a -m side &&
-	git tag side
+*** t3007-ls-files-recurse-submodules.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/.git/
+expecting success of 3007.1 'setup directory structure and submodules': 
+	echo a >a &&
+	mkdir b &&
+	echo b >b/b &&
+	git add a b &&
+	git commit -m "add a and b" &&
+	git init submodule &&
+	echo c >submodule/c &&
+	git -C submodule add c &&
+	git -C submodule commit -m "add c" &&
+	git submodule add ./submodule &&
+	git commit -m "added submodule"
 
-[master (root-commit) 211e5bc] base
+[master (root-commit) f320cab] add a and b
  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
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b/b
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git/
+[master (root-commit) 3281629] add c
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-HEAD is now at 211e5bc base
-[master 692b228] side
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c
+Adding existing repo at 'submodule' to the index
+[master 14616f7] added submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+ok 1 - setup directory structure and submodules
+
+expecting success of 3007.2 'ls-files correctly outputs files in submodule': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/c
+	EOF
+
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
+
+ok 2 - ls-files correctly outputs files in submodule
+
+expecting success of 3007.3 '--stage': 
+	GITMODULES_HASH=$(git rev-parse HEAD:.gitmodules) &&
+	A_HASH=$(git rev-parse HEAD:a) &&
+	B_HASH=$(git rev-parse HEAD:b/b) &&
+	C_HASH=$(git -C submodule rev-parse HEAD:c) &&
+
+	cat >expect <<-EOF &&
+	100644 $GITMODULES_HASH 0	.gitmodules
+	100644 $A_HASH 0	a
+	100644 $B_HASH 0	b/b
+	100644 $C_HASH 0	submodule/c
+	EOF
+
+	git ls-files --stage --recurse-submodules >actual &&
+	test_cmp expect actual
+
+ok 3 - --stage
+
+expecting success of 3007.4 'ls-files correctly outputs files in submodule with -z': 
+	lf_to_nul >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/c
+	EOF
+
+	git ls-files --recurse-submodules -z >actual &&
+	test_cmp expect actual
+
+ok 4 - ls-files correctly outputs files in submodule with -z
+
+expecting success of 3007.5 'ls-files does not output files not added to a repo': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/c
+	EOF
+
+	echo a >not_added &&
+	echo b >b/not_added &&
+	echo c >submodule/not_added &&
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
+
+ok 5 - ls-files does not output files not added to a repo
+
+expecting success of 3007.6 'ls-files recurses more than 1 level': 
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	submodule/.gitmodules
+	submodule/c
+	submodule/subsub/d
+	EOF
+
+	git init submodule/subsub &&
+	echo d >submodule/subsub/d &&
+	git -C submodule/subsub add d &&
+	git -C submodule/subsub commit -m "add d" &&
+	git -C submodule submodule add ./subsub &&
+	git -C submodule commit -m "added subsub" &&
+	git submodule absorbgitdirs &&
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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(+)
-ok 1 - setup
+ 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.45.2/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule'
+Migrating git directory of 'submodule/subsub' from
+'/build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule/modules/subsub'
+ok 6 - ls-files recurses more than 1 level
 
-expecting success of 3012.2 'git ls-files --deduplicate to show unique unmerged path': 
-	test_must_fail git merge tip &&
-	git ls-files --deduplicate >actual &&
+expecting success of 3007.7 'ls-files works with GIT_DIR': 
 	cat >expect <<-\EOF &&
-	a.txt
-	b.txt
-	delete.txt
+	.gitmodules
+	c
+	subsub/d
+	EOF
+
+	git --git-dir=submodule/.git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
+
+ok 7 - ls-files works with GIT_DIR
+
+expecting success of 3007.8 '--recurse-submodules and pathspecs setup': 
+	echo e >submodule/subsub/e.txt &&
+	git -C submodule/subsub add e.txt &&
+	git -C submodule/subsub commit -m "adding e.txt" &&
+	echo f >submodule/f.TXT &&
+	echo g >submodule/g.txt &&
+	git -C submodule add f.TXT g.txt &&
+	git -C submodule commit -m "add f and g" &&
+	echo h >h.txt &&
+	mkdir sib &&
+	echo sib >sib/file &&
+	git add h.txt sib/file &&
+	git commit -m "add h and sib/file" &&
+	git init sub &&
+	echo sub >sub/file &&
+	git -C sub add file &&
+	git -C sub commit -m "add file" &&
+	git submodule add ./sub &&
+	git commit -m "added sub" &&
+
+	cat >expect <<-\EOF &&
+	.gitmodules
+	a
+	b/b
+	h.txt
+	sib/file
+	sub/file
+	submodule/.gitmodules
+	submodule/c
+	submodule/f.TXT
+	submodule/g.txt
+	submodule/subsub/d
+	submodule/subsub/e.txt
 	EOF
+
+	git ls-files --recurse-submodules >actual &&
 	test_cmp expect actual &&
-	git merge --abort
+	git ls-files --recurse-submodules "*" >actual &&
+	test_cmp expect actual
 
-Auto-merging a.txt
-CONFLICT (content): Merge conflict in a.txt
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - git ls-files --deduplicate to show unique unmerged path
+[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.45.2/t/trash directory.t3007-ls-files-recurse-submodules/sub/.git/
+[master (root-commit) e443189] add file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Adding existing repo at 'sub' to the index
+[master 4a68fc6] added sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub
+ok 8 - --recurse-submodules and pathspecs setup
+
+expecting success of 3007.9 'inactive submodule': 
+	test_when_finished "git config --bool submodule.submodule.active true" &&
+	test_when_finished "git -C submodule config --bool submodule.subsub.active true" &&
+	git config --bool submodule.submodule.active "false" &&
 
-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
+	.gitmodules
+	a
+	b/b
+	h.txt
+	sib/file
+	sub/file
+	submodule
 	EOF
+
+	git ls-files --recurse-submodules >actual &&
 	test_cmp expect actual &&
-	git ls-files -d -m -t --deduplicate >actual &&
+
+	git config --bool submodule.submodule.active "true" &&
+	git -C submodule config --bool submodule.subsub.active "false" &&
+
 	cat >expect <<-\EOF &&
-	C a.txt
-	C a.txt
-	C a.txt
-	R delete.txt
-	C delete.txt
+	.gitmodules
+	a
+	b/b
+	h.txt
+	sib/file
+	sub/file
+	submodule/.gitmodules
+	submodule/c
+	submodule/f.TXT
+	submodule/g.txt
+	submodule/subsub
+	EOF
+
+	git ls-files --recurse-submodules >actual &&
+	test_cmp expect actual
+
+ok 9 - inactive submodule
+
+expecting success of 3007.10 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	h.txt
+	submodule/g.txt
+	submodule/subsub/e.txt
+	EOF
+
+	git ls-files --recurse-submodules "*.txt" >actual &&
+	test_cmp expect actual
+
+ok 10 - --recurse-submodules and pathspecs
+
+expecting success of 3007.11 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	h.txt
+	submodule/f.TXT
+	submodule/g.txt
+	submodule/subsub/e.txt
+	EOF
+
+	git ls-files --recurse-submodules ":(icase)*.txt" >actual &&
+	test_cmp expect actual
+
+ok 11 - --recurse-submodules and pathspecs
+
+expecting success of 3007.12 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	h.txt
+	submodule/f.TXT
+	submodule/g.txt
+	EOF
+
+	git ls-files --recurse-submodules ":(icase)*.txt" ":(exclude)submodule/subsub/*" >actual &&
+	test_cmp expect actual
+
+ok 12 - --recurse-submodules and pathspecs
+
+expecting success of 3007.13 '--recurse-submodules and pathspecs': 
+	cat >expect <<-\EOF &&
+	sub/file
 	EOF
+
+	git ls-files --recurse-submodules "sub" >actual &&
 	test_cmp expect actual &&
-	git ls-files -d -m -c --deduplicate >actual &&
+	git ls-files --recurse-submodules "sub/" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "sub/file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "su*/file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "su?/file" >actual &&
+	test_cmp expect actual
+
+ok 13 - --recurse-submodules and pathspecs
+
+expecting success of 3007.14 '--recurse-submodules and pathspecs': 
 	cat >expect <<-\EOF &&
-	a.txt
-	b.txt
-	delete.txt
+	sib/file
+	sub/file
 	EOF
+
+	git ls-files --recurse-submodules "s??/file" >actual &&
 	test_cmp expect actual &&
-	git merge --abort
+	git ls-files --recurse-submodules "s???file" >actual &&
+	test_cmp expect actual &&
+	git ls-files --recurse-submodules "s*file" >actual &&
+	test_cmp expect actual
 
-HEAD is now at 692b228 side
-Auto-merging a.txt
-CONFLICT (content): Merge conflict in a.txt
-Automatic merge failed; fix conflicts and then commit the result.
-ok 3 - git ls-files -d -m --deduplicate with different display options
+ok 14 - --recurse-submodules and pathspecs
 
-# passed all 3 test(s)
-1..3
+expecting success of 3007.15 '--recurse-submodules and relative paths': 
+	# From subdir
+	cat >expect <<-\EOF &&
+	b
+	EOF
+	git -C b ls-files --recurse-submodules >actual &&
+	test_cmp expect actual &&
+
+	# Relative path to top
+	cat >expect <<-\EOF &&
+	../.gitmodules
+	../a
+	b
+	../h.txt
+	../sib/file
+	../sub/file
+	../submodule/.gitmodules
+	../submodule/c
+	../submodule/f.TXT
+	../submodule/g.txt
+	../submodule/subsub/d
+	../submodule/subsub/e.txt
+	EOF
+	git -C b ls-files --recurse-submodules -- .. >actual &&
+	test_cmp expect actual &&
+
+	# Relative path to submodule
+	cat >expect <<-\EOF &&
+	../submodule/.gitmodules
+	../submodule/c
+	../submodule/f.TXT
+	../submodule/g.txt
+	../submodule/subsub/d
+	../submodule/subsub/e.txt
+	EOF
+	git -C b ls-files --recurse-submodules -- ../submodule >actual &&
+	test_cmp expect actual
+
+ok 15 - --recurse-submodules and relative paths
+
+expecting success of 3007.16 '--recurse-submodules does not support --error-unmatch': 
+	test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual &&
+	test_grep "does not support --error-unmatch" actual
+
+fatal: ls-files --recurse-submodules does not support --error-unmatch
+ok 16 - --recurse-submodules does not support --error-unmatch
+
+expecting success of 3007.17 '--recurse-submodules parses submodule repo config': 
+	test_config -C submodule index.sparse "invalid non-boolean value" &&
+	test_must_fail git ls-files --recurse-submodules 2>err &&
+	grep "bad boolean config value" err
+
+.gitmodules
+a
+b/b
+h.txt
+sib/file
+sub/file
+fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
+ok 17 - --recurse-submodules parses submodule repo config
+
+expecting success of 3007.18 '--recurse-submodules parses submodule worktree config': 
+	test_config -C submodule extensions.worktreeConfig true &&
+	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
+
+	test_must_fail git ls-files --recurse-submodules 2>err &&
+	grep "bad boolean config value" err
+
+.gitmodules
+a
+b/b
+h.txt
+sib/file
+sub/file
+fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
+ok 18 - --recurse-submodules parses submodule worktree config
+
+expecting success of 3007.19 '--recurse-submodules submodules ignore super project worktreeConfig extension': 
+	# Enable worktree config in both super project & submodule, set an
+	# invalid config in the submodule worktree config
+	test_config extensions.worktreeConfig true &&
+	test_config -C submodule extensions.worktreeConfig true &&
+	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
+
+	# Now, disable the worktree config in the submodule. Note that we need
+	# to manually re-enable extensions.worktreeConfig when the test is
+	# finished, otherwise the test_unconfig of index.sparse will not work.
+	test_unconfig -C submodule extensions.worktreeConfig &&
+	test_when_finished "git -C submodule config extensions.worktreeConfig true" &&
+
+	# With extensions.worktreeConfig disabled in the submodule, the invalid
+	# worktree config is not picked up.
+	git ls-files --recurse-submodules 2>err &&
+	! grep "bad boolean config value" err
+
+.gitmodules
+a
+b/b
+h.txt
+sib/file
+sub/file
+submodule/.gitmodules
+submodule/c
+submodule/f.TXT
+submodule/g.txt
+submodule/subsub/d
+submodule/subsub/e.txt
+ok 19 - --recurse-submodules submodules ignore super project worktreeConfig extension
+
+expecting success of 3007.20 '--recurse-submodules and --deleted are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --deleted 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 20 - --recurse-submodules and --deleted are incompatible
+
+expecting success of 3007.21 '--recurse-submodules and --modified are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --modified 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 21 - --recurse-submodules and --modified are incompatible
+
+expecting success of 3007.22 '--recurse-submodules and --others are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --others 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 22 - --recurse-submodules and --others are incompatible
+
+expecting success of 3007.23 '--recurse-submodules and --killed are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --killed 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 23 - --recurse-submodules and --killed are incompatible
+
+expecting success of 3007.24 '--recurse-submodules and --unmerged are incompatible': 
+		test_must_fail git ls-files --recurse-submodules --unmerged 2>actual &&
+		test_grep 'unsupported mode' actual
+	
+fatal: ls-files --recurse-submodules unsupported mode
+ok 24 - --recurse-submodules and --unmerged are incompatible
+
+# passed all 24 test(s)
+1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3011-common-prefixes-and-directory-traversal.sh ***
@@ -120051,8 +119830,8 @@
 	git ls-files -o "untracked_*/" >actual &&
 	test_cmp expect actual
 
---- expect	2025-12-18 01:33:38.782773267 +0000
-+++ actual	2025-12-18 01:33:38.786773267 +0000
+--- expect	2024-11-14 19:30:13.722117239 +0000
++++ actual	2024-11-14 19:30:13.726117279 +0000
 @@ -1,3 +1,2 @@
  untracked_*/empty
 -untracked_dir/empty
@@ -120106,6 +119885,94 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3012-ls-files-dedup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3012-ls-files-dedup/.git/
+expecting success of 3012.1 'setup': 
+	>a.txt &&
+	>b.txt &&
+	>delete.txt &&
+	git add a.txt b.txt delete.txt &&
+	git commit -m base &&
+	echo a >a.txt &&
+	echo b >b.txt &&
+	echo delete >delete.txt &&
+	git add a.txt b.txt delete.txt &&
+	git commit -m tip &&
+	git tag tip &&
+	git reset --hard HEAD^ &&
+	echo change >a.txt &&
+	git commit -a -m side &&
+	git tag side
+
+[master (root-commit) 211e5bc] base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a.txt
+ create mode 100644 b.txt
+ create mode 100644 delete.txt
+[master 8a0f78f] tip
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+HEAD is now at 211e5bc base
+[master 692b228] side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 3012.2 'git ls-files --deduplicate to show unique unmerged path': 
+	test_must_fail git merge tip &&
+	git ls-files --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	b.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git merge --abort
+
+Auto-merging a.txt
+CONFLICT (content): Merge conflict in a.txt
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - git ls-files --deduplicate to show unique unmerged path
+
+expecting success of 3012.3 'git ls-files -d -m --deduplicate with different display options': 
+	git reset --hard side &&
+	test_must_fail git merge tip &&
+	rm delete.txt &&
+	git ls-files -d -m --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git ls-files -d -m -t --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	C a.txt
+	C a.txt
+	C a.txt
+	R delete.txt
+	C delete.txt
+	EOF
+	test_cmp expect actual &&
+	git ls-files -d -m -c --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	b.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git merge --abort
+
+HEAD is now at 692b228 side
+Auto-merging a.txt
+CONFLICT (content): Merge conflict in a.txt
+Automatic merge failed; fix conflicts and then commit the result.
+ok 3 - git ls-files -d -m --deduplicate with different display options
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3020-ls-files-error-unmatch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3020-ls-files-error-unmatch/.git/
 expecting success of 3020.1 'setup': 
@@ -120139,6 +120006,102 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3050-subprojects-fetch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3050-subprojects-fetch/.git/
+expecting success of 3050.1 'setup': 
+	test_tick &&
+	mkdir -p sub && (
+		cd sub &&
+		git init &&
+		>subfile &&
+		git add subfile &&
+		git commit -m "subproject commit #1"
+	) &&
+	>mainfile &&
+	git add sub mainfile &&
+	test_tick &&
+	git commit -m "superproject commit #1"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 advice.addEmbeddedRepo false"
+[master (root-commit) 1226c2e] superproject commit #1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 mainfile
+ create mode 160000 sub
+ok 1 - setup
+
+expecting success of 3050.2 'clone': 
+	git clone "file://$(pwd)/.git" cloned &&
+	(git rev-parse HEAD && git ls-files -s) >expected &&
+	(
+		cd cloned &&
+		(git rev-parse HEAD && git ls-files -s) >../actual
+	) &&
+	test_cmp expected actual
+
+Cloning into 'cloned'...
+ok 2 - clone
+
+expecting success of 3050.3 'advance': 
+	echo more >mainfile &&
+	git update-index --force-remove sub &&
+	mv sub/.git sub/.git-disabled &&
+	git add sub/subfile mainfile &&
+	mv sub/.git-disabled sub/.git &&
+	test_tick &&
+	git commit -m "superproject commit #2"
+
+[master 1548ecd] superproject commit #2
+ Author: A U Thor <author@example.com>
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 160000 sub
+ create mode 100644 sub/subfile
+ok 3 - advance
+
+expecting success of 3050.4 'fetch': 
+	(git rev-parse HEAD && git ls-files -s) >expected &&
+	(
+		cd cloned &&
+		git pull &&
+		(git rev-parse HEAD && git ls-files -s) >../actual
+	) &&
+	test_cmp expected actual
+
+From file:///build/reproducible-path/git-2.45.2/t/trash directory.t3050-subprojects-fetch/
+   1226c2e..1548ecd  master     -> origin/master
+Updating 1226c2e..1548ecd
+Fast-forward
+ mainfile    | 1 +
+ sub         | 1 -
+ sub/subfile | 0
+ 3 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 160000 sub
+ create mode 100644 sub/subfile
+ok 4 - fetch
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3013-ls-files-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3013-ls-files-format/.git/
 expecting success of 3013.1 'usage: --format is incompatible with -s': 
@@ -120613,641 +120576,77 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3050-subprojects-fetch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
+*** t3040-subprojects-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3040-subprojects-basic/.git/
+expecting success of 3040.1 'setup: create superproject': 
+	: >Makefile &&
+	git add Makefile &&
+	git commit -m "Superproject created"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3050-subprojects-fetch/sub/.git/
-[master (root-commit) 4c0c877] subproject commit #1
+[master (root-commit) 0075abc] Superproject created
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 subfile
-warning: adding embedded git repository: sub
+ create mode 100644 Makefile
+ok 1 - setup: create superproject
+
+expecting success of 3040.2 'setup: create subprojects': 
+	mkdir sub1 &&
+	( cd sub1 && git init && : >Makefile && git add * &&
+	git commit -q -m "subproject 1" ) &&
+	mkdir sub2 &&
+	( cd sub2 && git init && : >Makefile && git add * &&
+	git commit -q -m "subproject 2" ) &&
+	git update-index --add sub1 &&
+	git add sub2 &&
+	git commit -q -m "subprojects added" &&
+	GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev=5 HEAD^ HEAD |cut -d" " -f-3,5- >current &&
+	git branch save HEAD &&
+	cat >expected <<-\EOF &&
+	:000000 160000 00000... A	sub1
+	:000000 160000 00000... A	sub2
+	EOF
+	test_cmp expected current
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3040-subprojects-basic/sub1/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3040-subprojects-basic/sub2/.git/
+warning: adding embedded git repository: sub2
 hint: You've added another git repository inside your current repository.
 hint: Clones of the outer repository will not contain the contents of
 hint: the embedded repository and will not know how to obtain it.
 hint: If you meant to add a submodule, use:
 hint:
-hint: 	git submodule add <url> sub
+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 sub
+hint: 	git rm --cached sub2
 hint:
 hint: See "git help submodule" for more information.
 hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[master (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 2 - setup: create subprojects
 
-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 3040.3 'check if fsck ignores the subprojects': 
+	git fsck --full
 
-Cloning into 'cloned'...
-ok 2 - clone
+ok 3 - check if fsck ignores the subprojects
 
-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 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
 
-[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
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 0000000000000000000000000000000000000000 M	sub1
+ok 4 - check if commit in a subproject detected
 
-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 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
 
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t3050-subprojects-fetch/
-   1226c2e..1548ecd  master     -> origin/master
-Updating 1226c2e..1548ecd
-Fast-forward
- mainfile    | 1 +
- sub         | 1 -
- sub/subfile | 0
- 3 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 160000 sub
- create mode 100644 sub/subfile
-ok 4 - fetch
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3007-ls-files-recurse-submodules.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/.git/
-expecting success of 3007.1 'setup directory structure and submodules': 
-	echo a >a &&
-	mkdir b &&
-	echo b >b/b &&
-	git add a b &&
-	git commit -m "add a and b" &&
-	git init submodule &&
-	echo c >submodule/c &&
-	git -C submodule add c &&
-	git -C submodule commit -m "add c" &&
-	git submodule add ./submodule &&
-	git commit -m "added submodule"
-
-[master (root-commit) f320cab] add a and b
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b/b
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git/
-[master (root-commit) 3281629] add c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c
-Adding existing repo at 'submodule' to the index
-[master 14616f7] added submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-ok 1 - setup directory structure and submodules
-
-expecting success of 3007.2 'ls-files correctly outputs files in submodule': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/c
-	EOF
-
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 2 - ls-files correctly outputs files in submodule
-
-expecting success of 3007.3 '--stage': 
-	GITMODULES_HASH=$(git rev-parse HEAD:.gitmodules) &&
-	A_HASH=$(git rev-parse HEAD:a) &&
-	B_HASH=$(git rev-parse HEAD:b/b) &&
-	C_HASH=$(git -C submodule rev-parse HEAD:c) &&
-
-	cat >expect <<-EOF &&
-	100644 $GITMODULES_HASH 0	.gitmodules
-	100644 $A_HASH 0	a
-	100644 $B_HASH 0	b/b
-	100644 $C_HASH 0	submodule/c
-	EOF
-
-	git ls-files --stage --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 3 - --stage
-
-expecting success of 3007.4 'ls-files correctly outputs files in submodule with -z': 
-	lf_to_nul >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/c
-	EOF
-
-	git ls-files --recurse-submodules -z >actual &&
-	test_cmp expect actual
-
-ok 4 - ls-files correctly outputs files in submodule with -z
-
-expecting success of 3007.5 'ls-files does not output files not added to a repo': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/c
-	EOF
-
-	echo a >not_added &&
-	echo b >b/not_added &&
-	echo c >submodule/not_added &&
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 5 - ls-files does not output files not added to a repo
-
-expecting success of 3007.6 'ls-files recurses more than 1 level': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	submodule/.gitmodules
-	submodule/c
-	submodule/subsub/d
-	EOF
-
-	git init submodule/subsub &&
-	echo d >submodule/subsub/d &&
-	git -C submodule/subsub add d &&
-	git -C submodule/subsub commit -m "add d" &&
-	git -C submodule submodule add ./subsub &&
-	git -C submodule commit -m "added subsub" &&
-	git submodule absorbgitdirs &&
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3007-ls-files-recurse-submodules/submodule/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule'
-Migrating git directory of 'submodule/subsub' from
-'/build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/submodule/subsub/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/.git/modules/submodule/modules/subsub'
-ok 6 - ls-files recurses more than 1 level
-
-expecting success of 3007.7 'ls-files works with GIT_DIR': 
-	cat >expect <<-\EOF &&
-	.gitmodules
-	c
-	subsub/d
-	EOF
-
-	git --git-dir=submodule/.git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 7 - ls-files works with GIT_DIR
-
-expecting success of 3007.8 '--recurse-submodules and pathspecs setup': 
-	echo e >submodule/subsub/e.txt &&
-	git -C submodule/subsub add e.txt &&
-	git -C submodule/subsub commit -m "adding e.txt" &&
-	echo f >submodule/f.TXT &&
-	echo g >submodule/g.txt &&
-	git -C submodule add f.TXT g.txt &&
-	git -C submodule commit -m "add f and g" &&
-	echo h >h.txt &&
-	mkdir sib &&
-	echo sib >sib/file &&
-	git add h.txt sib/file &&
-	git commit -m "add h and sib/file" &&
-	git init sub &&
-	echo sub >sub/file &&
-	git -C sub add file &&
-	git -C sub commit -m "add file" &&
-	git submodule add ./sub &&
-	git commit -m "added sub" &&
-
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	h.txt
-	sib/file
-	sub/file
-	submodule/.gitmodules
-	submodule/c
-	submodule/f.TXT
-	submodule/g.txt
-	submodule/subsub/d
-	submodule/subsub/e.txt
-	EOF
-
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "*" >actual &&
-	test_cmp expect actual
-
-[master 562fffb] adding e.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e.txt
-[master f284b88] add f and g
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 f.TXT
- create mode 100644 g.txt
-[master ad13f14] add h and sib/file
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 h.txt
- create mode 100644 sib/file
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3007-ls-files-recurse-submodules/sub/.git/
-[master (root-commit) e443189] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Adding existing repo at 'sub' to the index
-[master 4a68fc6] added sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub
-ok 8 - --recurse-submodules and pathspecs setup
-
-expecting success of 3007.9 'inactive submodule': 
-	test_when_finished "git config --bool submodule.submodule.active true" &&
-	test_when_finished "git -C submodule config --bool submodule.subsub.active true" &&
-	git config --bool submodule.submodule.active "false" &&
-
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	h.txt
-	sib/file
-	sub/file
-	submodule
-	EOF
-
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual &&
-
-	git config --bool submodule.submodule.active "true" &&
-	git -C submodule config --bool submodule.subsub.active "false" &&
-
-	cat >expect <<-\EOF &&
-	.gitmodules
-	a
-	b/b
-	h.txt
-	sib/file
-	sub/file
-	submodule/.gitmodules
-	submodule/c
-	submodule/f.TXT
-	submodule/g.txt
-	submodule/subsub
-	EOF
-
-	git ls-files --recurse-submodules >actual &&
-	test_cmp expect actual
-
-ok 9 - inactive submodule
-
-expecting success of 3007.10 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	h.txt
-	submodule/g.txt
-	submodule/subsub/e.txt
-	EOF
-
-	git ls-files --recurse-submodules "*.txt" >actual &&
-	test_cmp expect actual
-
-ok 10 - --recurse-submodules and pathspecs
-
-expecting success of 3007.11 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	h.txt
-	submodule/f.TXT
-	submodule/g.txt
-	submodule/subsub/e.txt
-	EOF
-
-	git ls-files --recurse-submodules ":(icase)*.txt" >actual &&
-	test_cmp expect actual
-
-ok 11 - --recurse-submodules and pathspecs
-
-expecting success of 3007.12 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	h.txt
-	submodule/f.TXT
-	submodule/g.txt
-	EOF
-
-	git ls-files --recurse-submodules ":(icase)*.txt" ":(exclude)submodule/subsub/*" >actual &&
-	test_cmp expect actual
-
-ok 12 - --recurse-submodules and pathspecs
-
-expecting success of 3007.13 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	sub/file
-	EOF
-
-	git ls-files --recurse-submodules "sub" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "sub/" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "sub/file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "su*/file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "su?/file" >actual &&
-	test_cmp expect actual
-
-ok 13 - --recurse-submodules and pathspecs
-
-expecting success of 3007.14 '--recurse-submodules and pathspecs': 
-	cat >expect <<-\EOF &&
-	sib/file
-	sub/file
-	EOF
-
-	git ls-files --recurse-submodules "s??/file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "s???file" >actual &&
-	test_cmp expect actual &&
-	git ls-files --recurse-submodules "s*file" >actual &&
-	test_cmp expect actual
-
-ok 14 - --recurse-submodules and pathspecs
-
-expecting success of 3007.15 '--recurse-submodules and relative paths': 
-	# From subdir
-	cat >expect <<-\EOF &&
-	b
-	EOF
-	git -C b ls-files --recurse-submodules >actual &&
-	test_cmp expect actual &&
-
-	# Relative path to top
-	cat >expect <<-\EOF &&
-	../.gitmodules
-	../a
-	b
-	../h.txt
-	../sib/file
-	../sub/file
-	../submodule/.gitmodules
-	../submodule/c
-	../submodule/f.TXT
-	../submodule/g.txt
-	../submodule/subsub/d
-	../submodule/subsub/e.txt
-	EOF
-	git -C b ls-files --recurse-submodules -- .. >actual &&
-	test_cmp expect actual &&
-
-	# Relative path to submodule
-	cat >expect <<-\EOF &&
-	../submodule/.gitmodules
-	../submodule/c
-	../submodule/f.TXT
-	../submodule/g.txt
-	../submodule/subsub/d
-	../submodule/subsub/e.txt
-	EOF
-	git -C b ls-files --recurse-submodules -- ../submodule >actual &&
-	test_cmp expect actual
-
-ok 15 - --recurse-submodules and relative paths
-
-expecting success of 3007.16 '--recurse-submodules does not support --error-unmatch': 
-	test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual &&
-	test_grep "does not support --error-unmatch" actual
-
-fatal: ls-files --recurse-submodules does not support --error-unmatch
-ok 16 - --recurse-submodules does not support --error-unmatch
-
-expecting success of 3007.17 '--recurse-submodules parses submodule repo config': 
-	test_config -C submodule index.sparse "invalid non-boolean value" &&
-	test_must_fail git ls-files --recurse-submodules 2>err &&
-	grep "bad boolean config value" err
-
-.gitmodules
-a
-b/b
-h.txt
-sib/file
-sub/file
-fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
-ok 17 - --recurse-submodules parses submodule repo config
-
-expecting success of 3007.18 '--recurse-submodules parses submodule worktree config': 
-	test_config -C submodule extensions.worktreeConfig true &&
-	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
-
-	test_must_fail git ls-files --recurse-submodules 2>err &&
-	grep "bad boolean config value" err
-
-.gitmodules
-a
-b/b
-h.txt
-sib/file
-sub/file
-fatal: bad boolean config value 'invalid non-boolean value' for 'index.sparse'
-ok 18 - --recurse-submodules parses submodule worktree config
-
-expecting success of 3007.19 '--recurse-submodules submodules ignore super project worktreeConfig extension': 
-	# Enable worktree config in both super project & submodule, set an
-	# invalid config in the submodule worktree config
-	test_config extensions.worktreeConfig true &&
-	test_config -C submodule extensions.worktreeConfig true &&
-	test_config -C submodule --worktree index.sparse "invalid non-boolean value" &&
-
-	# Now, disable the worktree config in the submodule. Note that we need
-	# to manually re-enable extensions.worktreeConfig when the test is
-	# finished, otherwise the test_unconfig of index.sparse will not work.
-	test_unconfig -C submodule extensions.worktreeConfig &&
-	test_when_finished "git -C submodule config extensions.worktreeConfig true" &&
-
-	# With extensions.worktreeConfig disabled in the submodule, the invalid
-	# worktree config is not picked up.
-	git ls-files --recurse-submodules 2>err &&
-	! grep "bad boolean config value" err
-
-.gitmodules
-a
-b/b
-h.txt
-sib/file
-sub/file
-submodule/.gitmodules
-submodule/c
-submodule/f.TXT
-submodule/g.txt
-submodule/subsub/d
-submodule/subsub/e.txt
-ok 19 - --recurse-submodules submodules ignore super project worktreeConfig extension
-
-expecting success of 3007.20 '--recurse-submodules and --deleted are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --deleted 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 20 - --recurse-submodules and --deleted are incompatible
-
-expecting success of 3007.21 '--recurse-submodules and --modified are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --modified 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 21 - --recurse-submodules and --modified are incompatible
-
-expecting success of 3007.22 '--recurse-submodules and --others are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --others 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 22 - --recurse-submodules and --others are incompatible
-
-expecting success of 3007.23 '--recurse-submodules and --killed are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --killed 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 23 - --recurse-submodules and --killed are incompatible
-
-expecting success of 3007.24 '--recurse-submodules and --unmerged are incompatible': 
-		test_must_fail git ls-files --recurse-submodules --unmerged 2>actual &&
-		test_grep 'unsupported mode' actual
-	
-fatal: ls-files --recurse-submodules unsupported mode
-ok 24 - --recurse-submodules and --unmerged are incompatible
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3040-subprojects-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3040-subprojects-basic/.git/
-expecting success of 3040.1 'setup: create superproject': 
-	: >Makefile &&
-	git add Makefile &&
-	git commit -m "Superproject created"
-
-[master (root-commit) 0075abc] Superproject created
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 Makefile
-ok 1 - setup: create superproject
-
-expecting success of 3040.2 'setup: create subprojects': 
-	mkdir sub1 &&
-	( cd sub1 && git init && : >Makefile && git add * &&
-	git commit -q -m "subproject 1" ) &&
-	mkdir sub2 &&
-	( cd sub2 && git init && : >Makefile && git add * &&
-	git commit -q -m "subproject 2" ) &&
-	git update-index --add sub1 &&
-	git add sub2 &&
-	git commit -q -m "subprojects added" &&
-	GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev=5 HEAD^ HEAD |cut -d" " -f-3,5- >current &&
-	git branch save HEAD &&
-	cat >expected <<-\EOF &&
-	:000000 160000 00000... A	sub1
-	:000000 160000 00000... A	sub2
-	EOF
-	test_cmp expected current
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3040-subprojects-basic/sub1/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3040-subprojects-basic/sub2/.git/
-warning: adding embedded git repository: sub2
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub2
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub2
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-ok 2 - setup: create subprojects
-
-expecting success of 3040.3 'check if fsck ignores the subprojects': 
-	git fsck --full
-
-ok 3 - check if fsck ignores the subprojects
-
-expecting success of 3040.4 'check if commit in a subproject detected': 
-	( cd sub1 &&
-	echo "all:" >>Makefile &&
-	echo "	true" >>Makefile &&
-	git commit -q -a -m "make all" ) &&
-	test_expect_code 1 git diff-files --exit-code
-
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 0000000000000000000000000000000000000000 M	sub1
-ok 4 - check if commit in a subproject detected
-
-expecting success of 3040.5 'check if a changed subproject HEAD can be committed': 
-	git commit -q -a -m "sub1 changed" &&
-	test_expect_code 1 git diff-tree --exit-code HEAD^ HEAD
-
-:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
-ok 5 - check if a changed subproject HEAD can be committed
+:160000 160000 1220b9f3ace6404f5c782bba5e262aaaf38310fb 487e23047a2a8ed2c84b1478b3e52375e3ae3334 M	sub1
+ok 5 - check if a changed subproject HEAD can be committed
 
 expecting success of 3040.6 'check if diff-index works for subproject elements': 
 	test_expect_code 1 git diff-index --exit-code --cached save -- sub1
@@ -121571,53 +120970,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3102-ls-tree-wildcards.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3102-ls-tree-wildcards/.git/
-expecting success of 3102.1 'setup': 
-	mkdir a aa "a[a]" &&
-	touch a/one aa/two "a[a]/three" &&
-	git add a/one aa/two "a[a]/three" &&
-	git commit -m test
-
-[master (root-commit) a832b10] test
- Author: A U Thor <author@example.com>
- 3 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a/one
- create mode 100644 a[a]/three
- create mode 100644 aa/two
-ok 1 - setup
-
-expecting success of 3102.2 'ls-tree a[a] matches literally': 
-	cat >expect <<-EOF &&
-	100644 blob $EMPTY_BLOB	a[a]/three
-	EOF
-	git ls-tree -r HEAD "a[a]" >actual &&
-	test_cmp expect actual
-
-ok 2 - ls-tree a[a] matches literally
-
-expecting success of 3102.3 'ls-tree outside prefix': 
-	cat >expect <<-EOF &&
-	100644 blob $EMPTY_BLOB	../a[a]/three
-	EOF
-	( cd aa && git ls-tree -r HEAD "../a[a]" ) >actual &&
-	test_cmp expect actual
-
-ok 3 - ls-tree outside prefix
-
-checking known breakage of 3102.4 'ls-tree does not yet support negated pathspec': 
-	git ls-files ":(exclude)a" "a*" >expect &&
-	git ls-tree --name-only -r HEAD ":(exclude)a" "a*" >actual &&
-	test_cmp expect actual
-
-fatal: :(exclude)a: pathspec magic not supported by this command: 'exclude' (mnemonic: '!')
-not ok 4 - ls-tree does not yet support negated pathspec # TODO known breakage
-
-# still have 1 known breakage(s)
-# passed all remaining 3 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3100-ls-tree-restrict.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3100-ls-tree-restrict/.git/
 expecting success of 3100.1 'setup': mkdir path2 path2/baz &&
@@ -121752,142 +121104,51 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3103-ls-tree-misc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3103-ls-tree-misc/.git/
-expecting success of 3103.1 'setup': 
-	mkdir a &&
-	touch a/one &&
-	git add a/one &&
+*** t3102-ls-tree-wildcards.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3102-ls-tree-wildcards/.git/
+expecting success of 3102.1 'setup': 
+	mkdir a aa "a[a]" &&
+	touch a/one aa/two "a[a]/three" &&
+	git add a/one aa/two "a[a]/three" &&
 	git commit -m test
 
-[master (root-commit) 687a3e0] test
+[master (root-commit) a832b10] test
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
+ 3 files changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 a/one
+ create mode 100644 a[a]/three
+ create mode 100644 aa/two
 ok 1 - setup
 
-expecting success of 3103.2 'ls-tree fails with non-zero exit code on broken tree': 
-	tree=$(git rev-parse HEAD:a) &&
-	rm -f .git/objects/$(echo $tree | sed -e "s,^\(..\),\1/,") &&
-	test_must_fail git ls-tree -r HEAD
-
-error: Could not read 5fcffbd6e4c5c5b8d81f5e9314b20e338e3ffff5
-ok 2 - ls-tree fails with non-zero exit code on broken tree
-
-expecting success of 3103.3 'usage: incompatible options: --long --name-only': 
-		test_expect_code 129 git ls-tree $opts $tree
-	
-error: options '--name-only' and '--long' cannot be used together
-ok 3 - usage: incompatible options: --long --name-only
-
-expecting success of 3103.4 'usage: incompatible options: --long and --format': 
-		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
-	
-fatal: --format can't be combined with other format-altering options
-
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
-
-    -d                    only show trees
-    -r                    recurse into subtrees
-    -t                    show trees when recursing
-    -z                    terminate entries with NUL byte
-    -l, --long            include object size
-    --name-only           list only filenames
-    --name-status         list only filenames
-    --object-only         list only objects
-    --[no-]full-name      use full path names
-    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
-    --format <format>     format to use for the output
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-
-ok 4 - usage: incompatible options: --long and --format
-
-expecting success of 3103.5 'usage: incompatible options: --name-only --name-status': 
-		test_expect_code 129 git ls-tree $opts $tree
-	
-error: options '--name-status' and '--name-only' cannot be used together
-ok 5 - usage: incompatible options: --name-only --name-status
-
-expecting success of 3103.6 'usage: incompatible options: --name-only and --format': 
-		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
-	
-fatal: --format can't be combined with other format-altering options
-
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
-
-    -d                    only show trees
-    -r                    recurse into subtrees
-    -t                    show trees when recursing
-    -z                    terminate entries with NUL byte
-    -l, --long            include object size
-    --name-only           list only filenames
-    --name-status         list only filenames
-    --object-only         list only objects
-    --[no-]full-name      use full path names
-    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
-    --format <format>     format to use for the output
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-
-ok 6 - usage: incompatible options: --name-only and --format
-
-expecting success of 3103.7 'usage: incompatible options: --name-status --object-only': 
-		test_expect_code 129 git ls-tree $opts $tree
-	
-error: options '--object-only' and '--name-status' cannot be used together
-ok 7 - usage: incompatible options: --name-status --object-only
-
-expecting success of 3103.8 'usage: incompatible options: --name-status and --format': 
-		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
-	
-fatal: --format can't be combined with other format-altering options
-
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
-
-    -d                    only show trees
-    -r                    recurse into subtrees
-    -t                    show trees when recursing
-    -z                    terminate entries with NUL byte
-    -l, --long            include object size
-    --name-only           list only filenames
-    --name-status         list only filenames
-    --object-only         list only objects
-    --[no-]full-name      use full path names
-    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
-    --format <format>     format to use for the output
-    --[no-]abbrev[=<n>]   use <n> digits to display object names
-
-ok 8 - usage: incompatible options: --name-status and --format
+expecting success of 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 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
+ok 2 - ls-tree a[a] matches literally
 
-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
+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
 
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
+ok 3 - ls-tree outside prefix
 
-    -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 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
 
-ok 10 - usage: incompatible options: --object-only and --format
+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
 
-# passed all 10 test(s)
-1..10
+# still have 1 known breakage(s)
+# passed all remaining 3 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3101-ls-tree-dirname.sh ***
@@ -122145,6 +121406,144 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3103-ls-tree-misc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3103-ls-tree-misc/.git/
+expecting success of 3103.1 'setup': 
+	mkdir a &&
+	touch a/one &&
+	git add a/one &&
+	git commit -m test
+
+[master (root-commit) 687a3e0] test
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a/one
+ok 1 - setup
+
+expecting success of 3103.2 'ls-tree fails with non-zero exit code on broken tree': 
+	tree=$(git rev-parse HEAD:a) &&
+	rm -f .git/objects/$(echo $tree | sed -e "s,^\(..\),\1/,") &&
+	test_must_fail git ls-tree -r HEAD
+
+error: Could not read 5fcffbd6e4c5c5b8d81f5e9314b20e338e3ffff5
+ok 2 - ls-tree fails with non-zero exit code on broken tree
+
+expecting success of 3103.3 'usage: incompatible options: --long --name-only': 
+		test_expect_code 129 git ls-tree $opts $tree
+	
+error: options '--name-only' and '--long' cannot be used together
+ok 3 - usage: incompatible options: --long --name-only
+
+expecting success of 3103.4 'usage: incompatible options: --long and --format': 
+		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+	
+fatal: --format can't be combined with other format-altering options
+
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
+
+    -d                    only show trees
+    -r                    recurse into subtrees
+    -t                    show trees when recursing
+    -z                    terminate entries with NUL byte
+    -l, --long            include object size
+    --name-only           list only filenames
+    --name-status         list only filenames
+    --object-only         list only objects
+    --[no-]full-name      use full path names
+    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
+    --format <format>     format to use for the output
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 4 - usage: incompatible options: --long and --format
+
+expecting success of 3103.5 'usage: incompatible options: --name-only --name-status': 
+		test_expect_code 129 git ls-tree $opts $tree
+	
+error: options '--name-status' and '--name-only' cannot be used together
+ok 5 - usage: incompatible options: --name-only --name-status
+
+expecting success of 3103.6 'usage: incompatible options: --name-only and --format': 
+		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+	
+fatal: --format can't be combined with other format-altering options
+
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
+
+    -d                    only show trees
+    -r                    recurse into subtrees
+    -t                    show trees when recursing
+    -z                    terminate entries with NUL byte
+    -l, --long            include object size
+    --name-only           list only filenames
+    --name-status         list only filenames
+    --object-only         list only objects
+    --[no-]full-name      use full path names
+    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
+    --format <format>     format to use for the output
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 6 - usage: incompatible options: --name-only and --format
+
+expecting success of 3103.7 'usage: incompatible options: --name-status --object-only': 
+		test_expect_code 129 git ls-tree $opts $tree
+	
+error: options '--object-only' and '--name-status' cannot be used together
+ok 7 - usage: incompatible options: --name-status --object-only
+
+expecting success of 3103.8 'usage: incompatible options: --name-status and --format': 
+		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+	
+fatal: --format can't be combined with other format-altering options
+
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
+
+    -d                    only show trees
+    -r                    recurse into subtrees
+    -t                    show trees when recursing
+    -z                    terminate entries with NUL byte
+    -l, --long            include object size
+    --name-only           list only filenames
+    --name-status         list only filenames
+    --object-only         list only objects
+    --[no-]full-name      use full path names
+    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
+    --format <format>     format to use for the output
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 8 - usage: incompatible options: --name-status and --format
+
+expecting success of 3103.9 'usage: incompatible options: --object-only --long': 
+		test_expect_code 129 git ls-tree $opts $tree
+	
+error: options '--long' and '--object-only' cannot be used together
+ok 9 - usage: incompatible options: --object-only --long
+
+expecting success of 3103.10 'usage: incompatible options: --object-only and --format': 
+		test_expect_code 129 git ls-tree $one_opt --format=fmt $tree
+	
+fatal: --format can't be combined with other format-altering options
+
+usage: git ls-tree [<options>] <tree-ish> [<path>...]
+
+    -d                    only show trees
+    -r                    recurse into subtrees
+    -t                    show trees when recursing
+    -z                    terminate entries with NUL byte
+    -l, --long            include object size
+    --name-only           list only filenames
+    --name-status         list only filenames
+    --object-only         list only objects
+    --[no-]full-name      use full path names
+    --[no-]full-tree      list entire tree; not just current directory (implies --full-name)
+    --format <format>     format to use for the output
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 10 - usage: incompatible options: --object-only and --format
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3104-ls-tree-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3104-ls-tree-format/.git/
 expecting success of 3104.1 'ls-tree --format usage': 
@@ -122357,6 +121756,2446 @@
 1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3105-ls-tree-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+
+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
+
+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
+
+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 1 - ls-tree --format usage
+
+expecting success of 3105.2 'setup': 
+	setup_basic_ls_tree_data
+
+[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 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 3 - setup: HEAD_* variables
+
+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
+
+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)
+
+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
+
+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 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 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)
+
+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 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)
+
+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 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 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 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)
+
+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
+
+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 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
+
+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 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
+
+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 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
+
+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
+
+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 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
+
+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 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
+
+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 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
+
+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 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
+
+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
+
+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)
+
+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)
+
+ok 36 - setup: HEAD_short_* variables
+
+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
+
+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
+
+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 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
+
+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
+
+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 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
+
+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
+
+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 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 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)
+
+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)
+
+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 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.45.2/t/trash directory.t3105-ls-tree-output'
+ok 54 - 'ls-tree --full-tree' output (via subdir, fails)
+
+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 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.45.2/t/trash directory.t3105-ls-tree-output'
+ok 56 - 'ls-tree --full-tree -t' output (via subdir, fails)
+
+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 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.45.2/t/trash directory.t3105-ls-tree-output'
+ok 58 - 'ls-tree --full-tree -d' output (via subdir, fails)
+
+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 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.45.2/t/trash directory.t3105-ls-tree-output'
+ok 60 - 'ls-tree --full-tree -r' output (via subdir, fails)
+
+# passed all 60 test(s)
+1..60
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t2013-checkout-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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 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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
+Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
+Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
+Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3201-branch-contains.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3201-branch-contains/.git/
 expecting success of 3201.1 'setup': 
@@ -122892,445 +124731,657 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3105-ls-tree-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-
-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
-
-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
-
-fatal: --format can't be combined with other format-altering options
+*** t3202-show-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3202-show-branch/.git/
+expecting success of 3202.1 'error descriptions on empty repository': 
+	current=$(git branch --show-current) &&
+	cat >expect <<-EOF &&
+	error: no commit on branch '$current' yet
+	EOF
+	test_must_fail git branch --edit-description 2>actual &&
+	test_cmp expect actual &&
+	test_must_fail git branch --edit-description $current 2>actual &&
+	test_cmp expect actual
 
-usage: git ls-tree [<options>] <tree-ish> [<path>...]
+ok 1 - error descriptions on empty repository
 
-    -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 3202.2 'fatal descriptions on empty repository': 
+	current=$(git branch --show-current) &&
+	cat >expect <<-EOF &&
+	fatal: no commit on branch '$current' yet
+	EOF
+	test_must_fail git branch --set-upstream-to=non-existent 2>actual &&
+	test_cmp expect actual &&
+	test_must_fail git branch -c new-branch 2>actual &&
+	test_cmp expect actual
 
-ok 1 - ls-tree --format usage
+ok 2 - fatal descriptions on empty repository
 
-expecting success of 3105.2 'setup': 
-	setup_basic_ls_tree_data
+expecting success of 3202.3 'setup': 
+	test_commit initial &&
+	for i in $(test_seq 1 10)
+	do
+		git checkout -b branch$i initial &&
+		test_commit --no-tag branch$i || return 1
+	done &&
+	git for-each-ref \
+		--sort=version:refname \
+		--format="%(refname:strip=2)" \
+		"refs/heads/branch*" >branches.sorted &&
+	sed "s/^> //" >expect <<-\EOF
+	> ! [branch1] branch1
+	>  ! [branch2] branch2
+	>   ! [branch3] branch3
+	>    ! [branch4] branch4
+	>     ! [branch5] branch5
+	>      ! [branch6] branch6
+	>       ! [branch7] branch7
+	>        ! [branch8] branch8
+	>         ! [branch9] branch9
+	>          * [branch10] branch10
+	> ----------
+	>          * [branch10] branch10
+	>         +  [branch9] branch9
+	>        +   [branch8] branch8
+	>       +    [branch7] branch7
+	>      +     [branch6] branch6
+	>     +      [branch5] branch5
+	>    +       [branch4] branch4
+	>   +        [branch3] branch3
+	>  +         [branch2] branch2
+	> +          [branch1] branch1
+	> +++++++++* [branch10^] initial
+	EOF
 
-[master (root-commit) 921915e] dir/sub-file
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 dir/sub-file.t
-[master 61a63ac] top-file
+ 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 top-file.t
-Cloning into 'submodule'...
-done.
-Adding existing repo at 'submodule' to the index
-[master 9ac950e] add submodule
+ create mode 100644 branch1.t
+Switched to a new branch 'branch2'
+[branch2 bcd9857] branch2
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-ok 2 - setup
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch2.t
+Switched to a new branch 'branch3'
+[branch3 6401a40] branch3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch3.t
+Switched to a new branch 'branch4'
+[branch4 831d58d] branch4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch4.t
+Switched to a new branch 'branch5'
+[branch5 d4d852d] branch5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch5.t
+Switched to a new branch 'branch6'
+[branch6 3af5e35] branch6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch6.t
+Switched to a new branch 'branch7'
+[branch7 0cecb11] branch7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch7.t
+Switched to a new branch 'branch8'
+[branch8 48b5688] branch8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch8.t
+Switched to a new branch 'branch9'
+[branch9 b82e556] branch9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch9.t
+Switched to a new branch 'branch10'
+[branch10 3b327e0] branch10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch10.t
+ok 3 - setup
 
-expecting success of 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)
+expecting success of 3202.4 'show-branch with more than 8 branches': 
+	git show-branch $(cat branches.sorted) >actual &&
+	test_cmp expect actual
 
-ok 3 - setup: HEAD_* variables
+ok 4 - show-branch with more than 8 branches
 
-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
+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
 
-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)
+ok 5 - show-branch with showbranch.default
 
-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
+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
 
-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)
+ok 6 - show-branch --color output
 
-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 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
 
-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 7 - show branch --remotes
 
-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 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" &&
 
-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 show-branch --sparse >out &&
+	grep "merge 1 and 10 to make A" out &&
 
-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
+	git show-branch >out &&
+	! grep "merge 1 and 10 to make A" 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)
+	git show-branch --no-sparse >out &&
+	! grep "merge 1 and 10 to make A" out
 
-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
+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 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)
+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 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 9 - setup show branch --list
 
-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 3202.10 'show branch --list': 
+	git show-branch --list $(cat branches.sorted) >actual &&
+	test_cmp expect actual
 
-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 10 - show branch --list
 
-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 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 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
+ok 11 - show branch --list has no --color output
 
-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 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 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
+ok 12 - show branch --merge-base with one argument
 
-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 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
 
-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 13 - show branch --merge-base with two arguments
 
-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 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 &&
 
-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
+	git merge-base $(cat branches.sorted) >actual &&
+	test_cmp expect actual
 
-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)
+ok 14 - show branch --merge-base with N arguments
 
-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
+expecting success of 3202.15 'show-branch --all --reflog (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+fatal: options '--reflog' and '--all/--remotes/--independent/--merge-base' cannot be used together
+ok 15 - show-branch --all --reflog (should fail)
 
-expecting success of 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 3202.16 'show-branch --merge-base --reflog (should fail)': 
+		test_must_fail git show-branch $combo 2>error &&
+		grep -e "cannot be used together" -e "usage:" error
+	
+usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
+ok 16 - show-branch --merge-base --reflog (should fail)
 
-expecting success of 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
+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 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 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 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
+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 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 3202.20 'show-branch --no-date-order (should fail)': 
+		test_must_fail git show-branch --no-$opt 2>err &&
+		grep "unknown option .no-$opt." err
+	
+error: unknown option `no-date-order'
+ok 20 - show-branch --no-date-order (should fail)
 
-expecting success of 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
+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 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)
+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
 
-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)
+ok 22 - error descriptions on non-existent branch
 
-ok 36 - setup: HEAD_short_* variables
+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 &&
 
-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
+	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 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)
+ok 23 - fatal descriptions on non-existent branch
 
-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
+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 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)
+Preparing worktree (detached HEAD 3b327e0)
+HEAD is now at 3b327e0 branch10
+Switched to a new branch 'orphan-branch'
+error: no commit on branch 'orphan-branch' yet
+error: no commit on branch 'orphan-branch' yet
+error: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+fatal: no commit on branch 'orphan-branch' yet
+ok 24 - error descriptions on orphan branch
 
-expecting success of 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
+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 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)
+[branch10 4c99dd1] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Switched to a new branch 'branch'
+[branch 6203781] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+HEAD is now at 4c99dd1 base
+[branch 9c7919e] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[branch 0d1aba5] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 25 - setup reflogs
 
-expecting success of 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
+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
 
-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)
+ok 26 - --reflog shows reflog entries
 
-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
+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 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)
+No revs to be shown.
+ok 27 - --reflog handles missing reflog
 
-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
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3204-branch-name-interpretation.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-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)
+[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 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 3204.2 'update branch via @{-1}': 
+	git branch previous one &&
 
-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)
+	git checkout previous &&
+	git checkout main &&
 
-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
+	git branch -f @{-1} two &&
+	expect_branch previous two
 
-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)
+Switched to branch 'previous'
+Switched to branch 'main'
+ok 2 - update branch via @{-1}
 
-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 3204.3 'update branch via local @{upstream}': 
+	git branch local one &&
+	git branch --set-upstream-to=local &&
 
-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.45.2/t/trash directory.t3105-ls-tree-output'
-ok 54 - 'ls-tree --full-tree' output (via subdir, fails)
+	git branch -f @{upstream} two &&
+	expect_branch local two
 
-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
+branch 'main' set up to track 'local'.
+ok 3 - update branch via local @{upstream}
 
-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.45.2/t/trash directory.t3105-ls-tree-output'
-ok 56 - 'ls-tree --full-tree -t' output (via subdir, fails)
+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 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
+	test_must_fail git branch -f @{upstream} two
 
-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.45.2/t/trash directory.t3105-ls-tree-output'
-ok 58 - 'ls-tree --full-tree -d' output (via subdir, fails)
+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 advice.refSyntax false"
+ok 4 - disallow updating branch via remote @{upstream}
 
-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 3204.5 'create branch with pseudo-qualified name': 
+	git branch refs/heads/qualified two &&
+	expect_branch refs/heads/refs/heads/qualified two
 
-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.45.2/t/trash directory.t3105-ls-tree-output'
-ok 60 - 'ls-tree --full-tree -r' output (via subdir, fails)
+ok 5 - create branch with pseudo-qualified name
 
-# passed all 60 test(s)
-1..60
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+expecting success of 3204.6 'force-copy a branch to itself via @{-1} is no-op': 
+	git branch -t copiable main &&
+	git checkout copiable &&
+	git checkout - &&
+	git branch -C @{-1} copiable &&
+	git config --get-all branch.copiable.merge >actual &&
+	echo refs/heads/main >expect &&
+	test_cmp expect actual
+
+branch 'copiable' set up to track 'main'.
+Switched to branch 'copiable'
+Your branch is up to date with 'main'.
+Switched to branch 'main'
+Your branch is ahead of 'origin/remote' by 1 commit.
+  (use "git push" to publish your local commits)
+ok 6 - force-copy a branch to itself via @{-1} is no-op
+
+expecting success of 3204.7 'delete branch via @{-1}': 
+	git branch previous-del &&
+
+	git checkout previous-del &&
+	git checkout main &&
+
+	git branch -D @{-1} &&
+	expect_deleted previous-del
+
+Switched to branch 'previous-del'
+Switched to branch 'main'
+Your branch is ahead of 'origin/remote' by 1 commit.
+  (use "git push" to publish your local commits)
+Deleted branch previous-del (was 139b20d).
+fatal: Needed a single revision
+ok 7 - delete branch via @{-1}
+
+expecting success of 3204.8 'delete branch via local @{upstream}': 
+	git branch local-del &&
+	git branch --set-upstream-to=local-del &&
+
+	git branch -D @{upstream} &&
+	expect_deleted local-del
+
+branch 'main' set up to track 'local-del'.
+Deleted branch local-del (was 139b20d).
+fatal: Needed a single revision
+ok 8 - delete branch via local @{upstream}
+
+expecting success of 3204.9 'delete branch via remote @{upstream}': 
+	git update-ref refs/remotes/origin/remote-del two &&
+	git branch --set-upstream-to=origin/remote-del &&
+
+	git branch -r -D @{upstream} &&
+	expect_deleted origin/remote-del
+
+branch 'main' set up to track 'origin/remote-del'.
+Deleted remote-tracking branch origin/remote-del (was 139b20d).
+fatal: Needed a single revision
+ok 9 - delete branch via remote @{upstream}
+
+expecting success of 3204.10 'delete @{upstream} expansion matches -r option': 
+	git update-ref refs/remotes/origin/remote-del two &&
+	git branch --set-upstream-to=origin/remote-del &&
+	git update-ref refs/heads/origin/remote-del two &&
+	git update-ref refs/heads/remotes/origin/remote-del two &&
+
+	test_must_fail git branch -D @{upstream} &&
+	expect_branch refs/heads/origin/remote-del two &&
+	expect_branch refs/heads/remotes/origin/remote-del two
+
+branch 'main' set up to track 'origin/remote-del'.
+error: branch '@{upstream}' not found
+ok 10 - delete @{upstream} expansion matches -r option
+
+expecting success of 3204.11 'disallow deleting remote branch via @{-1}': 
+	git update-ref refs/remotes/origin/previous one &&
+
+	git checkout -b origin/previous two &&
+	git checkout main &&
+
+	test_must_fail git branch -r -D @{-1} &&
+	expect_branch refs/remotes/origin/previous one &&
+	expect_branch refs/heads/origin/previous two
+
+Switched to a new branch 'origin/previous'
+Switched to branch 'main'
+Your branch is up to date with 'remotes/origin/remote-del'.
+error: remote-tracking branch '@{-1}' not found
+ok 11 - disallow deleting remote branch via @{-1}
+
+expecting success of 3204.12 'create branch named "@"': 
+	git branch -f @ one &&
+	expect_branch refs/heads/@ one
+
+ok 12 - create branch named "@"
+
+expecting success of 3204.13 'delete branch named "@"': 
+	git update-ref refs/heads/@ two &&
+	git branch -D @ &&
+	expect_deleted refs/heads/@
+
+Deleted branch @ (was 139b20d).
+fatal: Needed a single revision
+ok 13 - delete branch named "@"
+
+expecting success of 3204.14 'checkout does not treat remote @{upstream} as a branch': 
+	git update-ref refs/remotes/origin/checkout one &&
+	git branch --set-upstream-to=origin/checkout &&
+	git update-ref refs/heads/origin/checkout two &&
+	git update-ref refs/heads/remotes/origin/checkout two &&
+
+	git checkout @{upstream} &&
+	expect_branch HEAD one
+
+branch 'main' set up to track 'origin/checkout'.
+warning: refname '@{upstream}' is ambiguous.
+Note: switching to '@{upstream}'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d79ce16 one
+ok 14 - checkout does not treat remote @{upstream} as a branch
+
+expecting success of 3204.15 'edit-description via @{-1}': 
+	git checkout -b desc-branch &&
+	git checkout -b non-desc-branch &&
+	write_script editor <<-\EOF &&
+		echo "Branch description" >"$1"
+	EOF
+	EDITOR=./editor git branch --edit-description @{-1} &&
+	test_must_fail git config branch.non-desc-branch.description &&
+	git config branch.desc-branch.description >actual &&
+	printf "Branch description\n\n" >expect &&
+	test_cmp expect actual
+
+Switched to a new branch 'desc-branch'
+Switched to a new branch 'non-desc-branch'
+ok 15 - edit-description via @{-1}
+
+expecting success of 3204.16 'modify branch upstream via "@{-1}" and "@{-1}@{upstream}"': 
+	git checkout -b upstream-branch &&
+	git checkout -b upstream-other -t upstream-branch &&
+	git branch --set-upstream-to upstream-other @{-1} &&
+	git config branch.upstream-branch.merge >actual &&
+	echo "refs/heads/upstream-other" >expect &&
+	test_cmp expect actual &&
+	git branch --unset-upstream @{-1}@{upstream} &&
+	test_must_fail git config branch.upstream-other.merge
+
+Switched to a new branch 'upstream-branch'
+Switched to a new branch 'upstream-other'
+branch 'upstream-other' set up to track 'upstream-branch'.
+branch 'upstream-branch' set up to track 'upstream-other'.
+ok 16 - modify branch upstream via "@{-1}" and "@{-1}@{upstream}"
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3203-branch-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3203-branch-output/.git/
 expecting success of 3203.1 'make commits': 
@@ -123899,657 +125950,6 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3202-show-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3202-show-branch/.git/
-expecting success of 3202.1 'error descriptions on empty repository': 
-	current=$(git branch --show-current) &&
-	cat >expect <<-EOF &&
-	error: no commit on branch '$current' yet
-	EOF
-	test_must_fail git branch --edit-description 2>actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch --edit-description $current 2>actual &&
-	test_cmp expect actual
-
-ok 1 - error descriptions on empty repository
-
-expecting success of 3202.2 'fatal descriptions on empty repository': 
-	current=$(git branch --show-current) &&
-	cat >expect <<-EOF &&
-	fatal: no commit on branch '$current' yet
-	EOF
-	test_must_fail git branch --set-upstream-to=non-existent 2>actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch -c new-branch 2>actual &&
-	test_cmp expect actual
-
-ok 2 - fatal descriptions on empty repository
-
-expecting success of 3202.3 'setup': 
-	test_commit initial &&
-	for i in $(test_seq 1 10)
-	do
-		git checkout -b branch$i initial &&
-		test_commit --no-tag branch$i || return 1
-	done &&
-	git for-each-ref \
-		--sort=version:refname \
-		--format="%(refname:strip=2)" \
-		"refs/heads/branch*" >branches.sorted &&
-	sed "s/^> //" >expect <<-\EOF
-	> ! [branch1] branch1
-	>  ! [branch2] branch2
-	>   ! [branch3] branch3
-	>    ! [branch4] branch4
-	>     ! [branch5] branch5
-	>      ! [branch6] branch6
-	>       ! [branch7] branch7
-	>        ! [branch8] branch8
-	>         ! [branch9] branch9
-	>          * [branch10] branch10
-	> ----------
-	>          * [branch10] branch10
-	>         +  [branch9] branch9
-	>        +   [branch8] branch8
-	>       +    [branch7] branch7
-	>      +     [branch6] branch6
-	>     +      [branch5] branch5
-	>    +       [branch4] branch4
-	>   +        [branch3] branch3
-	>  +         [branch2] branch2
-	> +          [branch1] branch1
-	> +++++++++* [branch10^] initial
-	EOF
-
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'branch1'
-[branch1 39d0a3f] branch1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch1.t
-Switched to a new branch 'branch2'
-[branch2 bcd9857] branch2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch2.t
-Switched to a new branch 'branch3'
-[branch3 6401a40] branch3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch3.t
-Switched to a new branch 'branch4'
-[branch4 831d58d] branch4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch4.t
-Switched to a new branch 'branch5'
-[branch5 d4d852d] branch5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch5.t
-Switched to a new branch 'branch6'
-[branch6 3af5e35] branch6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch6.t
-Switched to a new branch 'branch7'
-[branch7 0cecb11] branch7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch7.t
-Switched to a new branch 'branch8'
-[branch8 48b5688] branch8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch8.t
-Switched to a new branch 'branch9'
-[branch9 b82e556] branch9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch9.t
-Switched to a new branch 'branch10'
-[branch10 3b327e0] branch10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch10.t
-ok 3 - setup
-
-expecting success of 3202.4 'show-branch with more than 8 branches': 
-	git show-branch $(cat branches.sorted) >actual &&
-	test_cmp expect actual
-
-ok 4 - show-branch with more than 8 branches
-
-expecting success of 3202.5 'show-branch with showbranch.default': 
-	for branch in $(cat branches.sorted)
-	do
-		test_config showbranch.default $branch --add || return 1
-	done &&
-	git show-branch >actual &&
-	test_cmp expect actual
-
-ok 5 - show-branch with showbranch.default
-
-expecting success of 3202.6 'show-branch --color output': 
-	sed "s/^> //" >expect <<-\EOF &&
-	> <RED>!<RESET> [branch1] branch1
-	>  <GREEN>!<RESET> [branch2] branch2
-	>   <YELLOW>!<RESET> [branch3] branch3
-	>    <BLUE>!<RESET> [branch4] branch4
-	>     <MAGENTA>!<RESET> [branch5] branch5
-	>      <CYAN>!<RESET> [branch6] branch6
-	>       <BOLD;RED>!<RESET> [branch7] branch7
-	>        <BOLD;GREEN>!<RESET> [branch8] branch8
-	>         <BOLD;YELLOW>!<RESET> [branch9] branch9
-	>          <BOLD;BLUE>*<RESET> [branch10] branch10
-	> ----------
-	>          <BOLD;BLUE>*<RESET> [branch10] branch10
-	>         <BOLD;YELLOW>+<RESET>  [branch9] branch9
-	>        <BOLD;GREEN>+<RESET>   [branch8] branch8
-	>       <BOLD;RED>+<RESET>    [branch7] branch7
-	>      <CYAN>+<RESET>     [branch6] branch6
-	>     <MAGENTA>+<RESET>      [branch5] branch5
-	>    <BLUE>+<RESET>       [branch4] branch4
-	>   <YELLOW>+<RESET>        [branch3] branch3
-	>  <GREEN>+<RESET>         [branch2] branch2
-	> <RED>+<RESET>          [branch1] branch1
-	> <RED>+<RESET><GREEN>+<RESET><YELLOW>+<RESET><BLUE>+<RESET><MAGENTA>+<RESET><CYAN>+<RESET><BOLD;RED>+<RESET><BOLD;GREEN>+<RESET><BOLD;YELLOW>+<RESET><BOLD;BLUE>*<RESET> [branch10^] initial
-	EOF
-	git show-branch --color=always $(cat branches.sorted) >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	test_cmp expect actual
-
-ok 6 - show-branch --color output
-
-expecting success of 3202.7 'show branch --remotes': 
-	cat >expect.err <<-\EOF &&
-	No revs to be shown.
-	EOF
-	git show-branch -r 2>actual.err >actual.out &&
-	test_cmp expect.err actual.err &&
-	test_must_be_empty actual.out
-
-ok 7 - show branch --remotes
-
-expecting success of 3202.8 'show-branch --sparse': 
-	test_when_finished "git checkout branch10 && git branch -D branchA" &&
-	git checkout -b branchA branch10 &&
-	git merge -s ours -m "merge 1 and 10 to make A" branch1 &&
-	git commit --allow-empty -m "another" &&
-
-	git show-branch --sparse >out &&
-	grep "merge 1 and 10 to make A" out &&
-
-	git show-branch >out &&
-	! grep "merge 1 and 10 to make A" out &&
-
-	git show-branch --no-sparse >out &&
-	! grep "merge 1 and 10 to make A" out
-
-Switched to a new branch 'branchA'
-Merge made by the 'ours' strategy.
-[branchA 711c132] another
- Author: A U Thor <author@example.com>
-          -  [branchA^] merge 1 and 10 to make A
-Switched to branch 'branch10'
-Deleted branch branchA (was 711c132).
-ok 8 - show-branch --sparse
-
-expecting success of 3202.9 'setup show branch --list': 
-	sed "s/^> //" >expect <<-\EOF
-	>   [branch1] branch1
-	>   [branch2] branch2
-	>   [branch3] branch3
-	>   [branch4] branch4
-	>   [branch5] branch5
-	>   [branch6] branch6
-	>   [branch7] branch7
-	>   [branch8] branch8
-	>   [branch9] branch9
-	> * [branch10] branch10
-	EOF
-
-ok 9 - setup show branch --list
-
-expecting success of 3202.10 'show branch --list': 
-	git show-branch --list $(cat branches.sorted) >actual &&
-	test_cmp expect actual
-
-ok 10 - show branch --list
-
-expecting success of 3202.11 'show branch --list has no --color output': 
-	git show-branch --color=always --list $(cat branches.sorted) >actual &&
-	test_cmp expect actual
-
-ok 11 - show branch --list has no --color output
-
-expecting success of 3202.12 'show branch --merge-base with one argument': 
-	for branch in $(cat branches.sorted)
-	do
-		git rev-parse $branch >expect &&
-		git show-branch --merge-base $branch >actual &&
-		test_cmp expect actual || return 1
-	done
-
-ok 12 - show branch --merge-base with one argument
-
-expecting success of 3202.13 'show branch --merge-base with two arguments': 
-	for branch in $(cat branches.sorted)
-	do
-		git rev-parse initial >expect &&
-		git show-branch --merge-base initial $branch >actual &&
-		test_cmp expect actual || return 1
-	done
-
-ok 13 - show branch --merge-base with two arguments
-
-expecting success of 3202.14 'show branch --merge-base with N arguments': 
-	git rev-parse initial >expect &&
-	git show-branch --merge-base $(cat branches.sorted) >actual &&
-	test_cmp expect actual &&
-
-	git merge-base $(cat branches.sorted) >actual &&
-	test_cmp expect actual
-
-ok 14 - show branch --merge-base with N arguments
-
-expecting success of 3202.15 'show-branch --all --reflog (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-fatal: options '--reflog' and '--all/--remotes/--independent/--merge-base' cannot be used together
-ok 15 - show-branch --all --reflog (should fail)
-
-expecting success of 3202.16 'show-branch --merge-base --reflog (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
-ok 16 - show-branch --merge-base --reflog (should fail)
-
-expecting success of 3202.17 'show-branch --list --merge-base (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-usage: git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]
-ok 17 - show-branch --list --merge-base (should fail)
-
-expecting success of 3202.18 'show-branch --reflog --current (should fail)': 
-		test_must_fail git show-branch $combo 2>error &&
-		grep -e "cannot be used together" -e "usage:" error
-	
-fatal: options '--reflog' and '--current' cannot be used together
-ok 18 - show-branch --reflog --current (should fail)
-
-expecting success of 3202.19 'show-branch --no-topo-order (should fail)': 
-		test_must_fail git show-branch --no-$opt 2>err &&
-		grep "unknown option .no-$opt." err
-	
-error: unknown option `no-topo-order'
-ok 19 - show-branch --no-topo-order (should fail)
-
-expecting success of 3202.20 'show-branch --no-date-order (should fail)': 
-		test_must_fail git show-branch --no-$opt 2>err &&
-		grep "unknown option .no-$opt." err
-	
-error: unknown option `no-date-order'
-ok 20 - show-branch --no-date-order (should fail)
-
-expecting success of 3202.21 'show-branch --no-reflog (should fail)': 
-		test_must_fail git show-branch --no-$opt 2>err &&
-		grep "unknown option .no-$opt." err
-	
-error: unknown option `no-reflog'
-ok 21 - show-branch --no-reflog (should fail)
-
-expecting success of 3202.22 'error descriptions on non-existent branch': 
-	cat >expect <<-EOF &&
-	error: no branch named 'non-existent'
-	EOF
-	test_must_fail git branch --edit-description non-existent 2>actual &&
-	test_cmp expect actual
-
-ok 22 - error descriptions on non-existent branch
-
-expecting success of 3202.23 'fatal descriptions on non-existent branch': 
-	cat >expect <<-EOF &&
-	fatal: branch 'non-existent' does not exist
-	EOF
-	test_must_fail git branch --set-upstream-to=non-existent non-existent 2>actual &&
-	test_cmp expect actual &&
-
-	cat >expect <<-EOF &&
-	fatal: no branch named 'non-existent'
-	EOF
-	test_must_fail git branch -c non-existent new-branch 2>actual &&
-	test_cmp expect actual &&
-	test_must_fail git branch -m non-existent new-branch 2>actual &&
-	test_cmp expect actual
-
-ok 23 - fatal descriptions on non-existent branch
-
-expecting success of 3202.24 'error descriptions on orphan branch': 
-	test_when_finished git worktree remove -f wt &&
-	git worktree add wt --detach &&
-	git -C wt checkout --orphan orphan-branch &&
-	test_branch_op_in_wt() {
-		test_orphan_error() {
-			test_must_fail git $* 2>actual &&
-			test_grep "no commit on branch .orphan-branch. yet$" actual
-		} &&
-		test_orphan_error -C wt branch $1 $2 &&                # implicit branch
-		test_orphan_error -C wt branch $1 orphan-branch $2 &&  # explicit branch
-		test_orphan_error branch $1 orphan-branch $2           # different worktree
-	} &&
-	test_branch_op_in_wt --edit-description &&
-	test_branch_op_in_wt --set-upstream-to=ne &&
-	test_branch_op_in_wt -c new-branch
-
-Preparing worktree (detached HEAD 3b327e0)
-HEAD is now at 3b327e0 branch10
-Switched to a new branch 'orphan-branch'
-error: no commit on branch 'orphan-branch' yet
-error: no commit on branch 'orphan-branch' yet
-error: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-fatal: no commit on branch 'orphan-branch' yet
-ok 24 - error descriptions on orphan branch
-
-expecting success of 3202.25 'setup reflogs': 
-	test_commit base &&
-	git checkout -b branch &&
-	test_commit one &&
-	git reset --hard HEAD^ &&
-	test_commit two &&
-	test_commit three
-
-[branch10 4c99dd1] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'branch'
-[branch 6203781] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-HEAD is now at 4c99dd1 base
-[branch 9c7919e] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[branch 0d1aba5] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 25 - setup reflogs
-
-expecting success of 3202.26 '--reflog shows reflog entries': 
-	cat >expect <<-\EOF &&
-	! [branch@{0}] (0 seconds ago) commit: three
-	 ! [branch@{1}] (60 seconds ago) commit: two
-	  ! [branch@{2}] (2 minutes ago) reset: moving to HEAD^
-	   ! [branch@{3}] (2 minutes ago) commit: one
-	----
-	+    [branch@{0}] three
-	++   [branch@{1}] two
-	   + [branch@{3}] one
-	++++ [branch@{2}] base
-	EOF
-	# the output always contains relative timestamps; use
-	# a known time to get deterministic results
-	GIT_TEST_DATE_NOW=$test_tick \
-	git show-branch --reflog branch >actual &&
-	test_cmp expect actual
-
-ok 26 - --reflog shows reflog entries
-
-expecting success of 3202.27 '--reflog handles missing reflog': 
-	git reflog expire --expire=now branch &&
-	git show-branch --reflog branch >actual &&
-	test_must_be_empty actual
-
-No revs to be shown.
-ok 27 - --reflog handles missing reflog
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3204-branch-name-interpretation.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3204-branch-name-interpretation/.git/
-expecting success of 3204.1 'set up repo': 
-	test_commit one &&
-	test_commit two &&
-	git remote add origin foo.git
-
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 1 - set up repo
-
-expecting success of 3204.2 'update branch via @{-1}': 
-	git branch previous one &&
-
-	git checkout previous &&
-	git checkout main &&
-
-	git branch -f @{-1} two &&
-	expect_branch previous two
-
-Switched to branch 'previous'
-Switched to branch 'main'
-ok 2 - update branch via @{-1}
-
-expecting success of 3204.3 'update branch via local @{upstream}': 
-	git branch local one &&
-	git branch --set-upstream-to=local &&
-
-	git branch -f @{upstream} two &&
-	expect_branch local two
-
-branch 'main' set up to track 'local'.
-ok 3 - update branch via local @{upstream}
-
-expecting success of 3204.4 'disallow updating branch via remote @{upstream}': 
-	git update-ref refs/remotes/origin/remote one &&
-	git branch --set-upstream-to=origin/remote &&
-
-	test_must_fail git branch -f @{upstream} two
-
-branch 'main' set up to track 'origin/remote'.
-fatal: '@{upstream}' is not a valid branch name
-hint: See `man git check-ref-format`
-hint: Disable this message with "git config advice.refSyntax false"
-ok 4 - disallow updating branch via remote @{upstream}
-
-expecting success of 3204.5 'create branch with pseudo-qualified name': 
-	git branch refs/heads/qualified two &&
-	expect_branch refs/heads/refs/heads/qualified two
-
-ok 5 - create branch with pseudo-qualified name
-
-expecting success of 3204.6 'force-copy a branch to itself via @{-1} is no-op': 
-	git branch -t copiable main &&
-	git checkout copiable &&
-	git checkout - &&
-	git branch -C @{-1} copiable &&
-	git config --get-all branch.copiable.merge >actual &&
-	echo refs/heads/main >expect &&
-	test_cmp expect actual
-
-branch 'copiable' set up to track 'main'.
-Switched to branch 'copiable'
-Your branch is up to date with 'main'.
-Switched to branch 'main'
-Your branch is ahead of 'origin/remote' by 1 commit.
-  (use "git push" to publish your local commits)
-ok 6 - force-copy a branch to itself via @{-1} is no-op
-
-expecting success of 3204.7 'delete branch via @{-1}': 
-	git branch previous-del &&
-
-	git checkout previous-del &&
-	git checkout main &&
-
-	git branch -D @{-1} &&
-	expect_deleted previous-del
-
-Switched to branch 'previous-del'
-Switched to branch 'main'
-Your branch is ahead of 'origin/remote' by 1 commit.
-  (use "git push" to publish your local commits)
-Deleted branch previous-del (was 139b20d).
-fatal: Needed a single revision
-ok 7 - delete branch via @{-1}
-
-expecting success of 3204.8 'delete branch via local @{upstream}': 
-	git branch local-del &&
-	git branch --set-upstream-to=local-del &&
-
-	git branch -D @{upstream} &&
-	expect_deleted local-del
-
-branch 'main' set up to track 'local-del'.
-Deleted branch local-del (was 139b20d).
-fatal: Needed a single revision
-ok 8 - delete branch via local @{upstream}
-
-expecting success of 3204.9 'delete branch via remote @{upstream}': 
-	git update-ref refs/remotes/origin/remote-del two &&
-	git branch --set-upstream-to=origin/remote-del &&
-
-	git branch -r -D @{upstream} &&
-	expect_deleted origin/remote-del
-
-branch 'main' set up to track 'origin/remote-del'.
-Deleted remote-tracking branch origin/remote-del (was 139b20d).
-fatal: Needed a single revision
-ok 9 - delete branch via remote @{upstream}
-
-expecting success of 3204.10 'delete @{upstream} expansion matches -r option': 
-	git update-ref refs/remotes/origin/remote-del two &&
-	git branch --set-upstream-to=origin/remote-del &&
-	git update-ref refs/heads/origin/remote-del two &&
-	git update-ref refs/heads/remotes/origin/remote-del two &&
-
-	test_must_fail git branch -D @{upstream} &&
-	expect_branch refs/heads/origin/remote-del two &&
-	expect_branch refs/heads/remotes/origin/remote-del two
-
-branch 'main' set up to track 'origin/remote-del'.
-error: branch '@{upstream}' not found
-ok 10 - delete @{upstream} expansion matches -r option
-
-expecting success of 3204.11 'disallow deleting remote branch via @{-1}': 
-	git update-ref refs/remotes/origin/previous one &&
-
-	git checkout -b origin/previous two &&
-	git checkout main &&
-
-	test_must_fail git branch -r -D @{-1} &&
-	expect_branch refs/remotes/origin/previous one &&
-	expect_branch refs/heads/origin/previous two
-
-Switched to a new branch 'origin/previous'
-Switched to branch 'main'
-Your branch is up to date with 'remotes/origin/remote-del'.
-error: remote-tracking branch '@{-1}' not found
-ok 11 - disallow deleting remote branch via @{-1}
-
-expecting success of 3204.12 'create branch named "@"': 
-	git branch -f @ one &&
-	expect_branch refs/heads/@ one
-
-ok 12 - create branch named "@"
-
-expecting success of 3204.13 'delete branch named "@"': 
-	git update-ref refs/heads/@ two &&
-	git branch -D @ &&
-	expect_deleted refs/heads/@
-
-Deleted branch @ (was 139b20d).
-fatal: Needed a single revision
-ok 13 - delete branch named "@"
-
-expecting success of 3204.14 'checkout does not treat remote @{upstream} as a branch': 
-	git update-ref refs/remotes/origin/checkout one &&
-	git branch --set-upstream-to=origin/checkout &&
-	git update-ref refs/heads/origin/checkout two &&
-	git update-ref refs/heads/remotes/origin/checkout two &&
-
-	git checkout @{upstream} &&
-	expect_branch HEAD one
-
-branch 'main' set up to track 'origin/checkout'.
-warning: refname '@{upstream}' is ambiguous.
-Note: switching to '@{upstream}'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at d79ce16 one
-ok 14 - checkout does not treat remote @{upstream} as a branch
-
-expecting success of 3204.15 'edit-description via @{-1}': 
-	git checkout -b desc-branch &&
-	git checkout -b non-desc-branch &&
-	write_script editor <<-\EOF &&
-		echo "Branch description" >"$1"
-	EOF
-	EDITOR=./editor git branch --edit-description @{-1} &&
-	test_must_fail git config branch.non-desc-branch.description &&
-	git config branch.desc-branch.description >actual &&
-	printf "Branch description\n\n" >expect &&
-	test_cmp expect actual
-
-Switched to a new branch 'desc-branch'
-Switched to a new branch 'non-desc-branch'
-ok 15 - edit-description via @{-1}
-
-expecting success of 3204.16 'modify branch upstream via "@{-1}" and "@{-1}@{upstream}"': 
-	git checkout -b upstream-branch &&
-	git checkout -b upstream-other -t upstream-branch &&
-	git branch --set-upstream-to upstream-other @{-1} &&
-	git config branch.upstream-branch.merge >actual &&
-	echo "refs/heads/upstream-other" >expect &&
-	test_cmp expect actual &&
-	git branch --unset-upstream @{-1}@{upstream} &&
-	test_must_fail git config branch.upstream-other.merge
-
-Switched to a new branch 'upstream-branch'
-Switched to a new branch 'upstream-other'
-branch 'upstream-other' set up to track 'upstream-branch'.
-branch 'upstream-branch' set up to track 'upstream-other'.
-ok 16 - modify branch upstream via "@{-1}" and "@{-1}@{upstream}"
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3205-branch-color.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3205-branch-color/.git/
 expecting success of 3205.1 'set up some sample branches': 
@@ -125791,221 +127191,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3300-funny-names.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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" || :; }
-
-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
-
-ok 11 - diff-tree -z does not quote funny filename
-
-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
-
-ok 12 - diff-tree --find-copies-harder quotes funny filename
-
-expecting success of 3300.13 'setup: remove unfunny index entry': 
-	git update-index --force-remove "$p0"
-
-ok 13 - setup: remove unfunny index entry
-
-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
-
-ok 14 - diff-tree -M quotes funny filename
-
-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
-
-ok 15 - diff-index -M -p quotes funny filename
-
-expecting success of 3300.16 'setup: mode change': 
-	chmod +x "$p1"
-
-ok 16 - setup: mode change
-
-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
-
-ok 17 - diff-index -M -p with mode change quotes funny filename
-
-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
-
-ok 18 - diffstat for rename quotes funny filename
-
-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
-
-ok 19 - numstat for rename quotes funny filename
-
-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
-
-ok 20 - numstat without -M quotes funny filename
-
-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
-
-ok 21 - numstat for non-git rename diff quotes funny filename
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3200-branch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3200-branch/.git/
 expecting success of 3200.1 'prepare a trivial repository': 
@@ -128590,66 +129775,219 @@
 1..166
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3302-notes-index-expensive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3302-notes-index-expensive/10/.git/
-ok 1 - setup 10
+*** t3300-funny-names.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-expecting success of 3302.2 'notes work': 
-		(
-			cd "$count" &&
-			test_notes "$count"
-		)
-	
-ok 2 - notes work
+	{ cat "$p0" >"$p1" || :; } &&
+	{ echo "Foo Bar Baz" >"$p2" || :; }
 
-checking prerequisite: USR_BIN_TIME
+ok 1 - setup
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
-	test -x /usr/bin/time
+expecting success of 3300.2 'setup: populate index and tree': 
+	git update-index --add "$p0" "$p2" &&
+	t0=$(git write-tree)
 
-)
-prerequisite USR_BIN_TIME not satisfied
-ok 3 # skip notes timing with /usr/bin/time (missing USR_BIN_TIME)
+ok 2 - setup: populate index and tree
 
-checking prerequisite: EXPENSIVE
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
+ok 3 - ls-files prints space in filename verbatim
 
-)
-prerequisite EXPENSIVE not satisfied
-ok 4 # skip setup 100 (missing EXPENSIVE)
+expecting success of 3300.4 'setup: add funny filename': 
+	git update-index --add "$p1" &&
+	t1=$(git write-tree)
 
-ok 5 # skip notes work (missing EXPENSIVE)
+ok 4 - setup: add funny filename
 
-ok 6 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
+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 7 # skip setup 1000 (missing EXPENSIVE)
+ok 5 - ls-files quotes funny filename
 
-ok 8 # skip notes work (missing EXPENSIVE)
+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 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
+ok 6 - ls-files -z does not quote funny filename
 
-ok 10 # skip setup 10000 (missing EXPENSIVE)
+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 11 # skip notes work (missing EXPENSIVE)
+ok 7 - ls-tree quotes funny filename
 
-ok 12 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
+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
 
-# passed all 12 test(s)
-1..12
+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
+
+ok 11 - diff-tree -z does not quote funny filename
+
+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
+
+ok 12 - diff-tree --find-copies-harder quotes funny filename
+
+expecting success of 3300.13 'setup: remove unfunny index entry': 
+	git update-index --force-remove "$p0"
+
+ok 13 - setup: remove unfunny index entry
+
+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
+
+ok 14 - diff-tree -M quotes funny filename
+
+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
+
+ok 15 - diff-index -M -p quotes funny filename
+
+expecting success of 3300.16 'setup: mode change': 
+	chmod +x "$p1"
+
+ok 16 - setup: mode change
+
+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
+
+ok 17 - diff-index -M -p with mode change quotes funny filename
+
+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
+
+ok 18 - diffstat for rename quotes funny filename
+
+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
+
+ok 19 - numstat for rename quotes funny filename
+
+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
+
+ok 20 - numstat without -M quotes funny filename
+
+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
+
+ok 21 - numstat for non-git rename diff quotes funny filename
+
+# passed all 21 test(s)
+1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3207-branch-submodule.sh ***
@@ -128871,8 +130209,8 @@
 submodule 'sub': creating branch 'branch-a'
 submodule 'sub': submodule 'sub-sub': creating branch 'branch-a'
 3d579b43f314a4988559e2acf30cd02799e765b0
---- expected	2025-12-18 01:33:46.878773267 +0000
-+++ actual-old-branch-a	2025-12-18 01:33:46.922773267 +0000
+--- expected	2024-11-14 19:30:39.230377076 +0000
++++ actual-old-branch-a	2024-11-14 19:30:39.342378217 +0000
 @@ -1 +1 @@
 -201498bd55475d67a59e9e957f60405b878d5656
 +1de21e3f64bec8ea3b5924bf9a4d3986a4ddeba2
@@ -129198,6 +130536,68 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3302-notes-index-expensive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3302-notes-index-expensive/10/.git/
+ok 1 - setup 10
+
+expecting success of 3302.2 'notes work': 
+		(
+			cd "$count" &&
+			test_notes "$count"
+		)
+	
+ok 2 - notes work
+
+checking prerequisite: USR_BIN_TIME
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-USR_BIN_TIME" &&
+	test -x /usr/bin/time
+
+)
+prerequisite USR_BIN_TIME not satisfied
+ok 3 # skip notes timing with /usr/bin/time (missing USR_BIN_TIME)
+
+checking prerequisite: EXPENSIVE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
+
+)
+prerequisite EXPENSIVE not satisfied
+ok 4 # skip setup 100 (missing EXPENSIVE)
+
+ok 5 # skip notes work (missing EXPENSIVE)
+
+ok 6 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
+
+ok 7 # skip setup 1000 (missing EXPENSIVE)
+
+ok 8 # skip notes work (missing EXPENSIVE)
+
+ok 9 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
+
+ok 10 # skip setup 10000 (missing EXPENSIVE)
+
+ok 11 # skip notes work (missing EXPENSIVE)
+
+ok 12 # skip notes timing with /usr/bin/time (missing EXPENSIVE,USR_BIN_TIME of USR_BIN_TIME,EXPENSIVE)
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3304-notes-mixed.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3304-notes-mixed/.git/
 expecting success of 3304.1 'setup: create a couple of commits': 
@@ -146510,2005 +147910,158 @@
 1..228
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t2013-checkout-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
+*** t3306-notes-prune.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3306-notes-prune/.git/
+expecting success of 3306.1 'setup: create a few commits with notes': 
+
+	: > file1 &&
+	git add file1 &&
 	test_tick &&
-	git commit -m superproject &&
-	(cd submodule &&
-	 test_commit second) &&
-	git add submodule &&
+	git commit -m 1st &&
+	git notes add -m "Note #1" &&
+	first=$(git rev-parse HEAD) &&
+	: > file2 &&
+	git add file2 &&
 	test_tick &&
-	git commit -m updated.superproject
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+	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 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.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub2/.git/
-[master (root-commit) f2c1bb9] nested submodule base
+[master (root-commit) ab5f302] 1st
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
+ 1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_repo/.git/
-[master (root-commit) 3950f7e] Base
+[master 08341ad] 2nd
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
+ 1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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
+[master 5ee1c35] 3rd
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
  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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
-Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
-Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '50491a1d91d7be663c2f0e01632adafaa8ad1784'
-Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+ok 1 - setup: create a few commits with notes
 
-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 3306.2 'verify commits and notes': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	git log > actual &&
+	test_cmp expect actual
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/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
+ok 2 - verify commits and notes
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 3306.3 'remove some commits': 
 
-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
+	git reset --hard HEAD~1 &&
+	git reflog expire --expire=now HEAD &&
+	git gc --prune=now
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+HEAD is now at 08341ad 2nd
+ok 3 - remove some commits
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 3306.4 'verify that commits are gone': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	test_must_fail git cat-file -p $third &&
+	git cat-file -p $second &&
+	git cat-file -p $first
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
+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
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
+2nd
+tree ad24149d789e59d4b5f9ce41cda90110ca0f98b7
+author A U Thor <author@example.com> 1112911993 -0700
+committer C O Mitter <committer@example.com> 1112911993 -0700
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
+1st
+ok 4 - verify that commits are gone
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 3306.5 'verify that notes are still present': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	git notes show $third &&
+	git notes show $second &&
+	git notes show $first
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+Note #3
+Note #2
+Note #1
+ok 5 - verify that notes are still present
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 3306.6 'prune -n does not remove notes': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	git notes list > expect &&
+	git notes prune -n &&
+	git notes list > actual &&
+	test_cmp expect actual
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
+ok 6 - prune -n does not remove notes
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 3306.7 'prune -n lists prunable notes': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	echo $third >expect &&
+	git notes prune -n > actual &&
+	test_cmp expect actual
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
+ok 7 - prune -n lists prunable notes
 
-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 3306.8 'prune notes': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	git notes prune
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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 8 - prune notes
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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 3306.9 'verify that notes are gone': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	test_must_fail git notes show $third &&
+	git notes show $second &&
+	git notes show $first
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+error: no note found for object 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29.
+Note #2
+Note #1
+ok 9 - verify that notes are gone
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+expecting success of 3306.10 'remove some commits': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	git reset --hard HEAD~1 &&
+	git reflog expire --expire=now HEAD &&
+	git gc --prune=now
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+HEAD is now at ab5f302 1st
+ok 10 - remove some commits
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 3306.11 'prune -v notes': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	echo $second >expect &&
+	git notes prune -v > actual &&
+	test_cmp expect actual
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+ok 11 - prune -v notes
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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 3306.12 'verify that notes are gone': 
 
-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.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t2013-checkout-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	test_must_fail git notes show $third &&
+	test_must_fail git notes show $second &&
+	git notes show $first
 
-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
+error: no note found for object 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29.
+error: no note found for object 08341ad9e94faa089d60fd3f523affb25c6da189.
+Note #1
+ok 12 - verify that notes are gone
 
-# still have 10 known breakage(s)
-# passed all remaining 64 test(s)
-1..74
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3307-notes-man.sh ***
@@ -148579,270 +148132,247 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3303-notes-subtrees.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3303-notes-subtrees/.git/
-expecting success of 3303.1 'setup: create 100 commits': 
-
-	(
-		nr=0 &&
-		while [ $nr -lt $number_of_commits ]; do
-			nr=$(($nr+1)) &&
-			test_tick &&
-			cat <<INPUT_END || return 1
-commit refs/heads/main
-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-data <<COMMIT
-commit #$nr
-COMMIT
-
-M 644 inline file
-data <<EOF
-file in commit #$nr
-EOF
-
-INPUT_END
-
-		done &&
-		test_tick &&
-		cat <<INPUT_END
-commit refs/notes/commits
-committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-data <<COMMIT
-no notes
-COMMIT
-
-deleteall
-
-INPUT_END
-
-	) |
-	git fast-import --quiet &&
-	git config core.notesRef refs/notes/commits
-
-ok 1 - setup: create 100 commits
-
-expecting success of 3303.2 'test notes in 2/38-fanout': test_sha1_based "s|^..|&/|"
-ok 2 - test notes in 2/38-fanout
-
-expecting success of 3303.3 'verify notes in 2/38-fanout': verify_notes
-ok 3 - verify notes in 2/38-fanout
-
-expecting success of 3303.4 'test notes in 2/2/36-fanout': test_sha1_based "s|^\(..\)\(..\)|\1/\2/|"
-ok 4 - test notes in 2/2/36-fanout
-
-expecting success of 3303.5 'verify notes in 2/2/36-fanout': verify_notes
-ok 5 - verify notes in 2/2/36-fanout
-
-expecting success of 3303.6 'test notes in 2/2/2/34-fanout': test_sha1_based "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
-ok 6 - test notes in 2/2/2/34-fanout
-
-expecting success of 3303.7 'verify notes in 2/2/2/34-fanout': verify_notes
-ok 7 - verify notes in 2/2/2/34-fanout
-
-expecting success of 3303.8 'test same notes in no fanout and 2/38-fanout': test_same_notes "s|^..|&/|" ""
-ok 8 - test same notes in no fanout and 2/38-fanout
-
-expecting success of 3303.9 'verify same notes in no fanout and 2/38-fanout': verify_notes
-ok 9 - verify same notes in no fanout and 2/38-fanout
-
-expecting success of 3303.10 'test same notes in no fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" ""
-ok 10 - test same notes in no fanout and 2/2/36-fanout
-
-expecting success of 3303.11 'verify same notes in no fanout and 2/2/36-fanout': verify_notes
-ok 11 - verify same notes in no fanout and 2/2/36-fanout
-
-expecting success of 3303.12 'test same notes in 2/38-fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
-ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout
-
-expecting success of 3303.13 'verify same notes in 2/38-fanout and 2/2/36-fanout': verify_notes
-ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout
-
-expecting success of 3303.14 'test same notes in 2/2/2/34-fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
-ok 14 - test same notes in 2/2/2/34-fanout and 2/2/36-fanout
-
-expecting success of 3303.15 'verify same notes in 2/2/2/34-fanout and 2/2/36-fanout': verify_notes
-ok 15 - verify same notes in 2/2/2/34-fanout and 2/2/36-fanout
-
-expecting success of 3303.16 'test notes in no fanout concatenated with 2/38-fanout': test_concatenated_notes "s|^..|&/|" ""
-ok 16 - test notes in no fanout concatenated with 2/38-fanout
-
-expecting success of 3303.17 'verify notes in no fanout concatenated with 2/38-fanout': verify_concatenated_notes
-ok 17 - verify notes in no fanout concatenated with 2/38-fanout
-
-expecting success of 3303.18 'test notes in no fanout concatenated with 2/2/36-fanout': test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" ""
-ok 18 - test notes in no fanout concatenated with 2/2/36-fanout
-
-expecting success of 3303.19 'verify notes in no fanout concatenated with 2/2/36-fanout': verify_concatenated_notes
-ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout
-
-expecting success of 3303.20 'test notes in 2/38-fanout concatenated with 2/2/36-fanout': test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
-ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout
-
-expecting success of 3303.21 'verify notes in 2/38-fanout concatenated with 2/2/36-fanout': verify_concatenated_notes
-ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout
-
-expecting success of 3303.22 'test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout': test_concatenated_notes "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|" "s|^\(..\)\(..\)|\1/\2/|"
-ok 22 - test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
-
-expecting success of 3303.23 'verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout': verify_concatenated_notes
-ok 23 - verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
+*** t3308-notes-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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/* &&
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3306-notes-prune.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3306-notes-prune/.git/
-expecting success of 3306.1 'setup: create a few commits with notes': 
+	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
 
-	: > 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"
+	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) ab5f302] 1st
+[master (root-commit) 04ed9a0] 1st
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file1
-[master 08341ad] 2nd
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1st.t
+[master 7a4ca6e] 2nd
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file2
-[master 5ee1c35] 3rd
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2nd.t
+[master d07d62e] 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
+ 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
+From .
+ * [new ref]         refs/notes/x -> refs/remote-notes/origin/x
+ok 1 - setup
 
-expecting success of 3306.2 'verify commits and notes': 
+expecting success of 3308.2 'verify initial notes (x)': 
+	verify_notes x
 
-	git log > actual &&
-	test_cmp expect actual
+ok 2 - verify initial notes (x)
 
-ok 2 - verify commits and notes
+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
 
-expecting success of 3306.3 'remove some commits': 
+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)
 
-	git reset --hard HEAD~1 &&
-	git reflog expire --expire=now HEAD &&
-	git gc --prune=now
+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
 
-HEAD is now at 08341ad 2nd
-ok 3 - remove some commits
+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 3306.4 'verify that commits are gone': 
+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)"
 
-	test_must_fail git cat-file -p $third &&
-	git cat-file -p $second &&
-	git cat-file -p $first
+ok 5 - merge non-notes ref into empty notes ref (remote-notes/origin/x => v)
 
-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
+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)"
 
-2nd
-tree ad24149d789e59d4b5f9ce41cda90110ca0f98b7
-author A U Thor <author@example.com> 1112911993 -0700
-committer C O Mitter <committer@example.com> 1112911993 -0700
+ok 6 - merge notes into empty notes ref (x => y)
 
-1st
-ok 4 - verify that commits are gone
+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 3306.5 'verify that notes are still present': 
+ok 7 - merge empty notes ref (z => y)
 
-	git notes show $third &&
-	git notes show $second &&
-	git notes show $first
+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
 
-Note #3
-Note #2
-Note #1
-ok 5 - verify that notes are still present
+Removing note for object 2nd
+Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
+ok 8 - change notes on other notes ref (y)
 
-expecting success of 3306.6 'prune -n does not remove notes': 
+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)"
 
-	git notes list > expect &&
-	git notes prune -n &&
-	git notes list > actual &&
-	test_cmp expect actual
+Already up to date.
+ok 9 - merge previous notes commit (y^ => y) => No-op
 
-5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29
-ok 6 - prune -n does not remove notes
+expecting success of 3308.10 'verify changed notes on other notes ref (y)': 
+	verify_notes y
 
-expecting success of 3306.7 'prune -n lists prunable notes': 
+ok 10 - verify changed notes on other notes ref (y)
 
-	echo $third >expect &&
-	git notes prune -n > actual &&
-	test_cmp expect actual
+expecting success of 3308.11 'verify unchanged notes on original notes ref (x)': 
+	verify_notes x
 
-ok 7 - prune -n lists prunable notes
+ok 11 - verify unchanged notes on original notes ref (x)
 
-expecting success of 3306.8 'prune notes': 
+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
 
-	git notes prune
+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
 
-ok 8 - prune notes
+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 3306.9 'verify that notes are gone': 
+Fast-forward
+ok 13 - merge changed (y) into original (x) => Fast-forward
 
-	test_must_fail git notes show $third &&
-	git notes show $second &&
-	git notes show $first
+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)"
 
-error: no note found for object 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29.
-Note #2
-Note #1
-ok 9 - verify that notes are gone
+Removing note for object HEAD
+ok 14 - merge empty notes ref (z => y)
 
-expecting success of 3306.10 'remove some commits': 
+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
 
-	git reset --hard HEAD~1 &&
-	git reflog expire --expire=now HEAD &&
-	git gc --prune=now
+ok 15 - change notes on other notes ref (y)
 
-HEAD is now at ab5f302 1st
-ok 10 - remove some commits
+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 3306.11 'prune -v notes': 
+Removing note for object 3rd
+ok 16 - change notes on notes ref (x)
 
-	echo $second >expect &&
-	git notes prune -v > actual &&
-	test_cmp expect actual
+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 11 - prune -v notes
+ok 17 - merge y into x => Non-conflicting 3-way merge
 
-expecting success of 3306.12 'verify that notes are gone': 
+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
 
-	test_must_fail git notes show $third &&
-	test_must_fail git notes show $second &&
-	git notes show $first
+ok 18 - create notes on new, separate notes ref (w)
 
-error: no note found for object 5ee1c35e83ea47cd3cc4f8cbee0568915fbbbd29.
-error: no note found for object 08341ad9e94faa089d60fd3f523affb25c6da189.
-Note #1
-ok 12 - verify that notes are gone
+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
 
-# passed all 12 test(s)
-1..12
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3301-notes.sh ***
@@ -151012,47 +150542,83 @@
 1..148
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3308-notes-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3308-notes-merge/.git/
-expecting success of 3308.1 'setup': 
+*** t3309-notes-merge-auto-resolve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
-	# 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_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
-	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
+	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
 
-	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
+	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
@@ -151075,283 +150641,357 @@
  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
+[master 2c12533] 6th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6th.t
+[master fb01e0c] 7th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7th.t
+[master 9a4c31c] 8th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8th.t
+[master 2e0db4b] 9th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9th.t
+[master 7c3b87a] 10th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10th.t
+[master a446fff] 11th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11th.t
+[master 65e263d] 12th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12th.t
+[master e871aa6] 13th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13th.t
+[master 07c85d7] 14th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14th.t
+[master 4acf42e] 15th
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 15th.t
+ok 1 - setup commits
 
-expecting success of 3308.2 'verify initial notes (x)': 
-	verify_notes x
+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 - verify initial notes (x)
+ok 2 - setup merge base (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
+expecting success of 3309.3 'verify state of merge base (x)': verify_notes x x
+ok 3 - verify state of merge base (x)
 
-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 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 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
+Removing note for object 6th
+Removing note for object 7th
+Removing note for object 8th
+Overwriting existing notes for object 65e263ded02ae4e8839bc151095113737579dc12
+Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
+Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
+Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+ok 4 - setup local branch (y)
 
-fatal: refusing to 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 3309.5 'verify state of local branch (y)': verify_notes y y
+ok 5 - verify state of local branch (y)
 
-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 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
 
-ok 5 - merge non-notes ref into empty notes ref (remote-notes/origin/x => v)
+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 3308.6 'merge notes into empty notes ref (x => y)': 
+expecting success of 3309.7 'verify state of remote branch (z)': verify_notes z z
+ok 7 - verify state of remote branch (z)
+
+expecting success of 3309.8 'merge z into y with invalid strategy => Fail/No changes': 
 	git config core.notesRef refs/notes/y &&
-	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)"
+	test_must_fail git notes merge --strategy=foo z &&
+	# Verify no changes (y)
+	verify_notes y y
 
-ok 6 - merge notes into empty notes ref (x => y)
+error: unknown -s/--strategy: foo
+usage: git notes merge [<options>] <notes-ref>
+   or: git notes merge --commit [<options>]
+   or: git notes merge --abort [<options>]
 
-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)"
+General options
+    -v, --[no-]verbose    be more verbose
+    -q, --[no-]quiet      be more quiet
 
-ok 7 - merge empty notes ref (z => y)
+Merge options
+    -s, --[no-]strategy <strategy>
+                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
 
-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
+Committing unmerged notes
+    --commit              finalize notes merge by committing unmerged notes
 
-Removing note for object 2nd
-Overwriting existing notes for object 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11
-ok 8 - change notes on other notes ref (y)
+Aborting notes merge resolution
+    --abort               abort notes merge
 
-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)"
+ok 8 - merge z into y with invalid strategy => Fail/No changes
 
-Already up to date.
-ok 9 - merge previous notes commit (y^ => y) => No-op
+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 3308.10 'verify changed notes on other notes ref (y)': 
-	verify_notes y
+ok 9 - merge z into y with invalid configuration option => Fail/No changes
 
-ok 10 - verify changed notes on other notes ref (y)
+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 3308.11 'verify unchanged notes on original notes ref (x)': 
-	verify_notes x
+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
 
-ok 11 - verify unchanged notes on original notes ref (x)
+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 3308.12 'merge original notes (x) into changed notes (y) => No-op': 
-	git notes merge -vvv x &&
-	verify_notes y &&
-	verify_notes x
+ok 11 - reset to pre-merge state (y)
 
-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 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 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)"
+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
 
-Fast-forward
-ok 13 - merge changed (y) into original (x) => Fast-forward
+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 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)"
+ok 13 - reset to pre-merge state (y)
 
-Removing note for object HEAD
-ok 14 - merge empty notes ref (z => y)
+expecting success of 3309.14 'merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge': 
+	git -c notes.y.mergeStrategy="ours" notes merge z &&
+	verify_notes y ours
 
-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
+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 15 - change notes on other notes ref (y)
+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 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
+ok 15 - reset to pre-merge state (y)
 
-Removing note for object 3rd
-ok 16 - change notes on notes ref (x)
+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 3308.17 'merge y into x => Non-conflicting 3-way merge': 
-	git notes merge y &&
-	verify_notes x &&
-	verify_notes y
+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 17 - merge y into x => Non-conflicting 3-way merge
+expecting success of 3309.17 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-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 17 - reset to pre-merge state (y)
 
-ok 18 - create notes on new, separate notes ref (w)
+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 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
+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
 
-ok 19 - merge w into x => Non-conflicting history-less merge
+expecting success of 3309.19 'reset to pre-merge state (y)': 
+	git update-ref refs/notes/y refs/notes/y^1 &&
+	# Verify pre-merge state
+	verify_notes y y
 
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3320-notes-merge-worktrees.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3320-notes-merge-worktrees/.git/
-expecting success of 3320.1 'setup commit': 
-	test_commit tantrum
+ok 19 - reset to pre-merge state (y)
 
-[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 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 3320.2 'setup notes ref (x)': 
-	git config core.notesRef refs/notes/x &&
-	git notes add -m "x notes on tantrum" tantrum
+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
 
-ok 2 - setup notes ref (x)
+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 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
+ok 21 - reset to pre-merge state (y)
 
-Removing note for object tantrum
-ok 3 - setup local branch (y)
+expecting success of 3309.22 'merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge': 
+	git -c notes.y.mergeStrategy="theirs" notes merge --strategy=union z &&
+	verify_notes y union
 
-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
+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
 
-Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 4 - setup remote branch (z)
+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 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
+ok 23 - reset to pre-merge state (y)
 
-Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 5 - modify notes ref ourselves (x)
+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 3320.6 'create some new worktrees': 
-	git worktree add -b newbranch worktree main &&
-	git worktree add -b newbranch2 worktree2 main
+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
 
-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 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 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
+ok 25 - reset to pre-merge state (y)
+
+expecting success of 3309.26 'merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge': 
+	test_must_fail git -c notes.z.mergeStrategy="union" notes merge z &&
+	git notes merge --abort &&
+	verify_notes y y
 
 Automatic notes merge failed. Fix conflicts in .git/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 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
+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 3320.8 'merge z into y while mid-merge in another workdir fails': 
-	(
-		cd worktree &&
-		git config core.notesRef refs/notes/y &&
-		test_must_fail git notes merge z 2>err &&
-		test_grep "a notes merge into refs/notes/y is already in-progress at" err
-	) &&
-	test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF
+expecting success of 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
 
-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.45.2/t/trash directory.t3320-notes-merge-worktrees
-fatal: ref NOTES_MERGE_REF is not a symbolic ref
-ok 8 - merge z into y while mid-merge in another workdir fails
+Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 27 - merge y into z with "union" strategy => Non-conflicting 3-way merge
 
-expecting success of 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
+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
 
-Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.45.2/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.45.2/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
-Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-CONFLICT (content): Merge conflict in notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
-ok 9 - merge z into x while mid-merge on y succeeds
+ok 28 - reset to pre-merge state (z)
 
-# passed all 9 test(s)
-1..9
+expecting success of 3309.29 'merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge': 
+	git notes merge --strategy=cat_sort_uniq y &&
+	verify_notes z cat_sort_uniq
+
+Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 29 - merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge
+
+expecting success of 3309.30 'reset to pre-merge state (z)': 
+	git update-ref refs/notes/z refs/notes/z^1 &&
+	# Verify pre-merge state
+	verify_notes z z
+
+ok 30 - reset to pre-merge state (z)
+
+expecting success of 3309.31 'merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge': 
+	git -c notes.mergeStrategy="cat_sort_uniq" notes merge y &&
+	verify_notes z cat_sort_uniq
+
+Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
+Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
+Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
+Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
+ok 31 - merge y into z with "cat_sort_uniq" strategy configuration option => Non-conflicting 3-way merge
+
+# passed all 31 test(s)
+1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3310-notes-merge-manual-resolve.sh ***
@@ -151799,456 +151439,103 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3309-notes-merge-auto-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t3320-notes-merge-worktrees.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3320-notes-merge-worktrees/.git/
+expecting success of 3320.1 'setup commit': 
+	test_commit tantrum
 
-[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
+[main (root-commit) 02f8a63] tantrum
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 15th.t
-ok 1 - setup commits
+ create mode 100644 tantrum.t
+ok 1 - setup commit
 
-expecting success of 3309.2 'setup merge base (x)': 
+expecting success of 3320.2 'setup notes ref (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)
+	git notes add -m "x notes on tantrum" tantrum
 
-expecting success of 3309.3 'verify state of merge base (x)': verify_notes x x
-ok 3 - verify state of merge base (x)
+ok 2 - setup notes ref (x)
 
-expecting success of 3309.4 'setup local branch (y)': 
+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 add -f -m "y notes on 3rd commit" 3rd &&
-	git notes add -f -m "y notes on 4th commit" 4th &&
-	git notes add -f -m "y notes on 5th commit" 5th &&
-	git notes remove 6th &&
-	git notes remove 7th &&
-	git notes remove 8th &&
-	git notes add -f -m "y notes on 12th commit" 12th &&
-	git notes add -f -m "y notes on 13th commit" 13th &&
-	git notes add -f -m "y notes on 14th commit" 14th &&
-	git notes add -f -m "y notes on 15th commit" 15th
-
-Removing note for object 6th
-Removing note for object 7th
-Removing note for object 8th
-Overwriting existing notes for object 65e263ded02ae4e8839bc151095113737579dc12
-Overwriting existing notes for object e871aa61182b1d95d0a6fb75445d891722863b6b
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-ok 4 - setup local branch (y)
+	git notes remove tantrum
 
-expecting success of 3309.5 'verify state of local branch (y)': verify_notes y y
-ok 5 - verify state of local branch (y)
+Removing note for object tantrum
+ok 3 - setup local branch (y)
 
-expecting success of 3309.6 'setup remote branch (z)': 
+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 "z notes on 2nd commit" 2nd &&
-	git notes add -f -m "y notes on 4th commit" 4th &&
-	git notes add -f -m "z notes on 5th commit" 5th &&
-	git notes remove 6th &&
-	git notes add -f -m "z notes on 8th commit" 8th &&
-	git notes remove 9th &&
-	git notes add -f -m "z notes on 11th commit" 11th &&
-	git notes remove 12th &&
-	git notes add -f -m "y notes on 14th commit" 14th &&
-	git notes add -f -m "z notes on 15th commit" 15th
-
-Removing note for object 6th
-Overwriting existing notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-Removing note for object 9th
-Overwriting existing notes for object a446fff8777efdc6eb8f4b7c8a5ff699484df0d5
-Removing note for object 12th
-Overwriting existing notes for object 07c85d77059393ed0154b8c96906547a59dfcddd
-Overwriting existing notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-ok 6 - setup remote branch (z)
-
-expecting success of 3309.7 'verify state of remote branch (z)': verify_notes z z
-ok 7 - verify state of remote branch (z)
-
-expecting success of 3309.8 'merge z into y with invalid strategy => Fail/No changes': 
-	git config core.notesRef refs/notes/y &&
-	test_must_fail git notes merge --strategy=foo z &&
-	# Verify no changes (y)
-	verify_notes y y
-
-error: unknown -s/--strategy: foo
-usage: git notes merge [<options>] <notes-ref>
-   or: git notes merge --commit [<options>]
-   or: git notes merge --abort [<options>]
+	git notes add -f -m "conflicting notes on tantrum" tantrum
 
-General options
-    -v, --[no-]verbose    be more verbose
-    -q, --[no-]quiet      be more quiet
+Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 4 - setup remote branch (z)
 
-Merge options
-    -s, --[no-]strategy <strategy>
-                          resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)
+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
 
-Committing unmerged notes
-    --commit              finalize notes merge by committing unmerged notes
+Overwriting existing notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 5 - modify notes ref ourselves (x)
 
-Aborting notes merge resolution
-    --abort               abort notes merge
+expecting success of 3320.6 'create some new worktrees': 
+	git worktree add -b newbranch worktree main &&
+	git worktree add -b newbranch2 worktree2 main
 
-ok 8 - merge z into y with invalid strategy => Fail/No changes
+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 3309.9 'merge z into y with invalid configuration option => Fail/No changes': 
+expecting success of 3320.7 'merge z into y fails and sets NOTES_MERGE_REF': 
 	git config core.notesRef refs/notes/y &&
-	cat >expect <<-\EOF &&
-	error: unknown notes merge strategy foo
-	fatal: unable to parse 'notes.mergeStrategy' from command-line config
-	EOF
-	test_must_fail git -c notes.mergeStrategy="foo" notes merge z 2>actual &&
-	test_cmp expect actual &&
-	# Verify no changes (y)
-	verify_notes y y
-
-ok 9 - merge z into y with invalid configuration option => Fail/No changes
-
-expecting success of 3309.10 'merge z into y with "ours" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=ours z &&
-	verify_notes y ours
-
-Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 10 - merge z into y with "ours" strategy => Non-conflicting 3-way merge
-
-expecting success of 3309.11 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 11 - reset to pre-merge state (y)
-
-expecting success of 3309.12 'merge z into y with "ours" configuration option => Non-conflicting 3-way merge': 
-	git -c notes.mergeStrategy="ours" notes merge z &&
-	verify_notes y ours
-
-Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 12 - merge z into y with "ours" configuration option => Non-conflicting 3-way merge
-
-expecting success of 3309.13 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 13 - reset to pre-merge state (y)
-
-expecting success of 3309.14 'merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge': 
-	git -c notes.y.mergeStrategy="ours" notes merge z &&
-	verify_notes y ours
-
-Using local notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using local notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using local notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using local notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 14 - merge z into y with "ours" per-ref configuration option => Non-conflicting 3-way merge
-
-expecting success of 3309.15 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 15 - reset to pre-merge state (y)
-
-expecting success of 3309.16 'merge z into y with "theirs" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=theirs z &&
-	verify_notes y theirs
-
-Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 16 - merge z into y with "theirs" strategy => Non-conflicting 3-way merge
-
-expecting success of 3309.17 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 17 - reset to pre-merge state (y)
-
-expecting success of 3309.18 'merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge': 
-	git -c notes.mergeStrategy="ours" notes merge --strategy=theirs z &&
-	verify_notes y theirs
-
-Using remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Using remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Using remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Using remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 18 - merge z into y with "theirs" strategy overriding configuration option "ours" => Non-conflicting 3-way merge
-
-expecting success of 3309.19 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 19 - reset to pre-merge state (y)
-
-expecting success of 3309.20 'merge z into y with "union" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=union z &&
-	verify_notes y union
-
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 20 - merge z into y with "union" strategy => Non-conflicting 3-way merge
-
-expecting success of 3309.21 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 21 - reset to pre-merge state (y)
-
-expecting success of 3309.22 'merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge': 
-	git -c notes.y.mergeStrategy="theirs" notes merge --strategy=union z &&
-	verify_notes y union
-
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 22 - merge z into y with "union" strategy overriding per-ref configuration => Non-conflicting 3-way merge
-
-expecting success of 3309.23 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 23 - reset to pre-merge state (y)
-
-expecting success of 3309.24 'merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge': 
-	git -c notes.y.mergeStrategy="union" -c notes.mergeStrategy="theirs" notes merge z &&
-	verify_notes y union
-
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 24 - merge z into y with "union" per-ref overriding general configuration => Non-conflicting 3-way merge
-
-expecting success of 3309.25 'reset to pre-merge state (y)': 
-	git update-ref refs/notes/y refs/notes/y^1 &&
-	# Verify pre-merge state
-	verify_notes y y
-
-ok 25 - reset to pre-merge state (y)
-
-expecting success of 3309.26 'merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge': 
-	test_must_fail git -c notes.z.mergeStrategy="union" notes merge z &&
-	git notes merge --abort &&
-	verify_notes y y
+	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 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-CONFLICT (content): Merge conflict in notes for object 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Auto-merging notes for 65e263ded02ae4e8839bc151095113737579dc12
-CONFLICT (delete/modify): Notes for object 65e263ded02ae4e8839bc151095113737579dc12 deleted in refs/notes/z and modified in refs/notes/y. Version from refs/notes/y left in tree.
-Auto-merging notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-CONFLICT (add/add): Merge conflict in notes for object 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Auto-merging notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-CONFLICT (delete/modify): Notes for object 9a4c31c7f722b5d517e92c64e932dd751e1413bf deleted in refs/notes/y and modified in refs/notes/z. Version from refs/notes/z left in tree.
-ok 26 - merge z into y with "manual" per-ref only checks specific ref configuration => Conflicting 3-way merge
-
-expecting success of 3309.27 'merge y into z with "union" strategy => Non-conflicting 3-way merge': 
-	git config core.notesRef refs/notes/z &&
-	git notes merge --strategy=union y &&
-	verify_notes z union2
-
-Concatenating local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 27 - merge y into z with "union" strategy => Non-conflicting 3-way merge
-
-expecting success of 3309.28 'reset to pre-merge state (z)': 
-	git update-ref refs/notes/z refs/notes/z^1 &&
-	# Verify pre-merge state
-	verify_notes z z
-
-ok 28 - reset to pre-merge state (z)
-
-expecting success of 3309.29 'merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge': 
-	git notes merge --strategy=cat_sort_uniq y &&
-	verify_notes z cat_sort_uniq
-
-Concatenating unique lines in local and remote notes for 4acf42e847e7fffbbf89ee365c20ac7caf40de89
-Concatenating unique lines in local and remote notes for 65e263ded02ae4e8839bc151095113737579dc12
-Concatenating unique lines in local and remote notes for 7f9ad8836c775acb134c0a055fc55fb4cd1ba361
-Concatenating unique lines in local and remote notes for 9a4c31c7f722b5d517e92c64e932dd751e1413bf
-ok 29 - merge y into z with "cat_sort_uniq" strategy => Non-conflicting 3-way merge
+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 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 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
 
-ok 30 - reset to pre-merge state (z)
+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.45.2/t/trash directory.t3320-notes-merge-worktrees
+fatal: ref NOTES_MERGE_REF is not a symbolic ref
+ok 8 - merge z into y while mid-merge in another workdir fails
 
-expecting success of 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 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
 
-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
+Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.45.2/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Automatic notes merge failed. Fix conflicts in /build/reproducible-path/git-2.45.2/t/trash directory.t3320-notes-merge-worktrees/.git/worktrees/worktree2/NOTES_MERGE_WORKTREE and commit the result with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'.
+Auto-merging notes for 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+CONFLICT (content): Merge conflict in notes for object 02f8a63df5a5eb7863e18dffcbc422a31a01d39e
+ok 9 - merge z into x while mid-merge on y succeeds
 
-# passed all 31 test(s)
-1..31
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3321-notes-stripspace.sh ***
@@ -152927,6 +152214,1038 @@
 1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3400-rebase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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: 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: 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
+
+error: The following untracked working tree files would be overwritten by checkout:
+	B
+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 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 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 24 - Rebase a commit that sprinkles CRs in
+
+expecting success of 3400.25 '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 25 - rebase can copy notes
+
+expecting success of 3400.26 '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 26 - rebase -m can copy notes
+
+expecting success of 3400.27 '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 27 - rebase commit with an ancient timestamp
+
+expecting success of 3400.28 '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 28 - rebase with "From " line in commit message
+
+expecting success of 3400.29 '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.45.2/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 advice.mergeConflict false"
+Patch failed at 0001 two
+trace: run_command: git show 4a30746df05d63c1ff544efc981f6dc849632f55 --
+trace: built-in: git show 4a30746df05d63c1ff544efc981f6dc849632f55 --
+ok 29 - rebase --apply and --show-current-patch
+
+expecting success of 3400.30 '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.45.2/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 30 - rebase --apply and .gitattributes
+
+expecting success of 3400.31 '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.45.2/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 advice.mergeConflict false"
+Could not apply 4a30746... two
+trace: run_command: git show REBASE_HEAD --
+trace: built-in: git show REBASE_HEAD --
+ok 31 - rebase--merge.sh and --show-current-patch
+
+expecting success of 3400.32 '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 32 - switch to branch checked out here
+
+expecting success of 3400.33 '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.45.2/t/trash directory.t3400-rebase/wt2'
+fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3400-rebase/wt1'
+Deleted branch shared (was 1fb901f).
+ok 33 - switch to branch checked out elsewhere fails
+
+expecting success of 3400.34 '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 34 - switch to branch not checked out
+
+expecting success of 3400.35 '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 35 - switch to non-branch detaches HEAD
+
+expecting success of 3400.36 '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
+
+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.45.2/t/trash directory.t3400-rebase'
+ok 36 - refuse to switch to branch checked out elsewhere
+
+expecting success of 3400.37 '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.45.2/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 37 - rebase when inside worktree subdirectory
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3303-notes-subtrees.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3303-notes-subtrees/.git/
+expecting success of 3303.1 'setup: create 100 commits': 
+
+	(
+		nr=0 &&
+		while [ $nr -lt $number_of_commits ]; do
+			nr=$(($nr+1)) &&
+			test_tick &&
+			cat <<INPUT_END || return 1
+commit refs/heads/main
+committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+data <<COMMIT
+commit #$nr
+COMMIT
+
+M 644 inline file
+data <<EOF
+file in commit #$nr
+EOF
+
+INPUT_END
+
+		done &&
+		test_tick &&
+		cat <<INPUT_END
+commit refs/notes/commits
+committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+data <<COMMIT
+no notes
+COMMIT
+
+deleteall
+
+INPUT_END
+
+	) |
+	git fast-import --quiet &&
+	git config core.notesRef refs/notes/commits
+
+ok 1 - setup: create 100 commits
+
+expecting success of 3303.2 'test notes in 2/38-fanout': test_sha1_based "s|^..|&/|"
+ok 2 - test notes in 2/38-fanout
+
+expecting success of 3303.3 'verify notes in 2/38-fanout': verify_notes
+ok 3 - verify notes in 2/38-fanout
+
+expecting success of 3303.4 'test notes in 2/2/36-fanout': test_sha1_based "s|^\(..\)\(..\)|\1/\2/|"
+ok 4 - test notes in 2/2/36-fanout
+
+expecting success of 3303.5 'verify notes in 2/2/36-fanout': verify_notes
+ok 5 - verify notes in 2/2/36-fanout
+
+expecting success of 3303.6 'test notes in 2/2/2/34-fanout': test_sha1_based "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
+ok 6 - test notes in 2/2/2/34-fanout
+
+expecting success of 3303.7 'verify notes in 2/2/2/34-fanout': verify_notes
+ok 7 - verify notes in 2/2/2/34-fanout
+
+expecting success of 3303.8 'test same notes in no fanout and 2/38-fanout': test_same_notes "s|^..|&/|" ""
+ok 8 - test same notes in no fanout and 2/38-fanout
+
+expecting success of 3303.9 'verify same notes in no fanout and 2/38-fanout': verify_notes
+ok 9 - verify same notes in no fanout and 2/38-fanout
+
+expecting success of 3303.10 'test same notes in no fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" ""
+ok 10 - test same notes in no fanout and 2/2/36-fanout
+
+expecting success of 3303.11 'verify same notes in no fanout and 2/2/36-fanout': verify_notes
+ok 11 - verify same notes in no fanout and 2/2/36-fanout
+
+expecting success of 3303.12 'test same notes in 2/38-fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
+ok 12 - test same notes in 2/38-fanout and 2/2/36-fanout
+
+expecting success of 3303.13 'verify same notes in 2/38-fanout and 2/2/36-fanout': verify_notes
+ok 13 - verify same notes in 2/38-fanout and 2/2/36-fanout
+
+expecting success of 3303.14 'test same notes in 2/2/2/34-fanout and 2/2/36-fanout': test_same_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|"
+ok 14 - test same notes in 2/2/2/34-fanout and 2/2/36-fanout
+
+expecting success of 3303.15 'verify same notes in 2/2/2/34-fanout and 2/2/36-fanout': verify_notes
+ok 15 - verify same notes in 2/2/2/34-fanout and 2/2/36-fanout
+
+expecting success of 3303.16 'test notes in no fanout concatenated with 2/38-fanout': test_concatenated_notes "s|^..|&/|" ""
+ok 16 - test notes in no fanout concatenated with 2/38-fanout
+
+expecting success of 3303.17 'verify notes in no fanout concatenated with 2/38-fanout': verify_concatenated_notes
+ok 17 - verify notes in no fanout concatenated with 2/38-fanout
+
+expecting success of 3303.18 'test notes in no fanout concatenated with 2/2/36-fanout': test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" ""
+ok 18 - test notes in no fanout concatenated with 2/2/36-fanout
+
+expecting success of 3303.19 'verify notes in no fanout concatenated with 2/2/36-fanout': verify_concatenated_notes
+ok 19 - verify notes in no fanout concatenated with 2/2/36-fanout
+
+expecting success of 3303.20 'test notes in 2/38-fanout concatenated with 2/2/36-fanout': test_concatenated_notes "s|^\(..\)\(..\)|\1/\2/|" "s|^..|&/|"
+ok 20 - test notes in 2/38-fanout concatenated with 2/2/36-fanout
+
+expecting success of 3303.21 'verify notes in 2/38-fanout concatenated with 2/2/36-fanout': verify_concatenated_notes
+ok 21 - verify notes in 2/38-fanout concatenated with 2/2/36-fanout
+
+expecting success of 3303.22 'test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout': test_concatenated_notes "s|^\(..\)\(..\)\(..\)|\1/\2/\3/|" "s|^\(..\)\(..\)|\1/\2/|"
+ok 22 - test notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
+
+expecting success of 3303.23 'verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout': verify_concatenated_notes
+ok 23 - verify notes in 2/2/36-fanout concatenated with 2/2/2/34-fanout
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3401-rebase-and-am-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3401-rebase-and-am-rename/.git/
 expecting success of 3401.1 'setup testcase where directory rename should be detected': 
@@ -153340,2568 +153659,6113 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3070-wildmatch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3070-wildmatch/.git/
-checking prerequisite: EXPENSIVE_ON_WINDOWS
+*** t3402-rebase-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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." &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE_ON_WINDOWS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE_ON_WINDOWS" &&
-	test_have_prereq EXPENSIVE || test_have_prereq !MINGW,!CYGWIN
+	echo "12 $T" >>original &&
+	git commit -a -m"main updates a bit more." &&
 
-)
-checking prerequisite: EXPENSIVE
+	git checkout side &&
+	(echo "0 $T" && cat original) >renamed &&
+	git add renamed &&
+	git update-index --force-remove original &&
+	git commit -a -m"side renames and edits." &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
+	tr "[a-z]" "[A-Z]" <original >newfile &&
+	git add newfile &&
+	git commit -a -m"side edits further." &&
+	git branch second-side &&
 
-)
-prerequisite EXPENSIVE not satisfied
-prerequisite EXPENSIVE_ON_WINDOWS ok
-expecting success of 3070.1 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 1 - cleanup after previous file test
+	tr "[a-m]" "[A-M]" <original >newfile &&
+	rm -f original &&
+	git commit -a -m"side edits once again." &&
 
-expecting success of 3070.2 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 2 - setup match file test for foo
+	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 3070.3 'wildmatch: match 'foo' 'foo'': 
-			test-tool wildmatch wildmatch 'foo' 'foo'
-		
-ok 3 - wildmatch: match 'foo' 'foo'
+[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 3070.4 'wildmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 4 - wildmatch (via ls-files): match 'foo' 'foo'
+expecting success of 3402.2 'reference merge': 
+	git merge -s recursive -m "reference merge" main
 
-expecting success of 3070.5 'iwildmatch: match 'foo' 'foo'': 
-			test-tool wildmatch iwildmatch 'foo' 'foo'
-		
-ok 5 - iwildmatch: match 'foo' 'foo'
+Auto-merging renamed
+Merge made by the 'ort' strategy.
+ renamed | 4 ++++
+ 1 file changed, 4 insertions(+)
+ok 2 - reference merge
 
-expecting success of 3070.6 'iwildmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 6 - iwildmatch (via ls-files): match 'foo' 'foo'
+expecting success of 3402.3 'rebase': 
+	git checkout test-rebase &&
+	GIT_TRACE=1 git rebase --merge main
 
-expecting success of 3070.7 'pathmatch: match 'foo' 'foo'': 
-			test-tool wildmatch pathmatch 'foo' 'foo'
-		
-ok 7 - pathmatch: match 'foo' 'foo'
+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: built-in: git notes copy --for-rewrite=rebase
+
                                                                                
Successfully rebased and updated refs/heads/test-rebase.
+ok 3 - rebase
 
-expecting success of 3070.8 'pathmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 8 - pathmatch (via ls-files): match 'foo' 'foo'
+expecting success of 3402.4 'test-rebase@{1} is pre rebase': 
+	test $PRE_REBASE = $(git rev-parse test-rebase@{1})
 
-expecting success of 3070.9 'ipathmatch: match 'foo' 'foo'': 
-			test-tool wildmatch ipathmatch 'foo' 'foo'
-		
-ok 9 - ipathmatch: match 'foo' 'foo'
+ok 4 - test-rebase@{1} is pre rebase
 
-expecting success of 3070.10 'ipathmatch (via ls-files): match 'foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 10 - ipathmatch (via ls-files): match 'foo' 'foo'
+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
 
-expecting success of 3070.11 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 11 - cleanup after previous file test
+happy
+ok 5 - merge and rebase should match
 
-expecting success of 3070.12 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 12 - setup match file test for foo
+expecting success of 3402.6 'rebase the other way': 
+	git reset --hard main &&
+	git rebase --merge side
 
-expecting success of 3070.13 'wildmatch: no match 'foo' 'bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' 'bar'
-		
-ok 13 - wildmatch: no match 'foo' 'bar'
+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 3070.14 'wildmatch (via ls-files): no match 'bar' 'foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 14 - wildmatch (via ls-files): no match 'bar' 'foo'
+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
 
-expecting success of 3070.15 'iwildmatch: no match 'foo' 'bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' 'bar'
-		
-ok 15 - iwildmatch: no match 'foo' 'bar'
+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 3070.16 'iwildmatch (via ls-files): no match 'bar' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 16 - iwildmatch (via ls-files): no match 'bar' 'foo'
+expecting success of 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
 
-expecting success of 3070.17 'pathmatch: no match 'foo' 'bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' 'bar'
-		
-ok 17 - pathmatch: no match 'foo' 'bar'
+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 3070.18 'pathmatch (via ls-files): no match 'bar' 'foo'': 
-				>expect &&
-				git ls-files -z -- 'bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 18 - pathmatch (via ls-files): no match 'bar' 'foo'
+expecting success of 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
 
-expecting success of 3070.19 'ipathmatch: no match 'foo' 'bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' 'bar'
-		
-ok 19 - ipathmatch: no match 'foo' 'bar'
+happy
+ok 9 - merge and rebase should match
 
-expecting success of 3070.20 'ipathmatch (via ls-files): no match 'bar' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 20 - ipathmatch (via ls-files): no match 'bar' 'foo'
+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
 
-expecting success of 3070.21 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 21 - cleanup after previous file test
+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 3070.22 'setup match file test for ': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 22 - setup match file test for 
+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
 
-expecting success of 3070.23 'wildmatch: match '' ''': 
-			test-tool wildmatch wildmatch '' ''
-		
-ok 23 - wildmatch: match '' ''
+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 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 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
 
-checking known breakage of 3070.24 'wildmatch (via ls-files): match skip '' ''': false
-not ok 24 - wildmatch (via ls-files): match skip '' '' # TODO known breakage
+expecting success of 3402.12 '--reapply-cherry-picks': 
+	git init repo &&
 
-expecting success of 3070.25 'iwildmatch: match '' ''': 
-			test-tool wildmatch iwildmatch '' ''
-		
-ok 25 - iwildmatch: match '' ''
+	# O(1-10) -- O(1-11) -- O(0-10) main
+	#        \
+	#         -- O(1-11) -- O(1-12) otherbranch
 
-checking known breakage of 3070.26 'iwildmatch (via ls-files): match skip '' ''': false
-not ok 26 - iwildmatch (via ls-files): match skip '' '' # TODO known breakage
+	printf "Line %d\n" $(test_seq 1 10) >repo/file.txt &&
+	git -C repo add file.txt &&
+	git -C repo commit -m "base commit" &&
 
-expecting success of 3070.27 'pathmatch: match '' ''': 
-			test-tool wildmatch pathmatch '' ''
-		
-ok 27 - pathmatch: match '' ''
+	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
+	git -C repo commit -a -m "add 11" &&
 
-checking known breakage of 3070.28 'pathmatch (via ls-files): match skip '' ''': false
-not ok 28 - pathmatch (via ls-files): match skip '' '' # TODO known breakage
+	printf "Line %d\n" $(test_seq 0 10) >repo/file.txt &&
+	git -C repo commit -a -m "add 0 delete 11" &&
 
-expecting success of 3070.29 'ipathmatch: match '' ''': 
-			test-tool wildmatch ipathmatch '' ''
-		
-ok 29 - ipathmatch: match '' ''
+	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" &&
 
-checking known breakage of 3070.30 'ipathmatch (via ls-files): match skip '' ''': false
-not ok 30 - ipathmatch (via ls-files): match skip '' '' # TODO known breakage
+	printf "Line %d\n" $(test_seq 1 12) >repo/file.txt &&
+	git -C repo commit -a -m "add 12 in another branch" &&
 
-expecting success of 3070.31 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-ok 31 - cleanup after previous file test
+	# 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 3070.32 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 32 - setup match file test for foo
+	# With --reapply-cherry-picks, it works
+	git -C repo rebase --merge --reapply-cherry-picks main
 
-expecting success of 3070.33 'wildmatch: match 'foo' '???'': 
-			test-tool wildmatch wildmatch 'foo' '???'
-		
-ok 33 - wildmatch: match 'foo' '???'
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 3070.34 'wildmatch (via ls-files): match '???' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 34 - wildmatch (via ls-files): match '???' 'foo'
+expecting success of 3402.13 '--reapply-cherry-picks refrains from reading unneeded blobs': 
+	git init server &&
 
-expecting success of 3070.35 'iwildmatch: match 'foo' '???'': 
-			test-tool wildmatch iwildmatch 'foo' '???'
-		
-ok 35 - iwildmatch: match 'foo' '???'
+	# O(1-10) -- O(1-11) -- O(1-12) main
+	#        \
+	#         -- O(0-10) otherbranch
 
-expecting success of 3070.36 'iwildmatch (via ls-files): match '???' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 36 - iwildmatch (via ls-files): match '???' 'foo'
+	printf "Line %d\n" $(test_seq 1 10) >server/file.txt &&
+	git -C server add file.txt &&
+	git -C server commit -m "merge base" &&
 
-expecting success of 3070.37 'pathmatch: match 'foo' '???'': 
-			test-tool wildmatch pathmatch 'foo' '???'
-		
-ok 37 - pathmatch: match 'foo' '???'
+	printf "Line %d\n" $(test_seq 1 11) >server/file.txt &&
+	git -C server commit -a -m "add 11" &&
 
-expecting success of 3070.38 'pathmatch (via ls-files): match '???' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- '???' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 38 - pathmatch (via ls-files): match '???' 'foo'
+	printf "Line %d\n" $(test_seq 1 12) >server/file.txt &&
+	git -C server commit -a -m "add 12" &&
 
-expecting success of 3070.39 'ipathmatch: match 'foo' '???'': 
-			test-tool wildmatch ipathmatch 'foo' '???'
-		
-ok 39 - ipathmatch: match 'foo' '???'
+	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 3070.40 'ipathmatch (via ls-files): match '???' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 40 - ipathmatch (via ls-files): match '???' 'foo'
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
 
-expecting success of 3070.41 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 41 - cleanup after previous file test
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	git -C client checkout origin/main &&
+	git -C client checkout origin/otherbranch &&
 
-expecting success of 3070.42 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 42 - setup match file test for foo
+	# 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 &&
 
-expecting success of 3070.43 'wildmatch: no match 'foo' '??'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '??'
-		
-ok 43 - wildmatch: no match 'foo' '??'
+	git -C client rebase --merge --reapply-cherry-picks origin/main &&
 
-expecting success of 3070.44 'wildmatch (via ls-files): no match '??' 'foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 44 - wildmatch (via ls-files): no match '??' 'foo'
+	# 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
 
-expecting success of 3070.45 'iwildmatch: no match 'foo' '??'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '??'
-		
-ok 45 - iwildmatch: no match 'foo' '??'
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 3070.46 'iwildmatch (via ls-files): no match '??' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 46 - iwildmatch (via ls-files): no match '??' 'foo'
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 3070.47 'pathmatch: no match 'foo' '??'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '??'
-		
-ok 47 - pathmatch: no match 'foo' '??'
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 3070.48 'pathmatch (via ls-files): no match '??' 'foo'': 
-				>expect &&
-				git ls-files -z -- '??' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 48 - pathmatch (via ls-files): no match '??' 'foo'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.49 'ipathmatch: no match 'foo' '??'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '??'
-		
-ok 49 - ipathmatch: no match 'foo' '??'
+Or undo this operation with:
 
-expecting success of 3070.50 'ipathmatch (via ls-files): no match '??' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 50 - ipathmatch (via ls-files): no match '??' 'foo'
+  git switch -
 
-expecting success of 3070.51 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 51 - cleanup after previous file test
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.52 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3403-rebase-skip.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 	
-ok 52 - setup match file test for foo
+[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 3070.53 'wildmatch: match 'foo' '*'': 
-			test-tool wildmatch wildmatch 'foo' '*'
-		
-ok 53 - wildmatch: match 'foo' '*'
+expecting success of 3403.2 'rebase with git am -3 (default)': 
+	test_must_fail git rebase --apply main
 
-expecting success of 3070.54 'wildmatch (via ls-files): match '*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 54 - wildmatch (via ls-files): match '*' 'foo'
+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 advice.mergeConflict false"
+Patch failed at 0001 we should skip this
+ok 2 - rebase with git am -3 (default)
 
-expecting success of 3070.55 'iwildmatch: match 'foo' '*'': 
-			test-tool wildmatch iwildmatch 'foo' '*'
-		
-ok 55 - iwildmatch: match 'foo' '*'
+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
 
-expecting success of 3070.56 'iwildmatch (via ls-files): match '*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 56 - iwildmatch (via ls-files): match '*' 'foo'
+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 3070.57 'pathmatch: match 'foo' '*'': 
-			test-tool wildmatch pathmatch 'foo' '*'
-		
-ok 57 - pathmatch: match 'foo' '*'
+    --[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 3070.58 'pathmatch (via ls-files): match '*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- '*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 58 - pathmatch (via ls-files): match '*' 'foo'
+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 3070.59 'ipathmatch: match 'foo' '*'': 
-			test-tool wildmatch ipathmatch 'foo' '*'
-		
-ok 59 - ipathmatch: match 'foo' '*'
+    --[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 3070.60 'ipathmatch (via ls-files): match '*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 60 - ipathmatch (via ls-files): match '*' 'foo'
+ok 3 - rebase --skip can not be used with other options
 
-expecting success of 3070.61 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
+expecting success of 3403.4 'rebase --skip with am -3': 
+	git rebase --skip
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 61 - cleanup after previous file test
+Applying: this should not be skipped
+ok 4 - rebase --skip with am -3
 
-expecting success of 3070.62 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 62 - setup match file test for foo
+expecting success of 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
 
-expecting success of 3070.63 'wildmatch: match 'foo' 'f*'': 
-			test-tool wildmatch wildmatch 'foo' 'f*'
-		
-ok 63 - wildmatch: match 'foo' 'f*'
+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 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 3070.64 'wildmatch (via ls-files): match 'f*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 64 - wildmatch (via ls-files): match 'f*' 'foo'
+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 3070.65 'iwildmatch: match 'foo' 'f*'': 
-			test-tool wildmatch iwildmatch 'foo' 'f*'
-		
-ok 65 - iwildmatch: match 'foo' 'f*'
+expecting success of 3403.7 'rebase with --merge': 
+	test_must_fail git rebase --merge main
 
-expecting success of 3070.66 'iwildmatch (via ls-files): match 'f*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 66 - iwildmatch (via ls-files): match 'f*' 'foo'
+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 advice.mergeConflict false"
+Could not apply 847c4cd... we should skip this
+ok 7 - rebase with --merge
 
-expecting success of 3070.67 'pathmatch: match 'foo' 'f*'': 
-			test-tool wildmatch pathmatch 'foo' 'f*'
-		
-ok 67 - pathmatch: match 'foo' 'f*'
+expecting success of 3403.8 'rebase --skip with --merge': 
+	git rebase --skip
 
-expecting success of 3070.68 'pathmatch (via ls-files): match 'f*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- 'f*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 68 - pathmatch (via ls-files): match 'f*' 'foo'
+Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/skip-merge.
+ok 8 - rebase --skip with --merge
 
-expecting success of 3070.69 'ipathmatch: match 'foo' 'f*'': 
-			test-tool wildmatch ipathmatch 'foo' 'f*'
-		
-ok 69 - ipathmatch: match 'foo' 'f*'
+expecting success of 3403.9 'merge and reference trees equal': 
+	test -z "$(git diff-tree skip-merge skip-reference)"
 
-expecting success of 3070.70 'ipathmatch (via ls-files): match 'f*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 70 - ipathmatch (via ls-files): match 'f*' 'foo'
+ok 9 - merge and reference trees equal
 
-expecting success of 3070.71 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 71 - cleanup after previous file test
+expecting success of 3403.10 'moved back to branch correctly': 
+	test refs/heads/skip-merge = $(git symbolic-ref HEAD)
 
-expecting success of 3070.72 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 72 - setup match file test for foo
+ok 10 - moved back to branch correctly
 
-expecting success of 3070.73 'wildmatch: no match 'foo' '*f'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo' '*f'
-		
-ok 73 - wildmatch: no match 'foo' '*f'
+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
 
-expecting success of 3070.74 'wildmatch (via ls-files): no match '*f' 'foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 74 - wildmatch (via ls-files): no match '*f' 'foo'
+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 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 3070.75 'iwildmatch: no match 'foo' '*f'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo' '*f'
-		
-ok 75 - iwildmatch: no match 'foo' '*f'
+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
 
-expecting success of 3070.76 'iwildmatch (via ls-files): no match '*f' 'foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 76 - iwildmatch (via ls-files): no match '*f' 'foo'
+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:
 
-expecting success of 3070.77 'pathmatch: no match 'foo' '*f'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '*f'
-		
-ok 77 - pathmatch: no match 'foo' '*f'
+    git commit --allow-empty
 
-expecting success of 3070.78 'pathmatch (via ls-files): no match '*f' 'foo'': 
-				>expect &&
-				git ls-files -z -- '*f' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 78 - pathmatch (via ls-files): no match '*f' 'foo'
+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")
 
-expecting success of 3070.79 'ipathmatch: no match 'foo' '*f'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '*f'
-		
-ok 79 - ipathmatch: no match 'foo' '*f'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
 
-expecting success of 3070.80 'ipathmatch (via ls-files): no match '*f' 'foo'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 80 - ipathmatch (via ls-files): no match '*f' 'foo'
+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 3070.81 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 81 - cleanup after previous file test
+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
 
-expecting success of 3070.82 'setup match file test for foo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 82 - setup match file test for foo
+Rebasing (1/1)
The previous cherry-pick is now empty, possibly due to conflict resolution.
+If you wish to commit it anyway, use:
 
-expecting success of 3070.83 'wildmatch: match 'foo' '*foo*'': 
-			test-tool wildmatch wildmatch 'foo' '*foo*'
-		
-ok 83 - wildmatch: match 'foo' '*foo*'
+    git commit --allow-empty
 
-expecting success of 3070.84 'wildmatch (via ls-files): match '*foo*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 84 - wildmatch (via ls-files): match '*foo*' 'foo'
+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")
 
-expecting success of 3070.85 'iwildmatch: match 'foo' '*foo*'': 
-			test-tool wildmatch iwildmatch 'foo' '*foo*'
-		
-ok 85 - iwildmatch: match 'foo' '*foo*'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	err
 
-expecting success of 3070.86 'iwildmatch (via ls-files): match '*foo*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 86 - iwildmatch (via ls-files): match '*foo*' 'foo'
+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 3070.87 'pathmatch: match 'foo' '*foo*'': 
-			test-tool wildmatch pathmatch 'foo' '*foo*'
-		
-ok 87 - pathmatch: match 'foo' '*foo*'
+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
 
-expecting success of 3070.88 'pathmatch (via ls-files): match '*foo*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 88 - pathmatch (via ls-files): match '*foo*' 'foo'
+rebase -i script before editing:
+pick d66ccab amended-goodbye
 
-expecting success of 3070.89 'ipathmatch: match 'foo' '*foo*'': 
-			test-tool wildmatch ipathmatch 'foo' '*foo*'
-		
-ok 89 - ipathmatch: match 'foo' '*foo*'
+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:
 
-expecting success of 3070.90 'ipathmatch (via ls-files): match '*foo*' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 90 - ipathmatch (via ls-files): match '*foo*' 'foo'
+    git commit --allow-empty
 
-expecting success of 3070.91 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo
-ok 91 - cleanup after previous file test
+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")
 
-expecting success of 3070.92 'setup match file test for foobar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 92 - setup match file test for foobar
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
 
-expecting success of 3070.93 'wildmatch: match 'foobar' '*ob*a*r*'': 
-			test-tool wildmatch wildmatch 'foobar' '*ob*a*r*'
-		
-ok 93 - wildmatch: match 'foobar' '*ob*a*r*'
+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 3070.94 'wildmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
-				printf '%s' 'foobar' >expect &&
-				git --glob-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 94 - wildmatch (via ls-files): match '*ob*a*r*' 'foobar'
+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 3070.95 'iwildmatch: match 'foobar' '*ob*a*r*'': 
-			test-tool wildmatch iwildmatch 'foobar' '*ob*a*r*'
-		
-ok 95 - iwildmatch: match 'foobar' '*ob*a*r*'
+rebase -i script before editing:
+pick d66ccab amended-goodbye
 
-expecting success of 3070.96 'iwildmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
-				printf '%s' 'foobar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 96 - iwildmatch (via ls-files): match '*ob*a*r*' 'foobar'
+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:
 
-expecting success of 3070.97 'pathmatch: match 'foobar' '*ob*a*r*'': 
-			test-tool wildmatch pathmatch 'foobar' '*ob*a*r*'
-		
-ok 97 - pathmatch: match 'foobar' '*ob*a*r*'
+    git commit --allow-empty
 
-expecting success of 3070.98 'pathmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
-				printf '%s' 'foobar' >expect &&
-				git ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 98 - pathmatch (via ls-files): match '*ob*a*r*' 'foobar'
+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")
 
-expecting success of 3070.99 'ipathmatch: match 'foobar' '*ob*a*r*'': 
-			test-tool wildmatch ipathmatch 'foobar' '*ob*a*r*'
-		
-ok 99 - ipathmatch: match 'foobar' '*ob*a*r*'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
 
-expecting success of 3070.100 'ipathmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
-				printf '%s' 'foobar' >expect &&
-				git --icase-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 100 - ipathmatch (via ls-files): match '*ob*a*r*' 'foobar'
+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 3070.101 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foobar
-ok 101 - cleanup after previous file test
+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
 
-expecting success of 3070.102 'setup match file test for aaaaaaabababab': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 102 - setup match file test for aaaaaaabababab
+rebase -i script before editing:
+pick 64bec18 goodbye
 
-expecting success of 3070.103 'wildmatch: match 'aaaaaaabababab' '*ab'': 
-			test-tool wildmatch wildmatch 'aaaaaaabababab' '*ab'
-		
-ok 103 - wildmatch: match 'aaaaaaabababab' '*ab'
+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 3070.104 'wildmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
-				printf '%s' 'aaaaaaabababab' >expect &&
-				git --glob-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 104 - wildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
 
-expecting success of 3070.105 'iwildmatch: match 'aaaaaaabababab' '*ab'': 
-			test-tool wildmatch iwildmatch 'aaaaaaabababab' '*ab'
-		
-ok 105 - iwildmatch: match 'aaaaaaabababab' '*ab'
+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")
 
-expecting success of 3070.106 'iwildmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
-				printf '%s' 'aaaaaaabababab' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 106 - iwildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
 
-expecting success of 3070.107 'pathmatch: match 'aaaaaaabababab' '*ab'': 
-			test-tool wildmatch pathmatch 'aaaaaaabababab' '*ab'
-		
-ok 107 - pathmatch: match 'aaaaaaabababab' '*ab'
+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 3070.108 'pathmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
-				printf '%s' 'aaaaaaabababab' >expect &&
-				git ls-files -z -- '*ab' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 108 - pathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
+expecting success of 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
 
-expecting success of 3070.109 'ipathmatch: match 'aaaaaaabababab' '*ab'': 
-			test-tool wildmatch ipathmatch 'aaaaaaabababab' '*ab'
-		
-ok 109 - ipathmatch: match 'aaaaaaabababab' '*ab'
+rebase -i script before editing:
+pick 5a0b053 hello world
+pick 64bec18 goodbye
 
-expecting success of 3070.110 'ipathmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
-				printf '%s' 'aaaaaaabababab' >expect &&
-				git --icase-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 110 - ipathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
+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")
 
-expecting success of 3070.111 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing aaaaaaabababab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 111 - cleanup after previous file test
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
 
-expecting success of 3070.112 'setup match file test for foo*': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 112 - setup match file test for foo*
+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 3070.113 'wildmatch: match 'foo*' 'foo\*'': 
-			test-tool wildmatch wildmatch 'foo*' 'foo\*'
-		
-ok 113 - wildmatch: match 'foo*' 'foo\*'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
 
-expecting success of 3070.114 'wildmatch (via ls-files): match 'foo\*' 'foo*'': 
-				printf '%s' 'foo*' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 114 - wildmatch (via ls-files): match 'foo\*' 'foo*'
+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 3070.115 'iwildmatch: match 'foo*' 'foo\*'': 
-			test-tool wildmatch iwildmatch 'foo*' 'foo\*'
-		
-ok 115 - iwildmatch: match 'foo*' 'foo\*'
+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 3070.116 'iwildmatch (via ls-files): match 'foo\*' 'foo*'': 
-				printf '%s' 'foo*' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 116 - iwildmatch (via ls-files): match 'foo\*' 'foo*'
+rebase -i script before editing:
+pick 64bec18 goodbye
+pick 1f15beb reverted-goodbye
 
-expecting success of 3070.117 'pathmatch: match 'foo*' 'foo\*'': 
-			test-tool wildmatch pathmatch 'foo*' 'foo\*'
-		
-ok 117 - pathmatch: match 'foo*' 'foo\*'
+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")
 
-expecting success of 3070.118 'pathmatch (via ls-files): match 'foo\*' 'foo*'': 
-				printf '%s' 'foo*' >expect &&
-				git ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 118 - pathmatch (via ls-files): match 'foo\*' 'foo*'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
 
-expecting success of 3070.119 'ipathmatch: match 'foo*' 'foo\*'': 
-			test-tool wildmatch ipathmatch 'foo*' 'foo\*'
-		
-ok 119 - ipathmatch: match 'foo*' 'foo\*'
+No changes
+Could not apply 1f15beb... reverted-goodbye
+ok 18 - fixup that empties commit fails
 
-expecting success of 3070.120 'ipathmatch (via ls-files): match 'foo\*' 'foo*'': 
-				printf '%s' 'foo*' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 120 - ipathmatch (via ls-files): match 'foo\*' 'foo*'
+expecting success of 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 3070.121 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo*
-ok 121 - cleanup after previous file test
+rebase -i script before editing:
+pick 64bec18 goodbye
+pick 1f15beb reverted-goodbye
 
-expecting success of 3070.122 'setup match file test for foobar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 122 - setup match file test for foobar
+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")
 
-expecting success of 3070.123 'wildmatch: no match 'foobar' 'foo\*bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foobar' 'foo\*bar'
-		
-ok 123 - wildmatch: no match 'foobar' 'foo\*bar'
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	err
+	expect
+	fake-editor.sh
 
-expecting success of 3070.124 'wildmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 124 - wildmatch (via ls-files): no match 'foo\*bar' 'foobar'
+No changes
+Could not apply 1f15beb... reverted-goodbye
+ok 19 - squash that empties commit fails
 
-expecting success of 3070.125 'iwildmatch: no match 'foobar' 'foo\*bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foobar' 'foo\*bar'
-		
-ok 125 - iwildmatch: no match 'foobar' 'foo\*bar'
+expecting success of 3403.20 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
 
-expecting success of 3070.126 'iwildmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 126 - iwildmatch (via ls-files): no match 'foo\*bar' 'foobar'
+ok 20 - $EDITOR and friends are unchanged
 
-expecting success of 3070.127 'pathmatch: no match 'foobar' 'foo\*bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foobar' 'foo\*bar'
-		
-ok 127 - pathmatch: no match 'foobar' 'foo\*bar'
+# passed all 20 test(s)
+1..20
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3405-rebase-malformed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3405-rebase-malformed/.git/
+expecting success of 3405.1 'setup': 
 
-expecting success of 3070.128 'pathmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
-				>expect &&
-				git ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 128 - pathmatch (via ls-files): no match 'foo\*bar' 'foobar'
+	>file1 &&
+	>file2 &&
+	git add file1 file2 &&
+	test_tick &&
+	git commit -m "Initial commit" &&
+	git branch diff-in-message &&
+	git branch empty-message-merge &&
 
-expecting success of 3070.129 'ipathmatch: no match 'foobar' 'foo\*bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foobar' 'foo\*bar'
-		
-ok 129 - ipathmatch: no match 'foobar' 'foo\*bar'
+	git checkout -b multi-line-subject &&
+	cat F >file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -F F &&
 
-expecting success of 3070.130 'ipathmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 130 - ipathmatch (via ls-files): no match 'foo\*bar' 'foobar'
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >F0 &&
 
-expecting success of 3070.131 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foobar
-ok 131 - cleanup after previous file test
+	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 3070.132 'setup match file test for f\oo': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 132 - setup match file test for f\oo
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >G0 &&
 
-expecting success of 3070.133 'wildmatch: match 'f\oo' 'f\\oo'': 
-			test-tool wildmatch wildmatch 'f\oo' 'f\\oo'
-		
-ok 133 - wildmatch: match 'f\oo' 'f\\oo'
+	git checkout empty-message-merge &&
+	echo file3 >file3 &&
+	git add file3 &&
+	git commit --allow-empty-message -m "" &&
 
-expecting success of 3070.134 'wildmatch (via ls-files): match 'f\\oo' 'f\oo'': 
-				printf '%s' 'f\oo' >expect &&
-				git --glob-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 134 - wildmatch (via ls-files): match 'f\\oo' 'f\oo'
+	git checkout main &&
 
-expecting success of 3070.135 'iwildmatch: match 'f\oo' 'f\\oo'': 
-			test-tool wildmatch iwildmatch 'f\oo' 'f\\oo'
-		
-ok 135 - iwildmatch: match 'f\oo' 'f\\oo'
+	echo One >file1 &&
+	test_tick &&
+	git add file1 &&
+	git commit -m "Second commit"
 
-expecting success of 3070.136 'iwildmatch (via ls-files): match 'f\\oo' 'f\oo'': 
-				printf '%s' 'f\oo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 136 - iwildmatch (via ls-files): match 'f\\oo' 'f\oo'
+[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 3070.137 'pathmatch: match 'f\oo' 'f\\oo'': 
-			test-tool wildmatch pathmatch 'f\oo' 'f\\oo'
-		
-ok 137 - pathmatch: match 'f\oo' 'f\\oo'
+expecting success of 3405.2 'rebase commit with multi-line subject': 
 
-expecting success of 3070.138 'pathmatch (via ls-files): match 'f\\oo' 'f\oo'': 
-				printf '%s' 'f\oo' >expect &&
-				git ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 138 - pathmatch (via ls-files): match 'f\\oo' 'f\oo'
+	git rebase main multi-line-subject &&
+	git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
 
-expecting success of 3070.139 'ipathmatch: match 'f\oo' 'f\\oo'': 
-			test-tool wildmatch ipathmatch 'f\oo' 'f\\oo'
-		
-ok 139 - ipathmatch: match 'f\oo' 'f\\oo'
+	test_cmp F0 F1 &&
+	test_cmp F F0
 
-expecting success of 3070.140 'ipathmatch (via ls-files): match 'f\\oo' 'f\oo'': 
-				printf '%s' 'f\oo' >expect &&
-				git --icase-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 140 - ipathmatch (via ls-files): match 'f\\oo' 'f\oo'
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/multi-line-subject.
+ok 2 - rebase commit with multi-line subject
 
-expecting success of 3070.141 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing "f\\oo"
-ok 141 - cleanup after previous file test
+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
 
-expecting success of 3070.142 'setup match file test for ball': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 142 - setup match file test for ball
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/diff-in-message.
+ok 3 - rebase commit with diff in message
 
-expecting success of 3070.143 'wildmatch: match 'ball' '*[al]?'': 
-			test-tool wildmatch wildmatch 'ball' '*[al]?'
-		
-ok 143 - wildmatch: match 'ball' '*[al]?'
+expecting success of 3405.4 'rebase -m commit with empty message': 
+	git rebase -m main empty-message-merge
 
-expecting success of 3070.144 'wildmatch (via ls-files): match '*[al]?' 'ball'': 
-				printf '%s' 'ball' >expect &&
-				git --glob-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 144 - wildmatch (via ls-files): match '*[al]?' 'ball'
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/empty-message-merge.
+ok 4 - rebase -m commit with empty message
 
-expecting success of 3070.145 'iwildmatch: match 'ball' '*[al]?'': 
-			test-tool wildmatch iwildmatch 'ball' '*[al]?'
-		
-ok 145 - iwildmatch: match 'ball' '*[al]?'
+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^
 
-expecting success of 3070.146 'iwildmatch (via ls-files): match '*[al]?' 'ball'': 
-				printf '%s' 'ball' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 146 - iwildmatch (via ls-files): match '*[al]?' 'ball'
+Switched to branch 'diff-in-message'
+rebase -i script before editing:
+pick 87b000b commit log message containing a diff
 
-expecting success of 3070.147 'pathmatch: match 'ball' '*[al]?'': 
-			test-tool wildmatch pathmatch 'ball' '*[al]?'
-		
-ok 147 - pathmatch: match 'ball' '*[al]?'
+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
 
-expecting success of 3070.148 'pathmatch (via ls-files): match '*[al]?' 'ball'': 
-				printf '%s' 'ball' >expect &&
-				git ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 148 - pathmatch (via ls-files): match '*[al]?' 'ball'
+  git commit --amend 
 
-expecting success of 3070.149 'ipathmatch: match 'ball' '*[al]?'': 
-			test-tool wildmatch ipathmatch 'ball' '*[al]?'
-		
-ok 149 - ipathmatch: match 'ball' '*[al]?'
+Once you are satisfied with your changes, run
 
-expecting success of 3070.150 'ipathmatch (via ls-files): match '*[al]?' 'ball'': 
-				printf '%s' 'ball' >expect &&
-				git --icase-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 150 - ipathmatch (via ls-files): match '*[al]?' 'ball'
+  git rebase --continue
+ok 5 - rebase -i commit with empty message
 
-expecting success of 3070.151 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing ball
-Removing expect
-ok 151 - cleanup after previous file test
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3311-notes-merge-fanout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 3070.152 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 152 - setup match file test for ten
+	git log --format=oneline &&
 
-expecting success of 3070.153 'wildmatch: no match 'ten' '[ten]'': 
-			test_must_fail test-tool wildmatch wildmatch 'ten' '[ten]'
-		
-ok 153 - wildmatch: no match 'ten' '[ten]'
+	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 3070.154 'wildmatch (via ls-files): no match '[ten]' 'ten'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 154 - wildmatch (via ls-files): no match '[ten]' 'ten'
+	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 3070.155 'iwildmatch: no match 'ten' '[ten]'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ten' '[ten]'
-		
-ok 155 - iwildmatch: no match 'ten' '[ten]'
+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 3070.156 'iwildmatch (via ls-files): no match '[ten]' 'ten'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 156 - iwildmatch (via ls-files): no match '[ten]' 'ten'
+expecting success of 3311.2 'sanity check (x)': 
+	verify_notes x commit5 &&
+	verify_no_fanout x
 
-expecting success of 3070.157 'pathmatch: no match 'ten' '[ten]'': 
-			test_must_fail test-tool wildmatch pathmatch 'ten' '[ten]'
-		
-ok 157 - pathmatch: no match 'ten' '[ten]'
+157e8cc0aeac5befb302d276f2e706112bf6e413
+94955c5cd7e5662c6ab40c323ecdfac458c47435
+e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ef004cfa88883bb87e030b6196934dd90e3548d2
+f6db73397fcc379ea00d1fc17a35abb42027a69a
+ok 2 - sanity check (x)
 
-expecting success of 3070.158 'pathmatch (via ls-files): no match '[ten]' 'ten'': 
-				>expect &&
-				git ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 158 - pathmatch (via ls-files): no match '[ten]' 'ten'
+expecting success of 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 3070.159 'ipathmatch: no match 'ten' '[ten]'': 
-			test_must_fail test-tool wildmatch ipathmatch 'ten' '[ten]'
-		
-ok 159 - ipathmatch: no match 'ten' '[ten]'
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 3070.160 'ipathmatch (via ls-files): no match '[ten]' 'ten'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 160 - ipathmatch (via ls-files): no match '[ten]' 'ten'
+ok 3 - Add a few hundred commits w/notes to trigger fanout (x -> y)
 
-expecting success of 3070.161 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 161 - cleanup after previous file test
+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 3070.162 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 162 - setup match file test for ten
+expecting success of 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 3070.163 'wildmatch: match 'ten' '**[!te]'': 
-			test-tool wildmatch wildmatch 'ten' '**[!te]'
-		
-ok 163 - wildmatch: match 'ten' '**[!te]'
+Already up to date.
+ok 5 - No-op merge (already included) (x => y)
 
-expecting success of 3070.164 'wildmatch (via ls-files): match '**[!te]' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --glob-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 164 - wildmatch (via ls-files): match '**[!te]' 'ten'
+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 3070.165 'iwildmatch: match 'ten' '**[!te]'': 
-			test-tool wildmatch iwildmatch 'ten' '**[!te]'
-		
-ok 165 - iwildmatch: match 'ten' '**[!te]'
+Fast-forward
+ok 6 - Fast-forward merge (y => x)
 
-expecting success of 3070.166 'iwildmatch (via ls-files): match '**[!te]' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 166 - iwildmatch (via ls-files): match '**[!te]' 'ten'
+expecting success of 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 3070.167 'pathmatch: match 'ten' '**[!te]'': 
-			test-tool wildmatch pathmatch 'ten' '**[!te]'
-		
-ok 167 - pathmatch: match 'ten' '**[!te]'
+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 3070.168 'pathmatch (via ls-files): match '**[!te]' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 168 - pathmatch (via ls-files): match '**[!te]' 'ten'
+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 3070.169 'ipathmatch: match 'ten' '**[!te]'': 
-			test-tool wildmatch ipathmatch 'ten' '**[!te]'
-		
-ok 169 - ipathmatch: match 'ten' '**[!te]'
+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 3070.170 'ipathmatch (via ls-files): match '**[!te]' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --icase-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 170 - ipathmatch (via ls-files): match '**[!te]' 'ten'
+ok 9 - successful merge without conflicts (y => z)
 
-expecting success of 3070.171 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 171 - cleanup after previous file test
+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 3070.172 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 172 - setup match file test for ten
+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 3070.173 'wildmatch: no match 'ten' '**[!ten]'': 
-			test_must_fail test-tool wildmatch wildmatch 'ten' '**[!ten]'
-		
-ok 173 - wildmatch: no match 'ten' '**[!ten]'
+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 3070.174 'wildmatch (via ls-files): no match '**[!ten]' 'ten'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 174 - wildmatch (via ls-files): no match '**[!ten]' 'ten'
+expecting success of 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 3070.175 'iwildmatch: no match 'ten' '**[!ten]'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ten' '**[!ten]'
-		
-ok 175 - iwildmatch: no match 'ten' '**[!ten]'
+Using local notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
+Using local notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ok 12 - successful merge using "ours" strategy (z => w)
 
-expecting success of 3070.176 'iwildmatch (via ls-files): no match '**[!ten]' 'ten'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 176 - iwildmatch (via ls-files): no match '**[!ten]' 'ten'
+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 3070.177 'pathmatch: no match 'ten' '**[!ten]'': 
-			test_must_fail test-tool wildmatch pathmatch 'ten' '**[!ten]'
-		
-ok 177 - pathmatch: no match 'ten' '**[!ten]'
+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 3070.178 'pathmatch (via ls-files): no match '**[!ten]' 'ten'': 
-				>expect &&
-				git ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 178 - pathmatch (via ls-files): no match '**[!ten]' 'ten'
+Using remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
+Using remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
+ok 14 - successful merge using "theirs" strategy (z => w)
 
-expecting success of 3070.179 'ipathmatch: no match 'ten' '**[!ten]'': 
-			test_must_fail test-tool wildmatch ipathmatch 'ten' '**[!ten]'
-		
-ok 179 - ipathmatch: no match 'ten' '**[!ten]'
+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 3070.180 'ipathmatch (via ls-files): no match '**[!ten]' 'ten'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 180 - ipathmatch (via ls-files): no match '**[!ten]' 'ten'
+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 3070.181 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 181 - cleanup after previous file test
+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 3070.182 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 182 - setup match file test for ten
+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 3070.183 'wildmatch: match 'ten' 't[a-g]n'': 
-			test-tool wildmatch wildmatch 'ten' 't[a-g]n'
-		
-ok 183 - wildmatch: match 'ten' 't[a-g]n'
+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 3070.184 'wildmatch (via ls-files): match 't[a-g]n' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --glob-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 184 - wildmatch (via ls-files): match 't[a-g]n' 'ten'
+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 3070.185 'iwildmatch: match 'ten' 't[a-g]n'': 
-			test-tool wildmatch iwildmatch 'ten' 't[a-g]n'
-		
-ok 185 - iwildmatch: match 'ten' 't[a-g]n'
+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 3070.186 'iwildmatch (via ls-files): match 't[a-g]n' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 186 - iwildmatch (via ls-files): match 't[a-g]n' 'ten'
+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 3070.187 'pathmatch: match 'ten' 't[a-g]n'': 
-			test-tool wildmatch pathmatch 'ten' 't[a-g]n'
-		
-ok 187 - pathmatch: match 'ten' 't[a-g]n'
+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 3070.188 'pathmatch (via ls-files): match 't[a-g]n' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 188 - pathmatch (via ls-files): match 't[a-g]n' 'ten'
+expecting success of 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 3070.189 'ipathmatch: match 'ten' 't[a-g]n'': 
-			test-tool wildmatch ipathmatch 'ten' 't[a-g]n'
-		
-ok 189 - ipathmatch: match 'ten' 't[a-g]n'
+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 3070.190 'ipathmatch (via ls-files): match 't[a-g]n' 'ten'': 
-				printf '%s' 'ten' >expect &&
-				git --icase-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 190 - ipathmatch (via ls-files): match 't[a-g]n' 'ten'
+ok 22 - verify conflict entries (with no fanout)
 
-expecting success of 3070.191 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 191 - cleanup after previous file test
+expecting success of 3311.23 'resolve and finalize merge (z => w)': 
+	cat >.git/NOTES_MERGE_WORKTREE/$commit_sha3 <<EOF &&
+other notes for commit3
 
-expecting success of 3070.192 'setup match file test for ten': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 192 - setup match file test for ten
+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 3070.193 'wildmatch: no match 'ten' 't[!a-g]n'': 
-			test_must_fail test-tool wildmatch wildmatch 'ten' 't[!a-g]n'
-		
-ok 193 - wildmatch: no match 'ten' 't[!a-g]n'
+ok 23 - resolve and finalize merge (z => w)
 
-expecting success of 3070.194 'wildmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 194 - wildmatch (via ls-files): no match 't[!a-g]n' 'ten'
+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 3070.195 'iwildmatch: no match 'ten' 't[!a-g]n'': 
-			test_must_fail test-tool wildmatch iwildmatch 'ten' 't[!a-g]n'
-		
-ok 195 - iwildmatch: no match 'ten' 't[!a-g]n'
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3406-rebase-message.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 
-expecting success of 3070.196 'iwildmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 196 - iwildmatch (via ls-files): no match 't[!a-g]n' 'ten'
+	git checkout -b conflicts O &&
+	test_commit P &&
+	test_commit conflict-X fileX &&
+	test_commit Q &&
 
-expecting success of 3070.197 'pathmatch: no match 'ten' 't[!a-g]n'': 
-			test_must_fail test-tool wildmatch pathmatch 'ten' 't[!a-g]n'
-		
-ok 197 - pathmatch: no match 'ten' 't[!a-g]n'
+	git checkout -b topic O &&
+	git cherry-pick A B &&
+	test_commit Z fileZ &&
+	git tag start
 
-expecting success of 3070.198 'pathmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
-				>expect &&
-				git ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 198 - pathmatch (via ls-files): no match 't[!a-g]n' 'ten'
+[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 3070.199 'ipathmatch: no match 'ten' 't[!a-g]n'': 
-			test_must_fail test-tool wildmatch ipathmatch 'ten' 't[!a-g]n'
-		
-ok 199 - ipathmatch: no match 'ten' 't[!a-g]n'
+expecting success of 3406.2 'rebase -m': 
+	git rebase -m main >actual &&
+	test_must_be_empty actual
 
-expecting success of 3070.200 'ipathmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 200 - ipathmatch (via ls-files): no match 't[!a-g]n' 'ten'
+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 advice.skippedCherryPicks false"
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/topic.
+ok 2 - rebase -m
 
-expecting success of 3070.201 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ten
-ok 201 - cleanup after previous file test
+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 3070.202 'setup match file test for ton': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 202 - setup match file test for ton
+Current branch topic is up to date.
+ok 3 - rebase against main twice
 
-expecting success of 3070.203 'wildmatch: match 'ton' 't[!a-g]n'': 
-			test-tool wildmatch wildmatch 'ton' 't[!a-g]n'
-		
-ok 203 - wildmatch: match 'ton' 't[!a-g]n'
+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 3070.204 'wildmatch (via ls-files): match 't[!a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --glob-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 204 - wildmatch (via ls-files): match 't[!a-g]n' 'ton'
+Current branch topic is up to date, rebase forced.
+ok 4 - rebase against main twice with --force
 
-expecting success of 3070.205 'iwildmatch: match 'ton' 't[!a-g]n'': 
-			test-tool wildmatch iwildmatch 'ton' 't[!a-g]n'
-		
-ok 205 - iwildmatch: match 'ton' 't[!a-g]n'
+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 3070.206 'iwildmatch (via ls-files): match 't[!a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 206 - iwildmatch (via ls-files): match 't[!a-g]n' 'ton'
+Note: switching to 'topic^'.
 
-expecting success of 3070.207 'pathmatch: match 'ton' 't[!a-g]n'': 
-			test-tool wildmatch pathmatch 'ton' 't[!a-g]n'
-		
-ok 207 - pathmatch: match 'ton' 't[!a-g]n'
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 3070.208 'pathmatch (via ls-files): match 't[!a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 208 - pathmatch (via ls-files): match 't[!a-g]n' 'ton'
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 3070.209 'ipathmatch: match 'ton' 't[!a-g]n'': 
-			test-tool wildmatch ipathmatch 'ton' 't[!a-g]n'
-		
-ok 209 - ipathmatch: match 'ton' 't[!a-g]n'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.210 'ipathmatch (via ls-files): match 't[!a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 210 - ipathmatch (via ls-files): match 't[!a-g]n' 'ton'
+Or undo this operation with:
 
-expecting success of 3070.211 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ton
-ok 211 - cleanup after previous file test
+  git switch -
 
-expecting success of 3070.212 'setup match file test for ton': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 212 - setup match file test for ton
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.213 'wildmatch: match 'ton' 't[^a-g]n'': 
-			test-tool wildmatch wildmatch 'ton' 't[^a-g]n'
-		
-ok 213 - wildmatch: match 'ton' 't[^a-g]n'
+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 3070.214 'wildmatch (via ls-files): match 't[^a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --glob-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 214 - wildmatch (via ls-files): match 't[^a-g]n' 'ton'
+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 3070.215 'iwildmatch: match 'ton' 't[^a-g]n'': 
-			test-tool wildmatch iwildmatch 'ton' 't[^a-g]n'
-		
-ok 215 - iwildmatch: match 'ton' 't[^a-g]n'
+Note: switching to 'topic^'.
 
-expecting success of 3070.216 'iwildmatch (via ls-files): match 't[^a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 216 - iwildmatch (via ls-files): match 't[^a-g]n' 'ton'
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 3070.217 'pathmatch: match 'ton' 't[^a-g]n'': 
-			test-tool wildmatch pathmatch 'ton' 't[^a-g]n'
-		
-ok 217 - pathmatch: match 'ton' 't[^a-g]n'
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 3070.218 'pathmatch (via ls-files): match 't[^a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 218 - pathmatch (via ls-files): match 't[^a-g]n' 'ton'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.219 'ipathmatch: match 'ton' 't[^a-g]n'': 
-			test-tool wildmatch ipathmatch 'ton' 't[^a-g]n'
-		
-ok 219 - ipathmatch: match 'ton' 't[^a-g]n'
+Or undo this operation with:
 
-expecting success of 3070.220 'ipathmatch (via ls-files): match 't[^a-g]n' 'ton'': 
-				printf '%s' 'ton' >expect &&
-				git --icase-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 220 - ipathmatch (via ls-files): match 't[^a-g]n' 'ton'
+  git switch -
 
-expecting success of 3070.221 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing ton
-ok 221 - cleanup after previous file test
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.222 'setup match file test for a]b': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 222 - setup match file test for a]b
+HEAD is now at 545b0d0 Y
+Fast-forwarded HEAD to topic.
+ok 6 - rebase fast-forward to main
 
-expecting success of 3070.223 'wildmatch: match 'a]b' 'a[]]b'': 
-			test-tool wildmatch wildmatch 'a]b' 'a[]]b'
-		
-ok 223 - wildmatch: match 'a]b' 'a[]]b'
+expecting success of 3406.7 'rebase --stat': 
+	git reset --hard start &&
+	git rebase --stat main >diffstat.txt &&
+	grep "^ fileX |  *1 +$" diffstat.txt
 
-expecting success of 3070.224 'wildmatch (via ls-files): match 'a[]]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 224 - wildmatch (via ls-files): match 'a[]]b' 'a]b'
+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 advice.skippedCherryPicks false"
+Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
+ fileX | 1 +
+ok 7 - rebase --stat
 
-expecting success of 3070.225 'iwildmatch: match 'a]b' 'a[]]b'': 
-			test-tool wildmatch iwildmatch 'a]b' 'a[]]b'
-		
-ok 225 - iwildmatch: match 'a]b' 'a[]]b'
+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
 
-expecting success of 3070.226 'iwildmatch (via ls-files): match 'a[]]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 226 - iwildmatch (via ls-files): match 'a[]]b' 'a]b'
+HEAD is now at 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 advice.skippedCherryPicks false"
+Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
+ fileX | 1 +
+ok 8 - rebase w/config rebase.stat
 
-expecting success of 3070.227 'pathmatch: match 'a]b' 'a[]]b'': 
-			test-tool wildmatch pathmatch 'a]b' 'a[]]b'
-		
-ok 227 - pathmatch: match 'a]b' 'a[]]b'
+expecting success of 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 3070.228 'pathmatch (via ls-files): match 'a[]]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 228 - pathmatch (via ls-files): match 'a[]]b' 'a]b'
+HEAD 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 advice.skippedCherryPicks false"
+Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 9 - rebase -n overrides config rebase.stat config
 
-expecting success of 3070.229 'ipathmatch: match 'a]b' 'a[]]b'': 
-			test-tool wildmatch ipathmatch 'a]b' 'a[]]b'
-		
-ok 229 - ipathmatch: match 'a]b' 'a[]]b'
+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 3070.230 'ipathmatch (via ls-files): match 'a[]]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 230 - ipathmatch (via ls-files): match 'a[]]b' 'a]b'
+fatal: Does not point to a valid commit 'invalid-ref'
+ok 10 - rebase --onto outputs the invalid ref
 
-expecting success of 3070.231 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a]b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 231 - cleanup after previous file test
+expecting success of 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 3070.232 'setup match file test for a-b': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 232 - setup match file test for a-b
+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 3070.233 'wildmatch: match 'a-b' 'a[]-]b'': 
-			test-tool wildmatch wildmatch 'a-b' 'a[]-]b'
-		
-ok 233 - wildmatch: match 'a-b' 'a[]-]b'
+expecting success of 3406.12 'rebase --merge reflog': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
 
-expecting success of 3070.234 'wildmatch (via ls-files): match 'a[]-]b' 'a-b'': 
-				printf '%s' 'a-b' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 234 - wildmatch (via ls-files): match 'a[]-]b' 'a-b'
+	(
+		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 3070.235 'iwildmatch: match 'a-b' 'a[]-]b'': 
-			test-tool wildmatch iwildmatch 'a-b' 'a[]-]b'
-		
-ok 235 - iwildmatch: match 'a-b' 'a[]-]b'
+	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 3070.236 'iwildmatch (via ls-files): match 'a[]-]b' 'a-b'': 
-				printf '%s' 'a-b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 236 - iwildmatch (via ls-files): match 'a[]-]b' 'a-b'
+	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 3070.237 'pathmatch: match 'a-b' 'a[]-]b'': 
-			test-tool wildmatch pathmatch 'a-b' 'a[]-]b'
-		
-ok 237 - pathmatch: match 'a-b' 'a[]-]b'
+	# 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 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 3070.238 'pathmatch (via ls-files): match 'a[]-]b' 'a-b'': 
-				printf '%s' 'a-b' >expect &&
-				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 238 - pathmatch (via ls-files): match 'a[]-]b' 'a-b'
+expecting success of 3406.13 'rebase --merge fast-forward reflog': 
+	git checkout fast-forward &&
+	test_when_finished "git reset --hard X" &&
 
-expecting success of 3070.239 'ipathmatch: match 'a-b' 'a[]-]b'': 
-			test-tool wildmatch ipathmatch 'a-b' 'a[]-]b'
-		
-ok 239 - ipathmatch: match 'a-b' 'a[]-]b'
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		git rebase $mode main
+	) &&
 
-expecting success of 3070.240 'ipathmatch (via ls-files): match 'a[]-]b' 'a-b'': 
-				printf '%s' 'a-b' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 240 - ipathmatch (via ls-files): match 'a[]-]b' 'a-b'
+	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 3070.241 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a-b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 241 - cleanup after previous file test
+	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 &&
 
-expecting success of 3070.242 'setup match file test for a]b': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+	# check there is only one new entry in the branch reflog
+	test_cmp_rev fast-forward@{1} X
 	
-ok 242 - setup match file test for a]b
+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 3070.243 'wildmatch: match 'a]b' 'a[]-]b'': 
-			test-tool wildmatch wildmatch 'a]b' 'a[]-]b'
-		
-ok 243 - wildmatch: match 'a]b' 'a[]-]b'
+expecting success of 3406.14 'rebase --merge --skip reflog': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
 
-expecting success of 3070.244 'wildmatch (via ls-files): match 'a[]-]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 244 - wildmatch (via ls-files): match 'a[]-]b' 'a]b'
+	(
+		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
+	) &&
 
-expecting success of 3070.245 'iwildmatch: match 'a]b' 'a[]-]b'': 
-			test-tool wildmatch iwildmatch 'a]b' 'a[]-]b'
-		
-ok 245 - iwildmatch: match 'a]b' 'a[]-]b'
+	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 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 3070.246 'iwildmatch (via ls-files): match 'a[]-]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 246 - iwildmatch (via ls-files): match 'a[]-]b' 'a]b'
+expecting success of 3406.15 'rebase --merge --abort reflog': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
 
-expecting success of 3070.247 'pathmatch: match 'a]b' 'a[]-]b'': 
-			test-tool wildmatch pathmatch 'a]b' 'a[]-]b'
-		
-ok 247 - pathmatch: match 'a]b' 'a[]-]b'
+	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
+	) &&
 
-expecting success of 3070.248 'pathmatch (via ls-files): match 'a[]-]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 248 - pathmatch (via ls-files): match 'a[]-]b' 'a]b'
+	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 &&
 
-expecting success of 3070.249 'ipathmatch: match 'a]b' 'a[]-]b'': 
-			test-tool wildmatch ipathmatch 'a]b' 'a[]-]b'
-		
-ok 249 - ipathmatch: match 'a]b' 'a[]-]b'
+	# 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 advice.mergeConflict false"
+Could not apply f31fbd6... conflict-X
+HEAD is now at f39a215 Q
+ok 15 - rebase --merge --abort reflog
 
-expecting success of 3070.250 'ipathmatch (via ls-files): match 'a[]-]b' 'a]b'': 
-				printf '%s' 'a]b' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 250 - ipathmatch (via ls-files): match 'a[]-]b' 'a]b'
+expecting success of 3406.16 'rebase --merge --abort detached HEAD reflog': 
+	git checkout Q &&
+	test_when_finished "git reset --hard Q" &&
 
-expecting success of 3070.251 'cleanup after previous file test': 
-		if test -e .git/created_test_file
+	(
+		if test -n "$reflog_action"
 		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing a]b
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 251 - cleanup after previous file test
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		test_must_fail git rebase $mode main &&
+		git rebase --abort
+	) &&
 
-expecting success of 3070.252 'setup match file test for aab': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
+	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
 	
-ok 252 - setup match file test for aab
+Note: switching to 'Q'.
 
-expecting success of 3070.253 'wildmatch: no match 'aab' 'a[]-]b'': 
-			test_must_fail test-tool wildmatch wildmatch 'aab' 'a[]-]b'
-		
-ok 253 - wildmatch: no match 'aab' 'a[]-]b'
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-expecting success of 3070.254 'wildmatch (via ls-files): no match 'a[]-]b' 'aab'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 254 - wildmatch (via ls-files): no match 'a[]-]b' 'aab'
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 3070.255 'iwildmatch: no match 'aab' 'a[]-]b'': 
-			test_must_fail test-tool wildmatch iwildmatch 'aab' 'a[]-]b'
-		
-ok 255 - iwildmatch: no match 'aab' 'a[]-]b'
+  git switch -c <new-branch-name>
 
-expecting success of 3070.256 'iwildmatch (via ls-files): no match 'a[]-]b' 'aab'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 256 - iwildmatch (via ls-files): no match 'a[]-]b' 'aab'
+Or undo this operation with:
 
-expecting success of 3070.257 'pathmatch: no match 'aab' 'a[]-]b'': 
-			test_must_fail test-tool wildmatch pathmatch 'aab' 'a[]-]b'
-		
-ok 257 - pathmatch: no match 'aab' 'a[]-]b'
+  git switch -
 
-expecting success of 3070.258 'pathmatch (via ls-files): no match 'a[]-]b' 'aab'': 
-				>expect &&
-				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 258 - pathmatch (via ls-files): no match 'a[]-]b' 'aab'
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 3070.259 'ipathmatch: no match 'aab' 'a[]-]b'': 
-			test_must_fail test-tool wildmatch ipathmatch 'aab' 'a[]-]b'
-		
-ok 259 - ipathmatch: no match 'aab' 'a[]-]b'
+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 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 3070.260 'ipathmatch (via ls-files): no match 'a[]-]b' 'aab'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 260 - ipathmatch (via ls-files): no match 'a[]-]b' 'aab'
+expecting success of 3406.17 'rebase --merge reflog GIT_REFLOG_ACTION=my-reflog-action': 
+	git checkout conflicts &&
+	test_when_finished "git reset --hard Q" &&
 
-expecting success of 3070.261 'cleanup after previous file test': 
-		if test -e .git/created_test_file
+	(
+		if test -n "$reflog_action"
 		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing aab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 261 - cleanup after previous file test
+			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 3070.262 'setup match file test for aab': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 262 - setup match file test for aab
+	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 3070.263 'wildmatch: match 'aab' 'a[]a-]b'': 
-			test-tool wildmatch wildmatch 'aab' 'a[]a-]b'
-		
-ok 263 - wildmatch: match 'aab' 'a[]a-]b'
+	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 3070.264 'wildmatch (via ls-files): match 'a[]a-]b' 'aab'': 
-				printf '%s' 'aab' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 264 - wildmatch (via ls-files): match 'a[]a-]b' 'aab'
+	# 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 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 3070.265 'iwildmatch: match 'aab' 'a[]a-]b'': 
-			test-tool wildmatch iwildmatch 'aab' 'a[]a-]b'
-		
-ok 265 - iwildmatch: match 'aab' 'a[]a-]b'
+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" &&
 
-expecting success of 3070.266 'iwildmatch (via ls-files): match 'a[]a-]b' 'aab'': 
-				printf '%s' 'aab' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 266 - iwildmatch (via ls-files): match 'a[]a-]b' 'aab'
+	(
+		if test -n "$reflog_action"
+		then
+			GIT_REFLOG_ACTION="$reflog_action" &&
+			export GIT_REFLOG_ACTION
+		fi &&
+		git rebase $mode main
+	) &&
 
-expecting success of 3070.267 'pathmatch: match 'aab' 'a[]a-]b'': 
-			test-tool wildmatch pathmatch 'aab' 'a[]a-]b'
-		
-ok 267 - pathmatch: match 'aab' 'a[]a-]b'
+	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 3070.268 'pathmatch (via ls-files): match 'a[]a-]b' 'aab'': 
-				printf '%s' 'aab' >expect &&
-				git ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 268 - pathmatch (via ls-files): match 'a[]a-]b' 'aab'
+	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 &&
 
-expecting success of 3070.269 'ipathmatch: match 'aab' 'a[]a-]b'': 
-			test-tool wildmatch ipathmatch 'aab' 'a[]a-]b'
-		
-ok 269 - ipathmatch: match 'aab' 'a[]a-]b'
+	# 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 3070.270 'ipathmatch (via ls-files): match 'a[]a-]b' 'aab'': 
-				printf '%s' 'aab' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 270 - ipathmatch (via ls-files): match 'a[]a-]b' 'aab'
+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" &&
 
-expecting success of 3070.271 'cleanup after previous file test': 
+	(
+		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 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 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 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 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 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 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 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 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 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 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 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.45.2/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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3407-rebase-abort.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3408-rebase-multi-line.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3070-wildmatch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3070-wildmatch/.git/
+checking prerequisite: EXPENSIVE_ON_WINDOWS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE_ON_WINDOWS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE_ON_WINDOWS" &&
+	test_have_prereq EXPENSIVE || test_have_prereq !MINGW,!CYGWIN
+
+)
+checking prerequisite: EXPENSIVE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
+
+)
+prerequisite EXPENSIVE not satisfied
+prerequisite EXPENSIVE_ON_WINDOWS ok
+expecting success of 3070.1 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing aab
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 271 - cleanup after previous file test
+ok 1 - cleanup after previous file test
 
-expecting success of 3070.272 'setup match file test for ]': 
+expecting success of 3070.2 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -155920,83 +159784,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 272 - setup match file test for ]
+ok 2 - setup match file test for foo
 
-expecting success of 3070.273 'wildmatch: match ']' ']'': 
-			test-tool wildmatch wildmatch ']' ']'
+expecting success of 3070.3 'wildmatch: match 'foo' 'foo'': 
+			test-tool wildmatch wildmatch 'foo' 'foo'
 		
-ok 273 - wildmatch: match ']' ']'
+ok 3 - wildmatch: match 'foo' 'foo'
 
-expecting success of 3070.274 'wildmatch (via ls-files): match ']' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
+expecting success of 3070.4 'wildmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 274 - wildmatch (via ls-files): match ']' ']'
+ok 4 - wildmatch (via ls-files): match 'foo' 'foo'
 
-expecting success of 3070.275 'iwildmatch: match ']' ']'': 
-			test-tool wildmatch iwildmatch ']' ']'
+expecting success of 3070.5 'iwildmatch: match 'foo' 'foo'': 
+			test-tool wildmatch iwildmatch 'foo' 'foo'
 		
-ok 275 - iwildmatch: match ']' ']'
+ok 5 - iwildmatch: match 'foo' 'foo'
 
-expecting success of 3070.276 'iwildmatch (via ls-files): match ']' ']'': 
-				printf '%s' ']' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
+expecting success of 3070.6 'iwildmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 276 - iwildmatch (via ls-files): match ']' ']'
+ok 6 - iwildmatch (via ls-files): match 'foo' 'foo'
 
-expecting success of 3070.277 'pathmatch: match ']' ']'': 
-			test-tool wildmatch pathmatch ']' ']'
+expecting success of 3070.7 'pathmatch: match 'foo' 'foo'': 
+			test-tool wildmatch pathmatch 'foo' 'foo'
 		
-ok 277 - pathmatch: match ']' ']'
+ok 7 - pathmatch: match 'foo' 'foo'
 
-expecting success of 3070.278 'pathmatch (via ls-files): match ']' ']'': 
-				printf '%s' ']' >expect &&
-				git ls-files -z -- ']' >actual.raw 2>actual.err &&
+expecting success of 3070.8 'pathmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- 'foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 278 - pathmatch (via ls-files): match ']' ']'
+ok 8 - pathmatch (via ls-files): match 'foo' 'foo'
 
-expecting success of 3070.279 'ipathmatch: match ']' ']'': 
-			test-tool wildmatch ipathmatch ']' ']'
+expecting success of 3070.9 'ipathmatch: match 'foo' 'foo'': 
+			test-tool wildmatch ipathmatch 'foo' 'foo'
 		
-ok 279 - ipathmatch: match ']' ']'
+ok 9 - ipathmatch: match 'foo' 'foo'
 
-expecting success of 3070.280 'ipathmatch (via ls-files): match ']' ']'': 
-				printf '%s' ']' >expect &&
-				git --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
+expecting success of 3070.10 'ipathmatch (via ls-files): match 'foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 280 - ipathmatch (via ls-files): match ']' ']'
+ok 10 - ipathmatch (via ls-files): match 'foo' 'foo'
 
-expecting success of 3070.281 'cleanup after previous file test': 
+expecting success of 3070.11 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ]
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 281 - cleanup after previous file test
+Removing foo
+ok 11 - cleanup after previous file test
 
-expecting success of 3070.282 'setup match file test for foo/baz/bar': 
+expecting success of 3070.12 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156015,69 +159879,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 282 - setup match file test for foo/baz/bar
+ok 12 - setup match file test for foo
 
-expecting success of 3070.283 'wildmatch: no match 'foo/baz/bar' 'foo*bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo*bar'
+expecting success of 3070.13 'wildmatch: no match 'foo' 'bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' 'bar'
 		
-ok 283 - wildmatch: no match 'foo/baz/bar' 'foo*bar'
+ok 13 - wildmatch: no match 'foo' 'bar'
 
-expecting success of 3070.284 'wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'': 
+expecting success of 3070.14 'wildmatch (via ls-files): no match 'bar' 'foo'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 284 - wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
+ok 14 - wildmatch (via ls-files): no match 'bar' 'foo'
 
-expecting success of 3070.285 'iwildmatch: no match 'foo/baz/bar' 'foo*bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo*bar'
+expecting success of 3070.15 'iwildmatch: no match 'foo' 'bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' 'bar'
 		
-ok 285 - iwildmatch: no match 'foo/baz/bar' 'foo*bar'
+ok 15 - iwildmatch: no match 'foo' 'bar'
 
-expecting success of 3070.286 'iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'': 
+expecting success of 3070.16 'iwildmatch (via ls-files): no match 'bar' 'foo'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 286 - iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
+ok 16 - iwildmatch (via ls-files): no match 'bar' 'foo'
 
-expecting success of 3070.287 'pathmatch: match 'foo/baz/bar' 'foo*bar'': 
-			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo*bar'
+expecting success of 3070.17 'pathmatch: no match 'foo' 'bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' 'bar'
 		
-ok 287 - pathmatch: match 'foo/baz/bar' 'foo*bar'
+ok 17 - pathmatch: no match 'foo' 'bar'
 
-expecting success of 3070.288 'pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
+expecting success of 3070.18 'pathmatch (via ls-files): no match 'bar' 'foo'': 
+				>expect &&
+				git ls-files -z -- 'bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 288 - pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
+ok 18 - pathmatch (via ls-files): no match 'bar' 'foo'
 
-expecting success of 3070.289 'ipathmatch: match 'foo/baz/bar' 'foo*bar'': 
-			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo*bar'
+expecting success of 3070.19 'ipathmatch: no match 'foo' 'bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' 'bar'
 		
-ok 289 - ipathmatch: match 'foo/baz/bar' 'foo*bar'
+ok 19 - ipathmatch: no match 'foo' 'bar'
 
-expecting success of 3070.290 'ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
+expecting success of 3070.20 'ipathmatch (via ls-files): no match 'bar' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 290 - ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
+ok 20 - ipathmatch (via ls-files): no match 'bar' 'foo'
 
-expecting success of 3070.291 'cleanup after previous file test': 
+expecting success of 3070.21 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -156088,10 +159952,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 291 - cleanup after previous file test
+Removing foo
+ok 21 - cleanup after previous file test
 
-expecting success of 3070.292 'setup match file test for foo/baz/bar': 
+expecting success of 3070.22 'setup match file test for ': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156110,83 +159974,50 @@
 			rm .git/created_test_file
 		fi
 	
-ok 292 - setup match file test for foo/baz/bar
+ok 22 - setup match file test for 
 
-expecting success of 3070.293 'wildmatch: no match 'foo/baz/bar' 'foo**bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo**bar'
+expecting success of 3070.23 'wildmatch: match '' ''': 
+			test-tool wildmatch wildmatch '' ''
 		
-ok 293 - wildmatch: no match 'foo/baz/bar' 'foo**bar'
+ok 23 - wildmatch: match '' ''
 
-expecting success of 3070.294 'wildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 294 - wildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
+checking known breakage of 3070.24 'wildmatch (via ls-files): match skip '' ''': false
+not ok 24 - wildmatch (via ls-files): match skip '' '' # TODO known breakage
 
-expecting success of 3070.295 'iwildmatch: no match 'foo/baz/bar' 'foo**bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo**bar'
+expecting success of 3070.25 'iwildmatch: match '' ''': 
+			test-tool wildmatch iwildmatch '' ''
 		
-ok 295 - iwildmatch: no match 'foo/baz/bar' 'foo**bar'
+ok 25 - iwildmatch: match '' ''
 
-expecting success of 3070.296 'iwildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 296 - iwildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
+checking known breakage of 3070.26 'iwildmatch (via ls-files): match skip '' ''': false
+not ok 26 - iwildmatch (via ls-files): match skip '' '' # TODO known breakage
 
-expecting success of 3070.297 'pathmatch: match 'foo/baz/bar' 'foo**bar'': 
-			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo**bar'
+expecting success of 3070.27 'pathmatch: match '' ''': 
+			test-tool wildmatch pathmatch '' ''
 		
-ok 297 - pathmatch: match 'foo/baz/bar' 'foo**bar'
+ok 27 - pathmatch: match '' ''
 
-expecting success of 3070.298 'pathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 298 - pathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
+checking known breakage of 3070.28 'pathmatch (via ls-files): match skip '' ''': false
+not ok 28 - pathmatch (via ls-files): match skip '' '' # TODO known breakage
 
-expecting success of 3070.299 'ipathmatch: match 'foo/baz/bar' 'foo**bar'': 
-			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo**bar'
+expecting success of 3070.29 'ipathmatch: match '' ''': 
+			test-tool wildmatch ipathmatch '' ''
 		
-ok 299 - ipathmatch: match 'foo/baz/bar' 'foo**bar'
+ok 29 - ipathmatch: match '' ''
 
-expecting success of 3070.300 'ipathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 300 - ipathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
+checking known breakage of 3070.30 'ipathmatch (via ls-files): match skip '' ''': false
+not ok 30 - ipathmatch (via ls-files): match skip '' '' # TODO known breakage
 
-expecting success of 3070.301 'cleanup after previous file test': 
+expecting success of 3070.31 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-Removing foo/
-ok 301 - cleanup after previous file test
+ok 31 - cleanup after previous file test
 
-expecting success of 3070.302 'setup match file test for foobazbar': 
+expecting success of 3070.32 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156205,69 +160036,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 302 - setup match file test for foobazbar
+ok 32 - setup match file test for foo
 
-expecting success of 3070.303 'wildmatch: match 'foobazbar' 'foo**bar'': 
-			test-tool wildmatch wildmatch 'foobazbar' 'foo**bar'
+expecting success of 3070.33 'wildmatch: match 'foo' '???'': 
+			test-tool wildmatch wildmatch 'foo' '???'
 		
-ok 303 - wildmatch: match 'foobazbar' 'foo**bar'
+ok 33 - wildmatch: match 'foo' '???'
 
-expecting success of 3070.304 'wildmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
-				printf '%s' 'foobazbar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
+expecting success of 3070.34 'wildmatch (via ls-files): match '???' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 304 - wildmatch (via ls-files): match 'foo**bar' 'foobazbar'
+ok 34 - wildmatch (via ls-files): match '???' 'foo'
 
-expecting success of 3070.305 'iwildmatch: match 'foobazbar' 'foo**bar'': 
-			test-tool wildmatch iwildmatch 'foobazbar' 'foo**bar'
+expecting success of 3070.35 'iwildmatch: match 'foo' '???'': 
+			test-tool wildmatch iwildmatch 'foo' '???'
 		
-ok 305 - iwildmatch: match 'foobazbar' 'foo**bar'
+ok 35 - iwildmatch: match 'foo' '???'
 
-expecting success of 3070.306 'iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
-				printf '%s' 'foobazbar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
+expecting success of 3070.36 'iwildmatch (via ls-files): match '???' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 306 - iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'
+ok 36 - iwildmatch (via ls-files): match '???' 'foo'
 
-expecting success of 3070.307 'pathmatch: match 'foobazbar' 'foo**bar'': 
-			test-tool wildmatch pathmatch 'foobazbar' 'foo**bar'
+expecting success of 3070.37 'pathmatch: match 'foo' '???'': 
+			test-tool wildmatch pathmatch 'foo' '???'
 		
-ok 307 - pathmatch: match 'foobazbar' 'foo**bar'
+ok 37 - pathmatch: match 'foo' '???'
 
-expecting success of 3070.308 'pathmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
-				printf '%s' 'foobazbar' >expect &&
-				git ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
+expecting success of 3070.38 'pathmatch (via ls-files): match '???' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- '???' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 308 - pathmatch (via ls-files): match 'foo**bar' 'foobazbar'
+ok 38 - pathmatch (via ls-files): match '???' 'foo'
 
-expecting success of 3070.309 'ipathmatch: match 'foobazbar' 'foo**bar'': 
-			test-tool wildmatch ipathmatch 'foobazbar' 'foo**bar'
+expecting success of 3070.39 'ipathmatch: match 'foo' '???'': 
+			test-tool wildmatch ipathmatch 'foo' '???'
 		
-ok 309 - ipathmatch: match 'foobazbar' 'foo**bar'
+ok 39 - ipathmatch: match 'foo' '???'
 
-expecting success of 3070.310 'ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
-				printf '%s' 'foobazbar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
+expecting success of 3070.40 'ipathmatch (via ls-files): match '???' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '???' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 310 - ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'
+ok 40 - ipathmatch (via ls-files): match '???' 'foo'
 
-expecting success of 3070.311 'cleanup after previous file test': 
+expecting success of 3070.41 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -156278,10 +160109,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foobazbar
-ok 311 - cleanup after previous file test
+Removing foo
+ok 41 - cleanup after previous file test
 
-expecting success of 3070.312 'setup match file test for foo/baz/bar': 
+expecting success of 3070.42 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156300,69 +160131,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 312 - setup match file test for foo/baz/bar
+ok 42 - setup match file test for foo
 
-expecting success of 3070.313 'wildmatch: match 'foo/baz/bar' 'foo/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/bar'
+expecting success of 3070.43 'wildmatch: no match 'foo' '??'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' '??'
 		
-ok 313 - wildmatch: match 'foo/baz/bar' 'foo/**/bar'
+ok 43 - wildmatch: no match 'foo' '??'
 
-expecting success of 3070.314 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.44 'wildmatch (via ls-files): no match '??' 'foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 314 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+ok 44 - wildmatch (via ls-files): no match '??' 'foo'
 
-expecting success of 3070.315 'iwildmatch: match 'foo/baz/bar' 'foo/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/bar'
+expecting success of 3070.45 'iwildmatch: no match 'foo' '??'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '??'
 		
-ok 315 - iwildmatch: match 'foo/baz/bar' 'foo/**/bar'
+ok 45 - iwildmatch: no match 'foo' '??'
 
-expecting success of 3070.316 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.46 'iwildmatch (via ls-files): no match '??' 'foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 316 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+ok 46 - iwildmatch (via ls-files): no match '??' 'foo'
 
-expecting success of 3070.317 'pathmatch: match 'foo/baz/bar' 'foo/**/bar'': 
-			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/bar'
+expecting success of 3070.47 'pathmatch: no match 'foo' '??'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '??'
 		
-ok 317 - pathmatch: match 'foo/baz/bar' 'foo/**/bar'
+ok 47 - pathmatch: no match 'foo' '??'
 
-expecting success of 3070.318 'pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.48 'pathmatch (via ls-files): no match '??' 'foo'': 
+				>expect &&
+				git ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 318 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+ok 48 - pathmatch (via ls-files): no match '??' 'foo'
 
-expecting success of 3070.319 'ipathmatch: match 'foo/baz/bar' 'foo/**/bar'': 
-			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/bar'
+expecting success of 3070.49 'ipathmatch: no match 'foo' '??'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '??'
 		
-ok 319 - ipathmatch: match 'foo/baz/bar' 'foo/**/bar'
+ok 49 - ipathmatch: no match 'foo' '??'
 
-expecting success of 3070.320 'ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.50 'ipathmatch (via ls-files): no match '??' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '??' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 320 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
+ok 50 - ipathmatch (via ls-files): no match '??' 'foo'
 
-expecting success of 3070.321 'cleanup after previous file test': 
+expecting success of 3070.51 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -156373,10 +160204,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 321 - cleanup after previous file test
+Removing foo
+ok 51 - cleanup after previous file test
 
-expecting success of 3070.322 'setup match file test for foo/baz/bar': 
+expecting success of 3070.52 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156395,69 +160226,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 322 - setup match file test for foo/baz/bar
+ok 52 - setup match file test for foo
 
-expecting success of 3070.323 'wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/**/bar'
+expecting success of 3070.53 'wildmatch: match 'foo' '*'': 
+			test-tool wildmatch wildmatch 'foo' '*'
 		
-ok 323 - wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
+ok 53 - wildmatch: match 'foo' '*'
 
-expecting success of 3070.324 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.54 'wildmatch (via ls-files): match '*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 324 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
+ok 54 - wildmatch (via ls-files): match '*' 'foo'
 
-expecting success of 3070.325 'iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/**/bar'
+expecting success of 3070.55 'iwildmatch: match 'foo' '*'': 
+			test-tool wildmatch iwildmatch 'foo' '*'
 		
-ok 325 - iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
+ok 55 - iwildmatch: match 'foo' '*'
 
-expecting success of 3070.326 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'': 
-				printf '%s' 'foo/baz/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.56 'iwildmatch (via ls-files): match '*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 326 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
+ok 56 - iwildmatch (via ls-files): match '*' 'foo'
 
-expecting success of 3070.327 'pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/**/bar'
+expecting success of 3070.57 'pathmatch: match 'foo' '*'': 
+			test-tool wildmatch pathmatch 'foo' '*'
 		
-ok 327 - pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
+ok 57 - pathmatch: match 'foo' '*'
 
-expecting success of 3070.328 'pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'': 
-				>expect &&
-				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.58 'pathmatch (via ls-files): match '*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- '*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 328 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
+ok 58 - pathmatch (via ls-files): match '*' 'foo'
 
-expecting success of 3070.329 'ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/**/bar'
+expecting success of 3070.59 'ipathmatch: match 'foo' '*'': 
+			test-tool wildmatch ipathmatch 'foo' '*'
 		
-ok 329 - ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
+ok 59 - ipathmatch: match 'foo' '*'
 
-expecting success of 3070.330 'ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.60 'ipathmatch (via ls-files): match '*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 330 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
+ok 60 - ipathmatch (via ls-files): match '*' 'foo'
 
-expecting success of 3070.331 'cleanup after previous file test': 
+expecting success of 3070.61 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -156468,10 +160299,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 331 - cleanup after previous file test
+Removing foo
+ok 61 - cleanup after previous file test
 
-expecting success of 3070.332 'setup match file test for foo/b/a/z/bar': 
+expecting success of 3070.62 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156490,69 +160321,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 332 - setup match file test for foo/b/a/z/bar
+ok 62 - setup match file test for foo
 
-expecting success of 3070.333 'wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/bar'
+expecting success of 3070.63 'wildmatch: match 'foo' 'f*'': 
+			test-tool wildmatch wildmatch 'foo' 'f*'
 		
-ok 333 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+ok 63 - wildmatch: match 'foo' 'f*'
 
-expecting success of 3070.334 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.64 'wildmatch (via ls-files): match 'f*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 334 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
+ok 64 - wildmatch (via ls-files): match 'f*' 'foo'
 
-expecting success of 3070.335 'iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/bar'
+expecting success of 3070.65 'iwildmatch: match 'foo' 'f*'': 
+			test-tool wildmatch iwildmatch 'foo' 'f*'
 		
-ok 335 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+ok 65 - iwildmatch: match 'foo' 'f*'
 
-expecting success of 3070.336 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.66 'iwildmatch (via ls-files): match 'f*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 336 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
+ok 66 - iwildmatch (via ls-files): match 'f*' 'foo'
 
-expecting success of 3070.337 'pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
-			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/bar'
+expecting success of 3070.67 'pathmatch: match 'foo' 'f*'': 
+			test-tool wildmatch pathmatch 'foo' 'f*'
 		
-ok 337 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+ok 67 - pathmatch: match 'foo' 'f*'
 
-expecting success of 3070.338 'pathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.68 'pathmatch (via ls-files): match 'f*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- 'f*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 338 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
+ok 68 - pathmatch (via ls-files): match 'f*' 'foo'
 
-expecting success of 3070.339 'ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
-			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/bar'
+expecting success of 3070.69 'ipathmatch: match 'foo' 'f*'': 
+			test-tool wildmatch ipathmatch 'foo' 'f*'
 		
-ok 339 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
+ok 69 - ipathmatch: match 'foo' 'f*'
 
-expecting success of 3070.340 'ipathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.70 'ipathmatch (via ls-files): match 'f*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- 'f*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 340 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
+ok 70 - ipathmatch (via ls-files): match 'f*' 'foo'
 
-expecting success of 3070.341 'cleanup after previous file test': 
+expecting success of 3070.71 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -156563,10 +160394,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 341 - cleanup after previous file test
+Removing foo
+ok 71 - cleanup after previous file test
 
-expecting success of 3070.342 'setup match file test for foo/b/a/z/bar': 
+expecting success of 3070.72 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156585,69 +160416,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 342 - setup match file test for foo/b/a/z/bar
+ok 72 - setup match file test for foo
 
-expecting success of 3070.343 'wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
+expecting success of 3070.73 'wildmatch: no match 'foo' '*f'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo' '*f'
 		
-ok 343 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+ok 73 - wildmatch: no match 'foo' '*f'
 
-expecting success of 3070.344 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.74 'wildmatch (via ls-files): no match '*f' 'foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 344 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+ok 74 - wildmatch (via ls-files): no match '*f' 'foo'
 
-expecting success of 3070.345 'iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
+expecting success of 3070.75 'iwildmatch: no match 'foo' '*f'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo' '*f'
 		
-ok 345 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+ok 75 - iwildmatch: no match 'foo' '*f'
 
-expecting success of 3070.346 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.76 'iwildmatch (via ls-files): no match '*f' 'foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 346 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+ok 76 - iwildmatch (via ls-files): no match '*f' 'foo'
 
-expecting success of 3070.347 'pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
+expecting success of 3070.77 'pathmatch: no match 'foo' '*f'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '*f'
 		
-ok 347 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+ok 77 - pathmatch: no match 'foo' '*f'
 
-expecting success of 3070.348 'pathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.78 'pathmatch (via ls-files): no match '*f' 'foo'': 
+				>expect &&
+				git ls-files -z -- '*f' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 348 - pathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+ok 78 - pathmatch (via ls-files): no match '*f' 'foo'
 
-expecting success of 3070.349 'ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
+expecting success of 3070.79 'ipathmatch: no match 'foo' '*f'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '*f'
 		
-ok 349 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+ok 79 - ipathmatch: no match 'foo' '*f'
 
-expecting success of 3070.350 'ipathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
-				printf '%s' 'foo/b/a/z/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.80 'ipathmatch (via ls-files): no match '*f' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '*f' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 350 - ipathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+ok 80 - ipathmatch (via ls-files): no match '*f' 'foo'
 
-expecting success of 3070.351 'cleanup after previous file test': 
+expecting success of 3070.81 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -156658,10 +160489,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 351 - cleanup after previous file test
+Removing foo
+ok 81 - cleanup after previous file test
 
-expecting success of 3070.352 'setup match file test for foo/bar': 
+expecting success of 3070.82 'setup match file test for foo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156680,69 +160511,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 352 - setup match file test for foo/bar
+ok 82 - setup match file test for foo
 
-expecting success of 3070.353 'wildmatch: match 'foo/bar' 'foo/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/bar'
+expecting success of 3070.83 'wildmatch: match 'foo' '*foo*'': 
+			test-tool wildmatch wildmatch 'foo' '*foo*'
 		
-ok 353 - wildmatch: match 'foo/bar' 'foo/**/bar'
+ok 83 - wildmatch: match 'foo' '*foo*'
 
-expecting success of 3070.354 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.84 'wildmatch (via ls-files): match '*foo*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 354 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
+ok 84 - wildmatch (via ls-files): match '*foo*' 'foo'
 
-expecting success of 3070.355 'iwildmatch: match 'foo/bar' 'foo/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/bar'
+expecting success of 3070.85 'iwildmatch: match 'foo' '*foo*'': 
+			test-tool wildmatch iwildmatch 'foo' '*foo*'
 		
-ok 355 - iwildmatch: match 'foo/bar' 'foo/**/bar'
+ok 85 - iwildmatch: match 'foo' '*foo*'
 
-expecting success of 3070.356 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.86 'iwildmatch (via ls-files): match '*foo*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 356 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
+ok 86 - iwildmatch (via ls-files): match '*foo*' 'foo'
 
-expecting success of 3070.357 'pathmatch: no match 'foo/bar' 'foo/**/bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/bar'
+expecting success of 3070.87 'pathmatch: match 'foo' '*foo*'': 
+			test-tool wildmatch pathmatch 'foo' '*foo*'
 		
-ok 357 - pathmatch: no match 'foo/bar' 'foo/**/bar'
+ok 87 - pathmatch: match 'foo' '*foo*'
 
-expecting success of 3070.358 'pathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'': 
-				>expect &&
-				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.88 'pathmatch (via ls-files): match '*foo*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 358 - pathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
+ok 88 - pathmatch (via ls-files): match '*foo*' 'foo'
 
-expecting success of 3070.359 'ipathmatch: no match 'foo/bar' 'foo/**/bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/bar'
+expecting success of 3070.89 'ipathmatch: match 'foo' '*foo*'': 
+			test-tool wildmatch ipathmatch 'foo' '*foo*'
 		
-ok 359 - ipathmatch: no match 'foo/bar' 'foo/**/bar'
+ok 89 - ipathmatch: match 'foo' '*foo*'
 
-expecting success of 3070.360 'ipathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.90 'ipathmatch (via ls-files): match '*foo*' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '*foo*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 360 - ipathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
+ok 90 - ipathmatch (via ls-files): match '*foo*' 'foo'
 
-expecting success of 3070.361 'cleanup after previous file test': 
+expecting success of 3070.91 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -156753,10 +160584,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 361 - cleanup after previous file test
+Removing foo
+ok 91 - cleanup after previous file test
 
-expecting success of 3070.362 'setup match file test for foo/bar': 
+expecting success of 3070.92 'setup match file test for foobar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156775,69 +160606,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 362 - setup match file test for foo/bar
+ok 92 - setup match file test for foobar
 
-expecting success of 3070.363 'wildmatch: match 'foo/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/**/bar'
+expecting success of 3070.93 'wildmatch: match 'foobar' '*ob*a*r*'': 
+			test-tool wildmatch wildmatch 'foobar' '*ob*a*r*'
 		
-ok 363 - wildmatch: match 'foo/bar' 'foo/**/**/bar'
+ok 93 - wildmatch: match 'foobar' '*ob*a*r*'
 
-expecting success of 3070.364 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.94 'wildmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
+				printf '%s' 'foobar' >expect &&
+				git --glob-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 364 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
+ok 94 - wildmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
-expecting success of 3070.365 'iwildmatch: match 'foo/bar' 'foo/**/**/bar'': 
-			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/**/bar'
+expecting success of 3070.95 'iwildmatch: match 'foobar' '*ob*a*r*'': 
+			test-tool wildmatch iwildmatch 'foobar' '*ob*a*r*'
 		
-ok 365 - iwildmatch: match 'foo/bar' 'foo/**/**/bar'
+ok 95 - iwildmatch: match 'foobar' '*ob*a*r*'
 
-expecting success of 3070.366 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.96 'iwildmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
+				printf '%s' 'foobar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 366 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
+ok 96 - iwildmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
-expecting success of 3070.367 'pathmatch: no match 'foo/bar' 'foo/**/**/bar'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/**/bar'
+expecting success of 3070.97 'pathmatch: match 'foobar' '*ob*a*r*'': 
+			test-tool wildmatch pathmatch 'foobar' '*ob*a*r*'
 		
-ok 367 - pathmatch: no match 'foo/bar' 'foo/**/**/bar'
+ok 97 - pathmatch: match 'foobar' '*ob*a*r*'
 
-expecting success of 3070.368 'pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'': 
-				>expect &&
-				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.98 'pathmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
+				printf '%s' 'foobar' >expect &&
+				git ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 368 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
+ok 98 - pathmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
-expecting success of 3070.369 'ipathmatch: no match 'foo/bar' 'foo/**/**/bar'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/**/bar'
+expecting success of 3070.99 'ipathmatch: match 'foobar' '*ob*a*r*'': 
+			test-tool wildmatch ipathmatch 'foobar' '*ob*a*r*'
 		
-ok 369 - ipathmatch: no match 'foo/bar' 'foo/**/**/bar'
+ok 99 - ipathmatch: match 'foobar' '*ob*a*r*'
 
-expecting success of 3070.370 'ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+expecting success of 3070.100 'ipathmatch (via ls-files): match '*ob*a*r*' 'foobar'': 
+				printf '%s' 'foobar' >expect &&
+				git --icase-pathspecs ls-files -z -- '*ob*a*r*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 370 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
+ok 100 - ipathmatch (via ls-files): match '*ob*a*r*' 'foobar'
 
-expecting success of 3070.371 'cleanup after previous file test': 
+expecting success of 3070.101 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -156848,10 +160679,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 371 - cleanup after previous file test
+Removing foobar
+ok 101 - cleanup after previous file test
 
-expecting success of 3070.372 'setup match file test for foo/bar': 
+expecting success of 3070.102 'setup match file test for aaaaaaabababab': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156870,83 +160701,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 372 - setup match file test for foo/bar
+ok 102 - setup match file test for aaaaaaabababab
 
-expecting success of 3070.373 'wildmatch: no match 'foo/bar' 'foo?bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
+expecting success of 3070.103 'wildmatch: match 'aaaaaaabababab' '*ab'': 
+			test-tool wildmatch wildmatch 'aaaaaaabababab' '*ab'
 		
-ok 373 - wildmatch: no match 'foo/bar' 'foo?bar'
+ok 103 - wildmatch: match 'aaaaaaabababab' '*ab'
 
-expecting success of 3070.374 'wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+expecting success of 3070.104 'wildmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
+				printf '%s' 'aaaaaaabababab' >expect &&
+				git --glob-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 374 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+ok 104 - wildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
-expecting success of 3070.375 'iwildmatch: no match 'foo/bar' 'foo?bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
+expecting success of 3070.105 'iwildmatch: match 'aaaaaaabababab' '*ab'': 
+			test-tool wildmatch iwildmatch 'aaaaaaabababab' '*ab'
 		
-ok 375 - iwildmatch: no match 'foo/bar' 'foo?bar'
+ok 105 - iwildmatch: match 'aaaaaaabababab' '*ab'
 
-expecting success of 3070.376 'iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+expecting success of 3070.106 'iwildmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
+				printf '%s' 'aaaaaaabababab' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 376 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+ok 106 - iwildmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
-expecting success of 3070.377 'pathmatch: match 'foo/bar' 'foo?bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
+expecting success of 3070.107 'pathmatch: match 'aaaaaaabababab' '*ab'': 
+			test-tool wildmatch pathmatch 'aaaaaaabababab' '*ab'
 		
-ok 377 - pathmatch: match 'foo/bar' 'foo?bar'
+ok 107 - pathmatch: match 'aaaaaaabababab' '*ab'
 
-expecting success of 3070.378 'pathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+expecting success of 3070.108 'pathmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
+				printf '%s' 'aaaaaaabababab' >expect &&
+				git ls-files -z -- '*ab' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 378 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+ok 108 - pathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
-expecting success of 3070.379 'ipathmatch: match 'foo/bar' 'foo?bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
+expecting success of 3070.109 'ipathmatch: match 'aaaaaaabababab' '*ab'': 
+			test-tool wildmatch ipathmatch 'aaaaaaabababab' '*ab'
 		
-ok 379 - ipathmatch: match 'foo/bar' 'foo?bar'
+ok 109 - ipathmatch: match 'aaaaaaabababab' '*ab'
 
-expecting success of 3070.380 'ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+expecting success of 3070.110 'ipathmatch (via ls-files): match '*ab' 'aaaaaaabababab'': 
+				printf '%s' 'aaaaaaabababab' >expect &&
+				git --icase-pathspecs ls-files -z -- '*ab' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 380 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+ok 110 - ipathmatch (via ls-files): match '*ab' 'aaaaaaabababab'
 
-expecting success of 3070.381 'cleanup after previous file test': 
+expecting success of 3070.111 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing aaaaaaabababab
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 381 - cleanup after previous file test
+ok 111 - cleanup after previous file test
 
-expecting success of 3070.382 'setup match file test for foo/bar': 
+expecting success of 3070.112 'setup match file test for foo*': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -156965,69 +160796,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 382 - setup match file test for foo/bar
+ok 112 - setup match file test for foo*
 
-expecting success of 3070.383 'wildmatch: no match 'foo/bar' 'foo[/]bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
+expecting success of 3070.113 'wildmatch: match 'foo*' 'foo\*'': 
+			test-tool wildmatch wildmatch 'foo*' 'foo\*'
 		
-ok 383 - wildmatch: no match 'foo/bar' 'foo[/]bar'
+ok 113 - wildmatch: match 'foo*' 'foo\*'
 
-expecting success of 3070.384 'wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+expecting success of 3070.114 'wildmatch (via ls-files): match 'foo\*' 'foo*'': 
+				printf '%s' 'foo*' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 384 - wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+ok 114 - wildmatch (via ls-files): match 'foo\*' 'foo*'
 
-expecting success of 3070.385 'iwildmatch: no match 'foo/bar' 'foo[/]bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
+expecting success of 3070.115 'iwildmatch: match 'foo*' 'foo\*'': 
+			test-tool wildmatch iwildmatch 'foo*' 'foo\*'
 		
-ok 385 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
+ok 115 - iwildmatch: match 'foo*' 'foo\*'
 
-expecting success of 3070.386 'iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+expecting success of 3070.116 'iwildmatch (via ls-files): match 'foo\*' 'foo*'': 
+				printf '%s' 'foo*' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 386 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+ok 116 - iwildmatch (via ls-files): match 'foo\*' 'foo*'
 
-expecting success of 3070.387 'pathmatch: match 'foo/bar' 'foo[/]bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
+expecting success of 3070.117 'pathmatch: match 'foo*' 'foo\*'': 
+			test-tool wildmatch pathmatch 'foo*' 'foo\*'
 		
-ok 387 - pathmatch: match 'foo/bar' 'foo[/]bar'
+ok 117 - pathmatch: match 'foo*' 'foo\*'
 
-expecting success of 3070.388 'pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+expecting success of 3070.118 'pathmatch (via ls-files): match 'foo\*' 'foo*'': 
+				printf '%s' 'foo*' >expect &&
+				git ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 388 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+ok 118 - pathmatch (via ls-files): match 'foo\*' 'foo*'
 
-expecting success of 3070.389 'ipathmatch: match 'foo/bar' 'foo[/]bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
+expecting success of 3070.119 'ipathmatch: match 'foo*' 'foo\*'': 
+			test-tool wildmatch ipathmatch 'foo*' 'foo\*'
 		
-ok 389 - ipathmatch: match 'foo/bar' 'foo[/]bar'
+ok 119 - ipathmatch: match 'foo*' 'foo\*'
 
-expecting success of 3070.390 'ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+expecting success of 3070.120 'ipathmatch (via ls-files): match 'foo\*' 'foo*'': 
+				printf '%s' 'foo*' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo\*' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 390 - ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+ok 120 - ipathmatch (via ls-files): match 'foo\*' 'foo*'
 
-expecting success of 3070.391 'cleanup after previous file test': 
+expecting success of 3070.121 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -157038,10 +160869,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 391 - cleanup after previous file test
+Removing foo*
+ok 121 - cleanup after previous file test
 
-expecting success of 3070.392 'setup match file test for foo/bar': 
+expecting success of 3070.122 'setup match file test for foobar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157060,69 +160891,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 392 - setup match file test for foo/bar
+ok 122 - setup match file test for foobar
 
-expecting success of 3070.393 'wildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
+expecting success of 3070.123 'wildmatch: no match 'foobar' 'foo\*bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foobar' 'foo\*bar'
 		
-ok 393 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+ok 123 - wildmatch: no match 'foobar' 'foo\*bar'
 
-expecting success of 3070.394 'wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
+expecting success of 3070.124 'wildmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo[^a-z]bar' >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 394 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+ok 124 - wildmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
-expecting success of 3070.395 'iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
+expecting success of 3070.125 'iwildmatch: no match 'foobar' 'foo\*bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foobar' 'foo\*bar'
 		
-ok 395 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+ok 125 - iwildmatch: no match 'foobar' 'foo\*bar'
 
-expecting success of 3070.396 'iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
+expecting success of 3070.126 'iwildmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >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 396 - iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+ok 126 - iwildmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
-expecting success of 3070.397 'pathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
+expecting success of 3070.127 'pathmatch: no match 'foobar' 'foo\*bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foobar' 'foo\*bar'
 		
-ok 397 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
+ok 127 - pathmatch: no match 'foobar' 'foo\*bar'
 
-expecting success of 3070.398 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+expecting success of 3070.128 'pathmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
+				>expect &&
+				git ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 398 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+ok 128 - pathmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
-expecting success of 3070.399 'ipathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
+expecting success of 3070.129 'ipathmatch: no match 'foobar' 'foo\*bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foobar' 'foo\*bar'
 		
-ok 399 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
+ok 129 - ipathmatch: no match 'foobar' 'foo\*bar'
 
-expecting success of 3070.400 'ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+expecting success of 3070.130 'ipathmatch (via ls-files): no match 'foo\*bar' 'foobar'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo\*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 400 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+ok 130 - ipathmatch (via ls-files): no match 'foo\*bar' 'foobar'
 
-expecting success of 3070.401 'cleanup after previous file test': 
+expecting success of 3070.131 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -157133,10 +160964,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 401 - cleanup after previous file test
+Removing foobar
+ok 131 - cleanup after previous file test
 
-expecting success of 3070.402 'setup match file test for foo/bar': 
+expecting success of 3070.132 'setup match file test for f\oo': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157155,69 +160986,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 402 - setup match file test for foo/bar
+ok 132 - setup match file test for f\oo
 
-expecting success of 3070.403 'wildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+expecting success of 3070.133 'wildmatch: match 'f\oo' 'f\\oo'': 
+			test-tool wildmatch wildmatch 'f\oo' 'f\\oo'
 		
-ok 403 - wildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+ok 133 - wildmatch: match 'f\oo' 'f\\oo'
 
-expecting success of 3070.404 'wildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+expecting success of 3070.134 'wildmatch (via ls-files): match 'f\\oo' 'f\oo'': 
+				printf '%s' 'f\oo' >expect &&
+				git --glob-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 404 - wildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+ok 134 - wildmatch (via ls-files): match 'f\\oo' 'f\oo'
 
-expecting success of 3070.405 'iwildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+expecting success of 3070.135 'iwildmatch: match 'f\oo' 'f\\oo'': 
+			test-tool wildmatch iwildmatch 'f\oo' 'f\\oo'
 		
-ok 405 - iwildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+ok 135 - iwildmatch: match 'f\oo' 'f\\oo'
 
-expecting success of 3070.406 'iwildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+expecting success of 3070.136 'iwildmatch (via ls-files): match 'f\\oo' 'f\oo'': 
+				printf '%s' 'f\oo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 406 - iwildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+ok 136 - iwildmatch (via ls-files): match 'f\\oo' 'f\oo'
 
-expecting success of 3070.407 'pathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch pathmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+expecting success of 3070.137 'pathmatch: match 'f\oo' 'f\\oo'': 
+			test-tool wildmatch pathmatch 'f\oo' 'f\\oo'
 		
-ok 407 - pathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+ok 137 - pathmatch: match 'f\oo' 'f\\oo'
 
-expecting success of 3070.408 'pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+expecting success of 3070.138 'pathmatch (via ls-files): match 'f\\oo' 'f\oo'': 
+				printf '%s' 'f\oo' >expect &&
+				git ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 408 - pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+ok 138 - pathmatch (via ls-files): match 'f\\oo' 'f\oo'
 
-expecting success of 3070.409 'ipathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch ipathmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+expecting success of 3070.139 'ipathmatch: match 'f\oo' 'f\\oo'': 
+			test-tool wildmatch ipathmatch 'f\oo' 'f\\oo'
 		
-ok 409 - ipathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+ok 139 - ipathmatch: match 'f\oo' 'f\\oo'
 
-expecting success of 3070.410 'ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+expecting success of 3070.140 'ipathmatch (via ls-files): match 'f\\oo' 'f\oo'': 
+				printf '%s' 'f\oo' >expect &&
+				git --icase-pathspecs ls-files -z -- 'f\\oo' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 410 - ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+ok 140 - ipathmatch (via ls-files): match 'f\\oo' 'f\oo'
 
-expecting success of 3070.411 'cleanup after previous file test': 
+expecting success of 3070.141 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -157228,10 +161059,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 411 - cleanup after previous file test
+Removing "f\\oo"
+ok 141 - cleanup after previous file test
 
-expecting success of 3070.412 'setup match file test for foo-bar': 
+expecting success of 3070.142 'setup match file test for ball': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157250,69 +161081,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 412 - setup match file test for foo-bar
+ok 142 - setup match file test for ball
 
-expecting success of 3070.413 'wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch wildmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+expecting success of 3070.143 'wildmatch: match 'ball' '*[al]?'': 
+			test-tool wildmatch wildmatch 'ball' '*[al]?'
 		
-ok 413 - wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+ok 143 - wildmatch: match 'ball' '*[al]?'
 
-expecting success of 3070.414 'wildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
-				printf '%s' 'foo-bar' >expect &&
-				git --glob-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+expecting success of 3070.144 'wildmatch (via ls-files): match '*[al]?' 'ball'': 
+				printf '%s' 'ball' >expect &&
+				git --glob-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 414 - wildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+ok 144 - wildmatch (via ls-files): match '*[al]?' 'ball'
 
-expecting success of 3070.415 'iwildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch iwildmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+expecting success of 3070.145 'iwildmatch: match 'ball' '*[al]?'': 
+			test-tool wildmatch iwildmatch 'ball' '*[al]?'
 		
-ok 415 - iwildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+ok 145 - iwildmatch: match 'ball' '*[al]?'
 
-expecting success of 3070.416 'iwildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
-				printf '%s' 'foo-bar' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+expecting success of 3070.146 'iwildmatch (via ls-files): match '*[al]?' 'ball'': 
+				printf '%s' 'ball' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 416 - iwildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+ok 146 - iwildmatch (via ls-files): match '*[al]?' 'ball'
 
-expecting success of 3070.417 'pathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch pathmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+expecting success of 3070.147 'pathmatch: match 'ball' '*[al]?'': 
+			test-tool wildmatch pathmatch 'ball' '*[al]?'
 		
-ok 417 - pathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+ok 147 - pathmatch: match 'ball' '*[al]?'
 
-expecting success of 3070.418 'pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
-				printf '%s' 'foo-bar' >expect &&
-				git ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+expecting success of 3070.148 'pathmatch (via ls-files): match '*[al]?' 'ball'': 
+				printf '%s' 'ball' >expect &&
+				git ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 418 - pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+ok 148 - pathmatch (via ls-files): match '*[al]?' 'ball'
 
-expecting success of 3070.419 'ipathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
-			test-tool wildmatch ipathmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+expecting success of 3070.149 'ipathmatch: match 'ball' '*[al]?'': 
+			test-tool wildmatch ipathmatch 'ball' '*[al]?'
 		
-ok 419 - ipathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+ok 149 - ipathmatch: match 'ball' '*[al]?'
 
-expecting success of 3070.420 'ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
-				printf '%s' 'foo-bar' >expect &&
-				git --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+expecting success of 3070.150 'ipathmatch (via ls-files): match '*[al]?' 'ball'': 
+				printf '%s' 'ball' >expect &&
+				git --icase-pathspecs ls-files -z -- '*[al]?' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 420 - ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+ok 150 - ipathmatch (via ls-files): match '*[al]?' 'ball'
 
-expecting success of 3070.421 'cleanup after previous file test': 
+expecting success of 3070.151 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -157322,11 +161153,11 @@
 Removing actual
 Removing actual.err
 Removing actual.raw
+Removing ball
 Removing expect
-Removing foo-bar
-ok 421 - cleanup after previous file test
+ok 151 - cleanup after previous file test
 
-expecting success of 3070.422 'setup match file test for foo': 
+expecting success of 3070.152 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157345,69 +161176,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 422 - setup match file test for foo
+ok 152 - setup match file test for ten
 
-expecting success of 3070.423 'wildmatch: match 'foo' '**/foo'': 
-			test-tool wildmatch wildmatch 'foo' '**/foo'
+expecting success of 3070.153 'wildmatch: no match 'ten' '[ten]'': 
+			test_must_fail test-tool wildmatch wildmatch 'ten' '[ten]'
 		
-ok 423 - wildmatch: match 'foo' '**/foo'
+ok 153 - wildmatch: no match 'ten' '[ten]'
 
-expecting success of 3070.424 'wildmatch (via ls-files): match '**/foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.154 'wildmatch (via ls-files): no match '[ten]' 'ten'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 424 - wildmatch (via ls-files): match '**/foo' 'foo'
+ok 154 - wildmatch (via ls-files): no match '[ten]' 'ten'
 
-expecting success of 3070.425 'iwildmatch: match 'foo' '**/foo'': 
-			test-tool wildmatch iwildmatch 'foo' '**/foo'
+expecting success of 3070.155 'iwildmatch: no match 'ten' '[ten]'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ten' '[ten]'
 		
-ok 425 - iwildmatch: match 'foo' '**/foo'
+ok 155 - iwildmatch: no match 'ten' '[ten]'
 
-expecting success of 3070.426 'iwildmatch (via ls-files): match '**/foo' 'foo'': 
-				printf '%s' 'foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.156 'iwildmatch (via ls-files): no match '[ten]' 'ten'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 426 - iwildmatch (via ls-files): match '**/foo' 'foo'
+ok 156 - iwildmatch (via ls-files): no match '[ten]' 'ten'
 
-expecting success of 3070.427 'pathmatch: no match 'foo' '**/foo'': 
-			test_must_fail test-tool wildmatch pathmatch 'foo' '**/foo'
+expecting success of 3070.157 'pathmatch: no match 'ten' '[ten]'': 
+			test_must_fail test-tool wildmatch pathmatch 'ten' '[ten]'
 		
-ok 427 - pathmatch: no match 'foo' '**/foo'
+ok 157 - pathmatch: no match 'ten' '[ten]'
 
-expecting success of 3070.428 'pathmatch (via ls-files): no match '**/foo' 'foo'': 
+expecting success of 3070.158 'pathmatch (via ls-files): no match '[ten]' 'ten'': 
 				>expect &&
-				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				git ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 428 - pathmatch (via ls-files): no match '**/foo' 'foo'
+ok 158 - pathmatch (via ls-files): no match '[ten]' 'ten'
 
-expecting success of 3070.429 'ipathmatch: no match 'foo' '**/foo'': 
-			test_must_fail test-tool wildmatch ipathmatch 'foo' '**/foo'
+expecting success of 3070.159 'ipathmatch: no match 'ten' '[ten]'': 
+			test_must_fail test-tool wildmatch ipathmatch 'ten' '[ten]'
 		
-ok 429 - ipathmatch: no match 'foo' '**/foo'
+ok 159 - ipathmatch: no match 'ten' '[ten]'
 
-expecting success of 3070.430 'ipathmatch (via ls-files): no match '**/foo' 'foo'': 
+expecting success of 3070.160 'ipathmatch (via ls-files): no match '[ten]' 'ten'': 
 				>expect &&
-				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				git --icase-pathspecs ls-files -z -- '[ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 430 - ipathmatch (via ls-files): no match '**/foo' 'foo'
+ok 160 - ipathmatch (via ls-files): no match '[ten]' 'ten'
 
-expecting success of 3070.431 'cleanup after previous file test': 
+expecting success of 3070.161 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -157418,10 +161249,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo
-ok 431 - cleanup after previous file test
+Removing ten
+ok 161 - cleanup after previous file test
 
-expecting success of 3070.432 'setup match file test for XXX/foo': 
+expecting success of 3070.162 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157440,83 +161271,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 432 - setup match file test for XXX/foo
+ok 162 - setup match file test for ten
 
-expecting success of 3070.433 'wildmatch: match 'XXX/foo' '**/foo'': 
-			test-tool wildmatch wildmatch 'XXX/foo' '**/foo'
+expecting success of 3070.163 'wildmatch: match 'ten' '**[!te]'': 
+			test-tool wildmatch wildmatch 'ten' '**[!te]'
 		
-ok 433 - wildmatch: match 'XXX/foo' '**/foo'
+ok 163 - wildmatch: match 'ten' '**[!te]'
 
-expecting success of 3070.434 'wildmatch (via ls-files): match '**/foo' 'XXX/foo'': 
-				printf '%s' 'XXX/foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.164 'wildmatch (via ls-files): match '**[!te]' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --glob-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 434 - wildmatch (via ls-files): match '**/foo' 'XXX/foo'
+ok 164 - wildmatch (via ls-files): match '**[!te]' 'ten'
 
-expecting success of 3070.435 'iwildmatch: match 'XXX/foo' '**/foo'': 
-			test-tool wildmatch iwildmatch 'XXX/foo' '**/foo'
+expecting success of 3070.165 'iwildmatch: match 'ten' '**[!te]'': 
+			test-tool wildmatch iwildmatch 'ten' '**[!te]'
 		
-ok 435 - iwildmatch: match 'XXX/foo' '**/foo'
+ok 165 - iwildmatch: match 'ten' '**[!te]'
 
-expecting success of 3070.436 'iwildmatch (via ls-files): match '**/foo' 'XXX/foo'': 
-				printf '%s' 'XXX/foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.166 'iwildmatch (via ls-files): match '**[!te]' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 436 - iwildmatch (via ls-files): match '**/foo' 'XXX/foo'
+ok 166 - iwildmatch (via ls-files): match '**[!te]' 'ten'
 
-expecting success of 3070.437 'pathmatch: match 'XXX/foo' '**/foo'': 
-			test-tool wildmatch pathmatch 'XXX/foo' '**/foo'
+expecting success of 3070.167 'pathmatch: match 'ten' '**[!te]'': 
+			test-tool wildmatch pathmatch 'ten' '**[!te]'
 		
-ok 437 - pathmatch: match 'XXX/foo' '**/foo'
+ok 167 - pathmatch: match 'ten' '**[!te]'
 
-expecting success of 3070.438 'pathmatch (via ls-files): match '**/foo' 'XXX/foo'': 
-				printf '%s' 'XXX/foo' >expect &&
-				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.168 'pathmatch (via ls-files): match '**[!te]' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 438 - pathmatch (via ls-files): match '**/foo' 'XXX/foo'
+ok 168 - pathmatch (via ls-files): match '**[!te]' 'ten'
 
-expecting success of 3070.439 'ipathmatch: match 'XXX/foo' '**/foo'': 
-			test-tool wildmatch ipathmatch 'XXX/foo' '**/foo'
+expecting success of 3070.169 'ipathmatch: match 'ten' '**[!te]'': 
+			test-tool wildmatch ipathmatch 'ten' '**[!te]'
 		
-ok 439 - ipathmatch: match 'XXX/foo' '**/foo'
+ok 169 - ipathmatch: match 'ten' '**[!te]'
 
-expecting success of 3070.440 'ipathmatch (via ls-files): match '**/foo' 'XXX/foo'': 
-				printf '%s' 'XXX/foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.170 'ipathmatch (via ls-files): match '**[!te]' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --icase-pathspecs ls-files -z -- '**[!te]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 440 - ipathmatch (via ls-files): match '**/foo' 'XXX/foo'
+ok 170 - ipathmatch (via ls-files): match '**[!te]' 'ten'
 
-expecting success of 3070.441 'cleanup after previous file test': 
+expecting success of 3070.171 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing XXX/
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 441 - cleanup after previous file test
+Removing ten
+ok 171 - cleanup after previous file test
 
-expecting success of 3070.442 'setup match file test for bar/baz/foo': 
+expecting success of 3070.172 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157535,69 +161366,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 442 - setup match file test for bar/baz/foo
+ok 172 - setup match file test for ten
 
-expecting success of 3070.443 'wildmatch: match 'bar/baz/foo' '**/foo'': 
-			test-tool wildmatch wildmatch 'bar/baz/foo' '**/foo'
+expecting success of 3070.173 'wildmatch: no match 'ten' '**[!ten]'': 
+			test_must_fail test-tool wildmatch wildmatch 'ten' '**[!ten]'
 		
-ok 443 - wildmatch: match 'bar/baz/foo' '**/foo'
+ok 173 - wildmatch: no match 'ten' '**[!ten]'
 
-expecting success of 3070.444 'wildmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.174 'wildmatch (via ls-files): no match '**[!ten]' 'ten'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 444 - wildmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+ok 174 - wildmatch (via ls-files): no match '**[!ten]' 'ten'
 
-expecting success of 3070.445 'iwildmatch: match 'bar/baz/foo' '**/foo'': 
-			test-tool wildmatch iwildmatch 'bar/baz/foo' '**/foo'
+expecting success of 3070.175 'iwildmatch: no match 'ten' '**[!ten]'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ten' '**[!ten]'
 		
-ok 445 - iwildmatch: match 'bar/baz/foo' '**/foo'
+ok 175 - iwildmatch: no match 'ten' '**[!ten]'
 
-expecting success of 3070.446 'iwildmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.176 'iwildmatch (via ls-files): no match '**[!ten]' 'ten'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 446 - iwildmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+ok 176 - iwildmatch (via ls-files): no match '**[!ten]' 'ten'
 
-expecting success of 3070.447 'pathmatch: match 'bar/baz/foo' '**/foo'': 
-			test-tool wildmatch pathmatch 'bar/baz/foo' '**/foo'
+expecting success of 3070.177 'pathmatch: no match 'ten' '**[!ten]'': 
+			test_must_fail test-tool wildmatch pathmatch 'ten' '**[!ten]'
 		
-ok 447 - pathmatch: match 'bar/baz/foo' '**/foo'
+ok 177 - pathmatch: no match 'ten' '**[!ten]'
 
-expecting success of 3070.448 'pathmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.178 'pathmatch (via ls-files): no match '**[!ten]' 'ten'': 
+				>expect &&
+				git ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 448 - pathmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+ok 178 - pathmatch (via ls-files): no match '**[!ten]' 'ten'
 
-expecting success of 3070.449 'ipathmatch: match 'bar/baz/foo' '**/foo'': 
-			test-tool wildmatch ipathmatch 'bar/baz/foo' '**/foo'
+expecting success of 3070.179 'ipathmatch: no match 'ten' '**[!ten]'': 
+			test_must_fail test-tool wildmatch ipathmatch 'ten' '**[!ten]'
 		
-ok 449 - ipathmatch: match 'bar/baz/foo' '**/foo'
+ok 179 - ipathmatch: no match 'ten' '**[!ten]'
 
-expecting success of 3070.450 'ipathmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.180 'ipathmatch (via ls-files): no match '**[!ten]' 'ten'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '**[!ten]' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 450 - ipathmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+ok 180 - ipathmatch (via ls-files): no match '**[!ten]' 'ten'
 
-expecting success of 3070.451 'cleanup after previous file test': 
+expecting success of 3070.181 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -157607,11 +161438,11 @@
 Removing actual
 Removing actual.err
 Removing actual.raw
-Removing bar/
 Removing expect
-ok 451 - cleanup after previous file test
+Removing ten
+ok 181 - cleanup after previous file test
 
-expecting success of 3070.452 'setup match file test for bar/baz/foo': 
+expecting success of 3070.182 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157630,69 +161461,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 452 - setup match file test for bar/baz/foo
+ok 182 - setup match file test for ten
 
-expecting success of 3070.453 'wildmatch: no match 'bar/baz/foo' '*/foo'': 
-			test_must_fail test-tool wildmatch wildmatch 'bar/baz/foo' '*/foo'
+expecting success of 3070.183 'wildmatch: match 'ten' 't[a-g]n'': 
+			test-tool wildmatch wildmatch 'ten' 't[a-g]n'
 		
-ok 453 - wildmatch: no match 'bar/baz/foo' '*/foo'
+ok 183 - wildmatch: match 'ten' 't[a-g]n'
 
-expecting success of 3070.454 'wildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.184 'wildmatch (via ls-files): match 't[a-g]n' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --glob-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 454 - wildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'
+ok 184 - wildmatch (via ls-files): match 't[a-g]n' 'ten'
 
-expecting success of 3070.455 'iwildmatch: no match 'bar/baz/foo' '*/foo'': 
-			test_must_fail test-tool wildmatch iwildmatch 'bar/baz/foo' '*/foo'
+expecting success of 3070.185 'iwildmatch: match 'ten' 't[a-g]n'': 
+			test-tool wildmatch iwildmatch 'ten' 't[a-g]n'
 		
-ok 455 - iwildmatch: no match 'bar/baz/foo' '*/foo'
+ok 185 - iwildmatch: match 'ten' 't[a-g]n'
 
-expecting success of 3070.456 'iwildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.186 'iwildmatch (via ls-files): match 't[a-g]n' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 456 - iwildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'
+ok 186 - iwildmatch (via ls-files): match 't[a-g]n' 'ten'
 
-expecting success of 3070.457 'pathmatch: match 'bar/baz/foo' '*/foo'': 
-			test-tool wildmatch pathmatch 'bar/baz/foo' '*/foo'
+expecting success of 3070.187 'pathmatch: match 'ten' 't[a-g]n'': 
+			test-tool wildmatch pathmatch 'ten' 't[a-g]n'
 		
-ok 457 - pathmatch: match 'bar/baz/foo' '*/foo'
+ok 187 - pathmatch: match 'ten' 't[a-g]n'
 
-expecting success of 3070.458 'pathmatch (via ls-files): match '*/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.188 'pathmatch (via ls-files): match 't[a-g]n' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 458 - pathmatch (via ls-files): match '*/foo' 'bar/baz/foo'
+ok 188 - pathmatch (via ls-files): match 't[a-g]n' 'ten'
 
-expecting success of 3070.459 'ipathmatch: match 'bar/baz/foo' '*/foo'': 
-			test-tool wildmatch ipathmatch 'bar/baz/foo' '*/foo'
+expecting success of 3070.189 'ipathmatch: match 'ten' 't[a-g]n'': 
+			test-tool wildmatch ipathmatch 'ten' 't[a-g]n'
 		
-ok 459 - ipathmatch: match 'bar/baz/foo' '*/foo'
+ok 189 - ipathmatch: match 'ten' 't[a-g]n'
 
-expecting success of 3070.460 'ipathmatch (via ls-files): match '*/foo' 'bar/baz/foo'': 
-				printf '%s' 'bar/baz/foo' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
+expecting success of 3070.190 'ipathmatch (via ls-files): match 't[a-g]n' 'ten'': 
+				printf '%s' 'ten' >expect &&
+				git --icase-pathspecs ls-files -z -- 't[a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 460 - ipathmatch (via ls-files): match '*/foo' 'bar/baz/foo'
+ok 190 - ipathmatch (via ls-files): match 't[a-g]n' 'ten'
 
-expecting success of 3070.461 'cleanup after previous file test': 
+expecting success of 3070.191 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -157702,11 +161533,11 @@
 Removing actual
 Removing actual.err
 Removing actual.raw
-Removing bar/
 Removing expect
-ok 461 - cleanup after previous file test
+Removing ten
+ok 191 - cleanup after previous file test
 
-expecting success of 3070.462 'setup match file test for foo/bar/baz': 
+expecting success of 3070.192 'setup match file test for ten': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157725,69 +161556,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 462 - setup match file test for foo/bar/baz
+ok 192 - setup match file test for ten
 
-expecting success of 3070.463 'wildmatch: no match 'foo/bar/baz' '**/bar*'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar*'
+expecting success of 3070.193 'wildmatch: no match 'ten' 't[!a-g]n'': 
+			test_must_fail test-tool wildmatch wildmatch 'ten' 't[!a-g]n'
 		
-ok 463 - wildmatch: no match 'foo/bar/baz' '**/bar*'
+ok 193 - wildmatch: no match 'ten' 't[!a-g]n'
 
-expecting success of 3070.464 'wildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'': 
+expecting success of 3070.194 'wildmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 464 - wildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'
+ok 194 - wildmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
-expecting success of 3070.465 'iwildmatch: no match 'foo/bar/baz' '**/bar*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar*'
+expecting success of 3070.195 'iwildmatch: no match 'ten' 't[!a-g]n'': 
+			test_must_fail test-tool wildmatch iwildmatch 'ten' 't[!a-g]n'
 		
-ok 465 - iwildmatch: no match 'foo/bar/baz' '**/bar*'
+ok 195 - iwildmatch: no match 'ten' 't[!a-g]n'
 
-expecting success of 3070.466 'iwildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'': 
+expecting success of 3070.196 'iwildmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 466 - iwildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'
+ok 196 - iwildmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
-expecting success of 3070.467 'pathmatch: match 'foo/bar/baz' '**/bar*'': 
-			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar*'
+expecting success of 3070.197 'pathmatch: no match 'ten' 't[!a-g]n'': 
+			test_must_fail test-tool wildmatch pathmatch 'ten' 't[!a-g]n'
 		
-ok 467 - pathmatch: match 'foo/bar/baz' '**/bar*'
+ok 197 - pathmatch: no match 'ten' 't[!a-g]n'
 
-expecting success of 3070.468 'pathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'': 
-				printf '%s' 'foo/bar/baz' >expect &&
-				git ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
+expecting success of 3070.198 'pathmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
+				>expect &&
+				git ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 468 - pathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'
+ok 198 - pathmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
-expecting success of 3070.469 'ipathmatch: match 'foo/bar/baz' '**/bar*'': 
-			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar*'
+expecting success of 3070.199 'ipathmatch: no match 'ten' 't[!a-g]n'': 
+			test_must_fail test-tool wildmatch ipathmatch 'ten' 't[!a-g]n'
 		
-ok 469 - ipathmatch: match 'foo/bar/baz' '**/bar*'
+ok 199 - ipathmatch: no match 'ten' 't[!a-g]n'
 
-expecting success of 3070.470 'ipathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'': 
-				printf '%s' 'foo/bar/baz' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
+expecting success of 3070.200 'ipathmatch (via ls-files): no match 't[!a-g]n' 'ten'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 470 - ipathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'
+ok 200 - ipathmatch (via ls-files): no match 't[!a-g]n' 'ten'
 
-expecting success of 3070.471 'cleanup after previous file test': 
+expecting success of 3070.201 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -157798,10 +161629,10 @@
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 471 - cleanup after previous file test
+Removing ten
+ok 201 - cleanup after previous file test
 
-expecting success of 3070.472 'setup match file test for deep/foo/bar/baz': 
+expecting success of 3070.202 'setup match file test for ton': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157820,69 +161651,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 472 - setup match file test for deep/foo/bar/baz
+ok 202 - setup match file test for ton
 
-expecting success of 3070.473 'wildmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
-			test-tool wildmatch wildmatch 'deep/foo/bar/baz' '**/bar/*'
+expecting success of 3070.203 'wildmatch: match 'ton' 't[!a-g]n'': 
+			test-tool wildmatch wildmatch 'ton' 't[!a-g]n'
 		
-ok 473 - wildmatch: match 'deep/foo/bar/baz' '**/bar/*'
+ok 203 - wildmatch: match 'ton' 't[!a-g]n'
 
-expecting success of 3070.474 'wildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
-				printf '%s' 'deep/foo/bar/baz' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+expecting success of 3070.204 'wildmatch (via ls-files): match 't[!a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --glob-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 474 - wildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+ok 204 - wildmatch (via ls-files): match 't[!a-g]n' 'ton'
 
-expecting success of 3070.475 'iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/baz' '**/bar/*'
+expecting success of 3070.205 'iwildmatch: match 'ton' 't[!a-g]n'': 
+			test-tool wildmatch iwildmatch 'ton' 't[!a-g]n'
 		
-ok 475 - iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'
+ok 205 - iwildmatch: match 'ton' 't[!a-g]n'
 
-expecting success of 3070.476 'iwildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
-				printf '%s' 'deep/foo/bar/baz' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+expecting success of 3070.206 'iwildmatch (via ls-files): match 't[!a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 476 - iwildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+ok 206 - iwildmatch (via ls-files): match 't[!a-g]n' 'ton'
 
-expecting success of 3070.477 'pathmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz' '**/bar/*'
+expecting success of 3070.207 'pathmatch: match 'ton' 't[!a-g]n'': 
+			test-tool wildmatch pathmatch 'ton' 't[!a-g]n'
 		
-ok 477 - pathmatch: match 'deep/foo/bar/baz' '**/bar/*'
+ok 207 - pathmatch: match 'ton' 't[!a-g]n'
 
-expecting success of 3070.478 'pathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
-				printf '%s' 'deep/foo/bar/baz' >expect &&
-				git ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+expecting success of 3070.208 'pathmatch (via ls-files): match 't[!a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 478 - pathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+ok 208 - pathmatch (via ls-files): match 't[!a-g]n' 'ton'
 
-expecting success of 3070.479 'ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz' '**/bar/*'
+expecting success of 3070.209 'ipathmatch: match 'ton' 't[!a-g]n'': 
+			test-tool wildmatch ipathmatch 'ton' 't[!a-g]n'
 		
-ok 479 - ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'
+ok 209 - ipathmatch: match 'ton' 't[!a-g]n'
 
-expecting success of 3070.480 'ipathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
-				printf '%s' 'deep/foo/bar/baz' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+expecting success of 3070.210 'ipathmatch (via ls-files): match 't[!a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --icase-pathspecs ls-files -z -- 't[!a-g]n' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 480 - ipathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+ok 210 - ipathmatch (via ls-files): match 't[!a-g]n' 'ton'
 
-expecting success of 3070.481 'cleanup after previous file test': 
+expecting success of 3070.211 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -157892,11 +161723,11 @@
 Removing actual
 Removing actual.err
 Removing actual.raw
-Removing deep/
 Removing expect
-ok 481 - cleanup after previous file test
+Removing ton
+ok 211 - cleanup after previous file test
 
-expecting success of 3070.482 'setup match file test for deep/foo/bar/baz/': 
+expecting success of 3070.212 'setup match file test for ton': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157915,50 +161746,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 482 - setup match file test for deep/foo/bar/baz/
+ok 212 - setup match file test for ton
 
-expecting success of 3070.483 'wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/*'
+expecting success of 3070.213 'wildmatch: match 'ton' 't[^a-g]n'': 
+			test-tool wildmatch wildmatch 'ton' 't[^a-g]n'
 		
-ok 483 - wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
+ok 213 - wildmatch: match 'ton' 't[^a-g]n'
 
-checking known breakage of 3070.484 'wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/'': false
-not ok 484 - wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success of 3070.214 'wildmatch (via ls-files): match 't[^a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --glob-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 214 - wildmatch (via ls-files): match 't[^a-g]n' 'ton'
 
-expecting success of 3070.485 'iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/*'
+expecting success of 3070.215 'iwildmatch: match 'ton' 't[^a-g]n'': 
+			test-tool wildmatch iwildmatch 'ton' 't[^a-g]n'
 		
-ok 485 - iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
+ok 215 - iwildmatch: match 'ton' 't[^a-g]n'
 
-checking known breakage of 3070.486 'iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/'': false
-not ok 486 - iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success of 3070.216 'iwildmatch (via ls-files): match 't[^a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 216 - iwildmatch (via ls-files): match 't[^a-g]n' 'ton'
 
-expecting success of 3070.487 'pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/*'
+expecting success of 3070.217 'pathmatch: match 'ton' 't[^a-g]n'': 
+			test-tool wildmatch pathmatch 'ton' 't[^a-g]n'
 		
-ok 487 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+ok 217 - pathmatch: match 'ton' 't[^a-g]n'
 
-checking known breakage of 3070.488 'pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/'': false
-not ok 488 - pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success of 3070.218 'pathmatch (via ls-files): match 't[^a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 218 - pathmatch (via ls-files): match 't[^a-g]n' 'ton'
 
-expecting success of 3070.489 'ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/*'
+expecting success of 3070.219 'ipathmatch: match 'ton' 't[^a-g]n'': 
+			test-tool wildmatch ipathmatch 'ton' 't[^a-g]n'
 		
-ok 489 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+ok 219 - ipathmatch: match 'ton' 't[^a-g]n'
 
-checking known breakage of 3070.490 'ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/'': false
-not ok 490 - ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success of 3070.220 'ipathmatch (via ls-files): match 't[^a-g]n' 'ton'': 
+				printf '%s' 'ton' >expect &&
+				git --icase-pathspecs ls-files -z -- 't[^a-g]n' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 220 - ipathmatch (via ls-files): match 't[^a-g]n' 'ton'
 
-expecting success of 3070.491 'cleanup after previous file test': 
+expecting success of 3070.221 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-ok 491 - cleanup after previous file test
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing ton
+ok 221 - cleanup after previous file test
 
-expecting success of 3070.492 'setup match file test for deep/foo/bar/baz/': 
+expecting success of 3070.222 'setup match file test for a]b': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -157977,50 +161841,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 492 - setup match file test for deep/foo/bar/baz/
+ok 222 - setup match file test for a]b
 
-expecting success of 3070.493 'wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
-			test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/**'
+expecting success of 3070.223 'wildmatch: match 'a]b' 'a[]]b'': 
+			test-tool wildmatch wildmatch 'a]b' 'a[]]b'
 		
-ok 493 - wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+ok 223 - wildmatch: match 'a]b' 'a[]]b'
 
-checking known breakage of 3070.494 'wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
-not ok 494 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success of 3070.224 'wildmatch (via ls-files): match 'a[]]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 224 - wildmatch (via ls-files): match 'a[]]b' 'a]b'
 
-expecting success of 3070.495 'iwildmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/**'
+expecting success of 3070.225 'iwildmatch: match 'a]b' 'a[]]b'': 
+			test-tool wildmatch iwildmatch 'a]b' 'a[]]b'
 		
-ok 495 - iwildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+ok 225 - iwildmatch: match 'a]b' 'a[]]b'
 
-checking known breakage of 3070.496 'iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
-not ok 496 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success of 3070.226 'iwildmatch (via ls-files): match 'a[]]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 226 - iwildmatch (via ls-files): match 'a[]]b' 'a]b'
 
-expecting success of 3070.497 'pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/**'
+expecting success of 3070.227 'pathmatch: match 'a]b' 'a[]]b'': 
+			test-tool wildmatch pathmatch 'a]b' 'a[]]b'
 		
-ok 497 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+ok 227 - pathmatch: match 'a]b' 'a[]]b'
 
-checking known breakage of 3070.498 'pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
-not ok 498 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success of 3070.228 'pathmatch (via ls-files): match 'a[]]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 228 - pathmatch (via ls-files): match 'a[]]b' 'a]b'
 
-expecting success of 3070.499 'ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/**'
+expecting success of 3070.229 'ipathmatch: match 'a]b' 'a[]]b'': 
+			test-tool wildmatch ipathmatch 'a]b' 'a[]]b'
 		
-ok 499 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+ok 229 - ipathmatch: match 'a]b' 'a[]]b'
 
-checking known breakage of 3070.500 'ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
-not ok 500 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+expecting success of 3070.230 'ipathmatch (via ls-files): match 'a[]]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 230 - ipathmatch (via ls-files): match 'a[]]b' 'a]b'
 
-expecting success of 3070.501 'cleanup after previous file test': 
+expecting success of 3070.231 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-ok 501 - cleanup after previous file test
+Removing a]b
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 231 - cleanup after previous file test
 
-expecting success of 3070.502 'setup match file test for deep/foo/bar': 
+expecting success of 3070.232 'setup match file test for a-b': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158039,83 +161936,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 502 - setup match file test for deep/foo/bar
+ok 232 - setup match file test for a-b
 
-expecting success of 3070.503 'wildmatch: no match 'deep/foo/bar' '**/bar/*'': 
-			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar' '**/bar/*'
+expecting success of 3070.233 'wildmatch: match 'a-b' 'a[]-]b'': 
+			test-tool wildmatch wildmatch 'a-b' 'a[]-]b'
 		
-ok 503 - wildmatch: no match 'deep/foo/bar' '**/bar/*'
+ok 233 - wildmatch: match 'a-b' 'a[]-]b'
 
-expecting success of 3070.504 'wildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+expecting success of 3070.234 'wildmatch (via ls-files): match 'a[]-]b' 'a-b'': 
+				printf '%s' 'a-b' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 504 - wildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+ok 234 - wildmatch (via ls-files): match 'a[]-]b' 'a-b'
 
-expecting success of 3070.505 'iwildmatch: no match 'deep/foo/bar' '**/bar/*'': 
-			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar' '**/bar/*'
+expecting success of 3070.235 'iwildmatch: match 'a-b' 'a[]-]b'': 
+			test-tool wildmatch iwildmatch 'a-b' 'a[]-]b'
 		
-ok 505 - iwildmatch: no match 'deep/foo/bar' '**/bar/*'
+ok 235 - iwildmatch: match 'a-b' 'a[]-]b'
 
-expecting success of 3070.506 'iwildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+expecting success of 3070.236 'iwildmatch (via ls-files): match 'a[]-]b' 'a-b'': 
+				printf '%s' 'a-b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 506 - iwildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+ok 236 - iwildmatch (via ls-files): match 'a[]-]b' 'a-b'
 
-expecting success of 3070.507 'pathmatch: no match 'deep/foo/bar' '**/bar/*'': 
-			test_must_fail test-tool wildmatch pathmatch 'deep/foo/bar' '**/bar/*'
+expecting success of 3070.237 'pathmatch: match 'a-b' 'a[]-]b'': 
+			test-tool wildmatch pathmatch 'a-b' 'a[]-]b'
 		
-ok 507 - pathmatch: no match 'deep/foo/bar' '**/bar/*'
+ok 237 - pathmatch: match 'a-b' 'a[]-]b'
 
-expecting success of 3070.508 'pathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
-				>expect &&
-				git ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+expecting success of 3070.238 'pathmatch (via ls-files): match 'a[]-]b' 'a-b'': 
+				printf '%s' 'a-b' >expect &&
+				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 508 - pathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+ok 238 - pathmatch (via ls-files): match 'a[]-]b' 'a-b'
 
-expecting success of 3070.509 'ipathmatch: no match 'deep/foo/bar' '**/bar/*'': 
-			test_must_fail test-tool wildmatch ipathmatch 'deep/foo/bar' '**/bar/*'
+expecting success of 3070.239 'ipathmatch: match 'a-b' 'a[]-]b'': 
+			test-tool wildmatch ipathmatch 'a-b' 'a[]-]b'
 		
-ok 509 - ipathmatch: no match 'deep/foo/bar' '**/bar/*'
+ok 239 - ipathmatch: match 'a-b' 'a[]-]b'
 
-expecting success of 3070.510 'ipathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+expecting success of 3070.240 'ipathmatch (via ls-files): match 'a[]-]b' 'a-b'': 
+				printf '%s' 'a-b' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 510 - ipathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+ok 240 - ipathmatch (via ls-files): match 'a[]-]b' 'a-b'
 
-expecting success of 3070.511 'cleanup after previous file test': 
+expecting success of 3070.241 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing a-b
 Removing actual
 Removing actual.err
 Removing actual.raw
-Removing deep/
 Removing expect
-ok 511 - cleanup after previous file test
+ok 241 - cleanup after previous file test
 
-expecting success of 3070.512 'setup match file test for deep/foo/bar/': 
+expecting success of 3070.242 'setup match file test for a]b': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158134,50 +162031,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 512 - setup match file test for deep/foo/bar/
+ok 242 - setup match file test for a]b
 
-expecting success of 3070.513 'wildmatch: match 'deep/foo/bar/' '**/bar/**'': 
-			test-tool wildmatch wildmatch 'deep/foo/bar/' '**/bar/**'
+expecting success of 3070.243 'wildmatch: match 'a]b' 'a[]-]b'': 
+			test-tool wildmatch wildmatch 'a]b' 'a[]-]b'
 		
-ok 513 - wildmatch: match 'deep/foo/bar/' '**/bar/**'
+ok 243 - wildmatch: match 'a]b' 'a[]-]b'
 
-checking known breakage of 3070.514 'wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
-not ok 514 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success of 3070.244 'wildmatch (via ls-files): match 'a[]-]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 244 - wildmatch (via ls-files): match 'a[]-]b' 'a]b'
 
-expecting success of 3070.515 'iwildmatch: match 'deep/foo/bar/' '**/bar/**'': 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/' '**/bar/**'
+expecting success of 3070.245 'iwildmatch: match 'a]b' 'a[]-]b'': 
+			test-tool wildmatch iwildmatch 'a]b' 'a[]-]b'
 		
-ok 515 - iwildmatch: match 'deep/foo/bar/' '**/bar/**'
+ok 245 - iwildmatch: match 'a]b' 'a[]-]b'
 
-checking known breakage of 3070.516 'iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
-not ok 516 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success of 3070.246 'iwildmatch (via ls-files): match 'a[]-]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 246 - iwildmatch (via ls-files): match 'a[]-]b' 'a]b'
 
-expecting success of 3070.517 'pathmatch: match 'deep/foo/bar/' '**/bar/**'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/' '**/bar/**'
+expecting success of 3070.247 'pathmatch: match 'a]b' 'a[]-]b'': 
+			test-tool wildmatch pathmatch 'a]b' 'a[]-]b'
 		
-ok 517 - pathmatch: match 'deep/foo/bar/' '**/bar/**'
+ok 247 - pathmatch: match 'a]b' 'a[]-]b'
 
-checking known breakage of 3070.518 'pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
-not ok 518 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success of 3070.248 'pathmatch (via ls-files): match 'a[]-]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 248 - pathmatch (via ls-files): match 'a[]-]b' 'a]b'
 
-expecting success of 3070.519 'ipathmatch: match 'deep/foo/bar/' '**/bar/**'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/' '**/bar/**'
+expecting success of 3070.249 'ipathmatch: match 'a]b' 'a[]-]b'': 
+			test-tool wildmatch ipathmatch 'a]b' 'a[]-]b'
 		
-ok 519 - ipathmatch: match 'deep/foo/bar/' '**/bar/**'
+ok 249 - ipathmatch: match 'a]b' 'a[]-]b'
 
-checking known breakage of 3070.520 'ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
-not ok 520 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+expecting success of 3070.250 'ipathmatch (via ls-files): match 'a[]-]b' 'a]b'': 
+				printf '%s' 'a]b' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 250 - ipathmatch (via ls-files): match 'a[]-]b' 'a]b'
 
-expecting success of 3070.521 'cleanup after previous file test': 
+expecting success of 3070.251 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-ok 521 - cleanup after previous file test
+Removing a]b
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 251 - cleanup after previous file test
 
-expecting success of 3070.522 'setup match file test for foo/bar/baz': 
+expecting success of 3070.252 'setup match file test for aab': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158196,83 +162126,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 522 - setup match file test for foo/bar/baz
+ok 252 - setup match file test for aab
 
-expecting success of 3070.523 'wildmatch: no match 'foo/bar/baz' '**/bar**'': 
-			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar**'
+expecting success of 3070.253 'wildmatch: no match 'aab' 'a[]-]b'': 
+			test_must_fail test-tool wildmatch wildmatch 'aab' 'a[]-]b'
 		
-ok 523 - wildmatch: no match 'foo/bar/baz' '**/bar**'
+ok 253 - wildmatch: no match 'aab' 'a[]-]b'
 
-expecting success of 3070.524 'wildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'': 
+expecting success of 3070.254 'wildmatch (via ls-files): no match 'a[]-]b' 'aab'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
+				git --glob-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 524 - wildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'
+ok 254 - wildmatch (via ls-files): no match 'a[]-]b' 'aab'
 
-expecting success of 3070.525 'iwildmatch: no match 'foo/bar/baz' '**/bar**'': 
-			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar**'
+expecting success of 3070.255 'iwildmatch: no match 'aab' 'a[]-]b'': 
+			test_must_fail test-tool wildmatch iwildmatch 'aab' 'a[]-]b'
 		
-ok 525 - iwildmatch: no match 'foo/bar/baz' '**/bar**'
+ok 255 - iwildmatch: no match 'aab' 'a[]-]b'
 
-expecting success of 3070.526 'iwildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'': 
+expecting success of 3070.256 'iwildmatch (via ls-files): no match 'a[]-]b' 'aab'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 526 - iwildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'
+ok 256 - iwildmatch (via ls-files): no match 'a[]-]b' 'aab'
 
-expecting success of 3070.527 'pathmatch: match 'foo/bar/baz' '**/bar**'': 
-			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar**'
+expecting success of 3070.257 'pathmatch: no match 'aab' 'a[]-]b'': 
+			test_must_fail test-tool wildmatch pathmatch 'aab' 'a[]-]b'
 		
-ok 527 - pathmatch: match 'foo/bar/baz' '**/bar**'
+ok 257 - pathmatch: no match 'aab' 'a[]-]b'
 
-expecting success of 3070.528 'pathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'': 
-				printf '%s' 'foo/bar/baz' >expect &&
-				git ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
+expecting success of 3070.258 'pathmatch (via ls-files): no match 'a[]-]b' 'aab'': 
+				>expect &&
+				git ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 528 - pathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'
+ok 258 - pathmatch (via ls-files): no match 'a[]-]b' 'aab'
 
-expecting success of 3070.529 'ipathmatch: match 'foo/bar/baz' '**/bar**'': 
-			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar**'
+expecting success of 3070.259 'ipathmatch: no match 'aab' 'a[]-]b'': 
+			test_must_fail test-tool wildmatch ipathmatch 'aab' 'a[]-]b'
 		
-ok 529 - ipathmatch: match 'foo/bar/baz' '**/bar**'
+ok 259 - ipathmatch: no match 'aab' 'a[]-]b'
 
-expecting success of 3070.530 'ipathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'': 
-				printf '%s' 'foo/bar/baz' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
+expecting success of 3070.260 'ipathmatch (via ls-files): no match 'a[]-]b' 'aab'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 530 - ipathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'
+ok 260 - ipathmatch (via ls-files): no match 'a[]-]b' 'aab'
 
-expecting success of 3070.531 'cleanup after previous file test': 
+expecting success of 3070.261 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing aab
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 531 - cleanup after previous file test
+ok 261 - cleanup after previous file test
 
-expecting success of 3070.532 'setup match file test for foo/bar/baz/x': 
+expecting success of 3070.262 'setup match file test for aab': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158291,83 +162221,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 532 - setup match file test for foo/bar/baz/x
+ok 262 - setup match file test for aab
 
-expecting success of 3070.533 'wildmatch: match 'foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch wildmatch 'foo/bar/baz/x' '*/bar/**'
+expecting success of 3070.263 'wildmatch: match 'aab' 'a[]a-]b'': 
+			test-tool wildmatch wildmatch 'aab' 'a[]a-]b'
 		
-ok 533 - wildmatch: match 'foo/bar/baz/x' '*/bar/**'
+ok 263 - wildmatch: match 'aab' 'a[]a-]b'
 
-expecting success of 3070.534 'wildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
-				printf '%s' 'foo/bar/baz/x' >expect &&
-				git --glob-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+expecting success of 3070.264 'wildmatch (via ls-files): match 'a[]a-]b' 'aab'': 
+				printf '%s' 'aab' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 534 - wildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+ok 264 - wildmatch (via ls-files): match 'a[]a-]b' 'aab'
 
-expecting success of 3070.535 'iwildmatch: match 'foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch iwildmatch 'foo/bar/baz/x' '*/bar/**'
+expecting success of 3070.265 'iwildmatch: match 'aab' 'a[]a-]b'': 
+			test-tool wildmatch iwildmatch 'aab' 'a[]a-]b'
 		
-ok 535 - iwildmatch: match 'foo/bar/baz/x' '*/bar/**'
+ok 265 - iwildmatch: match 'aab' 'a[]a-]b'
 
-expecting success of 3070.536 'iwildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
-				printf '%s' 'foo/bar/baz/x' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+expecting success of 3070.266 'iwildmatch (via ls-files): match 'a[]a-]b' 'aab'': 
+				printf '%s' 'aab' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 536 - iwildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+ok 266 - iwildmatch (via ls-files): match 'a[]a-]b' 'aab'
 
-expecting success of 3070.537 'pathmatch: match 'foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch pathmatch 'foo/bar/baz/x' '*/bar/**'
+expecting success of 3070.267 'pathmatch: match 'aab' 'a[]a-]b'': 
+			test-tool wildmatch pathmatch 'aab' 'a[]a-]b'
 		
-ok 537 - pathmatch: match 'foo/bar/baz/x' '*/bar/**'
+ok 267 - pathmatch: match 'aab' 'a[]a-]b'
 
-expecting success of 3070.538 'pathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
-				printf '%s' 'foo/bar/baz/x' >expect &&
-				git ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+expecting success of 3070.268 'pathmatch (via ls-files): match 'a[]a-]b' 'aab'': 
+				printf '%s' 'aab' >expect &&
+				git ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 538 - pathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+ok 268 - pathmatch (via ls-files): match 'a[]a-]b' 'aab'
 
-expecting success of 3070.539 'ipathmatch: match 'foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch ipathmatch 'foo/bar/baz/x' '*/bar/**'
+expecting success of 3070.269 'ipathmatch: match 'aab' 'a[]a-]b'': 
+			test-tool wildmatch ipathmatch 'aab' 'a[]a-]b'
 		
-ok 539 - ipathmatch: match 'foo/bar/baz/x' '*/bar/**'
+ok 269 - ipathmatch: match 'aab' 'a[]a-]b'
 
-expecting success of 3070.540 'ipathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
-				printf '%s' 'foo/bar/baz/x' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+expecting success of 3070.270 'ipathmatch (via ls-files): match 'a[]a-]b' 'aab'': 
+				printf '%s' 'aab' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[]a-]b' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 540 - ipathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+ok 270 - ipathmatch (via ls-files): match 'a[]a-]b' 'aab'
 
-expecting success of 3070.541 'cleanup after previous file test': 
+expecting success of 3070.271 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing aab
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-Removing foo/
-ok 541 - cleanup after previous file test
+ok 271 - cleanup after previous file test
 
-expecting success of 3070.542 'setup match file test for deep/foo/bar/baz/x': 
+expecting success of 3070.272 'setup match file test for ]': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158386,83 +162316,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 542 - setup match file test for deep/foo/bar/baz/x
+ok 272 - setup match file test for ]
 
-expecting success of 3070.543 'wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'': 
-			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '*/bar/**'
+expecting success of 3070.273 'wildmatch: match ']' ']'': 
+			test-tool wildmatch wildmatch ']' ']'
 		
-ok 543 - wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
+ok 273 - wildmatch: match ']' ']'
 
-expecting success of 3070.544 'wildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+expecting success of 3070.274 'wildmatch (via ls-files): match ']' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 544 - wildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'
+ok 274 - wildmatch (via ls-files): match ']' ']'
 
-expecting success of 3070.545 'iwildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'': 
-			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '*/bar/**'
+expecting success of 3070.275 'iwildmatch: match ']' ']'': 
+			test-tool wildmatch iwildmatch ']' ']'
 		
-ok 545 - iwildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
+ok 275 - iwildmatch: match ']' ']'
 
-expecting success of 3070.546 'iwildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+expecting success of 3070.276 'iwildmatch (via ls-files): match ']' ']'': 
+				printf '%s' ']' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 546 - iwildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'
+ok 276 - iwildmatch (via ls-files): match ']' ']'
 
-expecting success of 3070.547 'pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '*/bar/**'
+expecting success of 3070.277 'pathmatch: match ']' ']'': 
+			test-tool wildmatch pathmatch ']' ']'
 		
-ok 547 - pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
+ok 277 - pathmatch: match ']' ']'
 
-expecting success of 3070.548 'pathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+expecting success of 3070.278 'pathmatch (via ls-files): match ']' ']'': 
+				printf '%s' ']' >expect &&
+				git ls-files -z -- ']' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 548 - pathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'
+ok 278 - pathmatch (via ls-files): match ']' ']'
 
-expecting success of 3070.549 'ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '*/bar/**'
+expecting success of 3070.279 'ipathmatch: match ']' ']'': 
+			test-tool wildmatch ipathmatch ']' ']'
 		
-ok 549 - ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
+ok 279 - ipathmatch: match ']' ']'
 
-expecting success of 3070.550 'ipathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+expecting success of 3070.280 'ipathmatch (via ls-files): match ']' ']'': 
+				printf '%s' ']' >expect &&
+				git --icase-pathspecs ls-files -z -- ']' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 550 - ipathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'
+ok 280 - ipathmatch (via ls-files): match ']' ']'
 
-expecting success of 3070.551 'cleanup after previous file test': 
+expecting success of 3070.281 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
+Removing ]
 Removing actual
 Removing actual.err
 Removing actual.raw
-Removing deep/
 Removing expect
-ok 551 - cleanup after previous file test
+ok 281 - cleanup after previous file test
 
-expecting success of 3070.552 'setup match file test for deep/foo/bar/baz/x': 
+expecting success of 3070.282 'setup match file test for foo/baz/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158481,69 +162411,69 @@
 			rm .git/created_test_file
 		fi
 	
-ok 552 - setup match file test for deep/foo/bar/baz/x
+ok 282 - setup match file test for foo/baz/bar
 
-expecting success of 3070.553 'wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
-			test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+expecting success of 3070.283 'wildmatch: no match 'foo/baz/bar' 'foo*bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 553 - wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+ok 283 - wildmatch: no match 'foo/baz/bar' 'foo*bar'
 
-expecting success of 3070.554 'wildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git --glob-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.284 'wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 554 - wildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+ok 284 - wildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
 
-expecting success of 3070.555 'iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
-			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+expecting success of 3070.285 'iwildmatch: no match 'foo/baz/bar' 'foo*bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 555 - iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+ok 285 - iwildmatch: no match 'foo/baz/bar' 'foo*bar'
 
-expecting success of 3070.556 'iwildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.286 'iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 556 - iwildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+ok 286 - iwildmatch (via ls-files): no match 'foo*bar' 'foo/baz/bar'
 
-expecting success of 3070.557 'pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
-			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+expecting success of 3070.287 'pathmatch: match 'foo/baz/bar' 'foo*bar'': 
+			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 557 - pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+ok 287 - pathmatch: match 'foo/baz/bar' 'foo*bar'
 
-expecting success of 3070.558 'pathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.288 'pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 558 - pathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+ok 288 - pathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
 
-expecting success of 3070.559 'ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
-			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+expecting success of 3070.289 'ipathmatch: match 'foo/baz/bar' 'foo*bar'': 
+			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo*bar'
 		
-ok 559 - ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+ok 289 - ipathmatch: match 'foo/baz/bar' 'foo*bar'
 
-expecting success of 3070.560 'ipathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
-				printf '%s' 'deep/foo/bar/baz/x' >expect &&
-				git --icase-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
+expecting success of 3070.290 'ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo*bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 560 - ipathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+ok 290 - ipathmatch (via ls-files): match 'foo*bar' 'foo/baz/bar'
 
-expecting success of 3070.561 'cleanup after previous file test': 
+expecting success of 3070.291 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
@@ -158553,11 +162483,11 @@
 Removing actual
 Removing actual.err
 Removing actual.raw
-Removing deep/
 Removing expect
-ok 561 - cleanup after previous file test
+Removing foo/
+ok 291 - cleanup after previous file test
 
-expecting success of 3070.562 'setup match file test for acrt': 
+expecting success of 3070.292 'setup match file test for foo/baz/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158576,83 +162506,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 562 - setup match file test for acrt
+ok 292 - setup match file test for foo/baz/bar
 
-expecting success of 3070.563 'wildmatch: no match 'acrt' 'a[c-c]st'': 
-			test_must_fail test-tool wildmatch wildmatch 'acrt' 'a[c-c]st'
+expecting success of 3070.293 'wildmatch: no match 'foo/baz/bar' 'foo**bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 563 - wildmatch: no match 'acrt' 'a[c-c]st'
+ok 293 - wildmatch: no match 'foo/baz/bar' 'foo**bar'
 
-expecting success of 3070.564 'wildmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
+expecting success of 3070.294 'wildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'': 
 				>expect &&
-				git --glob-pathspecs ls-files -z -- 'a[c-c]st' >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 564 - wildmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+ok 294 - wildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
 
-expecting success of 3070.565 'iwildmatch: no match 'acrt' 'a[c-c]st'': 
-			test_must_fail test-tool wildmatch iwildmatch 'acrt' 'a[c-c]st'
+expecting success of 3070.295 'iwildmatch: no match 'foo/baz/bar' 'foo**bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 565 - iwildmatch: no match 'acrt' 'a[c-c]st'
+ok 295 - iwildmatch: no match 'foo/baz/bar' 'foo**bar'
 
-expecting success of 3070.566 'iwildmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
+expecting success of 3070.296 'iwildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'': 
 				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[c-c]st' >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 566 - iwildmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+ok 296 - iwildmatch (via ls-files): no match 'foo**bar' 'foo/baz/bar'
 
-expecting success of 3070.567 'pathmatch: no match 'acrt' 'a[c-c]st'': 
-			test_must_fail test-tool wildmatch pathmatch 'acrt' 'a[c-c]st'
+expecting success of 3070.297 'pathmatch: match 'foo/baz/bar' 'foo**bar'': 
+			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 567 - pathmatch: no match 'acrt' 'a[c-c]st'
+ok 297 - pathmatch: match 'foo/baz/bar' 'foo**bar'
 
-expecting success of 3070.568 'pathmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
-				>expect &&
-				git ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
+expecting success of 3070.298 'pathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 568 - pathmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+ok 298 - pathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
 
-expecting success of 3070.569 'ipathmatch: no match 'acrt' 'a[c-c]st'': 
-			test_must_fail test-tool wildmatch ipathmatch 'acrt' 'a[c-c]st'
+expecting success of 3070.299 'ipathmatch: match 'foo/baz/bar' 'foo**bar'': 
+			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo**bar'
 		
-ok 569 - ipathmatch: no match 'acrt' 'a[c-c]st'
+ok 299 - ipathmatch: match 'foo/baz/bar' 'foo**bar'
 
-expecting success of 3070.570 'ipathmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
+expecting success of 3070.300 'ipathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 570 - ipathmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+ok 300 - ipathmatch (via ls-files): match 'foo**bar' 'foo/baz/bar'
 
-expecting success of 3070.571 'cleanup after previous file test': 
+expecting success of 3070.301 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing acrt
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 571 - cleanup after previous file test
+Removing foo/
+ok 301 - cleanup after previous file test
 
-expecting success of 3070.572 'setup match file test for acrt': 
+expecting success of 3070.302 'setup match file test for foobazbar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158671,83 +162601,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 572 - setup match file test for acrt
+ok 302 - setup match file test for foobazbar
 
-expecting success of 3070.573 'wildmatch: match 'acrt' 'a[c-c]rt'': 
-			test-tool wildmatch wildmatch 'acrt' 'a[c-c]rt'
+expecting success of 3070.303 'wildmatch: match 'foobazbar' 'foo**bar'': 
+			test-tool wildmatch wildmatch 'foobazbar' 'foo**bar'
 		
-ok 573 - wildmatch: match 'acrt' 'a[c-c]rt'
+ok 303 - wildmatch: match 'foobazbar' 'foo**bar'
 
-expecting success of 3070.574 'wildmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
-				printf '%s' 'acrt' >expect &&
-				git --glob-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
+expecting success of 3070.304 'wildmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
+				printf '%s' 'foobazbar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 574 - wildmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+ok 304 - wildmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
-expecting success of 3070.575 'iwildmatch: match 'acrt' 'a[c-c]rt'': 
-			test-tool wildmatch iwildmatch 'acrt' 'a[c-c]rt'
+expecting success of 3070.305 'iwildmatch: match 'foobazbar' 'foo**bar'': 
+			test-tool wildmatch iwildmatch 'foobazbar' 'foo**bar'
 		
-ok 575 - iwildmatch: match 'acrt' 'a[c-c]rt'
+ok 305 - iwildmatch: match 'foobazbar' 'foo**bar'
 
-expecting success of 3070.576 'iwildmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
-				printf '%s' 'acrt' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
+expecting success of 3070.306 'iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
+				printf '%s' 'foobazbar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 576 - iwildmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+ok 306 - iwildmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
-expecting success of 3070.577 'pathmatch: match 'acrt' 'a[c-c]rt'': 
-			test-tool wildmatch pathmatch 'acrt' 'a[c-c]rt'
+expecting success of 3070.307 'pathmatch: match 'foobazbar' 'foo**bar'': 
+			test-tool wildmatch pathmatch 'foobazbar' 'foo**bar'
 		
-ok 577 - pathmatch: match 'acrt' 'a[c-c]rt'
+ok 307 - pathmatch: match 'foobazbar' 'foo**bar'
 
-expecting success of 3070.578 'pathmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
-				printf '%s' 'acrt' >expect &&
-				git ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
+expecting success of 3070.308 'pathmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
+				printf '%s' 'foobazbar' >expect &&
+				git ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 578 - pathmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+ok 308 - pathmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
-expecting success of 3070.579 'ipathmatch: match 'acrt' 'a[c-c]rt'': 
-			test-tool wildmatch ipathmatch 'acrt' 'a[c-c]rt'
+expecting success of 3070.309 'ipathmatch: match 'foobazbar' 'foo**bar'': 
+			test-tool wildmatch ipathmatch 'foobazbar' 'foo**bar'
 		
-ok 579 - ipathmatch: match 'acrt' 'a[c-c]rt'
+ok 309 - ipathmatch: match 'foobazbar' 'foo**bar'
 
-expecting success of 3070.580 'ipathmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
-				printf '%s' 'acrt' >expect &&
-				git --icase-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
+expecting success of 3070.310 'ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'': 
+				printf '%s' 'foobazbar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo**bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 580 - ipathmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+ok 310 - ipathmatch (via ls-files): match 'foo**bar' 'foobazbar'
 
-expecting success of 3070.581 'cleanup after previous file test': 
+expecting success of 3070.311 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing acrt
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 581 - cleanup after previous file test
+Removing foobazbar
+ok 311 - cleanup after previous file test
 
-expecting success of 3070.582 'setup match file test for ]': 
+expecting success of 3070.312 'setup match file test for foo/baz/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158766,83 +162696,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 582 - setup match file test for ]
+ok 312 - setup match file test for foo/baz/bar
 
-expecting success of 3070.583 'wildmatch: no match ']' '[!]-]'': 
-			test_must_fail test-tool wildmatch wildmatch ']' '[!]-]'
+expecting success of 3070.313 'wildmatch: match 'foo/baz/bar' 'foo/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 583 - wildmatch: no match ']' '[!]-]'
+ok 313 - wildmatch: match 'foo/baz/bar' 'foo/**/bar'
 
-expecting success of 3070.584 'wildmatch (via ls-files): no match '[!]-]' ']'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+expecting success of 3070.314 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 584 - wildmatch (via ls-files): no match '[!]-]' ']'
+ok 314 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.585 'iwildmatch: no match ']' '[!]-]'': 
-			test_must_fail test-tool wildmatch iwildmatch ']' '[!]-]'
+expecting success of 3070.315 'iwildmatch: match 'foo/baz/bar' 'foo/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 585 - iwildmatch: no match ']' '[!]-]'
+ok 315 - iwildmatch: match 'foo/baz/bar' 'foo/**/bar'
 
-expecting success of 3070.586 'iwildmatch (via ls-files): no match '[!]-]' ']'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+expecting success of 3070.316 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 586 - iwildmatch (via ls-files): no match '[!]-]' ']'
+ok 316 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.587 'pathmatch: no match ']' '[!]-]'': 
-			test_must_fail test-tool wildmatch pathmatch ']' '[!]-]'
+expecting success of 3070.317 'pathmatch: match 'foo/baz/bar' 'foo/**/bar'': 
+			test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 587 - pathmatch: no match ']' '[!]-]'
+ok 317 - pathmatch: match 'foo/baz/bar' 'foo/**/bar'
 
-expecting success of 3070.588 'pathmatch (via ls-files): no match '[!]-]' ']'': 
-				>expect &&
-				git ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+expecting success of 3070.318 'pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 588 - pathmatch (via ls-files): no match '[!]-]' ']'
+ok 318 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.589 'ipathmatch: no match ']' '[!]-]'': 
-			test_must_fail test-tool wildmatch ipathmatch ']' '[!]-]'
+expecting success of 3070.319 'ipathmatch: match 'foo/baz/bar' 'foo/**/bar'': 
+			test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/bar'
 		
-ok 589 - ipathmatch: no match ']' '[!]-]'
+ok 319 - ipathmatch: match 'foo/baz/bar' 'foo/**/bar'
 
-expecting success of 3070.590 'ipathmatch (via ls-files): no match '[!]-]' ']'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+expecting success of 3070.320 'ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 590 - ipathmatch (via ls-files): no match '[!]-]' ']'
+ok 320 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.591 'cleanup after previous file test': 
+expecting success of 3070.321 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing ]
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 591 - cleanup after previous file test
+Removing foo/
+ok 321 - cleanup after previous file test
 
-expecting success of 3070.592 'setup match file test for a': 
+expecting success of 3070.322 'setup match file test for foo/baz/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158861,83 +162791,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 592 - setup match file test for a
+ok 322 - setup match file test for foo/baz/bar
 
-expecting success of 3070.593 'wildmatch: match 'a' '[!]-]'': 
-			test-tool wildmatch wildmatch 'a' '[!]-]'
+expecting success of 3070.323 'wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 593 - wildmatch: match 'a' '[!]-]'
+ok 323 - wildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
 
-expecting success of 3070.594 'wildmatch (via ls-files): match '[!]-]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+expecting success of 3070.324 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 594 - wildmatch (via ls-files): match '[!]-]' 'a'
+ok 324 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.595 'iwildmatch: match 'a' '[!]-]'': 
-			test-tool wildmatch iwildmatch 'a' '[!]-]'
+expecting success of 3070.325 'iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 595 - iwildmatch: match 'a' '[!]-]'
+ok 325 - iwildmatch: match 'foo/baz/bar' 'foo/**/**/bar'
 
-expecting success of 3070.596 'iwildmatch (via ls-files): match '[!]-]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+expecting success of 3070.326 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'': 
+				printf '%s' 'foo/baz/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 596 - iwildmatch (via ls-files): match '[!]-]' 'a'
+ok 326 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.597 'pathmatch: match 'a' '[!]-]'': 
-			test-tool wildmatch pathmatch 'a' '[!]-]'
+expecting success of 3070.327 'pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 597 - pathmatch: match 'a' '[!]-]'
+ok 327 - pathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
 
-expecting success of 3070.598 'pathmatch (via ls-files): match '[!]-]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+expecting success of 3070.328 'pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'': 
+				>expect &&
+				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 598 - pathmatch (via ls-files): match '[!]-]' 'a'
+ok 328 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.599 'ipathmatch: match 'a' '[!]-]'': 
-			test-tool wildmatch ipathmatch 'a' '[!]-]'
+expecting success of 3070.329 'ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/baz/bar' 'foo/**/**/bar'
 		
-ok 599 - ipathmatch: match 'a' '[!]-]'
+ok 329 - ipathmatch: no match 'foo/baz/bar' 'foo/**/**/bar'
 
-expecting success of 3070.600 'ipathmatch (via ls-files): match '[!]-]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+expecting success of 3070.330 'ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 600 - ipathmatch (via ls-files): match '[!]-]' 'a'
+ok 330 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/baz/bar'
 
-expecting success of 3070.601 'cleanup after previous file test': 
+expecting success of 3070.331 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-Removing a
 Removing actual
 Removing actual.err
 Removing actual.raw
 Removing expect
-ok 601 - cleanup after previous file test
+Removing foo/
+ok 331 - cleanup after previous file test
 
-expecting success of 3070.602 'setup match file test for ': 
+expecting success of 3070.332 'setup match file test for foo/b/a/z/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -158956,50 +162886,83 @@
 			rm .git/created_test_file
 		fi
 	
-ok 602 - setup match file test for 
+ok 332 - setup match file test for foo/b/a/z/bar
 
-expecting success of 3070.603 'wildmatch: no match '' '\'': 
-			test_must_fail test-tool wildmatch wildmatch '' '\'
+expecting success of 3070.333 'wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 603 - wildmatch: no match '' '\'
+ok 333 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
-checking known breakage of 3070.604 'wildmatch (via ls-files): no match skip '\' ''': false
-not ok 604 - wildmatch (via ls-files): no match skip '\' '' # TODO known breakage
+expecting success of 3070.334 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 334 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.605 'iwildmatch: no match '' '\'': 
-			test_must_fail test-tool wildmatch iwildmatch '' '\'
+expecting success of 3070.335 'iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 605 - iwildmatch: no match '' '\'
+ok 335 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
-checking known breakage of 3070.606 'iwildmatch (via ls-files): no match skip '\' ''': false
-not ok 606 - iwildmatch (via ls-files): no match skip '\' '' # TODO known breakage
+expecting success of 3070.336 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 336 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.607 'pathmatch: no match '' '\'': 
-			test_must_fail test-tool wildmatch pathmatch '' '\'
+expecting success of 3070.337 'pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
+			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 607 - pathmatch: no match '' '\'
+ok 337 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
-checking known breakage of 3070.608 'pathmatch (via ls-files): no match skip '\' ''': false
-not ok 608 - pathmatch (via ls-files): no match skip '\' '' # TODO known breakage
+expecting success of 3070.338 'pathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 338 - pathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.609 'ipathmatch: no match '' '\'': 
-			test_must_fail test-tool wildmatch ipathmatch '' '\'
+expecting success of 3070.339 'ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'': 
+			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/bar'
 		
-ok 609 - ipathmatch: no match '' '\'
+ok 339 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/bar'
 
-checking known breakage of 3070.610 'ipathmatch (via ls-files): no match skip '\' ''': false
-not ok 610 - ipathmatch (via ls-files): no match skip '\' '' # TODO known breakage
+expecting success of 3070.340 'ipathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 340 - ipathmatch (via ls-files): match 'foo/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.611 'cleanup after previous file test': 
+expecting success of 3070.341 'cleanup after previous file test': 
 		if test -e .git/created_test_file
 		then
 			git reset &&
 			git clean -df
 		fi
 	
-ok 611 - cleanup after previous file test
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 341 - cleanup after previous file test
 
-expecting success of 3070.612 'setup match file test for \': 
+expecting success of 3070.342 'setup match file test for foo/b/a/z/bar': 
 		file=$(cat .git/expected_test_file) &&
 		if should_create_test_file "$file"
 		then
@@ -159018,40 +162981,2473 @@
 			rm .git/created_test_file
 		fi
 	
-ok 612 - setup match file test for \
+ok 342 - setup match file test for foo/b/a/z/bar
 
-expecting success of 3070.613 'wildmatch: no match '\' '\'': 
-			test_must_fail test-tool wildmatch wildmatch '\' '\'
+expecting success of 3070.343 'wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 613 - wildmatch: no match '\' '\'
+ok 343 - wildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
-expecting success of 3070.614 'wildmatch (via ls-files): match '\' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
+expecting success of 3070.344 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 614 - wildmatch (via ls-files): match '\' '\'
+ok 344 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.615 'iwildmatch: no match '\' '\'': 
-			test_must_fail test-tool wildmatch iwildmatch '\' '\'
+expecting success of 3070.345 'iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
 		
-ok 615 - iwildmatch: no match '\' '\'
+ok 345 - iwildmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
 
-expecting success of 3070.616 'iwildmatch (via ls-files): match '\' '\'': 
-				printf '%s' '\' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
+expecting success of 3070.346 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
 				
 		tr -d '\0' <actual.raw >actual &&
 		test_must_be_empty actual.err &&
 		test_cmp expect actual
 			
-ok 616 - iwildmatch (via ls-files): match '\' '\'
+ok 346 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
 
-expecting success of 3070.617 'pathmatch: no match '\' '\'': 
-			test_must_fail test-tool wildmatch pathmatch '\' '\'
+expecting success of 3070.347 'pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch pathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
+		
+ok 347 - pathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+
+expecting success of 3070.348 'pathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 348 - pathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+
+expecting success of 3070.349 'ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch ipathmatch 'foo/b/a/z/bar' 'foo/**/**/bar'
+		
+ok 349 - ipathmatch: match 'foo/b/a/z/bar' 'foo/**/**/bar'
+
+expecting success of 3070.350 'ipathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'': 
+				printf '%s' 'foo/b/a/z/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 350 - ipathmatch (via ls-files): match 'foo/**/**/bar' 'foo/b/a/z/bar'
+
+expecting success of 3070.351 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 351 - cleanup after previous file test
+
+expecting success of 3070.352 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 352 - setup match file test for foo/bar
+
+expecting success of 3070.353 'wildmatch: match 'foo/bar' 'foo/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/bar'
+		
+ok 353 - wildmatch: match 'foo/bar' 'foo/**/bar'
+
+expecting success of 3070.354 'wildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 354 - wildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
+
+expecting success of 3070.355 'iwildmatch: match 'foo/bar' 'foo/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/bar'
+		
+ok 355 - iwildmatch: match 'foo/bar' 'foo/**/bar'
+
+expecting success of 3070.356 'iwildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 356 - iwildmatch (via ls-files): match 'foo/**/bar' 'foo/bar'
+
+expecting success of 3070.357 'pathmatch: no match 'foo/bar' 'foo/**/bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/bar'
+		
+ok 357 - pathmatch: no match 'foo/bar' 'foo/**/bar'
+
+expecting success of 3070.358 'pathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'': 
+				>expect &&
+				git ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 358 - pathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
+
+expecting success of 3070.359 'ipathmatch: no match 'foo/bar' 'foo/**/bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/bar'
+		
+ok 359 - ipathmatch: no match 'foo/bar' 'foo/**/bar'
+
+expecting success of 3070.360 'ipathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 360 - ipathmatch (via ls-files): no match 'foo/**/bar' 'foo/bar'
+
+expecting success of 3070.361 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 361 - cleanup after previous file test
+
+expecting success of 3070.362 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 362 - setup match file test for foo/bar
+
+expecting success of 3070.363 'wildmatch: match 'foo/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch wildmatch 'foo/bar' 'foo/**/**/bar'
+		
+ok 363 - wildmatch: match 'foo/bar' 'foo/**/**/bar'
+
+expecting success of 3070.364 'wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 364 - wildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
+
+expecting success of 3070.365 'iwildmatch: match 'foo/bar' 'foo/**/**/bar'': 
+			test-tool wildmatch iwildmatch 'foo/bar' 'foo/**/**/bar'
+		
+ok 365 - iwildmatch: match 'foo/bar' 'foo/**/**/bar'
+
+expecting success of 3070.366 'iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 366 - iwildmatch (via ls-files): match 'foo/**/**/bar' 'foo/bar'
+
+expecting success of 3070.367 'pathmatch: no match 'foo/bar' 'foo/**/**/bar'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo/bar' 'foo/**/**/bar'
+		
+ok 367 - pathmatch: no match 'foo/bar' 'foo/**/**/bar'
+
+expecting success of 3070.368 'pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'': 
+				>expect &&
+				git ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 368 - pathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
+
+expecting success of 3070.369 'ipathmatch: no match 'foo/bar' 'foo/**/**/bar'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo/bar' 'foo/**/**/bar'
+		
+ok 369 - ipathmatch: no match 'foo/bar' 'foo/**/**/bar'
+
+expecting success of 3070.370 'ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'foo/**/**/bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 370 - ipathmatch (via ls-files): no match 'foo/**/**/bar' 'foo/bar'
+
+expecting success of 3070.371 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 371 - cleanup after previous file test
+
+expecting success of 3070.372 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 372 - setup match file test for foo/bar
+
+expecting success of 3070.373 'wildmatch: no match 'foo/bar' 'foo?bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo?bar'
+		
+ok 373 - wildmatch: no match 'foo/bar' 'foo?bar'
+
+expecting success of 3070.374 'wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 374 - wildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+
+expecting success of 3070.375 'iwildmatch: no match 'foo/bar' 'foo?bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo?bar'
+		
+ok 375 - iwildmatch: no match 'foo/bar' 'foo?bar'
+
+expecting success of 3070.376 'iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 376 - iwildmatch (via ls-files): no match 'foo?bar' 'foo/bar'
+
+expecting success of 3070.377 'pathmatch: match 'foo/bar' 'foo?bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo?bar'
+		
+ok 377 - pathmatch: match 'foo/bar' 'foo?bar'
+
+expecting success of 3070.378 'pathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 378 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+
+expecting success of 3070.379 'ipathmatch: match 'foo/bar' 'foo?bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo?bar'
+		
+ok 379 - ipathmatch: match 'foo/bar' 'foo?bar'
+
+expecting success of 3070.380 'ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 380 - ipathmatch (via ls-files): match 'foo?bar' 'foo/bar'
+
+expecting success of 3070.381 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 381 - cleanup after previous file test
+
+expecting success of 3070.382 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 382 - setup match file test for foo/bar
+
+expecting success of 3070.383 'wildmatch: no match 'foo/bar' 'foo[/]bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[/]bar'
+		
+ok 383 - wildmatch: no match 'foo/bar' 'foo[/]bar'
+
+expecting success of 3070.384 'wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 384 - wildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+
+expecting success of 3070.385 'iwildmatch: no match 'foo/bar' 'foo[/]bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[/]bar'
+		
+ok 385 - iwildmatch: no match 'foo/bar' 'foo[/]bar'
+
+expecting success of 3070.386 'iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 386 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
+
+expecting success of 3070.387 'pathmatch: match 'foo/bar' 'foo[/]bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[/]bar'
+		
+ok 387 - pathmatch: match 'foo/bar' 'foo[/]bar'
+
+expecting success of 3070.388 'pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 388 - pathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+
+expecting success of 3070.389 'ipathmatch: match 'foo/bar' 'foo[/]bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[/]bar'
+		
+ok 389 - ipathmatch: match 'foo/bar' 'foo[/]bar'
+
+expecting success of 3070.390 'ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 390 - ipathmatch (via ls-files): match 'foo[/]bar' 'foo/bar'
+
+expecting success of 3070.391 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 391 - cleanup after previous file test
+
+expecting success of 3070.392 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 392 - setup match file test for foo/bar
+
+expecting success of 3070.393 'wildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 393 - wildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+
+expecting success of 3070.394 'wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 394 - wildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+
+expecting success of 3070.395 'iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 395 - iwildmatch: no match 'foo/bar' 'foo[^a-z]bar'
+
+expecting success of 3070.396 'iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 396 - iwildmatch (via ls-files): no match 'foo[^a-z]bar' 'foo/bar'
+
+expecting success of 3070.397 'pathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 397 - pathmatch: match 'foo/bar' 'foo[^a-z]bar'
+
+expecting success of 3070.398 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 398 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+
+expecting success of 3070.399 'ipathmatch: match 'foo/bar' 'foo[^a-z]bar'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'foo[^a-z]bar'
+		
+ok 399 - ipathmatch: match 'foo/bar' 'foo[^a-z]bar'
+
+expecting success of 3070.400 'ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 400 - ipathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
+
+expecting success of 3070.401 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 401 - cleanup after previous file test
+
+expecting success of 3070.402 'setup match file test for foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 402 - setup match file test for foo/bar
+
+expecting success of 3070.403 'wildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+		
+ok 403 - wildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+
+expecting success of 3070.404 'wildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 404 - wildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+
+expecting success of 3070.405 'iwildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+		
+ok 405 - iwildmatch: no match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+
+expecting success of 3070.406 'iwildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 406 - iwildmatch (via ls-files): no match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+
+expecting success of 3070.407 'pathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch pathmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+		
+ok 407 - pathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+
+expecting success of 3070.408 'pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 408 - pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+
+expecting success of 3070.409 'ipathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch ipathmatch 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+		
+ok 409 - ipathmatch: match 'foo/bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+
+expecting success of 3070.410 'ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 410 - ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo/bar'
+
+expecting success of 3070.411 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 411 - cleanup after previous file test
+
+expecting success of 3070.412 'setup match file test for foo-bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 412 - setup match file test for foo-bar
+
+expecting success of 3070.413 'wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch wildmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+		
+ok 413 - wildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+
+expecting success of 3070.414 'wildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
+				printf '%s' 'foo-bar' >expect &&
+				git --glob-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 414 - wildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+
+expecting success of 3070.415 'iwildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch iwildmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+		
+ok 415 - iwildmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+
+expecting success of 3070.416 'iwildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
+				printf '%s' 'foo-bar' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 416 - iwildmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+
+expecting success of 3070.417 'pathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch pathmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+		
+ok 417 - pathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+
+expecting success of 3070.418 'pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
+				printf '%s' 'foo-bar' >expect &&
+				git ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 418 - pathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+
+expecting success of 3070.419 'ipathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'': 
+			test-tool wildmatch ipathmatch 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+		
+ok 419 - ipathmatch: match 'foo-bar' 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r'
+
+expecting success of 3070.420 'ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'': 
+				printf '%s' 'foo-bar' >expect &&
+				git --icase-pathspecs ls-files -z -- 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 420 - ipathmatch (via ls-files): match 'f[^eiu][^eiu][^eiu][^eiu][^eiu]r' 'foo-bar'
+
+expecting success of 3070.421 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo-bar
+ok 421 - cleanup after previous file test
+
+expecting success of 3070.422 'setup match file test for foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 422 - setup match file test for foo
+
+expecting success of 3070.423 'wildmatch: match 'foo' '**/foo'': 
+			test-tool wildmatch wildmatch 'foo' '**/foo'
+		
+ok 423 - wildmatch: match 'foo' '**/foo'
+
+expecting success of 3070.424 'wildmatch (via ls-files): match '**/foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 424 - wildmatch (via ls-files): match '**/foo' 'foo'
+
+expecting success of 3070.425 'iwildmatch: match 'foo' '**/foo'': 
+			test-tool wildmatch iwildmatch 'foo' '**/foo'
+		
+ok 425 - iwildmatch: match 'foo' '**/foo'
+
+expecting success of 3070.426 'iwildmatch (via ls-files): match '**/foo' 'foo'': 
+				printf '%s' 'foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 426 - iwildmatch (via ls-files): match '**/foo' 'foo'
+
+expecting success of 3070.427 'pathmatch: no match 'foo' '**/foo'': 
+			test_must_fail test-tool wildmatch pathmatch 'foo' '**/foo'
+		
+ok 427 - pathmatch: no match 'foo' '**/foo'
+
+expecting success of 3070.428 'pathmatch (via ls-files): no match '**/foo' 'foo'': 
+				>expect &&
+				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 428 - pathmatch (via ls-files): no match '**/foo' 'foo'
+
+expecting success of 3070.429 'ipathmatch: no match 'foo' '**/foo'': 
+			test_must_fail test-tool wildmatch ipathmatch 'foo' '**/foo'
+		
+ok 429 - ipathmatch: no match 'foo' '**/foo'
+
+expecting success of 3070.430 'ipathmatch (via ls-files): no match '**/foo' 'foo'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 430 - ipathmatch (via ls-files): no match '**/foo' 'foo'
+
+expecting success of 3070.431 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo
+ok 431 - cleanup after previous file test
+
+expecting success of 3070.432 'setup match file test for XXX/foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 432 - setup match file test for XXX/foo
+
+expecting success of 3070.433 'wildmatch: match 'XXX/foo' '**/foo'': 
+			test-tool wildmatch wildmatch 'XXX/foo' '**/foo'
+		
+ok 433 - wildmatch: match 'XXX/foo' '**/foo'
+
+expecting success of 3070.434 'wildmatch (via ls-files): match '**/foo' 'XXX/foo'': 
+				printf '%s' 'XXX/foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 434 - wildmatch (via ls-files): match '**/foo' 'XXX/foo'
+
+expecting success of 3070.435 'iwildmatch: match 'XXX/foo' '**/foo'': 
+			test-tool wildmatch iwildmatch 'XXX/foo' '**/foo'
+		
+ok 435 - iwildmatch: match 'XXX/foo' '**/foo'
+
+expecting success of 3070.436 'iwildmatch (via ls-files): match '**/foo' 'XXX/foo'': 
+				printf '%s' 'XXX/foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 436 - iwildmatch (via ls-files): match '**/foo' 'XXX/foo'
+
+expecting success of 3070.437 'pathmatch: match 'XXX/foo' '**/foo'': 
+			test-tool wildmatch pathmatch 'XXX/foo' '**/foo'
+		
+ok 437 - pathmatch: match 'XXX/foo' '**/foo'
+
+expecting success of 3070.438 'pathmatch (via ls-files): match '**/foo' 'XXX/foo'': 
+				printf '%s' 'XXX/foo' >expect &&
+				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 438 - pathmatch (via ls-files): match '**/foo' 'XXX/foo'
+
+expecting success of 3070.439 'ipathmatch: match 'XXX/foo' '**/foo'': 
+			test-tool wildmatch ipathmatch 'XXX/foo' '**/foo'
+		
+ok 439 - ipathmatch: match 'XXX/foo' '**/foo'
+
+expecting success of 3070.440 'ipathmatch (via ls-files): match '**/foo' 'XXX/foo'': 
+				printf '%s' 'XXX/foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 440 - ipathmatch (via ls-files): match '**/foo' 'XXX/foo'
+
+expecting success of 3070.441 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing XXX/
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 441 - cleanup after previous file test
+
+expecting success of 3070.442 'setup match file test for bar/baz/foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 442 - setup match file test for bar/baz/foo
+
+expecting success of 3070.443 'wildmatch: match 'bar/baz/foo' '**/foo'': 
+			test-tool wildmatch wildmatch 'bar/baz/foo' '**/foo'
+		
+ok 443 - wildmatch: match 'bar/baz/foo' '**/foo'
+
+expecting success of 3070.444 'wildmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 444 - wildmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+
+expecting success of 3070.445 'iwildmatch: match 'bar/baz/foo' '**/foo'': 
+			test-tool wildmatch iwildmatch 'bar/baz/foo' '**/foo'
+		
+ok 445 - iwildmatch: match 'bar/baz/foo' '**/foo'
+
+expecting success of 3070.446 'iwildmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 446 - iwildmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+
+expecting success of 3070.447 'pathmatch: match 'bar/baz/foo' '**/foo'': 
+			test-tool wildmatch pathmatch 'bar/baz/foo' '**/foo'
+		
+ok 447 - pathmatch: match 'bar/baz/foo' '**/foo'
+
+expecting success of 3070.448 'pathmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 448 - pathmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+
+expecting success of 3070.449 'ipathmatch: match 'bar/baz/foo' '**/foo'': 
+			test-tool wildmatch ipathmatch 'bar/baz/foo' '**/foo'
+		
+ok 449 - ipathmatch: match 'bar/baz/foo' '**/foo'
+
+expecting success of 3070.450 'ipathmatch (via ls-files): match '**/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 450 - ipathmatch (via ls-files): match '**/foo' 'bar/baz/foo'
+
+expecting success of 3070.451 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing bar/
+Removing expect
+ok 451 - cleanup after previous file test
+
+expecting success of 3070.452 'setup match file test for bar/baz/foo': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 452 - setup match file test for bar/baz/foo
+
+expecting success of 3070.453 'wildmatch: no match 'bar/baz/foo' '*/foo'': 
+			test_must_fail test-tool wildmatch wildmatch 'bar/baz/foo' '*/foo'
+		
+ok 453 - wildmatch: no match 'bar/baz/foo' '*/foo'
+
+expecting success of 3070.454 'wildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 454 - wildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'
+
+expecting success of 3070.455 'iwildmatch: no match 'bar/baz/foo' '*/foo'': 
+			test_must_fail test-tool wildmatch iwildmatch 'bar/baz/foo' '*/foo'
+		
+ok 455 - iwildmatch: no match 'bar/baz/foo' '*/foo'
+
+expecting success of 3070.456 'iwildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 456 - iwildmatch (via ls-files): no match '*/foo' 'bar/baz/foo'
+
+expecting success of 3070.457 'pathmatch: match 'bar/baz/foo' '*/foo'': 
+			test-tool wildmatch pathmatch 'bar/baz/foo' '*/foo'
+		
+ok 457 - pathmatch: match 'bar/baz/foo' '*/foo'
+
+expecting success of 3070.458 'pathmatch (via ls-files): match '*/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 458 - pathmatch (via ls-files): match '*/foo' 'bar/baz/foo'
+
+expecting success of 3070.459 'ipathmatch: match 'bar/baz/foo' '*/foo'': 
+			test-tool wildmatch ipathmatch 'bar/baz/foo' '*/foo'
+		
+ok 459 - ipathmatch: match 'bar/baz/foo' '*/foo'
+
+expecting success of 3070.460 'ipathmatch (via ls-files): match '*/foo' 'bar/baz/foo'': 
+				printf '%s' 'bar/baz/foo' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/foo' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 460 - ipathmatch (via ls-files): match '*/foo' 'bar/baz/foo'
+
+expecting success of 3070.461 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing bar/
+Removing expect
+ok 461 - cleanup after previous file test
+
+expecting success of 3070.462 'setup match file test for foo/bar/baz': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 462 - setup match file test for foo/bar/baz
+
+expecting success of 3070.463 'wildmatch: no match 'foo/bar/baz' '**/bar*'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar*'
+		
+ok 463 - wildmatch: no match 'foo/bar/baz' '**/bar*'
+
+expecting success of 3070.464 'wildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 464 - wildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'
+
+expecting success of 3070.465 'iwildmatch: no match 'foo/bar/baz' '**/bar*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar*'
+		
+ok 465 - iwildmatch: no match 'foo/bar/baz' '**/bar*'
+
+expecting success of 3070.466 'iwildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 466 - iwildmatch (via ls-files): no match '**/bar*' 'foo/bar/baz'
+
+expecting success of 3070.467 'pathmatch: match 'foo/bar/baz' '**/bar*'': 
+			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar*'
+		
+ok 467 - pathmatch: match 'foo/bar/baz' '**/bar*'
+
+expecting success of 3070.468 'pathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'': 
+				printf '%s' 'foo/bar/baz' >expect &&
+				git ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 468 - pathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'
+
+expecting success of 3070.469 'ipathmatch: match 'foo/bar/baz' '**/bar*'': 
+			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar*'
+		
+ok 469 - ipathmatch: match 'foo/bar/baz' '**/bar*'
+
+expecting success of 3070.470 'ipathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'': 
+				printf '%s' 'foo/bar/baz' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 470 - ipathmatch (via ls-files): match '**/bar*' 'foo/bar/baz'
+
+expecting success of 3070.471 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 471 - cleanup after previous file test
+
+expecting success of 3070.472 'setup match file test for deep/foo/bar/baz': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 472 - setup match file test for deep/foo/bar/baz
+
+expecting success of 3070.473 'wildmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
+			test-tool wildmatch wildmatch 'deep/foo/bar/baz' '**/bar/*'
+		
+ok 473 - wildmatch: match 'deep/foo/bar/baz' '**/bar/*'
+
+expecting success of 3070.474 'wildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
+				printf '%s' 'deep/foo/bar/baz' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 474 - wildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+
+expecting success of 3070.475 'iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
+			test-tool wildmatch iwildmatch 'deep/foo/bar/baz' '**/bar/*'
+		
+ok 475 - iwildmatch: match 'deep/foo/bar/baz' '**/bar/*'
+
+expecting success of 3070.476 'iwildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
+				printf '%s' 'deep/foo/bar/baz' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 476 - iwildmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+
+expecting success of 3070.477 'pathmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz' '**/bar/*'
+		
+ok 477 - pathmatch: match 'deep/foo/bar/baz' '**/bar/*'
+
+expecting success of 3070.478 'pathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
+				printf '%s' 'deep/foo/bar/baz' >expect &&
+				git ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 478 - pathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+
+expecting success of 3070.479 'ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz' '**/bar/*'
+		
+ok 479 - ipathmatch: match 'deep/foo/bar/baz' '**/bar/*'
+
+expecting success of 3070.480 'ipathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'': 
+				printf '%s' 'deep/foo/bar/baz' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 480 - ipathmatch (via ls-files): match '**/bar/*' 'deep/foo/bar/baz'
+
+expecting success of 3070.481 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing deep/
+Removing expect
+ok 481 - cleanup after previous file test
+
+expecting success of 3070.482 'setup match file test for deep/foo/bar/baz/': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 482 - setup match file test for deep/foo/bar/baz/
+
+expecting success of 3070.483 'wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 483 - wildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
+
+checking known breakage of 3070.484 'wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/'': false
+not ok 484 - wildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.485 'iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 485 - iwildmatch: no match 'deep/foo/bar/baz/' '**/bar/*'
+
+checking known breakage of 3070.486 'iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/'': false
+not ok 486 - iwildmatch (via ls-files): no match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.487 'pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 487 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+
+checking known breakage of 3070.488 'pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/'': false
+not ok 488 - pathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.489 'ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/*'
+		
+ok 489 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/*'
+
+checking known breakage of 3070.490 'ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/'': false
+not ok 490 - ipathmatch (via ls-files): match skip '**/bar/*' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.491 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 491 - cleanup after previous file test
+
+expecting success of 3070.492 'setup match file test for deep/foo/bar/baz/': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 492 - setup match file test for deep/foo/bar/baz/
+
+expecting success of 3070.493 'wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
+			test-tool wildmatch wildmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 493 - wildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+
+checking known breakage of 3070.494 'wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
+not ok 494 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.495 'iwildmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
+			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 495 - iwildmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+
+checking known breakage of 3070.496 'iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
+not ok 496 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.497 'pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 497 - pathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+
+checking known breakage of 3070.498 'pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
+not ok 498 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.499 'ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/' '**/bar/**'
+		
+ok 499 - ipathmatch: match 'deep/foo/bar/baz/' '**/bar/**'
+
+checking known breakage of 3070.500 'ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/'': false
+not ok 500 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/baz/' # TODO known breakage
+
+expecting success of 3070.501 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 501 - cleanup after previous file test
+
+expecting success of 3070.502 'setup match file test for deep/foo/bar': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 502 - setup match file test for deep/foo/bar
+
+expecting success of 3070.503 'wildmatch: no match 'deep/foo/bar' '**/bar/*'': 
+			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar' '**/bar/*'
+		
+ok 503 - wildmatch: no match 'deep/foo/bar' '**/bar/*'
+
+expecting success of 3070.504 'wildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 504 - wildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+
+expecting success of 3070.505 'iwildmatch: no match 'deep/foo/bar' '**/bar/*'': 
+			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar' '**/bar/*'
+		
+ok 505 - iwildmatch: no match 'deep/foo/bar' '**/bar/*'
+
+expecting success of 3070.506 'iwildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 506 - iwildmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+
+expecting success of 3070.507 'pathmatch: no match 'deep/foo/bar' '**/bar/*'': 
+			test_must_fail test-tool wildmatch pathmatch 'deep/foo/bar' '**/bar/*'
+		
+ok 507 - pathmatch: no match 'deep/foo/bar' '**/bar/*'
+
+expecting success of 3070.508 'pathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
+				>expect &&
+				git ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 508 - pathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+
+expecting success of 3070.509 'ipathmatch: no match 'deep/foo/bar' '**/bar/*'': 
+			test_must_fail test-tool wildmatch ipathmatch 'deep/foo/bar' '**/bar/*'
+		
+ok 509 - ipathmatch: no match 'deep/foo/bar' '**/bar/*'
+
+expecting success of 3070.510 'ipathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 510 - ipathmatch (via ls-files): no match '**/bar/*' 'deep/foo/bar'
+
+expecting success of 3070.511 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing deep/
+Removing expect
+ok 511 - cleanup after previous file test
+
+expecting success of 3070.512 'setup match file test for deep/foo/bar/': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 512 - setup match file test for deep/foo/bar/
+
+expecting success of 3070.513 'wildmatch: match 'deep/foo/bar/' '**/bar/**'': 
+			test-tool wildmatch wildmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 513 - wildmatch: match 'deep/foo/bar/' '**/bar/**'
+
+checking known breakage of 3070.514 'wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
+not ok 514 - wildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+
+expecting success of 3070.515 'iwildmatch: match 'deep/foo/bar/' '**/bar/**'': 
+			test-tool wildmatch iwildmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 515 - iwildmatch: match 'deep/foo/bar/' '**/bar/**'
+
+checking known breakage of 3070.516 'iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
+not ok 516 - iwildmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+
+expecting success of 3070.517 'pathmatch: match 'deep/foo/bar/' '**/bar/**'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 517 - pathmatch: match 'deep/foo/bar/' '**/bar/**'
+
+checking known breakage of 3070.518 'pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
+not ok 518 - pathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+
+expecting success of 3070.519 'ipathmatch: match 'deep/foo/bar/' '**/bar/**'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/' '**/bar/**'
+		
+ok 519 - ipathmatch: match 'deep/foo/bar/' '**/bar/**'
+
+checking known breakage of 3070.520 'ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/'': false
+not ok 520 - ipathmatch (via ls-files): match skip '**/bar/**' 'deep/foo/bar/' # TODO known breakage
+
+expecting success of 3070.521 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 521 - cleanup after previous file test
+
+expecting success of 3070.522 'setup match file test for foo/bar/baz': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 522 - setup match file test for foo/bar/baz
+
+expecting success of 3070.523 'wildmatch: no match 'foo/bar/baz' '**/bar**'': 
+			test_must_fail test-tool wildmatch wildmatch 'foo/bar/baz' '**/bar**'
+		
+ok 523 - wildmatch: no match 'foo/bar/baz' '**/bar**'
+
+expecting success of 3070.524 'wildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 524 - wildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'
+
+expecting success of 3070.525 'iwildmatch: no match 'foo/bar/baz' '**/bar**'': 
+			test_must_fail test-tool wildmatch iwildmatch 'foo/bar/baz' '**/bar**'
+		
+ok 525 - iwildmatch: no match 'foo/bar/baz' '**/bar**'
+
+expecting success of 3070.526 'iwildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 526 - iwildmatch (via ls-files): no match '**/bar**' 'foo/bar/baz'
+
+expecting success of 3070.527 'pathmatch: match 'foo/bar/baz' '**/bar**'': 
+			test-tool wildmatch pathmatch 'foo/bar/baz' '**/bar**'
+		
+ok 527 - pathmatch: match 'foo/bar/baz' '**/bar**'
+
+expecting success of 3070.528 'pathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'': 
+				printf '%s' 'foo/bar/baz' >expect &&
+				git ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 528 - pathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'
+
+expecting success of 3070.529 'ipathmatch: match 'foo/bar/baz' '**/bar**'': 
+			test-tool wildmatch ipathmatch 'foo/bar/baz' '**/bar**'
+		
+ok 529 - ipathmatch: match 'foo/bar/baz' '**/bar**'
+
+expecting success of 3070.530 'ipathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'': 
+				printf '%s' 'foo/bar/baz' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 530 - ipathmatch (via ls-files): match '**/bar**' 'foo/bar/baz'
+
+expecting success of 3070.531 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 531 - cleanup after previous file test
+
+expecting success of 3070.532 'setup match file test for foo/bar/baz/x': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 532 - setup match file test for foo/bar/baz/x
+
+expecting success of 3070.533 'wildmatch: match 'foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch wildmatch 'foo/bar/baz/x' '*/bar/**'
+		
+ok 533 - wildmatch: match 'foo/bar/baz/x' '*/bar/**'
+
+expecting success of 3070.534 'wildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
+				printf '%s' 'foo/bar/baz/x' >expect &&
+				git --glob-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 534 - wildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+
+expecting success of 3070.535 'iwildmatch: match 'foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch iwildmatch 'foo/bar/baz/x' '*/bar/**'
+		
+ok 535 - iwildmatch: match 'foo/bar/baz/x' '*/bar/**'
+
+expecting success of 3070.536 'iwildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
+				printf '%s' 'foo/bar/baz/x' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 536 - iwildmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+
+expecting success of 3070.537 'pathmatch: match 'foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch pathmatch 'foo/bar/baz/x' '*/bar/**'
+		
+ok 537 - pathmatch: match 'foo/bar/baz/x' '*/bar/**'
+
+expecting success of 3070.538 'pathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
+				printf '%s' 'foo/bar/baz/x' >expect &&
+				git ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 538 - pathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+
+expecting success of 3070.539 'ipathmatch: match 'foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch ipathmatch 'foo/bar/baz/x' '*/bar/**'
+		
+ok 539 - ipathmatch: match 'foo/bar/baz/x' '*/bar/**'
+
+expecting success of 3070.540 'ipathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'': 
+				printf '%s' 'foo/bar/baz/x' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 540 - ipathmatch (via ls-files): match '*/bar/**' 'foo/bar/baz/x'
+
+expecting success of 3070.541 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 541 - cleanup after previous file test
+
+expecting success of 3070.542 'setup match file test for deep/foo/bar/baz/x': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 542 - setup match file test for deep/foo/bar/baz/x
+
+expecting success of 3070.543 'wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'': 
+			test_must_fail test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '*/bar/**'
+		
+ok 543 - wildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
+
+expecting success of 3070.544 'wildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 544 - wildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'
+
+expecting success of 3070.545 'iwildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'': 
+			test_must_fail test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '*/bar/**'
+		
+ok 545 - iwildmatch: no match 'deep/foo/bar/baz/x' '*/bar/**'
+
+expecting success of 3070.546 'iwildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 546 - iwildmatch (via ls-files): no match '*/bar/**' 'deep/foo/bar/baz/x'
+
+expecting success of 3070.547 'pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '*/bar/**'
+		
+ok 547 - pathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
+
+expecting success of 3070.548 'pathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 548 - pathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'
+
+expecting success of 3070.549 'ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '*/bar/**'
+		
+ok 549 - ipathmatch: match 'deep/foo/bar/baz/x' '*/bar/**'
+
+expecting success of 3070.550 'ipathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git --icase-pathspecs ls-files -z -- '*/bar/**' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 550 - ipathmatch (via ls-files): match '*/bar/**' 'deep/foo/bar/baz/x'
+
+expecting success of 3070.551 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing deep/
+Removing expect
+ok 551 - cleanup after previous file test
+
+expecting success of 3070.552 'setup match file test for deep/foo/bar/baz/x': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 552 - setup match file test for deep/foo/bar/baz/x
+
+expecting success of 3070.553 'wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
+			test-tool wildmatch wildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+		
+ok 553 - wildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+
+expecting success of 3070.554 'wildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git --glob-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 554 - wildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+
+expecting success of 3070.555 'iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
+			test-tool wildmatch iwildmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+		
+ok 555 - iwildmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+
+expecting success of 3070.556 'iwildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 556 - iwildmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+
+expecting success of 3070.557 'pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
+			test-tool wildmatch pathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+		
+ok 557 - pathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+
+expecting success of 3070.558 'pathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 558 - pathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+
+expecting success of 3070.559 'ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'': 
+			test-tool wildmatch ipathmatch 'deep/foo/bar/baz/x' '**/bar/*/*'
+		
+ok 559 - ipathmatch: match 'deep/foo/bar/baz/x' '**/bar/*/*'
+
+expecting success of 3070.560 'ipathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'': 
+				printf '%s' 'deep/foo/bar/baz/x' >expect &&
+				git --icase-pathspecs ls-files -z -- '**/bar/*/*' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 560 - ipathmatch (via ls-files): match '**/bar/*/*' 'deep/foo/bar/baz/x'
+
+expecting success of 3070.561 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing deep/
+Removing expect
+ok 561 - cleanup after previous file test
+
+expecting success of 3070.562 'setup match file test for acrt': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 562 - setup match file test for acrt
+
+expecting success of 3070.563 'wildmatch: no match 'acrt' 'a[c-c]st'': 
+			test_must_fail test-tool wildmatch wildmatch 'acrt' 'a[c-c]st'
+		
+ok 563 - wildmatch: no match 'acrt' 'a[c-c]st'
+
+expecting success of 3070.564 'wildmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 564 - wildmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+
+expecting success of 3070.565 'iwildmatch: no match 'acrt' 'a[c-c]st'': 
+			test_must_fail test-tool wildmatch iwildmatch 'acrt' 'a[c-c]st'
+		
+ok 565 - iwildmatch: no match 'acrt' 'a[c-c]st'
+
+expecting success of 3070.566 'iwildmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 566 - iwildmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+
+expecting success of 3070.567 'pathmatch: no match 'acrt' 'a[c-c]st'': 
+			test_must_fail test-tool wildmatch pathmatch 'acrt' 'a[c-c]st'
+		
+ok 567 - pathmatch: no match 'acrt' 'a[c-c]st'
+
+expecting success of 3070.568 'pathmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
+				>expect &&
+				git ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 568 - pathmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+
+expecting success of 3070.569 'ipathmatch: no match 'acrt' 'a[c-c]st'': 
+			test_must_fail test-tool wildmatch ipathmatch 'acrt' 'a[c-c]st'
+		
+ok 569 - ipathmatch: no match 'acrt' 'a[c-c]st'
+
+expecting success of 3070.570 'ipathmatch (via ls-files): no match 'a[c-c]st' 'acrt'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- 'a[c-c]st' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 570 - ipathmatch (via ls-files): no match 'a[c-c]st' 'acrt'
+
+expecting success of 3070.571 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing acrt
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 571 - cleanup after previous file test
+
+expecting success of 3070.572 'setup match file test for acrt': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 572 - setup match file test for acrt
+
+expecting success of 3070.573 'wildmatch: match 'acrt' 'a[c-c]rt'': 
+			test-tool wildmatch wildmatch 'acrt' 'a[c-c]rt'
+		
+ok 573 - wildmatch: match 'acrt' 'a[c-c]rt'
+
+expecting success of 3070.574 'wildmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
+				printf '%s' 'acrt' >expect &&
+				git --glob-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 574 - wildmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+
+expecting success of 3070.575 'iwildmatch: match 'acrt' 'a[c-c]rt'': 
+			test-tool wildmatch iwildmatch 'acrt' 'a[c-c]rt'
+		
+ok 575 - iwildmatch: match 'acrt' 'a[c-c]rt'
+
+expecting success of 3070.576 'iwildmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
+				printf '%s' 'acrt' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 576 - iwildmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+
+expecting success of 3070.577 'pathmatch: match 'acrt' 'a[c-c]rt'': 
+			test-tool wildmatch pathmatch 'acrt' 'a[c-c]rt'
+		
+ok 577 - pathmatch: match 'acrt' 'a[c-c]rt'
+
+expecting success of 3070.578 'pathmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
+				printf '%s' 'acrt' >expect &&
+				git ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 578 - pathmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+
+expecting success of 3070.579 'ipathmatch: match 'acrt' 'a[c-c]rt'': 
+			test-tool wildmatch ipathmatch 'acrt' 'a[c-c]rt'
+		
+ok 579 - ipathmatch: match 'acrt' 'a[c-c]rt'
+
+expecting success of 3070.580 'ipathmatch (via ls-files): match 'a[c-c]rt' 'acrt'': 
+				printf '%s' 'acrt' >expect &&
+				git --icase-pathspecs ls-files -z -- 'a[c-c]rt' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 580 - ipathmatch (via ls-files): match 'a[c-c]rt' 'acrt'
+
+expecting success of 3070.581 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing acrt
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 581 - cleanup after previous file test
+
+expecting success of 3070.582 'setup match file test for ]': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 582 - setup match file test for ]
+
+expecting success of 3070.583 'wildmatch: no match ']' '[!]-]'': 
+			test_must_fail test-tool wildmatch wildmatch ']' '[!]-]'
+		
+ok 583 - wildmatch: no match ']' '[!]-]'
+
+expecting success of 3070.584 'wildmatch (via ls-files): no match '[!]-]' ']'': 
+				>expect &&
+				git --glob-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 584 - wildmatch (via ls-files): no match '[!]-]' ']'
+
+expecting success of 3070.585 'iwildmatch: no match ']' '[!]-]'': 
+			test_must_fail test-tool wildmatch iwildmatch ']' '[!]-]'
+		
+ok 585 - iwildmatch: no match ']' '[!]-]'
+
+expecting success of 3070.586 'iwildmatch (via ls-files): no match '[!]-]' ']'': 
+				>expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 586 - iwildmatch (via ls-files): no match '[!]-]' ']'
+
+expecting success of 3070.587 'pathmatch: no match ']' '[!]-]'': 
+			test_must_fail test-tool wildmatch pathmatch ']' '[!]-]'
+		
+ok 587 - pathmatch: no match ']' '[!]-]'
+
+expecting success of 3070.588 'pathmatch (via ls-files): no match '[!]-]' ']'': 
+				>expect &&
+				git ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 588 - pathmatch (via ls-files): no match '[!]-]' ']'
+
+expecting success of 3070.589 'ipathmatch: no match ']' '[!]-]'': 
+			test_must_fail test-tool wildmatch ipathmatch ']' '[!]-]'
+		
+ok 589 - ipathmatch: no match ']' '[!]-]'
+
+expecting success of 3070.590 'ipathmatch (via ls-files): no match '[!]-]' ']'': 
+				>expect &&
+				git --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 590 - ipathmatch (via ls-files): no match '[!]-]' ']'
+
+expecting success of 3070.591 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing ]
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 591 - cleanup after previous file test
+
+expecting success of 3070.592 'setup match file test for a': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 592 - setup match file test for a
+
+expecting success of 3070.593 'wildmatch: match 'a' '[!]-]'': 
+			test-tool wildmatch wildmatch 'a' '[!]-]'
+		
+ok 593 - wildmatch: match 'a' '[!]-]'
+
+expecting success of 3070.594 'wildmatch (via ls-files): match '[!]-]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 594 - wildmatch (via ls-files): match '[!]-]' 'a'
+
+expecting success of 3070.595 'iwildmatch: match 'a' '[!]-]'': 
+			test-tool wildmatch iwildmatch 'a' '[!]-]'
+		
+ok 595 - iwildmatch: match 'a' '[!]-]'
+
+expecting success of 3070.596 'iwildmatch (via ls-files): match '[!]-]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 596 - iwildmatch (via ls-files): match '[!]-]' 'a'
+
+expecting success of 3070.597 'pathmatch: match 'a' '[!]-]'': 
+			test-tool wildmatch pathmatch 'a' '[!]-]'
+		
+ok 597 - pathmatch: match 'a' '[!]-]'
+
+expecting success of 3070.598 'pathmatch (via ls-files): match '[!]-]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 598 - pathmatch (via ls-files): match '[!]-]' 'a'
+
+expecting success of 3070.599 'ipathmatch: match 'a' '[!]-]'': 
+			test-tool wildmatch ipathmatch 'a' '[!]-]'
+		
+ok 599 - ipathmatch: match 'a' '[!]-]'
+
+expecting success of 3070.600 'ipathmatch (via ls-files): match '[!]-]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[!]-]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 600 - ipathmatch (via ls-files): match '[!]-]' 'a'
+
+expecting success of 3070.601 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 601 - cleanup after previous file test
+
+expecting success of 3070.602 'setup match file test for ': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 602 - setup match file test for 
+
+expecting success of 3070.603 'wildmatch: no match '' '\'': 
+			test_must_fail test-tool wildmatch wildmatch '' '\'
+		
+ok 603 - wildmatch: no match '' '\'
+
+checking known breakage of 3070.604 'wildmatch (via ls-files): no match skip '\' ''': false
+not ok 604 - wildmatch (via ls-files): no match skip '\' '' # TODO known breakage
+
+expecting success of 3070.605 'iwildmatch: no match '' '\'': 
+			test_must_fail test-tool wildmatch iwildmatch '' '\'
+		
+ok 605 - iwildmatch: no match '' '\'
+
+checking known breakage of 3070.606 'iwildmatch (via ls-files): no match skip '\' ''': false
+not ok 606 - iwildmatch (via ls-files): no match skip '\' '' # TODO known breakage
+
+expecting success of 3070.607 'pathmatch: no match '' '\'': 
+			test_must_fail test-tool wildmatch pathmatch '' '\'
+		
+ok 607 - pathmatch: no match '' '\'
+
+checking known breakage of 3070.608 'pathmatch (via ls-files): no match skip '\' ''': false
+not ok 608 - pathmatch (via ls-files): no match skip '\' '' # TODO known breakage
+
+expecting success of 3070.609 'ipathmatch: no match '' '\'': 
+			test_must_fail test-tool wildmatch ipathmatch '' '\'
+		
+ok 609 - ipathmatch: no match '' '\'
+
+checking known breakage of 3070.610 'ipathmatch (via ls-files): no match skip '\' ''': false
+not ok 610 - ipathmatch (via ls-files): no match skip '\' '' # TODO known breakage
+
+expecting success of 3070.611 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+ok 611 - cleanup after previous file test
+
+expecting success of 3070.612 'setup match file test for \': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 612 - setup match file test for \
+
+expecting success of 3070.613 'wildmatch: no match '\' '\'': 
+			test_must_fail test-tool wildmatch wildmatch '\' '\'
+		
+ok 613 - wildmatch: no match '\' '\'
+
+expecting success of 3070.614 'wildmatch (via ls-files): match '\' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 614 - wildmatch (via ls-files): match '\' '\'
+
+expecting success of 3070.615 'iwildmatch: no match '\' '\'': 
+			test_must_fail test-tool wildmatch iwildmatch '\' '\'
+		
+ok 615 - iwildmatch: no match '\' '\'
+
+expecting success of 3070.616 'iwildmatch (via ls-files): match '\' '\'': 
+				printf '%s' '\' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '\' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 616 - iwildmatch (via ls-files): match '\' '\'
+
+expecting success of 3070.617 'pathmatch: no match '\' '\'': 
+			test_must_fail test-tool wildmatch pathmatch '\' '\'
 		
 ok 617 - pathmatch: no match '\' '\'
 
@@ -168750,9457 +175146,2463 @@
 			
 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.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'
-
-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 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
-
-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 3070.1684 'wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'': 
-				>expect &&
-				git --glob-pathspecs ls-files -z -- 'foo/**arr' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1684 - wildmatch (via ls-files): no match 'foo/**arr' 'foo/bba/arr'
-
-expecting success of 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 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'
-
-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'
-
-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'
-
-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 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
-
-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
-
-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 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'
-
-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 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'
-
-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 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'
-
-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'
-
-expecting success of 3070.1700 'ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'': 
-				>expect &&
-				git --icase-pathspecs ls-files -z -- 'foo/*z' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1700 - ipathmatch (via ls-files): no match 'foo/*z' 'foo/bba/arr'
-
-expecting success of 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 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
-
-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 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'
-
-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 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'
-
-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'
-
-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'
-
-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 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'
-
-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 3070.1712 'setup match file test for foo/bar': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1712 - setup match file test for foo/bar
-
-expecting success of 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 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'
-
-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 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'
-
-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 3070.1718 'pathmatch (via ls-files): match 'foo?bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo?bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1718 - pathmatch (via ls-files): match 'foo?bar' 'foo/bar'
-
-expecting success of 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 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'
-
-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 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
-
-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 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'
-
-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 3070.1726 'iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'': 
-				>expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- 'foo[/]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1726 - iwildmatch (via ls-files): no match 'foo[/]bar' 'foo/bar'
-
-expecting success of 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 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'
-
-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 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'
-
-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 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
-
-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 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'
-
-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 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'
-
-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 3070.1738 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
-				printf '%s' 'foo/bar' >expect &&
-				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1738 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
-
-expecting success of 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 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'
-
-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
-
-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
-
-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'
-
-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'
-
-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 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'
-
-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 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'
-
-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 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'
-
-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 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
-
-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 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.1755 'iwildmatch: match 'a' '[A-Z]'': 
-			test-tool wildmatch iwildmatch 'a' '[A-Z]'
-		
-ok 1755 - iwildmatch: match 'a' '[A-Z]'
-
-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.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 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.1759 'ipathmatch: match 'a' '[A-Z]'': 
-			test-tool wildmatch ipathmatch 'a' '[A-Z]'
-		
-ok 1759 - ipathmatch: match 'a' '[A-Z]'
-
-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.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 3070.1762 'setup match file test for A': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1762 - setup match file test for A
-
-expecting success of 3070.1763 'wildmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch wildmatch 'A' '[A-Z]'
-		
-ok 1763 - wildmatch: match 'A' '[A-Z]'
-
-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.1765 'iwildmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch iwildmatch 'A' '[A-Z]'
-		
-ok 1765 - iwildmatch: match 'A' '[A-Z]'
-
-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.1767 'pathmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch pathmatch 'A' '[A-Z]'
-		
-ok 1767 - pathmatch: match 'A' '[A-Z]'
-
-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.1769 'ipathmatch: match 'A' '[A-Z]'': 
-			test-tool wildmatch ipathmatch 'A' '[A-Z]'
-		
-ok 1769 - ipathmatch: match 'A' '[A-Z]'
-
-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.1771 'cleanup after previous file test': 
-		if test -e .git/created_test_file
-		then
-			git reset &&
-			git clean -df
-		fi
-	
-Removing A
-Removing actual
-Removing actual.err
-Removing actual.raw
-Removing expect
-ok 1771 - cleanup after previous file test
-
-expecting success of 3070.1772 'setup match file test for A': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1772 - setup match file test for A
-
-expecting success of 3070.1773 'wildmatch: no match 'A' '[a-z]'': 
-			test_must_fail test-tool wildmatch wildmatch 'A' '[a-z]'
-		
-ok 1773 - wildmatch: no match 'A' '[a-z]'
-
-expecting success of 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'
-
-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 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'
-
-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 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'
-
-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 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'
-
-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 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
-
-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 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'
-
-expecting success of 3070.1785 'iwildmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch iwildmatch 'a' '[a-z]'
-		
-ok 1785 - iwildmatch: match 'a' '[a-z]'
-
-expecting success of 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'
-
-expecting success of 3070.1787 'pathmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch pathmatch 'a' '[a-z]'
-		
-ok 1787 - pathmatch: match 'a' '[a-z]'
-
-expecting success of 3070.1788 'pathmatch (via ls-files): match '[a-z]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git ls-files -z -- '[a-z]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1788 - pathmatch (via ls-files): match '[a-z]' 'a'
-
-expecting success of 3070.1789 'ipathmatch: match 'a' '[a-z]'': 
-			test-tool wildmatch ipathmatch 'a' '[a-z]'
-		
-ok 1789 - ipathmatch: match 'a' '[a-z]'
-
-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'
-
-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 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
-
-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 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'
-
-expecting success of 3070.1795 'iwildmatch: match 'a' '[[:upper:]]'': 
-			test-tool wildmatch iwildmatch 'a' '[[:upper:]]'
-		
-ok 1795 - iwildmatch: match 'a' '[[:upper:]]'
-
-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'
-
-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 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'
-
-expecting success of 3070.1799 'ipathmatch: match 'a' '[[:upper:]]'': 
-			test-tool wildmatch ipathmatch 'a' '[[:upper:]]'
-		
-ok 1799 - ipathmatch: match 'a' '[[:upper:]]'
-
-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'
-
-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 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
-
-expecting success of 3070.1803 'wildmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch wildmatch 'A' '[[:upper:]]'
-		
-ok 1803 - wildmatch: match 'A' '[[:upper:]]'
-
-expecting success of 3070.1804 'wildmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1804 - wildmatch (via ls-files): match '[[:upper:]]' 'A'
-
-expecting success of 3070.1805 'iwildmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch iwildmatch 'A' '[[:upper:]]'
-		
-ok 1805 - iwildmatch: match 'A' '[[:upper:]]'
-
-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'
-
-expecting success of 3070.1807 'pathmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch pathmatch 'A' '[[:upper:]]'
-		
-ok 1807 - pathmatch: match 'A' '[[:upper:]]'
-
-expecting success of 3070.1808 'pathmatch (via ls-files): match '[[:upper:]]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git ls-files -z -- '[[:upper:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1808 - pathmatch (via ls-files): match '[[:upper:]]' 'A'
-
-expecting success of 3070.1809 'ipathmatch: match 'A' '[[:upper:]]'': 
-			test-tool wildmatch ipathmatch 'A' '[[:upper:]]'
-		
-ok 1809 - ipathmatch: match 'A' '[[:upper:]]'
-
-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'
-
-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
-
-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
-
-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:]]'
-
-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'
-
-expecting success of 3070.1815 'iwildmatch: match 'A' '[[:lower:]]'': 
-			test-tool wildmatch iwildmatch 'A' '[[:lower:]]'
-		
-ok 1815 - iwildmatch: match 'A' '[[:lower:]]'
-
-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 3070.1817 'pathmatch: no match 'A' '[[:lower:]]'': 
-			test_must_fail test-tool wildmatch pathmatch 'A' '[[:lower:]]'
-		
-ok 1817 - pathmatch: no match 'A' '[[:lower:]]'
-
-expecting success of 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'
-
-expecting success of 3070.1819 'ipathmatch: match 'A' '[[:lower:]]'': 
-			test-tool wildmatch ipathmatch 'A' '[[:lower:]]'
-		
-ok 1819 - ipathmatch: match 'A' '[[:lower:]]'
-
-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'
-
-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 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
-
-expecting success of 3070.1823 'wildmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch wildmatch 'a' '[[:lower:]]'
-		
-ok 1823 - wildmatch: match 'a' '[[:lower:]]'
-
-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 3070.1825 'iwildmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch iwildmatch 'a' '[[:lower:]]'
-		
-ok 1825 - iwildmatch: match 'a' '[[:lower:]]'
-
-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'
-
-expecting success of 3070.1827 'pathmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch pathmatch 'a' '[[:lower:]]'
-		
-ok 1827 - pathmatch: match 'a' '[[:lower:]]'
-
-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 3070.1829 'ipathmatch: match 'a' '[[:lower:]]'': 
-			test-tool wildmatch ipathmatch 'a' '[[:lower:]]'
-		
-ok 1829 - ipathmatch: match 'a' '[[:lower:]]'
-
-expecting success of 3070.1830 'ipathmatch (via ls-files): match '[[:lower:]]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[[:lower:]]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1830 - ipathmatch (via ls-files): match '[[:lower:]]' 'a'
-
-expecting success of 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
-
-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 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]'
-
-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'
-
-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 3070.1836 'iwildmatch (via ls-files): match '[B-Za]' 'A'': 
-				printf '%s' 'A' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1836 - iwildmatch (via ls-files): match '[B-Za]' 'A'
-
-expecting success of 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]'
-
-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 3070.1839 'ipathmatch: match 'A' '[B-Za]'': 
-			test-tool wildmatch ipathmatch 'A' '[B-Za]'
-		
-ok 1839 - ipathmatch: match 'A' '[B-Za]'
-
-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 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
-
-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
-
-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 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'
-
-expecting success of 3070.1845 'iwildmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch iwildmatch 'a' '[B-Za]'
-		
-ok 1845 - iwildmatch: match 'a' '[B-Za]'
-
-expecting success of 3070.1846 'iwildmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1846 - iwildmatch (via ls-files): match '[B-Za]' 'a'
-
-expecting success of 3070.1847 'pathmatch: match 'a' '[B-Za]'': 
-			test-tool wildmatch pathmatch 'a' '[B-Za]'
-		
-ok 1847 - pathmatch: match 'a' '[B-Za]'
-
-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'
-
-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 3070.1850 'ipathmatch (via ls-files): match '[B-Za]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1850 - ipathmatch (via ls-files): match '[B-Za]' 'a'
-
-expecting success of 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
-
-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
-
-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]'
-
-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 3070.1855 'iwildmatch: match 'A' '[B-a]'': 
-			test-tool wildmatch iwildmatch 'A' '[B-a]'
-		
-ok 1855 - iwildmatch: match 'A' '[B-a]'
-
-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'
-
-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]'
-
-expecting success of 3070.1858 'pathmatch (via ls-files): no match '[B-a]' 'A'': 
-				>expect &&
-				git ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1858 - pathmatch (via ls-files): no match '[B-a]' 'A'
-
-expecting success of 3070.1859 'ipathmatch: match 'A' '[B-a]'': 
-			test-tool wildmatch ipathmatch 'A' '[B-a]'
-		
-ok 1859 - ipathmatch: match 'A' '[B-a]'
-
-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 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
-
-expecting success of 3070.1862 'setup match file test for a': 
-		file=$(cat .git/expected_test_file) &&
-		if should_create_test_file "$file"
-		then
-			dirs=${file%/*} &&
-			if test "$file" != "$dirs"
-			then
-				mkdir -p -- "$dirs" &&
-				touch -- "./$text"
-			else
-				touch -- "./$file"
-			fi &&
-			git add -A &&
-			printf "%s" "$file" >.git/created_test_file
-		elif test -e .git/created_test_file
-		then
-			rm .git/created_test_file
-		fi
-	
-ok 1862 - setup match file test for a
-
-expecting success of 3070.1863 'wildmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch wildmatch 'a' '[B-a]'
-		
-ok 1863 - wildmatch: match 'a' '[B-a]'
-
-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'
-
-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 3070.1866 'iwildmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1866 - iwildmatch (via ls-files): match '[B-a]' 'a'
-
-expecting success of 3070.1867 'pathmatch: match 'a' '[B-a]'': 
-			test-tool wildmatch pathmatch 'a' '[B-a]'
-		
-ok 1867 - pathmatch: match 'a' '[B-a]'
-
-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'
-
-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 3070.1870 'ipathmatch (via ls-files): match '[B-a]' 'a'': 
-				printf '%s' 'a' >expect &&
-				git --icase-pathspecs ls-files -z -- '[B-a]' >actual.raw 2>actual.err &&
-				
-		tr -d '\0' <actual.raw >actual &&
-		test_must_be_empty actual.err &&
-		test_cmp expect actual
-			
-ok 1870 - ipathmatch (via ls-files): match '[B-a]' 'a'
-
-expecting success of 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
-
-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 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]'
-
-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 3070.1875 'iwildmatch: match 'z' '[Z-y]'': 
-			test-tool wildmatch iwildmatch 'z' '[Z-y]'
-		
-ok 1875 - iwildmatch: match 'z' '[Z-y]'
-
-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'
-
-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]'
-
-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 3070.1879 'ipathmatch: match 'z' '[Z-y]'': 
-			test-tool wildmatch ipathmatch 'z' '[Z-y]'
-		
-ok 1879 - ipathmatch: match 'z' '[Z-y]'
-
-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 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
-
-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 3070.1883 'wildmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch wildmatch 'Z' '[Z-y]'
-		
-ok 1883 - wildmatch: match 'Z' '[Z-y]'
-
-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 3070.1885 'iwildmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch iwildmatch 'Z' '[Z-y]'
-		
-ok 1885 - iwildmatch: match 'Z' '[Z-y]'
-
-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 3070.1887 'pathmatch: match 'Z' '[Z-y]'': 
-			test-tool wildmatch pathmatch 'Z' '[Z-y]'
-		
-ok 1887 - pathmatch: match 'Z' '[Z-y]'
-
-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 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 $!
-
-t3070-wildmatch.sh: 11: kill: 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3402-rebase-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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: 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 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 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.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3403-rebase-skip.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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 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 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3405-rebase-malformed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3400-rebase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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: 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: 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
-
-error: The following untracked working tree files would be overwritten by checkout:
-	B
-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 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 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 24 - Rebase a commit that sprinkles CRs in
-
-expecting success of 3400.25 '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 25 - rebase can copy notes
-
-expecting success of 3400.26 '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 26 - rebase -m can copy notes
-
-expecting success of 3400.27 '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 27 - rebase commit with an ancient timestamp
-
-expecting success of 3400.28 '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 28 - rebase with "From " line in commit message
-
-expecting success of 3400.29 '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.45.2/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 advice.mergeConflict false"
-Patch failed at 0001 two
-trace: run_command: git show 4a30746df05d63c1ff544efc981f6dc849632f55 --
-trace: built-in: git show 4a30746df05d63c1ff544efc981f6dc849632f55 --
-ok 29 - rebase --apply and --show-current-patch
-
-expecting success of 3400.30 '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.45.2/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 30 - rebase --apply and .gitattributes
-
-expecting success of 3400.31 '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.45.2/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 advice.mergeConflict false"
-Could not apply 4a30746... two
-trace: run_command: git show REBASE_HEAD --
-trace: built-in: git show REBASE_HEAD --
-ok 31 - rebase--merge.sh and --show-current-patch
-
-expecting success of 3400.32 '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 32 - switch to branch checked out here
-
-expecting success of 3400.33 '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.45.2/t/trash directory.t3400-rebase/wt2'
-fatal: 'shared' is already used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3400-rebase/wt1'
-Deleted branch shared (was 1fb901f).
-ok 33 - switch to branch checked out elsewhere fails
-
-expecting success of 3400.34 '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 34 - switch to branch not checked out
-
-expecting success of 3400.35 '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 35 - switch to non-branch detaches HEAD
-
-expecting success of 3400.36 '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
-
-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.45.2/t/trash directory.t3400-rebase'
-ok 36 - refuse to switch to branch checked out elsewhere
-
-expecting success of 3400.37 '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.45.2/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 37 - rebase when inside worktree subdirectory
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3408-rebase-multi-line.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3409-rebase-environ.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3311-notes-merge-fanout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
-
-	git log --format=oneline &&
-
-	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
-
-	hash05a sha256:3aae5d26619d96dba93795f66325716e4cbc486884f95a6adee8fb0615a76d12
-	hash04a sha256:07e43dd3d89fe634d3252e253b426aacc7285a995dcdbcf94ac284060a1122cf
-	hash03a sha256:26fb52eaa7f4866bf735254587be7b31209ec10e525912ffd8e8ba549ba892ff
-	hash02a sha256:b57ebdf23634e750dcbc4b9a37991d70f90830d568a0e4529ce9de0a3f8d605c
-	hash01a sha256:377903b1572bd5117087a5518fcb1011b5053cccbc59e3c7c823a8615204173b
-	hash03b sha256:04e7b392fda7c185bfa17c9179b56db732edc2dc2b3bf887308dcaabb717270d
-	hash02b sha256:66099aaaec49a485ed990acadd9a9b81232ea592079964113d8f581ff69ef50b
-	EOF
-
-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 3311.2 'sanity check (x)': 
-	verify_notes x commit5 &&
-	verify_no_fanout x
-
-157e8cc0aeac5befb302d276f2e706112bf6e413
-94955c5cd7e5662c6ab40c323ecdfac458c47435
-e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ef004cfa88883bb87e030b6196934dd90e3548d2
-f6db73397fcc379ea00d1fc17a35abb42027a69a
-ok 2 - sanity check (x)
-
-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
-
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
----------------------------------------------------------------------
-
-ok 3 - Add a few hundred commits w/notes to trigger fanout (x -> y)
-
-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 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)"
-
-Already up to date.
-ok 5 - No-op merge (already included) (x => y)
-
-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)"
-
-Fast-forward
-ok 6 - Fast-forward merge (y => x)
-
-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
-
-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 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 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
-
-ok 9 - successful merge without conflicts (y => z)
-
-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 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
-
-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 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
-
-Using local notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
-Using local notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 12 - successful merge using "ours" strategy (z => w)
-
-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 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
-
-Using remote notes for 157e8cc0aeac5befb302d276f2e706112bf6e413
-Using remote notes for e0851358fb6b4703f23d74ef964bc4491bec7ab9
-ok 14 - successful merge using "theirs" strategy (z => w)
-
-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 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
-
-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 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 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
-
-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 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 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
-
-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 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 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)"
-
-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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3407-rebase-abort.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 3070.1657 'pathmatch: match 'foo/bba/arr' 'foo*'': 
+			test-tool wildmatch pathmatch 'foo/bba/arr' 'foo*'
+		
+ok 1657 - pathmatch: match 'foo/bba/arr' 'foo*'
 
-	test_commit --annotate b a b &&
-	test_commit --annotate c a c &&
+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 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 3070.1659 'ipathmatch: match 'foo/bba/arr' 'foo*'': 
+			test-tool wildmatch ipathmatch 'foo/bba/arr' 'foo*'
+		
+ok 1659 - ipathmatch: match 'foo/bba/arr' 'foo*'
 
-[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 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 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"
+expecting success of 3070.1661 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-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 advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-ok 2 - rebase --apply --abort
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1661 - cleanup after previous file test
 
-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
+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
 	
-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 advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-ok 3 - pre rebase --apply head is marked as reachable
+ok 1662 - setup match file test for foo/bba/arr
 
-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:
+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**'
 
-  656dfef reworded
+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'
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 3070.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**'
 
- git branch <new-branch-name> 656dfef
+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'
 
-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 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 advice.mergeConflict false"
-Patch failed at 0002 merge should fail on this, too
-ok 4 - rebase --apply --abort after --skip
+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 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 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 advice.mergeConflict false"
-Patch failed at 0002 merge should fail on this, too
-ok 5 - rebase --apply --abort after --continue
+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 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 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 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 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
+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
 	
-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 advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-ok 7 - rebase --apply --abort does not update reflog
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1671 - cleanup after previous file test
 
-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
+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
 	
-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 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
+ok 1672 - setup match file test for foo/bba/arr
 
-    --[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 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'
 
-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 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'
 
-    --[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 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'
 
-ok 8 - rebase --abort can not be used with other options
+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 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 advice.mergeConflict false"
-Patch failed at 0001 merge should fail on this
-ok 9 - rebase --apply --quit
+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 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 advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-ok 10 - rebase --merge --abort
+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 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
+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.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'
+
+expecting success of 3070.1681 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-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 advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-ok 11 - pre rebase --merge head is marked as reachable
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1681 - cleanup after previous file test
 
-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"
+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
 	
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+ok 1682 - setup match file test for foo/bba/arr
 
-  93ea589 reworded
+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'
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 3070.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'
 
- git branch <new-branch-name> 93ea589
+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'
 
-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 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 advice.mergeConflict false"
-Could not apply 1c3a3e2... merge should fail on this, too
-ok 12 - rebase --merge --abort after --skip
+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'
 
-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 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 advice.mergeConflict false"
-Could not apply 1c3a3e2... merge should fail on this, too
-ok 13 - rebase --merge --abort after --continue
+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'
 
-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 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 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'
 
-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
+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 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
 	
-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 advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-ok 15 - rebase --merge --abort does not update reflog
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+Removing foo/
+ok 1691 - cleanup after previous file test
 
-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
+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
 	
-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 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
+ok 1692 - setup match file test for foo/bba/arr
 
-    --[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 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'
 
-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 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'
 
-    --[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 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'
 
-ok 16 - rebase --abort can not be used with other options
+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'
 
-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 advice.mergeConflict false"
-Could not apply 3e1f4f7... merge should fail on this
-ok 17 - rebase --merge --quit
+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'
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3412-rebase-root.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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'
 
-[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 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'
 
-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
+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'
 
-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
+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
 
-    --[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 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 2 - rebase --root fails with too many args
+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 3412.3 'setup pre-rebase hook': 
-	test_hook --setup pre-rebase <<-\EOF
-	echo "$1,$2" >.git/PRE-REBASE-INPUT
-	EOF
+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 3 - setup pre-rebase hook
+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 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 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'
 
-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 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 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'
 
-expecting success of 3412.5 'pre-rebase got correct input (1)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+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'
 
-ok 5 - pre-rebase got correct input (1)
+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 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
+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'
 
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/work2.
-ok 6 - rebase --root --onto <newbase> <branch>
+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 3412.7 'pre-rebase got correct input (2)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work2
+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 7 - pre-rebase got correct input (2)
+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 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
+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'
 
-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 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 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 3412.9 'pre-rebase got correct input (3)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
+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 9 - pre-rebase got correct input (3)
+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 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
+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'
 
-warning: skipped previously applied commit 1c4476a
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/work4.
-ok 10 - rebase -i --root --onto <newbase> <branch>
+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 3412.11 'pre-rebase got correct input (4)': 
-	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
+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'
 
-ok 11 - pre-rebase got correct input (4)
+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 3412.12 'set up merge history': 
-	git checkout other^ &&
-	git checkout -b side &&
-	test_commit 5 C &&
-	git checkout other &&
-	git merge side
+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
 
-Note: switching to 'other^'.
+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'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 3070.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'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 3070.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'
 
-  git switch -c <new-branch-name>
+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'
 
-Or undo this operation with:
+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'
 
-  git switch -
+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'
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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'
 
-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 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'
 
-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
+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
 
-[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 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
 
-expecting success of 3412.14 'setup pre-rebase hook that fails': 
-	test_hook --setup --clobber pre-rebase <<-\EOF
-	false
-	EOF
+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'
 
-ok 14 - setup pre-rebase hook that fails
+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'
 
-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)
+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'
 
-Switched to a new branch 'stops1'
-fatal: The pre-rebase hook refused to rebase.
-ok 15 - pre-rebase hook stops rebase
+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'
 
-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)
+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'
 
-Switched to a new branch 'stops2'
-fatal: The pre-rebase hook refused to rebase.
-ok 16 - pre-rebase hook stops rebase -i
+expecting success of 3070.1738 'pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'': 
+				printf '%s' 'foo/bar' >expect &&
+				git ls-files -z -- 'foo[^a-z]bar' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1738 - pathmatch (via ls-files): match 'foo[^a-z]bar' 'foo/bar'
 
-expecting success of 3412.17 'remove pre-rebase hook': 
-	rm -f .git/hooks/pre-rebase
+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'
 
-ok 17 - remove pre-rebase hook
+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'
 
-expecting success of 3412.18 'set up a conflict': 
-	git checkout main &&
-	echo conflict > B &&
-	git add B &&
-	git commit -m conflict
+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
 
-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 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
 
-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 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'
 
-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 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 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 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'
 
-expecting success of 3412.20 'fix the conflict': 
-	echo 3 > B &&
-	git add B
+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'
 
-ok 20 - fix the conflict
+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'
 
-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
+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'
 
-[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 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'
 
-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$"
+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'
 
-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 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 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 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'
 
-expecting success of 3412.23 'fix the conflict': 
-	echo 3 > B &&
-	git add B
+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
 
-ok 23 - fix the conflict
+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
 
-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 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]'
 
-[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 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 3412.25 'fix the conflict': 
-	echo 3 > B &&
-	git add B
+expecting success of 3070.1755 'iwildmatch: match 'a' '[A-Z]'': 
+			test-tool wildmatch iwildmatch 'a' '[A-Z]'
+		
+ok 1755 - iwildmatch: match 'a' '[A-Z]'
 
-ok 25 - fix the conflict
+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'
 
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3413-rebase-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3413-rebase-hook/.git/
-expecting success of 3413.1 'setup': 
-	echo hello >file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-	echo goodbye >file &&
-	git add file &&
-	test_tick &&
-	git commit -m second &&
-	git checkout -b side HEAD^ &&
-	echo world >git &&
-	git add git &&
-	test_tick &&
-	git commit -m side &&
-	git checkout main &&
-	git log --pretty=oneline --abbrev-commit --graph --all &&
-	git branch test side
+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]'
 
-[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 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 3413.2 'rebase': 
-	git checkout test &&
-	git reset --hard side &&
-	git rebase main &&
-	test "z$(cat git)" = zworld
+expecting success of 3070.1759 'ipathmatch: match 'a' '[A-Z]'': 
+			test-tool wildmatch ipathmatch 'a' '[A-Z]'
+		
+ok 1759 - ipathmatch: match 'a' '[A-Z]'
 
-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 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 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 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
 
-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 3070.1762 'setup match file test for A': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
+		then
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1762 - setup match file test for A
 
-expecting success of 3413.4 'setup pre-rebase hook': 
-	test_hook --setup pre-rebase <<-\EOF
-	echo "$1,$2" >.git/PRE-REBASE-INPUT
-	EOF
+expecting success of 3070.1763 'wildmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch wildmatch 'A' '[A-Z]'
+		
+ok 1763 - wildmatch: match 'A' '[A-Z]'
 
-ok 4 - setup pre-rebase hook
+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 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 3070.1765 'iwildmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch iwildmatch 'A' '[A-Z]'
+		
+ok 1765 - iwildmatch: match 'A' '[A-Z]'
 
+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'
 
-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 3070.1767 'pathmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch pathmatch 'A' '[A-Z]'
+		
+ok 1767 - pathmatch: match 'A' '[A-Z]'
 
-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
+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'
 
-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 3070.1769 'ipathmatch: match 'A' '[A-Z]'': 
+			test-tool wildmatch ipathmatch 'A' '[A-Z]'
+		
+ok 1769 - ipathmatch: match 'A' '[A-Z]'
 
-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
+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'
 
-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 3070.1771 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1771 - cleanup after previous file test
 
-expecting success of 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,
+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 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]'
 
-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 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'
 
-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
+expecting success of 3070.1775 'iwildmatch: match 'A' '[a-z]'': 
+			test-tool wildmatch iwildmatch 'A' '[a-z]'
+		
+ok 1775 - iwildmatch: match 'A' '[a-z]'
 
-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 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'
 
-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
+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]'
 
-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 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'
 
-expecting success of 3413.11 'setup pre-rebase hook that fails': 
-	test_hook --setup --clobber pre-rebase <<-\EOF
-	false
-	EOF
+expecting success of 3070.1779 'ipathmatch: match 'A' '[a-z]'': 
+			test-tool wildmatch ipathmatch 'A' '[a-z]'
+		
+ok 1779 - ipathmatch: match 'A' '[a-z]'
 
-ok 11 - setup pre-rebase hook that fails
+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'
 
-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)
+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
 
-Already on 'test'
-HEAD is now at c847452 side
-fatal: The pre-rebase hook refused to rebase.
-ok 12 - pre-rebase hook stops rebase (1)
+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
 
-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 3070.1783 'wildmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch wildmatch 'a' '[a-z]'
+		
+ok 1783 - wildmatch: match 'a' '[a-z]'
 
-Already on 'test'
-HEAD is now at c847452 side
-fatal: The pre-rebase hook refused to rebase.
-ok 13 - pre-rebase hook stops rebase (2)
+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'
 
-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
+expecting success of 3070.1785 'iwildmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch iwildmatch 'a' '[a-z]'
+		
+ok 1785 - iwildmatch: match 'a' '[a-z]'
 
-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 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'
 
-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
+expecting success of 3070.1787 'pathmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch pathmatch 'a' '[a-z]'
+		
+ok 1787 - pathmatch: match 'a' '[a-z]'
 
-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)
+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'
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3406-rebase-message.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
+expecting success of 3070.1789 'ipathmatch: match 'a' '[a-z]'': 
+			test-tool wildmatch ipathmatch 'a' '[a-z]'
+		
+ok 1789 - ipathmatch: match 'a' '[a-z]'
 
-	git checkout -b conflicts O &&
-	test_commit P &&
-	test_commit conflict-X fileX &&
-	test_commit Q &&
+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'
 
-	git checkout -b topic O &&
-	git cherry-pick A B &&
-	test_commit Z fileZ &&
-	git tag start
+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
 
-[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 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
 
-expecting success of 3406.2 'rebase -m': 
-	git rebase -m main >actual &&
-	test_must_be_empty actual
+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:]]'
 
-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 advice.skippedCherryPicks false"
-Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/topic.
-ok 2 - rebase -m
+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'
 
-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 3070.1795 'iwildmatch: match 'a' '[[:upper:]]'': 
+			test-tool wildmatch iwildmatch 'a' '[[:upper:]]'
+		
+ok 1795 - iwildmatch: match 'a' '[[:upper:]]'
 
-Current branch topic is up to date.
-ok 3 - rebase against main twice
+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'
 
-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 3070.1797 'pathmatch: no match 'a' '[[:upper:]]'': 
+			test_must_fail test-tool wildmatch pathmatch 'a' '[[:upper:]]'
+		
+ok 1797 - pathmatch: no match 'a' '[[:upper:]]'
 
-Current branch topic is up to date, rebase forced.
-ok 4 - rebase against main twice with --force
+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'
 
-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 3070.1799 'ipathmatch: match 'a' '[[:upper:]]'': 
+			test-tool wildmatch ipathmatch 'a' '[[:upper:]]'
+		
+ok 1799 - ipathmatch: match 'a' '[[:upper:]]'
 
-Note: switching to 'topic^'.
+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'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 3070.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
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 3070.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
 
-  git switch -c <new-branch-name>
+expecting success of 3070.1803 'wildmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch wildmatch 'A' '[[:upper:]]'
+		
+ok 1803 - wildmatch: match 'A' '[[:upper:]]'
 
-Or undo this operation with:
+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'
 
-  git switch -
+expecting success of 3070.1805 'iwildmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch iwildmatch 'A' '[[:upper:]]'
+		
+ok 1805 - iwildmatch: match 'A' '[[:upper:]]'
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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'
 
-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 3070.1807 'pathmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch pathmatch 'A' '[[:upper:]]'
+		
+ok 1807 - pathmatch: match 'A' '[[:upper:]]'
 
-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 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'
 
-Note: switching to 'topic^'.
+expecting success of 3070.1809 'ipathmatch: match 'A' '[[:upper:]]'': 
+			test-tool wildmatch ipathmatch 'A' '[[:upper:]]'
+		
+ok 1809 - ipathmatch: match 'A' '[[:upper:]]'
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 3070.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'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 3070.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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:]]'
 
-  git switch -
+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'
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 3070.1815 'iwildmatch: match 'A' '[[:lower:]]'': 
+			test-tool wildmatch iwildmatch 'A' '[[:lower:]]'
+		
+ok 1815 - iwildmatch: match 'A' '[[:lower:]]'
 
-HEAD is now at 545b0d0 Y
-Fast-forwarded HEAD to topic.
-ok 6 - rebase fast-forward to main
+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 3406.7 'rebase --stat': 
-	git reset --hard start &&
-	git rebase --stat main >diffstat.txt &&
-	grep "^ fileX |  *1 +$" diffstat.txt
+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:]]'
 
-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 advice.skippedCherryPicks false"
-Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
- fileX | 1 +
-ok 7 - rebase --stat
+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'
 
-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
+expecting success of 3070.1819 'ipathmatch: match 'A' '[[:lower:]]'': 
+			test-tool wildmatch ipathmatch 'A' '[[:lower:]]'
+		
+ok 1819 - ipathmatch: match 'A' '[[:lower:]]'
 
-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 advice.skippedCherryPicks false"
-Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
- fileX | 1 +
-ok 8 - rebase w/config rebase.stat
+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'
 
-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 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
 
-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 advice.skippedCherryPicks false"
-Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 9 - rebase -n overrides config rebase.stat config
+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
 
-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 3070.1823 'wildmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch wildmatch 'a' '[[:lower:]]'
+		
+ok 1823 - wildmatch: match 'a' '[[:lower:]]'
 
-fatal: Does not point to a valid commit 'invalid-ref'
-ok 10 - rebase --onto outputs the invalid ref
+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 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 3070.1825 'iwildmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch iwildmatch 'a' '[[:lower:]]'
+		
+ok 1825 - iwildmatch: match 'a' '[[:lower:]]'
 
-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 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'
 
-expecting success of 3406.12 'rebase --merge reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+expecting success of 3070.1827 'pathmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch pathmatch 'a' '[[:lower:]]'
+		
+ok 1827 - pathmatch: match 'a' '[[:lower:]]'
 
-	(
-		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 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'
 
-	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 3070.1829 'ipathmatch: match 'a' '[[:lower:]]'': 
+			test-tool wildmatch ipathmatch 'a' '[[:lower:]]'
+		
+ok 1829 - ipathmatch: match 'a' '[[:lower:]]'
 
-	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 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'
 
-	# check there is only one new entry in the branch reflog
-	test_cmp_rev conflicts@{1} Q
+expecting success of 3070.1831 'cleanup after previous file test': 
+		if test -e .git/created_test_file
+		then
+			git reset &&
+			git clean -df
+		fi
 	
-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 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" &&
+Removing a
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1831 - cleanup after previous file test
 
-	(
-		if test -n "$reflog_action"
+expecting success of 3070.1832 'setup match file test for A': 
+		file=$(cat .git/expected_test_file) &&
+		if should_create_test_file "$file"
 		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		git rebase $mode main
-	) &&
+			dirs=${file%/*} &&
+			if test "$file" != "$dirs"
+			then
+				mkdir -p -- "$dirs" &&
+				touch -- "./$text"
+			else
+				touch -- "./$file"
+			fi &&
+			git add -A &&
+			printf "%s" "$file" >.git/created_test_file
+		elif test -e .git/created_test_file
+		then
+			rm .git/created_test_file
+		fi
+	
+ok 1832 - setup match file test for A
 
-	git 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 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]'
 
-	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 &&
+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'
 
-	# 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 3070.1835 'iwildmatch: match 'A' '[B-Za]'': 
+			test-tool wildmatch iwildmatch 'A' '[B-Za]'
+		
+ok 1835 - iwildmatch: match 'A' '[B-Za]'
 
-expecting success of 3406.14 'rebase --merge --skip reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+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'
 
-	(
-		if test -n "$reflog_action"
+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]'
+
+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 3070.1839 'ipathmatch: match 'A' '[B-Za]'': 
+			test-tool wildmatch ipathmatch 'A' '[B-Za]'
+		
+ok 1839 - ipathmatch: match 'A' '[B-Za]'
+
+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 3070.1841 'cleanup after previous file test': 
+		if test -e .git/created_test_file
 		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --skip
-	) &&
+			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
 
-	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 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
 	
-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 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
+ok 1842 - setup match file test for a
 
-expecting success of 3406.15 'rebase --merge --abort reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+expecting success of 3070.1843 'wildmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch wildmatch 'a' '[B-Za]'
+		
+ok 1843 - wildmatch: match 'a' '[B-Za]'
 
-	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
-	) &&
+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'
 
-	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 &&
+expecting success of 3070.1845 'iwildmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch iwildmatch 'a' '[B-Za]'
+		
+ok 1845 - iwildmatch: match 'a' '[B-Za]'
 
-	# 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 advice.mergeConflict false"
-Could not apply f31fbd6... conflict-X
-HEAD is now at f39a215 Q
-ok 15 - rebase --merge --abort reflog
+expecting success of 3070.1846 'iwildmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --glob-pathspecs --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1846 - iwildmatch (via ls-files): match '[B-Za]' 'a'
 
-expecting success of 3406.16 'rebase --merge --abort detached HEAD reflog': 
-	git checkout Q &&
-	test_when_finished "git reset --hard Q" &&
+expecting success of 3070.1847 'pathmatch: match 'a' '[B-Za]'': 
+			test-tool wildmatch pathmatch 'a' '[B-Za]'
+		
+ok 1847 - pathmatch: match 'a' '[B-Za]'
 
-	(
-		if test -n "$reflog_action"
+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'
+
+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 3070.1850 'ipathmatch (via ls-files): match '[B-Za]' 'a'': 
+				printf '%s' 'a' >expect &&
+				git --icase-pathspecs ls-files -z -- '[B-Za]' >actual.raw 2>actual.err &&
+				
+		tr -d '\0' <actual.raw >actual &&
+		test_must_be_empty actual.err &&
+		test_cmp expect actual
+			
+ok 1850 - ipathmatch (via ls-files): match '[B-Za]' 'a'
+
+expecting success of 3070.1851 'cleanup after previous file test': 
+		if test -e .git/created_test_file
 		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
+			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
 
-	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 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
 	
-Note: switching to 'Q'.
+ok 1852 - setup match file test for A
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 3070.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]'
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 3070.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'
 
-  git switch -c <new-branch-name>
+expecting success of 3070.1855 'iwildmatch: match 'A' '[B-a]'': 
+			test-tool wildmatch iwildmatch 'A' '[B-a]'
+		
+ok 1855 - iwildmatch: match 'A' '[B-a]'
 
-Or undo this operation with:
+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'
 
-  git switch -
+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]'
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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'
 
-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 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 3070.1859 'ipathmatch: match 'A' '[B-a]'': 
+			test-tool wildmatch ipathmatch 'A' '[B-a]'
+		
+ok 1859 - ipathmatch: match 'A' '[B-a]'
 
-expecting success of 3406.17 'rebase --merge reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+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'
 
-	(
-		if test -n "$reflog_action"
+expecting success of 3070.1861 'cleanup after previous file test': 
+		if test -e .git/created_test_file
 		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 reset &&
+			git clean -df
+		fi
+	
+Removing A
+Removing actual
+Removing actual.err
+Removing actual.raw
+Removing expect
+ok 1861 - cleanup after previous file test
 
-	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 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
 
-	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 3070.1863 'wildmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch wildmatch 'a' '[B-a]'
+		
+ok 1863 - wildmatch: match 'a' '[B-a]'
 
-	# 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 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 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'
 
-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" &&
+expecting success of 3070.1865 'iwildmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch iwildmatch 'a' '[B-a]'
+		
+ok 1865 - iwildmatch: match 'a' '[B-a]'
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		git rebase $mode main
-	) &&
+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'
 
-	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 3070.1867 'pathmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch pathmatch 'a' '[B-a]'
+		
+ok 1867 - pathmatch: match 'a' '[B-a]'
 
-	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 &&
+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'
 
-	# 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 3070.1869 'ipathmatch: match 'a' '[B-a]'': 
+			test-tool wildmatch ipathmatch 'a' '[B-a]'
+		
+ok 1869 - ipathmatch: match 'a' '[B-a]'
 
-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" &&
+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'
 
-	(
-		if test -n "$reflog_action"
+expecting success of 3070.1871 'cleanup after previous file test': 
+		if test -e .git/created_test_file
 		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --skip
-	) &&
+			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
 
-	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 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
 	
-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 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
+ok 1872 - setup match file test for z
 
-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" &&
+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]'
 
-	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
-	) &&
+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'
 
-	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 &&
+expecting success of 3070.1875 'iwildmatch: match 'z' '[Z-y]'': 
+			test-tool wildmatch iwildmatch 'z' '[Z-y]'
+		
+ok 1875 - iwildmatch: match 'z' '[Z-y]'
 
-	# 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 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 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'
 
-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" &&
+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]'
 
-	(
-		if test -n "$reflog_action"
+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 3070.1879 'ipathmatch: match 'z' '[Z-y]'': 
+			test-tool wildmatch ipathmatch 'z' '[Z-y]'
+		
+ok 1879 - ipathmatch: match 'z' '[Z-y]'
+
+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 3070.1881 'cleanup after previous file test': 
+		if test -e .git/created_test_file
 		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		test_must_fail git rebase $mode main &&
-		git rebase --abort
-	) &&
+			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
 
-	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 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
 	
-Note: switching to 'Q'.
+ok 1882 - setup match file test for Z
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 3070.1883 'wildmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch wildmatch 'Z' '[Z-y]'
+		
+ok 1883 - wildmatch: match 'Z' '[Z-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 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'
 
-  git switch -c <new-branch-name>
+expecting success of 3070.1885 'iwildmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch iwildmatch 'Z' '[Z-y]'
+		
+ok 1885 - iwildmatch: match 'Z' '[Z-y]'
 
-Or undo this operation with:
+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'
 
-  git switch -
+expecting success of 3070.1887 'pathmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch pathmatch 'Z' '[Z-y]'
+		
+ok 1887 - pathmatch: match 'Z' '[Z-y]'
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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'
 
-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 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 3070.1889 'ipathmatch: match 'Z' '[Z-y]'': 
+			test-tool wildmatch ipathmatch 'Z' '[Z-y]'
+		
+ok 1889 - ipathmatch: match 'Z' '[Z-y]'
 
-expecting success of 3406.22 'rebase --apply reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+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'
 
-	(
-		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 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 $!
 
-	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 &&
+./test-lib.sh: line 1060: kill: (29853) - No such process
+ok 1891 - matching does not exhibit exponential behavior
 
-	git log -g --format=%gs -1 conflicts >actual &&
-	write_reflog_expect <<-EOF &&
-	${reflog_action:-rebase} (finish): refs/heads/conflicts onto $(git rev-parse main)
+# still have 40 known breakage(s)
+# passed all remaining 1851 test(s)
+1..1891
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3409-rebase-environ.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3412-rebase-root.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-	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 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
+ok 3 - setup pre-rebase hook
 
-expecting success of 3406.23 'rebase --apply fast-forward reflog': 
-	git checkout fast-forward &&
-	test_when_finished "git reset --hard X" &&
+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
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		git rebase $mode main
-	) &&
+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 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
 
-	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 &&
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/work2.
+ok 6 - rebase --root --onto <newbase> <branch>
 
-	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 &&
+expecting success of 3412.7 'pre-rebase got correct input (2)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work2
 
-	# 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
+ok 7 - pre-rebase got correct input (2)
 
-expecting success of 3406.24 'rebase --apply --skip reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+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
 
-	(
-		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
-	) &&
+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 advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/work3.
+ok 8 - rebase -i --root --onto <newbase>
 
-	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 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 3412.9 'pre-rebase got correct input (3)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,
 
-expecting success of 3406.25 'rebase --apply --abort reflog': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+ok 9 - pre-rebase got correct input (3)
 
-	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
-	) &&
+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
 
-	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 &&
+warning: skipped previously applied commit 1c4476a
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/work4.
+ok 10 - rebase -i --root --onto <newbase> <branch>
 
-	# 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 advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-HEAD is now at f39a215 Q
-ok 25 - rebase --apply --abort reflog
+expecting success of 3412.11 'pre-rebase got correct input (4)': 
+	test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4
 
-expecting success of 3406.26 'rebase --apply --abort detached HEAD reflog': 
-	git checkout Q &&
-	test_when_finished "git reset --hard Q" &&
+ok 11 - pre-rebase got correct input (4)
 
-	(
-		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
-	) &&
+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
 
-	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'.
+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
@@ -178217,378 +177619,374 @@
 
 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 advice.mergeConflict false"
-Patch failed at 0002 conflict-X
-HEAD is now at f39a215 Q
-ok 26 - rebase --apply --abort detached HEAD reflog
+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 3406.27 'rebase --apply reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout conflicts &&
-	test_when_finished "git reset --hard Q" &&
+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
 
-	(
-		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
-	) &&
+[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
 
-	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
+expecting success of 3412.14 'setup pre-rebase hook that fails': 
+	test_hook --setup --clobber pre-rebase <<-\EOF
+	false
 	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 &&
+ok 14 - setup pre-rebase hook that fails
 
-	# 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 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 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)
 
-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" &&
+Switched to a new branch 'stops1'
+fatal: The pre-rebase hook refused to rebase.
+ok 15 - pre-rebase hook stops rebase
 
-	(
-		if test -n "$reflog_action"
-		then
-			GIT_REFLOG_ACTION="$reflog_action" &&
-			export GIT_REFLOG_ACTION
-		fi &&
-		git rebase $mode main
-	) &&
+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)
 
-	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 &&
+Switched to a new branch 'stops2'
+fatal: The pre-rebase hook refused to rebase.
+ok 16 - pre-rebase hook stops rebase -i
 
-	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 &&
+expecting success of 3412.17 'remove pre-rebase hook': 
+	rm -f .git/hooks/pre-rebase
 
-	# 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
+ok 17 - remove pre-rebase hook
 
-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 3412.18 'set up a conflict': 
+	git checkout main &&
+	echo conflict > B &&
+	git add B &&
+	git commit -m conflict
 
-	(
-		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
-	) &&
+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
 
-	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
+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 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 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
+Could not apply 2c64091... 3
+100644 9b1719f5cf069568785080a0bbabbe7c377e22ae 2	B
+100644 00750edc07d6415dcc07ae0351e9397b0222b7ba 3	B
+ok 19 - rebase --root with conflict (first part)
 
-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" &&
+expecting success of 3412.20 'fix the conflict': 
+	echo 3 > B &&
+	git add B
 
-	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
-	) &&
+ok 20 - fix the conflict
 
-	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 &&
+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
 
-	# 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
+[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 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 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
+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 3406.31 'rebase --apply --abort detached HEAD reflog GIT_REFLOG_ACTION=my-reflog-action': 
-	git checkout Q &&
-	test_when_finished "git reset --hard Q" &&
+expecting success of 3412.23 'fix the conflict': 
+	echo 3 > B &&
+	git add B
 
-	(
-		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
-	) &&
+ok 23 - fix the conflict
 
-	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
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3413-rebase-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3413-rebase-hook/.git/
+expecting success of 3413.1 'setup': 
+	echo hello >file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	echo goodbye >file &&
+	git add file &&
+	test_tick &&
+	git commit -m second &&
+	git checkout -b side HEAD^ &&
+	echo world >git &&
+	git add git &&
+	test_tick &&
+	git commit -m side &&
+	git checkout main &&
+	git log --pretty=oneline --abbrev-commit --graph --all &&
+	git branch test side
+
+[main (root-commit) 6637599] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[main 20a11a4] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side'
+[side c847452] side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 git
+Switched to branch 'main'
+* c847452 side
+| * 20a11a4 second
+|/  
+* 6637599 initial
+ok 1 - setup
+
+expecting success of 3413.2 'rebase': 
+	git checkout test &&
+	git reset --hard side &&
+	git rebase main &&
+	test "z$(cat git)" = zworld
+
+Switched to branch 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/test.
+ok 2 - rebase
+
+expecting success of 3413.3 'rebase -i': 
+	git checkout test &&
+	git reset --hard side &&
+	EDITOR=true git rebase -i main &&
+	test "z$(cat git)" = zworld
+
+Already on 'test'
+HEAD is now at c847452 side
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/test.
+ok 3 - rebase -i
+
+expecting success of 3413.4 'setup pre-rebase hook': 
+	test_hook --setup pre-rebase <<-\EOF
+	echo "$1,$2" >.git/PRE-REBASE-INPUT
 	EOF
-	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.
+ok 4 - setup pre-rebase hook
 
-If you want to 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 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,
 
-  git switch -c <new-branch-name>
 
-Or undo this operation with:
+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)
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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)
 
-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 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 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
 
-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
+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)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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
+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,
 
-# passed all 32 test(s)
-1..32
+
+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)
+
+Already on 'test'
+HEAD is now at c847452 side
+fatal: The pre-rebase hook refused to rebase.
+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
+fatal: 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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3417-rebase-whitespace-fix.sh ***
@@ -179737,7 +179135,7 @@
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 fixup
 Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

                                                                                
Successfully rebased and updated refs/heads/main.
-pick 26ba9f6 [A U Thor @ 21 years ago] empty2 # empty
+pick 26ba9f6 [A U Thor @ 20 years ago] empty2 # empty
 ok 22 - autosquash with multiple empty patches
 
 expecting success of 3415.23 'extra spaces after fixup!': 
@@ -179808,7 +179206,7 @@
  Author: A U Thor <author@example.com>
 Rebasing (2/4)
error: there was a problem with the editor 'grep -q ^pick'
 Please supply the message using either -m or -F option.
-Could not apply 6d29458... [A U Thor @ 21 years ago] squash! first # empty
+Could not apply 6d29458... [A U Thor @ 20 years ago] squash! first # empty
 [detached HEAD 96a770e] edited-first
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 16:33:13 2005 -0700
@@ -179871,419 +179269,6 @@
 1..27
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3305-notes-fanout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3305-notes-fanout/.git/
-expecting success of 3305.1 'tweak test environment': 
-	git checkout -b nondeterminism &&
-	test_commit A &&
-	git checkout --orphan with_notes;
-
-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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3418-rebase-continue.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3418-rebase-continue/.git/
 expecting success of 3418.1 'setup': 
@@ -181334,10 +180319,11 @@
 hint: Disable this message with "git config advice.mergeConflict false"
 Resolved 'F2' using previous resolution.
 Could not apply 24c5d85... 
-[detached HEAD cf7125b] commit-new-file-F2-on-topic-branch
+
+[detached HEAD da61d7a] commit-new-file-F2-on-topic-branch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)

                                                                                
Stopped at cf7125b (commit-new-file-F2-on-topic-branch)
+ 1 file changed, 1 deletion(-)
+Rebasing (2/2)

                                                                                
Stopped at da61d7a (commit-new-file-F2-on-topic-branch)
 ok 20 - patch file is removed before break command
 
 expecting success of 3418.21 '--reschedule-failed-exec': 
@@ -181669,135 +180655,417 @@
 1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3423-rebase-reword.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3423-rebase-reword/.git/
-expecting success of 3423.1 'setup': 
-	test_commit main file-1 test &&
-
-	git checkout -b stuff &&
-
-	test_commit feature_a file-2 aaa &&
-	test_commit feature_b file-2 ddd
+*** t3305-notes-fanout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3305-notes-fanout/.git/
+expecting success of 3305.1 'tweak test environment': 
+	git checkout -b nondeterminism &&
+	test_commit A &&
+	git checkout --orphan with_notes;
 
-[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
+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 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
+ create mode 100644 A.t
+Switched to a new branch 'with_notes'
+ok 1 - tweak test environment
 
-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 3305.2 'creating many notes with git-notes': 
+	num_notes=300 &&
+	i=0 &&
+	while test $i -lt $num_notes
+	do
+		i=$(($i + 1)) &&
+		test_tick &&
+		echo "file for commit #$i" > file &&
+		git add file &&
+		git commit -q -m "commit #$i" &&
+		git notes add -m "note #$i" || return 1
+	done
 
-expecting success of 3423.3 'reword after a conflict preserves commit': 
-	test_when_finished "reset_rebase" &&
+ok 2 - creating many notes with git-notes
 
-	git checkout stuff^0 &&
+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
 
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="reword 2" \
-		git rebase -i -v main &&
+ok 3 - many notes created correctly with git-notes
 
-	git checkout --theirs file-2 &&
-	git add file-2 &&
-	FAKE_COMMIT_MESSAGE="feature_b_reworded" git rebase --continue &&
+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
 
-	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
-	test $(git rev-list --count HEAD) = 2
+Fanout 0 -> 1 at refs/notes/commits~202
+ok 4 - stable fanout 0 is followed by stable fanout 1
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  7179cda feature_b_reworded
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 7179cda
+ok 6 - most notes deleted correctly with git-notes
 
-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 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
 
-rebase -i script after editing:
-reword 6975fa1 feature_b
-Rebasing (1/1)
-CONFLICT (modify/delete): file-2 deleted in HEAD and modified in 6975fa1 (feature_b).  Version 6975fa1 (feature_b) of file-2 left in tree.
-error: could not apply 6975fa1... feature_b
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 6975fa1... feature_b
-Updated 1 path from the index
-[detached HEAD 2e9e381] feature_b_reworded
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-2
-Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-HEAD is now at 2e9e381 feature_b_reworded
-Removing fake-editor.sh
-ok 3 - reword after a conflict preserves commit
+Fanout 1 -> 0 at refs/notes/commits~43
+ok 7 - stable fanout 1 is followed by stable fanout 0
 
-# passed all 3 test(s)
-1..3
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3422-rebase-incompatible-options.sh ***
@@ -182290,295 +181558,43 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3425-rebase-topology-merges.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3425-rebase-topology-merges/.git/
-expecting success of 3425.1 'setup of non-linear-history': 
-	test_commit a &&
-	test_commit b &&
-	test_commit c &&
-	git checkout b &&
-	test_commit d &&
-	test_commit e &&
-
-	git checkout c &&
-	test_commit g &&
-	revert h g &&
-	git checkout d &&
-	cherry_pick gp g &&
-	test_commit i &&
-	git checkout b &&
-	test_commit f &&
-
-	git checkout d &&
-	test_commit n &&
-	test_commit o &&
-	test_merge w e &&
-	test_merge v c &&
-	git checkout o &&
-	test_commit z
-
-[master (root-commit) ce450c7] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a.t
-[master 020ea9b] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b.t
-[master d9ea348] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Note: switching to 'b'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
+*** t3423-rebase-reword.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3423-rebase-reword/.git/
+expecting success of 3423.1 'setup': 
+	test_commit main file-1 test &&
 
-  git switch -
+	git checkout -b stuff &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	test_commit feature_a file-2 aaa &&
+	test_commit feature_b file-2 ddd
 
-HEAD is now at 020ea9b b
-[detached HEAD 1bd0260] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-[detached HEAD 67a7211] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e.t
-Previous HEAD position was 67a7211 e
-HEAD is now at d9ea348 c
-[detached HEAD 5573dba] g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-[detached HEAD 09e6546] h
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 g.t
-Previous HEAD position was 09e6546 h
-HEAD is now at 1bd0260 d
-[detached HEAD 00eccdb] gp
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g.t
-[detached HEAD 3317c29] i
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 i.t
-Previous HEAD position was 3317c29 i
-HEAD is now at 020ea9b b
-[detached HEAD 09e072f] f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f.t
-Previous HEAD position was 09e072f f
-HEAD is now at 1bd0260 d
-[detached HEAD 35a5a4f] n
+[master (root-commit) 2fc88f2] main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 n.t
-[detached HEAD a60ff6b] o
+ 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 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
+ create mode 100644 file-2
+[stuff 6975fa1] feature_b
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 z.t
-ok 1 - setup of non-linear-history
-
-expecting success of 3425.2 'rebase --apply after merge from upstream': 
-		reset_rebase &&
-		git rebase --apply e w &&
-		test_cmp_rev e HEAD~2 &&
-		test_linear_range 'n o' e..
-	
-fatal: no rebase in progress
-HEAD is now at 6fadda8 z
-First, rewinding head to replay your work on top of it...
-Applying: n
-Applying: o
-ok 2 - rebase --apply after merge from upstream
-
-expecting success of 3425.3 'rebase -m after merge from upstream': 
-		reset_rebase &&
-		git rebase -m e w &&
-		test_cmp_rev e HEAD~2 &&
-		test_linear_range 'n o' e..
-	
-fatal: no rebase in progress
-HEAD is now at 4cd4d2a o
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 3 - rebase -m after merge from upstream
-
-expecting success of 3425.4 'rebase -i after merge from upstream': 
-		reset_rebase &&
-		git rebase -i e w &&
-		test_cmp_rev e HEAD~2 &&
-		test_linear_range 'n o' e..
-	
-fatal: no rebase in progress
-HEAD is now at 4cd4d2a o
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 4 - rebase -i after merge from upstream
-
-expecting success of 3425.5 'rebase --apply of non-linear history is linearized in place': 
-		reset_rebase &&
-		git rebase --apply d w &&
-		test_cmp_rev d HEAD~3 &&
-		test_linear_range 'n o e' d..
-	
-fatal: no rebase in progress
-HEAD is now at 4cd4d2a o
-First, rewinding head to replay your work on top of it...
-Applying: n
-Applying: o
-Applying: e
-ok 5 - rebase --apply of non-linear history is linearized in place
-
-expecting success of 3425.6 'rebase -m of non-linear history is linearized in place': 
-		reset_rebase &&
-		git rebase -m d w &&
-		test_cmp_rev d HEAD~3 &&
-		test_linear_range 'n o e' d..
-	
-fatal: no rebase in progress
-HEAD is now at 9e9424c e
-Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 6 - rebase -m of non-linear history is linearized in place
-
-expecting success of 3425.7 'rebase -i of non-linear history is linearized in place': 
-		reset_rebase &&
-		git rebase -i d w &&
-		test_cmp_rev d HEAD~3 &&
-		test_linear_range 'n o e' d..
-	
-fatal: no rebase in progress
-HEAD is now at ef67882 e
-Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 7 - rebase -i of non-linear history is linearized in place
-
-expecting success of 3425.8 'rebase --apply of non-linear history is linearized upstream': 
-		reset_rebase &&
-		git rebase --apply c w &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at ef67882 e
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: n
-Applying: o
-Applying: e
-ok 8 - rebase --apply of non-linear history is linearized upstream
-
-expecting success of 3425.9 'rebase -m of non-linear history is linearized upstream': 
-		reset_rebase &&
-		git rebase -m c w &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 9 - rebase -m of non-linear history is linearized upstream
-
-expecting success of 3425.10 'rebase -i of non-linear history is linearized upstream': 
-		reset_rebase &&
-		git rebase -i c w &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'd n o e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7946025 e
-Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 10 - rebase -i of non-linear history is linearized upstream
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-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 3423.2 'reword without issues functions as intended': 
+	test_when_finished "reset_rebase" &&
 
-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
+	git checkout stuff^0 &&
 
-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
+	set_fake_editor &&
+	FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \
+		git rebase -i -v main &&
 
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3421-rebase-topology-linear.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
+	test $(git rev-list --count HEAD) = 3
 
-[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 '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
@@ -182595,864 +181611,82 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 020ea9b b
-[detached HEAD 1bd0260] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d.t
-[detached HEAD 67a7211] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e.t
-ok 1 - setup
-
-expecting success of 3421.2 'simple rebase --apply': 
-		reset_rebase &&
-		git rebase --apply c e &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 67a7211 e
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: e
-ok 2 - simple rebase --apply
-
-expecting success of 3421.3 'simple rebase -m': 
-		reset_rebase &&
-		git rebase -m c e &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7d728d6 e
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 3 - simple rebase -m
-
-expecting success of 3421.4 'simple rebase -i': 
-		reset_rebase &&
-		git rebase -i c e &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd e' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7d728d6 e
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 4 - simple rebase -i
-
-expecting success of 3421.5 'setup branches and remote tracking': 
-	git tag -l >tags &&
-	for tag in $(cat tags)
-	do
-		git branch branch-$tag $tag || return 1
-	done &&
-	git remote add origin "file://$PWD" &&
-	git fetch origin
-
-From file:///build/reproducible-path/git-2.45.2/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
+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
 
-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
+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>
- 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 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 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 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 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..
-	
+ 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 bcc98eb i
-warning: skipped previously applied commit 00eccdb
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 29 - rebase -m --onto drops patches in upstream
+HEAD is now at 7179cda feature_b_reworded
+Removing fake-editor.sh
+ok 2 - reword without issues functions as intended
 
-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 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 3423.3 'reword after a conflict preserves commit': 
+	test_when_finished "reset_rebase" &&
 
-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
+	git checkout stuff^0 &&
 
-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
+	set_fake_editor &&
+	test_must_fail env FAKE_LINES="reword 2" \
+		git rebase -i -v main &&
 
-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
+	git checkout --theirs file-2 &&
+	git add file-2 &&
+	FAKE_COMMIT_MESSAGE="feature_b_reworded" git rebase --continue &&
 
-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
+	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
+	test $(git rev-list --count HEAD) = 2
 
-Warning: you are leaving 3 commits behind, not connected to
+Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  bbe8f41 i
-  4a12efe gp
-  e937a8e d
+  7179cda feature_b_reworded
 
-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
-
-HEAD is now at d9ea348 c
-[detached HEAD 5b67321] j
- Author: A U Thor <author@example.com>
-Previous HEAD position was 5b67321 j
-HEAD is now at 1bd0260 d
-[detached HEAD 753370d] k
- Author: A U Thor <author@example.com>
-[detached HEAD 49cf309] l
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 l.t
-ok 34 - setup of linear history for empty commit tests
-
-checking known breakage of 3421.35 'rebase --apply keeps begin-empty commits': 
-		reset_rebase &&
-		git rebase --apply j l &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'j d k l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 49cf309 l
-First, rewinding head to replay your work on top of it...
-Applying: d
-Applying: l
-error: two revisions point to different objects:
-  'c': d9ea348e0fe8827f205c231ed0a5b8258841fd37
-  'HEAD~4': 020ea9b5b2051d958f4737afacdc8821a33ac9a9
-not ok 35 - rebase --apply keeps begin-empty commits # TODO known breakage
-
-expecting success of 3421.36 'rebase -m keeps begin-empty commits': 
-		reset_rebase &&
-		git rebase -m j l &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'j d k l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 1612308 l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 36 - rebase -m keeps begin-empty commits
-
-expecting success of 3421.37 'rebase -i keeps begin-empty commits': 
-		reset_rebase &&
-		git rebase -i j l &&
-		test_cmp_rev c HEAD~4 &&
-		test_linear_range 'j d k l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 37 - rebase -i keeps begin-empty commits
-
-expecting success of 3421.38 'rebase -m --no-keep-empty drops begin-empty commits': 
-		reset_rebase &&
-		git rebase -m --no-keep-empty c l &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd l' c..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 38 - rebase -m --no-keep-empty drops begin-empty commits
-
-expecting success of 3421.39 'rebase -i --no-keep-empty drops begin-empty commits': 
-		reset_rebase &&
-		git rebase -i --no-keep-empty c l &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd l' c..
-	
-fatal: no rebase in progress
-HEAD is now at ef60b8d l
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 39 - rebase -i --no-keep-empty drops begin-empty commits
-
-expecting success of 3421.40 'rebase -m --keep-empty keeps empty even if already in upstream': 
-		reset_rebase &&
-		git rebase -m --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-fatal: no rebase in progress
-HEAD is now at ef60b8d l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 40 - rebase -m --keep-empty keeps empty even if already in upstream
-
-expecting success of 3421.41 'rebase -i --keep-empty keeps empty even if already in upstream': 
-		reset_rebase &&
-		git rebase -i --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 41 - rebase -i --keep-empty keeps empty even if already in upstream
-
-expecting success of 3421.42 'rebase --rebase-merges --keep-empty keeps empty even if already in upstream': 
-		reset_rebase &&
-		git rebase --rebase-merges --keep-empty j l &&
-		test_cmp_rev j HEAD~3 &&
-		test_linear_range 'd k l' j..
-	
-fatal: no rebase in progress
-HEAD is now at 5395ede l
-Rebasing (1/5)
Rebasing (2/5)
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 42 - rebase --rebase-merges --keep-empty keeps empty even if already in upstream
-
-expecting success of 3421.43 'setup of linear history for test involving root': 
-	git checkout b &&
-	revert m b &&
-	git checkout --orphan disjoint &&
-	git rm -rf . &&
-	test_commit x &&
-	test_commit y &&
-	cherry_pick bp b
-
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  5395ede l
-  9a731c2 k
-  60768b3 d
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+ git branch <new-branch-name> 7179cda
 
- git branch <new-branch-name> 5395ede
+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
 
-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
+rebase -i script after editing:
+reword 6975fa1 feature_b
+Rebasing (1/1)
+CONFLICT (modify/delete): file-2 deleted in HEAD and modified in 6975fa1 (feature_b).  Version 6975fa1 (feature_b) of file-2 left in tree.
+error: could not apply 6975fa1... feature_b
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 6975fa1... feature_b
+Updated 1 path from the index
+[detached HEAD 2e9e381] feature_b_reworded
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 b.t
-ok 43 - setup of linear history for test involving root
-
-expecting success of 3421.44 'rebase --apply --onto --root': 
-		reset_rebase &&
-		git rebase --apply --onto c --root y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at b7cb922 bp
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 44 - rebase --apply --onto --root
-
-expecting success of 3421.45 'rebase -m --onto --root': 
-		reset_rebase &&
-		git rebase -m --onto c --root y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 45 - rebase -m --onto --root
-
-expecting success of 3421.46 'rebase -i --onto --root': 
-		reset_rebase &&
-		git rebase -i --onto c --root y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 46 - rebase -i --onto --root
-
-expecting success of 3421.47 'rebase --apply without --onto --root with disjoint history': 
-		reset_rebase &&
-		git rebase --apply c y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 47 - rebase --apply without --onto --root with disjoint history
-
-expecting success of 3421.48 'rebase -m without --onto --root with disjoint history': 
-		reset_rebase &&
-		git rebase -m c y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 48 - rebase -m without --onto --root with disjoint history
-
-expecting success of 3421.49 'rebase -i without --onto --root with disjoint history': 
-		reset_rebase &&
-		git rebase -i c y &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'x y' c..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 49 - rebase -i without --onto --root with disjoint history
-
-expecting success of 3421.50 'rebase --apply --onto --root drops patch in onto': 
-		reset_rebase &&
-		git rebase --apply --onto m --root bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 7e2f0ad y
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 50 - rebase --apply --onto --root drops patch in onto
-
-expecting success of 3421.51 'rebase -m --onto --root drops patch in onto': 
-		reset_rebase &&
-		git rebase -m --onto m --root bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 51 - rebase -m --onto --root drops patch in onto
-
-expecting success of 3421.52 'rebase -i --onto --root drops patch in onto': 
-		reset_rebase &&
-		git rebase -i --onto m --root bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 52 - rebase -i --onto --root drops patch in onto
-
-expecting success of 3421.53 'rebase --apply --onto --root with merge-base does not go to root': 
-		reset_rebase &&
-		git rebase --apply --onto m --root g &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'c g' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-First, rewinding head to replay your work on top of it...
-Applying: c
-Applying: g
-ok 53 - rebase --apply --onto --root with merge-base does not go to root
-
-expecting success of 3421.54 'rebase -m --onto --root with merge-base does not go to root': 
-		reset_rebase &&
-		git rebase -m --onto m --root g &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'c g' m..
-	
-fatal: no rebase in progress
-HEAD is now at 9921398 g
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 54 - rebase -m --onto --root with merge-base does not go to root
-
-expecting success of 3421.55 'rebase -i --onto --root with merge-base does not go to root': 
-		reset_rebase &&
-		git rebase -i --onto m --root g &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'c g' m..
-	
-fatal: no rebase in progress
-HEAD is now at 9921398 g
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 55 - rebase -i --onto --root with merge-base does not go to root
-
-expecting success of 3421.56 'rebase --apply without --onto --root with disjoint history drops patch in onto': 
-		reset_rebase &&
-		git rebase --apply m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 9921398 g
-First, rewinding head to replay your work on top of it...
-Applying: x
-Applying: y
-ok 56 - rebase --apply without --onto --root with disjoint history drops patch in onto
-
-expecting success of 3421.57 'rebase -m without --onto --root with disjoint history drops patch in onto': 
-		reset_rebase &&
-		git rebase -m m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 57 - rebase -m without --onto --root with disjoint history drops patch in onto
-
-expecting success of 3421.58 'rebase -i without --onto --root with disjoint history drops patch in onto': 
-		reset_rebase &&
-		git rebase -i m bp &&
-		test_cmp_rev m HEAD~2 &&
-		test_linear_range 'x y' m..
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-warning: skipped previously applied commit b7cb922
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 58 - rebase -i without --onto --root with disjoint history drops patch in onto
-
-expecting success of 3421.59 'rebase  --root on linear history is a no-op': 
-		reset_rebase &&
-		git rebase  --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 1daea3a y
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 59 - rebase  --root on linear history is a no-op
-
-expecting success of 3421.60 'rebase -m --root on linear history is a no-op': 
-		reset_rebase &&
-		git rebase -m --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: no rebase in progress
-HEAD is now at d9ea348 c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 60 - rebase -m --root on linear history is a no-op
-
-expecting success of 3421.61 'rebase -i --root on linear history is a no-op': 
-		reset_rebase &&
-		git rebase -i --root c &&
-		test_cmp_rev c HEAD
-	
-fatal: no rebase in progress
-HEAD is now at d9ea348 c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 61 - rebase -i --root on linear history is a no-op
-
-expecting success of 3421.62 'rebase  -f --root on linear history causes re-write': 
-		reset_rebase &&
-		git rebase  -f --root c &&
-		test_cmp_rev ! a HEAD~2 &&
-		test_linear_range 'a b c' HEAD
-	
-fatal: no rebase in progress
-HEAD is now at d9ea348 c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 62 - rebase  -f --root on linear history causes re-write
-
-expecting success of 3421.63 'rebase -m -f --root on linear history causes re-write': 
-		reset_rebase &&
-		git rebase -m -f --root c &&
-		test_cmp_rev ! a HEAD~2 &&
-		test_linear_range 'a b c' HEAD
-	
-fatal: no rebase in progress
-HEAD is now at 8b0b08f c
-Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 63 - rebase -m -f --root on linear history causes re-write
-
-expecting success of 3421.64 'rebase -i -f --root on linear history causes re-write': 
-		reset_rebase &&
-		git rebase -i -f --root c &&
-		test_cmp_rev ! a HEAD~2 &&
-		test_linear_range 'a b c' HEAD
-	
+ create mode 100644 file-2
+Successfully rebased and updated detached 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
+HEAD is now at 2e9e381 feature_b_reworded
+Removing fake-editor.sh
+ok 3 - reword after a conflict preserves commit
 
-# still have 1 known breakage(s)
-# passed all remaining 63 test(s)
-1..64
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3424-rebase-empty.sh ***
@@ -184698,612 +182932,1777 @@
 		sed "$remove_progress_re" <actual >actual2 &&
 		test_cmp expected actual2
 	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 25 - rebase --merge: check output with conflicting stash
+Deleted branch rebased-feature-branch (was b607b14).
+ok 25 - rebase --merge: check output with conflicting stash
+
+expecting success of 3420.26 '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 0c4d2f1 third 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 26 - rebase --interactive: dirty worktree, --no-autostash
+
+expecting success of 3420.27 '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 27 - rebase --interactive: dirty worktree, non-conflicting rebase
+
+expecting success of 3420.28 '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 28 - rebase --interactive --autostash: check output
+
+expecting success of 3420.29 '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 29 - rebase --interactive: dirty index, non-conflicting rebase
+
+expecting success of 3420.30 'rebase --interactive: conflicting rebase': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		rm -rf $dotest &&
+		git reset --hard &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+HEAD is now at c57d250 related commit
+Previous HEAD position was c57d250 related commit
+Switched to branch 'feature-branch'
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 30 - rebase --interactive: conflicting rebase
+
+expecting success of 3420.31 'rebase --interactive: --continue': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		echo "conflicting-plus-goodbye" >file2 &&
+		git add file2 &&
+		git rebase --continue &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+[detached HEAD 62edf38] second commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file1
+Rebasing (2/2)
Applied autostash.
+
                                                                                
Successfully rebased and updated refs/heads/rebased-feature-branch.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 51f2c81).
+ok 31 - rebase --interactive: --continue
+
+expecting success of 3420.32 'rebase --interactive: --skip': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --skip &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+Rebasing (2/2)
Applied autostash.
+
                                                                                
Successfully rebased and updated refs/heads/rebased-feature-branch.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was fa02356).
+ok 32 - rebase --interactive: --skip
+
+expecting success of 3420.33 'rebase --interactive: --abort': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --abort &&
+		test_path_is_missing $dotest/autostash &&
+		grep dirty file3 &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+Applied autostash.
+dirty
+Switched to branch 'feature-branch'
+M	file3
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 33 - rebase --interactive: --abort
+
+expecting success of 3420.34 'rebase --interactive: --quit': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		git diff >expect &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --quit &&
+		test_when_finished git stash drop &&
+		test_path_is_missing $dotest/autostash &&
+		! grep dirty file3 &&
+		git stash show -p >actual &&
+		test_cmp expect actual &&
+		git reset --hard &&
+		git checkout feature-branch
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+Created autostash: ce96636
+Rebasing (1/2)
Auto-merging file2
+CONFLICT (add/add): Merge conflict in file2
+error: could not apply 6fe95e2... second commit
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 6fe95e2... second commit
+Autostash exists; creating a new stash entry.
+Your changes are safe in the stash.
+You can run "git stash pop" or "git stash drop" at any time.
+grep: file3: No such file or directory
+HEAD is now at c57d250 related commit
+Previous HEAD position was c57d250 related commit
+Switched to branch 'feature-branch'
+Dropped refs/stash@{0} (ce96636712fc38300c1f0f777cc2fac6dee041c0)
+Deleted branch rebased-feature-branch (was 0c4d2f1).
+ok 34 - rebase --interactive: --quit
+
+expecting success of 3420.35 'rebase --interactive: non-conflicting rebase, conflicting stash': 
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		echo dirty >file4 &&
+		git add file4 &&
+		git rebase$type unrelated-onto-branch >actual 2>&1 &&
+		test_path_is_missing $dotest &&
+		git reset --hard &&
+		grep unrelated file4 &&
+		! grep dirty file4 &&
+		git checkout feature-branch &&
+		git stash pop &&
+		grep dirty file4
+	
+HEAD is now at 0c4d2f1 third commit
+Switched to a new branch 'rebased-feature-branch'
+HEAD is now at b607b14 third commit
+unrelated
+Switched to branch 'feature-branch'
+Merging Version stash was based on with Stashed changes
+On branch feature-branch
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   file4
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual2
+	expect
+	expected
+
+Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
+dirty
+ok 35 - rebase --interactive: non-conflicting rebase, conflicting stash
+
+expecting success of 3420.36 '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 36 - rebase --interactive: check output with conflicting stash
+
+expecting success of 3420.37 'abort rebase -i with --autostash': 
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
+	(
+		write_script abort-editor.sh <<-\EOF &&
+			echo >"$1"
+		EOF
+		test_set_editor "$(pwd)/abort-editor.sh" &&
+		test_must_fail git rebase -i --autostash HEAD^ &&
+		rm -f abort-editor.sh
+	) &&
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
+
+Created autostash: d9b9f3e
+Applied autostash.
+error: nothing to do
+HEAD is now at 0c4d2f1 third commit
+ok 37 - abort rebase -i with --autostash
+
+expecting success of 3420.38 'restore autostash on editor failure': 
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
+	(
+		test_set_editor "false" &&
+		test_must_fail git rebase -i --autostash HEAD^
+	) &&
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
+
+Created autostash: 083685b
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Applied autostash.
+HEAD is now at 0c4d2f1 third commit
+ok 38 - restore autostash on editor failure
+
+expecting success of 3420.39 'autostash is saved on editor failure with conflict': 
+	test_when_finished "git reset --hard" &&
+	echo uncommitted-content >file0 &&
+	(
+		write_script abort-editor.sh <<-\EOF &&
+			echo conflicting-content >file0
+			exit 1
+		EOF
+		test_set_editor "$(pwd)/abort-editor.sh" &&
+		test_must_fail git rebase -i --autostash HEAD^ &&
+		rm -f abort-editor.sh
+	) &&
+	echo conflicting-content >expected &&
+	test_cmp expected file0 &&
+	git checkout file0 &&
+	git stash pop &&
+	echo uncommitted-content >expected &&
+	test_cmp expected file0
+
+Created autostash: 083685b
+error: there was a problem with the editor '"$FAKE_EDITOR"'
+Applying autostash resulted in conflicts.
+Your changes are safe in the stash.
+You can run "git stash pop" or "git stash drop" at any time.
+Updated 1 path from the index
+Merging Version stash was based on with Stashed changes
+On branch feature-branch
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   file0
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual2
+	expect
+	expected
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (083685bba8c747d8dec51b2a5ffc97733bf5a961)
+HEAD is now at 0c4d2f1 third commit
+ok 39 - autostash is saved on editor failure with conflict
+
+expecting success of 3420.40 'autostash with dirty submodules': 
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b with-submodule &&
+	git -c protocol.file.allow=always submodule add ./ sub &&
+	test_tick &&
+	git commit -m add-submodule &&
+	echo changed >sub/file0 &&
+	git rebase -i --autostash HEAD
+
+Switched to a new branch 'with-submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3420-rebase-autostash/sub'...
+done.
+[with-submodule 42dcd38] add-submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+
                                                                                
Successfully rebased and updated refs/heads/with-submodule.
+HEAD is now at 42dcd38 add-submodule
+warning: unable to rmdir 'sub': Directory not empty
+Switched to branch 'main'
+ok 40 - autostash with dirty submodules
+
+expecting success of 3420.41 'branch is left alone when possible': 
+	git checkout -b unchanged-branch &&
+	echo changed >file0 &&
+	git rebase --autostash unchanged-branch &&
+	test changed = "$(cat file0)" &&
+	test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)"
+
+Switched to a new branch 'unchanged-branch'
+Created autostash: 84b1204
+Current branch unchanged-branch is up to date.
+Applied autostash.
+ok 41 - branch is left alone when possible
+
+expecting success of 3420.42 'never change active branch': 
+	git checkout -b not-the-feature-branch unrelated-onto-branch &&
+	test_when_finished "git reset --hard && git checkout main" &&
+	echo changed >file0 &&
+	git rebase --autostash not-the-feature-branch feature-branch &&
+	test_cmp_rev not-the-feature-branch unrelated-onto-branch
+
+Switched to a new branch 'not-the-feature-branch'
+M	file0
+Created autostash: 37b7cba
+Rebasing (1/2)
Rebasing (2/2)
Applied autostash.
+
                                                                                
Successfully rebased and updated refs/heads/feature-branch.
+HEAD is now at 543b47f third commit
+Switched to branch 'main'
+ok 42 - never change active branch
+
+expecting success of 3420.43 'autostash commit is marked as reachable': 
+	echo changed >file0 &&
+	git rebase --autostash --exec "git prune --expire=now" \
+		feature-branch^ feature-branch &&
+	# git rebase succeeds if the stash cannot be applied so we need to check
+	# the contents of file0
+	echo changed >expect &&
+	test_cmp expect file0
+
+Created autostash: 81533a6
+Rebasing (2/2)

                                                                                
Executing: git prune --expire=now
+Applied autostash.
+
                                                                                
Successfully rebased and updated refs/heads/feature-branch.
+ok 43 - autostash commit is marked as reachable
+
+# passed all 43 test(s)
+1..43
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3427-rebase-subtree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3427-rebase-subtree/.git/
+expecting success of 3427.1 'setup': 
+	test_commit README &&
+
+	git init files &&
+	test_commit -C files topic_1 &&
+	test_commit -C files topic_2 &&
+	test_commit -C files topic_3 &&
+
+	: perform subtree merge into files_subtree/ &&
+	git fetch files refs/heads/main:refs/heads/files-main &&
+	git merge -s ours --no-commit --allow-unrelated-histories \
+		files-main &&
+	git read-tree --prefix=files_subtree -u files-main &&
+	git commit -m "Add subproject main" &&
+
+	: 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 README.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3427-rebase-subtree/files/.git/
+[main (root-commit) 8d5ac37] topic_1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic_1.t
+[main e30c5d3] topic_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic_2.t
+[main 152af92] topic_3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 topic_3.t
+From files
+ * [new branch]      main       -> files-main
+ * [new tag]         topic_3    -> topic_3
+ * [new tag]         topic_1    -> topic_1
+ * [new tag]         topic_2    -> topic_2
+Automatic merge went well; stopped before committing as requested
+[main 90609d1] Add subproject main
+ Author: A U Thor <author@example.com>
+[main 9e13d1d] topic_4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 files_subtree/topic_4.t
+[main 76d9147] files_subtree/topic_5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 files_subtree/topic_5.t
+Switched to a new branch 'to-rebase'
+HEAD is now at e6c9414 files_subtree/topic_5
+[to-rebase f09580c] Empty commit
+ 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3425-rebase-topology-merges.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3425-rebase-topology-merges/.git/
+expecting success of 3425.1 'setup of non-linear-history': 
+	test_commit a &&
+	test_commit b &&
+	test_commit c &&
+	git checkout b &&
+	test_commit d &&
+	test_commit e &&
+
+	git checkout c &&
+	test_commit g &&
+	revert h g &&
+	git checkout d &&
+	cherry_pick gp g &&
+	test_commit i &&
+	git checkout b &&
+	test_commit f &&
+
+	git checkout d &&
+	test_commit n &&
+	test_commit o &&
+	test_merge w e &&
+	test_merge v c &&
+	git checkout o &&
+	test_commit z
+
+[master (root-commit) ce450c7] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+[master 020ea9b] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[master d9ea348] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Note: switching to 'b'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 020ea9b b
+[detached HEAD 1bd0260] d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+[detached HEAD 67a7211] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+Previous HEAD position was 67a7211 e
+HEAD is now at d9ea348 c
+[detached HEAD 5573dba] g
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+[detached HEAD 09e6546] h
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 g.t
+Previous HEAD position was 09e6546 h
+HEAD is now at 1bd0260 d
+[detached HEAD 00eccdb] gp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 g.t
+[detached HEAD 3317c29] i
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 i.t
+Previous HEAD position was 3317c29 i
+HEAD is now at 020ea9b b
+[detached HEAD 09e072f] f
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f.t
+Previous HEAD position was 09e072f f
+HEAD is now at 1bd0260 d
+[detached HEAD 35a5a4f] n
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 n.t
+[detached HEAD a60ff6b] o
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 o.t
+Merge made by the 'ort' strategy.
+ e.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+Merge made by the 'ort' strategy.
+ c.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Previous HEAD position was 253142b v
+HEAD is now at a60ff6b o
+[detached HEAD 6fadda8] z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 z.t
+ok 1 - setup of non-linear-history
+
+expecting success of 3425.2 'rebase --apply after merge from upstream': 
+		reset_rebase &&
+		git rebase --apply e w &&
+		test_cmp_rev e HEAD~2 &&
+		test_linear_range 'n o' e..
+	
+fatal: no rebase in progress
+HEAD is now at 6fadda8 z
+First, rewinding head to replay your work on top of it...
+Applying: n
+Applying: o
+ok 2 - rebase --apply after merge from upstream
+
+expecting success of 3425.3 'rebase -m after merge from upstream': 
+		reset_rebase &&
+		git rebase -m e w &&
+		test_cmp_rev e HEAD~2 &&
+		test_linear_range 'n o' e..
+	
+fatal: no rebase in progress
+HEAD is now at 4cd4d2a o
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 3 - rebase -m after merge from upstream
+
+expecting success of 3425.4 'rebase -i after merge from upstream': 
+		reset_rebase &&
+		git rebase -i e w &&
+		test_cmp_rev e HEAD~2 &&
+		test_linear_range 'n o' e..
+	
+fatal: no rebase in progress
+HEAD is now at 4cd4d2a o
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 4 - rebase -i after merge from upstream
+
+expecting success of 3425.5 'rebase --apply of non-linear history is linearized in place': 
+		reset_rebase &&
+		git rebase --apply d w &&
+		test_cmp_rev d HEAD~3 &&
+		test_linear_range 'n o e' d..
+	
+fatal: no rebase in progress
+HEAD is now at 4cd4d2a o
+First, rewinding head to replay your work on top of it...
+Applying: n
+Applying: o
+Applying: e
+ok 5 - rebase --apply of non-linear history is linearized in place
+
+expecting success of 3425.6 'rebase -m of non-linear history is linearized in place': 
+		reset_rebase &&
+		git rebase -m d w &&
+		test_cmp_rev d HEAD~3 &&
+		test_linear_range 'n o e' d..
+	
+fatal: no rebase in progress
+HEAD is now at 9e9424c e
+Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 6 - rebase -m of non-linear history is linearized in place
+
+expecting success of 3425.7 'rebase -i of non-linear history is linearized in place': 
+		reset_rebase &&
+		git rebase -i d w &&
+		test_cmp_rev d HEAD~3 &&
+		test_linear_range 'n o e' d..
+	
+fatal: no rebase in progress
+HEAD is now at ef67882 e
+Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 7 - rebase -i of non-linear history is linearized in place
+
+expecting success of 3425.8 'rebase --apply of non-linear history is linearized upstream': 
+		reset_rebase &&
+		git rebase --apply c w &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at ef67882 e
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: n
+Applying: o
+Applying: e
+ok 8 - rebase --apply of non-linear history is linearized upstream
+
+expecting success of 3425.9 'rebase -m of non-linear history is linearized upstream': 
+		reset_rebase &&
+		git rebase -m c w &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 9 - rebase -m of non-linear history is linearized upstream
+
+expecting success of 3425.10 'rebase -i of non-linear history is linearized upstream': 
+		reset_rebase &&
+		git rebase -i c w &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 10 - rebase -i of non-linear history is linearized upstream
+
+expecting success of 3425.11 'rebase --apply of non-linear history with merges after upstream merge is linearized': 
+		reset_rebase &&
+		git rebase --apply c v &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: n
+Applying: o
+Applying: e
+ok 11 - rebase --apply of non-linear history with merges after upstream merge is linearized
+
+expecting success of 3425.12 'rebase -m of non-linear history with merges after upstream merge is linearized': 
+		reset_rebase &&
+		git rebase -m c v &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 12 - rebase -m of non-linear history with merges after upstream merge is linearized
+
+expecting success of 3425.13 'rebase -i of non-linear history with merges after upstream merge is linearized': 
+		reset_rebase &&
+		git rebase -i c v &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'd n o e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7946025 e
+Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 13 - rebase -i of non-linear history with merges after upstream merge is linearized
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3421-rebase-topology-linear.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3421-rebase-topology-linear/.git/
+expecting success of 3421.1 'setup': 
+	test_commit a &&
+	test_commit b &&
+	test_commit c &&
+	git checkout b &&
+	test_commit d &&
+	test_commit e
+
+[master (root-commit) ce450c7] a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a.t
+[master 020ea9b] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b.t
+[master d9ea348] c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Note: switching to 'b'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 020ea9b b
+[detached HEAD 1bd0260] d
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 d.t
+[detached HEAD 67a7211] e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e.t
+ok 1 - setup
+
+expecting success of 3421.2 'simple rebase --apply': 
+		reset_rebase &&
+		git rebase --apply c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 67a7211 e
+First, rewinding head to replay your work on top of it...
+Applying: d
+Applying: e
+ok 2 - simple rebase --apply
+
+expecting success of 3421.3 'simple rebase -m': 
+		reset_rebase &&
+		git rebase -m c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7d728d6 e
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 3 - simple rebase -m
+
+expecting success of 3421.4 'simple rebase -i': 
+		reset_rebase &&
+		git rebase -i c e &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd e' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7d728d6 e
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 4 - simple rebase -i
+
+expecting success of 3421.5 'setup branches and remote tracking': 
+	git tag -l >tags &&
+	for tag in $(cat tags)
+	do
+		git branch branch-$tag $tag || return 1
+	done &&
+	git remote add origin "file://$PWD" &&
+	git fetch origin
+
+From file:///build/reproducible-path/git-2.45.2/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 3420.26 '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
+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
 	
-HEAD is now at 0c4d2f1 third 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 26 - rebase --interactive: dirty worktree, --no-autostash
+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 3420.27 '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
+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
 	
-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 27 - rebase --interactive: dirty worktree, non-conflicting rebase
+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 3420.28 '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
+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
 	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 28 - rebase --interactive --autostash: check output
+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 3420.29 '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
+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..
 	
-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 29 - rebase --interactive: dirty index, non-conflicting rebase
+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 3420.30 '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
+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..
 	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-HEAD is now at c57d250 related commit
-Previous HEAD position was c57d250 related commit
-Switched to branch 'feature-branch'
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 30 - rebase --interactive: conflicting rebase
+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 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 3420.31 '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
+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..
 	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-[detached HEAD 62edf38] second commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file1
-Rebasing (2/2)
Applied autostash.
-
                                                                                
Successfully rebased and updated refs/heads/rebased-feature-branch.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 51f2c81).
-ok 31 - rebase --interactive: --continue
+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 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 3420.32 '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
+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..
 	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-Rebasing (2/2)
Applied autostash.
-
                                                                                
Successfully rebased and updated refs/heads/rebased-feature-branch.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was fa02356).
-ok 32 - rebase --interactive: --skip
+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 3420.33 '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
+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..
 	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-Applied autostash.
-dirty
-Switched to branch 'feature-branch'
-M	file3
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 33 - rebase --interactive: --abort
+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 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 3420.34 '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
+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..
 	
-HEAD is now at 0c4d2f1 third commit
-Switched to a new branch 'rebased-feature-branch'
-Created autostash: ce96636
-Rebasing (1/2)
Auto-merging file2
-CONFLICT (add/add): Merge conflict in file2
-error: could not apply 6fe95e2... second commit
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 6fe95e2... second commit
-Autostash exists; creating a new stash entry.
-Your changes are safe in the stash.
-You can run "git stash pop" or "git stash drop" at any time.
-grep: file3: No such file or directory
-HEAD is now at c57d250 related commit
-Previous HEAD position was c57d250 related commit
-Switched to branch 'feature-branch'
-Dropped refs/stash@{0} (ce96636712fc38300c1f0f777cc2fac6dee041c0)
-Deleted branch rebased-feature-branch (was 0c4d2f1).
-ok 34 - rebase --interactive: --quit
+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 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 3420.35 '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
+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..
 	
-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
+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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual2
-	expect
-	expected
+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 advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 29 - rebase -m --onto drops patches in upstream
 
-Dropped refs/stash@{0} (1b6501f85530697b9c800b37ca0a8c6ef37e954c)
-dirty
-ok 35 - rebase --interactive: non-conflicting rebase, conflicting stash
+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 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 3420.36 '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
+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..
 	
-Deleted branch rebased-feature-branch (was b607b14).
-ok 36 - rebase --interactive: check output with conflicting stash
+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 3420.37 'abort rebase -i with --autostash': 
-	test_when_finished "git reset --hard" &&
-	echo uncommitted-content >file0 &&
-	(
-		write_script abort-editor.sh <<-\EOF &&
-			echo >"$1"
-		EOF
-		test_set_editor "$(pwd)/abort-editor.sh" &&
-		test_must_fail git rebase -i --autostash HEAD^ &&
-		rm -f abort-editor.sh
-	) &&
-	echo uncommitted-content >expected &&
-	test_cmp expected file0
+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
 
-Created autostash: d9b9f3e
-Applied autostash.
-error: nothing to do
-HEAD is now at 0c4d2f1 third commit
-ok 37 - abort rebase -i with --autostash
+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 3420.38 '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
+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
 
-Created autostash: 083685b
-error: there was a problem with the editor '"$FAKE_EDITOR"'
-Applied autostash.
-HEAD is now at 0c4d2f1 third commit
-ok 38 - restore autostash on editor failure
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-expecting success of 3420.39 '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
+  bbe8f41 i
+  4a12efe gp
+  e937a8e d
 
-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
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual2
-	expect
-	expected
+ git branch <new-branch-name> bbe8f41
 
-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 39 - autostash is saved on editor failure with conflict
+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
 
-expecting success of 3420.40 '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
+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
 
-Switched to a new branch 'with-submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3420-rebase-autostash/sub'...
-done.
-[with-submodule 42dcd38] add-submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-
                                                                                
Successfully rebased and updated refs/heads/with-submodule.
-HEAD is now at 42dcd38 add-submodule
-warning: unable to rmdir 'sub': Directory not empty
-Switched to branch 'main'
-ok 40 - autostash with dirty submodules
+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 3420.41 '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)"
+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
 
-Switched to a new branch 'unchanged-branch'
-Created autostash: 84b1204
-Current branch unchanged-branch is up to date.
-Applied autostash.
-ok 41 - branch is left alone when possible
+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 3420.42 '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
+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
 
-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 42 - never change active branch
+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 3420.43 '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
+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
 
-Created autostash: 81533a6
-Rebasing (2/2)

                                                                                
Executing: git prune --expire=now
-Applied autostash.
-
                                                                                
Successfully rebased and updated refs/heads/feature-branch.
-ok 43 - autostash commit is marked as reachable
+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
 
-# passed all 43 test(s)
-1..43
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3427-rebase-subtree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3427-rebase-subtree/.git/
-expecting success of 3427.1 'setup': 
-	test_commit README &&
+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
 
-	git init files &&
-	test_commit -C files topic_1 &&
-	test_commit -C files topic_2 &&
-	test_commit -C files topic_3 &&
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
 
-	: 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" &&
+  5395ede l
+  9a731c2 k
+  60768b3 d
 
-	: add two extra commits to rebase &&
-	test_commit -C files_subtree topic_4 &&
-	test_commit files_subtree/topic_5 &&
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-	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
+ git branch <new-branch-name> 5395ede
 
-[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.45.2/t/trash directory.t3427-rebase-subtree/files/.git/
-[main (root-commit) 8d5ac37] topic_1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 topic_1.t
-[main e30c5d3] topic_2
+HEAD is now at 020ea9b b
+[detached HEAD 6db5543] m
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 topic_2.t
-[main 152af92] topic_3
+ 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 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 x.t
+[disjoint be1e399] y
  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
+ create mode 100644 y.t
+[disjoint b7cb922] bp
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 files_subtree/topic_5.t
-Switched to a new branch 'to-rebase'
-HEAD is now at e6c9414 files_subtree/topic_5
-[to-rebase f09580c] Empty commit
- Author: A U Thor <author@example.com>
-ok 1 - setup
+ create mode 100644 b.t
+ok 43 - setup of linear history for test involving root
 
-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 3421.44 'rebase --apply --onto --root': 
+		reset_rebase &&
+		git rebase --apply --onto c --root y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at b7cb922 bp
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 44 - rebase --apply --onto --root
 
+expecting success of 3421.45 'rebase -m --onto --root': 
+		reset_rebase &&
+		git rebase -m --onto c --root y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
 fatal: no rebase in progress
-HEAD is now at 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:
+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 commit --allow-empty
+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
 
-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")
+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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	files/
+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
 
-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 3421.49 'rebase -i without --onto --root with disjoint history': 
+		reset_rebase &&
+		git rebase -i c y &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'x y' c..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 49 - rebase -i without --onto --root with disjoint history
 
-expecting success of 3427.3 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit': 
-	reset_rebase &&
-	git checkout -b rebase-merges-onto to-rebase &&
-	test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-main --root &&
-	: first pick results in no changes &&
-	git rebase --skip &&
-	test "$(commit_message HEAD~2)" = "topic_4" &&
-	test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
-	test "$(commit_message HEAD)" = "Empty commit"
+expecting success of 3421.50 'rebase --apply --onto --root drops patch in onto': 
+		reset_rebase &&
+		git rebase --apply --onto m --root bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 7e2f0ad y
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 50 - rebase --apply --onto --root drops patch in onto
 
+expecting success of 3421.51 'rebase -m --onto --root drops patch in onto': 
+		reset_rebase &&
+		git rebase -m --onto m --root bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
 fatal: no rebase in progress
-HEAD is now at 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:
+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 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
 
-    git commit --allow-empty
+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 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
 
-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 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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	files/
+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
 
-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 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
 
-# passed all 3 test(s)
-1..3
+expecting success of 3421.56 'rebase --apply without --onto --root with disjoint history drops patch in onto': 
+		reset_rebase &&
+		git rebase --apply m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 9921398 g
+First, rewinding head to replay your work on top of it...
+Applying: x
+Applying: y
+ok 56 - rebase --apply without --onto --root with disjoint history drops patch in onto
+
+expecting success of 3421.57 'rebase -m without --onto --root with disjoint history drops patch in onto': 
+		reset_rebase &&
+		git rebase -m m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 57 - rebase -m without --onto --root with disjoint history drops patch in onto
+
+expecting success of 3421.58 'rebase -i without --onto --root with disjoint history drops patch in onto': 
+		reset_rebase &&
+		git rebase -i m bp &&
+		test_cmp_rev m HEAD~2 &&
+		test_linear_range 'x y' m..
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+warning: skipped previously applied commit b7cb922
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 58 - rebase -i without --onto --root with disjoint history drops patch in onto
+
+expecting success of 3421.59 'rebase  --root on linear history is a no-op': 
+		reset_rebase &&
+		git rebase  --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 1daea3a y
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 59 - rebase  --root on linear history is a no-op
+
+expecting success of 3421.60 'rebase -m --root on linear history is a no-op': 
+		reset_rebase &&
+		git rebase -m --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: no rebase in progress
+HEAD is now at d9ea348 c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 60 - rebase -m --root on linear history is a no-op
+
+expecting success of 3421.61 'rebase -i --root on linear history is a no-op': 
+		reset_rebase &&
+		git rebase -i --root c &&
+		test_cmp_rev c HEAD
+	
+fatal: no rebase in progress
+HEAD is now at d9ea348 c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 61 - rebase -i --root on linear history is a no-op
+
+expecting success of 3421.62 'rebase  -f --root on linear history causes re-write': 
+		reset_rebase &&
+		git rebase  -f --root c &&
+		test_cmp_rev ! a HEAD~2 &&
+		test_linear_range 'a b c' HEAD
+	
+fatal: no rebase in progress
+HEAD is now at d9ea348 c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 62 - rebase  -f --root on linear history causes re-write
+
+expecting success of 3421.63 'rebase -m -f --root on linear history causes re-write': 
+		reset_rebase &&
+		git rebase -m -f --root c &&
+		test_cmp_rev ! a HEAD~2 &&
+		test_linear_range 'a b c' HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 8b0b08f c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 63 - rebase -m -f --root on linear history causes re-write
+
+expecting success of 3421.64 'rebase -i -f --root on linear history causes re-write': 
+		reset_rebase &&
+		git rebase -i -f --root c &&
+		test_cmp_rev ! a HEAD~2 &&
+		test_linear_range 'a b c' HEAD
+	
+fatal: no rebase in progress
+HEAD is now at 8b0b08f c
+Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 64 - rebase -i -f --root on linear history causes re-write
+
+# still have 1 known breakage(s)
+# passed all remaining 63 test(s)
+1..64
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3428-rebase-signoff.sh ***
@@ -185573,346 +184972,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3433-rebase-across-mode-change.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3433-rebase-across-mode-change/.git/
-expecting success of 3433.1 'setup': 
-	mkdir DS &&
-	>DS/whatever &&
-	git add DS &&
-	git commit -m base &&
-
-	git branch side1 &&
-	git branch side2 &&
-
-	git checkout side1 &&
-	git rm -rf DS &&
-	test_ln_s_add unrelated DS &&
-	git commit -m side1 &&
-
-	git checkout side2 &&
-	>unrelated &&
-	git add unrelated &&
-	git commit -m commit1 &&
-
-	echo >>unrelated &&
-	git commit -am commit2
-
-[master (root-commit) ba9279b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 DS/whatever
-Switched to branch 'side1'
-rm 'DS/whatever'
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[side1 0a05486] side1
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 DS
- delete mode 100644 DS/whatever
-Switched to branch 'side2'
-[side2 e75512e] commit1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 unrelated
-[side2 e22f82a] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 3433.2 'rebase changes with the apply backend': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b apply-backend side2 &&
-	git rebase side1
-
-Switched to a new branch 'apply-backend'
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/apply-backend.
-fatal: no rebase in progress
-ok 2 - rebase changes with the apply backend
-
-expecting success of 3433.3 'rebase changes with the merge backend': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b merge-backend side2 &&
-	git rebase -m side1
-
-Switched to a new branch 'merge-backend'
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/merge-backend.
-fatal: no rebase in progress
-ok 3 - rebase changes with the merge backend
-
-expecting success of 3433.4 'rebase changes with the merge backend with a delay': 
-	test_when_finished "git rebase --abort || true" &&
-	git checkout -b merge-delay-backend side2 &&
-	git rebase -m --exec "sleep 1" side1
-
-Switched to a new branch 'merge-delay-backend'
-Rebasing (1/4)
Rebasing (2/4)

                                                                                
Executing: sleep 1
-Rebasing (3/4)
Rebasing (4/4)

                                                                                
Executing: sleep 1
-
                                                                                
Successfully rebased and updated refs/heads/merge-delay-backend.
-fatal: no rebase in progress
-ok 4 - rebase changes with the merge backend with a delay
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3434-rebase-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3434-rebase-i18n/.git/
-expecting success of 3434.1 'setup': 
-	test_commit one &&
-	git branch first &&
-	test_commit two &&
-	git switch first &&
-	test_commit three &&
-	git branch second &&
-	test_commit four &&
-	git switch second &&
-	test_commit five &&
-	test_commit six
-
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Switched to branch 'first'
-[first 897c206] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[first 6f2ec4d] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-Switched to branch 'second'
-[second e2eded9] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-[second 666e62f] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-ok 1 - setup
-
-expecting success of 3434.2 'rebase --rebase-merges update encoding eucJP to UTF-8': 
-	git switch -c merge-eucJP-UTF-8 first &&
-	git config i18n.commitencoding eucJP &&
-	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
-	git config i18n.commitencoding UTF-8 &&
-	git rebase --rebase-merges main &&
-	compare_msg eucJP.txt eucJP UTF-8
-
-Switched to a new branch 'merge-eucJP-UTF-8'
-Merge made by the 'ort' strategy.
- five.t | 1 +
- six.t  | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 five.t
- create mode 100644 six.t
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)

                                                                                
Successfully rebased and updated refs/heads/merge-eucJP-UTF-8.
-ok 2 - rebase --rebase-merges update encoding eucJP to UTF-8
-
-expecting success of 3434.3 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP': 
-	git switch -c merge-eucJP-ISO-2022-JP first &&
-	git config i18n.commitencoding eucJP &&
-	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
-	git config i18n.commitencoding ISO-2022-JP &&
-	git rebase --rebase-merges main &&
-	compare_msg eucJP.txt eucJP ISO-2022-JP
-
-Switched to a new branch 'merge-eucJP-ISO-2022-JP'
-Merge made by the 'ort' strategy.
- five.t | 1 +
- six.t  | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 five.t
- create mode 100644 six.t
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)

                                                                                
Successfully rebased and updated refs/heads/merge-eucJP-ISO-2022-JP.
-ok 3 - rebase --rebase-merges update encoding eucJP to ISO-2022-JP
-
-expecting success of 3434.4 'rebase --continue update from ISO-8859-1 to UTF-8': 
-		(git rebase --abort || : abort current git-rebase failure) &&
-		git switch -c conflict-$old-$new one &&
-		echo for-conflict >two.t &&
-		git add two.t &&
-		git config i18n.commitencoding $old &&
-		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
-		git config i18n.commitencoding $new &&
-		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
-		git stripspace <.git/rebase-merge/message >two.t &&
-		git add two.t &&
-		git rebase --continue &&
-		compare_msg $msgfile $old $new &&
-		: git-commit assume invalid utf-8 is latin1 &&
-		test_cmp expect two.t
-	
-fatal: no rebase in progress
-Switched to a new branch 'conflict-ISO-8859-1-UTF-8'
-[conflict-ISO-8859-1-UTF-8 7f6df7e] ÄËÑÏÖ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Rebasing (1/1)
Auto-merging two.t
-CONFLICT (add/add): Merge conflict in two.t
-error: could not apply 7f6df7e... ÄËÑ�Ö
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 7f6df7e... ÄËÑ�Ö
-[detached HEAD 2d1ef83] ÄËÑ�Ö
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated refs/heads/conflict-ISO-8859-1-UTF-8.
-ok 4 - rebase --continue update from ISO-8859-1 to UTF-8
-
-expecting success of 3434.5 'rebase --continue update from eucJP to UTF-8': 
-		(git rebase --abort || : abort current git-rebase failure) &&
-		git switch -c conflict-$old-$new one &&
-		echo for-conflict >two.t &&
-		git add two.t &&
-		git config i18n.commitencoding $old &&
-		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
-		git config i18n.commitencoding $new &&
-		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
-		git stripspace <.git/rebase-merge/message >two.t &&
-		git add two.t &&
-		git rebase --continue &&
-		compare_msg $msgfile $old $new &&
-		: git-commit assume invalid utf-8 is latin1 &&
-		test_cmp expect two.t
-	
-fatal: no rebase in progress
-Switched to a new branch 'conflict-eucJP-UTF-8'
-[conflict-eucJP-UTF-8 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Rebasing (1/1)
Auto-merging two.t
-CONFLICT (add/add): Merge conflict in two.t
-error: could not apply 4850d3a... �れ���
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 4850d3a... �れ���
-[detached HEAD 52bcbd9] �れ���
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated refs/heads/conflict-eucJP-UTF-8.
-ok 5 - rebase --continue update from eucJP to UTF-8
-
-expecting success of 3434.6 'rebase --continue update from eucJP to ISO-2022-JP': 
-		(git rebase --abort || : abort current git-rebase failure) &&
-		git switch -c conflict-$old-$new one &&
-		echo for-conflict >two.t &&
-		git add two.t &&
-		git config i18n.commitencoding $old &&
-		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
-		git config i18n.commitencoding $new &&
-		test_must_fail git rebase -m main &&
-		test -f .git/rebase-merge/message &&
-		git stripspace <.git/rebase-merge/message >two.t &&
-		git add two.t &&
-		git rebase --continue &&
-		compare_msg $msgfile $old $new &&
-		: git-commit assume invalid utf-8 is latin1 &&
-		test_cmp expect two.t
-	
-fatal: no rebase in progress
-Switched to a new branch 'conflict-eucJP-ISO-2022-JP'
-[conflict-eucJP-ISO-2022-JP 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Rebasing (1/1)
Auto-merging two.t
-CONFLICT (add/add): Merge conflict in two.t
-error: could not apply 4850d3a... ?$B$O$l$R$[$U?(B
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 4850d3a... $B$O$l$R$[$U
-[detached HEAD d0ef7c0] $B$O$l$R$[$U(B
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated refs/heads/conflict-eucJP-ISO-2022-JP.
-ok 6 - rebase --continue update from eucJP to ISO-2022-JP
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3435-rebase-gpg-sign.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3435-rebase-gpg-sign/.git/
-checking prerequisite: GPG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG not satisfied
-1..0 # SKIP skip all test rebase --[no-]gpg-sign, gpg not available
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3431-rebase-fork-point.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3431-rebase-fork-point/.git/
 expecting success of 3431.1 'setup': 
@@ -186244,1021 +185303,6 @@
 1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3437-rebase-fixup-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3437-rebase-fixup-options/.git/
-expecting success of 3437.1 'setup': 
-	cat >message <<-EOF &&
-	amend! B
-	$EMPTY
-	new subject
-	$EMPTY
-	new
-	body
-	EOF
-
-	test_commit initial &&
-	test_commit A A &&
-	test_commit B B &&
-	get_author HEAD >expected-author &&
-	ORIG_AUTHOR_NAME="$GIT_AUTHOR_NAME" &&
-	ORIG_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" &&
-	GIT_AUTHOR_NAME="Amend Author" &&
-	GIT_AUTHOR_EMAIL="amend@example.com" &&
-	test_commit "$(cat message)" A A1 A1 &&
-	test_commit A2 A &&
-	test_commit A3 A &&
-	GIT_AUTHOR_NAME="$ORIG_AUTHOR_NAME" &&
-	GIT_AUTHOR_EMAIL="$ORIG_AUTHOR_EMAIL" &&
-	git checkout -b conflicts-branch A &&
-	test_commit conflicts A &&
-
-	set_fake_editor &&
-	git checkout -b branch B &&
-	echo B1 >B &&
-	test_tick &&
-	git commit --fixup=HEAD -a &&
-	git tag B1 &&
-	test_tick &&
-	FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
-	test_tick &&
-	FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
-	echo B2 >B &&
-	test_tick &&
-	FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
-	git tag B2 &&
-	echo B3 >B &&
-	test_tick &&
-	FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
-	git tag B3 &&
-
-	GIT_AUTHOR_NAME="Rebase Author" &&
-	GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
-	GIT_COMMITTER_NAME="Rebase Committer" &&
-	GIT_COMMITTER_EMAIL="rebase.committer@example.com"
-
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[master e45ed32] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A
-[master 0b010d6] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-[master 24547d2] amend! B
- Author: Amend Author <amend@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 34b9ec4] A2
- Author: Amend Author <amend@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master fc6fe24] A3
- Author: Amend Author <amend@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'conflicts-branch'
-[conflicts-branch 1ae01f5] conflicts
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'branch'
-[branch 5ea5a69] fixup! B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[branch 9954cb8] amend! B
- Author: A U Thor <author@example.com>
-[branch ddcbd4a] amend! amend! B
- Author: A U Thor <author@example.com>
-[branch 4d0230e] squash! amend! amend! B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[branch e0c8cb3] amend! amend! amend! B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 3437.2 'simple fixup -C works': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A2 &&
-	FAKE_LINES="1 fixup_-C 2" git rebase -i B &&
-	test_cmp_rev HEAD^ B &&
-	test_cmp_rev HEAD^{tree} A2^{tree} &&
-	test_commit_message HEAD -m "A2"
-
-HEAD is now at 34b9ec4 A2
-rebase -i script before editing:
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-
-rebase -i script after editing:
-pick 24547d2 amend! B
-fixup -C 34b9ec4 A2
-Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 2 - simple fixup -C works
-
-expecting success of 3437.3 'simple fixup -c works': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A2 &&
-	git log -1 --pretty=format:%B >expected-fixup-message &&
-	test_write_lines "" "Modified A2" >>expected-fixup-message &&
-	FAKE_LINES="1 fixup_-c 2" \
-		FAKE_COMMIT_AMEND="Modified A2" \
-		git rebase -i B &&
-	test_cmp_rev HEAD^ B &&
-	test_cmp_rev HEAD^{tree} A2^{tree} &&
-	test_commit_message HEAD expected-fixup-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  9e14115 A2
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 9e14115
-
-HEAD is now at 34b9ec4 A2
-rebase -i script before editing:
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-
-rebase -i script after editing:
-pick 24547d2 amend! B
-fixup -c 34b9ec4 A2
-Rebasing (2/2)
[detached HEAD e21ffe9] A2
- Author: Amend Author <amend@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 3 - simple fixup -c works
-
-expecting success of 3437.4 'fixup -C removes amend! from message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A1 &&
-	git log -1 --pretty=format:%b >expected-message &&
-	FAKE_LINES="1 fixup_-C 2" git rebase -i A &&
-	test_cmp_rev HEAD^ A &&
-	test_cmp_rev HEAD^{tree} A1^{tree} &&
-	test_commit_message HEAD expected-message &&
-	get_author HEAD >actual-author &&
-	test_cmp expected-author actual-author
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  e21ffe9 A2
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> e21ffe9
-
-HEAD is now at 24547d2 amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup -C 24547d2 amend! B
-Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 4 - fixup -C removes amend! from message
-
-expecting success of 3437.5 'fixup -C with conflicts gives correct message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A1 &&
-	git log -1 --pretty=format:%b >expected-message &&
-	test_write_lines "" "edited" >>expected-message &&
-	test_must_fail env FAKE_LINES="1 fixup_-C 2" git rebase -i conflicts &&
-	git checkout --theirs -- A &&
-	git add A &&
-	FAKE_COMMIT_AMEND=edited git rebase --continue &&
-	test_cmp_rev HEAD^ conflicts &&
-	test_cmp_rev HEAD^{tree} A1^{tree} &&
-	test_commit_message HEAD expected-message &&
-	get_author HEAD >actual-author &&
-	test_cmp expected-author actual-author
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b96345a new subject
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> b96345a
-
-HEAD is now at 24547d2 amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup -C 24547d2 amend! B
-Rebasing (1/2)
Rebasing (2/2)
Auto-merging A
-CONFLICT (content): Merge conflict in A
-error: could not apply 24547d2... amend! B
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 24547d2... amend! B
-[detached HEAD df4c993] new subject
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 B
-
                                                                                
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 5 - fixup -C with conflicts gives correct message
-
-expecting success of 3437.6 'skipping fixup -C after fixup gives correct message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A3 &&
-	test_must_fail env FAKE_LINES="1 fixup 2 fixup_-C 4" git rebase -i A &&
-	git reset --hard &&
-	FAKE_COMMIT_AMEND=edited git rebase --continue &&
-	test_commit_message HEAD -m "B"
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  df4c993 new subject
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> df4c993
-
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup 24547d2 amend! B
-fixup -C fc6fe24 A3
-Rebasing (2/3)
Rebasing (3/3)
Auto-merging A
-CONFLICT (content): Merge conflict in A
-error: could not apply fc6fe24... A3
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply fc6fe24... A3
-HEAD is now at dfd7a63 # This is a combination of 2 commits. # This is the 1st commit message:
-
                                                                                
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 6 - skipping fixup -C after fixup gives correct message
-
-expecting success of 3437.7 'sequence of fixup, fixup -C & squash --signoff works': 
-	git checkout --detach B3 &&
-	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4 squash 5 fixup_-C 6" \
-		FAKE_COMMIT_AMEND=squashed \
-		FAKE_MESSAGE_COPY=actual-squash-message \
-		git -c commit.status=false rebase -ik --signoff A &&
-	git diff-tree --exit-code --patch HEAD B3 -- &&
-	test_cmp_rev HEAD^ A &&
-	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
-		actual-squash-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  e650b85 B
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> e650b85
-
-HEAD is now at e0c8cb3 amend! amend! amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 5ea5a69 fixup! B
-pick 9954cb8 amend! B # empty
-pick ddcbd4a amend! amend! B # empty
-pick 4d0230e squash! amend! amend! B
-pick e0c8cb3 amend! amend! amend! B
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup 5ea5a69 fixup! B
-fixup -C 9954cb8 amend! B # empty
-fixup -C ddcbd4a amend! amend! B # empty
-squash 4d0230e squash! amend! amend! B
-fixup -C e0c8cb3 amend! amend! amend! B
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
[detached HEAD 93e1c61] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 7 - sequence of fixup, fixup -C & squash --signoff works
-
-expecting success of 3437.8 'first fixup -C commented out in sequence fixup fixup -C fixup -C': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach B2~ &&
-	git log -1 --pretty=format:%b >expected-message &&
-	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4" git rebase -i A &&
-	test_cmp_rev HEAD^ A &&
-	test_commit_message HEAD expected-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  93e1c61 B
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 93e1c61
-
-HEAD is now at ddcbd4a amend! amend! B
-rebase -i script before editing:
-pick 0b010d6 B
-pick 5ea5a69 fixup! B
-pick 9954cb8 amend! B # empty
-pick ddcbd4a amend! amend! B # empty
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup 5ea5a69 fixup! B
-fixup -C 9954cb8 amend! B # empty
-fixup -C ddcbd4a amend! amend! B # empty
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

                                                                                
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 8 - first fixup -C commented out in sequence fixup fixup -C fixup -C
-
-expecting success of 3437.9 'multiple fixup -c opens editor once': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A3 &&
-	git log -1 --pretty=format:%B >expected-message &&
-	test_write_lines "" "Modified-A3" >>expected-message &&
-	FAKE_COMMIT_AMEND="Modified-A3" \
-		FAKE_LINES="1 fixup_-C 2 fixup_-c 3 fixup_-c 4" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i A &&
-	test_cmp_rev HEAD^ A &&
-	get_author HEAD >actual-author &&
-	test_cmp expected-author actual-author &&
-	test_commit_message HEAD expected-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  8566dee B
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 8566dee
-
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
-
-rebase -i script after editing:
-pick 0b010d6 B
-fixup -C 24547d2 amend! B
-fixup -c 34b9ec4 A2
-fixup -c fc6fe24 A3
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 68e48e4] A3
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 B
-
                                                                                
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 9 - multiple fixup -c opens editor once
-
-expecting success of 3437.10 'sequence squash, fixup & fixup -c gives combined message': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout --detach A3 &&
-	FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
-		FAKE_MESSAGE_COPY=actual-combined-message \
-		git -c commit.status=false rebase -i A &&
-	test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
-		actual-combined-message &&
-	test_cmp_rev HEAD^ A
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  68e48e4 A3
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 68e48e4
-
-HEAD is now at fc6fe24 A3
-rebase -i script before editing:
-pick 0b010d6 B
-pick 24547d2 amend! B
-pick 34b9ec4 A2
-pick fc6fe24 A3
-
-rebase -i script after editing:
-pick 0b010d6 B
-squash 24547d2 amend! B
-fixup 34b9ec4 A2
-fixup -c fc6fe24 A3
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 0a304e5] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 B
-
                                                                                
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 10 - sequence squash, fixup & fixup -c gives combined message
-
-expecting success of 3437.11 'fixup -C works upon --autosquash with amend!': 
-	git checkout --detach B3 &&
-	FAKE_COMMIT_AMEND=squashed \
-		FAKE_MESSAGE_COPY=actual-squash-message \
-		git -c commit.status=false rebase -ik --autosquash \
-						--signoff A &&
-	git diff-tree --exit-code --patch HEAD B3 -- &&
-	test_cmp_rev HEAD^ A &&
-	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
-		actual-squash-message
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  0a304e5 B
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 0a304e5
-
-HEAD is now at e0c8cb3 amend! amend! amend! B
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
[detached HEAD 93e1c61] B
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 B
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 11 - fixup -C works upon --autosquash with amend!
-
-expecting success of 3437.12 'fixup -[Cc]<commit> works': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	cat >todo <<-\EOF &&
-	pick A
-	fixup -CA1
-	pick B
-	fixup -cA2
-	EOF
-	(
-		set_replace_editor todo &&
-		FAKE_COMMIT_MESSAGE="edited and fixed up" \
-			git rebase -i initial initial
-	) &&
-	git log --pretty=format:%B initial.. >actual &&
-	cat >expect <<-EOF &&
-	edited and fixed up
-	$EMPTY
-	new subject
-	$EMPTY
-	new
-	body
-	EOF
-	test_cmp expect actual
-
-rebase -i script after editing:
-pick A
-fixup -CA1
-pick B
-fixup -cA2
-Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 755eebe] edited and fixed up
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 B
-
                                                                                
Successfully rebased and updated detached HEAD.
-fatal: no rebase in progress
-ok 12 - fixup -[Cc]<commit> works
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3436-rebase-more-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3436-rebase-more-options/.git/
-expecting success of 3436.1 'setup': 
-	git checkout -b topic &&
-	test_write_lines "line 1" "	line 2" "line 3" >file &&
-	git add file &&
-	git commit -m "add file" &&
-
-	test_write_lines "line 1" "new line 2" "line 3" >file &&
-	git commit -am "update file" &&
-	git tag side &&
-	test_commit commit1 foo foo1 &&
-	test_commit commit2 foo foo2 &&
-	test_commit commit3 foo foo3 &&
-
-	git checkout --orphan main &&
-	rm foo &&
-	test_write_lines "line 1" "        line 2" "line 3" >file &&
-	git commit -am "add file" &&
-	git tag main &&
-
-	mkdir test-bin &&
-	write_script test-bin/git-merge-test <<-\EOF
-	exec git merge-recursive "$@"
-	EOF
-
-Switched to a new branch 'topic'
-[topic (root-commit) c24e627] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 file
-[topic 139b464] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[topic 7c57c40] commit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[topic bd08fd4] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[topic eda6f49] commit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'main'
-[main (root-commit) 3ada4af] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 3436.2 '--ignore-whitespace works with apply backend': 
-	test_must_fail git rebase --apply main side &&
-	git rebase --abort &&
-	git rebase --apply --ignore-whitespace main side &&
-	git diff --exit-code side
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-3ada4af add file
-virtual update file
-found 1 common ancestor:
-virtual cea075e2ce716201e60e4bbadc9a40706c56c362
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 update file
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-ok 2 - --ignore-whitespace works with apply backend
-
-expecting success of 3436.3 '--ignore-whitespace works with merge backend': 
-	test_must_fail git rebase --merge main side &&
-	git rebase --abort &&
-	git rebase --merge --ignore-whitespace main side &&
-	git diff --exit-code side
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/1)
Auto-merging file
-CONFLICT (content): Merge conflict in file
-error: could not apply 139b464... update file
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 139b464... update file
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 3 - --ignore-whitespace works with merge backend
-
-expecting success of 3436.4 '--ignore-whitespace is remembered when continuing': 
-	(
-		set_fake_editor &&
-		FAKE_LINES="break 1" git rebase -i --ignore-whitespace \
-			main side &&
-		git rebase --continue
-	) &&
-	git diff --exit-code side
-
-warning: refname 'main' is ambiguous.
-warning: refname 'main' is ambiguous.
-warning: skipped previously applied commit c24e627
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-rebase -i script before editing:
-pick 139b464 update file
-
-rebase -i script after editing:
-break
-pick 139b464 update file
-Rebasing (1/2)

                                                                                
Stopped at 3ada4af (add file)
-Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 4 - --ignore-whitespace is remembered when continuing
-
-expecting success of 3436.5 '--committer-date-is-author-date works with apply backend': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	git rebase --apply --committer-date-is-author-date HEAD^ &&
-	test_ctime_is_atime -1
-
-[detached HEAD 6184e8b] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: update file
-ok 5 - --committer-date-is-author-date works with apply backend
-
-expecting success of 3436.6 '--committer-date-is-author-date works with merge backend': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	git rebase -m --committer-date-is-author-date HEAD^ &&
-	test_ctime_is_atime -1
-
-[detached HEAD 6184e8b] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is up to date, rebase forced.
-Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 6 - --committer-date-is-author-date works with merge backend
-
-expecting success of 3436.7 '--committer-date-is-author-date works when rewording': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE=edited \
-			FAKE_LINES="reword 1" \
-			git rebase -i --committer-date-is-author-date HEAD^
-	) &&
-	test_write_lines edited "" >expect &&
-	git log --format="%B" -1 >actual &&
-	test_cmp expect actual &&
-	test_ctime_is_atime -1
-
-[detached HEAD 6184e8b] update file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-rebase -i script before editing:
-pick 6184e8b update file
-
-rebase -i script after editing:
-reword 6184e8b update file
-Rebasing (1/1)
[detached HEAD 5c38296] edited
- Author: A U Thor <author@example.com>
- Date: Thu Jan 1 03:20:34 1970 +0300
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 7 - --committer-date-is-author-date works when rewording
-
-expecting success of 3436.8 '--committer-date-is-author-date works with rebase -r': 
-	git checkout side &&
-	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
-	git rebase -r --root --committer-date-is-author-date &&
-	test_ctime_is_atime
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  5c38296 edited
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 5c38296
-
-HEAD is now at 139b464 update file
-Merge made by the 'ort' strategy.
- foo | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 8 - --committer-date-is-author-date works with rebase -r
-
-expecting success of 3436.9 '--committer-date-is-author-date works when forking merge': 
-	git checkout side &&
-	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
-	PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \
-					--committer-date-is-author-date &&
-	test_ctime_is_atime
-
-Warning: you are leaving 6 commits behind, not connected to
-any of your branches:
-
-  aa07736 Merge tag 'commit3' into HEAD
-  54193eb commit3
-  a2d9c2e commit2
-  8251e18 commit1
- ... and 2 more.
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> aa07736
-
-HEAD is now at 139b464 update file
-Merge made by the 'ort' strategy.
- foo | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Merging 2a85097a58eecaad11df374857a87fbc0e47e389 with c24e62700f83d7b12297f45d1ce1e9689ebb2b1f
-Merging:
-2a85097 c24e627 add file
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-Rebasing (4/11)
Merging eaa553d7eb7c0d13b95960e348a77332601bbc3e with 139b46443e355afd5f438ac2849d41f3a53b8c77
-Merging:
-eaa553d add file
-139b464 update file
-found 1 common ancestor:
-c24e627 add file
-Rebasing (5/11)
Rebasing (6/11)
Merging 34dfd6c233143884ddd9180be88112657b590d86 with 7c57c40ccd2483ccea76831595c0e232d40560c7
-Merging:
-34dfd6c update file
-7c57c40 commit1
-found 1 common ancestor:
-139b464 update file
-Rebasing (7/11)
Merging 8251e18d67ff84cb7aa93676b4cb93be15ef6810 with bd08fd48eeadc218177587a9f467f39ac4b51d49
-Merging:
-8251e18 commit1
-bd08fd4 commit2
-found 1 common ancestor:
-7c57c40 commit1
-Rebasing (8/11)
Merging a2d9c2ebb6808fff81a49a500b865fbf8f4fcbf5 with eda6f49c7ee63a956ad612b98a03b92c19face55
-Merging:
-a2d9c2e commit2
-eda6f49 commit3
-found 1 common ancestor:
-bd08fd4 commit2
-Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)
Merging HEAD with 54193ebc0e463528ab8c3f723f89752960c98304
-Merging:
-34dfd6c update file
-54193eb commit3
-found 1 common ancestor:
-34dfd6c update file
-Merge made by the 'test' strategy.
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 9 - --committer-date-is-author-date works when forking merge
-
-expecting success of 3436.10 '--committer-date-is-author-date works when committing conflict resolution': 
-	git checkout commit2 &&
-	GIT_AUTHOR_DATE="@1980 +0000" git commit --amend --only --reset-author &&
-	test_must_fail git rebase -m --committer-date-is-author-date \
-		--onto HEAD^^ HEAD^ &&
-	echo resolved > foo &&
-	git add foo &&
-	git rebase --continue &&
-	test_ctime_is_atime -1
-
-Warning: you are leaving 6 commits behind, not connected to
-any of your branches:
-
-  aa07736 Merge tag 'commit3' into HEAD
-  54193eb commit3
-  a2d9c2e commit2
-  8251e18 commit1
- ... and 2 more.
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> aa07736
-
-HEAD is now at bd08fd4 commit2
-[detached HEAD 832d950] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in 832d950 (commit2).  Version 832d950 (commit2) of foo left in tree.
-error: could not apply 832d950... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 832d950... commit2
-[detached HEAD 3bf7cf9] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 10 - --committer-date-is-author-date works when committing conflict resolution
-
-expecting success of 3436.11 '--reset-author-date works with apply backend': 
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --apply --reset-author-date HEAD^ &&
-	test_atime_is_ignored -1
-
-[detached HEAD 70e7180] commit2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-HEAD is up to date, rebase forced.
-First, rewinding head to replay your work on top of it...
-Applying: commit2
-ok 11 - --reset-author-date works with apply backend
-
-expecting success of 3436.12 '--reset-author-date works with merge backend': 
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --reset-author-date -m HEAD^ &&
-	test_atime_is_ignored -1
-
-[detached HEAD 70e7180] commit2
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-HEAD is up to date, rebase forced.
-Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 12 - --reset-author-date works with merge backend
-
-expecting success of 3436.13 '--reset-author-date works after conflict resolution': 
-	test_must_fail git rebase --reset-author-date -m \
-		--onto commit2^^ commit2^ commit2 &&
-	echo resolved >foo &&
-	git add foo &&
-	git rebase --continue &&
-	test_atime_is_ignored -1
-
-Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
-error: could not apply bd08fd4... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply bd08fd4... commit2
-[detached HEAD 6c9e856] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 13 - --reset-author-date works after conflict resolution
-
-expecting success of 3436.14 '--reset-author-date works with rebase -r': 
-	git checkout side &&
-	git merge --no-ff commit3 &&
-	git rebase -r --root --reset-author-date &&
-	test_atime_is_ignored
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6c9e856 commit2
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 6c9e856
-
-HEAD is now at 139b464 update file
-Merge made by the 'ort' strategy.
- foo | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (1/11)
Rebasing (2/11)
Rebasing (3/11)
Rebasing (4/11)
Rebasing (5/11)
Rebasing (6/11)
Rebasing (7/11)
Rebasing (8/11)
Rebasing (9/11)
Rebasing (10/11)
Rebasing (11/11)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 14 - --reset-author-date works with rebase -r
-
-expecting success of 3436.15 '--reset-author-date with --committer-date-is-author-date works': 
-	test_must_fail git rebase -m --committer-date-is-author-date \
-		--reset-author-date --onto commit2^^ commit2^ commit3 &&
-	git checkout --theirs foo &&
-	git add foo &&
-	git rebase --continue &&
-	test_ctime_is_atime -2 &&
-	test_atime_is_ignored -2
-
-Rebasing (1/2)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
-error: could not apply bd08fd4... commit2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply bd08fd4... commit2
-Updated 1 path from the index
-[detached HEAD 4bc0e05] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 15 - --reset-author-date with --committer-date-is-author-date works
-
-expecting success of 3436.16 'reset-author-date with --committer-date-is-author-date works when rewording': 
-	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_MESSAGE=edited \
-			FAKE_LINES="reword 1" \
-			git rebase -i --committer-date-is-author-date \
-				--reset-author-date HEAD^
-	) &&
-	test_write_lines edited "" >expect &&
-	git log --format="%B" -1 >actual &&
-	test_cmp expect actual &&
-	test_atime_is_ignored -1
-
-[detached HEAD fe8f5ce] commit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-rebase -i script before editing:
-pick fe8f5ce commit3
-
-rebase -i script after editing:
-reword fe8f5ce commit3
-Rebasing (1/1)
[detached HEAD 18abb52] edited
- Author: A U Thor <author@example.com>
- Date: Thu Dec 18 01:34:48 2025 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 16 - reset-author-date with --committer-date-is-author-date works when rewording
-
-expecting success of 3436.17 '--reset-author-date --committer-date-is-author-date works when forking merge': 
-	GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \
-		PATH="./test-bin:$PATH" git rebase -i --strategy=test \
-				--reset-author-date \
-				--committer-date-is-author-date side side &&
-	test_ctime_is_atime -1 &&
-	test_atime_is_ignored -1
- 
-Rebasing (1/1)
Merging HEAD with eda6f49c7ee63a956ad612b98a03b92c19face55
-Merging:
-139b464 update file
-eda6f49 commit3
-found 1 common ancestor:
-139b464 update file
-Merge made by the 'test' strategy.
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 17 - --reset-author-date --committer-date-is-author-date works when forking merge
-
-expecting success of 3436.18 '--ignore-date is an alias for --reset-author-date': 
-	git commit --amend --date="$GIT_AUTHOR_DATE" &&
-	git rebase --apply --ignore-date HEAD^ &&
-	git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" &&
-	git rebase -m --ignore-date HEAD^ &&
-	test_atime_is_ignored -2
-
-[detached HEAD 09e9cd3] edited
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-First, rewinding head to replay your work on top of it...
-Applying: commit1
-Applying: commit2
-Applying: commit3
-[detached HEAD 505ca62] empty
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
-HEAD is up to date, rebase forced.
-Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 18 - --ignore-date is an alias for --reset-author-date
-
-expecting success of 3436.19 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
-
-ok 19 - $EDITOR and friends are unchanged
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3404-rebase-interactive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive/.git/
 expecting success of 3404.1 'setup': 
@@ -191610,532 +189654,2326 @@
 		set_replace_editor fake-todo-1 &&
 		git rebase -i --update-refs primary &&
 
-		# 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 &&
+		# 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 &&
+
+		set_replace_editor fake-todo-2 &&
+		git rebase --edit-todo &&
+
+		# These branches are currently locked.
+		for b in second third
+		do
+			test_must_fail git branch -f $b base || return 1
+		done &&
+
+		# 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 &&
+
+		git rebase --continue &&
+
+		set_replace_editor fake-todo-3 &&
+		git rebase --edit-todo &&
+
+		# These branches are currently locked.
+		for b in second third first unseen
+		do
+			test_must_fail git branch -f $b base || return 1
+		done &&
+
+		# 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 &&
+
+		git rebase --continue
+	) &&
+
+	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
+
+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
+
+pick e31be72ab52d740527956c171d40a832b63e68ca
+pick 34033109e5a0def540b16172943d8a7e2a8a712e
+update-ref refs/heads/third
+
+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.45.2/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'no-conflict-branch' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
+rebase -i script after editing:
+update-ref refs/heads/second
+
+pick e31be72ab52d740527956c171d40a832b63e68ca
+update-ref refs/heads/third
+pick 34033109e5a0def540b16172943d8a7e2a8a712e
+break
+
+pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
+fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
+fatal: cannot force update the branch 'unseen' used by worktree at '/build/reproducible-path/git-2.45.2/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 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 &&
+
+	test_commit test-refs-not-removed &&
+	git commit --amend --fixup first &&
+
+	git rev-parse first second third tip no-conflict-branch >expect-oids &&
+
+	(
+		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
+	) &&
+
+	# 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
+
+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 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 &&
+
+	test_commit test-refs-not-removed2 &&
+	git commit --amend --fixup first &&
+
+	git rev-parse first second third >expect-oids &&
+
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i \
+			--autosquash --update-refs \
+			base >todo.raw &&
+		sed -e "/^update-ref/d" <todo.raw >todo
+	) &&
+
+	# Add a break to the end of the todo so we can edit later
+	echo "break" >>todo &&
+
+	(
+		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
+	) &&
+
+	# 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
+
+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 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 &&
+
+	test_commit test-refs-not-removed3 &&
+	git commit --amend --fixup first &&
+
+	git rev-parse first second third tip no-conflict-branch >expect-oids &&
+
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i \
+			--autosquash --update-refs \
+			base >todo.raw &&
+		sed -e "/^update-ref/d" <todo.raw >todo
+	) &&
+
+	# 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 &&
+
+	(
+		set_replace_editor todo.new &&
+		git rebase -i --autosquash --update-refs base &&
+
+		# Make no changes when editing so update-refs is still empty
+		cat todo >todo.new &&
+		git rebase --edit-todo &&
+		git rebase --continue
+	) &&
+
+	# 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
+
+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 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 &&
+
+	cat >fake-todo <<-EOF &&
+	pick $(git rev-parse HEAD~3)
+	break
+	update-ref refs/heads/first
+
+	pick $(git rev-parse HEAD~2)
+	update-ref refs/heads/second
+
+	pick $(git rev-parse HEAD~1)
+	update-ref refs/heads/third
+
+	pick $(git rev-parse HEAD)
+	update-ref refs/heads/no-conflict-branch
+	EOF
+
+	(
+		set_replace_editor fake-todo &&
+		git rebase -i --update-refs base
+	) &&
+
+	# 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 &&
+
+	test_must_fail git rebase --continue 2>err &&
+	grep "update_ref failed for ref 'refs/heads/second'" err &&
+
+	cat >expect <<-\EOF &&
+	Updated the following refs with --update-refs:
+		refs/heads/first
+		refs/heads/no-conflict-branch
+		refs/heads/third
+	Failed to update the following refs with --update-refs:
+		refs/heads/second
+	EOF
+
+	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
+	tail -n 6 err >err.last &&
+	sed -e "s/Rebasing.*Successfully/Successfully/g" -e "s/^\t//g" \
+		<err.last >err.trimmed &&
+	test_cmp expect err.trimmed
+
+Switched to a new branch 'update-refs-error'
+rebase -i script after editing:
+pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
+break
+update-ref refs/heads/first
+
+pick e31be72ab52d740527956c171d40a832b63e68ca
+update-ref refs/heads/second
+
+pick 34033109e5a0def540b16172943d8a7e2a8a712e
+update-ref refs/heads/third
+
+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 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
+
+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 3404.130 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 130 - $EDITOR and friends are unchanged
+
+# passed all 130 test(s)
+1..130
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3434-rebase-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3434-rebase-i18n/.git/
+expecting success of 3434.1 'setup': 
+	test_commit one &&
+	git branch first &&
+	test_commit two &&
+	git switch first &&
+	test_commit three &&
+	git branch second &&
+	test_commit four &&
+	git switch second &&
+	test_commit five &&
+	test_commit six
+
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Switched to branch 'first'
+[first 897c206] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[first 6f2ec4d] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+Switched to branch 'second'
+[second e2eded9] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+[second 666e62f] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+ok 1 - setup
+
+expecting success of 3434.2 'rebase --rebase-merges update encoding eucJP to UTF-8': 
+	git switch -c merge-eucJP-UTF-8 first &&
+	git config i18n.commitencoding eucJP &&
+	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
+	git config i18n.commitencoding UTF-8 &&
+	git rebase --rebase-merges main &&
+	compare_msg eucJP.txt eucJP UTF-8
+
+Switched to a new branch 'merge-eucJP-UTF-8'
+Merge made by the 'ort' strategy.
+ five.t | 1 +
+ six.t  | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 five.t
+ create mode 100644 six.t
+Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)

                                                                                
Successfully rebased and updated refs/heads/merge-eucJP-UTF-8.
+ok 2 - rebase --rebase-merges update encoding eucJP to UTF-8
+
+expecting success of 3434.3 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP': 
+	git switch -c merge-eucJP-ISO-2022-JP first &&
+	git config i18n.commitencoding eucJP &&
+	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
+	git config i18n.commitencoding ISO-2022-JP &&
+	git rebase --rebase-merges main &&
+	compare_msg eucJP.txt eucJP ISO-2022-JP
+
+Switched to a new branch 'merge-eucJP-ISO-2022-JP'
+Merge made by the 'ort' strategy.
+ five.t | 1 +
+ six.t  | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 five.t
+ create mode 100644 six.t
+Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)

                                                                                
Successfully rebased and updated refs/heads/merge-eucJP-ISO-2022-JP.
+ok 3 - rebase --rebase-merges update encoding eucJP to ISO-2022-JP
+
+expecting success of 3434.4 'rebase --continue update from ISO-8859-1 to UTF-8': 
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m main &&
+		test -f .git/rebase-merge/message &&
+		git stripspace <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	
+fatal: no rebase in progress
+Switched to a new branch 'conflict-ISO-8859-1-UTF-8'
+[conflict-ISO-8859-1-UTF-8 7f6df7e] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Rebasing (1/1)
Auto-merging two.t
+CONFLICT (add/add): Merge conflict in two.t
+error: could not apply 7f6df7e... ÄËÑ�Ö
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 7f6df7e... ÄËÑ�Ö
+[detached HEAD 2d1ef83] ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
                                                                                
Successfully rebased and updated refs/heads/conflict-ISO-8859-1-UTF-8.
+ok 4 - rebase --continue update from ISO-8859-1 to UTF-8
+
+expecting success of 3434.5 'rebase --continue update from eucJP to UTF-8': 
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m main &&
+		test -f .git/rebase-merge/message &&
+		git stripspace <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	
+fatal: no rebase in progress
+Switched to a new branch 'conflict-eucJP-UTF-8'
+[conflict-eucJP-UTF-8 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Rebasing (1/1)
Auto-merging two.t
+CONFLICT (add/add): Merge conflict in two.t
+error: could not apply 4850d3a... �れ���
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 4850d3a... �れ���
+[detached HEAD 52bcbd9] �れ���
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
                                                                                
Successfully rebased and updated refs/heads/conflict-eucJP-UTF-8.
+ok 5 - rebase --continue update from eucJP to UTF-8
+
+expecting success of 3434.6 'rebase --continue update from eucJP to ISO-2022-JP': 
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m main &&
+		test -f .git/rebase-merge/message &&
+		git stripspace <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	
+fatal: no rebase in progress
+Switched to a new branch 'conflict-eucJP-ISO-2022-JP'
+[conflict-eucJP-ISO-2022-JP 4850d3a] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Rebasing (1/1)
Auto-merging two.t
+CONFLICT (add/add): Merge conflict in two.t
+error: could not apply 4850d3a... ?$B$O$l$R$[$U?(B
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 4850d3a... $B$O$l$R$[$U
+[detached HEAD d0ef7c0] $B$O$l$R$[$U(B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
                                                                                
Successfully rebased and updated refs/heads/conflict-eucJP-ISO-2022-JP.
+ok 6 - rebase --continue update from eucJP to ISO-2022-JP
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3433-rebase-across-mode-change.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3433-rebase-across-mode-change/.git/
+expecting success of 3433.1 'setup': 
+	mkdir DS &&
+	>DS/whatever &&
+	git add DS &&
+	git commit -m base &&
+
+	git branch side1 &&
+	git branch side2 &&
+
+	git checkout side1 &&
+	git rm -rf DS &&
+	test_ln_s_add unrelated DS &&
+	git commit -m side1 &&
+
+	git checkout side2 &&
+	>unrelated &&
+	git add unrelated &&
+	git commit -m commit1 &&
+
+	echo >>unrelated &&
+	git commit -am commit2
+
+[master (root-commit) ba9279b] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 DS/whatever
+Switched to branch 'side1'
+rm 'DS/whatever'
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[side1 0a05486] side1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 120000 DS
+ delete mode 100644 DS/whatever
+Switched to branch 'side2'
+[side2 e75512e] commit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 unrelated
+[side2 e22f82a] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 3433.2 'rebase changes with the apply backend': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b apply-backend side2 &&
+	git rebase side1
+
+Switched to a new branch 'apply-backend'
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/apply-backend.
+fatal: no rebase in progress
+ok 2 - rebase changes with the apply backend
+
+expecting success of 3433.3 'rebase changes with the merge backend': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b merge-backend side2 &&
+	git rebase -m side1
+
+Switched to a new branch 'merge-backend'
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/merge-backend.
+fatal: no rebase in progress
+ok 3 - rebase changes with the merge backend
+
+expecting success of 3433.4 'rebase changes with the merge backend with a delay': 
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b merge-delay-backend side2 &&
+	git rebase -m --exec "sleep 1" side1
+
+Switched to a new branch 'merge-delay-backend'
+Rebasing (1/4)
Rebasing (2/4)

                                                                                
Executing: sleep 1
+Rebasing (3/4)
Rebasing (4/4)

                                                                                
Executing: sleep 1
+
                                                                                
Successfully rebased and updated refs/heads/merge-delay-backend.
+fatal: no rebase in progress
+ok 4 - rebase changes with the merge backend with a delay
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3435-rebase-gpg-sign.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3435-rebase-gpg-sign/.git/
+checking prerequisite: GPG
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
+
+	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
+	# that version, creation of signed tags using the generated key fails.
+	case "$gpg_version" in
+	"gpg (GnuPG) 1.0.6"*)
+		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
+		;;
+	*)
+		# Available key info:
+		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
+		#   name and email: C O Mitter <committer@example.com>
+		# * Type RSA, size 2048 bits, no expiration date,
+		#   name and email: Eris Discordia <discord@example.net>
+		# No password given, to enable non-interactive operation.
+		# To generate new key:
+		#	gpg --homedir /tmp/gpghome --gen-key
+		# To write armored exported key to keyring:
+		#	gpg --homedir /tmp/gpghome --export-secret-keys \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		#	gpg --homedir /tmp/gpghome --export \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		# To export ownertrust:
+		#	gpg --homedir /tmp/gpghome --export-ownertrust \
+		#		> lib-gpg/ownertrust
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
+
+)
+prerequisite GPG not satisfied
+1..0 # SKIP skip all test rebase --[no-]gpg-sign, gpg not available
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3430-rebase-merges.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3430-rebase-merges/.git/
+expecting success of 3430.1 'setup': 
+	write_script replace-editor.sh <<-\EOF &&
+	mv "$1" "$(git rev-parse --git-path ORIGINAL-TODO)"
+	cp script-from-scratch "$1"
+	EOF
+
+	test_commit A &&
+	git checkout -b first &&
+	test_commit B &&
+	b=$(git rev-parse --short HEAD) &&
+	git checkout main &&
+	test_commit C &&
+	c=$(git rev-parse --short HEAD) &&
+	test_commit D &&
+	d=$(git rev-parse --short HEAD) &&
+	git merge --no-commit B &&
+	test_tick &&
+	git commit -m E &&
+	git tag -m E E &&
+	e=$(git rev-parse --short HEAD) &&
+	git checkout -b second C &&
+	test_commit F &&
+	f=$(git rev-parse --short HEAD) &&
+	test_commit G &&
+	g=$(git rev-parse --short HEAD) &&
+	git checkout main &&
+	git merge --no-commit G &&
+	test_tick &&
+	git commit -m H &&
+	h=$(git rev-parse --short HEAD) &&
+	git tag -m H H &&
+	git checkout A &&
+	test_commit conflicting-G G.t
+
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Switched to a new branch 'first'
+[first d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to branch 'main'
+[main 5dee784] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[main 12bd07b] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Automatic merge went well; stopped before committing as requested
+[main 2051b56] E
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'second'
+[second ca2c861] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+[second 088b00a] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Switched to branch 'main'
+Automatic merge went well; stopped before committing as requested
+[main 233d48a] H
+ Author: A U Thor <author@example.com>
+Note: switching to 'A'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 0ddfaf1 A
+[detached HEAD 82776a5] conflicting-G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+ok 1 - setup
+
+expecting success of 3430.2 'create completely different structure': 
+	cat >script-from-scratch <<-\EOF &&
+	label onto
+
+	# onebranch
+	pick G
+	pick D
+	label onebranch
+
+	# second
+	reset onto
+	pick B
+	label second
+
+	reset onto
+	merge -C H second
+	merge onebranch # Merge the topic branch 'onebranch'
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i -r A main &&
+	test_cmp_graph <<-\EOF
+	*   Merge the topic branch 'onebranch'
+	|\
+	| * D
+	| * G
+	* |   H
+	|\ \
+	| |/
+	|/|
+	| * B
+	|/
+	* A
+	EOF
+
+Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
[detached HEAD c2c3fe3] Merge the topic branch 'onebranch'
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:22:13 2005 -0700
+
                                                                                
Successfully rebased and updated refs/heads/main.
+ok 2 - create completely different structure
+
+expecting success of 3430.3 'generate correct todo list': 
+	cat >expect <<-EOF &&
+	label onto
+
+	reset onto
+	pick $b B
+	label E
+
+	reset onto
+	pick $c C
+	label branch-point
+	pick $f F
+	pick $g G
+	label H
+
+	reset branch-point # C
+	pick $d D
+	merge -C $e E # E
+	merge -C $h H # H
+
+	EOF
+
+	grep -v "^#" <.git/ORIGINAL-TODO >output &&
+	test_cmp expect output
+
+ok 3 - generate correct todo list
+
+expecting success of 3430.4 '`reset` refuses to overwrite untracked files': 
+	git checkout B &&
+	test_commit dont-overwrite-untracked &&
+	cat >script-from-scratch <<-EOF &&
+	exec >dont-overwrite-untracked.t
+	pick $(git rev-parse B) B
+	reset refs/tags/dont-overwrite-untracked
+	pick $(git rev-parse C) C
+	exec cat .git/rebase-merge/done >actual
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_must_fail git rebase -ir A &&
+	test_cmp_rev HEAD B &&
+	head -n3 script-from-scratch >expect &&
+	test_cmp expect .git/rebase-merge/done &&
+	rm dont-overwrite-untracked.t &&
+	git rebase --continue &&
+	tail -n3 script-from-scratch >>expect &&
+	test_cmp expect actual
+
+Note: switching to 'B'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d9df450 B
+[detached HEAD 8acd0a8] dont-overwrite-untracked
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dont-overwrite-untracked.t
+Rebasing (1/5)

                                                                                
Executing: >dont-overwrite-untracked.t
+Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by reset:
+	dont-overwrite-untracked.t
+Please move or remove them before you reset.
+Aborting
+hint: Could not execute the todo command
+hint:
+hint:     reset refs/tags/dont-overwrite-untracked
+hint:
+hint: It has been rescheduled; To edit the command before continuing, please
+hint: edit the todo list first:
+hint:
+hint:     git rebase --edit-todo
+hint:     git rebase --continue
+Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)

                                                                                
Executing: cat .git/rebase-merge/done >actual
+
                                                                                
Successfully rebased and updated detached HEAD.
+ok 4 - `reset` refuses to overwrite untracked files
+
+expecting success of 3430.5 '`reset` rejects trees': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset A^{tree} >" \
+		git rebase -i B C >out 2>err &&
+	grep "object .* is a tree" err &&
+	test_must_be_empty out
+
+Rebasing (1/1)
error: object da5497437fd67ca928333aab79c4b4b55036ea66 is a tree, not a commit
+ok 5 - `reset` rejects trees
+
+expecting success of 3430.6 '`reset` only looks for labels under refs/rewritten/': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git branch refs/rewritten/my-label A &&
+	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset my-label >" \
+		git rebase -i B C >out 2>err &&
+	grep "could not resolve ${SQ}my-label${SQ}" err &&
+	test_must_be_empty out
+
+Rebasing (1/1)
error: could not resolve 'my-label'
+ok 6 - `reset` only looks for labels under refs/rewritten/
+
+expecting success of 3430.7 'failed `merge -C` writes patch (may be rescheduled, too)': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout -b conflicting-merge A &&
+
+	: fail because of conflicting untracked file &&
+	>G.t &&
+	echo "merge -C H G" >script-from-scratch &&
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	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 &&
+
+	: 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
+
+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 3430.8 'failed `merge <branch>` does not crash': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout conflicting-G &&
+
+	echo "merge G" >script-from-scratch &&
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	test_must_fail git rebase -ir HEAD &&
+	! grep "^merge G$" .git/rebase-merge/git-rebase-todo &&
+	grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
+
+Note: switching to 'conflicting-G'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 82776a5 conflicting-G
+Rebasing (1/1)
Auto-merging G.t
+CONFLICT (add/add): Merge conflict in G.t
+Could not merge G
+Merge branch 'G'
+ok 8 - failed `merge <branch>` does not crash
+
+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>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+Rebasing (2/3)

                                                                                
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+Rebasing (3/3)
[detached HEAD 790085d] H
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+Rebasing (4/4)

                                                                                
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
+
                                                                                
Successfully rebased and updated refs/heads/merge-c.
+ok 9 - merge -c commits before rewording and reloads todo-list
+
+expecting success of 3430.10 'merge -c rewords when a strategy is given': 
+	git checkout -b merge-c-with-strategy H &&
+	write_script git-merge-override <<-\EOF &&
+	echo overridden$1 >G.t
+	git add G.t
+	EOF
+
+	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 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 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 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
+
+Switched to a new branch 'no-rebase-merges'
+Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/no-rebase-merges.
+ok 12 - --no-rebase-merges countermands --rebase-merges
+
+expecting success of 3430.13 'do not rebase cousins unless asked for': 
+	git checkout -b cousins main &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_tick &&
+	git rebase -r HEAD^ &&
+	test_cmp_rev HEAD $before &&
+	test_tick &&
+	git rebase --rebase-merges=rebase-cousins HEAD^ &&
+	test_cmp_graph HEAD^.. <<-\EOF
+	*   Merge the topic branch 'onebranch'
+	|\
+	| * D
+	| * G
+	|/
+	o H
+	EOF
+
+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 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
+
+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 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
+
+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 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
+
+Switched to a new branch 'override-config-rebase-cousins'
+Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)

                                                                                
Successfully rebased and updated refs/heads/override-config-rebase-cousins.
+ok 16 - --rebase-merges overrides rebase.rebaseMerges=rebase-cousins
+
+expecting success of 3430.17 'refs/rewritten/* is worktree-local': 
+	git worktree add wt &&
+	cat >wt/script-from-scratch <<-\EOF &&
+	label xyz
+	exec GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
+	exec git rev-parse --verify refs/rewritten/xyz >b
+	EOF
+
+	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)"
+
+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 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
+
+Switched to a new branch 'abort-cleans-refs-rewritten'
+Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)

                                                                                
Stopped at 233d48a (H)
+2051b561a3f30f5455d33a5269d3851790a86f42
+fatal: Needed a single revision
+ok 18 - --abort cleans up refs/rewritten
+
+expecting success of 3430.19 '--quit cleans up refs/rewritten': 
+	git checkout -b quit-cleans-refs-rewritten H &&
+	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
+	git rev-parse --verify refs/rewritten/onto &&
+	git rebase --quit &&
+	test_must_fail git rev-parse --verify refs/rewritten/onto
+
+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 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 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 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
+
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/post-rewrite.
+ok 21 - refuse to merge ancestors of HEAD
+
+expecting success of 3430.22 'root commits': 
+	git checkout --orphan unrelated &&
+	(GIT_AUTHOR_NAME="Parsnip" GIT_AUTHOR_EMAIL="root@example.com" \
+	 test_commit 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
+
+	: 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
+
+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 f19511e] 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 a2629fa] Merge the 3rd root
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:40: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 3430.23 'a "merge" into a root commit is a fast-forward': 
+	head=$(git rev-parse HEAD) &&
+	cat >script-from-scratch <<-EOF &&
+	reset [new root]
+	merge $head
+	EOF
+	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
+	test_tick &&
+	git rebase -i -r HEAD^ &&
+	test_cmp_rev HEAD $head
+
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/unrelated.
+ok 23 - a "merge" into a root commit is a fast-forward
+
+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
+
+Switched to a new branch 'khnum'
+[khnum (root-commit) e607b56] 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 373c75d] 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 3430.25 'labels that are object IDs are rewritten': 
+	git checkout -b third 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
+
+Switched to a new branch 'third'
+[third 7c47b26] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Switched to a new branch 'labels'
+Automatic merge went well; stopped before committing as requested
+[labels 417d0e6] Merge commit '7c47b267dedd9167bf6f82b866cdb3c0c616cf63' into labels
+ Author: A U Thor <author@example.com>
+
                                                                                
Successfully rebased and updated refs/heads/labels.
+label 7c47b267dedd9167bf6f82b866cdb3c0c616cf63-2
+ok 25 - labels that are object IDs are rewritten
+
+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) &&
+
+	: fast forward if possible &&
+	before="$(git rev-parse --verify HEAD)" &&
+	test_tick &&
+	git rebase -i -r HEAD^^ &&
+	test_cmp_rev HEAD $before &&
+
+	test_tick &&
+	git rebase -i --force-rebase -r HEAD^^ &&
+	test "Hank" = "$(git show -s --format=%an HEAD)" &&
+	test "$before" != $(git rev-parse HEAD) &&
+	test_cmp_graph HEAD^^.. <<-\EOF
+	*-.   Tüntenfüsch
+	|\ \
+	| | * three
+	| * | two
+	| |/
+	* / one
+	|/
+	o before-octopus
+	EOF
+
+Switched to a new branch 'three'
+[three 1ad7714] before-octopus
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 before-octopus.t
+[three 71d08b6] 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 71be617] 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 feed705] 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 c2f662c506dd68b3c6d1768bf722453638ad16a9
+Trying simple merge with b41d3cf4ea54b48a1166ddf99a8bbca32f1faa00
+Merge made by the 'octopus' strategy.
+
                                                                                
Successfully rebased and updated refs/heads/one.
+ok 26 - octopus merges
+
+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
+
+Switched to a new branch 'with-exec'
+[with-exec 6889979] fixup! B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/22)
Rebasing (2/22)
Rebasing (3/22)
Rebasing (4/22)
Rebasing (5/22)

                                                                                
Executing: ./show.sh
+Rebasing (6/22)
Rebasing (7/22)
Rebasing (8/22)
Rebasing (9/22)

                                                                                
Executing: ./show.sh
+Rebasing (10/22)
Rebasing (11/22)
Rebasing (12/22)

                                                                                
Executing: ./show.sh
+Rebasing (13/22)
Rebasing (14/22)

                                                                                
Executing: ./show.sh
+Rebasing (15/22)
Rebasing (16/22)
Rebasing (17/22)
Rebasing (18/22)

                                                                                
Executing: ./show.sh
+Rebasing (19/22)
Rebasing (20/22)

                                                                                
Executing: ./show.sh
+Rebasing (21/22)
Rebasing (22/22)

                                                                                
Executing: ./show.sh
+
                                                                                
Successfully rebased and updated refs/heads/with-exec.
+B: +Booh
+E: +Booh
+G: +G
+ok 27 - with --autosquash and --exec
+
+expecting success of 3430.28 '--continue after resolving conflicts after a merge': 
+	git checkout -b already-has-g E &&
+	git cherry-pick E..G &&
+	test_commit H2 &&
 
-		set_replace_editor fake-todo-2 &&
-		git rebase --edit-todo &&
+	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
 
-		# These branches are currently locked.
-		for b in second third
-		do
-			test_must_fail git branch -f $b base || return 1
-		done &&
+Switched to a new branch 'already-has-g'
+[already-has-g aaabeae] 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 b3ecfaf] 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 e6b3e17] 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 7a5ff2f] 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 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 7a5ff2f... 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 advice.mergeConflict false"
+Could not apply 7a5ff2f... H2
+conflicts
+[detached HEAD 05e3a9c] 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
 
-		# 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 3430.29 '--rebase-merges with strategies': 
+	git checkout -b with-a-strategy F &&
+	test_tick &&
+	git merge -m "Merge conflicting-G" conflicting-G &&
 
-		git rebase --continue &&
+	: first, test with a merge strategy option &&
+	git rebase -ir -Xtheirs G &&
+	echo conflicting-G >expect &&
+	test_cmp expect G.t &&
 
-		set_replace_editor fake-todo-3 &&
-		git rebase --edit-todo &&
+	: 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
 
-		# These branches are currently locked.
-		for b in second third first unseen
-		do
-			test_must_fail git branch -f $b base || return 1
-		done &&
+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 006864c 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
 
-		# 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 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
 
-		git rebase --continue
-	) &&
+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
 
-	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 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
 
-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
+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
 
-pick e31be72ab52d740527956c171d40a832b63e68ca
-pick 34033109e5a0def540b16172943d8a7e2a8a712e
-update-ref refs/heads/third
+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
 
-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.45.2/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'no-conflict-branch' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
-rebase -i script after editing:
-update-ref refs/heads/second
+Switched to a new branch 'progress'
+Changes from 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 to 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050:
+ok 32 - progress shows the correct total
 
-pick e31be72ab52d740527956c171d40a832b63e68ca
-update-ref refs/heads/third
-pick 34033109e5a0def540b16172943d8a7e2a8a712e
-break
+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 &&
 
-pick fb069ba3d9b13031500b5a75939ff4162b7cb13a
-fatal: cannot force update the branch 'second' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'third' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'first' used by worktree at '/build/reproducible-path/git-2.45.2/t/trash directory.t3404-rebase-interactive'
-fatal: cannot force update the branch 'unseen' used by worktree at '/build/reproducible-path/git-2.45.2/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
+	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 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 &&
+Updating 87a9d58..189d902
+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
 
-	test_commit test-refs-not-removed &&
-	git commit --amend --fixup first &&
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3436-rebase-more-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3436-rebase-more-options/.git/
+expecting success of 3436.1 'setup': 
+	git checkout -b topic &&
+	test_write_lines "line 1" "	line 2" "line 3" >file &&
+	git add file &&
+	git commit -m "add file" &&
 
-	git rev-parse first second third tip no-conflict-branch >expect-oids &&
+	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 &&
 
-	(
-		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
-	) &&
+	git checkout --orphan main &&
+	rm foo &&
+	test_write_lines "line 1" "        line 2" "line 3" >file &&
+	git commit -am "add file" &&
+	git tag main &&
 
-	# 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
+	mkdir test-bin &&
+	write_script test-bin/git-merge-test <<-\EOF
+	exec git merge-recursive "$@"
+	EOF
 
-Switched to a new branch 'test-refs-not-removed'
-[test-refs-not-removed adbf713ec8f3] test-refs-not-removed
+Switched to a new branch 'topic'
+[topic (root-commit) c24e627] add file
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-refs-not-removed.t
-warning: refname 'first' is ambiguous.
-[test-refs-not-removed 5ca2ca8d583e] fixup! 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(-)
+[topic 7c57c40] commit1
  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 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 &&
+ 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
 
-	test_commit test-refs-not-removed2 &&
-	git commit --amend --fixup first &&
+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
 
-	git rev-parse first second third >expect-oids &&
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+3ada4af add file
+virtual update file
+found 1 common ancestor:
+virtual cea075e2ce716201e60e4bbadc9a40706c56c362
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 update file
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+First, rewinding head to replay your work on top of it...
+Applying: update file
+ok 2 - --ignore-whitespace works with apply backend
 
-	(
-		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 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
 
-	# Add a break to the end of the todo so we can edit later
-	echo "break" >>todo &&
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/1)
Auto-merging file
+CONFLICT (content): Merge conflict in file
+error: could not apply 139b464... update file
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 139b464... update file
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 3 - --ignore-whitespace works with merge backend
 
+expecting success of 3436.4 '--ignore-whitespace is remembered when continuing': 
 	(
-		set_replace_editor todo &&
-		git rebase -i --autosquash --update-refs base &&
-		echo "update-ref refs/heads/tip" >todo &&
-		git rebase --edit-todo &&
+		set_fake_editor &&
+		FAKE_LINES="break 1" git rebase -i --ignore-whitespace \
+			main side &&
 		git rebase --continue
 	) &&
+	git diff --exit-code side
 
-	# 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
+warning: refname 'main' is ambiguous.
+warning: refname 'main' is ambiguous.
+warning: skipped previously applied commit c24e627
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+rebase -i script before editing:
+pick 139b464 update file
 
-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 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 &&
+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
 
-	test_commit test-refs-not-removed3 &&
-	git commit --amend --fixup first &&
+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
 
-	git rev-parse first second third tip no-conflict-branch >expect-oids &&
+[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
 
-	(
-		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 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
 
-	# 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 &&
+[detached HEAD 6184e8b] update file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is up to date, rebase forced.
+Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 6 - --committer-date-is-author-date works with merge backend
 
+expecting success of 3436.7 '--committer-date-is-author-date works when rewording': 
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
 	(
-		set_replace_editor todo.new &&
-		git rebase -i --autosquash --update-refs base &&
-
-		# Make no changes when editing so update-refs is still empty
-		cat todo >todo.new &&
-		git rebase --edit-todo &&
-		git rebase --continue
+		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
 
-	# 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
-
-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
+[detached HEAD 6184e8b] update file
  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)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+rebase -i script before editing:
+pick 6184e8b update file
+
 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
+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 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 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
 
-	cat >fake-todo <<-EOF &&
-	pick $(git rev-parse HEAD~3)
-	break
-	update-ref refs/heads/first
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	pick $(git rev-parse HEAD~2)
-	update-ref refs/heads/second
+  5c38296 edited
 
-	pick $(git rev-parse HEAD~1)
-	update-ref refs/heads/third
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	pick $(git rev-parse HEAD)
-	update-ref refs/heads/no-conflict-branch
-	EOF
+ git branch <new-branch-name> 5c38296
 
-	(
-		set_replace_editor fake-todo &&
-		git rebase -i --update-refs base
-	) &&
+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
 
-	# 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 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
 
-	test_must_fail git rebase --continue 2>err &&
-	grep "update_ref failed for ref 'refs/heads/second'" err &&
+Warning: you are leaving 6 commits behind, not connected to
+any of your branches:
 
-	cat >expect <<-\EOF &&
-	Updated the following refs with --update-refs:
-		refs/heads/first
-		refs/heads/no-conflict-branch
-		refs/heads/third
-	Failed to update the following refs with --update-refs:
-		refs/heads/second
-	EOF
+  aa07736 Merge tag 'commit3' into HEAD
+  54193eb commit3
+  a2d9c2e commit2
+  8251e18 commit1
+ ... and 2 more.
 
-	# Clear "Rebasing (X/Y)" progress lines and drop leading tabs.
-	tail -n 6 err >err.last &&
-	sed -e "s/Rebasing.*Successfully/Successfully/g" -e "s/^\t//g" \
-		<err.last >err.trimmed &&
-	test_cmp expect err.trimmed
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-Switched to a new branch 'update-refs-error'
-rebase -i script after editing:
-pick c49b6574f4e9659c4aef3cc10be848348dc1a0ee
-break
-update-ref refs/heads/first
+ git branch <new-branch-name> aa07736
 
-pick e31be72ab52d740527956c171d40a832b63e68ca
-update-ref refs/heads/second
+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
 
-pick 34033109e5a0def540b16172943d8a7e2a8a712e
-update-ref refs/heads/third
+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
 
-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
+Warning: you are leaving 6 commits behind, not connected to
+any of your branches:
 
-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
+  aa07736 Merge tag 'commit3' into HEAD
+  54193eb commit3
+  a2d9c2e commit2
+  8251e18 commit1
+ ... and 2 more.
 
-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
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 3404.130 '$EDITOR and friends are unchanged': 
-	test_editor_unchanged
+ git branch <new-branch-name> aa07736
 
-ok 130 - $EDITOR and friends are unchanged
+HEAD is now at bd08fd4 commit2
+[detached HEAD 832d950] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in 832d950 (commit2).  Version 832d950 (commit2) of foo left in tree.
+error: could not apply 832d950... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 832d950... commit2
+[detached HEAD 3bf7cf9] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+
                                                                                
Successfully rebased and updated detached HEAD.
+ok 10 - --committer-date-is-author-date works when committing conflict resolution
 
-# passed all 130 test(s)
-1..130
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3500-cherry.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3500-cherry/.git/
-expecting success of 3500.1 'prepare repository with topic branch, and check cherry finds the 2 patches from there': 
-	echo First > A &&
-	git update-index --add A &&
-	test_tick &&
-	git commit -m "Add A." &&
+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
 
-	git checkout -b my-topic-branch &&
+[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
 
-	echo Second > B &&
-	git update-index --add B &&
-	test_tick &&
-	git commit -m "Add B." &&
+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
 
-	echo AnotherSecond > C &&
-	git update-index --add C &&
-	test_tick &&
-	git commit -m "Add C." &&
+[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
 
-	git checkout -f main &&
-	rm -f B C &&
+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
 
-	echo Third >> A &&
-	git update-index A &&
-	test_tick &&
-	git commit -m "Modify A." &&
+Rebasing (1/1)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
+error: could not apply bd08fd4... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply bd08fd4... commit2
+[detached HEAD 429a638] 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
 
-	expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*"
+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 (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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-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) )" : "+ [^ ]*"
+  429a638 commit2
 
-42
-ok 2 - check that cherry with limit returns only the top patch
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-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) )" : "+ [^ ]* - .*"
+ git branch <new-branch-name> 429a638
 
-[main 3a1a38a] Add C.
- Author: A U Thor <bogus_email_address>
- Date: Thu Apr 7 15:15:13 2005 -0700
+HEAD is now at 139b464 update file
+Merge made by the 'ort' strategy.
+ foo | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 C
-+ 75dd694131e593dac8cf8ea0a377f1b73a80c1ad - c8d60d26f42936e7a055747f5412d41a6bce7d77
-85
-ok 3 - cherry-pick one of the 2 patches, and check cherry recognized one and only one as new
-
-expecting success of 3500.4 'cherry ignores whitespace': 
-	git switch --orphan=upstream-with-space &&
-	test_commit initial file &&
-	>expect &&
-	git switch --create=feature-without-space &&
+ 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
 
-	# 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 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
 
-	# A further change.  Should not match upstream.
-	test_commit change file &&
-	git log --format="+ %H" -1 >>expect &&
+Rebasing (1/2)
CONFLICT (modify/delete): foo deleted in HEAD and modified in bd08fd4 (commit2).  Version bd08fd4 (commit2) of foo left in tree.
+error: could not apply bd08fd4... commit2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply bd08fd4... commit2
+Updated 1 path from the index
+[detached HEAD 2d9615b] 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
 
-	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 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
 
-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>
+[detached HEAD c9674c6] commit3
+ Author: A U Thor <author@example.com>
  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>
+rebase -i script before editing:
+pick c9674c6 commit3
+
+rebase -i script after editing:
+reword c9674c6 commit3
+Rebasing (1/1)
[detached HEAD aea02e1] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Nov 14 19:32:33 2024 +0000
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - cherry ignores whitespace
+
                                                                                
Successfully rebased and updated detached HEAD.
+ok 16 - reset-author-date with --committer-date-is-author-date works when rewording
 
-# passed all 4 test(s)
-1..4
+expecting success of 3436.17 '--reset-author-date --committer-date-is-author-date works when forking merge': 
+	GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \
+		PATH="./test-bin:$PATH" git rebase -i --strategy=test \
+				--reset-author-date \
+				--committer-date-is-author-date side side &&
+	test_ctime_is_atime -1 &&
+	test_atime_is_ignored -1
+ 
+Rebasing (1/1)
Merging HEAD with eda6f49c7ee63a956ad612b98a03b92c19face55
+Merging:
+139b464 update file
+eda6f49 commit3
+found 1 common ancestor:
+139b464 update file
+Merge made by the 'test' strategy.
+
                                                                                
Successfully rebased and updated detached HEAD.
+ok 17 - --reset-author-date --committer-date-is-author-date works when forking merge
+
+expecting success of 3436.18 '--ignore-date is an alias for --reset-author-date': 
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --apply --ignore-date HEAD^ &&
+	git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" &&
+	git rebase -m --ignore-date HEAD^ &&
+	test_atime_is_ignored -2
+
+[detached HEAD 09e9cd3] edited
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+First, rewinding head to replay your work on top of it...
+Applying: commit1
+Applying: commit2
+Applying: commit3
+[detached HEAD 19127bf] empty
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+HEAD is up to date, rebase forced.
+Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 18 - --ignore-date is an alias for --reset-author-date
+
+expecting success of 3436.19 '$EDITOR and friends are unchanged': 
+	test_editor_unchanged
+
+ok 19 - $EDITOR and friends are unchanged
+
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3438-rebase-broken-files.sh ***
@@ -192453,165 +192291,633 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3503-cherry-pick-root.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3503-cherry-pick-root/.git/
-expecting success of 3503.1 'setup': 
+*** t3437-rebase-fixup-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3437-rebase-fixup-options/.git/
+expecting success of 3437.1 'setup': 
+	cat >message <<-EOF &&
+	amend! B
+	$EMPTY
+	new subject
+	$EMPTY
+	new
+	body
+	EOF
 
-	echo first > file1 &&
-	git add file1 &&
-	test_tick &&
-	git commit -m "first" &&
+	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 &&
 
-	git symbolic-ref HEAD refs/heads/second &&
-	rm .git/index file1 &&
-	echo second > file2 &&
-	git add file2 &&
+	set_fake_editor &&
+	git checkout -b branch B &&
+	echo B1 >B &&
 	test_tick &&
-	git commit -m "second" &&
-
-	git symbolic-ref HEAD refs/heads/third &&
-	rm .git/index file2 &&
-	echo third > file3 &&
-	git add file3 &&
+	git commit --fixup=HEAD -a &&
+	git tag B1 &&
 	test_tick &&
-	git commit -m "third"
+	FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
+	echo B2 >B &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
+	git tag B2 &&
+	echo B3 >B &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
+	git tag B3 &&
 
+	GIT_AUTHOR_NAME="Rebase Author" &&
+	GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
+	GIT_COMMITTER_NAME="Rebase Committer" &&
+	GIT_COMMITTER_EMAIL="rebase.committer@example.com"
 
-[main (root-commit) 0c72e4f] first
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-[second (root-commit) bbcd39a] second
+ create mode 100644 initial.t
+[master e45ed32] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file2
-[third (root-commit) 4911fa6] third
+ create mode 100644 A
+[master 0b010d6] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
+ 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 3503.2 'cherry-pick a root commit': 
+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"
 
-	git checkout second^0 &&
-	git cherry-pick main &&
-	echo first >expect &&
-	test_cmp expect file1
+HEAD is now at 34b9ec4 A2
+rebase -i script before editing:
+pick 24547d2 amend! B
+pick 34b9ec4 A2
 
+rebase -i script after editing:
+pick 24547d2 amend! B
+fixup -C 34b9ec4 A2
+Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 2 - simple fixup -C works
 
-Note: switching to 'second^0'.
+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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+  9e14115 A2
 
-  git switch -c <new-branch-name>
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-Or undo this operation with:
+ git branch <new-branch-name> 9e14115
 
-  git switch -
+HEAD is now at 34b9ec4 A2
+rebase -i script before editing:
+pick 24547d2 amend! B
+pick 34b9ec4 A2
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-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 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 3503.3 'revert a root commit': 
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	git revert main &&
-	test_path_is_missing file1
+  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
 
-[detached HEAD 3eb7e0d] Revert "first"
+HEAD is now at 24547d2 amend! B
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup -C 24547d2 amend! B
+Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 4 - fixup -C removes amend! from message
+
+expecting success of 3437.5 'fixup -C with conflicts gives correct message': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A1 &&
+	git log -1 --pretty=format:%b >expected-message &&
+	test_write_lines "" "edited" >>expected-message &&
+	test_must_fail env FAKE_LINES="1 fixup_-C 2" git rebase -i conflicts &&
+	git checkout --theirs -- A &&
+	git add A &&
+	FAKE_COMMIT_AMEND=edited git rebase --continue &&
+	test_cmp_rev HEAD^ conflicts &&
+	test_cmp_rev HEAD^{tree} A1^{tree} &&
+	test_commit_message HEAD expected-message &&
+	get_author HEAD >actual-author &&
+	test_cmp expected-author actual-author
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  b96345a new subject
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> b96345a
+
+HEAD is now at 24547d2 amend! B
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup -C 24547d2 amend! B
+Rebasing (1/2)
Rebasing (2/2)
Auto-merging A
+CONFLICT (content): Merge conflict in A
+error: could not apply 24547d2... amend! B
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 24547d2... amend! B
+[detached HEAD df4c993] new subject
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-ok 3 - revert a root commit
+ 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 3503.4 'cherry-pick a root commit with an external strategy': 
+expecting success of 3437.6 'skipping fixup -C after fixup gives correct message': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A3 &&
+	test_must_fail env FAKE_LINES="1 fixup 2 fixup_-C 4" git rebase -i A &&
+	git reset --hard &&
+	FAKE_COMMIT_AMEND=edited git rebase --continue &&
+	test_commit_message HEAD -m "B"
 
-	git cherry-pick --strategy=resolve main &&
-	echo first >expect &&
-	test_cmp expect file1
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
+  df4c993 new subject
 
-Trying simple merge.
-[detached HEAD 54587e2] first
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> df4c993
+
+HEAD is now at fc6fe24 A3
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+pick fc6fe24 A3
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup 24547d2 amend! B
+fixup -C fc6fe24 A3
+Rebasing (2/3)
Rebasing (3/3)
Auto-merging A
+CONFLICT (content): Merge conflict in A
+error: could not apply fc6fe24... A3
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply fc6fe24... A3
+HEAD is now at dfd7a63 # This is a combination of 2 commits. # This is the 1st commit message:
+
                                                                                
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 6 - skipping fixup -C after fixup gives correct message
+
+expecting success of 3437.7 'sequence of fixup, fixup -C & squash --signoff works': 
+	git checkout --detach B3 &&
+	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4 squash 5 fixup_-C 6" \
+		FAKE_COMMIT_AMEND=squashed \
+		FAKE_MESSAGE_COPY=actual-squash-message \
+		git -c commit.status=false rebase -ik --signoff A &&
+	git diff-tree --exit-code --patch HEAD B3 -- &&
+	test_cmp_rev HEAD^ A &&
+	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
+		actual-squash-message
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  e650b85 B
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> e650b85
+
+HEAD is now at e0c8cb3 amend! amend! amend! B
+rebase -i script before editing:
+pick 0b010d6 B
+pick 5ea5a69 fixup! B
+pick 9954cb8 amend! B # empty
+pick ddcbd4a amend! amend! B # empty
+pick 4d0230e squash! amend! amend! B
+pick e0c8cb3 amend! amend! amend! B
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup 5ea5a69 fixup! B
+fixup -C 9954cb8 amend! B # empty
+fixup -C ddcbd4a amend! amend! B # empty
+squash 4d0230e squash! amend! amend! B
+fixup -C e0c8cb3 amend! amend! amend! B
+Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
[detached HEAD 93e1c61] B
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
+ Date: Thu Apr 7 15:15:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 4 - cherry-pick a root commit with an external strategy
+ create mode 100644 B
+
                                                                                
Successfully rebased and updated detached HEAD.
+ok 7 - sequence of fixup, fixup -C & squash --signoff works
 
-expecting success of 3503.5 'revert a root commit with an external strategy': 
+expecting success of 3437.8 'first fixup -C commented out in sequence fixup fixup -C fixup -C': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach B2~ &&
+	git log -1 --pretty=format:%b >expected-message &&
+	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4" git rebase -i A &&
+	test_cmp_rev HEAD^ A &&
+	test_commit_message HEAD expected-message
 
-	git revert --strategy=resolve main &&
-	test_path_is_missing file1
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
+  93e1c61 B
 
-Removing file1
-[detached HEAD a457399] Revert "first"
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 93e1c61
+
+HEAD is now at ddcbd4a amend! amend! B
+rebase -i script before editing:
+pick 0b010d6 B
+pick 5ea5a69 fixup! B
+pick 9954cb8 amend! B # empty
+pick ddcbd4a amend! amend! B # empty
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup 5ea5a69 fixup! B
+fixup -C 9954cb8 amend! B # empty
+fixup -C ddcbd4a amend! amend! B # empty
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)

                                                                                
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 8 - first fixup -C commented out in sequence fixup fixup -C fixup -C
+
+expecting success of 3437.9 'multiple fixup -c opens editor once': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A3 &&
+	git log -1 --pretty=format:%B >expected-message &&
+	test_write_lines "" "Modified-A3" >>expected-message &&
+	FAKE_COMMIT_AMEND="Modified-A3" \
+		FAKE_LINES="1 fixup_-C 2 fixup_-c 3 fixup_-c 4" \
+		EXPECT_HEADER_COUNT=4 \
+		git rebase -i A &&
+	test_cmp_rev HEAD^ A &&
+	get_author HEAD >actual-author &&
+	test_cmp expected-author actual-author &&
+	test_commit_message HEAD expected-message
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  8566dee B
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 8566dee
+
+HEAD is now at fc6fe24 A3
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+pick fc6fe24 A3
+
+rebase -i script after editing:
+pick 0b010d6 B
+fixup -C 24547d2 amend! B
+fixup -c 34b9ec4 A2
+fixup -c fc6fe24 A3
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 68e48e4] A3
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 file1
-ok 5 - revert a root commit with an external strategy
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 B
+
                                                                                
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 9 - multiple fixup -c opens editor once
 
-expecting success of 3503.6 'cherry-pick two root commits': 
+expecting success of 3437.10 'sequence squash, fixup & fixup -c gives combined message': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A3 &&
+	FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
+		FAKE_MESSAGE_COPY=actual-combined-message \
+		git -c commit.status=false rebase -i A &&
+	test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
+		actual-combined-message &&
+	test_cmp_rev HEAD^ A
 
-	echo first >expect.file1 &&
-	echo second >expect.file2 &&
-	echo third >expect.file3 &&
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	git checkout second^0 &&
-	git cherry-pick main third &&
+  68e48e4 A3
 
-	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^^^
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
+ git branch <new-branch-name> 68e48e4
 
-Warning: you are leaving 4 commits behind, not connected to
+HEAD is now at fc6fe24 A3
+rebase -i script before editing:
+pick 0b010d6 B
+pick 24547d2 amend! B
+pick 34b9ec4 A2
+pick fc6fe24 A3
+
+rebase -i script after editing:
+pick 0b010d6 B
+squash 24547d2 amend! B
+fixup 34b9ec4 A2
+fixup -c fc6fe24 A3
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 0a304e5] B
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 B
+
                                                                                
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 10 - sequence squash, fixup & fixup -c gives combined message
+
+expecting success of 3437.11 'fixup -C works upon --autosquash with amend!': 
+	git checkout --detach B3 &&
+	FAKE_COMMIT_AMEND=squashed \
+		FAKE_MESSAGE_COPY=actual-squash-message \
+		git -c commit.status=false rebase -ik --autosquash \
+						--signoff A &&
+	git diff-tree --exit-code --patch HEAD B3 -- &&
+	test_cmp_rev HEAD^ A &&
+	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
+		actual-squash-message
+
+Warning: you are leaving 1 commit behind, not connected to
 any of your branches:
 
-  a457399 Revert "first"
-  54587e2 first
-  3eb7e0d Revert "first"
-  3e6f574 first
+  0a304e5 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> a457399
+ git branch <new-branch-name> 0a304e5
 
-HEAD is now at bbcd39a second
-[detached HEAD 3e6f574] first
+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:13:13 2005 -0700
+ Date: Thu Apr 7 15:15:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 file1
-[detached HEAD 2069bd1] third
+ create mode 100644 B
+
                                                                                
Successfully rebased and updated detached HEAD.
+ok 11 - fixup -C works upon --autosquash with amend!
+
+expecting success of 3437.12 'fixup -[Cc]<commit> works': 
+	test_when_finished "test_might_fail git rebase --abort" &&
+	cat >todo <<-\EOF &&
+	pick A
+	fixup -CA1
+	pick B
+	fixup -cA2
+	EOF
+	(
+		set_replace_editor todo &&
+		FAKE_COMMIT_MESSAGE="edited and fixed up" \
+			git rebase -i initial initial
+	) &&
+	git log --pretty=format:%B initial.. >actual &&
+	cat >expect <<-EOF &&
+	edited and fixed up
+	$EMPTY
+	new subject
+	$EMPTY
+	new
+	body
+	EOF
+	test_cmp expect actual
+
+rebase -i script after editing:
+pick A
+fixup -CA1
+pick B
+fixup -cA2
+Rebasing (2/4)
Rebasing (3/4)
Rebasing (4/4)
[detached HEAD 755eebe] edited and fixed up
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:15:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 B
+
                                                                                
Successfully rebased and updated detached HEAD.
+fatal: no rebase in progress
+ok 12 - fixup -[Cc]<commit> works
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3500-cherry.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3500-cherry/.git/
+expecting success of 3500.1 'prepare repository with topic branch, and check cherry finds the 2 patches from there': 
+	echo First > A &&
+	git update-index --add A &&
+	test_tick &&
+	git commit -m "Add A." &&
+
+	git checkout -b my-topic-branch &&
+
+	echo Second > B &&
+	git update-index --add B &&
+	test_tick &&
+	git commit -m "Add B." &&
+
+	echo AnotherSecond > C &&
+	git update-index --add C &&
+	test_tick &&
+	git commit -m "Add C." &&
+
+	git checkout -f main &&
+	rm -f B C &&
+
+	echo Third >> A &&
+	git update-index A &&
+	test_tick &&
+	git commit -m "Modify A." &&
+
+	expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*"
+
+[main (root-commit) 4655d1a] Add A.
+ Author: A U Thor <bogus_email_address>
  1 file changed, 1 insertion(+)
- create mode 100644 file3
-bbcd39af5b7918b8e79c884f958eeddbace1fd46
-fatal: Needed a single revision
-ok 6 - cherry-pick two root commits
+ 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
 
-# passed all 6 test(s)
-1..6
+expecting success of 3500.2 'check that cherry with limit returns only the top patch': 
+	expr "$(echo $(git cherry main my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
+
+42
+ok 2 - check that cherry with limit returns only the top patch
+
+expecting success of 3500.3 'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new': 
+	git cherry-pick my-topic-branch^0 &&
+	echo $(git cherry main my-topic-branch) &&
+	expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* - .*"
+
+[main 3a1a38a] Add C.
+ Author: A U Thor <bogus_email_address>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C
++ 75dd694131e593dac8cf8ea0a377f1b73a80c1ad - c8d60d26f42936e7a055747f5412d41a6bce7d77
+85
+ok 3 - cherry-pick one of the 2 patches, and check cherry recognized one and only one as new
+
+expecting success of 3500.4 'cherry ignores whitespace': 
+	git switch --orphan=upstream-with-space &&
+	test_commit initial file &&
+	>expect &&
+	git switch --create=feature-without-space &&
+
+	# A spaceless file on the feature branch.  Expect a match upstream.
+	printf space >file &&
+	git add file &&
+	git commit -m"file without space" &&
+	git log --format="- %H" -1 >>expect &&
+
+	# A further change.  Should not match upstream.
+	test_commit change file &&
+	git log --format="+ %H" -1 >>expect &&
+
+	git switch upstream-with-space &&
+	# Same as the spaceless file, just with spaces and on upstream.
+	test_commit "file with space" file "s p a c e" file-with-space &&
+	git cherry upstream-with-space feature-without-space >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'upstream-with-space'
+[upstream-with-space (root-commit) 42825d6] initial
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'feature-without-space'
+[feature-without-space 21e64a6] file without space
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[feature-without-space efc65e3] change
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'upstream-with-space'
+[upstream-with-space 2ae2c61] file with space
+ Author: A U Thor <bogus_email_address>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - cherry ignores whitespace
+
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3502-cherry-pick-merge.sh ***
@@ -192901,6 +193207,167 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3503-cherry-pick-root.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3503-cherry-pick-root/.git/
+expecting success of 3503.1 'setup': 
+
+	echo first > file1 &&
+	git add file1 &&
+	test_tick &&
+	git commit -m "first" &&
+
+	git symbolic-ref HEAD refs/heads/second &&
+	rm .git/index file1 &&
+	echo second > file2 &&
+	git add file2 &&
+	test_tick &&
+	git commit -m "second" &&
+
+	git symbolic-ref HEAD refs/heads/third &&
+	rm .git/index file2 &&
+	echo third > file3 &&
+	git add file3 &&
+	test_tick &&
+	git commit -m "third"
+
+
+[main (root-commit) 0c72e4f] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[second (root-commit) bbcd39a] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[third (root-commit) 4911fa6] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+ok 1 - setup
+
+expecting success of 3503.2 'cherry-pick a root commit': 
+
+	git checkout second^0 &&
+	git cherry-pick main &&
+	echo first >expect &&
+	test_cmp expect file1
+
+
+Note: switching to 'second^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at bbcd39a second
+[detached HEAD 3e6f574] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 2 - cherry-pick a root commit
+
+expecting success of 3503.3 'revert a root commit': 
+
+	git revert main &&
+	test_path_is_missing file1
+
+
+[detached HEAD 3eb7e0d] Revert "first"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file1
+ok 3 - revert a root commit
+
+expecting success of 3503.4 'cherry-pick a root commit with an external strategy': 
+
+	git cherry-pick --strategy=resolve main &&
+	echo first >expect &&
+	test_cmp expect file1
+
+
+Trying simple merge.
+[detached HEAD 54587e2] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+ok 4 - cherry-pick a root commit with an external strategy
+
+expecting success of 3503.5 'revert a root commit with an external strategy': 
+
+	git revert --strategy=resolve main &&
+	test_path_is_missing file1
+
+
+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 3503.6 'cherry-pick two root commits': 
+
+	echo first >expect.file1 &&
+	echo second >expect.file2 &&
+	echo third >expect.file3 &&
+
+	git checkout second^0 &&
+	git cherry-pick main third &&
+
+	test_cmp expect.file1 file1 &&
+	test_cmp expect.file2 file2 &&
+	test_cmp expect.file3 file3 &&
+	git rev-parse --verify HEAD^^ &&
+	test_must_fail git rev-parse --verify HEAD^^^
+
+
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
+
+  a457399 Revert "first"
+  54587e2 first
+  3eb7e0d Revert "first"
+  3e6f574 first
+
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> a457399
+
+HEAD is now at bbcd39a second
+[detached HEAD 3e6f574] first
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[detached HEAD 2069bd1] third
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+bbcd39af5b7918b8e79c884f958eeddbace1fd46
+fatal: Needed a single revision
+ok 6 - cherry-pick two root commits
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3501-revert-cherry-pick.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3501-revert-cherry-pick/.git/
 expecting success of 3501.1 'setup': 
@@ -194456,1074 +194923,6 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3430-rebase-merges.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3430-rebase-merges/.git/
-expecting success of 3430.1 'setup': 
-	write_script replace-editor.sh <<-\EOF &&
-	mv "$1" "$(git rev-parse --git-path ORIGINAL-TODO)"
-	cp script-from-scratch "$1"
-	EOF
-
-	test_commit A &&
-	git checkout -b first &&
-	test_commit B &&
-	b=$(git rev-parse --short HEAD) &&
-	git checkout main &&
-	test_commit C &&
-	c=$(git rev-parse --short HEAD) &&
-	test_commit D &&
-	d=$(git rev-parse --short HEAD) &&
-	git merge --no-commit B &&
-	test_tick &&
-	git commit -m E &&
-	git tag -m E E &&
-	e=$(git rev-parse --short HEAD) &&
-	git checkout -b second C &&
-	test_commit F &&
-	f=$(git rev-parse --short HEAD) &&
-	test_commit G &&
-	g=$(git rev-parse --short HEAD) &&
-	git checkout main &&
-	git merge --no-commit G &&
-	test_tick &&
-	git commit -m H &&
-	h=$(git rev-parse --short HEAD) &&
-	git tag -m H H &&
-	git checkout A &&
-	test_commit conflicting-G G.t
-
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'first'
-[first d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'main'
-[main 5dee784] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main 12bd07b] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Automatic merge went well; stopped before committing as requested
-[main 2051b56] E
- Author: A U Thor <author@example.com>
-Switched to a new branch 'second'
-[second ca2c861] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F.t
-[second 088b00a] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Switched to branch 'main'
-Automatic merge went well; stopped before committing as requested
-[main 233d48a] H
- Author: A U Thor <author@example.com>
-Note: switching to 'A'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 0ddfaf1 A
-[detached HEAD 82776a5] conflicting-G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-ok 1 - setup
-
-expecting success of 3430.2 'create completely different structure': 
-	cat >script-from-scratch <<-\EOF &&
-	label onto
-
-	# onebranch
-	pick G
-	pick D
-	label onebranch
-
-	# second
-	reset onto
-	pick B
-	label second
-
-	reset onto
-	merge -C H second
-	merge onebranch # Merge the topic branch 'onebranch'
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i -r A main &&
-	test_cmp_graph <<-\EOF
-	*   Merge the topic branch 'onebranch'
-	|\
-	| * D
-	| * G
-	* |   H
-	|\ \
-	| |/
-	|/|
-	| * B
-	|/
-	* A
-	EOF
-
-Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
Rebasing (10/10)
[detached HEAD c2c3fe3] Merge the topic branch 'onebranch'
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:22:13 2005 -0700
-
                                                                                
Successfully rebased and updated refs/heads/main.
-ok 2 - create completely different structure
-
-expecting success of 3430.3 'generate correct todo list': 
-	cat >expect <<-EOF &&
-	label onto
-
-	reset onto
-	pick $b B
-	label E
-
-	reset onto
-	pick $c C
-	label branch-point
-	pick $f F
-	pick $g G
-	label H
-
-	reset branch-point # C
-	pick $d D
-	merge -C $e E # E
-	merge -C $h H # H
-
-	EOF
-
-	grep -v "^#" <.git/ORIGINAL-TODO >output &&
-	test_cmp expect output
-
-ok 3 - generate correct todo list
-
-expecting success of 3430.4 '`reset` refuses to overwrite untracked files': 
-	git checkout B &&
-	test_commit dont-overwrite-untracked &&
-	cat >script-from-scratch <<-EOF &&
-	exec >dont-overwrite-untracked.t
-	pick $(git rev-parse B) B
-	reset refs/tags/dont-overwrite-untracked
-	pick $(git rev-parse C) C
-	exec cat .git/rebase-merge/done >actual
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_must_fail git rebase -ir A &&
-	test_cmp_rev HEAD B &&
-	head -n3 script-from-scratch >expect &&
-	test_cmp expect .git/rebase-merge/done &&
-	rm dont-overwrite-untracked.t &&
-	git rebase --continue &&
-	tail -n3 script-from-scratch >>expect &&
-	test_cmp expect actual
-
-Note: switching to 'B'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at d9df450 B
-[detached HEAD 8acd0a8] dont-overwrite-untracked
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dont-overwrite-untracked.t
-Rebasing (1/5)

                                                                                
Executing: >dont-overwrite-untracked.t
-Rebasing (2/5)
Rebasing (3/5)
error: The following untracked working tree files would be overwritten by reset:
-	dont-overwrite-untracked.t
-Please move or remove them before you reset.
-Aborting
-hint: Could not execute the todo command
-hint:
-hint:     reset refs/tags/dont-overwrite-untracked
-hint:
-hint: It has been rescheduled; To edit the command before continuing, please
-hint: edit the todo list first:
-hint:
-hint:     git rebase --edit-todo
-hint:     git rebase --continue
-Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)

                                                                                
Executing: cat .git/rebase-merge/done >actual
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 4 - `reset` refuses to overwrite untracked files
-
-expecting success of 3430.5 '`reset` rejects trees': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset A^{tree} >" \
-		git rebase -i B C >out 2>err &&
-	grep "object .* is a tree" err &&
-	test_must_be_empty out
-
-Rebasing (1/1)
error: object da5497437fd67ca928333aab79c4b4b55036ea66 is a tree, not a commit
-ok 5 - `reset` rejects trees
-
-expecting success of 3430.6 '`reset` only looks for labels under refs/rewritten/': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git branch refs/rewritten/my-label A &&
-	test_must_fail env GIT_SEQUENCE_EDITOR="echo reset my-label >" \
-		git rebase -i B C >out 2>err &&
-	grep "could not resolve ${SQ}my-label${SQ}" err &&
-	test_must_be_empty out
-
-Rebasing (1/1)
error: could not resolve 'my-label'
-ok 6 - `reset` only looks for labels under refs/rewritten/
-
-expecting success of 3430.7 'failed `merge -C` writes patch (may be rescheduled, too)': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b conflicting-merge A &&
-
-	: fail because of conflicting untracked file &&
-	>G.t &&
-	echo "merge -C H G" >script-from-scratch &&
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	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 &&
-
-	: 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
-
-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 3430.8 'failed `merge <branch>` does not crash': 
-	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout conflicting-G &&
-
-	echo "merge G" >script-from-scratch &&
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	test_must_fail git rebase -ir HEAD &&
-	! grep "^merge G$" .git/rebase-merge/git-rebase-todo &&
-	grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message
-
-Note: switching to 'conflicting-G'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 82776a5 conflicting-G
-Rebasing (1/1)
Auto-merging G.t
-CONFLICT (add/add): Merge conflict in G.t
-Could not merge G
-Merge branch 'G'
-ok 8 - failed `merge <branch>` does not crash
-
-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>
- Date: Thu Apr 7 15:17:13 2005 -0700
-Rebasing (2/3)

                                                                                
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-Rebasing (3/3)
[detached HEAD 790085d] H
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
-Rebasing (4/4)

                                                                                
Executing: git log -1 --pretty=format:'%an <%ae> %at%n%B%n' >>reword-actual
-
                                                                                
Successfully rebased and updated refs/heads/merge-c.
-ok 9 - merge -c commits before rewording and reloads todo-list
-
-expecting success of 3430.10 'merge -c rewords when a strategy is given': 
-	git checkout -b merge-c-with-strategy H &&
-	write_script git-merge-override <<-\EOF &&
-	echo overridden$1 >G.t
-	git add G.t
-	EOF
-
-	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 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 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 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
-
-Switched to a new branch 'no-rebase-merges'
-Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/no-rebase-merges.
-ok 12 - --no-rebase-merges countermands --rebase-merges
-
-expecting success of 3430.13 'do not rebase cousins unless asked for': 
-	git checkout -b cousins main &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_tick &&
-	git rebase -r HEAD^ &&
-	test_cmp_rev HEAD $before &&
-	test_tick &&
-	git rebase --rebase-merges=rebase-cousins HEAD^ &&
-	test_cmp_graph HEAD^.. <<-\EOF
-	*   Merge the topic branch 'onebranch'
-	|\
-	| * D
-	| * G
-	|/
-	o H
-	EOF
-
-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 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
-
-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 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
-
-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 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
-
-Switched to a new branch 'override-config-rebase-cousins'
-Rebasing (1/7)
Rebasing (2/7)
Rebasing (3/7)
Rebasing (4/7)
Rebasing (5/7)
Rebasing (6/7)
Rebasing (7/7)

                                                                                
Successfully rebased and updated refs/heads/override-config-rebase-cousins.
-ok 16 - --rebase-merges overrides rebase.rebaseMerges=rebase-cousins
-
-expecting success of 3430.17 'refs/rewritten/* is worktree-local': 
-	git worktree add wt &&
-	cat >wt/script-from-scratch <<-\EOF &&
-	label xyz
-	exec GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || :
-	exec git rev-parse --verify refs/rewritten/xyz >b
-	EOF
-
-	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)"
-
-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 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
-
-Switched to a new branch 'abort-cleans-refs-rewritten'
-Rebasing (1/8)
Rebasing (2/8)
Rebasing (3/8)
Rebasing (4/8)
Rebasing (5/8)
Rebasing (6/8)
Rebasing (7/8)
Rebasing (8/8)

                                                                                
Stopped at 233d48a (H)
-2051b561a3f30f5455d33a5269d3851790a86f42
-fatal: Needed a single revision
-ok 18 - --abort cleans up refs/rewritten
-
-expecting success of 3430.19 '--quit cleans up refs/rewritten': 
-	git checkout -b quit-cleans-refs-rewritten H &&
-	GIT_SEQUENCE_EDITOR="echo break >>" git rebase -ir @^ &&
-	git rev-parse --verify refs/rewritten/onto &&
-	git rebase --quit &&
-	test_must_fail git rev-parse --verify refs/rewritten/onto
-
-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 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 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 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
-
-Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/post-rewrite.
-ok 21 - refuse to merge ancestors of HEAD
-
-expecting success of 3430.22 'root commits': 
-	git checkout --orphan unrelated &&
-	(GIT_AUTHOR_NAME="Parsnip" GIT_AUTHOR_EMAIL="root@example.com" \
-	 test_commit 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
-
-	: 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
-
-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 f19511e] 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 a2629fa] Merge the 3rd root
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:40: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 3430.23 'a "merge" into a root commit is a fast-forward': 
-	head=$(git rev-parse HEAD) &&
-	cat >script-from-scratch <<-EOF &&
-	reset [new root]
-	merge $head
-	EOF
-	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
-	test_tick &&
-	git rebase -i -r HEAD^ &&
-	test_cmp_rev HEAD $head
-
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/unrelated.
-ok 23 - a "merge" into a root commit is a fast-forward
-
-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
-
-Switched to a new branch 'khnum'
-[khnum (root-commit) e607b56] 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 373c75d] 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 3430.25 'labels that are object IDs are rewritten': 
-	git checkout -b third 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
-
-Switched to a new branch 'third'
-[third 7c47b26] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I.t
-Switched to a new branch 'labels'
-Automatic merge went well; stopped before committing as requested
-[labels 417d0e6] Merge commit '7c47b267dedd9167bf6f82b866cdb3c0c616cf63' into labels
- Author: A U Thor <author@example.com>
-
                                                                                
Successfully rebased and updated refs/heads/labels.
-label 7c47b267dedd9167bf6f82b866cdb3c0c616cf63-2
-ok 25 - labels that are object IDs are rewritten
-
-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) &&
-
-	: fast forward if possible &&
-	before="$(git rev-parse --verify HEAD)" &&
-	test_tick &&
-	git rebase -i -r HEAD^^ &&
-	test_cmp_rev HEAD $before &&
-
-	test_tick &&
-	git rebase -i --force-rebase -r HEAD^^ &&
-	test "Hank" = "$(git show -s --format=%an HEAD)" &&
-	test "$before" != $(git rev-parse HEAD) &&
-	test_cmp_graph HEAD^^.. <<-\EOF
-	*-.   Tüntenfüsch
-	|\ \
-	| | * three
-	| * | two
-	| |/
-	* / one
-	|/
-	o before-octopus
-	EOF
-
-Switched to a new branch 'three'
-[three 1ad7714] before-octopus
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 before-octopus.t
-[three 71d08b6] 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 71be617] 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 feed705] 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 c2f662c506dd68b3c6d1768bf722453638ad16a9
-Trying simple merge with b41d3cf4ea54b48a1166ddf99a8bbca32f1faa00
-Merge made by the 'octopus' strategy.
-
                                                                                
Successfully rebased and updated refs/heads/one.
-ok 26 - octopus merges
-
-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
-
-Switched to a new branch 'with-exec'
-[with-exec 6889979] fixup! B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/22)
Rebasing (2/22)
Rebasing (3/22)
Rebasing (4/22)
Rebasing (5/22)

                                                                                
Executing: ./show.sh
-Rebasing (6/22)
Rebasing (7/22)
Rebasing (8/22)
Rebasing (9/22)

                                                                                
Executing: ./show.sh
-Rebasing (10/22)
Rebasing (11/22)
Rebasing (12/22)

                                                                                
Executing: ./show.sh
-Rebasing (13/22)
Rebasing (14/22)

                                                                                
Executing: ./show.sh
-Rebasing (15/22)
Rebasing (16/22)
Rebasing (17/22)
Rebasing (18/22)

                                                                                
Executing: ./show.sh
-Rebasing (19/22)
Rebasing (20/22)

                                                                                
Executing: ./show.sh
-Rebasing (21/22)
Rebasing (22/22)

                                                                                
Executing: ./show.sh
-
                                                                                
Successfully rebased and updated refs/heads/with-exec.
-B: +Booh
-E: +Booh
-G: +G
-ok 27 - with --autosquash and --exec
-
-expecting success of 3430.28 '--continue after resolving conflicts after a merge': 
-	git checkout -b already-has-g E &&
-	git cherry-pick E..G &&
-	test_commit H2 &&
-
-	git checkout -b conflicts-in-merge H &&
-	test_commit H2 H2.t conflicts H2-conflict &&
-	test_must_fail git rebase -r already-has-g &&
-	grep conflicts H2.t &&
-	echo resolved >H2.t &&
-	git add -u &&
-	git rebase --continue &&
-	test_must_fail git rev-parse --verify HEAD^2 &&
-	test_path_is_missing .git/MERGE_HEAD
-
-Switched to a new branch 'already-has-g'
-[already-has-g aaabeae] 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 b3ecfaf] 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 e6b3e17] 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 7a5ff2f] 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 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 7a5ff2f... 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 advice.mergeConflict false"
-Could not apply 7a5ff2f... H2
-conflicts
-[detached HEAD 05e3a9c] 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 3430.29 '--rebase-merges with strategies': 
-	git checkout -b with-a-strategy F &&
-	test_tick &&
-	git merge -m "Merge conflicting-G" conflicting-G &&
-
-	: first, test with a merge strategy option &&
-	git rebase -ir -Xtheirs G &&
-	echo conflicting-G >expect &&
-	test_cmp expect G.t &&
-
-	: now, try with a merge strategy other than recursive &&
-	git reset --hard @{1} &&
-	write_script git-merge-override <<-\EOF &&
-	echo overridden$1 >>G.t
-	git add G.t
-	EOF
-	PATH="$PWD:$PATH" git rebase -ir -s override -Xxopt G &&
-	test_write_lines G overridden--xopt >expect &&
-	test_cmp expect G.t
-
-Switched to a new branch 'with-a-strategy'
-Merge made by the 'ort' strategy.
- G.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-Rebasing (1/6)
Rebasing (2/6)
Rebasing (3/6)
Rebasing (4/6)
Rebasing (5/6)
Rebasing (6/6)
Auto-merging G.t
-Merge made by the 'ort' strategy.
-
                                                                                
Successfully rebased and updated refs/heads/with-a-strategy.
-HEAD is now at 006864c 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 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
-
-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 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
-
-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 3430.32 'progress shows the correct total': 
-	git checkout -b progress H &&
-	git rebase --rebase-merges --force-rebase --verbose A 2> err &&
-	# Expecting "Rebasing (N/14)" here, no bogus total number
-	grep "^Rebasing.*/14.$" err >progress &&
-	test_line_count = 14 progress
-
-Switched to a new branch 'progress'
-Changes from 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 to 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050:
-ok 32 - progress shows the correct total
-
-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 &&
-
-	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
-
-Updating 87a9d58..189d902
-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
-
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3508-cherry-pick-many-commits.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3508-cherry-pick-many-commits/.git/
 expecting success of 3508.1 'setup': 
@@ -197062,645 +196461,1758 @@
 hint: Disable this message with "git config advice.mergeConflict false"
 [detached HEAD d9f497e] picked
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 22de78d] redundant-pick
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 22de78d] redundant-pick
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+error: no cherry-pick or revert in progress
+fatal: cherry-pick failed
+ok 43 - cherry-pick --continue remembers --keep-redundant-commits
+
+expecting success of 3507.44 'cherry-pick --continue remembers --allow-empty and --allow-empty-message': 
+	test_when_finished "git cherry-pick --abort || :" &&
+	pristine_detach initial &&
+	test_must_fail git cherry-pick --allow-empty --allow-empty-message \
+				       picked empty &&
+	echo c >foo &&
+	git add foo &&
+	git cherry-pick --continue
+
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  22de78d redundant-pick
+  d9f497e picked
+
+HEAD is now at df2a63d initial
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 7e6d412... picked
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+[detached HEAD d9f497e] picked
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD d7f7844] 
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+error: no cherry-pick or revert in progress
+fatal: cherry-pick failed
+ok 44 - cherry-pick --continue remembers --allow-empty and --allow-empty-message
+
+# passed all 44 test(s)
+1..44
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3511-cherry-pick-x.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3511-cherry-pick-x/.git/
+expecting success of 3511.1 'setup': 
+	git config advice.detachedhead false &&
+	echo unrelated >unrelated &&
+	git add unrelated &&
+	test_commit initial foo a &&
+	test_commit "$mesg_one_line" foo b mesg-one-line &&
+	git reset --hard initial &&
+	test_commit "$mesg_no_footer" foo b mesg-no-footer &&
+	git reset --hard initial &&
+	test_commit "$mesg_broken_footer" foo b mesg-broken-footer &&
+	git reset --hard initial &&
+	test_commit "$mesg_with_footer" foo b mesg-with-footer &&
+	git reset --hard initial &&
+	test_commit "$mesg_with_footer_sob" foo b mesg-with-footer-sob &&
+	git reset --hard initial &&
+	test_commit "$mesg_with_cherry_footer" foo b mesg-with-cherry-footer &&
+	git reset --hard initial &&
+	test_config commit.cleanup verbatim &&
+	test_commit "$mesg_unclean" foo b mesg-unclean &&
+	test_unconfig commit.cleanup &&
+	pristine_detach initial &&
+	test_commit conflicting unrelated
+
+[master (root-commit) df2a63d] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 foo
+ create mode 100644 unrelated
+[master d18d4f3] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master e073909] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master 0353e8f] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master 3838485] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master d60edf0] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master d7a875c] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[master 860e94a] base: commit message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at df2a63d initial
+[detached HEAD 823a98f] conflicting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 3511.2 'cherry-pick -x inserts blank line after one line subject': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-one-line^0) &&
+	git cherry-pick -x mesg-one-line &&
+	cat <<-EOF >expect &&
+		$mesg_one_line
+
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Previous HEAD position was 823a98f conflicting
+HEAD is now at df2a63d initial
+[detached HEAD 6970a53] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - cherry-pick -x inserts blank line after one line subject
+
+expecting success of 3511.3 'cherry-pick -s inserts blank line after one line subject': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-one-line &&
+	cat <<-EOF >expect &&
+		$mesg_one_line
+
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  6970a53 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD 0fda2e1] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - cherry-pick -s inserts blank line after one line subject
+
+expecting success of 3511.4 'cherry-pick -s inserts blank line after non-conforming footer': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-broken-footer &&
+	cat <<-EOF >expect &&
+		$mesg_broken_footer
+
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  0fda2e1 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD 0cf5261] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - cherry-pick -s inserts blank line after non-conforming footer
+
+expecting success of 3511.5 'cherry-pick -s recognizes trailer config': 
+	pristine_detach initial &&
+	git -c "trailer.Myfooter.ifexists=add" cherry-pick -s mesg-broken-footer &&
+	cat <<-EOF >expect &&
+		$mesg_broken_footer
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  0cf5261 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD b95a0f7] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - cherry-pick -s recognizes trailer config
+
+expecting success of 3511.6 'cherry-pick -x inserts blank line when conforming footer not found': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-no-footer^0) &&
+	git cherry-pick -x mesg-no-footer &&
+	cat <<-EOF >expect &&
+		$mesg_no_footer
+
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  b95a0f7 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD 6f42e54] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - cherry-pick -x inserts blank line when conforming footer not found
+
+expecting success of 3511.7 'cherry-pick -s inserts blank line when conforming footer not found': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-no-footer &&
+	cat <<-EOF >expect &&
+		$mesg_no_footer
+
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  6f42e54 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD 32d2dda] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - cherry-pick -s inserts blank line when conforming footer not found
+
+expecting success of 3511.8 'cherry-pick -x -s inserts blank line when conforming footer not found': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-no-footer^0) &&
+	git cherry-pick -x -s mesg-no-footer &&
+	cat <<-EOF >expect &&
+		$mesg_no_footer
+
+		(cherry picked from commit $sha1)
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  32d2dda base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD adaaef8] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 8 - cherry-pick -x -s inserts blank line when conforming footer not found
+
+expecting success of 3511.9 'cherry-pick -s adds sob when last sob doesnt match committer': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-with-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_footer
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  adaaef8 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD b62bd75] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - cherry-pick -s adds sob when last sob doesnt match committer
+
+expecting success of 3511.10 'cherry-pick -x -s adds sob when last sob doesnt match committer': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-with-footer^0) &&
+	git cherry-pick -x -s mesg-with-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_footer
+		(cherry picked from commit $sha1)
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  b62bd75 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD 94e740a] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:17:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 10 - cherry-pick -x -s adds sob when last sob doesnt match committer
+
+expecting success of 3511.11 'cherry-pick -s refrains from adding duplicate trailing sob': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-with-footer-sob &&
+	cat <<-EOF >expect &&
+		$mesg_with_footer_sob
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  94e740a base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD a836c16] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 11 - cherry-pick -s refrains from adding duplicate trailing sob
+
+expecting success of 3511.12 'cherry-pick -x -s adds sob even when trailing sob exists for committer': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-with-footer-sob^0) &&
+	git cherry-pick -x -s mesg-with-footer-sob &&
+	cat <<-EOF >expect &&
+		$mesg_with_footer_sob
+		(cherry picked from commit $sha1)
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  a836c16 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD 2d6e386] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 12 - cherry-pick -x -s adds sob even when trailing sob exists for committer
+
+expecting success of 3511.13 'cherry-pick -x handles commits with no NL at end of message': 
+	pristine_detach initial &&
+	printf "title\n\nSigned-off-by: A <a@example.com>" >msg &&
+	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
+	git cherry-pick -x $sha1 &&
+	git log -1 --pretty=format:%B >actual &&
+
+	printf "\n(cherry picked from commit %s)\n" $sha1 >>msg &&
+	test_cmp msg actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  2d6e386 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD 96716be] title
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - cherry-pick -x handles commits with no NL at end of message
+
+expecting success of 3511.14 'cherry-pick -x handles commits with no footer and no NL at end of message': 
+	pristine_detach initial &&
+	printf "title\n\nnot a footer" >msg &&
+	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
+	git cherry-pick -x $sha1 &&
+	git log -1 --pretty=format:%B >actual &&
+
+	printf "\n\n(cherry picked from commit %s)\n" $sha1 >>msg &&
+	test_cmp msg actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  96716be title
+
+HEAD is now at df2a63d initial
+[detached HEAD 8c5d63f] title
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 14 - cherry-pick -x handles commits with no footer and no NL at end of message
+
+expecting success of 3511.15 'cherry-pick -s handles commits with no NL at end of message': 
+	pristine_detach initial &&
+	printf "title\n\nSigned-off-by: A <a@example.com>" >msg &&
+	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
+	git cherry-pick -s $sha1 &&
+	git log -1 --pretty=format:%B >actual &&
+
+	printf "\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
+	test_cmp msg actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  8c5d63f title
+
+HEAD is now at df2a63d initial
+[detached HEAD 6671fda] title
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - cherry-pick -s handles commits with no NL at end of message
+
+expecting success of 3511.16 'cherry-pick -s handles commits with no footer and no NL at end of message': 
+	pristine_detach initial &&
+	printf "title\n\nnot a footer" >msg &&
+	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
+	git cherry-pick -s $sha1 &&
+	git log -1 --pretty=format:%B >actual &&
+
+	printf "\n\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
+	test_cmp msg actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  6671fda title
+
+HEAD is now at df2a63d initial
+[detached HEAD 19f481d] title
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:21:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 16 - cherry-pick -s handles commits with no footer and no NL at end of message
+
+expecting success of 3511.17 'cherry-pick -x treats "(cherry picked from..." line as part of footer': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
+	git cherry-pick -x mesg-with-cherry-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_cherry_footer
+		(cherry picked from commit $sha1)
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  19f481d title
+
+HEAD is now at df2a63d initial
+[detached HEAD 7b5eb6d] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 17 - cherry-pick -x treats "(cherry picked from..." line as part of footer
+
+expecting success of 3511.18 'cherry-pick -s treats "(cherry picked from..." line as part of footer': 
+	pristine_detach initial &&
+	git cherry-pick -s mesg-with-cherry-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_cherry_footer
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7b5eb6d base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD b468a7b] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 18 - cherry-pick -s treats "(cherry picked from..." line as part of footer
+
+expecting success of 3511.19 'cherry-pick -x -s treats "(cherry picked from..." line as part of footer': 
+	pristine_detach initial &&
+	sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
+	git cherry-pick -x -s mesg-with-cherry-footer &&
+	cat <<-EOF >expect &&
+		$mesg_with_cherry_footer
+		(cherry picked from commit $sha1)
+		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	EOF
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  b468a7b base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD c7c741c] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:19:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - cherry-pick -x -s treats "(cherry picked from..." line as part of footer
+
+expecting success of 3511.20 'cherry-pick preserves commit message': 
+	pristine_detach initial &&
+	printf "$mesg_unclean" >expect &&
+	git log -1 --pretty=format:%B mesg-unclean >actual &&
+	test_cmp expect actual &&
+	git cherry-pick mesg-unclean &&
+	git log -1 --pretty=format:%B >actual &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  c7c741c base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD 7a2ed43] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 20 - cherry-pick preserves commit message
+
+expecting success of 3511.21 'cherry-pick -x cleans commit message': 
+	pristine_detach initial &&
+	git cherry-pick -x mesg-unclean &&
+	git log -1 --pretty=format:%B >actual &&
+	printf "%s\n(cherry picked from commit %s)\n" \
+		"$mesg_unclean" $(git rev-parse mesg-unclean) |
+			git stripspace >expect &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7a2ed43 base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD ad2d5bc] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 21 - cherry-pick -x cleans commit message
+
+expecting success of 3511.22 'cherry-pick -x respects commit.cleanup': 
+	pristine_detach initial &&
+	git -c commit.cleanup=strip cherry-pick -x mesg-unclean &&
+	git log -1 --pretty=format:%B >actual &&
+	printf "%s\n(cherry picked from commit %s)\n" \
+		"$mesg_unclean" $(git rev-parse mesg-unclean) |
+			git stripspace -s >expect &&
+	test_cmp expect actual
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  ad2d5bc base: commit message
+
+HEAD is now at df2a63d initial
+[detached HEAD fd8c8fa] base: commit message
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:20:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 22 - cherry-pick -x respects commit.cleanup
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3426-rebase-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/.git/
+expecting success of 3426.1 'git_rebase: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to a new branch 'ours'
+[ours dddfb5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 2a5884b] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_rebase: added submodule creates empty directory
+
+expecting success of 3426.2 'git_rebase: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to a new branch 'ours'
+[ours dddfb5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 2a5884b] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_rebase: added submodule leaves existing empty directory alone
+
+expecting success of 3426.3 'git_rebase: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Switched to a new branch 'ours'
+[ours db2b5c3] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours d7a6c40] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_rebase: replace tracked file with submodule creates empty directory
+
+expecting success of 3426.4 'git_rebase: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Switched to a new branch 'ours'
+[ours c876b15] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 86f2b1a] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - git_rebase: replace directory with submodule
+
+expecting success of 3426.5 'git_rebase: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+warning: unable to rmdir 'sub1': Directory not empty
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+ok 5 - git_rebase: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 3426.6 'git_rebase: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+warning: unable to rmdir 'sub1': Directory not empty
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+ok 6 - git_rebase: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 3426.7 'git_rebase: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+error: could not detach HEAD
+ok 7 - git_rebase: replace submodule with a directory must fail
+
+expecting success of 3426.8 'git_rebase: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+error: could not detach HEAD
+ok 8 - git_rebase: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 3426.9 'git_rebase: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+test_must_fail: command succeeded: git rebase replace_sub1_with_file
+not ok 9 - git_rebase: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 3426.10 'git_rebase: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+test_must_fail: command succeeded: git rebase replace_sub1_with_file
+not ok 10 - git_rebase: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 3426.11 'git_rebase: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - git_rebase: modified submodule does not update submodule work tree
+
+expecting success of 3426.12 'git_rebase: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - git_rebase: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 3426.13 'git_rebase: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Switched to a new branch 'ours'
+[ours 8fb6209] add_x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[ours 1145b44] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
-error: no cherry-pick or revert in progress
-fatal: cherry-pick failed
-ok 43 - cherry-pick --continue remembers --keep-redundant-commits
-
-expecting success of 3507.44 'cherry-pick --continue remembers --allow-empty and --allow-empty-message': 
-	test_when_finished "git cherry-pick --abort || :" &&
-	pristine_detach initial &&
-	test_must_fail git cherry-pick --allow-empty --allow-empty-message \
-				       picked empty &&
-	echo c >foo &&
-	git add foo &&
-	git cherry-pick --continue
-
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  22de78d redundant-pick
-  d9f497e picked
+ 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - git_rebase: modified submodule does not update submodule work tree from invalid commit
 
-HEAD is now at df2a63d initial
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 7e6d412... picked
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-[detached HEAD d9f497e] picked
+expecting success of 3426.14 'git_rebase: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to a new branch 'ours'
+[ours dddfb5c] add_x
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD d7f7844] 
+ 1 file changed, 1 insertion(+)
+[ours 2a5884b] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
-error: no cherry-pick or revert in progress
-fatal: cherry-pick failed
-ok 44 - cherry-pick --continue remembers --allow-empty and --allow-empty-message
-
-# passed all 44 test(s)
-1..44
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3511-cherry-pick-x.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3511-cherry-pick-x/.git/
-expecting success of 3511.1 'setup': 
-	git config advice.detachedhead false &&
-	echo unrelated >unrelated &&
-	git add unrelated &&
-	test_commit initial foo a &&
-	test_commit "$mesg_one_line" foo b mesg-one-line &&
-	git reset --hard initial &&
-	test_commit "$mesg_no_footer" foo b mesg-no-footer &&
-	git reset --hard initial &&
-	test_commit "$mesg_broken_footer" foo b mesg-broken-footer &&
-	git reset --hard initial &&
-	test_commit "$mesg_with_footer" foo b mesg-with-footer &&
-	git reset --hard initial &&
-	test_commit "$mesg_with_footer_sob" foo b mesg-with-footer-sob &&
-	git reset --hard initial &&
-	test_commit "$mesg_with_cherry_footer" foo b mesg-with-cherry-footer &&
-	git reset --hard initial &&
-	test_config commit.cleanup verbatim &&
-	test_commit "$mesg_unclean" foo b mesg-unclean &&
-	test_unconfig commit.cleanup &&
-	pristine_detach initial &&
-	test_commit conflicting unrelated
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1
+Please move or remove them before you switch branches.
+Aborting
+error: could not detach HEAD
+ok 14 - git_rebase: added submodule doesn't remove untracked unignored file with same name
 
-[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
+expecting success of 3426.15 'git_rebase_interactive: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to a new branch 'ours'
+[ours dddfb5c] add_x
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[master e073909] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 2a5884b] Revert "add_x"
  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
+ 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 15 - git_rebase_interactive: added submodule creates empty directory
+
+expecting success of 3426.16 'git_rebase_interactive: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to a new branch 'ours'
+[ours dddfb5c] add_x
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[master 3838485] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 2a5884b] Revert "add_x"
  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
+ 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 16 - git_rebase_interactive: added submodule leaves existing empty directory alone
+
+expecting success of 3426.17 'git_rebase_interactive: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Switched to a new branch 'ours'
+[ours db2b5c3] add_x
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[master d7a875c] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours d7a6c40] Revert "add_x"
  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
+ 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 17 - git_rebase_interactive: replace tracked file with submodule creates empty directory
+
+expecting success of 3426.18 'git_rebase_interactive: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Switched to a new branch 'ours'
+[ours c876b15] add_x
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at df2a63d initial
-[detached HEAD 823a98f] conflicting
+ 1 file changed, 1 insertion(+)
+[ours 86f2b1a] Revert "add_x"
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 3511.2 'cherry-pick -x inserts blank line after one line subject': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-one-line^0) &&
-	git cherry-pick -x mesg-one-line &&
-	cat <<-EOF >expect &&
-		$mesg_one_line
-
-		(cherry picked from commit $sha1)
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
+ 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 18 - git_rebase_interactive: replace directory with submodule
 
-Previous HEAD position was 823a98f conflicting
-HEAD is now at df2a63d initial
-[detached HEAD 6970a53] base: commit message
+expecting success of 3426.19 'git_rebase_interactive: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - cherry-pick -x inserts blank line after one line subject
-
-expecting success of 3511.3 'cherry-pick -s inserts blank line after one line subject': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-one-line &&
-	cat <<-EOF >expect &&
-		$mesg_one_line
-
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6970a53 base: commit message
-
-HEAD is now at df2a63d initial
-[detached HEAD 0fda2e1] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - cherry-pick -s inserts blank line after one line subject
-
-expecting success of 3511.4 'cherry-pick -s inserts blank line after non-conforming footer': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-broken-footer &&
-	cat <<-EOF >expect &&
-		$mesg_broken_footer
-
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  0fda2e1 base: commit message
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+warning: unable to rmdir 'sub1': Directory not empty
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+ok 19 - git_rebase_interactive: removed submodule leaves submodule directory and its contents in place
 
-HEAD is now at df2a63d initial
-[detached HEAD 0cf5261] base: commit message
+expecting success of 3426.20 'git_rebase_interactive: 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - cherry-pick -s inserts blank line after non-conforming footer
-
-expecting success of 3511.5 'cherry-pick -s recognizes trailer config': 
-	pristine_detach initial &&
-	git -c "trailer.Myfooter.ifexists=add" cherry-pick -s mesg-broken-footer &&
-	cat <<-EOF >expect &&
-		$mesg_broken_footer
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  0cf5261 base: commit message
-
-HEAD is now at df2a63d initial
-[detached HEAD b95a0f7] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - cherry-pick -s recognizes trailer config
-
-expecting success of 3511.6 'cherry-pick -x inserts blank line when conforming footer not found': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-no-footer^0) &&
-	git cherry-pick -x mesg-no-footer &&
-	cat <<-EOF >expect &&
-		$mesg_no_footer
-
-		(cherry picked from commit $sha1)
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b95a0f7 base: commit message
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+warning: unable to rmdir 'sub1': Directory not empty
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
+ok 20 - git_rebase_interactive: removed submodule leaves submodule containing a .git directory alone
 
-HEAD is now at df2a63d initial
-[detached HEAD 6f42e54] base: commit message
+expecting success of 3426.21 'git_rebase_interactive: 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - cherry-pick -x inserts blank line when conforming footer not found
-
-expecting success of 3511.7 'cherry-pick -s inserts blank line when conforming footer not found': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-no-footer &&
-	cat <<-EOF >expect &&
-		$mesg_no_footer
-
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6f42e54 base: commit message
-
-HEAD is now at df2a63d initial
-[detached HEAD 32d2dda] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - cherry-pick -s inserts blank line when conforming footer not found
-
-expecting success of 3511.8 'cherry-pick -x -s inserts blank line when conforming footer not found': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-no-footer^0) &&
-	git cherry-pick -x -s mesg-no-footer &&
-	cat <<-EOF >expect &&
-		$mesg_no_footer
-
-		(cherry picked from commit $sha1)
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  32d2dda base: commit message
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+error: could not detach HEAD
+ok 21 - git_rebase_interactive: replace submodule with a directory must fail
 
-HEAD is now at df2a63d initial
-[detached HEAD adaaef8] base: commit message
+expecting success of 3426.22 'git_rebase_interactive: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 8 - cherry-pick -x -s inserts blank line when conforming footer not found
-
-expecting success of 3511.9 'cherry-pick -s adds sob when last sob doesnt match committer': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-with-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_footer
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  adaaef8 base: commit message
-
-HEAD is now at df2a63d initial
-[detached HEAD b62bd75] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 9 - cherry-pick -s adds sob when last sob doesnt match committer
-
-expecting success of 3511.10 'cherry-pick -x -s adds sob when last sob doesnt match committer': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-with-footer^0) &&
-	git cherry-pick -x -s mesg-with-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_footer
-		(cherry picked from commit $sha1)
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b62bd75 base: commit message
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+error: could not detach HEAD
+ok 22 - git_rebase_interactive: replace submodule containing a .git directory with a directory must fail
 
-HEAD is now at df2a63d initial
-[detached HEAD 94e740a] base: commit message
+checking known breakage of 3426.23 'git_rebase_interactive: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:17:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 10 - cherry-pick -x -s adds sob when last sob doesnt match committer
-
-expecting success of 3511.11 'cherry-pick -s refrains from adding duplicate trailing sob': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-with-footer-sob &&
-	cat <<-EOF >expect &&
-		$mesg_with_footer_sob
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  94e740a base: commit message
-
-HEAD is now at df2a63d initial
-[detached HEAD a836c16] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 11 - cherry-pick -s refrains from adding duplicate trailing sob
-
-expecting success of 3511.12 'cherry-pick -x -s adds sob even when trailing sob exists for committer': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-with-footer-sob^0) &&
-	git cherry-pick -x -s mesg-with-footer-sob &&
-	cat <<-EOF >expect &&
-		$mesg_with_footer_sob
-		(cherry picked from commit $sha1)
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  a836c16 base: commit message
+ 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
 
-HEAD is now at df2a63d initial
-[detached HEAD 2d6e386] base: commit message
+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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 12 - cherry-pick -x -s adds sob even when trailing sob exists for committer
-
-expecting success of 3511.13 'cherry-pick -x handles commits with no NL at end of message': 
-	pristine_detach initial &&
-	printf "title\n\nSigned-off-by: A <a@example.com>" >msg &&
-	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
-	git cherry-pick -x $sha1 &&
-	git log -1 --pretty=format:%B >actual &&
-
-	printf "\n(cherry picked from commit %s)\n" $sha1 >>msg &&
-	test_cmp msg actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  2d6e386 base: commit message
-
-HEAD is now at df2a63d initial
-[detached HEAD 96716be] title
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - cherry-pick -x handles commits with no NL at end of message
-
-expecting success of 3511.14 'cherry-pick -x handles commits with no footer and no NL at end of message': 
-	pristine_detach initial &&
-	printf "title\n\nnot a footer" >msg &&
-	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
-	git cherry-pick -x $sha1 &&
-	git log -1 --pretty=format:%B >actual &&
-
-	printf "\n\n(cherry picked from commit %s)\n" $sha1 >>msg &&
-	test_cmp msg actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  96716be title
+ 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
 
-HEAD is now at df2a63d initial
-[detached HEAD 8c5d63f] title
+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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - cherry-pick -x handles commits with no footer and no NL at end of message
-
-expecting success of 3511.15 'cherry-pick -s handles commits with no NL at end of message': 
-	pristine_detach initial &&
-	printf "title\n\nSigned-off-by: A <a@example.com>" >msg &&
-	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
-	git cherry-pick -s $sha1 &&
-	git log -1 --pretty=format:%B >actual &&
-
-	printf "\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
-	test_cmp msg actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  8c5d63f title
-
-HEAD is now at df2a63d initial
-[detached HEAD 6671fda] title
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 15 - cherry-pick -s handles commits with no NL at end of message
-
-expecting success of 3511.16 'cherry-pick -s handles commits with no footer and no NL at end of message': 
-	pristine_detach initial &&
-	printf "title\n\nnot a footer" >msg &&
-	sha1=$(git commit-tree -p initial mesg-with-footer^{tree} <msg) &&
-	git cherry-pick -s $sha1 &&
-	git log -1 --pretty=format:%B >actual &&
-
-	printf "\n\nSigned-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>\n" >>msg &&
-	test_cmp msg actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6671fda title
+ 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 df2a63d initial
-[detached HEAD 19f481d] title
+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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Switched to a new branch 'ours'
+[ours 506db5c] add_x
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:21:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 16 - cherry-pick -s handles commits with no footer and no NL at end of message
-
-expecting success of 3511.17 'cherry-pick -x treats "(cherry picked from..." line as part of footer': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
-	git cherry-pick -x mesg-with-cherry-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_cherry_footer
-		(cherry picked from commit $sha1)
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  19f481d title
-
-HEAD is now at df2a63d initial
-[detached HEAD 7b5eb6d] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 9ad3499] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 17 - cherry-pick -x treats "(cherry picked from..." line as part of footer
-
-expecting success of 3511.18 'cherry-pick -s treats "(cherry picked from..." line as part of footer': 
-	pristine_detach initial &&
-	git cherry-pick -s mesg-with-cherry-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_cherry_footer
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  7b5eb6d base: commit message
+ 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
 
-HEAD is now at df2a63d initial
-[detached HEAD b468a7b] base: commit message
+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>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 18 - cherry-pick -s treats "(cherry picked from..." line as part of footer
-
-expecting success of 3511.19 'cherry-pick -x -s treats "(cherry picked from..." line as part of footer': 
-	pristine_detach initial &&
-	sha1=$(git rev-parse mesg-with-cherry-footer^0) &&
-	git cherry-pick -x -s mesg-with-cherry-footer &&
-	cat <<-EOF >expect &&
-		$mesg_with_cherry_footer
-		(cherry picked from commit $sha1)
-		Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	EOF
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  b468a7b base: commit message
-
-HEAD is now at df2a63d initial
-[detached HEAD c7c741c] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 1145b44] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:19:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 19 - cherry-pick -x -s treats "(cherry picked from..." line as part of footer
-
-expecting success of 3511.20 'cherry-pick preserves commit message': 
-	pristine_detach initial &&
-	printf "$mesg_unclean" >expect &&
-	git log -1 --pretty=format:%B mesg-unclean >actual &&
-	test_cmp expect actual &&
-	git cherry-pick mesg-unclean &&
-	git log -1 --pretty=format:%B >actual &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  c7c741c base: commit message
+ 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 27 - git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit
 
-HEAD is now at df2a63d initial
-[detached HEAD 7a2ed43] base: commit message
+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>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 20 - cherry-pick preserves commit message
-
-expecting success of 3511.21 'cherry-pick -x cleans commit message': 
-	pristine_detach initial &&
-	git cherry-pick -x mesg-unclean &&
-	git log -1 --pretty=format:%B >actual &&
-	printf "%s\n(cherry picked from commit %s)\n" \
-		"$mesg_unclean" $(git rev-parse mesg-unclean) |
-			git stripspace >expect &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  7a2ed43 base: commit message
-
-HEAD is now at df2a63d initial
-[detached HEAD ad2d5bc] base: commit message
+ 1 file changed, 1 insertion(+)
+[ours 2a5884b] Revert "add_x"
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 21 - cherry-pick -x cleans commit message
-
-expecting success of 3511.22 'cherry-pick -x respects commit.cleanup': 
-	pristine_detach initial &&
-	git -c commit.cleanup=strip cherry-pick -x mesg-unclean &&
-	git log -1 --pretty=format:%B >actual &&
-	printf "%s\n(cherry picked from commit %s)\n" \
-		"$mesg_unclean" $(git rev-parse mesg-unclean) |
-			git stripspace -s >expect &&
-	test_cmp expect actual
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+ 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
 
-  ad2d5bc base: commit message
+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 df2a63d initial
-[detached HEAD fd8c8fa] base: commit message
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/sub/.git/
+[master (root-commit) b8cea33] Initial commit
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:20:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 22 - cherry-pick -x respects commit.cleanup
-
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3514-cherry-pick-revert-gpg.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
-checking prerequisite: GPG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/super/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-)
-prerequisite GPG not satisfied
-1..0 # SKIP skip all test {cherry-pick,revert} --[no-]gpg-sign, gpg not available
+# still have 4 known breakage(s)
+# passed all remaining 25 test(s)
+1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3510-cherry-pick-sequence.sh ***
@@ -199516,6 +200028,59 @@
 1..55
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3514-cherry-pick-revert-gpg.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3514-cherry-pick-revert-gpg/.git/
+checking prerequisite: GPG
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
+
+	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
+	# that version, creation of signed tags using the generated key fails.
+	case "$gpg_version" in
+	"gpg (GnuPG) 1.0.6"*)
+		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
+		;;
+	*)
+		# Available key info:
+		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
+		#   name and email: C O Mitter <committer@example.com>
+		# * Type RSA, size 2048 bits, no expiration date,
+		#   name and email: Eris Discordia <discord@example.net>
+		# No password given, to enable non-interactive operation.
+		# To generate new key:
+		#	gpg --homedir /tmp/gpghome --gen-key
+		# To write armored exported key to keyring:
+		#	gpg --homedir /tmp/gpghome --export-secret-keys \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		#	gpg --homedir /tmp/gpghome --export \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		# To export ownertrust:
+		#	gpg --homedir /tmp/gpghome --export-ownertrust \
+		#		> lib-gpg/ownertrust
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
+
+)
+prerequisite GPG not satisfied
+1..0 # SKIP skip all test {cherry-pick,revert} --[no-]gpg-sign, gpg not available
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3601-rm-pathspec-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3601-rm-pathspec-file/.git/
 expecting success of 3601.1 'setup': 
@@ -199822,9 +200387,316 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3426-rebase-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/.git/
-expecting success of 3426.1 'git_rebase: added submodule creates empty directory': 
+*** t3650-replay-basics.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3650-replay-basics/.git/
+expecting success of 3650.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+
+	git switch -c topic1 &&
+	test_commit C &&
+	git switch -c topic2 &&
+	test_commit D &&
+	test_commit E &&
+	git switch topic1 &&
+	test_commit F &&
+	git switch -c topic3 &&
+	test_commit G &&
+	test_commit H &&
+	git switch -c topic4 main &&
+	test_commit I &&
+	test_commit J &&
+
+	git switch -c next main &&
+	test_commit K &&
+	git merge -m "Merge topic1" topic1 &&
+	git merge -m "Merge topic2" topic2 &&
+	git merge -m "Merge topic3" topic3 &&
+	>evil &&
+	git add evil &&
+	git commit --amend &&
+	git merge -m "Merge topic4" topic4 &&
+
+	git switch main &&
+	test_commit L &&
+	test_commit M &&
+
+	git switch -c conflict B &&
+	test_commit C.conflict C.t conflict
+
+[main (root-commit) 349e9c6] A
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main 1188bf6] B
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'topic1'
+[topic1 a8f6b72] C
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to a new branch 'topic2'
+[topic2 d953cf2] D
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[topic2 bceb3ac] E
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+Switched to branch 'topic1'
+[topic1 6c842f2] F
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+Switched to a new branch 'topic3'
+[topic3 722c0e7] G
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+[topic3 c3d2928] H
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 H.t
+Switched to a new branch 'topic4'
+[topic4 5387a3c] I
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+[topic4 50a0d29] J
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+Switched to a new branch 'next'
+[next 71026ee] K
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 K.t
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ F.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 C.t
+ create mode 100644 F.t
+Merge made by the 'ort' strategy.
+ D.t | 1 +
+ E.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 D.t
+ create mode 100644 E.t
+Merge made by the 'ort' strategy.
+ G.t | 1 +
+ H.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 G.t
+ create mode 100644 H.t
+[next 05e6edc] Merge topic3
+ Author: author@name <bogus@email@address>
+ Date: Thu Apr 7 15:23:13 2005 -0700
+Merge made by the 'ort' strategy.
+ I.t | 1 +
+ J.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 I.t
+ create mode 100644 J.t
+Switched to branch 'main'
+[main 9a9b858] L
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 L.t
+[main d6553f1] M
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 M.t
+Switched to a new branch 'conflict'
+[conflict 0783956] C.conflict
+ Author: author@name <bogus@email@address>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+ok 1 - setup
+
+expecting success of 3650.2 'setup bare': 
+	git clone --bare . bare
+
+Cloning into bare repository 'bare'...
+done.
+ok 2 - setup bare
+
+expecting success of 3650.3 'using replay to rebase two branches, one on top of other': 
+	git replay --onto main topic1..topic2 >result &&
+
+	test_line_count = 1 result &&
+
+	git log --format=%s $(cut -f 3 -d " " result) >actual &&
+	test_write_lines E D M L B A >expect &&
+	test_cmp expect actual &&
+
+	printf "update refs/heads/topic2 " >expect &&
+	printf "%s " $(cut -f 3 -d " " result) >>expect &&
+	git rev-parse topic2 >>expect &&
+
+	test_cmp expect result
+
+ok 3 - using replay to rebase two branches, one on top of other
+
+expecting success of 3650.4 'using replay on bare repo to rebase two branches, one on top of other': 
+	git -C bare replay --onto main topic1..topic2 >result-bare &&
+	test_cmp expect result-bare
+
+ok 4 - using replay on bare repo to rebase two branches, one on top of other
+
+expecting success of 3650.5 'using replay to rebase with a conflict': 
+	test_expect_code 1 git replay --onto topic1 B..conflict
+
+ok 5 - using replay to rebase with a conflict
+
+expecting success of 3650.6 'using replay on bare repo to rebase with a conflict': 
+	test_expect_code 1 git -C bare replay --onto topic1 B..conflict
+
+ok 6 - using replay on bare repo to rebase with a conflict
+
+expecting success of 3650.7 'using replay to perform basic cherry-pick': 
+	# The differences between this test and previous ones are:
+	#   --advance vs --onto
+	# 2nd field of result is refs/heads/main vs. refs/heads/topic2
+	# 4th field of result is hash for main instead of hash for topic2
+
+	git replay --advance main topic1..topic2 >result &&
+
+	test_line_count = 1 result &&
+
+	git log --format=%s $(cut -f 3 -d " " result) >actual &&
+	test_write_lines E D M L B A >expect &&
+	test_cmp expect actual &&
+
+	printf "update refs/heads/main " >expect &&
+	printf "%s " $(cut -f 3 -d " " result) >>expect &&
+	git rev-parse main >>expect &&
+
+	test_cmp expect result
+
+ok 7 - using replay to perform basic cherry-pick
+
+expecting success of 3650.8 'using replay on bare repo to perform basic cherry-pick': 
+	git -C bare replay --advance main topic1..topic2 >result-bare &&
+	test_cmp expect result-bare
+
+ok 8 - using replay on bare repo to perform basic cherry-pick
+
+expecting success of 3650.9 'replay on bare repo fails with both --advance and --onto': 
+	test_must_fail git -C bare replay --advance main --onto main topic1..topic2 >result-bare
+
+fatal: --onto and --advance are incompatible
+ok 9 - replay on bare repo fails with both --advance and --onto
+
+expecting success of 3650.10 'replay fails when both --advance and --onto are omitted': 
+	test_must_fail git replay topic1..topic2 >result
+
+error: option --onto or --advance is mandatory
+usage: (EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) <revision-range>...
+
+    --[no-]advance <branch>
+                          make replay advance given branch
+    --[no-]onto <revision>
+                          replay onto given commit
+    --[no-]contained      advance all branches contained in revision-range
+
+ok 10 - replay fails when both --advance and --onto are omitted
+
+expecting success of 3650.11 'using replay to also rebase a contained branch': 
+	git replay --contained --onto main main..topic3 >result &&
+
+	test_line_count = 2 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
+
+	git log --format=%s $(head -n 1 new-branch-tips) >actual &&
+	test_write_lines F C M L B A >expect &&
+	test_cmp expect actual &&
+
+	git log --format=%s $(tail -n 1 new-branch-tips) >actual &&
+	test_write_lines H G F C M L B A >expect &&
+	test_cmp expect actual &&
+
+	printf "update refs/heads/topic1 " >expect &&
+	printf "%s " $(head -n 1 new-branch-tips) >>expect &&
+	git rev-parse topic1 >>expect &&
+	printf "update refs/heads/topic3 " >>expect &&
+	printf "%s " $(tail -n 1 new-branch-tips) >>expect &&
+	git rev-parse topic3 >>expect &&
+
+	test_cmp expect result
+
+ok 11 - using replay to also rebase a contained branch
+
+expecting success of 3650.12 'using replay on bare repo to also rebase a contained branch': 
+	git -C bare replay --contained --onto main main..topic3 >result-bare &&
+	test_cmp expect result-bare
+
+ok 12 - using replay on bare repo to also rebase a contained branch
+
+expecting success of 3650.13 'using replay to rebase multiple divergent branches': 
+	git replay --onto main ^topic1 topic2 topic4 >result &&
+
+	test_line_count = 2 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
+
+	git log --format=%s $(head -n 1 new-branch-tips) >actual &&
+	test_write_lines E D M L B A >expect &&
+	test_cmp expect actual &&
+
+	git log --format=%s $(tail -n 1 new-branch-tips) >actual &&
+	test_write_lines J I M L B A >expect &&
+	test_cmp expect actual &&
+
+	printf "update refs/heads/topic2 " >expect &&
+	printf "%s " $(head -n 1 new-branch-tips) >>expect &&
+	git rev-parse topic2 >>expect &&
+	printf "update refs/heads/topic4 " >>expect &&
+	printf "%s " $(tail -n 1 new-branch-tips) >>expect &&
+	git rev-parse topic4 >>expect &&
+
+	test_cmp expect result
+
+ok 13 - using replay to rebase multiple divergent branches
+
+expecting success of 3650.14 'using replay on bare repo to rebase multiple divergent branches, including contained ones': 
+	git -C bare replay --contained --onto main ^main topic2 topic3 topic4 >result &&
+
+	test_line_count = 4 result &&
+	cut -f 3 -d " " result >new-branch-tips &&
+
+	>expect &&
+	for i in 2 1 3 4
+	do
+		printf "update refs/heads/topic$i " >>expect &&
+		printf "%s " $(grep topic$i result | cut -f 3 -d " ") >>expect &&
+		git -C bare rev-parse topic$i >>expect || return 1
+	done &&
+
+	test_cmp expect result &&
+
+	test_write_lines F C M L B A >expect1 &&
+	test_write_lines E D C M L B A >expect2 &&
+	test_write_lines H G F C M L B A >expect3 &&
+	test_write_lines J I M L B A >expect4 &&
+
+	for i in 1 2 3 4
+	do
+		git -C bare log --format=%s $(grep topic$i result | cut -f 3 -d " ") >actual &&
+		test_cmp expect$i actual || return 1
+	done
+
+ok 14 - using replay on bare repo to rebase multiple divergent branches, including contained ones
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3512-cherry-pick-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/.git/
+expecting success of 3512.1 'git_test_func: added submodule creates empty directory': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -199837,31 +200709,31 @@
 			test_submodule_content sub1 origin/add_sub1
 		)
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1/.git/
+[main (root-commit) 63c4304] Base inside first submodule
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 file1
  create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2/.git/
+[main (root-commit) 27c5769] nested submodule base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 file1
  create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/.git/
+[main (root-commit) 27611a5] Base
  Author: A U Thor <author@example.com>
  3 files changed, 4 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 file1
  create mode 100644 file2
 Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/uninitialized_sub'...
 done.
 [add_sub1 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
@@ -199884,13 +200756,13 @@
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+), 1 deletion(-)
  create mode 100644 file3
-To /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
+To /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
  * [new branch]      modifications -> modifications
 [modify_sub1 cb2bda7] Modify sub1
  Author: A U Thor <author@example.com>
 Switched to a new branch 'add_nested_sub'
 Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_repo/sub1/sub2'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1/sub2'...
 done.
 [add_nested_sub 8b3b335] add a nested submodule
  Author: A U Thor <author@example.com>
@@ -199911,9 +200783,9 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 [modify_sub1_recursively 953e869] update sub1, that updates nested sub
  Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1
+To /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub2
+To /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2
  * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
 Cleared directory 'sub2'
 Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
@@ -199957,32 +200829,29 @@
  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'
+Switched to branch 'main'
 Cloning into 'submodule_update'...
 done.
 Switched to a new branch 'no_submodule'
 branch 'no_submodule' set up to track 'origin/no_submodule'.
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to a new branch 'ours'
-[ours dddfb5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 2a5884b] Revert "add_x"
+[no_submodule 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_rebase: added submodule creates empty directory
+ok 1 - git_test_func: added submodule creates empty directory
 
-expecting success of 3426.2 'git_rebase: added submodule leaves existing empty directory alone': 
+expecting success of 3512.2 'git_test_func: added submodule leaves existing empty directory alone': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -200001,26 +200870,23 @@
 Switched to a new branch 'no_submodule'
 branch 'no_submodule' set up to track 'origin/no_submodule'.
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to a new branch 'ours'
-[ours dddfb5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 2a5884b] Revert "add_x"
+[no_submodule 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_rebase: added submodule leaves existing empty directory alone
+ok 2 - git_test_func: added submodule leaves existing empty directory alone
 
-expecting success of 3426.3 'git_rebase: replace tracked file with submodule creates empty directory': 
+expecting success of 3512.3 'git_test_func: replace tracked file with submodule creates empty directory': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_file &&
 		(
@@ -200039,26 +200905,22 @@
 branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
 fatal: Needed a single revision
 branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Switched to a new branch 'ours'
-[ours db2b5c3] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours d7a6c40] Revert "add_x"
+[replace_sub1_with_file 8b6fdfc] Revert "Replace sub1 with file"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_rebase: replace tracked file with submodule creates empty directory
+ok 3 - git_test_func: replace tracked file with submodule creates empty directory
 
-expecting success of 3426.4 'git_rebase: replace directory with submodule': 
+expecting success of 3512.4 'git_test_func: replace directory with submodule': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_directory &&
 		(
@@ -200077,26 +200939,24 @@
 branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
 fatal: Needed a single revision
 branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Switched to a new branch 'ours'
-[ours c876b15] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 86f2b1a] Revert "add_x"
+[replace_sub1_with_directory a2e65d5] Revert "Replace sub1 with directory"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_rebase: replace directory with submodule
+ok 4 - git_test_func: replace directory with submodule
 
-expecting success of 3426.5 'git_rebase: removed submodule leaves submodule directory and its contents in place': 
+expecting success of 3512.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200111,24 +200971,22 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+warning: unable to rmdir 'sub1': Directory not empty
+[add_sub1 d6ba723] Revert "Add sub1"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-warning: unable to rmdir 'sub1': Directory not empty
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-ok 5 - git_rebase: removed submodule leaves submodule directory and its contents in place
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-expecting success of 3426.6 'git_rebase: removed submodule leaves submodule containing a .git directory alone': 
+expecting success of 3512.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200145,24 +201003,22 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+warning: unable to rmdir 'sub1': Directory not empty
+[add_sub1 d6ba723] Revert "Add sub1"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-warning: unable to rmdir 'sub1': Directory not empty
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-ok 6 - git_rebase: removed submodule leaves submodule containing a .git directory alone
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-expecting success of 3426.7 'git_rebase: replace submodule with a directory must fail': 
+expecting success of 3512.7 'git_test_func: replace submodule with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200177,28 +201033,20 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-error: The following untracked working tree files would be overwritten by checkout:
+error: The following untracked working tree files would be overwritten by merge:
 	sub1/file1
 	sub1/file2
-Please move or remove them before you switch branches.
+Please move or remove them before you merge.
 Aborting
-error: could not detach HEAD
-ok 7 - git_rebase: replace submodule with a directory must fail
+fatal: cherry-pick failed
+ok 7 - git_test_func: replace submodule with a directory must fail
 
-expecting success of 3426.8 'git_rebase: replace submodule containing a .git directory with a directory must fail': 
+expecting success of 3512.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200215,28 +201063,20 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-error: The following untracked working tree files would be overwritten by checkout:
+error: The following untracked working tree files would be overwritten by merge:
 	sub1/file1
 	sub1/file2
-Please move or remove them before you switch branches.
+Please move or remove them before you merge.
 Aborting
-error: could not detach HEAD
-ok 8 - git_rebase: replace submodule containing a .git directory with a directory must fail
+fatal: cherry-pick failed
+ok 8 - git_test_func: replace submodule containing a .git directory with a directory must fail
 
-checking known breakage of 3426.9 'git_rebase: replace submodule with a file must fail': 
+checking known breakage of 3512.9 'git_test_func: replace submodule with a file must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200251,24 +201091,20 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-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"
+[add_sub1 2364f5a] Replace sub1 with file
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-test_must_fail: command succeeded: git rebase replace_sub1_with_file
-not ok 9 - git_rebase: replace submodule with a file must fail # TODO known breakage
+ 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 3426.10 'git_rebase: replace submodule containing a .git directory with a file must fail': 
+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 &&
 		(
@@ -200285,24 +201121,20 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-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"
+[add_sub1 2364f5a] Replace sub1 with file
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-test_must_fail: command succeeded: git rebase replace_sub1_with_file
-not ok 10 - git_rebase: replace submodule containing a .git directory with a file must fail # TODO known breakage
+ 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 3426.11 'git_rebase: modified submodule does not update submodule work tree': 
+expecting success of 3512.11 'git_test_func: modified submodule does not update submodule work tree': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200319,24 +201151,18 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-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"
+[add_sub1 cb2bda7] Modify sub1
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
 Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_rebase: modified submodule does not update submodule work tree
+ok 11 - git_test_func: modified submodule does not update submodule work tree
 
-expecting success of 3426.12 'git_rebase: modified submodule does not update submodule work tree to invalid commit': 
+expecting success of 3512.12 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200353,26 +201179,20 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-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"
+[add_sub1 e6169bf] Invalid sub1 commit
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
 fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
 fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
 fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git_rebase: modified submodule does not update submodule work tree to invalid commit
+ok 12 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-expecting success of 3426.13 'git_rebase: modified submodule does not update submodule work tree from invalid commit': 
+expecting success of 3512.13 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
 		prolog &&
 		reset_work_tree_to invalid_sub1 &&
 		(
@@ -200391,26 +201211,20 @@
 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"
+[invalid_sub1 3036e4e] Revert "Invalid sub1 commit"
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
 done.
 Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
 Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_rebase: modified submodule does not update submodule work tree from invalid commit
+ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 3426.14 'git_rebase: added submodule doesn't remove untracked unignored file with same name': 
+expecting success of 3512.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -200427,22 +201241,873 @@
 Switched to a 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
+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.45.2/t/trash directory.t3512-cherry-pick-submodule/sub/.git/
+[main (root-commit) 8e92946] add a file in a submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/a_repo/.git/
+[main (root-commit) ab27302] add a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a_file
+Switched to branch 'test'
+[test 472972d] add a regular folder with name sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 sub/content
+[test 32d3b70] modify a file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[ours 2a5884b] Revert "add_x"
+Switched to branch 'main'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/a_repo/sub'...
+done.
+[main 77c71a9] add a submodule info folder with name sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[main ec77434] modify a file
  Author: A U Thor <author@example.com>
  Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1
-Please move or remove them before you switch branches.
-Aborting
-error: could not detach HEAD
-ok 14 - git_rebase: added submodule doesn't remove untracked unignored file with same name
+ 1 file changed, 1 insertion(+)
+ok 15 - unrelated submodule/file conflict is ignored
 
-expecting success of 3426.15 'git_rebase_interactive: added submodule creates empty directory': 
+# still have 2 known breakage(s)
+# passed all remaining 13 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3700-add.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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 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 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.45.2/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.45.2/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 advice.addEmbeddedRepo false"
+		warning: adding embedded git repository: inner2
+		EOF
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/outer/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/outer/inner1/.git/
+[master (root-commit) c5e40ca] inner1
+ Author: A U Thor <author@example.com>
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/outer/inner2/.git/
+[master (root-commit) 3c517b1] inner2
+ Author: A U Thor <author@example.com>
+ok 37 - "git add" a embedded repository
+
+expecting success of 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.45.2/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 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 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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3513-revert-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 		(
@@ -200455,31 +202120,158 @@
 			test_submodule_content sub1 origin/add_sub1
 		)
 	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/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 a new branch 'ours'
-[ours dddfb5c] add_x
+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>
- 1 file changed, 1 insertion(+)
-[ours 2a5884b] Revert "add_x"
+ 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
- 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/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 15 - git_rebase_interactive: added submodule creates empty directory
+ok 1 - git_revert: added submodule creates empty directory
 
-expecting success of 3426.16 'git_rebase_interactive: added submodule leaves existing empty directory alone': 
+expecting success of 3513.2 'git_revert: added submodule leaves existing empty directory alone': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -200498,26 +202290,32 @@
 Switched to a new branch 'no_submodule'
 branch 'no_submodule' set up to track 'origin/no_submodule'.
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to a new branch 'ours'
-[ours dddfb5c] add_x
+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>
- 1 file changed, 1 insertion(+)
-[ours 2a5884b] Revert "add_x"
+ 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
- 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/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 16 - git_rebase_interactive: added submodule leaves existing empty directory alone
+ok 2 - git_revert: added submodule leaves existing empty directory alone
 
-expecting success of 3426.17 'git_rebase_interactive: replace tracked file with submodule creates empty directory': 
+expecting success of 3513.3 'git_revert: replace tracked file with submodule creates empty directory': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_file &&
 		(
@@ -200536,26 +202334,29 @@
 branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
 fatal: Needed a single revision
 branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Switched to a new branch 'ours'
-[ours db2b5c3] add_x
+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>
- 1 file changed, 1 insertion(+)
-[ours d7a6c40] Revert "add_x"
+ 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
- 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/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 17 - git_rebase_interactive: replace tracked file with submodule creates empty directory
+ok 3 - git_revert: replace tracked file with submodule creates empty directory
 
-expecting success of 3426.18 'git_rebase_interactive: replace directory with submodule': 
+expecting success of 3513.4 'git_revert: replace directory with submodule': 
 		prolog &&
 		reset_work_tree_to replace_sub1_with_directory &&
 		(
@@ -200574,26 +202375,34 @@
 branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
 fatal: Needed a single revision
 branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Switched to a new branch 'ours'
-[ours c876b15] add_x
+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>
- 1 file changed, 1 insertion(+)
-[ours 86f2b1a] Revert "add_x"
+ 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
- 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/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 18 - git_rebase_interactive: replace directory with submodule
+ok 4 - git_revert: replace directory with submodule
 
-expecting success of 3426.19 'git_rebase_interactive: removed submodule leaves submodule directory and its contents in place': 
+expecting success of 3513.5 'git_revert: removed submodule leaves submodule directory and its contents in place': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200608,24 +202417,31 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+warning: unable to rmdir 'sub1': Directory not empty
+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
- 1 file changed, 1 deletion(-)
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
 warning: unable to rmdir 'sub1': Directory not empty
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-ok 19 - git_rebase_interactive: removed submodule leaves submodule directory and its contents in place
+[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 3426.20 'git_rebase_interactive: removed submodule leaves submodule containing a .git directory alone': 
+expecting success of 3513.6 'git_revert: removed submodule leaves submodule containing a .git directory alone': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200642,24 +202458,31 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+warning: unable to rmdir 'sub1': Directory not empty
+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
- 1 file changed, 1 deletion(-)
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
 warning: unable to rmdir 'sub1': Directory not empty
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/ours.
-ok 20 - git_rebase_interactive: removed submodule leaves submodule containing a .git directory alone
+[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 3426.21 'git_rebase_interactive: replace submodule with a directory must fail': 
+expecting success of 3513.7 'git_revert: replace submodule with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200674,28 +202497,19 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
 error: The following untracked working tree files would be overwritten by checkout:
 	sub1/file1
 	sub1/file2
 Please move or remove them before you switch branches.
 Aborting
-error: could not detach HEAD
-ok 21 - git_rebase_interactive: replace submodule with a directory must fail
+ok 7 - git_revert: replace submodule with a directory must fail
 
-expecting success of 3426.22 'git_rebase_interactive: replace submodule containing a .git directory with a directory must fail': 
+expecting success of 3513.8 'git_revert: replace submodule containing a .git directory with a directory must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200712,28 +202526,19 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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'.
-Switched to a new branch 'ours'
-[ours 506db5c] add_x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
 error: The following untracked working tree files would be overwritten by checkout:
 	sub1/file1
 	sub1/file2
 Please move or remove them before you switch branches.
 Aborting
-error: could not detach HEAD
-ok 22 - git_rebase_interactive: replace submodule containing a .git directory with a directory must fail
+ok 8 - git_revert: replace submodule containing a .git directory with a directory must fail
 
-checking known breakage of 3426.23 'git_rebase_interactive: replace submodule with a file must fail': 
+checking known breakage of 3513.9 'git_revert: replace submodule with a file must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200748,24 +202553,17 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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 23 - git_rebase_interactive: replace submodule with a file must fail # TODO known breakage
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git checkout replace_sub1_with_file
+not ok 9 - git_revert: replace submodule with a file must fail # TODO known breakage
 
-checking known breakage of 3426.24 'git_rebase_interactive: replace submodule containing a .git directory with a file must fail': 
+checking known breakage of 3513.10 'git_revert: replace submodule containing a .git directory with a file must fail': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200782,24 +202580,17 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 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
+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 3426.25 'git_rebase_interactive: modified submodule does not update submodule work tree': 
+expecting success of 3513.11 'git_revert: modified submodule does not update submodule work tree': 
 		prolog &&
 		reset_work_tree_to add_sub1 &&
 		(
@@ -200816,24 +202607,23 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 a new branch 'ours'
-[ours 506db5c] add_x
+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>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+ 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
- 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
+ok 11 - git_revert: 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': 
+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 &&
 		(
@@ -200850,26 +202640,25 @@
 done.
 Switched to a new branch 'add_sub1'
 branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/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 a new branch 'ours'
-[ours 506db5c] add_x
+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>
- 1 file changed, 1 insertion(+)
-[ours 9ad3499] Revert "add_x"
+ 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
- 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
+ok 12 - git_revert: 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': 
+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 &&
 		(
@@ -200888,26 +202677,25 @@
 branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
 fatal: Needed a single revision
 branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Switched to a new branch 'ours'
-[ours 8fb6209] add_x
+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>
- 1 file changed, 1 insertion(+)
-[ours 1145b44] Revert "add_x"
+ 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
- 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.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/sub1'...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3426-rebase-submodule/submodule_update/uninitialized_sub'...
+Cloning into '/build/reproducible-path/git-2.45.2/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 27 - git_rebase_interactive: modified submodule does not update submodule work tree from invalid commit
+ok 13 - git_revert: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 3426.28 'git_rebase_interactive: added submodule doesn't remove untracked unignored file with same name': 
+expecting success of 3513.14 'git_revert: added submodule doesn't remove untracked unignored file with same name': 
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -200924,68 +202712,122 @@
 Switched to a 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
+ok 14 - git_revert: 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^^
+# still have 2 known breakage(s)
+# passed all remaining 12 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3702-add-edit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3702-add-edit/.git/
+expecting success of 3702.1 'setup': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3426-rebase-submodule/super/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/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
+	git add file &&
+	test_tick &&
+	git commit -m initial file
+
+
+[master (root-commit) e055285] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-
                                                                                
Successfully rebased and updated refs/heads/master.
-ok 29 - rebase interactive ignores modified submodules
+ 1 file changed, 11 insertions(+)
+ create mode 100644 file
+ok 1 - setup
 
-# still have 4 known breakage(s)
-# passed all remaining 25 test(s)
-1..29
+expecting success of 3702.2 'add -e': 
+
+	cp second-part file &&
+	git add -e &&
+	test_cmp second-part file &&
+	test_cmp expected-patch orig-patch &&
+	git diff --cached >actual &&
+	grep -v index actual >out &&
+	test_cmp expected out
+
+
+ok 2 - add -e
+
+expecting success of 3702.3 'add -e notices editor failure': 
+	git reset --hard &&
+	echo change >>file &&
+	test_must_fail env GIT_EDITOR=false git add -e &&
+	test_expect_code 1 git diff --exit-code
+
+HEAD is now at e055285 initial
+error: there was a problem with the editor 'false'
+fatal: editing patch failed
+diff --git a/file b/file
+index b9834b5..cce9ee2 100644
+--- a/file
++++ b/file
+@@ -9,3 +9,4 @@ for he waxed under welkin, in wealth he throve,
+ till before him the folk, both far and near,
+ who house by the whale-path, heard his mandate,
+ gave him gifts:  a good king he!
++change
+ok 3 - add -e notices editor failure
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3703-add-magic-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3432-rebase-fast-forward.sh ***
@@ -210864,1531 +212706,4044 @@
 			test_cmp_rev ! $oldhead $newhead
 		fi
 	
-HEAD is now at ee2ad00 E
-ok 220 - git rebase --apply --fork-point --keep-base main with our and their changes is noop with same HEAD
+HEAD is now at ee2ad00 E
+ok 220 - git rebase --apply --fork-point --keep-base main with our and their changes is noop with same HEAD
+
+expecting success of 3432.221 'git rebase --apply --no-ff --fork-point --keep-base main with our and their changes is work with diff HEAD': 
+		if test 0 -eq 1
+		then
+			test_config rebase.abbreviateCommands true
+		fi &&
+		oldhead=$(git rev-parse HEAD) &&
+		test_when_finished 'git reset --hard $oldhead' &&
+		git reflog HEAD >expect &&
+		git rebase --apply --no-ff --fork-point --keep-base main >stdout &&
+		git reflog HEAD >actual &&
+		if test work = work
+		then
+			old=$(wc -l <expect) &&
+			test_line_count '-gt' $old actual
+		elif test work = noop
+		then
+			test_cmp expect actual
+		fi &&
+		newhead=$(git rev-parse HEAD) &&
+		if test diff = same
+		then
+			test_cmp_rev $oldhead $newhead
+		elif test diff = diff
+		then
+			test_cmp_rev ! $oldhead $newhead
+		fi
+	
+HEAD is now at ee2ad00 E
+ok 221 - git rebase --apply --no-ff --fork-point --keep-base main with our and their changes is work with diff HEAD
+
+expecting success of 3432.222 'git rebase --merge --fork-point --keep-base main with our and their changes is noop with same HEAD': 
+		if test 0 -eq 1
+		then
+			test_config rebase.abbreviateCommands true
+		fi &&
+		oldhead=$(git rev-parse HEAD) &&
+		test_when_finished 'git reset --hard $oldhead' &&
+		git reflog HEAD >expect &&
+		git rebase --merge --fork-point --keep-base main >stdout &&
+		git reflog HEAD >actual &&
+		if test noop = work
+		then
+			old=$(wc -l <expect) &&
+			test_line_count '-gt' $old actual
+		elif test noop = noop
+		then
+			test_cmp expect actual
+		fi &&
+		newhead=$(git rev-parse HEAD) &&
+		if test same = same
+		then
+			test_cmp_rev $oldhead $newhead
+		elif test same = diff
+		then
+			test_cmp_rev ! $oldhead $newhead
+		fi
+	
+HEAD is now at ee2ad00 E
+ok 222 - git rebase --merge --fork-point --keep-base main with our and their changes is noop with same HEAD
+
+expecting success of 3432.223 'git rebase --merge --no-ff --fork-point --keep-base main with our and their changes is work with diff HEAD': 
+		if test 0 -eq 1
+		then
+			test_config rebase.abbreviateCommands true
+		fi &&
+		oldhead=$(git rev-parse HEAD) &&
+		test_when_finished 'git reset --hard $oldhead' &&
+		git reflog HEAD >expect &&
+		git rebase --merge --no-ff --fork-point --keep-base main >stdout &&
+		git reflog HEAD >actual &&
+		if test work = work
+		then
+			old=$(wc -l <expect) &&
+			test_line_count '-gt' $old actual
+		elif test work = noop
+		then
+			test_cmp expect actual
+		fi &&
+		newhead=$(git rev-parse HEAD) &&
+		if test diff = same
+		then
+			test_cmp_rev $oldhead $newhead
+		elif test diff = diff
+		then
+			test_cmp_rev ! $oldhead $newhead
+		fi
+	
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/side.
+HEAD is now at ee2ad00 E
+ok 223 - git rebase --merge --no-ff --fork-point --keep-base main with our and their changes is work with diff HEAD
+
+expecting success of 3432.224 'git rebase --merge --fork-point --keep-base main (rebase.abbreviateCommands = true) with our and their changes is noop with same HEAD': 
+		if test 1 -eq 1
+		then
+			test_config rebase.abbreviateCommands true
+		fi &&
+		oldhead=$(git rev-parse HEAD) &&
+		test_when_finished 'git reset --hard $oldhead' &&
+		git reflog HEAD >expect &&
+		git rebase --merge --fork-point --keep-base main >stdout &&
+		git reflog HEAD >actual &&
+		if test noop = work
+		then
+			old=$(wc -l <expect) &&
+			test_line_count '-gt' $old actual
+		elif test noop = noop
+		then
+			test_cmp expect actual
+		fi &&
+		newhead=$(git rev-parse HEAD) &&
+		if test same = same
+		then
+			test_cmp_rev $oldhead $newhead
+		elif test same = diff
+		then
+			test_cmp_rev ! $oldhead $newhead
+		fi
+	
+HEAD is now at ee2ad00 E
+ok 224 - git rebase --merge --fork-point --keep-base main (rebase.abbreviateCommands = true) with our and their changes is noop with same HEAD
+
+expecting success of 3432.225 'git rebase --merge --no-ff --fork-point --keep-base main (rebase.abbreviateCommands = true) with our and their changes is work with diff HEAD': 
+		if test 1 -eq 1
+		then
+			test_config rebase.abbreviateCommands true
+		fi &&
+		oldhead=$(git rev-parse HEAD) &&
+		test_when_finished 'git reset --hard $oldhead' &&
+		git reflog HEAD >expect &&
+		git rebase --merge --no-ff --fork-point --keep-base main >stdout &&
+		git reflog HEAD >actual &&
+		if test work = work
+		then
+			old=$(wc -l <expect) &&
+			test_line_count '-gt' $old actual
+		elif test work = noop
+		then
+			test_cmp expect actual
+		fi &&
+		newhead=$(git rev-parse HEAD) &&
+		if test diff = same
+		then
+			test_cmp_rev $oldhead $newhead
+		elif test diff = diff
+		then
+			test_cmp_rev ! $oldhead $newhead
+		fi
+	
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/side.
+HEAD is now at ee2ad00 E
+ok 225 - git rebase --merge --no-ff --fork-point --keep-base main (rebase.abbreviateCommands = true) with our and their changes is work with diff HEAD
+
+# still have 6 known breakage(s)
+# passed all remaining 219 test(s)
+1..225
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3704-add-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3704-add-pathspec-file/.git/
+expecting success of 3704.1 'setup': 
+	test_commit file0 &&
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t
+
+[master (root-commit) ad2e047] file0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file0.t
+ok 1 - setup
+
+expecting success of 3704.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
+
+	echo fileA.t | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+
+ok 2 - --pathspec-from-file from stdin
+
+expecting success of 3704.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git add --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+
+ok 3 - --pathspec-from-file from file
+
+expecting success of 3704.4 'NUL delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+
+ok 4 - NUL delimiters
+
+expecting success of 3704.5 'LF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+
+ok 5 - LF delimiters
+
+expecting success of 3704.6 'no trailing delimiter': 
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+
+ok 6 - no trailing delimiter
+
+expecting success of 3704.7 'CRLF delimiters': 
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+
+ok 7 - CRLF delimiters
+
+expecting success of 3704.8 'quotes': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git add --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+
+ok 8 - quotes
+
+expecting success of 3704.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
+
+fatal: pathspec '"file\101.t"
+' did not match any files
+ok 9 - quotes not compatible with --pathspec-file-nul
+
+expecting success of 3704.10 'only touches what was listed': 
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileB.t
+	A  fileC.t
+	EOF
+	verify_expect
+
+ok 10 - only touches what was listed
+
+expecting success of 3704.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
+
+	test_must_fail git add --pathspec-from-file=list --interactive 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+
+	test_must_fail git add --pathspec-from-file=list --patch 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+
+	test_must_fail git add --pathspec-from-file=list --edit 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&
+
+	test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+
+	test_must_fail git add --pathspec-file-nul 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+
+	# This case succeeds, but still prints to stderr
+	git add --pathspec-from-file=empty_list 2>err &&
+	test_grep -e "Nothing specified, nothing added." err
+
+fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
+fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
+fatal: options '--pathspec-from-file' and '--edit' cannot be used together
+fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
+fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
+Nothing specified, nothing added.
+ok 11 - error conditions
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3705-add-sparse-checkout.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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 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 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 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3900-i18n-commit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 3432.221 'git rebase --apply --no-ff --fork-point --keep-base main with our and their changes is work with diff HEAD': 
-		if test 0 -eq 1
-		then
-			test_config rebase.abbreviateCommands true
-		fi &&
-		oldhead=$(git rev-parse HEAD) &&
-		test_when_finished 'git reset --hard $oldhead' &&
-		git reflog HEAD >expect &&
-		git rebase --apply --no-ff --fork-point --keep-base main >stdout &&
-		git reflog HEAD >actual &&
-		if test work = work
-		then
-			old=$(wc -l <expect) &&
-			test_line_count '-gt' $old actual
-		elif test work = noop
-		then
-			test_cmp expect actual
-		fi &&
-		newhead=$(git rev-parse HEAD) &&
-		if test diff = same
-		then
-			test_cmp_rev $oldhead $newhead
-		elif test diff = diff
-		then
-			test_cmp_rev ! $oldhead $newhead
-		fi
+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
 	
-HEAD is now at ee2ad00 E
-ok 221 - git rebase --apply --no-ff --fork-point --keep-base main with our and their changes is work with diff HEAD
+ok 19 - ISO8859-1 should be shown in itself now
 
-expecting success of 3432.222 'git rebase --merge --fork-point --keep-base main with our and their changes is noop with same HEAD': 
-		if test 0 -eq 1
-		then
-			test_config rebase.abbreviateCommands true
-		fi &&
-		oldhead=$(git rev-parse HEAD) &&
-		test_when_finished 'git reset --hard $oldhead' &&
-		git reflog HEAD >expect &&
-		git rebase --merge --fork-point --keep-base main >stdout &&
-		git reflog HEAD >actual &&
-		if test noop = work
-		then
-			old=$(wc -l <expect) &&
-			test_line_count '-gt' $old actual
-		elif test noop = noop
-		then
-			test_cmp expect actual
-		fi &&
-		newhead=$(git rev-parse HEAD) &&
-		if test same = same
-		then
-			test_cmp_rev $oldhead $newhead
-		elif test same = diff
-		then
-			test_cmp_rev ! $oldhead $newhead
-		fi
+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
 	
-HEAD is now at ee2ad00 E
-ok 222 - git rebase --merge --fork-point --keep-base main with our and their changes is noop with same HEAD
+ok 20 - eucJP should be shown in itself now
 
-expecting success of 3432.223 'git rebase --merge --no-ff --fork-point --keep-base main with our and their changes is work with diff HEAD': 
-		if test 0 -eq 1
-		then
-			test_config rebase.abbreviateCommands true
-		fi &&
-		oldhead=$(git rev-parse HEAD) &&
-		test_when_finished 'git reset --hard $oldhead' &&
-		git reflog HEAD >expect &&
-		git rebase --merge --no-ff --fork-point --keep-base main >stdout &&
-		git reflog HEAD >actual &&
-		if test work = work
-		then
-			old=$(wc -l <expect) &&
-			test_line_count '-gt' $old actual
-		elif test work = noop
-		then
-			test_cmp expect actual
-		fi &&
-		newhead=$(git rev-parse HEAD) &&
-		if test diff = same
-		then
-			test_cmp_rev $oldhead $newhead
-		elif test diff = diff
-		then
-			test_cmp_rev ! $oldhead $newhead
-		fi
+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
 	
-Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/side.
-HEAD is now at ee2ad00 E
-ok 223 - git rebase --merge --no-ff --fork-point --keep-base main with our and their changes is work with diff HEAD
+ok 21 - ISO-2022-JP should be shown in itself now
 
-expecting success of 3432.224 'git rebase --merge --fork-point --keep-base main (rebase.abbreviateCommands = true) with our and their changes is noop with same HEAD': 
-		if test 1 -eq 1
-		then
-			test_config rebase.abbreviateCommands true
-		fi &&
-		oldhead=$(git rev-parse HEAD) &&
-		test_when_finished 'git reset --hard $oldhead' &&
-		git reflog HEAD >expect &&
-		git rebase --merge --fork-point --keep-base main >stdout &&
-		git reflog HEAD >actual &&
-		if test noop = work
-		then
-			old=$(wc -l <expect) &&
-			test_line_count '-gt' $old actual
-		elif test noop = noop
-		then
-			test_cmp expect actual
-		fi &&
-		newhead=$(git rev-parse HEAD) &&
-		if test same = same
-		then
-			test_cmp_rev $oldhead $newhead
-		elif test same = diff
-		then
-			test_cmp_rev ! $oldhead $newhead
-		fi
+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
 	
-HEAD is now at ee2ad00 E
-ok 224 - git rebase --merge --fork-point --keep-base main (rebase.abbreviateCommands = true) with our and their changes is noop with same HEAD
+ok 24 - eucJP should be shown in UTF-8 now
 
-expecting success of 3432.225 'git rebase --merge --no-ff --fork-point --keep-base main (rebase.abbreviateCommands = true) with our and their changes is work with diff HEAD': 
-		if test 1 -eq 1
-		then
-			test_config rebase.abbreviateCommands true
-		fi &&
-		oldhead=$(git rev-parse HEAD) &&
-		test_when_finished 'git reset --hard $oldhead' &&
-		git reflog HEAD >expect &&
-		git rebase --merge --no-ff --fork-point --keep-base main >stdout &&
-		git reflog HEAD >actual &&
-		if test work = work
-		then
-			old=$(wc -l <expect) &&
-			test_line_count '-gt' $old actual
-		elif test work = noop
-		then
-			test_cmp expect actual
-		fi &&
-		newhead=$(git rev-parse HEAD) &&
-		if test diff = same
-		then
-			test_cmp_rev $oldhead $newhead
-		elif test diff = diff
-		then
-			test_cmp_rev ! $oldhead $newhead
-		fi
+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
 	
-Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/side.
-HEAD is now at ee2ad00 E
-ok 225 - git rebase --merge --no-ff --fork-point --keep-base main (rebase.abbreviateCommands = true) with our and their changes is work with diff HEAD
+ok 25 - ISO-2022-JP should be shown in UTF-8 now
 
-# still have 6 known breakage(s)
-# passed all remaining 219 test(s)
-1..225
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3650-replay-basics.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3650-replay-basics/.git/
-expecting success of 3650.1 'setup': 
-	test_commit A &&
-	test_commit B &&
+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
 
-	git switch -c topic1 &&
-	test_commit C &&
-	git switch -c topic2 &&
-	test_commit D &&
-	test_commit E &&
-	git switch topic1 &&
-	test_commit F &&
-	git switch -c topic3 &&
-	test_commit G &&
-	test_commit H &&
-	git switch -c topic4 main &&
-	test_commit I &&
-	test_commit J &&
+expecting success of 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
 
-	git switch -c next main &&
-	test_commit K &&
-	git merge -m "Merge topic1" topic1 &&
-	git merge -m "Merge topic2" topic2 &&
-	git merge -m "Merge topic3" topic3 &&
-	>evil &&
-	git add evil &&
-	git commit --amend &&
-	git merge -m "Merge topic4" topic4 &&
+expecting success of 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
 
-	git switch main &&
-	test_commit L &&
-	test_commit M &&
+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
 
-	git switch -c conflict B &&
-	test_commit C.conflict C.t conflict
+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
 
-[main (root-commit) 349e9c6] A
- Author: author@name <bogus@email@address>
+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(+)
- create mode 100644 A.t
-[main 1188bf6] B
- Author: author@name <bogus@email@address>
+[eucJP-fixup 4164b89] intermediate commit
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'topic1'
-[topic1 a8f6b72] C
- Author: author@name <bogus@email@address>
+ 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(+)
- create mode 100644 C.t
-Switched to a new branch 'topic2'
-[topic2 d953cf2] D
- Author: author@name <bogus@email@address>
+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(+)
- create mode 100644 D.t
-[topic2 bceb3ac] E
- Author: author@name <bogus@email@address>
+[ISO-2022-JP-squash 358ea4d] intermediate commit
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 E.t
-Switched to branch 'topic1'
-[topic1 6c842f2] F
- Author: author@name <bogus@email@address>
+ 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(+)
- create mode 100644 F.t
-Switched to a new branch 'topic3'
-[topic3 722c0e7] G
- Author: author@name <bogus@email@address>
+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(+)
- create mode 100644 G.t
-[topic3 c3d2928] H
- Author: author@name <bogus@email@address>
+[fixup-UTF-8-ISO-8859-1 2e63169] intermediate commit
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 H.t
-Switched to a new branch 'topic4'
-[topic4 5387a3c] I
- Author: author@name <bogus@email@address>
+ create mode 100644 G
+[fixup-UTF-8-ISO-8859-1 c8086ca] fixup! ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 I.t
-[topic4 50a0d29] J
- Author: author@name <bogus@email@address>
+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(+)
- create mode 100644 J.t
-Switched to a new branch 'next'
-[next 71026ee] K
- Author: author@name <bogus@email@address>
+[squash-ISO-8859-1-UTF-8 108aa2c] intermediate commit
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 K.t
-Merge made by the 'ort' strategy.
- C.t | 1 +
- F.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 C.t
- create mode 100644 F.t
-Merge made by the 'ort' strategy.
- D.t | 1 +
- E.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 D.t
- create mode 100644 E.t
-Merge made by the 'ort' strategy.
- G.t | 1 +
- H.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 G.t
- create mode 100644 H.t
-[next 05e6edc] Merge topic3
- Author: author@name <bogus@email@address>
- Date: Thu Apr 7 15:23:13 2005 -0700
-Merge made by the 'ort' strategy.
- I.t | 1 +
- J.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 I.t
- create mode 100644 J.t
-Switched to branch 'main'
-[main 9a9b858] L
- Author: author@name <bogus@email@address>
+ create mode 100644 G
+[squash-ISO-8859-1-UTF-8 1f9565f] squash! ÄËÑ�Ö
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 L.t
-[main d6553f1] M
- Author: author@name <bogus@email@address>
+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(+)
- create mode 100644 M.t
-Switched to a new branch 'conflict'
-[conflict 0783956] C.conflict
- Author: author@name <bogus@email@address>
+[squash-eucJP-ISO-2022-JP ac34524] intermediate commit
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-ok 1 - setup
+ 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 3650.2 'setup bare': 
-	git clone --bare . bare
+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
 
-Cloning into bare repository 'bare'...
-done.
-ok 2 - setup bare
+# passed all 38 test(s)
+1..38
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3701-add-interactive.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3701-add-interactive/.git/
+expecting success of 3701.1 'warn about add.interactive.useBuiltin': 
+	cat >expect <<-\EOF &&
+	warning: the add.interactive.useBuiltin setting has been removed!
+	See its entry in 'git help config' for details.
+	No changes.
+	EOF
 
-expecting success of 3650.3 'using replay to rebase two branches, one on top of other': 
-	git replay --onto main topic1..topic2 >result &&
+	for v in = =true =false
+	do
+		git -c "add.interactive.useBuiltin$v" add -p >out 2>actual &&
+		test_must_be_empty out &&
+		test_cmp expect actual || return 1
+	done
 
-	test_line_count = 1 result &&
+ok 1 - warn about add.interactive.useBuiltin
 
-	git log --format=%s $(cut -f 3 -d " " result) >actual &&
-	test_write_lines E D M L B A >expect &&
-	test_cmp expect actual &&
+expecting success of 3701.2 'setup (initial)': 
+	echo content >file &&
+	git add file &&
+	echo more >>file &&
+	echo lines >>file
 
-	printf "update refs/heads/topic2 " >expect &&
-	printf "%s " $(cut -f 3 -d " " result) >>expect &&
-	git rev-parse topic2 >>expect &&
+ok 2 - setup (initial)
 
-	test_cmp expect result
+expecting success of 3701.3 'status works (initial)': 
+	git add -i </dev/null >output &&
+	grep "+1/-0 *+2/-0 file" output
 
-ok 3 - using replay to rebase two branches, one on top of other
+  1:        +1/-0        +2/-0 file
+ok 3 - status works (initial)
 
-expecting success of 3650.4 'using replay on bare repo to rebase two branches, one on top of other': 
-	git -C bare replay --onto main topic1..topic2 >result-bare &&
-	test_cmp expect result-bare
+expecting success of 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 - using replay on bare repo to rebase two branches, one on top of other
+ok 4 - setup expected
 
-expecting success of 3650.5 'using replay to rebase with a conflict': 
-	test_expect_code 1 git replay --onto topic1 B..conflict
+expecting success of 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 - using replay to rebase with a conflict
+ok 5 - diff works (initial)
 
-expecting success of 3650.6 'using replay on bare repo to rebase with a conflict': 
-	test_expect_code 1 git -C bare replay --onto topic1 B..conflict
+expecting success of 3701.6 'revert works (initial)': 
+	git add file &&
+	test_write_lines r 1 | git add -i &&
+	git ls-files >output &&
+	! grep . output
 
-ok 6 - using replay on bare repo to rebase with a conflict
+           staged     unstaged path
+  1:        +3/-0      nothing file
 
-expecting success of 3650.7 'using replay to perform basic cherry-pick': 
-	# The differences between this test and previous ones are:
-	#   --advance vs --onto
-	# 2nd field of result is refs/heads/main vs. refs/heads/topic2
-	# 4th field of result is hash for main instead of hash for topic2
+*** 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
 
-	git replay --advance main topic1..topic2 >result &&
+*** 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)
 
-	test_line_count = 1 result &&
+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
 
-	git log --format=%s $(cut -f 3 -d " " result) >actual &&
-	test_write_lines E D M L B A >expect &&
-	test_cmp expect actual &&
 
-	printf "update refs/heads/main " >expect &&
-	printf "%s " $(cut -f 3 -d " " result) >>expect &&
-	git rev-parse main >>expect &&
+*** 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
 
-	test_cmp expect result
+*** 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)
 
-ok 7 - using replay to perform basic cherry-pick
+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 3650.8 'using replay on bare repo to perform basic cherry-pick': 
-	git -C bare replay --advance main topic1..topic2 >result-bare &&
-	test_cmp expect result-bare
+[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)
 
-ok 8 - using replay on bare repo to perform basic cherry-pick
+expecting success of 3701.9 'status works (commit)': 
+	git add -i </dev/null >output &&
+	grep "+1/-0 *+2/-0 file" output
 
-expecting success of 3650.9 'replay on bare repo fails with both --advance and --onto': 
-	test_must_fail git -C bare replay --advance main --onto main topic1..topic2 >result-bare
+  1:        +1/-0        +2/-0 file
+ok 9 - status works (commit)
 
-fatal: --onto and --advance are incompatible
-ok 9 - replay on bare repo fails with both --advance and --onto
+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 3650.10 'replay fails when both --advance and --onto are omitted': 
-	test_must_fail git replay topic1..topic2 >result
+           staged     unstaged path
+  1:        +1/-0        +2/-0 file
+  2:        +0/-0        +0/-0 to-delete
 
-error: option --onto or --advance is mandatory
-usage: (EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) <revision-range>...
+*** 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
 
-    --[no-]advance <branch>
-                          make replay advance given branch
-    --[no-]onto <revision>
-                          replay onto given commit
-    --[no-]contained      advance all branches contained in revision-range
+*** 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
 
-ok 10 - replay fails when both --advance and --onto are omitted
+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 3650.11 'using replay to also rebase a contained branch': 
-	git replay --contained --onto main main..topic3 >result &&
+ok 11 - setup expected
 
-	test_line_count = 2 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
+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
 
-	git log --format=%s $(head -n 1 new-branch-tips) >actual &&
-	test_write_lines F C M L B A >expect &&
-	test_cmp expect actual &&
+ok 12 - diff works (commit)
 
-	git log --format=%s $(tail -n 1 new-branch-tips) >actual &&
-	test_write_lines H G F C M L B A >expect &&
-	test_cmp expect actual &&
+expecting success of 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
 
-	printf "update refs/heads/topic1 " >expect &&
-	printf "%s " $(head -n 1 new-branch-tips) >>expect &&
-	git rev-parse topic1 >>expect &&
-	printf "update refs/heads/topic3 " >>expect &&
-	printf "%s " $(tail -n 1 new-branch-tips) >>expect &&
-	git rev-parse topic3 >>expect &&
+           staged     unstaged path
+  1:        +3/-0      nothing file
 
-	test_cmp expect result
+*** 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
 
-ok 11 - using replay to also rebase a contained branch
+*** 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 3650.12 'using replay on bare repo to also rebase a contained branch': 
-	git -C bare replay --contained --onto main main..topic3 >result-bare &&
-	test_cmp expect result-bare
+expecting success of 3701.14 'setup expected': 
+	cat >expected <<-\EOF
+	EOF
 
-ok 12 - using replay on bare repo to also rebase a contained branch
+ok 14 - setup expected
 
-expecting success of 3650.13 'using replay to rebase multiple divergent branches': 
-	git replay --onto main ^topic1 topic2 topic4 >result &&
+expecting success of 3701.15 'dummy edit works': 
+	test_set_editor : &&
+	test_write_lines e a | git add -p &&
+	git diff > diff &&
+	diff_cmp expected diff
 
-	test_line_count = 2 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
+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 15 - dummy edit works
 
-	git log --format=%s $(head -n 1 new-branch-tips) >actual &&
-	test_write_lines E D M L B A >expect &&
-	test_cmp expect actual &&
+expecting success of 3701.16 'setup patch': 
+	cat >patch <<-\EOF
+	@@ -1,1 +1,4 @@
+	 this
+	+patch
+	-does not
+	 apply
+	EOF
 
-	git log --format=%s $(tail -n 1 new-branch-tips) >actual &&
-	test_write_lines J I M L B A >expect &&
-	test_cmp expect actual &&
+ok 16 - setup patch
 
-	printf "update refs/heads/topic2 " >expect &&
-	printf "%s " $(head -n 1 new-branch-tips) >>expect &&
-	git rev-parse topic2 >>expect &&
-	printf "update refs/heads/topic4 " >>expect &&
-	printf "%s " $(tail -n 1 new-branch-tips) >>expect &&
-	git rev-parse topic4 >>expect &&
+expecting success of 3701.17 '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"
 
-	test_cmp expect result
+ok 17 - setup fake editor
 
-ok 13 - using replay to rebase multiple divergent branches
+expecting success of 3701.18 'bad edit rejected': 
+	git reset &&
+	test_write_lines e n d | git add -p >output &&
+	grep "hunk does not apply" output
 
-expecting success of 3650.14 'using replay on bare repo to rebase multiple divergent branches, including contained ones': 
-	git -C bare replay --contained --onto main ^main topic2 topic3 topic4 >result &&
+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 18 - bad edit rejected
 
-	test_line_count = 4 result &&
-	cut -f 3 -d " " result >new-branch-tips &&
+expecting success of 3701.19 'setup patch': 
+	cat >patch <<-\EOF
+	this patch
+	is garbage
+	EOF
 
-	>expect &&
-	for i in 2 1 3 4
-	do
-		printf "update refs/heads/topic$i " >>expect &&
-		printf "%s " $(grep topic$i result | cut -f 3 -d " ") >>expect &&
-		git -C bare rev-parse topic$i >>expect || return 1
-	done &&
+ok 19 - setup patch
 
-	test_cmp expect result &&
+expecting success of 3701.20 'garbage edit rejected': 
+	git reset &&
+	test_write_lines e n d | git add -p >output &&
+	grep "hunk does not apply" output
 
-	test_write_lines F C M L B A >expect1 &&
-	test_write_lines E D C M L B A >expect2 &&
-	test_write_lines H G F C M L B A >expect3 &&
-	test_write_lines J I M L B A >expect4 &&
+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 20 - garbage edit rejected
 
-	for i in 1 2 3 4
-	do
-		git -C bare log --format=%s $(grep topic$i result | cut -f 3 -d " ") >actual &&
-		test_cmp expect$i actual || return 1
-	done
+expecting success of 3701.21 'setup patch': 
+	cat >patch <<-\EOF
+	@@ -1,0 +1,0 @@
+	 baseline
+	+content
+	+newcontent
+	+lines
+	EOF
 
-ok 14 - using replay on bare repo to rebase multiple divergent branches, including contained ones
+ok 21 - setup patch
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3702-add-edit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3702-add-edit/.git/
-expecting success of 3702.1 'setup': 
+expecting success of 3701.22 '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 22 - setup expected
+
+expecting success of 3701.23 '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 23 - real edit works
 
+expecting success of 3701.24 'setup file': 
+	test_write_lines a "" b "" c >file &&
 	git add file &&
-	test_tick &&
-	git commit -m initial file
+	test_write_lines a "" d "" c >file
 
+ok 24 - setup file
 
-[master (root-commit) e055285] initial
+expecting success of 3701.25 'setup patch': 
+	SP=" " &&
+	NULL="" &&
+	cat >patch <<-EOF
+	@@ -1,4 +1,4 @@
+	 a
+	$NULL
+	-b
+	+f
+	$SP
+	c
+	EOF
+
+ok 25 - setup patch
+
+expecting success of 3701.26 '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 26 - setup expected
+
+expecting success of 3701.27 '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 27 - edit can strip spaces from empty context lines
+
+expecting success of 3701.28 '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, 11 insertions(+)
- create mode 100644 file
-ok 1 - setup
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 4ef1e3a commit
+ok 28 - skip files similarly as commit -a
 
-expecting success of 3702.2 'add -e': 
+checking prerequisite: FILEMODE
 
-	cp second-part file &&
-	git add -e &&
-	test_cmp second-part file &&
-	test_cmp expected-patch orig-patch &&
-	git diff --cached >actual &&
-	grep -v index actual >out &&
-	test_cmp expected out
+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.29 '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"
 
-ok 2 - add -e
+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 29 - patch does not affect mode
 
-expecting success of 3702.3 'add -e notices editor failure': 
+expecting success of 3701.30 'stage mode but not hunk': 
 	git reset --hard &&
-	echo change >>file &&
-	test_must_fail env GIT_EDITOR=false git add -e &&
-	test_expect_code 1 git diff --exit-code
+	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 e055285 initial
-error: there was a problem with the editor 'false'
-fatal: editing patch failed
+HEAD is now at 4ef1e3a commit
 diff --git a/file b/file
-index b9834b5..cce9ee2 100644
+index 180b47c..b6f2c08
 --- a/file
 +++ b/file
-@@ -9,3 +9,4 @@ for he waxed under welkin, in wealth he throve,
- till before him the folk, both far and near,
- who house by the whale-path, heard his mandate,
- gave him gifts:  a good king he!
-+change
-ok 3 - add -e notices editor failure
+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 30 - stage mode but not hunk
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3703-add-magic-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3703-add-magic-pathspec/.git/
-expecting success of 3703.1 'setup': 
-	mkdir sub anothersub &&
-	: >sub/foo &&
-	: >anothersub/foo
+expecting success of 3701.31 '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
 
-ok 1 - setup
+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 and hunk
 
-expecting success of 3703.2 'add :/': 
-	cat >expected <<-EOF &&
-	add 'anothersub/foo'
-	add 'expected'
-	add 'sub/actual'
-	add 'sub/foo'
+expecting success of 3701.32 '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
-	(cd sub && git add -n :/ >actual) &&
-	test_cmp expected sub/actual
+	test_cmp expect actual.filtered
 
-ok 2 - add :/
+HEAD is now at 4ef1e3a commit
+ok 32 - different prompts for mode change/deleted
 
-expecting success of 3703.3 'add :/anothersub': 
-	(cd sub && git add -n :/anothersub >actual) &&
-	test_cmp expected sub/actual
+expecting success of 3701.33 'correct message when there is nothing to do': 
+	git reset --hard &&
+	git add -p 2>err &&
+	test_grep "No changes" err &&
+	printf "\\0123" >binary &&
+	git add binary &&
+	printf "\\0abc" >binary &&
+	git add -p 2>err &&
+	test_grep "Only binary files changed" err
 
-ok 3 - add :/anothersub
+HEAD is now at 4ef1e3a commit
+No changes.
+Only binary files changed.
+ok 33 - correct message when there is nothing to do
 
-expecting success of 3703.4 'add :/non-existent': 
-	(cd sub && test_must_fail git add -n :/non-existent)
+expecting success of 3701.34 'setup again': 
+	git reset --hard &&
+	test_chmod +x file &&
+	echo content >>file &&
+	test_write_lines A B C D>file2 &&
+	git add file2
 
-fatal: pathspec ':/non-existent' did not match any files
-ok 4 - add :/non-existent
+HEAD is now at 4ef1e3a commit
+ok 34 - setup again
 
-expecting success of 3703.5 'a file with the same (long) magic name exists': 
-	: >":(icase)ha" &&
-	test_must_fail git add -n ":(icase)ha" &&
-	git add -n "./:(icase)ha"
+expecting success of 3701.35 '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
 
-fatal: pathspec ':(icase)ha' did not match any files
-add ':(icase)ha'
-ok 5 - a file with the same (long) magic name exists
+ok 35 - setup patch
 
-expecting success of 3703.6 'a file with the same (short) magic name exists': 
-	: >":/bar" &&
-	test_must_fail git add -n :/bar &&
-	git add -n "./:/bar"
+expecting success of 3701.36 '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
 
-fatal: pathspec ':/bar' did not match any files
-add ':/bar'
-ok 6 - a file with the same (short) magic name exists
+ok 36 - setup expected
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3700-add.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/.git/
-expecting success of 3700.1 'Test of git add': 
-	touch foo && git add foo
+expecting success of 3701.37 '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
 
-ok 1 - Test of git add
+[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 37 - add first line works
 
-expecting success of 3700.2 'Test with no pathspecs': 
-	cat >expect <<-EOF &&
-	Nothing specified, nothing added.
-	hint: Maybe you wanted to say ${SQ}git add .${SQ}?
-	hint: Disable this message with "git config advice.addEmptyPathspec false"
+expecting success of 3701.38 '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
-	git add 2>actual &&
-	test_cmp expect actual
 
-ok 2 - Test with no pathspecs
+ok 38 - setup expected
 
-expecting success of 3700.3 'Post-check that foo is in the index': 
-	git ls-files foo | grep foo
+expecting success of 3701.39 '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
 
-foo
-ok 3 - Post-check that foo is in the index
+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 39 - deleting a non-empty file
 
-expecting success of 3700.4 'Test that "git add -- -q" works': 
-	touch -- -q && git add -- -q
+expecting success of 3701.40 'setup expected': 
+	cat >expected <<-\EOF
+	diff --git a/empty b/empty
+	deleted file mode 100644
+	index e69de29..0000000
+	EOF
 
-ok 4 - Test that "git add -- -q" works
+ok 40 - setup expected
 
-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 3701.41 '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
 
-	# 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
+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 41 - deleting an empty file
 
-ok 5 - git add: core.fsyncmethod=batch
+expecting success of 3701.42 '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 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 &&
+		echo y | git checkout -p added-file -- >actual &&
+		test_path_is_file empty &&
+		test_grep "Apply addition to index and worktree" actual
+	)
 
-	# 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 42 - adding an empty file
 
-ok 6 - git update-index: core.fsyncmethod=batch
+expecting success of 3701.43 '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 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
+	test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
 
-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
+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 43 - split hunk setup
 
-checking prerequisite: SYMLINKS
+expecting success of 3701.44 'goto hunk': 
+	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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+Unstaged changes after reset:
+M	test
+ok 44 - goto hunk
 
-)
-prerequisite SYMLINKS ok
-pass
-ok 8 - git add: filemode=0 should not get confused by symlink
+expecting success of 3701.45 'navigate to hunk via regex': 
+	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 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...
+Unstaged changes after reset:
+M	test
+ok 45 - navigate to hunk via regex
 
-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 3701.46 '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
 
-pass
-ok 10 - git add: filemode=0 should not get confused by symlink
+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 46 - split hunk "add -p (edit)"
 
-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 3701.47 '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 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
+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 47 - split hunk "add -p (no, yes, edit)"
 
-ok 12 - .gitignore test setup
+expecting success of 3701.48 '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 3700.13 '.gitignore is honored': 
-	git add . &&
-	git ls-files >files &&
-	sed -n "/\\.ig/p" <files >actual &&
-	test_must_be_empty actual
+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 48 - split hunk with incomplete line at end
 
-ok 13 - .gitignore is honored
+expecting success of 3701.49 '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 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
+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 49 - edit, adding lines to the first hunk
 
-The following paths are ignored by one of your .gitignore files:
-a.ig
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 14 - error out when attempting to add ignored ones without -f
+expecting success of 3701.50 '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 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
+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 50 - patch mode ignores unmerged entries
 
-The following paths are ignored by one of your .gitignore files:
-d.ig
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-ok 15 - error out when attempting to add ignored ones without -f
+expecting success of 3701.51 '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 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
+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 51 - index is refreshed after applying patch
 
-The following paths are ignored by one of your .gitignore files:
-a.ig
-hint: Use -f if you really want to add them.
-hint: Disable this message with "git config advice.addIgnoredFile false"
-a.if
-ok 16 - error out when attempting to add ignored ones but add others
+expecting success of 3701.52 'diffs can be colorized': 
+	git reset --hard &&
 
-expecting success of 3700.17 'add ignored ones with -f': 
-	git add -f a.?? &&
-	git ls-files --error-unmatch a.ig
+	echo content >test &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
+	git diff-files --exit-code &&
 
-a.ig
-ok 17 - add ignored ones with -f
+	# 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 3700.18 'add ignored ones with -f': 
-	git add -f d.??/* &&
-	git ls-files --error-unmatch d.ig/d.if d.ig/d.ig
+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 52 - diffs can be colorized
 
-d.ig/d.if
-d.ig/d.ig
-ok 18 - add ignored ones with -f
+expecting success of 3701.53 '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 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
+	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 &&
 
-d.ig/d.if
-d.ig/d.ig
-ok 19 - add ignored ones with -f
+	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 3700.20 '.gitignore with subdirectory': 
+	<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 &&
 
-	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
+	: 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
 
-sub/dir/a.ig
-sub/dir/a.ig
-ok 20 - .gitignore with subdirectory
+HEAD is now at 095e8c6 main
+           staged     unstaged path
+  1:        +3/-0        +2/-1 color-test
 
-expecting success of 3700.21 'check correct prefix detection': 
-	rm -f .git/index &&
-	git add 1/2/a 1/3/b 1/2/c
+*** 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 53 - colors can be overridden
 
-ok 21 - check correct prefix detection
+expecting success of 3701.54 '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 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$"
+	test_write_lines quit >input &&
+	git add -i >actual <input &&
 
-100755 3e757656cf36eca53338e520d134963a44f793f8 0	file
-120000 3e757656cf36eca53338e520d134963a44f793f8 0	symlink
-ok 22 - git add with filemode=0, symlinks=0, and unmerged entries
+	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 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$"
+	test_cmp expect actual
 
-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
+HEAD is now at 095e8c6 main
+rm 'bracket-test'
+ok 54 - brackets appear without color
 
-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 3701.55 '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 &&
 
-[master (root-commit) 0254e3c] commit all
- Author: A U Thor <author@example.com>
- 6 files changed, 2 insertions(+)
- create mode 100644 1/2/a
- create mode 100644 1/2/c
- create mode 100644 1/3/b
- create mode 100755 file
- create mode 100644 foo
- create mode 120000 symlink
-pass
-ok 24 - git add --refresh
+	test_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 3700.25 'git add --refresh with pathspec': 
+HEAD is now at 095e8c6 main
+rm 'color-test'
+ok 55 - colors can be skipped with color.ui=false
+
+expecting success of 3701.56 'colorized diffs respect diff.wsErrorHighlight': 
 	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
+	echo "old " >test &&
+	git add test &&
+	echo "new " >test &&
 
-HEAD is now at 0254e3c commit all
-rm 'foo'
-baz
-ok 25 - git add --refresh with pathspec
+	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 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
+HEAD is now at 095e8c6 main
+<RED>-<RESET><RED>old<RESET><BRED> <RESET>
+ok 56 - colorized diffs respect diff.wsErrorHighlight
 
-ok 26 - git add --refresh correctly reports no match error
+expecting success of 3701.57 'diffFilter filters diff': 
+	git reset --hard &&
 
-checking prerequisite: SANITY
+	echo content >test &&
+	test_config interactive.diffFilter "sed s/^/foo:/" &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
-	mkdir SANETESTD.1 SANETESTD.2 &&
+	# avoid depending on the exact coloring or content of the prompts,
+	# and just make sure we saw our diff prefixed
+	grep foo:.*content output
 
-	chmod +w SANETESTD.1 SANETESTD.2 &&
-	>SANETESTD.1/x 2>SANETESTD.2/x &&
-	chmod -w SANETESTD.1 &&
-	chmod -r SANETESTD.1/x &&
-	chmod -rx SANETESTD.2 ||
-	BUG "cannot prepare SANETESTD"
+HEAD is now at 095e8c6 main
+foo:+content
+ok 57 - diffFilter filters diff
 
-	! test -r SANETESTD.1/x &&
-	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
-	status=$?
+expecting success of 3701.58 'detect bogus diffFilter output': 
+	git reset --hard &&
 
-	chmod +rwx SANETESTD.1 SANETESTD.2 &&
-	rm -rf SANETESTD.1 SANETESTD.2 ||
-	BUG "cannot clean SANETESTD"
-	return $status
+	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
 
-)
-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': 
+HEAD is now at 095e8c6 main
+error: mismatched output from interactive.diffFilter
+ok 58 - detect bogus diffFilter output
+
+expecting success of 3701.59 'handle iffy colored hunk headers': 
 	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
+	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 3700.28 'git add --ignore-errors': 
+HEAD is now at 095e8c6 main
+XX
+ok 59 - handle iffy colored hunk headers
+
+expecting success of 3701.60 'handle very large filtered diff': 
 	git reset --hard &&
-	date >foo1 &&
-	date >foo2 &&
-	chmod 0 foo2 &&
-	test_must_fail git add --verbose --ignore-errors . &&
-	git ls-files foo1 | grep foo1
+	# The 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
 
-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
+HEAD is now at 095e8c6 main
+ok 60 - handle very large filtered diff
 
-expecting success of 3700.29 'git add (add.ignore-errors)': 
-	git config add.ignore-errors 1 &&
+expecting success of 3701.61 'diff.algorithm is passed to `git diff-files`': 
 	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)
+	>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 3700.30 'git add (add.ignore-errors = false)': 
-	git config add.ignore-errors 0 &&
+HEAD is now at 095e8c6 main
+error: option diff-algorithm accepts "myers", "minimal", "patience" and "histogram"
+ok 61 - diff.algorithm is passed to `git diff-files`
+
+expecting success of 3701.62 'patch-mode via -i prompts for files': 
 	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)
+	echo one >file &&
+	echo two >test &&
+	git add -i <<-\EOF &&
+	patch
+	test
 
-expecting success of 3700.31 '--no-ignore-errors overrides config': 
-	git config add.ignore-errors 1 &&
+	y
+	quit
+	EOF
+
+	echo test >expect &&
+	git diff --cached --name-only >actual &&
+	diff_cmp expect actual
+
+HEAD is now at 095e8c6 main
+           staged     unstaged path
+  1:    unchanged        +1/-2 file
+  2:    unchanged        +1/-6 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:    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 62 - patch-mode via -i prompts for files
+
+expecting success of 3701.63 'add -p handles globs': 
 	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
+	mkdir -p subdir &&
+	echo base >one.c &&
+	echo base >subdir/two.c &&
+	git add "*.c" &&
+	git commit -m base &&
 
-expecting success of 3700.32 'git add 'fo\[ou\]bar' ignores foobar': 
+	echo change >one.c &&
+	echo change >subdir/two.c &&
+	git add -p "*.c" <<-\EOF &&
+	y
+	y
+	EOF
+
+	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 63 - add -p handles globs
+
+expecting success of 3701.64 'add -p handles relative paths': 
 	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
+	echo base >relpath.c &&
+	git add "*.c" &&
+	git commit -m relpath &&
 
-expecting success of 3700.33 'git add to resolve conflicts on otherwise ignored path': 
+	echo change >relpath.c &&
+	mkdir -p subdir &&
+	git -C subdir add -p .. 2>error <<-\EOF &&
+	y
+	EOF
+
+	test_must_be_empty error &&
+
+	cat >expect <<-\EOF &&
+	relpath.c
+	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 64 - add -p handles relative paths
+
+expecting success of 3701.65 'add -p does not expand argument lists': 
 	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
+	echo content >not-changed &&
+	git add not-changed &&
+	git commit -m "add not-changed file" &&
 
-expecting success of 3700.34 '"add non-existent" should fail': 
-	test_must_fail git add non-existent &&
-	! (git ls-files | grep "non-existent")
+	echo change >file &&
+	GIT_TRACE=$(pwd)/trace.out git add -p . <<-\EOF &&
+	y
+	EOF
 
-fatal: pathspec 'non-existent' did not match any files
-ok 34 - "add non-existent" should fail
+	# 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 3700.35 'git add -A on empty repo does not error out': 
-	rm -fr empty &&
-	git init empty &&
+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 65 - add -p does not expand argument lists
+
+expecting success of 3701.66 '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
+
+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 66 - hunk-editing handles custom comment char
+
+expecting success of 3701.67 '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
+
+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 67 - add -p works even with color.ui=always
+
+expecting success of 3701.68 'setup different kinds of dirty submodules': 
+	test_create_repo for-submodules &&
 	(
-		cd empty &&
-		git add -A . &&
-		git add -A
-	)
+		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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/empty/.git/
-ok 35 - git add -A on empty repo does not error out
+		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 3700.36 '"git add ." in empty repo': 
-	rm -fr empty &&
-	git init empty &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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 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 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 68 - setup different kinds of dirty submodules
+
+expecting success of 3701.69 '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
+
+  2:    unchanged        +1/-1 dirty-head
+  1:    unchanged        +1/-1 dirty-both-ways
+ok 69 - status ignores dirty submodules (except HEAD)
+
+expecting success of 3701.70 'handle submodules': 
+	echo 123 >>for-submodules/dirty-otherwise/initial.t &&
+
+	force_color git -C for-submodules add -p dirty-otherwise >output 2>&1 &&
+	grep "No changes" output &&
+
+	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
+
+No changes.
+160000 f10ac08dbe6eaf5e88125c402669e6f9b7076181 0	dirty-head
+ok 70 - handle submodules
+
+expecting success of 3701.71 '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
+
+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 71 - set up pathological context
+
+expecting success of 3701.72 '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
+
+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 72 - add -p works with pathological context lines
+
+expecting success of 3701.73 '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
+
+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 73 - add -p patch editing works with pathological context lines
+
+expecting success of 3701.74 '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
+
+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 74 - checkout -p works with pathological context lines
+
+expecting success of 3701.75 'add -N followed by add -p patch editing': 
+	git reset --hard &&
 	(
-		cd empty &&
-		git add .
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/empty/.git/
-ok 36 - "git add ." in empty repo
+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 75 - add -N followed by add -p patch editing
 
-expecting success of 3700.37 '"git add" a embedded repository': 
-	rm -fr outer && git init outer &&
+expecting success of 3701.76 'checkout -p patch editing of added file': 
+	git reset --hard &&
 	(
-		cd outer &&
-		for i in 1 2
-		do
-			name=inner$i &&
-			git init $name &&
-			git -C $name commit --allow-empty -m $name ||
-				return 1
-		done &&
-		git add . 2>actual &&
-		cat >expect <<-EOF &&
-		warning: adding embedded git repository: inner1
-		hint: You${SQ}ve added another git repository inside your current repository.
-		hint: Clones of the outer repository will not contain the contents of
-		hint: the embedded repository and will not know how to obtain it.
-		hint: If you meant to add a submodule, use:
-		hint:
-		hint: 	git submodule add <url> inner1
-		hint:
-		hint: If you added this path by mistake, you can remove it from the
-		hint: index with:
-		hint:
-		hint: 	git rm --cached inner1
-		hint:
-		hint: See "git help submodule" for more information.
-		hint: Disable this message with "git config advice.addEmbeddedRepo false"
-		warning: adding embedded git repository: inner2
-		EOF
-		test_cmp expect actual
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/outer/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/outer/inner1/.git/
-[master (root-commit) c5e40ca] inner1
+HEAD is now at 9e98a5e a
+[main 58d499b] add new file
  Author: A U Thor <author@example.com>
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/outer/inner2/.git/
-[master (root-commit) 3c517b1] inner2
+ 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>
-ok 37 - "git add" a embedded repository
+ 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 76 - checkout -p patch editing of added file
 
-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 &&
+expecting success of 3701.77 'show help from add--helper': 
+	git reset --hard &&
 	cat >expect <<-EOF &&
-	error: 'empty/' does not have a commit checked out
-	fatal: adding files failed
+
+	<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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3700-add/empty/.git/
-ok 38 - error on a repository with no commits
+HEAD is now at 4a33265 remove new file
+ok 77 - show help from add--helper
 
-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 3701.78 '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 &&
 
-ok 39 - git add --dry-run of existing changed file
+	# this is a noop with only an unmerged entry
+	git reset -p &&
 
-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
+	# add files that sort before and after unmerged entry
+	echo a >a &&
+	echo z >z &&
+	git add a z &&
 
-ok 40 - git add --dry-run of non-existing file
+	# 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
 
-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
+[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
 
-ok 41 - git add --dry-run of an existing file output
+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
 
-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
+warning: refname 'main' is ambiguous.
+Switched to branch 'main'
+ok 78 - reset -p with unmerged files
 
-ok 42 - git add --dry-run --ignore-missing of non-existing file
+# passed all 78 test(s)
+1..78
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3902-quoted.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3902-quoted/.git/
+expecting success of 3902.1 'setup': 
 
-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
+	mkdir "$FN" &&
+	for_each_name "echo initial >\"\$name\"" &&
+	git add . &&
+	git commit -q -m Initial &&
 
-ok 43 - git add --dry-run --ignore-missing of non-existing file output
+	for_each_name "echo second >\"\$name\"" &&
+	git commit -a -m Second &&
 
-expecting success of 3700.44 'git add --dry-run --interactive should fail': 
-	test_must_fail git add --dry-run --interactive
+	for_each_name "echo modified >\"\$name\""
 
-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 ""
+[master 6e4313d] Second
+ Author: A U Thor <author@example.com>
+ 11 files changed, 11 insertions(+), 11 deletions(-)
+ok 1 - setup
 
-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 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.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
+cat >expect.raw <<\EOF
+Name
+"Name and a\nLF"
+"Name and an\tHT"
+"Name\""
+With SP in it
+"濱野\t純"
+"濱野\n純"
+濱野 純
+"濱野\"純"
+濱野/file
+濱野純
+EOF
 
-pass
-pass
-ok 46 - git add --chmod=[+-]x stages correctly
+ok 2 - setup expected files
 
-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 3902.3 'check fully quoted output from ls-files': 
 
-pass
-ok 47 - git add --chmod=+x with symlinks
+	git ls-files >current && test_cmp expect.quoted current
 
-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
+ok 3 - check fully quoted output from ls-files
 
-expecting success of 3700.49 'git add --chmod=[+-]x does not change the working tree': 
-	echo foo >foo4 &&
-	git add foo4 &&
-	git add --chmod=+x foo4 &&
-	! test -x foo4
+expecting success of 3902.4 'check fully quoted output from diff-files': 
 
-ok 49 - git add --chmod=[+-]x does not change the working tree
+	git diff --name-only >current &&
+	test_cmp expect.quoted current
 
-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)
+ok 4 - check fully quoted output from diff-files
 
-expecting success of 3700.51 'git add --chmod honors --dry-run': 
-	git reset --hard &&
-	echo foo >foo4 &&
-	git add foo4 &&
-	git add --chmod=+x --dry-run foo4 &&
-	test_mode_in_index 100644 foo4
+expecting success of 3902.5 'check fully quoted output from diff-index': 
 
-HEAD is now at 0254e3c commit all
-pass
-ok 51 - git add --chmod honors --dry-run
+	git diff --name-only HEAD >current &&
+	test_cmp expect.quoted current
 
-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
+ok 5 - check fully quoted output from diff-index
 
-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 3902.6 'check fully quoted output from diff-tree': 
 
-fatal: pathspec 'nonexistent' did not match any files
-ok 53 - git add --chmod --dry-run reports error for unmatched pathspec
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.quoted current
 
-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 advice.addEmptyPathspec false"
-pass
-pass
-ok 54 - no file status change if no pathspec is given
+ok 6 - check fully quoted output from diff-tree
 
-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 3902.7 'check fully quoted output from ls-tree': 
 
-Nothing specified, nothing added.
-hint: Maybe you wanted to say 'git add .'?
-hint: Disable this message with "git config advice.addEmptyPathspec false"
-pass
-pass
-ok 55 - no file status change if no pathspec is given in subdir
+	git ls-tree --name-only -r HEAD >current &&
+	test_cmp expect.quoted current
 
-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.45.2/t/trash directory.t3700-add/repo/.git/
-ok 56 - all statuses changed in folder if . is given
+ok 7 - check fully quoted output from ls-tree
 
-checking prerequisite: CASE_INSENSITIVE_FS
+expecting success of 3902.8 'setting core.quotepath': 
 
-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
+	git config --bool core.quotepath false
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 57 # skip path is case-insensitive (missing CASE_INSENSITIVE_FS)
 
-# passed all 57 test(s)
-1..57
+ok 8 - setting core.quotepath
+
+expecting success of 3902.9 'check fully quoted output from ls-files': 
+
+	git ls-files >current && test_cmp expect.raw current
+
+
+ok 9 - check fully quoted output from ls-files
+
+expecting success of 3902.10 'check fully quoted output from diff-files': 
+
+	git diff --name-only >current &&
+	test_cmp expect.raw current
+
+
+ok 10 - check fully quoted output from diff-files
+
+expecting success of 3902.11 'check fully quoted output from diff-index': 
+
+	git diff --name-only HEAD >current &&
+	test_cmp expect.raw current
+
+
+ok 11 - check fully quoted output from diff-index
+
+expecting success of 3902.12 'check fully quoted output from diff-tree': 
+
+	git diff --name-only HEAD^ HEAD >current &&
+	test_cmp expect.raw current
+
+
+ok 12 - check fully quoted output from diff-tree
+
+expecting success of 3902.13 'check fully quoted output from ls-tree': 
+
+	git ls-tree --name-only -r HEAD >current &&
+	test_cmp expect.raw current
+
+
+ok 13 - check fully quoted output from ls-tree
+
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3704-add-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3704-add-pathspec-file/.git/
-expecting success of 3704.1 'setup': 
-	test_commit file0 &&
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t
+*** t3901-i18n-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3901-i18n-patch/.git/
+expecting success of 3901.1 'setup': 
+	git config i18n.commitencoding UTF-8 &&
 
-[master (root-commit) ad2e047] file0
- Author: A U Thor <author@example.com>
+	# use UTF-8 in author and committer name to match the
+	# i18n.commitencoding settings
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+
+	test_tick &&
+	echo "$GIT_AUTHOR_NAME" >mine &&
+	git add mine &&
+	git commit -s -m "Initial commit" &&
+
+	test_tick &&
+	echo Hello world >mine &&
+	git add mine &&
+	git commit -s -m "Second on main" &&
+
+	# the first commit on the side branch is UTF-8
+	test_tick &&
+	git checkout -b side main^ &&
+	echo Another file >yours &&
+	git add yours &&
+	git commit -s -m "Second on side" &&
+
+	if test_have_prereq !MINGW
+	then
+		# the second one on the side branch is ISO-8859-1
+		git config i18n.commitencoding ISO8859-1 &&
+		# use author and committer name in ISO-8859-1 to match it.
+		. "$TEST_DIRECTORY"/t3901/8859-1.txt
+	fi &&
+	test_tick &&
+	echo Yet another >theirs &&
+	git add theirs &&
+	git commit -s -m "Third on side" &&
+
+	# Back to default
+	git config i18n.commitencoding UTF-8
+
+[main (root-commit) a751cb4] Initial commit
+ Author: �éí óú <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file0.t
+ 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 3704.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
+expecting success of 3901.2 'format-patch output (ISO-8859-1)': 
+	git config i18n.logoutputencoding ISO8859-1 &&
 
-	echo fileA.t | git add --pathspec-from-file=- &&
+	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
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	EOF
-	verify_expect
+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)
 
-ok 2 - --pathspec-from-file from stdin
+expecting success of 3901.3 'format-patch output (UTF-8)': 
+	git config i18n.logoutputencoding UTF-8 &&
 
-expecting success of 3704.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
+	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
 
-	echo fileA.t >list &&
-	git add --pathspec-from-file=list &&
+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)
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	EOF
-	verify_expect
+expecting success of 3901.4 'rebase (U/U)': 
+	# We want the result of rebase in UTF-8
+	git config i18n.commitencoding UTF-8 &&
 
-ok 3 - --pathspec-from-file from file
+	# The test is about logoutputencoding not affecting the
+	# final outcome -- it is used internally to generate the
+	# patch and the log.
 
-expecting success of 3704.4 'NUL delimiters': 
-	restore_checkpoint &&
+	git config i18n.logoutputencoding UTF-8 &&
 
-	printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul &&
+	# The result will be committed by GIT_COMMITTER_NAME --
+	# we want UTF-8 encoded name.
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
+	git checkout -b test &&
+	git rebase main &&
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+	check_encoding 2
 
-ok 4 - NUL delimiters
+Switched to a new branch 'test'
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 4 - rebase (U/U)
 
-expecting success of 3704.5 'LF delimiters': 
-	restore_checkpoint &&
+expecting success of 3901.5 'rebase (U/L)': 
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-	printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- &&
+	git reset --hard side &&
+	git rebase main &&
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+	check_encoding 2
 
-ok 5 - LF delimiters
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 5 - rebase (U/L)
 
-expecting success of 3704.6 'no trailing delimiter': 
-	restore_checkpoint &&
+expecting success of 3901.6 'rebase (L/L)': 
+	# In this test we want ISO-8859-1 encoded commits as the result
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- &&
+	git reset --hard side &&
+	git rebase main &&
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+	check_encoding 2 8859
 
-ok 6 - no trailing delimiter
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 6 - rebase (L/L)
 
-expecting success of 3704.7 'CRLF delimiters': 
-	restore_checkpoint &&
+expecting success of 3901.7 'rebase (L/U)': 
+	# This is pathological -- use UTF-8 as intermediate form
+	# to get ISO-8859-1 results.
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- &&
+	git reset --hard side &&
+	git rebase main &&
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	A  fileB.t
-	EOF
-	verify_expect
+	check_encoding 2 8859
 
-ok 7 - CRLF delimiters
+HEAD is now at 717f610 Third on side
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/test.
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+encoding ISO8859-1
+ok 7 - rebase (L/U)
 
-expecting success of 3704.8 'quotes': 
-	restore_checkpoint &&
+expecting success of 3901.8 'cherry-pick(U/U)': 
+	# Both the commitencoding and logoutputencoding is set to UTF-8.
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-	git add --pathspec-from-file=list &&
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
 
-	cat >expect <<-\EOF &&
-	A  fileA.t
-	EOF
-	verify_expect
+	check_encoding 3
 
-ok 8 - quotes
+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 3704.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
+expecting success of 3901.9 'cherry-pick(L/L)': 
+	# Both the commitencoding and logoutputencoding is set to ISO-8859-1
 
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
 
-fatal: pathspec '"file\101.t"
-' did not match any files
-ok 9 - quotes not compatible with --pathspec-file-nul
+	check_encoding 3 8859
 
-expecting success of 3704.10 'only touches what was listed': 
-	restore_checkpoint &&
+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)
 
-	printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- &&
+expecting success of 3901.10 'cherry-pick(U/L)': 
+	# Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1
 
-	cat >expect <<-\EOF &&
-	A  fileB.t
-	A  fileC.t
-	EOF
-	verify_expect
+	git config i18n.commitencoding UTF-8 &&
+	git config i18n.logoutputencoding ISO8859-1 &&
+	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-ok 10 - only touches what was listed
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
 
-expecting success of 3704.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	>empty_list &&
+	check_encoding 3
 
-	test_must_fail git add --pathspec-from-file=list --interactive 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+HEAD is now at 1abbfe5 Second on main
+[test 226e420] Second on side
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 yours
+[test 0c82aa3] Third on side
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 theirs
+[test 267f566] Revert "Third on side"
+ Author: Áéí óú <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 theirs
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
+ok 10 - cherry-pick(U/L)
 
-	test_must_fail git add --pathspec-from-file=list --patch 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
+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.
 
-	test_must_fail git add --pathspec-from-file=list --edit 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err &&
+	git config i18n.commitencoding ISO8859-1 &&
+	git config i18n.logoutputencoding UTF-8 &&
+	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err &&
-	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
+	git reset --hard main &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	git revert HEAD &&
 
-	test_must_fail git add --pathspec-file-nul 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
+	check_encoding 3 8859
 
-	# This case succeeds, but still prints to stderr
-	git add --pathspec-from-file=empty_list 2>err &&
-	test_grep -e "Nothing specified, nothing added." err
+HEAD is now at 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)
 
-fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
-fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
-fatal: options '--pathspec-from-file' and '--edit' cannot be used together
-fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
-fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
-Nothing specified, nothing added.
-ok 11 - error conditions
+expecting success of 3901.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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3904-stash-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-# passed all 11 test(s)
-1..11
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3600-rm.sh ***
@@ -213840,1727 +218195,6 @@
 1..82
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3512-cherry-pick-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/.git/
-expecting success of 3512.1 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1/.git/
-[main (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2/.git/
-[main (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/.git/
-[main (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'main'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-[no_submodule 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_test_func: added submodule creates empty directory
-
-expecting success of 3512.2 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-[no_submodule 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 3512.3 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-[replace_sub1_with_file 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 3512.4 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-[replace_sub1_with_directory a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_test_func: replace directory with submodule
-
-expecting success of 3512.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-[add_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 3512.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-[add_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 3512.7 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-fatal: cherry-pick failed
-ok 7 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 3512.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-fatal: cherry-pick failed
-ok 8 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 3512.9 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-[add_sub1 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
-not ok 9 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 3512.10 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-[add_sub1 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git cherry-pick replace_sub1_with_file
-not ok 10 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 3512.11 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-[add_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 3512.12 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-[add_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git_test_func: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 3512.13 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-[invalid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 3512.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-fatal: cherry-pick failed
-ok 14 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 3512.15 'unrelated submodule/file conflict is ignored': 
-	test_config_global protocol.file.allow always &&
-
-	test_create_repo sub &&
-
-	touch sub/file &&
-	git -C sub add file &&
-	git -C sub commit -m "add a file in a submodule" &&
-
-	test_create_repo a_repo &&
-	(
-		cd a_repo &&
-		>a_file &&
-		git add a_file &&
-		git commit -m "add a file" &&
-
-		git branch test &&
-		git checkout test &&
-
-		mkdir sub &&
-		>sub/content &&
-		git add sub/content &&
-		git commit -m "add a regular folder with name sub" &&
-
-		echo "123" >a_file &&
-		git add a_file &&
-		git commit -m "modify a file" &&
-
-		git checkout main &&
-
-		git submodule add ../sub sub &&
-		git submodule update sub &&
-		git commit -m "add a submodule info folder with name sub" &&
-
-		git cherry-pick test
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/sub/.git/
-[main (root-commit) 8e92946] add a file in a submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/a_repo/.git/
-[main (root-commit) ab27302] add a file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a_file
-Switched to branch 'test'
-[test 472972d] add a regular folder with name sub
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 sub/content
-[test 32d3b70] modify a file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3512-cherry-pick-submodule/a_repo/sub'...
-done.
-[main 77c71a9] add a submodule info folder with name sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[main ec77434] modify a file
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 15 - unrelated submodule/file conflict is ignored
-
-# still have 2 known breakage(s)
-# passed all remaining 13 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3705-add-sparse-checkout.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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 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 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 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3513-revert-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3513-revert-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3902-quoted.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3902-quoted/.git/
-expecting success of 3902.1 'setup': 
-
-	mkdir "$FN" &&
-	for_each_name "echo initial >\"\$name\"" &&
-	git add . &&
-	git commit -q -m Initial &&
-
-	for_each_name "echo second >\"\$name\"" &&
-	git commit -a -m Second &&
-
-	for_each_name "echo modified >\"\$name\""
-
-
-[master 6e4313d] Second
- Author: A U Thor <author@example.com>
- 11 files changed, 11 insertions(+), 11 deletions(-)
-ok 1 - setup
-
-expecting success of 3902.2 'setup expected files': 
-cat >expect.quoted <<\EOF &&
-Name
-"Name and a\nLF"
-"Name and an\tHT"
-"Name\""
-With SP in it
-"\346\277\261\351\207\216\t\347\264\224"
-"\346\277\261\351\207\216\n\347\264\224"
-"\346\277\261\351\207\216 \347\264\224"
-"\346\277\261\351\207\216\"\347\264\224"
-"\346\277\261\351\207\216/file"
-"\346\277\261\351\207\216\347\264\224"
-EOF
-
-cat >expect.raw <<\EOF
-Name
-"Name and a\nLF"
-"Name and an\tHT"
-"Name\""
-With SP in it
-"濱野\t純"
-"濱野\n純"
-濱野 純
-"濱野\"純"
-濱野/file
-濱野純
-EOF
-
-ok 2 - setup expected files
-
-expecting success of 3902.3 'check fully quoted output from ls-files': 
-
-	git ls-files >current && test_cmp expect.quoted current
-
-
-ok 3 - check fully quoted output from ls-files
-
-expecting success of 3902.4 'check fully quoted output from diff-files': 
-
-	git diff --name-only >current &&
-	test_cmp expect.quoted current
-
-
-ok 4 - check fully quoted output from diff-files
-
-expecting success of 3902.5 'check fully quoted output from diff-index': 
-
-	git diff --name-only HEAD >current &&
-	test_cmp expect.quoted current
-
-
-ok 5 - check fully quoted output from diff-index
-
-expecting success of 3902.6 'check fully quoted output from diff-tree': 
-
-	git diff --name-only HEAD^ HEAD >current &&
-	test_cmp expect.quoted current
-
-
-ok 6 - check fully quoted output from diff-tree
-
-expecting success of 3902.7 'check fully quoted output from ls-tree': 
-
-	git ls-tree --name-only -r HEAD >current &&
-	test_cmp expect.quoted current
-
-
-ok 7 - check fully quoted output from ls-tree
-
-expecting success of 3902.8 'setting core.quotepath': 
-
-	git config --bool core.quotepath false
-
-
-ok 8 - setting core.quotepath
-
-expecting success of 3902.9 'check fully quoted output from ls-files': 
-
-	git ls-files >current && test_cmp expect.raw current
-
-
-ok 9 - check fully quoted output from ls-files
-
-expecting success of 3902.10 'check fully quoted output from diff-files': 
-
-	git diff --name-only >current &&
-	test_cmp expect.raw current
-
-
-ok 10 - check fully quoted output from diff-files
-
-expecting success of 3902.11 'check fully quoted output from diff-index': 
-
-	git diff --name-only HEAD >current &&
-	test_cmp expect.raw current
-
-
-ok 11 - check fully quoted output from diff-index
-
-expecting success of 3902.12 'check fully quoted output from diff-tree': 
-
-	git diff --name-only HEAD^ HEAD >current &&
-	test_cmp expect.raw current
-
-
-ok 12 - check fully quoted output from diff-tree
-
-expecting success of 3902.13 'check fully quoted output from ls-tree': 
-
-	git ls-tree --name-only -r HEAD >current &&
-	test_cmp expect.raw current
-
-
-ok 13 - check fully quoted output from ls-tree
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3800-mktag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3800-mktag/.git/
 expecting success of 3800.1 'setup': 
@@ -218148,2913 +220782,672 @@
 1..151
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3900-i18n-commit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3901-i18n-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3901-i18n-patch/.git/
-expecting success of 3901.1 'setup': 
-	git config i18n.commitencoding UTF-8 &&
-
-	# use UTF-8 in author and committer name to match the
-	# i18n.commitencoding settings
-	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
-
-	test_tick &&
-	echo "$GIT_AUTHOR_NAME" >mine &&
-	git add mine &&
-	git commit -s -m "Initial commit" &&
-
-	test_tick &&
-	echo Hello world >mine &&
-	git add mine &&
-	git commit -s -m "Second on main" &&
-
-	# the first commit on the side branch is UTF-8
+*** t3905-stash-include-untracked.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 &&
+	git commit -m initial &&
+	echo 2 >file &&
+	git add file &&
+	echo 3 >file &&
 	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
+	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
 
-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
+[master (root-commit) 777c62c] initial
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 theirs
-[test 2f88e21] Revert "Third on side"
- Author: Áéí óú <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 theirs
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?= <author@example.com>
-encoding ISO8859-1
-ok 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)
+ 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
 
-# passed all 20 test(s)
-1..20
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3701-add-interactive.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3701-add-interactive/.git/
-expecting success of 3701.1 'warn about add.interactive.useBuiltin': 
-	cat >expect <<-\EOF &&
-	warning: the add.interactive.useBuiltin setting has been removed!
-	See its entry in 'git help config' for details.
-	No changes.
+expecting success of 3905.2 'stash save --include-untracked cleaned the untracked files': 
+	cat >expect <<-EOF &&
+	?? actual
+	?? expect
 	EOF
 
-	for v in = =true =false
-	do
-		git -c "add.interactive.useBuiltin$v" add -p >out 2>actual &&
-		test_must_be_empty out &&
-		test_cmp expect actual || return 1
-	done
-
-ok 1 - warn about add.interactive.useBuiltin
-
-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
+	git status --porcelain >actual &&
+	test_cmp expect actual
 
-  1:        +1/-0        +2/-0 file
-ok 3 - status works (initial)
+ok 2 - stash save --include-untracked cleaned the untracked files
 
-expecting success of 3701.4 'setup expected': 
-	cat >expected <<-\EOF
+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..d95f3ad
+	index 0000000..$tracked
 	--- /dev/null
-	+++ b/file
+	+++ b/HEAD
 	@@ -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 'setup expected': 
-	cat >expected <<-\EOF
-	EOF
-
-ok 14 - setup expected
-
-expecting success of 3701.15 '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 15 - dummy edit works
-
-expecting success of 3701.16 'setup patch': 
-	cat >patch <<-\EOF
-	@@ -1,1 +1,4 @@
-	 this
-	+patch
-	-does not
-	 apply
-	EOF
-
-ok 16 - setup patch
-
-expecting success of 3701.17 '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 17 - setup fake editor
-
-expecting success of 3701.18 '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 18 - bad edit rejected
-
-expecting success of 3701.19 'setup patch': 
-	cat >patch <<-\EOF
-	this patch
-	is garbage
-	EOF
-
-ok 19 - setup patch
-
-expecting success of 3701.20 '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 20 - garbage edit rejected
-
-expecting success of 3701.21 'setup patch': 
-	cat >patch <<-\EOF
-	@@ -1,0 +1,0 @@
-	 baseline
-	+content
-	+newcontent
-	+lines
-	EOF
-
-ok 21 - setup patch
-
-expecting success of 3701.22 '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 22 - setup expected
-
-expecting success of 3701.23 '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 23 - real edit works
-
-expecting success of 3701.24 'setup file': 
-	test_write_lines a "" b "" c >file &&
-	git add file &&
-	test_write_lines a "" d "" c >file
-
-ok 24 - setup file
-
-expecting success of 3701.25 'setup patch': 
-	SP=" " &&
-	NULL="" &&
-	cat >patch <<-EOF
-	@@ -1,4 +1,4 @@
-	 a
-	$NULL
-	-b
-	+f
-	$SP
-	c
-	EOF
-
-ok 25 - setup patch
-
-expecting success of 3701.26 '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 26 - setup expected
-
-expecting success of 3701.27 '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 27 - edit can strip spaces from empty context lines
-
-expecting success of 3701.28 '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 28 - 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.29 '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 29 - patch does not affect mode
-
-expecting success of 3701.30 '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 30 - stage mode but not hunk
-
-expecting success of 3701.31 '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 31 - stage mode and hunk
-
-expecting success of 3701.32 '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 32 - different prompts for mode change/deleted
-
-expecting success of 3701.33 'correct message when there is nothing to do': 
-	git reset --hard &&
-	git add -p 2>err &&
-	test_grep "No changes" err &&
-	printf "\\0123" >binary &&
-	git add binary &&
-	printf "\\0abc" >binary &&
-	git add -p 2>err &&
-	test_grep "Only binary files changed" err
-
-HEAD is now at 4ef1e3a commit
-No changes.
-Only binary files changed.
-ok 33 - correct message when there is nothing to do
-
-expecting success of 3701.34 '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 34 - setup again
-
-expecting success of 3701.35 '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
+	+1
 	diff --git a/file2 b/file2
-	index 8422d40..35b930a 100644
-	--- a/file2
+	new file mode 100644
+	index 0000000..$tracked
+	--- /dev/null
 	+++ b/file2
-	@@ -1,4 +1,5 @@
-	-A
-	+Z
-	 B
-	+Y
-	 C
-	-D
-	+X
+	@@ -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
 
-ok 35 - setup patch
+	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
 
-expecting success of 3701.36 '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 3 - stash save --include-untracked stashed the untracked files
 
-ok 36 - setup expected
+expecting success of 3905.4 'stash save --patch --include-untracked fails': 
+	test_must_fail git stash --patch --include-untracked
 
-expecting success of 3701.37 '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
+Can't use --patch and --include-untracked or --all at the same time
+ok 4 - stash save --patch --include-untracked fails
 
-[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 37 - add first line works
+expecting success of 3905.5 'stash save --patch --all fails': 
+	test_must_fail git stash --patch --all
 
-expecting success of 3701.38 '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
+Can't use --patch and --include-untracked or --all at the same time
+ok 5 - stash save --patch --all fails
 
-ok 38 - setup expected
+expecting success of 3905.6 'clean up untracked/untracked file to prepare for next tests': 
+	git clean --force --quiet
 
-expecting success of 3701.39 '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 39 - deleting a non-empty file
+ok 6 - clean up untracked/untracked file to prepare for next tests
 
-expecting success of 3701.40 'setup expected': 
-	cat >expected <<-\EOF
-	diff --git a/empty b/empty
-	deleted file mode 100644
-	index e69de29..0000000
+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
 
-ok 40 - setup expected
+	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
 
-expecting success of 3701.41 '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
+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
 
-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 41 - deleting an empty file
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	HEAD
+	expect
+	file2
+	untracked/
 
-expecting success of 3701.42 '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 &&
+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
 
-		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 3905.8 'clean up untracked/ directory to prepare for next tests': 
+	git clean --force --quiet -d
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 42 - adding an empty file
+ok 8 - clean up untracked/ directory to prepare for next tests
 
-expecting success of 3701.43 'split hunk setup': 
-	git reset --hard &&
-	test_write_lines 10 20 30 40 50 60 >test &&
-	git add test &&
+expecting success of 3905.9 'stash save -u dirty index': 
+	echo 4 >file3 &&
+	git add file3 &&
 	test_tick &&
-	git commit -m test &&
-
-	test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
+	git stash -u
 
-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 43 - split hunk setup
+Saved working directory and index state WIP on master: 777c62c initial
+ok 9 - stash save -u dirty index
 
-expecting success of 3701.44 'goto hunk': 
-	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,?]?_
+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
-	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 44 - goto hunk
 
-expecting success of 3701.45 'navigate to hunk via regex': 
+	git stash pop --index &&
 	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 45 - navigate to hunk via regex
-
-expecting success of 3701.46 '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 46 - split hunk "add -p (edit)"
-
-expecting success of 3701.47 '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 47 - split hunk "add -p (no, yes, edit)"
-
-expecting success of 3701.48 '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 48 - split hunk with incomplete line at end
-
-expecting success of 3701.49 '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
-
-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 49 - edit, adding lines to the first hunk
-
-expecting success of 3701.50 '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
-
-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 50 - patch mode ignores unmerged entries
-
-expecting success of 3701.51 'index is refreshed after applying patch': 
-	git reset --hard &&
-	echo content >test &&
-	printf y | git add -p &&
-	git diff-files --exit-code
-
-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 51 - index is refreshed after applying patch
-
-expecting success of 3701.52 'diffs can be colorized': 
-	git reset --hard &&
-
-	echo content >test &&
-	printf y >y &&
-	force_color git add -p >output 2>&1 <y &&
-	git diff-files --exit-code &&
+	test_cmp expect actual
 
-	# 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
+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
 
-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 52 - diffs can be colorized
+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 3701.53 '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 &&
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
 
-	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 &&
+Dropped refs/stash@{0} (6fe995aa91ff10c4e2af89ab165bd888828517d0)
+Unstaged changes after reset:
+M	file
+ok 10 - stash save --include-untracked dirty index got stashed
 
-	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 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
 
-	<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 &&
+ok 11 - stash save --include-untracked -q is quiet
 
-	: 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 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
 
-HEAD is now at 095e8c6 main
-           staged     unstaged path
-  1:        +3/-0        +2/-1 color-test
+Saved working directory and index state WIP on master: 777c62c initial
+ok 12 - stash save --include-untracked removed 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 53 - colors can be overridden
+expecting success of 3905.13 'stash save --include-untracked removed files got stashed': 
+	git stash pop &&
+	test_path_is_missing file
 
-expecting success of 3701.54 '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 &&
+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
 
-	test_write_lines quit >input &&
-	git add -i >actual <input &&
+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
 
-	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.
+expecting success of 3905.14 'stash save --include-untracked respects .gitignore': 
+	cat >.gitignore <<-EOF &&
+	.gitignore
+	ignored
+	ignored.d/
 	EOF
 
-	test_cmp expect actual
-
-HEAD is now at 095e8c6 main
-rm 'bracket-test'
-ok 54 - brackets appear without color
+	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 3701.55 '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 &&
+Saved working directory and index state WIP on master: 777c62c initial
+ok 14 - stash save --include-untracked respects .gitignore
 
-	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 3905.15 'stash save -u can stash with only untracked files different': 
+	echo 4 >file4 &&
+	git stash -u &&
+	test_path_is_missing file4
 
-HEAD is now at 095e8c6 main
-rm 'color-test'
-ok 55 - colors can be skipped with color.ui=false
+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 3701.56 'colorized diffs respect diff.wsErrorHighlight': 
-	git reset --hard &&
+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
 
-	echo "old " >test &&
-	git add test &&
-	echo "new " >test &&
+Saved working directory and index state WIP on master: 777c62c initial
+ok 16 - stash save --all does not respect .gitignore
 
-	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 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
 
-HEAD is now at 095e8c6 main
-<RED>-<RESET><RED>old<RESET><BRED> <RESET>
-ok 56 - colorized diffs respect diff.wsErrorHighlight
+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 3701.57 'diffFilter filters diff': 
-	git reset --hard &&
+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
 
-	echo content >test &&
-	test_config interactive.diffFilter "sed s/^/foo:/" &&
-	printf y >y &&
-	force_color git add -p >output 2>&1 <y &&
+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
 
-	# avoid depending on the exact coloring or content of the prompts,
-	# and just make sure we saw our diff prefixed
-	grep foo:.*content output
+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
 
-HEAD is now at 095e8c6 main
-foo:+content
-ok 57 - diffFilter filters diff
+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 3701.58 'detect bogus diffFilter output': 
-	git reset --hard &&
+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
 
-	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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	bar
 
-HEAD is now at 095e8c6 main
-error: mismatched output from interactive.diffFilter
-ok 58 - detect bogus diffFilter output
+Dropped refs/stash@{0} (35eb97973117e33f4570df8b356a559959935987)
+ok 19 - stash push with $IFS character
 
-expecting success of 3701.59 'handle iffy colored hunk headers': 
-	git reset --hard &&
+expecting success of 3905.20 'stash previously ignored file': 
+	cat >.gitignore <<-EOF &&
+	ignored
+	ignored.d/*
+	EOF
 
-	echo content >test &&
-	printf n >n &&
-	force_color git -c interactive.diffFilter="sed s/.*@@.*/XX/" \
-		add -p >output 2>&1 <n &&
-	grep "^XX$" output
+	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
 
-HEAD is now at 095e8c6 main
-XX
-ok 59 - handle iffy colored hunk headers
+[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 3701.60 '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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	bar
+	foo
+	foo bar
+	ignored.d/
 
-HEAD is now at 095e8c6 main
-ok 60 - handle very large filtered diff
+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 3701.61 'diff.algorithm is passed to `git diff-files`': 
-	git reset --hard &&
+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
 
-	>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
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 21 - stash -u -- <untracked> doesnt print error
 
-HEAD is now at 095e8c6 main
-error: option diff-algorithm accepts "myers", "minimal", "patience" and "histogram"
-ok 61 - diff.algorithm is passed to `git diff-files`
+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 3701.62 'patch-mode via -i prompts for files': 
-	git reset --hard &&
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 22 - stash -u -- <untracked> leaves rest of working tree in place
 
-	echo one >file &&
-	echo two >test &&
-	git add -i <<-\EOF &&
-	patch
-	test
+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
 
-	y
-	quit
-	EOF
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 23 - stash -u -- <tracked> <untracked> clears changes in both
 
-	echo test >expect &&
-	git diff --cached --name-only >actual &&
-	diff_cmp expect actual
+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
 
-HEAD is now at 095e8c6 main
-           staged     unstaged path
-  1:    unchanged        +1/-2 file
-  2:    unchanged        +1/-6 test
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 24 - stash --all -- <ignored> stashes ignored 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/-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 62 - patch-mode via -i prompts for files
+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 3701.63 'add -p handles globs': 
-	git reset --hard &&
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 25 - stash --all -- <tracked> <ignored> clears changes in both
 
-	mkdir -p subdir &&
-	echo base >one.c &&
-	echo base >subdir/two.c &&
-	git add "*.c" &&
-	git commit -m base &&
+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
 
-	echo change >one.c &&
-	echo change >subdir/two.c &&
-	git add -p "*.c" <<-\EOF &&
-	y
-	y
-	EOF
+No local changes to save
+ok 26 - stash -u -- <ignored> leaves ignored file alone
 
-	cat >expect <<-\EOF &&
-	one.c
-	subdir/two.c
-	EOF
-	git diff --cached --name-only >actual &&
+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
 
-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 63 - add -p handles globs
+ok 27 - stash -u -- <non-existent> shows no changes when there are none
 
-expecting success of 3701.64 'add -p handles relative paths': 
-	git reset --hard &&
+expecting success of 3905.28 'stash -u with globs': 
+	>untracked.txt &&
+	git stash -u -- ":(glob)**/*.txt" &&
+	test_path_is_missing untracked.txt
 
-	echo base >relpath.c &&
-	git add "*.c" &&
-	git commit -m relpath &&
+Saved working directory and index state WIP on master: 14579a4 Add .gitignore
+ok 28 - stash -u with globs
 
-	echo change >relpath.c &&
-	mkdir -p subdir &&
-	git -C subdir add -p .. 2>error <<-\EOF &&
-	y
-	EOF
+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 &&
 
-	test_must_be_empty error &&
+	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 &&
 
-	cat >expect <<-\EOF &&
-	relpath.c
+	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 diff --cached --name-only >actual &&
+	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
 
-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 64 - add -p handles relative paths
+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 3701.65 'add -p does not expand argument lists': 
+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 &&
 
-	echo content >not-changed &&
-	git add not-changed &&
-	git commit -m "add not-changed file" &&
-
-	echo change >file &&
-	GIT_TRACE=$(pwd)/trace.out git add -p . <<-\EOF &&
-	y
+	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 &&
 
-	# 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
+	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
 
-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 65 - add -p does not expand argument lists
+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 3701.66 'hunk-editing handles custom comment char': 
+expecting success of 3905.31 'stash show --no-include-untracked cancels --{include,only}-untracked': 
 	git reset --hard &&
-	echo change >>file &&
-	test_config core.commentChar "\$" &&
-	echo e | GIT_EDITOR=true git add -p &&
-	git diff --exit-code
-
-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 66 - hunk-editing handles custom comment char
+	git clean -xf &&
+	>untracked &&
+	>tracked &&
+	git add tracked &&
+	git stash -u &&
 
-expecting success of 3701.67 '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 &&
+	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
 
-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 67 - add -p works even with color.ui=always
-
-expecting success of 3701.68 '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 &&
+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
 
-		cd dirty-head &&
-		test_commit updated &&
-		cd ../dirty-both-ways &&
-		test_commit updated &&
-		echo dirty >>initial &&
-		: >untracked &&
-		cd ../dirty-otherwise &&
-		echo dirty >>initial &&
-		: >untracked
+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"
 	) &&
-	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
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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 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 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 68 - setup different kinds of dirty submodules
+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 3701.69 '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 3905.33 'stash show --{include,only}-untracked on stashes without untracked entries': 
+	git reset --hard &&
+	git clean -xf &&
+	>tracked &&
+	git add tracked &&
+	git stash &&
 
-  2:    unchanged        +1/-1 dirty-head
-  1:    unchanged        +1/-1 dirty-both-ways
-ok 69 - status ignores dirty submodules (except HEAD)
+	git stash show >expect &&
+	git stash show --include-untracked >actual &&
+	test_cmp expect actual &&
 
-expecting success of 3701.70 'handle submodules': 
-	echo 123 >>for-submodules/dirty-otherwise/initial.t &&
+	git stash show --only-untracked >actual &&
+	test_must_be_empty actual
 
-	force_color git -C for-submodules add -p dirty-otherwise >output 2>&1 &&
-	grep "No changes" output &&
+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
 
-	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 3905.34 'stash -u ignores sub-repository': 
+	test_when_finished "rm -rf sub-repo" &&
+	git init sub-repo &&
+	git stash -u
 
-No changes.
-160000 f10ac08dbe6eaf5e88125c402669e6f9b7076181 0	dirty-head
-ok 70 - handle submodules
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 3701.71 '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
+# passed all 34 test(s)
+1..34
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3907-stash-show-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3907-stash-show-config/.git/
+expecting success of 3907.1 'setup': 
+	test_commit file
 
-HEAD is now at 86e6db4 add not-changed file
-[main 9e98a5e] a
+[master (root-commit) 4c1911f] file
  Author: A U Thor <author@example.com>
- 1 file changed, 11 insertions(+)
- create mode 100644 a
-ok 71 - set up pathological context
-
-expecting success of 3701.72 '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
-
-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 72 - add -p works with pathological context lines
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+ok 1 - setup
 
-expecting success of 3701.73 '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 3907.2 'showStat unset showPatch unset': 
+	test_stat_and_patch "<unset>" "<unset>" --stat
 
-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 73 - add -p patch editing works with pathological context lines
+Saved working directory and index state WIP on master: 4c1911f file
+ok 2 - showStat unset showPatch unset
 
-expecting success of 3701.74 '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 3907.3 'showStat unset showPatch false': 
+	test_stat_and_patch "<unset>" false --stat
 
-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 74 - checkout -p works with pathological context lines
+Saved working directory and index state WIP on master: 4c1911f file
+ok 3 - showStat unset showPatch false
 
-expecting success of 3701.75 '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 3907.4 'showStat unset showPatch true': 
+	test_stat_and_patch "<unset>" true --stat -p
 
-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 75 - add -N followed by add -p patch editing
+Saved working directory and index state WIP on master: 4c1911f file
+ok 4 - showStat unset showPatch true
 
-expecting success of 3701.76 '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 3907.5 'showStat false showPatch unset': 
+	test_stat_and_patch false "<unset>"
 
-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 76 - checkout -p patch editing of added file
+Saved working directory and index state WIP on master: 4c1911f file
+ok 5 - showStat false showPatch unset
 
-expecting success of 3701.77 'show help from add--helper': 
-	git reset --hard &&
-	cat >expect <<-EOF &&
+expecting success of 3907.6 'showStat false showPatch false': 
+	test_stat_and_patch false false
 
-	<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
+Saved working directory and index state WIP on master: 4c1911f file
+ok 6 - showStat false showPatch false
 
-HEAD is now at 4a33265 remove new file
-ok 77 - show help from add--helper
+expecting success of 3907.7 'showStat false showPatch true': 
+	test_stat_and_patch false true -p
 
-expecting success of 3701.78 '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 &&
+Saved working directory and index state WIP on master: 4c1911f file
+ok 7 - showStat false showPatch true
 
-	# this is a noop with only an unmerged entry
-	git reset -p &&
+expecting success of 3907.8 'showStat true showPatch unset': 
+	test_stat_and_patch true "<unset>" --stat
 
-	# add files that sort before and after unmerged entry
-	echo a >a &&
-	echo z >z &&
-	git add a z &&
+Saved working directory and index state WIP on master: 4c1911f file
+ok 8 - showStat true showPatch unset
 
-	# 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
+expecting success of 3907.9 'showStat true showPatch false': 
+	test_stat_and_patch true false --stat
 
-[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
+Saved working directory and index state WIP on master: 4c1911f file
+ok 9 - showStat true showPatch false
 
-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
+expecting success of 3907.10 'showStat true showPatch true': 
+	test_stat_and_patch true true --stat -p
 
-warning: refname 'main' is ambiguous.
-Switched to branch 'main'
-ok 78 - reset -p with unmerged files
+Saved working directory and index state WIP on master: 4c1911f file
+ok 10 - showStat true showPatch true
 
-# passed all 78 test(s)
-1..78
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3908-stash-in-worktree.sh ***
@@ -221094,6 +221487,24 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3910-mac-os-precompose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3910-mac-os-precompose/.git/
+checking prerequisite: UTF8_NFD_TO_NFC
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+	# check whether FS converts nfd unicode to nfc
+	auml=$(printf "\303\244")
+	aumlcdiar=$(printf "\141\314\210")
+	>"$auml" &&
+	test -f "$aumlcdiar"
+
+)
+prerequisite UTF8_NFD_TO_NFC not satisfied
+1..0 # SKIP filesystem does not corrupt utf-8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3909-stash-pathspec-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3909-stash-pathspec-file/.git/
 expecting success of 3909.1 'setup': 
@@ -221204,419 +221615,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3907-stash-show-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3907-stash-show-config/.git/
-expecting success of 3907.1 'setup': 
-	test_commit file
-
-[master (root-commit) 4c1911f] file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-ok 1 - setup
-
-expecting success of 3907.2 'showStat unset showPatch unset': 
-	test_stat_and_patch "<unset>" "<unset>" --stat
-
-Saved working directory and index state WIP on master: 4c1911f file
-ok 2 - showStat unset showPatch unset
-
-expecting success of 3907.3 'showStat unset showPatch false': 
-	test_stat_and_patch "<unset>" false --stat
-
-Saved working directory and index state WIP on master: 4c1911f file
-ok 3 - showStat unset showPatch false
-
-expecting success of 3907.4 'showStat unset showPatch true': 
-	test_stat_and_patch "<unset>" true --stat -p
-
-Saved working directory and index state WIP on master: 4c1911f file
-ok 4 - showStat unset showPatch true
-
-expecting success of 3907.5 'showStat false showPatch unset': 
-	test_stat_and_patch false "<unset>"
-
-Saved working directory and index state WIP on master: 4c1911f file
-ok 5 - showStat false showPatch unset
-
-expecting success of 3907.6 'showStat false showPatch false': 
-	test_stat_and_patch false false
-
-Saved working directory and index state WIP on master: 4c1911f file
-ok 6 - showStat false showPatch false
-
-expecting success of 3907.7 'showStat false showPatch true': 
-	test_stat_and_patch false true -p
-
-Saved working directory and index state WIP on master: 4c1911f file
-ok 7 - showStat false showPatch true
-
-expecting success of 3907.8 'showStat true showPatch unset': 
-	test_stat_and_patch true "<unset>" --stat
-
-Saved working directory and index state WIP on master: 4c1911f file
-ok 8 - showStat true showPatch unset
-
-expecting success of 3907.9 'showStat true showPatch false': 
-	test_stat_and_patch true false --stat
-
-Saved working directory and index state WIP on master: 4c1911f file
-ok 9 - showStat true showPatch false
-
-expecting success of 3907.10 'showStat true showPatch true': 
-	test_stat_and_patch true true --stat -p
-
-Saved working directory and index state WIP on master: 4c1911f file
-ok 10 - showStat true showPatch true
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3910-mac-os-precompose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3910-mac-os-precompose/.git/
-checking prerequisite: UTF8_NFD_TO_NFC
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-	# check whether FS converts nfd unicode to nfc
-	auml=$(printf "\303\244")
-	aumlcdiar=$(printf "\141\314\210")
-	>"$auml" &&
-	test -f "$aumlcdiar"
-
-)
-prerequisite UTF8_NFD_TO_NFC not satisfied
-1..0 # SKIP filesystem does not corrupt utf-8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3904-stash-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t3920-crlf-messages.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3920-crlf-messages/.git/
 expecting success of 3920.1 'Setup refs with commit and tag messages using CRLF': 
@@ -221844,6 +221842,511 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4001-diff-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4001-diff-rename/.git/
+expecting success of 4001.1 'setup': 
+	cat >path0 <<-\EOF &&
+	Line 1
+	Line 2
+	Line 3
+	Line 4
+	Line 5
+	Line 6
+	Line 7
+	Line 8
+	Line 9
+	Line 10
+	line 11
+	Line 12
+	Line 13
+	Line 14
+	Line 15
+	EOF
+	cat >expected <<-\EOF &&
+	diff --git a/path0 b/path1
+	rename from path0
+	rename to path1
+	--- a/path0
+	+++ b/path1
+	@@ -8,7 +8,7 @@ Line 7
+	 Line 8
+	 Line 9
+	 Line 10
+	-line 11
+	+Line 11
+	 Line 12
+	 Line 13
+	 Line 14
+	EOF
+	cat >no-rename <<-\EOF
+	diff --git a/path0 b/path0
+	deleted file mode 100644
+	index fdbec44..0000000
+	--- a/path0
+	+++ /dev/null
+	@@ -1,15 +0,0 @@
+	-Line 1
+	-Line 2
+	-Line 3
+	-Line 4
+	-Line 5
+	-Line 6
+	-Line 7
+	-Line 8
+	-Line 9
+	-Line 10
+	-line 11
+	-Line 12
+	-Line 13
+	-Line 14
+	-Line 15
+	diff --git a/path1 b/path1
+	new file mode 100644
+	index 0000000..752c50e
+	--- /dev/null
+	+++ b/path1
+	@@ -0,0 +1,15 @@
+	+Line 1
+	+Line 2
+	+Line 3
+	+Line 4
+	+Line 5
+	+Line 6
+	+Line 7
+	+Line 8
+	+Line 9
+	+Line 10
+	+Line 11
+	+Line 12
+	+Line 13
+	+Line 14
+	+Line 15
+	EOF
+
+ok 1 - setup
+
+expecting success of 4001.2 'update-index --add a file.': git update-index --add path0
+ok 2 - update-index --add a file.
+
+expecting success of 4001.3 'write that tree.': tree=$(git write-tree) && echo $tree
+ad8378482f032562f72403dd7c5bd607578a3f0e
+ok 3 - write that tree.
+
+expecting success of 4001.4 'renamed and edited the file.': git update-index --add --remove path0 path1
+ok 4 - renamed and edited the file.
+
+expecting success of 4001.5 'git diff-index -p -M after rename and editing.': git diff-index -p -M $tree >current
+ok 5 - git diff-index -p -M after rename and editing.
+
+expecting success of 4001.6 'validate the output.': compare_diff_patch current expected
+ok 6 - validate the output.
+
+expecting success of 4001.7 'test diff.renames=true': 
+	git -c diff.renames=true diff --cached $tree >current &&
+	compare_diff_patch current expected
+
+ok 7 - test diff.renames=true
+
+expecting success of 4001.8 'test diff.renames=false': 
+	git -c diff.renames=false diff --cached $tree >current &&
+	compare_diff_patch current no-rename
+
+ok 8 - test diff.renames=false
+
+expecting success of 4001.9 'test diff.renames unset': 
+	git diff --cached $tree >current &&
+	compare_diff_patch current expected
+
+ok 9 - test diff.renames unset
+
+expecting success of 4001.10 'favour same basenames over different ones': 
+	cp path1 another-path &&
+	git add another-path &&
+	git commit -m 1 &&
+	git rm path1 &&
+	mkdir subdir &&
+	git mv another-path subdir/path1 &&
+	git status >out &&
+	test_grep "renamed: .*path1 -> subdir/path1" out
+
+[master (root-commit) 7846fdf] 1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 30 insertions(+)
+ create mode 100644 another-path
+ create mode 100644 path1
+rm 'path1'
+	renamed:    path1 -> subdir/path1
+ok 10 - favour same basenames over different ones
+
+expecting success of 4001.11 'test diff.renames=true for git status': 
+	git -c diff.renames=true status >out &&
+	test_grep "renamed: .*path1 -> subdir/path1" out
+
+	renamed:    path1 -> subdir/path1
+ok 11 - test diff.renames=true for git status
+
+expecting success of 4001.12 'test diff.renames=false for git status': 
+	git -c diff.renames=false status >out &&
+	test_grep ! "renamed: .*path1 -> subdir/path1" out &&
+	test_grep "new file: .*subdir/path1" out &&
+	test_grep "deleted: .*[^/]path1" out
+
+	new file:   subdir/path1
+	deleted:    path1
+ok 12 - test diff.renames=false for git status
+
+expecting success of 4001.13 'favour same basenames even with minor differences': 
+	git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
+	git status >out &&
+	test_grep "renamed: .*path1 -> subdir/path1" out
+
+	renamed:    path1 -> subdir/path1
+ok 13 - favour same basenames even with minor differences
+
+expecting success of 4001.14 'two files with same basename and same content': 
+	git reset --hard &&
+	mkdir -p dir/A dir/B &&
+	cp path1 dir/A/file &&
+	cp path1 dir/B/file &&
+	git add dir &&
+	git commit -m 2 &&
+	git mv dir other-dir &&
+	git status >out &&
+	test_grep "renamed: .*dir/A/file -> other-dir/A/file" out
+
+HEAD is now at 7846fdf 1
+[master 05f0b7a] 2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 30 insertions(+)
+ create mode 100644 dir/A/file
+ create mode 100644 dir/B/file
+	renamed:    dir/A/file -> other-dir/A/file
+ok 14 - two files with same basename and same content
+
+expecting success of 4001.15 'setup for many rename source candidates': 
+	git reset --hard &&
+	for i in 0 1 2 3 4 5 6 7 8 9;
+	do
+		for j in 0 1 2 3 4 5 6 7 8 9;
+		do
+			echo "$i$j" >"path$i$j" || return 1
+		done
+	done &&
+	git add "path??" &&
+	test_tick &&
+	git commit -m "hundred" &&
+	(cat path1 && echo new) >new-path &&
+	echo old >>path1 &&
+	git add new-path path1 &&
+	git diff -l 4 -C -C --cached --name-status >actual 2>actual.err &&
+	sed -e "s/^\([CM]\)[0-9]*	/\1	/" actual >actual.munged &&
+	cat >expect <<-EOF &&
+	C	path1	new-path
+	M	path1
+	EOF
+	test_cmp expect actual.munged &&
+	grep warning actual.err
+
+HEAD is now at 05f0b7a 2
+[master c0eb1c8] hundred
+ Author: A U Thor <author@example.com>
+ 100 files changed, 100 insertions(+)
+ create mode 100644 path00
+ create mode 100644 path01
+ create mode 100644 path02
+ create mode 100644 path03
+ create mode 100644 path04
+ create mode 100644 path05
+ create mode 100644 path06
+ create mode 100644 path07
+ create mode 100644 path08
+ create mode 100644 path09
+ create mode 100644 path10
+ create mode 100644 path11
+ create mode 100644 path12
+ create mode 100644 path13
+ create mode 100644 path14
+ create mode 100644 path15
+ create mode 100644 path16
+ create mode 100644 path17
+ create mode 100644 path18
+ create mode 100644 path19
+ create mode 100644 path20
+ create mode 100644 path21
+ create mode 100644 path22
+ create mode 100644 path23
+ create mode 100644 path24
+ create mode 100644 path25
+ create mode 100644 path26
+ create mode 100644 path27
+ create mode 100644 path28
+ create mode 100644 path29
+ create mode 100644 path30
+ create mode 100644 path31
+ create mode 100644 path32
+ create mode 100644 path33
+ create mode 100644 path34
+ create mode 100644 path35
+ create mode 100644 path36
+ create mode 100644 path37
+ create mode 100644 path38
+ create mode 100644 path39
+ create mode 100644 path40
+ create mode 100644 path41
+ create mode 100644 path42
+ create mode 100644 path43
+ create mode 100644 path44
+ create mode 100644 path45
+ create mode 100644 path46
+ create mode 100644 path47
+ create mode 100644 path48
+ create mode 100644 path49
+ create mode 100644 path50
+ create mode 100644 path51
+ create mode 100644 path52
+ create mode 100644 path53
+ create mode 100644 path54
+ create mode 100644 path55
+ create mode 100644 path56
+ create mode 100644 path57
+ create mode 100644 path58
+ create mode 100644 path59
+ create mode 100644 path60
+ create mode 100644 path61
+ create mode 100644 path62
+ create mode 100644 path63
+ create mode 100644 path64
+ create mode 100644 path65
+ create mode 100644 path66
+ create mode 100644 path67
+ create mode 100644 path68
+ create mode 100644 path69
+ create mode 100644 path70
+ create mode 100644 path71
+ create mode 100644 path72
+ create mode 100644 path73
+ create mode 100644 path74
+ create mode 100644 path75
+ create mode 100644 path76
+ create mode 100644 path77
+ create mode 100644 path78
+ create mode 100644 path79
+ create mode 100644 path80
+ create mode 100644 path81
+ create mode 100644 path82
+ create mode 100644 path83
+ create mode 100644 path84
+ create mode 100644 path85
+ create mode 100644 path86
+ create mode 100644 path87
+ create mode 100644 path88
+ create mode 100644 path89
+ create mode 100644 path90
+ create mode 100644 path91
+ create mode 100644 path92
+ create mode 100644 path93
+ create mode 100644 path94
+ create mode 100644 path95
+ create mode 100644 path96
+ create mode 100644 path97
+ create mode 100644 path98
+ create mode 100644 path99
+warning: only found copies from modified paths due to too many files.
+warning: you may want to set your diff.renameLimit variable to at least 104 and retry the command.
+ok 15 - setup for many rename source candidates
+
+expecting success of 4001.16 'rename pretty print with nothing in common': 
+	mkdir -p a/b/ &&
+	: >a/b/c &&
+	git add a/b/c &&
+	git commit -m "create a/b/c" &&
+	mkdir -p c/b/ &&
+	git mv a/b/c c/b/a &&
+	git commit -m "a/b/c -> c/b/a" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " a/b/c => c/b/a " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " a/b/c => c/b/a " output
+
+[master 5d0663c] create a/b/c
+ Author: A U Thor <author@example.com>
+ 3 files changed, 17 insertions(+)
+ create mode 100644 a/b/c
+ create mode 100644 new-path
+[master 24096e6] a/b/c -> c/b/a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a/b/c => c/b/a (100%)
+ rename a/b/c => c/b/a (100%)
+ a/b/c => c/b/a | 0
+ok 16 - rename pretty print with nothing in common
+
+expecting success of 4001.17 'rename pretty print with common prefix': 
+	mkdir -p c/d &&
+	git mv c/b/a c/d/e &&
+	git commit -m "c/b/a -> c/d/e" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " c/{b/a => d/e} " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " c/{b/a => d/e} " output
+
+[master e15a3a1] c/b/a -> c/d/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename c/{b/a => d/e} (100%)
+ rename c/{b/a => d/e} (100%)
+ c/{b/a => d/e} | 0
+ok 17 - rename pretty print with common prefix
+
+expecting success of 4001.18 'rename pretty print with common suffix': 
+	mkdir d &&
+	git mv c/d/e d/e &&
+	git commit -m "c/d/e -> d/e" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " {c/d => d}/e " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " {c/d => d}/e " output
+
+[master aafbd77] c/d/e -> d/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {c/d => d}/e (100%)
+ rename {c/d => d}/e (100%)
+ {c/d => d}/e | 0
+ok 18 - rename pretty print with common suffix
+
+expecting success of 4001.19 'rename pretty print with common prefix and suffix': 
+	mkdir d/f &&
+	git mv d/e d/f/e &&
+	git commit -m "d/e -> d/f/e" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " d/{ => f}/e " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " d/{ => f}/e " output
+
+[master 28b412a] d/e -> d/f/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename d/{ => f}/e (100%)
+ rename d/{ => f}/e (100%)
+ d/{ => f}/e | 0
+ok 19 - rename pretty print with common prefix and suffix
+
+expecting success of 4001.20 'rename pretty print common prefix and suffix overlap': 
+	mkdir d/f/f &&
+	git mv d/f/e d/f/f/e &&
+	git commit -m "d/f/e d/f/f/e" &&
+	git diff -M --summary HEAD^ HEAD >output &&
+	test_grep " d/f/{ => f}/e " output &&
+	git diff -M --stat HEAD^ HEAD >output &&
+	test_grep " d/f/{ => f}/e " output
+
+[master 272fc8d] d/f/e d/f/f/e
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename d/f/{ => f}/e (100%)
+ rename d/f/{ => f}/e (100%)
+ d/f/{ => f}/e | 0
+ok 20 - rename pretty print common prefix and suffix overlap
+
+expecting success of 4001.21 'diff-tree -l0 defaults to a big rename limit, not zero': 
+	test_write_lines line1 line2 line3 >myfile &&
+	git add myfile &&
+	git commit -m x &&
+
+	test_write_lines line1 line2 line4 >myotherfile &&
+	git rm myfile &&
+	git add myotherfile &&
+	git commit -m x &&
+
+	git diff-tree -M -l0 HEAD HEAD^ >actual &&
+	# Verify that a rename from myotherfile to myfile was detected
+	grep "myotherfile.*myfile" actual
+
+[master a3d2e59] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 myfile
+rm 'myfile'
+[master ff4cac0] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename myfile => myotherfile (66%)
+:100644 100644 cc8654bf0610eedacc646edaf4c1cbda59454836 83db48f84ec878fbfb30b46d16630e944e34f205 R066	myotherfile	myfile
+ok 21 - diff-tree -l0 defaults to a big rename limit, not zero
+
+expecting success of 4001.22 'basename similarity vs best similarity': 
+	mkdir subdir &&
+	test_write_lines line1 line2 line3 line4 line5 \
+			 line6 line7 line8 line9 line10 >subdir/file.txt &&
+	git add subdir/file.txt &&
+	git commit -m "base txt" &&
+
+	git rm subdir/file.txt &&
+	test_write_lines line1 line2 line3 line4 line5 \
+			  line6 line7 line8 >file.txt &&
+	test_write_lines line1 line2 line3 line4 line5 \
+			  line6 line7 line8 line9 >file.md &&
+	git add file.txt file.md &&
+	git commit -a -m "rename" &&
+	git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+	# subdir/file.txt is 88% similar to file.md, 78% similar to file.txt,
+	# but since same basenames are checked first...
+	cat >expected <<-\EOF &&
+	A	file.md
+	R078	subdir/file.txt	file.txt
+	EOF
+	test_cmp expected actual
+
+[master 09a1aec] base txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 subdir/file.txt
+rm 'subdir/file.txt'
+[master 72a9c67] rename
+ Author: A U Thor <author@example.com>
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+ create mode 100644 file.md
+ rename subdir/file.txt => file.txt (78%)
+ok 22 - basename similarity vs best similarity
+
+expecting success of 4001.23 'last line matters too': 
+	{
+		test_write_lines a 0 1 2 3 4 5 6 7 8 9 &&
+		printf "git ignores final up to 63 characters if not newline terminated"
+	} >no-final-lf &&
+	git add no-final-lf &&
+	git commit -m "original version of file with no final newline" &&
+
+	# Change ONLY the first character of the whole file
+	{
+		test_write_lines b 0 1 2 3 4 5 6 7 8 9 &&
+		printf "git ignores final up to 63 characters if not newline terminated"
+	} >no-final-lf &&
+	git add no-final-lf &&
+	git mv no-final-lf still-absent-final-lf &&
+	git commit -a -m "rename no-final-lf -> still-absent-final-lf" &&
+	git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+	sed -e "s/^R[0-9]*	/R	/" actual >actual.munged &&
+	cat >expected <<-\EOF &&
+	R	no-final-lf	still-absent-final-lf
+	EOF
+	test_cmp expected actual.munged
+
+[master b0865a0] original version of file with no final newline
+ Author: A U Thor <author@example.com>
+ 1 file changed, 12 insertions(+)
+ create mode 100644 no-final-lf
+[master bbca1a2] rename no-final-lf -> still-absent-final-lf
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename no-final-lf => still-absent-final-lf (97%)
+ok 23 - last line matters too
+
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4000-diff-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4000-diff-format/.git/
 expecting success of 4000.1 'update-index --add two files with and without +x.': 
@@ -222131,684 +222634,2531 @@
 1..41
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4001-diff-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4001-diff-rename/.git/
-expecting success of 4001.1 'setup': 
-	cat >path0 <<-\EOF &&
-	Line 1
-	Line 2
-	Line 3
-	Line 4
-	Line 5
-	Line 6
-	Line 7
-	Line 8
-	Line 9
-	Line 10
-	line 11
-	Line 12
-	Line 13
-	Line 14
-	Line 15
+*** t4004-diff-rename-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4004-diff-rename-symlink/.git/
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 4004.1 'prepare reference tree': 
+	echo xyzzy | tr -d \\012 >yomin &&
+	ln -s xyzzy frotz &&
+	git update-index --add frotz yomin &&
+	tree=$(git write-tree) &&
+	echo $tree
+
+e8a7292168115b2c189b56bd500aa179ca8d69ba
+ok 1 - prepare reference tree
+
+expecting success of 4004.2 'prepare work tree': 
+	mv frotz rezrov &&
+	rm -f yomin &&
+	ln -s xyzzy nitfol &&
+	ln -s xzzzy bozbar &&
+	git update-index --add --remove frotz rezrov nitfol bozbar yomin
+
+ok 2 - prepare work tree
+
+expecting success of 4004.3 'setup diff output': 
+	GIT_DIFF_OPTS=--unified=0 git diff-index -C -p $tree >current &&
+	cat >expected <<\EOF
+diff --git a/bozbar b/bozbar
+new file mode 120000
+--- /dev/null
++++ b/bozbar
+@@ -0,0 +1 @@
++xzzzy
+\ No newline at end of file
+diff --git a/frotz b/nitfol
+similarity index 100%
+copy from frotz
+copy to nitfol
+diff --git a/frotz b/rezrov
+similarity index 100%
+rename from frotz
+rename to rezrov
+diff --git a/yomin b/yomin
+deleted file mode 100644
+--- a/yomin
++++ /dev/null
+@@ -1 +0,0 @@
+-xyzzy
+\ No newline at end of file
+EOF
+
+ok 3 - setup diff output
+
+expecting success of 4004.4 'validate diff output': 
+	compare_diff_patch current expected
+
+ok 4 - validate diff output
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4003-diff-rename-1.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4003-diff-rename-1/.git/
+expecting success of 4003.1 'prepare reference tree': 
+	COPYING_test_data >COPYING &&
+	echo frotz >rezrov &&
+	git update-index --add COPYING rezrov &&
+	tree=$(git write-tree) &&
+	echo $tree
+
+f7f2b494dd94f6acf05bc19174516b590236eb2d
+ok 1 - prepare reference tree
+
+expecting success of 4003.2 'prepare work tree': 
+	sed -e s/HOWEVER/However/ <COPYING >COPYING.1 &&
+	sed -e s/GPL/G.P.L/g <COPYING >COPYING.2 &&
+	rm -f COPYING &&
+	git update-index --add --remove COPYING COPYING.?
+
+ok 2 - prepare work tree
+
+expecting success of 4003.3 'validate output from rename/copy detection (#1)': 
+	compare_diff_patch current expected
+
+ok 3 - validate output from rename/copy detection (#1)
+
+expecting success of 4003.4 'prepare work tree again': 
+	mv COPYING.2 COPYING &&
+	git update-index --add --remove COPYING COPYING.1 COPYING.2
+
+ok 4 - prepare work tree again
+
+expecting success of 4003.5 'validate output from rename/copy detection (#2)': 
+	compare_diff_patch current expected
+
+ok 5 - validate output from rename/copy detection (#2)
+
+expecting success of 4003.6 'prepare work tree once again': 
+	COPYING_test_data >COPYING &&
+	git update-index --add --remove COPYING COPYING.1
+
+ok 6 - prepare work tree once again
+
+expecting success of 4003.7 'validate output from rename/copy detection (#3)': 
+	compare_diff_patch current expected
+
+ok 7 - validate output from rename/copy detection (#3)
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4005-diff-rename-2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4005-diff-rename-2/.git/
+expecting success of 4005.1 'setup reference tree': 
+	COPYING_test_data >COPYING &&
+	echo frotz >rezrov &&
+	git update-index --add COPYING rezrov &&
+	tree=$(git write-tree) &&
+	echo $tree &&
+	sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 &&
+	sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 &&
+	origoid=$(git hash-object COPYING) &&
+	oid1=$(git hash-object COPYING.1) &&
+	oid2=$(git hash-object COPYING.2)
+
+f7f2b494dd94f6acf05bc19174516b590236eb2d
+ok 1 - setup reference tree
+
+expecting success of 4005.2 'validate output from rename/copy detection (#1)': 
+	rm -f COPYING &&
+	git update-index --add --remove COPYING COPYING.? &&
+
+	cat <<-EOF >expected &&
+	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
+	:100644 100644 $origoid $oid2 R1234	COPYING	COPYING.2
 	EOF
-	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
+	git diff-index -C $tree >current &&
+	compare_diff_raw expected current
+
+ok 2 - validate output from rename/copy detection (#1)
+
+expecting success of 4005.3 'validate output from rename/copy detection (#2)': 
+	mv COPYING.2 COPYING &&
+	git update-index --add --remove COPYING COPYING.1 COPYING.2 &&
+
+	cat <<-EOF >expected &&
+	:100644 100644 $origoid $oid2 M	COPYING
+	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
 	EOF
-	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
+	git diff-index -C $tree >current &&
+	compare_diff_raw current expected
+
+ok 3 - validate output from rename/copy detection (#2)
+
+expecting success of 4005.4 'validate output from rename/copy detection (#3)': 
+	COPYING_test_data >COPYING &&
+	git update-index --add --remove COPYING COPYING.1 &&
+
+	cat <<-EOF >expected &&
+	:100644 100644 $origoid $oid1 C1234	COPYING	COPYING.1
 	EOF
+	git diff-index -C --find-copies-harder $tree >current &&
+	compare_diff_raw current expected
+
+ok 4 - validate output from rename/copy detection (#3)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4006-diff-mode.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4006-diff-mode/.git/
+expecting success of 4006.1 'setup': 
+	echo frotz >rezrov &&
+	git update-index --add rezrov &&
+	tree=$(git write-tree) &&
+	echo $tree
 
+5189e2f1ba2c164fa2006e4f8f4e4ec56f15291e
 ok 1 - setup
 
-expecting success of 4001.2 'update-index --add a file.': git update-index --add path0
-ok 2 - update-index --add a file.
+expecting success of 4006.2 'chmod': 
+	test_chmod +x rezrov &&
+	git diff-index $tree >current &&
+	sed -e "$sed_script" <current >check &&
+	echo ":100644 100755 X X M	rezrov" >expected &&
+	test_cmp expected check
 
-expecting success of 4001.3 'write that tree.': tree=$(git write-tree) && echo $tree
-ad8378482f032562f72403dd7c5bd607578a3f0e
-ok 3 - write that tree.
+ok 2 - chmod
 
-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 4006.3 'prepare binary file': 
+	git commit -m one &&
+	test_commit --printf two binbin "\00\01\02\03\04\05\06"
 
-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.
+[master (root-commit) d232af0] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100755 rezrov
+[master a89ae18] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binbin
+ok 3 - prepare binary file
 
-expecting success of 4001.6 'validate the output.': compare_diff_patch current expected
-ok 6 - validate the output.
+expecting success of 4006.4 '--stat output after text chmod': 
+	test_chmod -x rezrov &&
+	cat >expect <<-\EOF &&
+	 rezrov | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git diff HEAD --stat >actual &&
+	test_cmp expect actual
 
-expecting success of 4001.7 'test diff.renames=true': 
-	git -c diff.renames=true diff --cached $tree >current &&
-	compare_diff_patch current expected
+ok 4 - --stat output after text chmod
 
-ok 7 - test diff.renames=true
+expecting success of 4006.5 '--shortstat output after text chmod': 
+	tail -n 1 <expect >expect.short &&
+	git diff HEAD --shortstat >actual &&
+	test_cmp expect.short actual
 
-expecting success of 4001.8 'test diff.renames=false': 
-	git -c diff.renames=false diff --cached $tree >current &&
-	compare_diff_patch current no-rename
+ok 5 - --shortstat output after text chmod
 
-ok 8 - test diff.renames=false
+expecting success of 4006.6 '--stat output after binary chmod': 
+	test_chmod +x binbin &&
+	cat >expect <<-EOF &&
+	 binbin | Bin
+	 rezrov |   0
+	 2 files changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git diff HEAD --stat >actual &&
+	test_cmp expect actual
 
-expecting success of 4001.9 'test diff.renames unset': 
-	git diff --cached $tree >current &&
-	compare_diff_patch current expected
+ok 6 - --stat output after binary chmod
 
-ok 9 - test diff.renames unset
+expecting success of 4006.7 '--shortstat output after binary chmod': 
+	tail -n 1 <expect >expect.short &&
+	git diff HEAD --shortstat >actual &&
+	test_cmp expect.short actual
 
-expecting success of 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
+ok 7 - --shortstat output after binary chmod
 
-[master (root-commit) 7846fdf] 1
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4007-rename-3.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4007-rename-3/.git/
+expecting success of 4007.1 'prepare reference tree': 
+	mkdir path0 path1 &&
+	COPYING_test_data >path0/COPYING &&
+	git update-index --add path0/COPYING &&
+	tree=$(git write-tree) &&
+	blob=$(git rev-parse :path0/COPYING)
+
+ok 1 - prepare reference tree
+
+expecting success of 4007.2 'prepare work tree': 
+	cp path0/COPYING path1/COPYING &&
+	git update-index --add --remove path0/COPYING path1/COPYING
+
+ok 2 - prepare work tree
+
+expecting success of 4007.3 'copy detection': 
+	git diff-index -C --find-copies-harder $tree >current &&
+	compare_diff_raw current expected
+
+ok 3 - copy detection
+
+expecting success of 4007.4 'copy detection, cached': 
+	git diff-index -C --find-copies-harder --cached $tree >current &&
+	compare_diff_raw current expected
+
+ok 4 - copy detection, cached
+
+expecting success of 4007.5 'copy, limited to a subtree': 
+	git diff-index -C --find-copies-harder $tree path1 >current &&
+	compare_diff_raw current expected
+
+ok 5 - copy, limited to a subtree
+
+expecting success of 4007.6 'tweak work tree': 
+	rm -f path0/COPYING &&
+	git update-index --remove path0/COPYING
+
+ok 6 - tweak work tree
+
+expecting success of 4007.7 'rename detection': 
+	git diff-index -C --find-copies-harder $tree >current &&
+	compare_diff_raw current expected
+
+ok 7 - rename detection
+
+expecting success of 4007.8 'rename, limited to a subtree': 
+	git diff-index -C --find-copies-harder $tree path1 >current &&
+	compare_diff_raw current expected
+
+ok 8 - rename, limited to a subtree
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4008-diff-break-rewrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4008-diff-break-rewrite/.git/
+expecting success of 4008.1 'setup': 
+	echo some dissimilar content >file0 &&
+	COPYING_test_data >file1 &&
+	blob0_id=$(git hash-object file0) &&
+	blob1_id=$(git hash-object file1) &&
+	git update-index --add file0 file1 &&
+	git tag reference $(git write-tree)
+
+ok 1 - setup
+
+expecting success of 4008.2 'change file1 with copy-edit of file0 and remove file0': 
+	sed -e "s/git/GIT/" file0 >file1 &&
+	blob2_id=$(git hash-object file1) &&
+	rm -f file0 &&
+	git update-index --remove file0 file1
+
+ok 2 - change file1 with copy-edit of file0 and remove file0
+
+expecting success of 4008.3 'run diff with -B (#1)': 
+	git diff-index -B --cached reference >current &&
+	cat >expect <<-EOF &&
+	:100644 000000 $blob0_id $ZERO_OID D	file0
+	:100644 100644 $blob1_id $blob2_id M100	file1
+	EOF
+	compare_diff_raw expect current
+
+ok 3 - run diff with -B (#1)
+
+expecting success of 4008.4 'run diff with -B and -M (#2)': 
+	git diff-index -B -M reference >current &&
+	cat >expect <<-EOF &&
+	:100644 100644 $blob0_id $blob2_id R100	file0	file1
+	EOF
+	compare_diff_raw expect current
+
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4009-diff-rename-4.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4009-diff-rename-4/.git/
+expecting success of 4009.1 'prepare reference tree': COPYING_test_data >COPYING &&
+     echo frotz >rezrov &&
+    git update-index --add COPYING rezrov &&
+    orig=$(git hash-object COPYING) &&
+    tree=$(git write-tree) &&
+    echo $tree
+f7f2b494dd94f6acf05bc19174516b590236eb2d
+ok 1 - prepare reference tree
+
+expecting success of 4009.2 'prepare work tree': sed -e s/HOWEVER/However/ <COPYING >COPYING.1 &&
+    sed -e s/GPL/G.P.L/g <COPYING >COPYING.2 &&
+    rm -f COPYING &&
+    c1=$(git hash-object COPYING.1) &&
+    c2=$(git hash-object COPYING.2) &&
+    git update-index --add --remove COPYING COPYING.?
+ok 2 - prepare work tree
+
+expecting success of 4009.3 'validate output from rename/copy detection (#1)': compare_diff_raw_z current expected
+ok 3 - validate output from rename/copy detection (#1)
+
+expecting success of 4009.4 'prepare work tree again': mv COPYING.2 COPYING &&
+     git update-index --add --remove COPYING COPYING.1 COPYING.2
+ok 4 - prepare work tree again
+
+expecting success of 4009.5 'validate output from rename/copy detection (#2)': compare_diff_raw_z current expected
+ok 5 - validate output from rename/copy detection (#2)
+
+expecting success of 4009.6 'prepare work tree once again': COPYING_test_data >COPYING &&
+     git update-index --add --remove COPYING COPYING.1
+ok 6 - prepare work tree once again
+
+expecting success of 4009.7 'validate output from rename/copy detection (#3)': compare_diff_raw_z current expected
+ok 7 - validate output from rename/copy detection (#3)
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3906-stash-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/.git/
+expecting success of 3906.1 'git_stash: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
  Author: A U Thor <author@example.com>
- 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
+ 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.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Saved working directory and index state WIP on no_submodule: 27611a5 Base
+Merging Version stash was based on with Stashed changes
+On branch no_submodule
+Your branch is up to date with 'origin/no_submodule'.
 
-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
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   .gitmodules
+	new file:   sub1
+	new file:   uninitialized_sub
 
-	renamed:    path1 -> subdir/path1
-ok 11 - test diff.renames=true for git status
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_stash: added submodule creates empty directory
 
-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
+checking known breakage of 3906.2 'git_stash: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Saved working directory and index state WIP on no_submodule: 27611a5 Base
+--- expect	2024-11-14 19:33:19.724011735 +0000
++++ actual	2024-11-14 19:33:19.776012265 +0000
+@@ -2,5 +2,3 @@
+ expect
+ file1
+ file2
+-
+-sub1:
+not ok 2 - git_stash: added submodule leaves existing empty directory alone # TODO known breakage
 
-	new file:   subdir/path1
-	deleted:    path1
-ok 12 - test diff.renames=false for git status
+checking known breakage of 3906.3 'git_stash: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Saved working directory and index state WIP on replace_sub1_with_file: 2364f5a Replace sub1 with file
+Merging Version stash was based on with Stashed changes
+On branch replace_sub1_with_file
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   .gitmodules
+	deleted:    sub1
+
+no changes added to commit (use "git add" and/or "git commit -a")
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 cf8d5939a67bef46c85d0f50732c37b6fac1d92a M	.gitmodules
+:160000 100644 63c430421a9604f896526f8a04236bdfe3ac1fc1 d95f3ad14dee633a758d2e331151e950dd13e4ed T	sub1
+not ok 3 - git_stash: replace tracked file with submodule creates empty directory # TODO known breakage
+
+checking known breakage of 3906.4 'git_stash: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Saved working directory and index state WIP on replace_sub1_with_directory: cb28587 Replace sub1 with directory
+Merging Version stash was based on with Stashed changes
+error: 'sub1/file1' appears as both a file and as a directory
+error: 'sub1/file2' appears as both a file and as a directory
+error: 'sub1/file3' appears as both a file and as a directory
+On branch replace_sub1_with_directory
+Your branch is up to date with 'origin/replace_sub1_with_directory'.
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   sub1
+	deleted:    sub1/file1
+	deleted:    sub1/file2
+	deleted:    sub1/file3
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   .gitmodules
+
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 cf8d5939a67bef46c85d0f50732c37b6fac1d92a M	.gitmodules
+not ok 4 - git_stash: replace directory with submodule # TODO known breakage
+
+checking known breakage of 3906.5 'git_stash: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Saved working directory and index state WIP on add_sub1: 09bcf53 Add sub1
+warning: unable to rmdir 'sub1': Directory not empty
+Merging Version stash was based on with Stashed changes
+On branch add_sub1
+Your branch is up to date with 'origin/add_sub1'.
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	deleted:    sub1
+
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    .gitmodules
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	sub1/
+
+'actual' is not empty, it contains:
+:000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
+:000000 160000 0000000000000000000000000000000000000000 63c430421a9604f896526f8a04236bdfe3ac1fc1 A	uninitialized_sub
+not ok 5 - git_stash: removed submodule leaves submodule directory and its contents in place # TODO known breakage
+
+checking known breakage of 3906.6 'git_stash: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Saved working directory and index state WIP on add_sub1: 09bcf53 Add sub1
+warning: unable to rmdir 'sub1': Directory not empty
+Merging Version stash was based on with Stashed changes
+On branch add_sub1
+Your branch is up to date with 'origin/add_sub1'.
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	deleted:    sub1
+
+Changes not staged for commit:
+  (use "git add/rm <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	deleted:    .gitmodules
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	sub1/
+
+'actual' is not empty, it contains:
+:000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
+:000000 160000 0000000000000000000000000000000000000000 63c430421a9604f896526f8a04236bdfe3ac1fc1 A	uninitialized_sub
+not ok 6 - git_stash: removed submodule leaves submodule containing a .git directory alone # TODO known breakage
+
+expecting success of 3906.7 'git_stash: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+ok 7 - git_stash: replace submodule with a directory must fail
+
+expecting success of 3906.8 'git_stash: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+ok 8 - git_stash: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 3906.9 'git_stash: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
+not ok 9 - git_stash: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 3906.10 'git_stash: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
+not ok 10 - git_stash: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+checking known breakage of 3906.11 'git_stash: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+No local changes to save
+--- expect	2024-11-14 19:33:25.508070641 +0000
++++ actual	2024-11-14 19:33:25.560071171 +0000
+@@ -1,3 +1,4 @@
++M  sub1
+ actual
+ expect
+ file1
+not ok 11 - git_stash: modified submodule does not update submodule work tree # TODO known breakage
+
+checking known breakage of 3906.12 'git_stash: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+No local changes to save
+--- expect	2024-11-14 19:33:25.904074675 +0000
++++ actual	2024-11-14 19:33:25.928074919 +0000
+@@ -1,3 +1,4 @@
++M  sub1
+ actual
+ expect
+ file1
+not ok 12 - git_stash: modified submodule does not update submodule work tree to invalid commit # TODO known breakage
+
+checking known breakage of 3906.13 'git_stash: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+No local changes to save
+--- expect	2024-11-14 19:33:26.204077730 +0000
++++ actual	2024-11-14 19:33:26.276078463 +0000
+@@ -1,3 +1,4 @@
++M  sub1
+ actual
+ expect
+ file1
+not ok 13 - git_stash: modified submodule does not update submodule work tree from invalid commit # TODO known breakage
+
+expecting success of 3906.14 'git_stash: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+ok 14 - git_stash: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 3906.15 'stash push with submodule.recurse=true preserves dirty submodule worktree': 
+	setup_basic &&
+	(
+		cd main &&
+		git config submodule.recurse true &&
+		echo "x" >main_file.t &&
+		echo "y" >sub/sub_file.t &&
+		git stash push &&
+		test_must_fail git -C sub diff --quiet
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/sub/.git/
+[master (root-commit) af789f4] sub_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub_file.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/main/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/main/sub'...
+done.
+[master (root-commit) d3a5de8] main_file
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 main_file.t
+ create mode 160000 sub
+Saved working directory and index state WIP on master: d3a5de8 main_file
+ok 15 - stash push with submodule.recurse=true preserves dirty submodule worktree
+
+expecting success of 3906.16 'stash push and pop with submodule.recurse=true preserves dirty submodule worktree': 
+	setup_basic &&
+	(
+		cd main &&
+		git config submodule.recurse true &&
+		echo "x" >main_file.t &&
+		echo "y" >sub/sub_file.t &&
+		git stash push &&
+		git stash pop &&
+		test_must_fail git -C sub diff --quiet
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/sub/.git/
+[master (root-commit) af789f4] sub_file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub_file.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/main/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/main/sub'...
+done.
+[master (root-commit) d3a5de8] main_file
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 main_file.t
+ create mode 160000 sub
+Saved working directory and index state WIP on master: d3a5de8 main_file
+Merging Version stash was based on with Stashed changes
+On branch master
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+  (commit or discard the untracked or modified content in submodules)
+	modified:   main_file.t
+	modified:   sub (modified content)
+
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (ee331cc507c2f3e6ac052edd8b1cc51dc982b38c)
+ok 16 - stash push and pop with submodule.recurse=true preserves dirty submodule worktree
+
+# still have 10 known breakage(s)
+# passed all remaining 6 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4002-diff-basic.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4002-diff-basic/.git/
+expecting success of 4002.1 'adding test file NN and Z/NN': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 1 - adding test file NN and Z/NN
+
+expecting success of 4002.2 'adding test file ND and Z/ND': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 2 - adding test file ND and Z/ND
+
+expecting success of 4002.3 'adding test file NM and Z/NM': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 3 - adding test file NM and Z/NM
+
+expecting success of 4002.4 'adding test file DN and Z/DN': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 4 - adding test file DN and Z/DN
+
+expecting success of 4002.5 'adding test file DD and Z/DD': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 5 - adding test file DD and Z/DD
+
+expecting success of 4002.6 'adding test file DM and Z/DM': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 6 - adding test file DM and Z/DM
+
+expecting success of 4002.7 'adding test file MN and Z/MN': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 7 - adding test file MN and Z/MN
+
+expecting success of 4002.8 'adding test file MD and Z/MD': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 8 - adding test file MD and Z/MD
+
+expecting success of 4002.9 'adding test file MM and Z/MM': 
+	    git update-index --add $p &&
+	    git update-index --add Z/$p
+    
+ok 9 - adding test file MM and Z/MM
+
+expecting success of 4002.10 'adding test file SS': 
+	git update-index --add SS
+
+ok 10 - adding test file SS
+
+expecting success of 4002.11 'adding test file TT': 
+	git update-index --add TT
+
+ok 11 - adding test file TT
+
+expecting success of 4002.12 'prepare initial tree': 
+	tree_O=$(git write-tree)
+
+ok 12 - prepare initial tree
+
+expecting success of 4002.13 'change in branch A (removal)': 
+	git update-index --remove $to_remove
+
+ok 13 - change in branch A (removal)
+
+expecting success of 4002.14 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 14 - change in branch A (modification)
+
+expecting success of 4002.15 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 15 - change in branch A (modification)
+
+expecting success of 4002.16 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 16 - change in branch A (modification)
+
+expecting success of 4002.17 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 17 - change in branch A (modification)
+
+expecting success of 4002.18 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 18 - change in branch A (modification)
+
+expecting success of 4002.19 'change in branch A (modification)': 
+		git update-index $p
+	
+ok 19 - change in branch A (modification)
+
+expecting success of 4002.20 'change in branch A (addition)': 
+		git update-index --add $p
+	
+ok 20 - change in branch A (addition)
+
+expecting success of 4002.21 'change in branch A (addition)': 
+		git update-index --add $p
+	
+ok 21 - change in branch A (addition)
+
+expecting success of 4002.22 'change in branch A (addition)': 
+		git update-index --add $p
+	
+ok 22 - change in branch A (addition)
+
+expecting success of 4002.23 'change in branch A (addition)': 
+		git update-index --add $p
+	
+ok 23 - change in branch A (addition)
+
+expecting success of 4002.24 'change in branch A (addition)': 
+	git update-index --add LL &&
+	git update-index SS
+
+ok 24 - change in branch A (addition)
+
+expecting success of 4002.25 'change in branch A (edit)': 
+	git update-index TT
+
+ok 25 - change in branch A (edit)
+
+expecting success of 4002.26 'change in branch A (change file to directory)': 
+	git update-index --add DF/DF
+
+ok 26 - change in branch A (change file to directory)
+
+expecting success of 4002.27 'recording branch A tree': 
+	tree_A=$(git write-tree)
+
+ok 27 - recording branch A tree
+
+expecting success of 4002.28 'reading original tree and checking out': 
+	git read-tree $tree_O &&
+	git checkout-index -a
+
+ok 28 - reading original tree and checking out
+
+expecting success of 4002.29 'change in branch B (removal)': 
+	git update-index --remove $to_remove
+
+ok 29 - change in branch B (removal)
+
+expecting success of 4002.30 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 30 - change in branch B (modification)
+
+expecting success of 4002.31 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 31 - change in branch B (modification)
+
+expecting success of 4002.32 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 32 - change in branch B (modification)
+
+expecting success of 4002.33 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 33 - change in branch B (modification)
+
+expecting success of 4002.34 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 34 - change in branch B (modification)
+
+expecting success of 4002.35 'change in branch B (modification)': 
+		git update-index $p
+	
+ok 35 - change in branch B (modification)
+
+expecting success of 4002.36 'change in branch B (addition)': 
+		git update-index --add $p
+	
+ok 36 - change in branch B (addition)
+
+expecting success of 4002.37 'change in branch B (addition)': 
+		git update-index --add $p
+	
+ok 37 - change in branch B (addition)
+
+expecting success of 4002.38 'change in branch B (addition)': 
+		git update-index --add $p
+	
+ok 38 - change in branch B (addition)
+
+expecting success of 4002.39 'change in branch B (addition)': 
+		git update-index --add $p
+	
+ok 39 - change in branch B (addition)
+
+expecting success of 4002.40 'change in branch B (addition and modification)': 
+	git update-index --add LL &&
+	git update-index SS
+
+ok 40 - change in branch B (addition and modification)
+
+expecting success of 4002.41 'change in branch B (modification)': 
+	git update-index TT
+
+ok 41 - change in branch B (modification)
+
+expecting success of 4002.42 'change in branch B (addition of a file to conflict with directory)': 
+	git update-index --add DF
+
+ok 42 - change in branch B (addition of a file to conflict with directory)
+
+expecting success of 4002.43 'recording branch B tree': 
+	tree_B=$(git write-tree)
+
+ok 43 - recording branch B tree
+
+expecting success of 4002.44 'keep contents of 3 trees for easy access': 
+	rm -f .git/index &&
+	git read-tree $tree_O &&
+	mkdir .orig-O &&
+	git checkout-index --prefix=.orig-O/ -f -q -a &&
+	rm -f .git/index &&
+	git read-tree $tree_A &&
+	mkdir .orig-A &&
+	git checkout-index --prefix=.orig-A/ -f -q -a &&
+	rm -f .git/index &&
+	git read-tree $tree_B &&
+	mkdir .orig-B &&
+	git checkout-index --prefix=.orig-B/ -f -q -a
+
+ok 44 - keep contents of 3 trees for easy access
+
+expecting success of 4002.45 'diff-tree of known trees.': 
+	git diff-tree $tree_O $tree_A >.test-a &&
+	cmp -s .test-a .test-plain-OA
+
+ok 45 - diff-tree of known trees.
+
+expecting success of 4002.46 'diff-tree of known trees.': 
+	git diff-tree -r $tree_O $tree_A >.test-a &&
+	cmp -s .test-a .test-recursive-OA
+
+ok 46 - diff-tree of known trees.
+
+expecting success of 4002.47 'diff-tree of known trees.': 
+	git diff-tree $tree_O $tree_B >.test-a &&
+	cmp -s .test-a .test-plain-OB
+
+ok 47 - diff-tree of known trees.
+
+expecting success of 4002.48 'diff-tree of known trees.': 
+	git diff-tree -r $tree_O $tree_B >.test-a &&
+	cmp -s .test-a .test-recursive-OB
+
+ok 48 - diff-tree of known trees.
+
+expecting success of 4002.49 'diff-tree of known trees.': 
+	git diff-tree $tree_A $tree_B >.test-a &&
+	cmp -s .test-a .test-plain-AB
+
+ok 49 - diff-tree of known trees.
+
+expecting success of 4002.50 'diff-tree of known trees.': 
+	git diff-tree -r $tree_A $tree_B >.test-a &&
+	cmp -s .test-a .test-recursive-AB
+
+ok 50 - diff-tree of known trees.
+
+expecting success of 4002.51 'diff-tree --stdin of known trees.': 
+	echo $tree_A $tree_B | git diff-tree --stdin > .test-a &&
+	echo $tree_A $tree_B > .test-plain-ABx &&
+	cat .test-plain-AB >> .test-plain-ABx &&
+	cmp -s .test-a .test-plain-ABx
+
+ok 51 - diff-tree --stdin of known trees.
+
+expecting success of 4002.52 'diff-tree --stdin of known trees.': 
+	echo $tree_A $tree_B | git diff-tree -r --stdin > .test-a &&
+	echo $tree_A $tree_B > .test-recursive-ABx &&
+	cat .test-recursive-AB >> .test-recursive-ABx &&
+	cmp -s .test-a .test-recursive-ABx
+
+ok 52 - diff-tree --stdin of known trees.
+
+expecting success of 4002.53 'diff-cache O with A in cache': 
+	git read-tree $tree_A &&
+	git diff-index --cached $tree_O >.test-a &&
+	cmp -s .test-a .test-recursive-OA
+
+ok 53 - diff-cache O with A in cache
+
+expecting success of 4002.54 'diff-cache O with B in cache': 
+	git read-tree $tree_B &&
+	git diff-index --cached $tree_O >.test-a &&
+	cmp -s .test-a .test-recursive-OB
+
+ok 54 - diff-cache O with B in cache
+
+expecting success of 4002.55 'diff-cache A with B in cache': 
+	git read-tree $tree_B &&
+	git diff-index --cached $tree_A >.test-a &&
+	cmp -s .test-a .test-recursive-AB
+
+ok 55 - diff-cache A with B in cache
+
+expecting success of 4002.56 'diff-files with O in cache and A checked out': 
+	rm -fr Z [A-Z][A-Z] &&
+	git read-tree $tree_A &&
+	git checkout-index -f -a &&
+	git read-tree --reset $tree_O &&
+	test_must_fail git update-index --refresh -q &&
+	git diff-files >.test-a &&
+	cmp_diff_files_output .test-a .test-recursive-OA
+
+DD: needs update
+DM: needs update
+DN: needs update
+MD: needs update
+MM: needs update
+MN: needs update
+SS: needs update
+TT: needs update
+Z/DD: needs update
+Z/DM: needs update
+Z/DN: needs update
+Z/MD: needs update
+Z/MM: needs update
+Z/MN: needs update
+ok 56 - diff-files with O in cache and A checked out
+
+expecting success of 4002.57 'diff-files with O in cache and B checked out': 
+	rm -fr Z [A-Z][A-Z] &&
+	git read-tree $tree_B &&
+	git checkout-index -f -a &&
+	git read-tree --reset $tree_O &&
+	test_must_fail git update-index --refresh -q &&
+	git diff-files >.test-a &&
+	cmp_diff_files_output .test-a .test-recursive-OB
+
+DD: needs update
+DM: needs update
+MD: needs update
+MM: needs update
+ND: needs update
+NM: needs update
+SS: needs update
+TT: needs update
+Z/DD: needs update
+Z/DM: needs update
+Z/MD: needs update
+Z/MM: needs update
+Z/ND: needs update
+Z/NM: needs update
+ok 57 - diff-files with O in cache and B checked out
+
+expecting success of 4002.58 'diff-files with A in cache and B checked out': 
+	rm -fr Z [A-Z][A-Z] &&
+	git read-tree $tree_B &&
+	git checkout-index -f -a &&
+	git read-tree --reset $tree_A &&
+	test_must_fail git update-index --refresh -q &&
+	git diff-files >.test-a &&
+	cmp_diff_files_output .test-a .test-recursive-AB
+
+AA: needs update
+AN: needs update
+DF/DF: needs update
+MD: needs update
+MM: needs update
+MN: needs update
+ND: needs update
+NM: needs update
+TT: needs update
+Z/AA: needs update
+Z/AN: needs update
+Z/MD: needs update
+Z/MM: needs update
+Z/MN: needs update
+Z/ND: needs update
+Z/NM: needs update
+ok 58 - diff-files with A in cache and B checked out
+
+expecting success of 4002.59 'diff-tree O A == diff-tree -R A O': 
+	git diff-tree $tree_O $tree_A >.test-a &&
+	git diff-tree -R $tree_A $tree_O >.test-b &&
+	cmp -s .test-a .test-b
+
+ok 59 - diff-tree O A == diff-tree -R A O
+
+expecting success of 4002.60 'diff-tree -r O A == diff-tree -r -R A O': 
+	git diff-tree -r $tree_O $tree_A >.test-a &&
+	git diff-tree -r -R $tree_A $tree_O >.test-b &&
+	cmp -s .test-a .test-b
+
+ok 60 - diff-tree -r O A == diff-tree -r -R A O
+
+expecting success of 4002.61 'diff-tree B A == diff-tree -R A B': 
+	git diff-tree $tree_B $tree_A >.test-a &&
+	git diff-tree -R $tree_A $tree_B >.test-b &&
+	cmp -s .test-a .test-b
+
+ok 61 - diff-tree B A == diff-tree -R A B
+
+expecting success of 4002.62 'diff-tree -r B A == diff-tree -r -R A B': 
+	git diff-tree -r $tree_B $tree_A >.test-a &&
+	git diff-tree -r -R $tree_A $tree_B >.test-b &&
+	cmp -s .test-a .test-b
+ok 62 - diff-tree -r B A == diff-tree -r -R A B
+
+expecting success of 4002.63 'diff can read from stdin': 
+	test_must_fail git diff --no-index -- MN - < NN |
+		sed "/^index/d; s#/-#/NN#" >.test-a &&
+	test_must_fail git diff --no-index -- MN NN |
+		grep -v "^index" >.test-b &&
+	test_cmp .test-a .test-b
+
+ok 63 - diff can read from stdin
+
+# passed all 63 test(s)
+1..63
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4010-diff-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4010-diff-pathspec/.git/
+expecting success of 4010.1 'setup': echo frotz >file0 &&
+     mkdir path1 &&
+     echo rezrov >path1/file1 &&
+     before0=$(git hash-object file0) &&
+     before1=$(git hash-object path1/file1) &&
+     git update-index --add file0 path1/file1 &&
+     tree=$(git write-tree) &&
+     echo "$tree" &&
+     echo nitfol >file0 &&
+     echo yomin >path1/file1 &&
+     after0=$(git hash-object file0) &&
+     after1=$(git hash-object path1/file1) &&
+     git update-index file0 path1/file1
+6b4658eda9b6c5385f027bc54abf3276b6effd05
+ok 1 - setup
+
+expecting success of 4010.2 'limit to path should show nothing': git diff-index --cached $tree -- path >current &&
+     compare_diff_raw current expected
+ok 2 - limit to path should show nothing
+
+expecting success of 4010.3 'limit to path1 should show path1/file1': git diff-index --cached $tree -- path1 >current &&
+     compare_diff_raw current expected
+ok 3 - limit to path1 should show path1/file1
+
+expecting success of 4010.4 'limit to path1/ should show path1/file1': git diff-index --cached $tree -- path1/ >current &&
+     compare_diff_raw current expected
+ok 4 - limit to path1/ should show path1/file1
+
+expecting success of 4010.5 '"*file1" should show path1/file1': git diff-index --cached $tree -- "*file1" >current &&
+     compare_diff_raw current expected
+ok 5 - "*file1" should show path1/file1
+
+expecting success of 4010.6 'limit to file0 should show file0': git diff-index --cached $tree -- file0 >current &&
+     compare_diff_raw current expected
+ok 6 - limit to file0 should show file0
+
+expecting success of 4010.7 'limit to file0/ should emit nothing.': git diff-index --cached $tree -- file0/ >current &&
+     compare_diff_raw current expected
+ok 7 - limit to file0/ should emit nothing.
+
+expecting success of 4010.8 'diff-tree pathspec': 
+	tree2=$(git write-tree) &&
+	echo "$tree2" &&
+	git diff-tree -r --name-only $tree $tree2 -- pa path1/a >current &&
+	test_must_be_empty current
+
+54d8765b122f32157e847ce3924180cb2ec778fc
+ok 8 - diff-tree pathspec
+
+expecting success of 4010.9 'diff-tree with wildcard shows dir also matches': 
+	git diff-tree --name-only $EMPTY_TREE $tree -- "f*" >result &&
+	echo file0 >expected &&
+	test_cmp expected result
+
+ok 9 - diff-tree with wildcard shows dir also matches
+
+expecting success of 4010.10 'diff-tree -r with wildcard': 
+	git diff-tree -r --name-only $EMPTY_TREE $tree -- "*file1" >result &&
+	echo path1/file1 >expected &&
+	test_cmp expected result
+
+ok 10 - diff-tree -r with wildcard
+
+expecting success of 4010.11 'diff-tree with wildcard shows dir also matches': 
+	git diff-tree --name-only $tree $tree2 -- "path1/f*" >result &&
+	echo path1 >expected &&
+	test_cmp expected result
+
+ok 11 - diff-tree with wildcard shows dir also matches
+
+expecting success of 4010.12 'diff-tree -r with wildcard from beginning': 
+	git diff-tree -r --name-only $tree $tree2 -- "path1/*file1" >result &&
+	echo path1/file1 >expected &&
+	test_cmp expected result
+
+ok 12 - diff-tree -r with wildcard from beginning
+
+expecting success of 4010.13 'diff-tree -r with wildcard': 
+	git diff-tree -r --name-only $tree $tree2 -- "path1/f*" >result &&
+	echo path1/file1 >expected &&
+	test_cmp expected result
+
+ok 13 - diff-tree -r with wildcard
+
+expecting success of 4010.14 'setup submodules': 
+	test_tick &&
+	git init submod &&
+	( cd submod && test_commit first ) &&
+	git add submod &&
+	git commit -m first &&
+	( cd submod && test_commit second ) &&
+	git add submod &&
+	git commit -m second
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4010-diff-pathspec/submod/.git/
+[master (root-commit) 1e96f59] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+warning: adding embedded git repository: submod
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> submod
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached submod
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[master (root-commit) f9d7654] first
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 file0
+ create mode 100644 path1/file1
+ create mode 160000 submod
+[master 1bf6dc5] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+[master f1afec5] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 14 - setup submodules
+
+expecting success of 4010.15 'diff-tree ignores trailing slash on submodule path': 
+	git diff --name-only HEAD^ HEAD submod >expect &&
+	git diff --name-only HEAD^ HEAD submod/ >actual &&
+	test_cmp expect actual &&
+	git diff --name-only HEAD^ HEAD -- submod/whatever >actual &&
+	test_must_be_empty actual
+
+ok 15 - diff-tree ignores trailing slash on submodule path
+
+expecting success of 4010.16 'diff multiple wildcard pathspecs': 
+	mkdir path2 &&
+	echo rezrov >path2/file1 &&
+	git update-index --add path2/file1 &&
+	tree3=$(git write-tree) &&
+	git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual &&
+	cat <<-\EOF >expect &&
+	path1/file1
+	path2/file1
+	EOF
+	test_cmp expect actual
+
+ok 16 - diff multiple wildcard pathspecs
+
+expecting success of 4010.17 'diff-cache ignores trailing slash on submodule path': 
+	git diff --name-only HEAD^ submod >expect &&
+	git diff --name-only HEAD^ submod/ >actual &&
+	test_cmp expect actual
+
+ok 17 - diff-cache ignores trailing slash on submodule path
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t3903-stash.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
+
+	test_expect_code 129 git stash push --invalid-option 2>usage &&
+	! grep "or: git stash" usage
+
+   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>
+ 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 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 5 - parents of stash
+
+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
+
+fatal: log for 'stash' only has 1 entries
+ok 6 - applying bogus stash does nothing
+
+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
+
+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
+
+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 7 - apply does not need clean working directory
+
+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
+
+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
+
+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 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)
+
+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
+
+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(+), 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
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+	output
+	usage
+
+ok 10 - apply stashed changes (including index)
+
+expecting success of 3903.11 'unstashing in a subdirectory': 
+	git reset --hard HEAD &&
+	mkdir subdir &&
+	(
+		cd subdir &&
+		git stash apply
+	)
+
+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)
+	../expect
+	../output
+	../usage
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 11 - unstashing in a subdirectory
+
+expecting success of 3903.12 'stash drop complains of extra options': 
+	test_must_fail git stash drop --foo
+
+error: unknown option `foo'
+usage: git stash drop [-q | --quiet] [<stash>]
+
+    -q, --[no-]quiet      be quiet, only report errors
+
+ok 12 - stash drop complains of extra options
+
+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)
+
+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
+
+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
+
+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)
+
+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
+
+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 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
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expected
+	output
+	usage
 
-	renamed:    path1 -> subdir/path1
-ok 13 - favour same basenames even with minor differences
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 15 - drop middle stash by index
 
-expecting success of 4001.14 'two files with same basename and same content': 
+expecting success of 3903.16 'drop stash reflog updates refs/stash': 
 	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
+	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 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
+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})" &&
 
-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
+	$new_oid
+	$old_oid
 	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
+	git -C repo reflog show refs/stash --format=%H >actual &&
+	test_cmp expect actual &&
 
-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
+	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
 
-[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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3903-stash/repo/.git/
+[main (root-commit) c512db6] initial
  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
+ 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 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
+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)
 
-[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
+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 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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expected
+	output
+	repo/
+	usage
 
-[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
+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 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
+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)
 
-[master 28b412a] d/e -> d/f/e
+[main ce675cf] first
  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
+ 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, 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 &&
+ 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
 
-	test_write_lines line1 line2 line4 >myotherfile &&
-	git rm myfile &&
-	git add myotherfile &&
-	git commit -m x &&
+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 diff-tree -M -l0 HEAD HEAD^ >actual &&
-	# Verify that a rename from myotherfile to myfile was detected
-	grep "myotherfile.*myfile" actual
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	expect
+	expect1
+	expect2
+	expected
+	output
+	repo/
+	usage
 
-[master a3d2e59] x
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 myfile
-rm 'myfile'
-[master ff4cac0] x
+Dropped refs/stash@{0} (cdadb37dcdb15029c2bcf635107de6d696bb3ad3)
+[stashbranch d3a23d9] alternate second
  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
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+ok 19 - stash branch
 
-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" &&
+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
 
-	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
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 20 - apply -q is quiet
 
-[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 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 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" &&
+	git stash &&
+	git stash apply --index -q >output.out 2>&1 &&
+	test_must_be_empty output.out
 
-	# 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
+rm 'other-file'
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 21 - apply --index -q is quiet
 
-[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
+expecting success of 3903.22 'save -q is quiet': 
+	git stash save --quiet >output.out 2>&1 &&
+	test_must_be_empty output.out
 
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3905-stash-include-untracked.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+ok 22 - save -q is quiet
 
-[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 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 3905.2 'stash save --include-untracked cleaned the untracked files': 
-	cat >expect <<-EOF &&
-	?? actual
-	?? expect
-	EOF
+ok 23 - pop -q works and is quiet
 
-	git status --porcelain >actual &&
-	test_cmp expect actual
+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 2 - stash save --include-untracked cleaned the untracked files
+ok 24 - pop -q --index works and is quiet
 
-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
+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
 
-	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
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 25 - drop -q is quiet
 
-ok 3 - stash save --include-untracked stashed the untracked files
+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 3905.4 'stash save --patch --include-untracked fails': 
-	test_must_fail git stash --patch --include-untracked
+HEAD is now at d3a23d9 alternate second
+ok 26 - stash push -q --staged refreshes the index
 
-Can't use --patch and --include-untracked or --all at the same time
-ok 4 - stash save --patch --include-untracked fails
+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 3905.5 'stash save --patch --all fails': 
-	test_must_fail git stash --patch --all
+	git stash apply -q --index &&
+	git diff-files >actual &&
+	test_cmp expect actual
 
-Can't use --patch and --include-untracked or --all at the same time
-ok 5 - stash save --patch --all fails
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 27 - stash apply -q --index refreshes the index
 
-expecting success of 3905.6 'clean up untracked/untracked file to prepare for next tests': 
-	git clean --force --quiet
+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)
 
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 28 - stash -k
 
-ok 6 - clean up untracked/untracked file to prepare for next tests
+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 3905.7 'stash pop after save --include-untracked leaves files untracked again': 
-	cat >expect <<-EOF &&
-	 M file
-	?? HEAD
-	?? actual
-	?? expect
-	?? file2
-	?? untracked/
-	EOF
+Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
+ok 29 - stash --no-keep-index
 
+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 &&
-	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
+	test bar,bar4 = $(cat file),$(cat file2)
 
+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 master
+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
 
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
-	HEAD
+	actual
 	expect
-	file2
-	untracked/
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
 
 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
+Dropped refs/stash@{0} (87589b9806264bae268601f80dfb73d1e02c4fa4)
+ok 30 - stash --staged
 
-expecting success of 3905.8 'clean up untracked/ directory to prepare for next tests': 
-	git clean --force --quiet -d
+expecting success of 3903.31 '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
 
-ok 8 - clean up untracked/ directory to prepare for next tests
+fatal: subcommand wasn't specified; 'push' can't be assumed due to unexpected token 'drop'
+ok 31 - dont assume push with non-option args
 
-expecting success of 3905.9 'stash save -u dirty index': 
-	echo 4 >file3 &&
-	git add file3 &&
-	test_tick &&
-	git stash -u
+expecting success of 3903.32 '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)
 
-Saved working directory and index state WIP on master: 777c62c initial
-ok 9 - stash save -u dirty index
+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 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
+    -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
 
-	git stash pop --index &&
-	test_when_finished "git reset" &&
-	git diff --cached >actual &&
-	test_cmp expect actual
+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>]
 
+    -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 32 - stash --invalid-option
+
+expecting success of 3903.33 '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)"
+
+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 master
+On branch stashbranch
 Changes to be committed:
   (use "git restore --staged <file>..." to unstage)
 	new file:   file3
 
+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 33 - stash an added file
+
+expecting success of 3903.34 '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
+
+HEAD is now at d3a23d9 alternate second
+error: Entry 'file4' not uptodate. Cannot merge.
+Cannot save the current worktree state
+rm 'file4'
+ok 34 - stash --intent-to-add file
+
+expecting success of 3903.35 '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)"
+
+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)
@@ -222816,1712 +225166,2577 @@
 
 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
 
-Dropped refs/stash@{0} (6fe995aa91ff10c4e2af89ab165bd888828517d0)
-Unstaged changes after reset:
-M	file
-ok 10 - stash save --include-untracked dirty index got stashed
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 35 - stash rm then recreate
 
-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
+expecting success of 3903.36 '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 11 - stash save --include-untracked -q is quiet
+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 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
+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
 
-Saved working directory and index state WIP on master: 777c62c initial
-ok 12 - stash save --include-untracked removed files
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 36 - stash rm and ignore
 
-expecting success of 3905.13 'stash save --include-untracked removed files got stashed': 
-	git stash pop &&
-	test_path_is_missing file
+expecting success of 3903.37 '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)"
 
+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 master
+On branch stashbranch
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   .gitignore
+
 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
+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 3905.14 'stash save --include-untracked respects .gitignore': 
-	cat >.gitignore <<-EOF &&
-	.gitignore
-	ignored
-	ignored.d/
-	EOF
+ok 37 - stash rm and ignore (stage .gitignore)
 
-	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
+checking prerequisite: SYMLINKS
 
-Saved working directory and index state WIP on master: 777c62c initial
-ok 14 - stash save --include-untracked respects .gitignore
+mkdir -p "$TRASH_DIRECTORY/prereq-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 3905.15 'stash save -u can stash with only untracked files different': 
-	echo 4 >file4 &&
-	git stash -u &&
-	test_path_is_missing file4
+)
+prerequisite SYMLINKS ok
+expecting success of 3903.38 '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
 
-Saved working directory and index state WIP on master: 777c62c initial
-ok 15 - stash save -u can stash with only untracked files different
+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
 
-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
+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
 
-Saved working directory and index state WIP on master: 777c62c initial
-ok 16 - stash save --all does not respect .gitignore
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 38 - stash file to symlink
 
-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 3903.39 '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
-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
+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
 
-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
+	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)
-Dropped refs/stash@{0} (8c4436f5c5cee126e0672d6347a425d7e9dcfcdd)
-ok 18 - stash push --include-untracked with pathspec
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 39 - stash file to symlink (stage rm)
 
-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 3903.40 '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
 
-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
+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)
-	bar
-
-Dropped refs/stash@{0} (35eb97973117e33f4570df8b356a559959935987)
-ok 19 - stash push with $IFS character
+	actual
+	err
+	expect
+	expect1
+	expect2
+	expected
+	file2.diff
+	output
+	output.out
+	repo/
+	usage
 
-expecting success of 3905.20 'stash previously ignored file': 
-	cat >.gitignore <<-EOF &&
-	ignored
-	ignored.d/*
-	EOF
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 40 - stash file to symlink (full stage)
 
-	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 3903.41 '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"
 
-[master 14579a4] Add .gitignore
+HEAD is now at d3a23d9 alternate second
+[stashbranch f202a25] Add symlink
  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
+ 1 file changed, 1 insertion(+)
+ create mode 120000 filelink
+Saved working directory and index state On stashbranch: symlink to file
+ok 41 - stash symlink to file
+
+expecting success of 3903.42 'this must have re-created the symlink': 
+	test -h filelink &&
+	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+
+ok 42 - this must have re-created the symlink
+
+expecting success of 3903.43 '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 master
+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:   .gitignore
+	typechange: filelink
 
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
-	bar
-	foo
-	foo bar
-	ignored.d/
+	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")
-Dropped refs/stash@{0} (cd3bab6f4eef73edff723219ece7e89ceec0e923)
-ok 20 - stash previously ignored file
+ok 43 - unstash must re-create the file
 
-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 3903.44 'stash symlink to file (stage rm)': 
+	git reset --hard &&
+	git rm filelink &&
+	cp file filelink &&
+	git stash save "symlink to file (stage rm)"
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 21 - stash -u -- <untracked> doesnt print error
+HEAD is now at f202a25 Add symlink
+rm 'filelink'
+Saved working directory and index state On stashbranch: symlink to file (stage rm)
+ok 44 - stash symlink to file (stage rm)
 
-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 3903.45 'this must have re-created the symlink': 
+	test -h filelink &&
+	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 22 - stash -u -- <untracked> leaves rest of working tree in place
+ok 45 - this must have re-created the symlink
 
-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 3903.46 'unstash must re-create the file': 
+	git stash apply &&
+	! test -h filelink &&
+	test bar = "$(cat file)"
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 23 - stash -u -- <tracked> <untracked> clears changes in both
+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 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
+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
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 24 - stash --all -- <ignored> stashes ignored file
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 46 - unstash must re-create the file
 
-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 3903.47 '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)"
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 25 - stash --all -- <tracked> <ignored> clears changes in both
+HEAD is now at f202a25 Add symlink
+Saved working directory and index state On stashbranch: symlink to file (full stage)
+ok 47 - stash symlink to file (full stage)
 
-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 3903.48 'this must have re-created the symlink': 
+	test -h filelink &&
+	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
 
-No local changes to save
-ok 26 - stash -u -- <ignored> leaves ignored file alone
+ok 48 - this must have re-created the symlink
 
-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 3903.49 'unstash must re-create the file': 
+	git stash apply &&
+	! test -h filelink &&
+	test bar = "$(cat file)"
 
-ok 27 - stash -u -- <non-existent> shows no changes when there are none
+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 3905.28 'stash -u with globs': 
-	>untracked.txt &&
-	git stash -u -- ":(glob)**/*.txt" &&
-	test_path_is_missing untracked.txt
+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
 
-Saved working directory and index state WIP on master: 14579a4 Add .gitignore
-ok 28 - stash -u with globs
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 49 - unstash must re-create the file
 
-expecting success of 3905.29 'stash show --include-untracked shows untracked files': 
+checking known breakage of 3903.50 'stash directory to file': 
 	git reset --hard &&
-	git clean -xf &&
-	>untracked &&
-	>tracked &&
-	git add tracked &&
-	empty_blob_oid=$(git rev-parse --short :tracked) &&
-	git stash -u &&
+	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^
 
-	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 &&
+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 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
 
-	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
+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
 
-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
+no changes added to commit (use "git add" and/or "git commit -a")
+test_must_fail: command succeeded: git stash apply
+not ok 50 - stash directory to file # TODO known breakage
 
-expecting success of 3905.30 'stash show --only-untracked only shows untracked files': 
+checking known breakage of 3903.51 'stash file to directory': 
 	git reset --hard &&
-	git clean -xf &&
-	>untracked &&
-	>tracked &&
-	git add tracked &&
-	empty_blob_oid=$(git rev-parse --short :tracked) &&
-	git stash -u &&
+	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)"
 
-	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 &&
+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
 
-	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
+nothing added to commit but untracked files present (use "git add" to track)
+File file/file doesn't exist
+not ok 51 - stash file to directory # TODO known breakage
 
-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 3903.52 '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
 
-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 &&
+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 52 - giving too many ref arguments does not modify files
 
-	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 &&
+expecting success of 3903.53 '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
 
-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
+Too many revisions specified: 'stash@{0}' 'stash@{1}'
+ok 53 - drop: too many arguments errors out (does nothing)
 
-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 3903.54 '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
 
-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
+Too many revisions specified: 'stash@{0}' 'stash@{1}'
+ok 54 - show: too many arguments errors out (does nothing)
 
-expecting success of 3905.33 'stash show --{include,only}-untracked on stashes without untracked entries': 
+expecting success of 3903.55 'stash create - no changes': 
+	git stash clear &&
+	test_when_finished "git reset --hard HEAD" &&
 	git reset --hard &&
-	git clean -xf &&
-	>tracked &&
-	git add tracked &&
-	git stash &&
-
-	git stash show >expect &&
-	git stash show --include-untracked >actual &&
-	test_cmp expect actual &&
-
-	git stash show --only-untracked >actual &&
+	git stash create >actual &&
 	test_must_be_empty actual
 
-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
+HEAD is now at 36c53af Add file in dir
+HEAD is now at 36c53af Add file in dir
+ok 55 - stash create - no changes
 
-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 3903.56 '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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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
 
-# passed all 34 test(s)
-1..34
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4003-diff-rename-1.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4003-diff-rename-1/.git/
-expecting success of 4003.1 'prepare reference tree': 
-	COPYING_test_data >COPYING &&
-	echo frotz >rezrov &&
-	git update-index --add COPYING rezrov &&
-	tree=$(git write-tree) &&
-	echo $tree
+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
 
-f7f2b494dd94f6acf05bc19174516b590236eb2d
-ok 1 - prepare reference tree
+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 56 - stash branch - no stashes on stack, stash-like argument
 
-expecting success of 4003.2 'prepare work tree': 
-	sed -e s/HOWEVER/However/ <COPYING >COPYING.1 &&
-	sed -e s/GPL/G.P.L/g <COPYING >COPYING.2 &&
-	rm -f COPYING &&
-	git update-index --add --remove COPYING COPYING.?
+expecting success of 3903.57 '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
 
-ok 2 - prepare work tree
+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
 
-expecting success of 4003.3 'validate output from rename/copy detection (#1)': 
-	compare_diff_patch current expected
+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 3 - validate output from rename/copy detection (#1)
+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 57 - stash branch - stashes on stack, stash-like argument
 
-expecting success of 4003.4 'prepare work tree again': 
-	mv COPYING.2 COPYING &&
-	git update-index --add --remove COPYING COPYING.1 COPYING.2
+expecting success of 3903.58 'stash branch complains with no arguments': 
+	test_must_fail git stash branch 2>err &&
+	test_grep "No branch name specified" err
 
-ok 4 - prepare work tree again
+No branch name specified
+ok 58 - stash branch complains with no arguments
 
-expecting success of 4003.5 'validate output from rename/copy detection (#2)': 
-	compare_diff_patch current expected
+expecting success of 3903.59 '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
 
-ok 5 - validate output from rename/copy detection (#2)
+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 59 - stash show format defaults to --stat
 
-expecting success of 4003.6 'prepare work tree once again': 
-	COPYING_test_data >COPYING &&
-	git update-index --add --remove COPYING COPYING.1
+expecting success of 3903.60 '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
 
-ok 6 - prepare work tree once again
+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 - stashes on stack, stash-like argument
 
-expecting success of 4003.7 'validate output from rename/copy detection (#3)': 
-	compare_diff_patch current expected
+expecting success of 3903.61 '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
 
-ok 7 - validate output from rename/copy detection (#3)
+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 -p - stashes on stack, stash-like argument
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4004-diff-rename-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4004-diff-rename-symlink/.git/
-checking prerequisite: SYMLINKS
+expecting success of 3903.62 '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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+ok 62 - stash show - no stashes on stack, stash-like argument
 
-)
-prerequisite SYMLINKS ok
-expecting success of 4004.1 'prepare reference tree': 
-	echo xyzzy | tr -d \\012 >yomin &&
-	ln -s xyzzy frotz &&
-	git update-index --add frotz yomin &&
-	tree=$(git write-tree) &&
-	echo $tree
+expecting success of 3903.63 '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
 
-e8a7292168115b2c189b56bd500aa179ca8d69ba
-ok 1 - prepare reference tree
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+ok 63 - stash show -p - no stashes on stack, stash-like argument
 
-expecting success of 4004.2 'prepare work tree': 
-	mv frotz rezrov &&
-	rm -f yomin &&
-	ln -s xyzzy nitfol &&
-	ln -s xzzzy bozbar &&
-	git update-index --add --remove frotz rezrov nitfol bozbar yomin
+expecting success of 3903.64 '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
 
-ok 2 - prepare work tree
+HEAD is now at 662e8e5 second
+HEAD is now at 662e8e5 second
+ok 64 - stash show --patience shows diff
 
-expecting success of 4004.3 'setup diff output': 
-	GIT_DIFF_OPTS=--unified=0 git diff-index -C -p $tree >current &&
-	cat >expected <<\EOF
-diff --git a/bozbar b/bozbar
-new file mode 120000
---- /dev/null
-+++ b/bozbar
-@@ -0,0 +1 @@
-+xzzzy
-\ No newline at end of file
-diff --git a/frotz b/nitfol
-similarity index 100%
-copy from frotz
-copy to nitfol
-diff --git a/frotz b/rezrov
-similarity index 100%
-rename from frotz
-rename to rezrov
-diff --git a/yomin b/yomin
-deleted file mode 100644
---- a/yomin
-+++ /dev/null
-@@ -1 +0,0 @@
--xyzzy
-\ No newline at end of file
-EOF
+expecting success of 3903.65 '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
 
-ok 3 - setup diff output
+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
 
-expecting success of 4004.4 'validate diff output': 
-	compare_diff_patch current expected
+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 4 - validate diff output
+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 65 - drop: fail early if specified stash is not a stash ref
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4005-diff-rename-2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 3903.66 '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
 
-f7f2b494dd94f6acf05bc19174516b590236eb2d
-ok 1 - setup reference tree
+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
 
-expecting success of 4005.2 'validate output from rename/copy detection (#1)': 
-	rm -f COPYING &&
-	git update-index --add --remove COPYING COPYING.? &&
+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
 
-	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
+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 - pop: fail early if specified stash is not a stash ref
 
-ok 2 - validate output from rename/copy detection (#1)
+expecting success of 3903.67 '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 4005.3 'validate output from rename/copy detection (#2)': 
-	mv COPYING.2 COPYING &&
-	git update-index --add --remove COPYING COPYING.1 COPYING.2 &&
+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 67 - ref with non-existent reflog
 
-	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 3903.68 '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
 
-ok 3 - validate output from rename/copy detection (#2)
+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 68 - invalid ref of the form stash@{n}, n >= N
 
-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 3903.69 '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
 
-	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
+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 69 - invalid ref of the form "n", n >= N
 
-ok 4 - validate output from rename/copy detection (#3)
+expecting success of 3903.70 '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
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4006-diff-mode.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4006-diff-mode/.git/
-expecting success of 4006.1 'setup': 
-	echo frotz >rezrov &&
-	git update-index --add rezrov &&
-	tree=$(git write-tree) &&
-	echo $tree
+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
 
-5189e2f1ba2c164fa2006e4f8f4e4ec56f15291e
-ok 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:   file
 
-expecting success of 4006.2 'chmod': 
-	test_chmod +x rezrov &&
-	git diff-index $tree >current &&
-	sed -e "$sed_script" <current >check &&
-	echo ":100644 100755 X X M	rezrov" >expected &&
-	test_cmp expected check
+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 2 - chmod
+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 4006.3 'prepare binary file': 
-	git commit -m one &&
-	test_commit --printf two binbin "\00\01\02\03\04\05\06"
+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
 
-[master (root-commit) d232af0] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100755 rezrov
-[master a89ae18] two
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binbin
-ok 3 - prepare binary file
+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 4006.4 '--stat output after text chmod': 
-	test_chmod -x rezrov &&
-	cat >expect <<-\EOF &&
-	 rezrov | 0
-	 1 file changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	git diff HEAD --stat >actual &&
-	test_cmp expect actual
+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
 
-ok 4 - --stat output after text chmod
+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 4006.5 '--shortstat output after text chmod': 
-	tail -n 1 <expect >expect.short &&
-	git diff HEAD --shortstat >actual &&
-	test_cmp expect.short 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/
+	usage
 
-ok 5 - --shortstat output after text chmod
+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 70 - valid ref of the form "n", n < N
 
-expecting success of 4006.6 '--stat output after binary chmod': 
-	test_chmod +x binbin &&
-	cat >expect <<-EOF &&
-	 binbin | Bin
-	 rezrov |   0
-	 2 files changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	git diff HEAD --stat >actual &&
-	test_cmp expect actual
+expecting success of 3903.71 '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} --
 
-ok 6 - --stat output after binary chmod
+[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 71 - branch: do not drop the stash if the branch exists
 
-expecting success of 4006.7 '--shortstat output after binary chmod': 
-	tail -n 1 <expect >expect.short &&
-	git diff HEAD --shortstat >actual &&
-	test_cmp expect.short actual
+expecting success of 3903.72 '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 7 - --shortstat output after binary chmod
+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
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4007-rename-3.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4007-rename-3/.git/
-expecting success of 4007.1 'prepare reference tree': 
-	mkdir path0 path1 &&
-	COPYING_test_data >path0/COPYING &&
-	git update-index --add path0/COPYING &&
-	tree=$(git write-tree) &&
-	blob=$(git rev-parse :path0/COPYING)
+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 1 - prepare reference tree
+no changes added to commit (use "git add" and/or "git commit -a")
+68902b50f26eb6fc30df10f888c7728c286038c7
+--
+Switched to branch 'main'
+M	file
+ok 72 - branch: should not drop the stash if the apply fails
 
-expecting success of 4007.2 'prepare work tree': 
-	cp path0/COPYING path1/COPYING &&
-	git update-index --add --remove path0/COPYING path1/COPYING
+expecting success of 3903.73 '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
 
-ok 2 - prepare work tree
+[main 307367e] subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/subfile1
+ok 73 - apply: show same status as git status (relative to ./)
 
-expecting success of 4007.3 'copy detection': 
-	git diff-index -C --find-copies-harder $tree >current &&
-	compare_diff_raw current expected
+expecting success of 3903.74 '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 3 - copy detection
+HEAD is now at 307367e subdir
+Saved working directory and index state WIP on main: 307367e subdir
+ok 74 - stash where working directory contains "HEAD" file
 
-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 3903.75 'store called with invalid commit': 
+	test_must_fail git stash store foo
 
-ok 4 - copy detection, cached
+Cannot update refs/stash with foo
+ok 75 - store called with invalid commit
 
-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 3903.76 'store called with non-stash commit': 
+	test_must_fail git stash store HEAD
 
-ok 5 - copy, limited to a subtree
+fatal: '307367ef082bbeb26ff4d37194044be1a75ff404' is not a stash-like commit
+ok 76 - store called with non-stash commit
 
-expecting success of 4007.6 'tweak work tree': 
-	rm -f path0/COPYING &&
-	git update-index --remove path0/COPYING
+expecting success of 3903.77 '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 6 - tweak work tree
+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 4007.7 'rename detection': 
-	git diff-index -C --find-copies-harder $tree >current &&
-	compare_diff_raw current expected
+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 7 - rename detection
+Dropped refs/stash@{0} (47ce57b251b2eb978437ea9bbc89e32969254a93)
+quux
+ok 77 - store updates stash ref and reflog
 
-expecting success of 4007.8 'rename, limited to a subtree': 
-	git diff-index -C --find-copies-harder $tree path1 >current &&
-	compare_diff_raw current expected
+expecting success of 3903.78 '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 8 - rename, limited to a subtree
+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
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4009-diff-rename-4.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4009-diff-rename-4/.git/
-expecting success of 4009.1 'prepare reference tree': COPYING_test_data >COPYING &&
-     echo frotz >rezrov &&
-    git update-index --add COPYING rezrov &&
-    orig=$(git hash-object COPYING) &&
-    tree=$(git write-tree) &&
-    echo $tree
-f7f2b494dd94f6acf05bc19174516b590236eb2d
-ok 1 - prepare reference tree
+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 4009.2 'prepare work tree': sed -e s/HOWEVER/However/ <COPYING >COPYING.1 &&
-    sed -e s/GPL/G.P.L/g <COPYING >COPYING.2 &&
-    rm -f COPYING &&
-    c1=$(git hash-object COPYING.1) &&
-    c2=$(git hash-object COPYING.2) &&
-    git update-index --add --remove COPYING COPYING.?
-ok 2 - prepare work tree
+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 4009.3 'validate output from rename/copy detection (#1)': compare_diff_raw_z current expected
-ok 3 - validate output from rename/copy detection (#1)
+pig
+ok 78 - handle stash specification with spaces
 
-expecting success of 4009.4 'prepare work tree again': mv COPYING.2 COPYING &&
-     git update-index --add --remove COPYING COPYING.1 COPYING.2
-ok 4 - prepare work tree again
+expecting success of 3903.79 '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 4009.5 'validate output from rename/copy detection (#2)': compare_diff_raw_z current expected
-ok 5 - validate output from rename/copy detection (#2)
+HEAD is now at 307367e subdir
+Saved working directory and index state WIP on main: 307367e subdir
+ok 79 - setup stash with index and worktree changes
 
-expecting success of 4009.6 'prepare work tree once again': COPYING_test_data >COPYING &&
-     git update-index --add --remove COPYING COPYING.1
-ok 6 - prepare work tree once again
+expecting success of 3903.80 'stash list -p shows simple diff': 
+	cat >expect <<-EOF &&
+	stash@{0}
 
-expecting success of 4009.7 'validate output from rename/copy detection (#3)': compare_diff_raw_z current expected
-ok 7 - validate output from rename/copy detection (#3)
+	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
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4008-diff-break-rewrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4008-diff-break-rewrite/.git/
-expecting success of 4008.1 'setup': 
-	echo some dissimilar content >file0 &&
-	COPYING_test_data >file1 &&
-	blob0_id=$(git hash-object file0) &&
-	blob1_id=$(git hash-object file1) &&
-	git update-index --add file0 file1 &&
-	git tag reference $(git write-tree)
+ok 80 - stash list -p shows simple diff
 
-ok 1 - setup
+expecting success of 3903.81 'stash list --cc shows combined diff': 
+	cat >expect <<-\EOF &&
+	stash@{0}
 
-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
+	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
 
-ok 2 - change file1 with copy-edit of file0 and remove file0
+ok 81 - stash list --cc shows combined diff
 
-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
+expecting success of 3903.82 '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
 
-ok 3 - run diff with -B (#1)
+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
 
-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
+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 4 - run diff with -B and -M (#2)
+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 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 82 - stash is not confused by partial renames
 
-ok 5 - swap file0 and file1
+expecting success of 3903.83 '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
 
-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
+Saved working directory and index state On main: test message
+ok 83 - push -m shows right message
 
-ok 6 - run diff with -B (#3)
+expecting success of 3903.84 '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 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
+Saved working directory and index state On main: unspaced test message
+ok 84 - push -m also works without space
 
-ok 7 - run diff with -B and -M (#4)
+expecting success of 3903.85 '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
 
-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
+HEAD is now at 307367e subdir
+ok 85 - store -m foo shows right message
 
-checking prerequisite: SYMLINKS
+expecting success of 3903.86 '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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+HEAD is now at 307367e subdir
+ok 86 - store -mfoo shows right message
 
-)
-prerequisite SYMLINKS ok
-ok 8 - make file0 into something completely different
+expecting success of 3903.87 '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
 
-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
+HEAD is now at 307367e subdir
+ok 87 - store --message=foo shows right message
 
-ok 9 - run diff with -B (#5)
+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
 
-expecting success of 4008.10 'run diff with -B -M (#6)': 
-	git diff-index -B -M reference >current &&
+HEAD is now at 307367e subdir
+ok 88 - store --message foo shows right message
 
-	# 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
+expecting success of 3903.89 '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
 
-ok 10 - run diff with -B -M (#6)
+Saved working directory and index state On main: test mfoo
+ok 89 - push -mfoo uses right message
 
-expecting success of 4008.11 'run diff with -M (#7)': 
-	git diff-index -M reference >current &&
+expecting success of 3903.90 '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
 
-	# 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
+Saved working directory and index state On main: test message foo
+ok 90 - push --message foo is synonym for -mfoo
 
-ok 11 - run diff with -M (#7)
+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 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
+Saved working directory and index state On main: test message=foo
+ok 91 - push --message=foo is synonym for -mfoo
 
-ok 12 - file1 edited to look like file0 and file0 rename-edited to file2
+expecting success of 3903.92 '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
 
-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
+Saved working directory and index state On main: test m foo
+ok 92 - push -m shows right message
 
-ok 13 - run diff with -B (#8)
+expecting success of 3903.93 '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
 
-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 93 - create stores correct message
 
-ok 14 - run diff with -B -C (#9)
+expecting success of 3903.94 '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
 
-# passed all 14 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4010-diff-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4010-diff-pathspec/.git/
-expecting success of 4010.1 'setup': echo frotz >file0 &&
-     mkdir path1 &&
-     echo rezrov >path1/file1 &&
-     before0=$(git hash-object file0) &&
-     before1=$(git hash-object path1/file1) &&
-     git update-index --add file0 path1/file1 &&
-     tree=$(git write-tree) &&
-     echo "$tree" &&
-     echo nitfol >file0 &&
-     echo yomin >path1/file1 &&
-     after0=$(git hash-object file0) &&
-     after1=$(git hash-object path1/file1) &&
-     git update-index file0 path1/file1
-6b4658eda9b6c5385f027bc54abf3276b6effd05
-ok 1 - setup
+Switched to a new branch 'some/topic'
+Switched to branch 'main'
+A	foo
+ok 94 - create when branch name has /
 
-expecting success of 4010.2 'limit to path should show nothing': git diff-index --cached $tree -- path >current &&
-     compare_diff_raw current expected
-ok 2 - limit to path should show nothing
+expecting success of 3903.95 '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 4010.3 'limit to path1 should show path1/file1': git diff-index --cached $tree -- path1 >current &&
-     compare_diff_raw current expected
-ok 3 - limit to path1 should show path1/file1
+ok 95 - create with multiple arguments for the message
 
-expecting success of 4010.4 'limit to path1/ should show path1/file1': git diff-index --cached $tree -- path1/ >current &&
-     compare_diff_raw current expected
-ok 4 - limit to path1/ should show path1/file1
+expecting success of 3903.96 '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 4010.5 '"*file1" should show path1/file1': git diff-index --cached $tree -- "*file1" >current &&
-     compare_diff_raw current expected
-ok 5 - "*file1" should show path1/file1
+Note: switching to 'HEAD~1'.
 
-expecting success of 4010.6 'limit to file0 should show file0': git diff-index --cached $tree -- file0 >current &&
-     compare_diff_raw current expected
-ok 6 - limit to file0 should show file0
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 4010.7 'limit to file0/ should emit nothing.': git diff-index --cached $tree -- file0/ >current &&
-     compare_diff_raw current expected
-ok 7 - limit to file0/ should emit nothing.
+If you want to 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 4010.8 'diff-tree pathspec': 
-	tree2=$(git write-tree) &&
-	echo "$tree2" &&
-	git diff-tree -r --name-only $tree $tree2 -- pa path1/a >current &&
-	test_must_be_empty current
+  git switch -c <new-branch-name>
 
-54d8765b122f32157e847ce3924180cb2ec778fc
-ok 8 - diff-tree pathspec
+Or undo this operation with:
 
-expecting success of 4010.9 'diff-tree with wildcard shows dir also matches': 
-	git diff-tree --name-only $EMPTY_TREE $tree -- "f*" >result &&
-	echo file0 >expected &&
-	test_cmp expected result
+  git switch -
 
-ok 9 - diff-tree with wildcard shows dir also matches
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 4010.10 'diff-tree -r with wildcard': 
-	git diff-tree -r --name-only $EMPTY_TREE $tree -- "*file1" >result &&
-	echo path1/file1 >expected &&
-	test_cmp expected result
+HEAD is now at 47d5e0e initial
+A	foo
+Previous HEAD position was 47d5e0e initial
+Switched to branch 'main'
+A	foo
+ok 96 - create in a detached state
 
-ok 10 - diff-tree -r with wildcard
+expecting success of 3903.97 '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 4010.11 'diff-tree with wildcard shows dir also matches': 
-	git diff-tree --name-only $tree $tree2 -- "path1/f*" >result &&
-	echo path1 >expected &&
-	test_cmp expected result
+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
 
-ok 11 - diff-tree with wildcard shows dir also matches
+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 4010.12 'diff-tree -r with wildcard from beginning': 
-	git diff-tree -r --name-only $tree $tree2 -- "path1/*file1" >result &&
-	echo path1/file1 >expected &&
-	test_cmp expected result
+Dropped refs/stash@{0} (77cde497b79c4bf69eca6c6f66d3d5d913caa5d5)
+ok 97 - stash -- <pathspec> stashes and restores the file
 
-ok 12 - diff-tree -r with wildcard from beginning
+expecting success of 3903.98 '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
 
-expecting success of 4010.13 'diff-tree -r with wildcard': 
-	git diff-tree -r --name-only $tree $tree2 -- "path1/f*" >result &&
-	echo path1/file1 >expected &&
-	test_cmp expected result
+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
 
-ok 13 - diff-tree -r with wildcard
+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 4010.14 'setup submodules': 
-	test_tick &&
-	git init submod &&
-	( cd submod && test_commit first ) &&
-	git add submod &&
-	git commit -m first &&
-	( cd submod && test_commit second ) &&
-	git add submod &&
-	git commit -m second
+Dropped refs/stash@{0} (77cde497b79c4bf69eca6c6f66d3d5d913caa5d5)
+ok 98 - stash -- <pathspec> stashes in subdirectory
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4010-diff-pathspec/submod/.git/
-[master (root-commit) 1e96f59] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-warning: adding embedded git repository: submod
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> submod
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached submod
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[master (root-commit) f9d7654] first
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 file0
- create mode 100644 path1/file1
- create mode 160000 submod
-[master 1bf6dc5] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-[master f1afec5] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 14 - setup submodules
+expecting success of 3903.99 '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 4010.15 'diff-tree ignores trailing slash on submodule path': 
-	git diff --name-only HEAD^ HEAD submod >expect &&
-	git diff --name-only HEAD^ HEAD submod/ >actual &&
-	test_cmp expect actual &&
-	git diff --name-only HEAD^ HEAD -- submod/whatever >actual &&
-	test_must_be_empty actual
+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
 
-ok 15 - diff-tree ignores trailing slash on submodule 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
 
-expecting success of 4010.16 'diff multiple wildcard pathspecs': 
-	mkdir path2 &&
-	echo rezrov >path2/file1 &&
-	git update-index --add path2/file1 &&
-	tree3=$(git write-tree) &&
-	git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual &&
-	cat <<-\EOF >expect &&
-	path1/file1
-	path2/file1
-	EOF
-	test_cmp expect actual
+Dropped refs/stash@{0} (39084c1f0c9f714051bc864ea9bde5fe251804e7)
+ok 99 - stash with multiple pathspec arguments
 
-ok 16 - diff multiple wildcard pathspecs
+expecting success of 3903.100 '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 4010.17 'diff-cache ignores trailing slash on submodule path': 
-	git diff --name-only HEAD^ submod >expect &&
-	git diff --name-only HEAD^ submod/ >actual &&
-	test_cmp expect actual
+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 17 - diff-cache ignores trailing slash on submodule 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
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4011-diff-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4011-diff-symlink/.git/
-expecting success of 4011.1 'diff new symlink and file': 
-	symlink=$(symlink_oid xyzzy) &&
-	cat >expected <<-EOF &&
-	diff --git a/frotz b/frotz
-	new file mode 120000
-	index 0000000..$symlink
-	--- /dev/null
-	+++ b/frotz
-	@@ -0,0 +1 @@
-	+xyzzy
-	\ No newline at end of file
-	diff --git a/nitfol b/nitfol
-	new file mode 100644
-	index 0000000..$symlink
-	--- /dev/null
-	+++ b/nitfol
-	@@ -0,0 +1 @@
-	+xyzzy
-	EOF
+Dropped refs/stash@{0} (a0eb395f4ba4b07852ce751bcb1e058bceeddcd6)
+ok 100 - stash with file including $IFS character
 
-	# the empty tree
-	git update-index &&
-	tree=$(git write-tree) &&
+expecting success of 3903.101 '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
 
-	test_ln_s_add xyzzy frotz &&
-	echo xyzzy >nitfol &&
-	git update-index --add nitfol &&
-	GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
-	compare_diff_patch expected current
+[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
 
-checking prerequisite: SYMLINKS
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+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
 
-)
-prerequisite SYMLINKS ok
-ok 1 - diff new symlink and file
+Dropped refs/stash@{0} (a99e49675f8b387c63ffade2c2dafb4b31242b77)
+ok 101 - stash with pathspec matching multiple paths
 
-expecting success of 4011.2 'diff unchanged symlink and file': 
-	tree=$(git write-tree) &&
-	git update-index frotz nitfol &&
-	test -z "$(git diff-index --name-only $tree)"
+expecting success of 3903.102 '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
 
-ok 2 - diff unchanged symlink and file
+[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 102 - stash push -p with pathspec shows no changes only once
 
-expecting success of 4011.3 'diff removed symlink and file': 
-	cat >expected <<-EOF &&
-	diff --git a/frotz b/frotz
-	deleted file mode 120000
-	index $symlink..0000000
-	--- a/frotz
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-xyzzy
-	\ No newline at end of file
-	diff --git a/nitfol b/nitfol
-	deleted file mode 100644
-	index $symlink..0000000
-	--- a/nitfol
-	+++ /dev/null
-	@@ -1 +0,0 @@
-	-xyzzy
-	EOF
-	mv frotz frotz2 &&
-	mv nitfol nitfol2 &&
-	git diff-index -M -p $tree >current &&
-	compare_diff_patch expected current
+expecting success of 3903.103 '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
 
-ok 3 - diff removed symlink and file
+[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 103 - push <pathspec>: show no changes when there are none
 
-expecting success of 4011.4 'diff identical, but newly created symlink and file': 
-	>expected &&
-	rm -f frotz nitfol &&
-	echo xyzzy >nitfol &&
-	test-tool chmtime +10 nitfol &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s xyzzy frotz
-	else
-		printf xyzzy >frotz
-		# the symlink property propagates from the index
-	fi &&
-	git diff-index -M -p $tree >current &&
-	compare_diff_patch expected current &&
+expecting success of 3903.104 'push: <pathspec> not in the repository errors out': 
+	>untracked &&
+	test_must_fail git stash push untracked &&
+	test_path_is_file untracked
 
-	>expected &&
-	git diff-index -M -p -w $tree >current &&
-	compare_diff_patch expected current
+error: pathspec ':(prefix:0)untracked' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 104 - push: <pathspec> not in the repository errors out
 
-ok 4 - diff identical, but newly created symlink and file
+expecting success of 3903.105 'push: -q is quiet with changes': 
+	>foo &&
+	git add foo &&
+	git stash push -q >output 2>&1 &&
+	test_must_be_empty output
 
-expecting success of 4011.5 'diff different symlink and file': 
-	new=$(symlink_oid yxyyz) &&
-	cat >expected <<-EOF &&
-	diff --git a/frotz b/frotz
-	index $symlink..$new 120000
-	--- a/frotz
-	+++ b/frotz
-	@@ -1 +1 @@
-	-xyzzy
-	\ No newline at end of file
-	+yxyyz
-	\ No newline at end of file
-	diff --git a/nitfol b/nitfol
-	index $symlink..$new 100644
-	--- a/nitfol
-	+++ b/nitfol
-	@@ -1 +1 @@
-	-xyzzy
-	+yxyyz
-	EOF
-	rm -f frotz &&
-	if test_have_prereq SYMLINKS
-	then
-		ln -s yxyyz frotz
-	else
-		printf yxyyz >frotz
-		# the symlink property propagates from the index
-	fi &&
-	echo yxyyz >nitfol &&
-	git diff-index -M -p $tree >current &&
-	compare_diff_patch expected current
+ok 105 - push: -q is quiet with changes
 
-ok 5 - diff different symlink and file
+expecting success of 3903.106 'push: -q is quiet with no changes': 
+	git stash push -q >output 2>&1 &&
+	test_must_be_empty output
 
-expecting success of 4011.6 'diff symlinks with non-existing targets': 
-	ln -s narf pinky &&
-	ln -s take\ over brain &&
-	test_must_fail git diff --no-index pinky brain >output 2>output.err &&
-	grep narf output &&
-	test_must_be_empty output.err
+ok 106 - push: -q is quiet with no changes
 
--narf
-ok 6 - diff symlinks with non-existing targets
+expecting success of 3903.107 '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 4011.7 'setup symlinks with attributes': 
-	echo "*.bin diff=bin" >>.gitattributes &&
-	echo content >file.bin &&
-	ln -s file.bin link.bin &&
-	git add -N file.bin link.bin
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3903-stash/foo_dir/.git/
+ok 107 - push: -q is quiet even if there is no initial commit
 
-ok 7 - setup symlinks with attributes
+expecting success of 3903.108 '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 4011.8 'symlinks do not respect userdiff config by path': 
-	file=$(short_oid file.bin) &&
-	link=$(symlink_oid file.bin) &&
-	cat >expect <<-EOF &&
-	diff --git a/file.bin b/file.bin
-	new file mode 100644
-	index 0000000..$file
-	Binary files /dev/null and b/file.bin differ
-	diff --git a/link.bin b/link.bin
-	new file mode 120000
-	index 0000000..$link
-	--- /dev/null
-	+++ b/link.bin
-	@@ -0,0 +1 @@
-	+file.bin
-	\ No newline at end of file
-	EOF
-	git config diff.bin.binary true &&
-	git diff file.bin link.bin >actual &&
-	test_cmp expect actual
+Saved working directory and index state WIP on main: 7a1ff97 two
+ok 108 - untracked files are left in place when -u is not given
 
-ok 8 - symlinks do not respect userdiff config by path
+expecting success of 3903.109 '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
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4002-diff-basic.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4002-diff-basic/.git/
-expecting success of 4002.1 'adding test file NN and Z/NN': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 1 - adding test file NN and Z/NN
+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
 
-expecting success of 4002.2 'adding test file ND and Z/ND': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 2 - adding test file ND and Z/ND
+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 4002.3 'adding test file NM and Z/NM': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 3 - adding test file NM and Z/NM
+Dropped refs/stash@{0} (ee2f40a7fbffdfcabacf51aaa804cdfb77cbd5cc)
+ok 109 - stash without verb with pathspec
 
-expecting success of 4002.4 'adding test file DN and Z/DN': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 4 - adding test file DN and Z/DN
+expecting success of 3903.110 '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 4002.5 'adding test file DD and Z/DD': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 5 - adding test file DD and Z/DD
+[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
 
-expecting success of 4002.6 'adding test file DM and Z/DM': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 6 - adding test file DM and Z/DM
+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 4002.7 'adding test file MN and Z/MN': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 7 - adding test file MN and Z/MN
+no changes added to commit (use "git add" and/or "git commit -a")
+Dropped refs/stash@{0} (ba2404f46c158deabdec1768576a3ec717c3bd0e)
+ok 110 - stash -k -- <pathspec> leaves unstaged files intact
 
-expecting success of 4002.8 'adding test file MD and Z/MD': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 8 - adding test file MD and Z/MD
+expecting success of 3903.111 '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 4002.9 'adding test file MM and Z/MM': 
-	    git update-index --add $p &&
-	    git update-index --add Z/$p
-    
-ok 9 - adding test file MM and Z/MM
+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
 
-expecting success of 4002.10 'adding test file SS': 
-	git update-index --add SS
+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 10 - adding test file SS
+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 4002.11 'adding test file TT': 
-	git update-index --add TT
+Dropped refs/stash@{0} (2749eb7e55d7636b47e46aaec96ad1ff54f3d24c)
+ok 111 - stash -- <subdir> leaves untracked files in subdir intact
 
-ok 11 - adding test file TT
+expecting success of 3903.112 '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 4002.12 'prepare initial tree': 
-	tree_O=$(git write-tree)
+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 12 - prepare initial tree
+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 4002.13 'change in branch A (removal)': 
-	git update-index --remove $to_remove
+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 13 - change in branch A (removal)
+Dropped refs/stash@{0} (e57a3ec7bcb89795529c05afe9c1d3759e31605b)
+ok 112 - stash -- <subdir> works with binary files
 
-expecting success of 4002.14 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 14 - change in branch A (modification)
+expecting success of 3903.113 '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 4002.15 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 15 - change in branch A (modification)
+Saved working directory and index state WIP on main: f03eb4e test
+ok 113 - stash with user.name and user.email set works
 
-expecting success of 4002.16 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 16 - change in branch A (modification)
+expecting success of 3903.114 '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
+	)
 
-expecting success of 4002.17 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 17 - change in branch A (modification)
+Saved working directory and index state WIP on main: f03eb4e test
+Author identity unknown
 
-expecting success of 4002.18 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 18 - change in branch A (modification)
+*** Please tell me who you are.
 
-expecting success of 4002.19 'change in branch A (modification)': 
-		git update-index $p
-	
-ok 19 - change in branch A (modification)
+Run
 
-expecting success of 4002.20 'change in branch A (addition)': 
-		git update-index --add $p
-	
-ok 20 - change in branch A (addition)
+  git config --global user.email "you@example.com"
+  git config --global user.name "Your Name"
 
-expecting success of 4002.21 'change in branch A (addition)': 
-		git update-index --add $p
-	
-ok 21 - change in branch A (addition)
+to set your account's default identity.
+Omit --global to set the identity only in this repository.
 
-expecting success of 4002.22 'change in branch A (addition)': 
-		git update-index --add $p
-	
-ok 22 - change in branch A (addition)
+fatal: no email was given and auto-detection is disabled
+Saved working directory and index state WIP on main: f03eb4e test
+ok 114 - stash works when user.name and user.email are not set
 
-expecting success of 4002.23 'change in branch A (addition)': 
-		git update-index --add $p
-	
-ok 23 - change in branch A (addition)
+expecting success of 3903.115 '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
 
-expecting success of 4002.24 'change in branch A (addition)': 
-	git update-index --add LL &&
-	git update-index SS
+[main ebe821f] to-remove
+ 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 115 - stash --keep-index with file deleted in index does not resurrect it on disk
 
-ok 24 - change in branch A (addition)
+expecting success of 3903.116 'stash apply should succeed with unmodified file': 
+	echo base >file &&
+	git add file &&
+	git commit -m base &&
 
-expecting success of 4002.25 'change in branch A (edit)': 
-	git update-index TT
+	# now stash a modification
+	echo modified >file &&
+	git stash &&
 
-ok 25 - change in branch A (edit)
+	# make the file stat dirty
+	cp file other &&
+	mv other file &&
 
-expecting success of 4002.26 'change in branch A (change file to directory)': 
-	git update-index --add DF/DF
+	git stash apply
 
-ok 26 - change in branch A (change file to directory)
+[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
 
-expecting success of 4002.27 'recording branch A tree': 
-	tree_A=$(git write-tree)
+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 27 - recording branch A tree
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 116 - stash apply should succeed with unmodified file
 
-expecting success of 4002.28 'reading original tree and checking out': 
-	git read-tree $tree_O &&
-	git checkout-index -a
+expecting success of 3903.117 '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 &&
 
-ok 28 - reading original tree and checking out
+	git rev-parse --verify refs/stash:A.t
 
-expecting success of 4002.29 'change in branch B (removal)': 
-	git update-index --remove $to_remove
+[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 117 - stash handles skip-worktree entries nicely
 
-ok 29 - change in branch B (removal)
+expecting success of 3903.118 '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/ &&
 
-expecting success of 4002.30 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 30 - change in branch B (modification)
+	# 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 4002.31 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 31 - change in branch B (modification)
+	# 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
 
-expecting success of 4002.32 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 32 - change in branch B (modification)
+Saved working directory and index state WIP on main: 3d10817 A
+ok 118 - stash with core.fsyncmethod=batch
 
-expecting success of 4002.33 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 33 - change in branch B (modification)
+expecting success of 3903.119 'git stash succeeds despite directory/file change': 
+	test_create_repo directory_file_switch_v1 &&
+	(
+		cd directory_file_switch_v1 &&
+		test_commit init &&
 
-expecting success of 4002.34 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 34 - change in branch B (modification)
+		test_write_lines this file has some words >filler &&
+		git add filler &&
+		git commit -m filler &&
 
-expecting success of 4002.35 'change in branch B (modification)': 
-		git update-index $p
-	
-ok 35 - change in branch B (modification)
+		git rm filler &&
+		mkdir filler &&
+		echo contents >filler/file &&
+		git stash push
+	)
 
-expecting success of 4002.36 'change in branch B (addition)': 
-		git update-index --add $p
-	
-ok 36 - change in branch B (addition)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 119 - git stash succeeds despite directory/file change
 
-expecting success of 4002.37 'change in branch B (addition)': 
-		git update-index --add $p
-	
-ok 37 - change in branch B (addition)
+expecting success of 3903.120 'git stash can pop file -> directory saved changes': 
+	test_create_repo directory_file_switch_v2 &&
+	(
+		cd directory_file_switch_v2 &&
+		test_commit init &&
 
-expecting success of 4002.38 'change in branch B (addition)': 
-		git update-index --add $p
-	
-ok 38 - change in branch B (addition)
+		test_write_lines this file has some words >filler &&
+		git add filler &&
+		git commit -m filler &&
 
-expecting success of 4002.39 'change in branch B (addition)': 
-		git update-index --add $p
-	
-ok 39 - change in branch B (addition)
+		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
+	)
 
-expecting success of 4002.40 'change in branch B (addition and modification)': 
-	git update-index --add LL &&
-	git update-index SS
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-ok 40 - change in branch B (addition and modification)
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+	filler/
 
-expecting success of 4002.41 'change in branch B (modification)': 
-	git update-index TT
+ok 120 - git stash can pop file -> directory saved changes
 
-ok 41 - change in branch B (modification)
+expecting success of 3903.121 '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 4002.42 'change in branch B (addition of a file to conflict with directory)': 
-	git update-index --add DF
+		mkdir filler &&
+		test_write_lines some words >filler/file1 &&
+		test_write_lines and stuff >filler/file2 &&
+		git add filler &&
+		git commit -m filler &&
 
-ok 42 - change in branch B (addition of a file to conflict with directory)
+		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 4002.43 'recording branch B tree': 
-	tree_B=$(git write-tree)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 43 - recording branch B tree
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	expect
+	filler
 
-expecting success of 4002.44 'keep contents of 3 trees for easy access': 
-	rm -f .git/index &&
-	git read-tree $tree_O &&
-	mkdir .orig-O &&
-	git checkout-index --prefix=.orig-O/ -f -q -a &&
-	rm -f .git/index &&
-	git read-tree $tree_A &&
-	mkdir .orig-A &&
-	git checkout-index --prefix=.orig-A/ -f -q -a &&
-	rm -f .git/index &&
-	git read-tree $tree_B &&
-	mkdir .orig-B &&
-	git checkout-index --prefix=.orig-B/ -f -q -a
+ok 121 - git stash can pop directory -> file saved changes
 
-ok 44 - keep contents of 3 trees for easy access
+expecting success of 3903.122 'restore untracked files even when we hit conflicts': 
+	git init restore_untracked_after_conflict &&
+	(
+		cd restore_untracked_after_conflict &&
 
-expecting success of 4002.45 'diff-tree of known trees.': 
-	git diff-tree $tree_O $tree_A >.test-a &&
-	cmp -s .test-a .test-plain-OA
+		echo hi >a &&
+		echo there >b &&
+		git add . &&
+		git commit -m first &&
+		echo hello >a &&
+		echo something >c &&
 
-ok 45 - diff-tree of known trees.
+		git stash push --include-untracked &&
 
-expecting success of 4002.46 'diff-tree of known trees.': 
-	git diff-tree -r $tree_O $tree_A >.test-a &&
-	cmp -s .test-a .test-recursive-OA
+		echo conflict >a &&
+		git add a &&
+		git commit -m second &&
 
-ok 46 - diff-tree of known trees.
+		test_must_fail git stash pop &&
 
-expecting success of 4002.47 'diff-tree of known trees.': 
-	git diff-tree $tree_O $tree_B >.test-a &&
-	cmp -s .test-a .test-plain-OB
+		test_path_is_file c
+	)
 
-ok 47 - diff-tree of known trees.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 4002.48 'diff-tree of known trees.': 
-	git diff-tree -r $tree_O $tree_B >.test-a &&
-	cmp -s .test-a .test-recursive-OB
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	c
 
-ok 48 - diff-tree of known trees.
+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 122 - restore untracked files even when we hit conflicts
 
-expecting success of 4002.49 'diff-tree of known trees.': 
-	git diff-tree $tree_A $tree_B >.test-a &&
-	cmp -s .test-a .test-plain-AB
+expecting success of 3903.123 '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 49 - diff-tree of known trees.
+		cat >expect <<-EOF &&
+		error: could not write index
+		EOF
+		test_must_fail git stash create 2>err &&
+		test_cmp expect err
+	)
 
-expecting success of 4002.50 'diff-tree of known trees.': 
-	git diff-tree -r $tree_A $tree_B >.test-a &&
-	cmp -s .test-a .test-recursive-AB
+Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/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 123 - stash create reports a locked index
 
-ok 50 - diff-tree of known trees.
+expecting success of 3903.124 '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 &&
+
+		cat >expect <<-EOF &&
+		error: could not write index
+		EOF
+		test_must_fail git stash push 2>err &&
+		test_cmp expect err
+	)
 
-expecting success of 4002.51 'diff-tree --stdin of known trees.': 
-	echo $tree_A $tree_B | git diff-tree --stdin > .test-a &&
-	echo $tree_A $tree_B > .test-plain-ABx &&
-	cat .test-plain-AB >> .test-plain-ABx &&
-	cmp -s .test-a .test-plain-ABx
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 124 - stash push reports a locked index
 
-ok 51 - diff-tree --stdin of known trees.
+expecting success of 3903.125 '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 &&
 
-expecting success of 4002.52 'diff-tree --stdin of known trees.': 
-	echo $tree_A $tree_B | git diff-tree -r --stdin > .test-a &&
-	echo $tree_A $tree_B > .test-recursive-ABx &&
-	cat .test-recursive-AB >> .test-recursive-ABx &&
-	cmp -s .test-a .test-recursive-ABx
+		cat >expect <<-EOF &&
+		error: could not write index
+		EOF
+		test_must_fail git stash apply 2>err &&
+		test_cmp expect err
+	)
 
-ok 52 - diff-tree --stdin of known trees.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 125 - stash apply reports a locked index
 
-expecting success of 4002.53 'diff-cache O with A in cache': 
-	git read-tree $tree_A &&
-	git diff-index --cached $tree_O >.test-a &&
-	cmp -s .test-a .test-recursive-OA
+# still have 2 known breakage(s)
+# passed all remaining 123 test(s)
+1..125
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4011-diff-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4011-diff-symlink/.git/
+expecting success of 4011.1 'diff new symlink and file': 
+	symlink=$(symlink_oid xyzzy) &&
+	cat >expected <<-EOF &&
+	diff --git a/frotz b/frotz
+	new file mode 120000
+	index 0000000..$symlink
+	--- /dev/null
+	+++ b/frotz
+	@@ -0,0 +1 @@
+	+xyzzy
+	\ No newline at end of file
+	diff --git a/nitfol b/nitfol
+	new file mode 100644
+	index 0000000..$symlink
+	--- /dev/null
+	+++ b/nitfol
+	@@ -0,0 +1 @@
+	+xyzzy
+	EOF
 
-ok 53 - diff-cache O with A in cache
+	# the empty tree
+	git update-index &&
+	tree=$(git write-tree) &&
 
-expecting success of 4002.54 'diff-cache O with B in cache': 
-	git read-tree $tree_B &&
-	git diff-index --cached $tree_O >.test-a &&
-	cmp -s .test-a .test-recursive-OB
+	test_ln_s_add xyzzy frotz &&
+	echo xyzzy >nitfol &&
+	git update-index --add nitfol &&
+	GIT_DIFF_OPTS=--unified=0 git diff-index -M -p $tree >current &&
+	compare_diff_patch expected current
 
-ok 54 - diff-cache O with B in cache
+checking prerequisite: SYMLINKS
 
-expecting success of 4002.55 'diff-cache A with B in cache': 
-	git read-tree $tree_B &&
-	git diff-index --cached $tree_A >.test-a &&
-	cmp -s .test-a .test-recursive-AB
+mkdir -p "$TRASH_DIRECTORY/prereq-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 55 - diff-cache A with B in cache
+)
+prerequisite SYMLINKS ok
+ok 1 - diff new symlink and file
 
-expecting success of 4002.56 'diff-files with O in cache and A checked out': 
-	rm -fr Z [A-Z][A-Z] &&
-	git read-tree $tree_A &&
-	git checkout-index -f -a &&
-	git read-tree --reset $tree_O &&
-	test_must_fail git update-index --refresh -q &&
-	git diff-files >.test-a &&
-	cmp_diff_files_output .test-a .test-recursive-OA
+expecting success of 4011.2 'diff unchanged symlink and file': 
+	tree=$(git write-tree) &&
+	git update-index frotz nitfol &&
+	test -z "$(git diff-index --name-only $tree)"
 
-DD: needs update
-DM: needs update
-DN: needs update
-MD: needs update
-MM: needs update
-MN: needs update
-SS: needs update
-TT: needs update
-Z/DD: needs update
-Z/DM: needs update
-Z/DN: needs update
-Z/MD: needs update
-Z/MM: needs update
-Z/MN: needs update
-ok 56 - diff-files with O in cache and A checked out
+ok 2 - diff unchanged symlink and file
 
-expecting success of 4002.57 'diff-files with O in cache and B checked out': 
-	rm -fr Z [A-Z][A-Z] &&
-	git read-tree $tree_B &&
-	git checkout-index -f -a &&
-	git read-tree --reset $tree_O &&
-	test_must_fail git update-index --refresh -q &&
-	git diff-files >.test-a &&
-	cmp_diff_files_output .test-a .test-recursive-OB
+expecting success of 4011.3 'diff removed symlink and file': 
+	cat >expected <<-EOF &&
+	diff --git a/frotz b/frotz
+	deleted file mode 120000
+	index $symlink..0000000
+	--- a/frotz
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-xyzzy
+	\ No newline at end of file
+	diff --git a/nitfol b/nitfol
+	deleted file mode 100644
+	index $symlink..0000000
+	--- a/nitfol
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-xyzzy
+	EOF
+	mv frotz frotz2 &&
+	mv nitfol nitfol2 &&
+	git diff-index -M -p $tree >current &&
+	compare_diff_patch expected current
 
-DD: needs update
-DM: needs update
-MD: needs update
-MM: needs update
-ND: needs update
-NM: needs update
-SS: needs update
-TT: needs update
-Z/DD: needs update
-Z/DM: needs update
-Z/MD: needs update
-Z/MM: needs update
-Z/ND: needs update
-Z/NM: needs update
-ok 57 - diff-files with O in cache and B checked out
+ok 3 - diff removed symlink and file
 
-expecting success of 4002.58 'diff-files with A in cache and B checked out': 
-	rm -fr Z [A-Z][A-Z] &&
-	git read-tree $tree_B &&
-	git checkout-index -f -a &&
-	git read-tree --reset $tree_A &&
-	test_must_fail git update-index --refresh -q &&
-	git diff-files >.test-a &&
-	cmp_diff_files_output .test-a .test-recursive-AB
+expecting success of 4011.4 'diff identical, but newly created symlink and file': 
+	>expected &&
+	rm -f frotz nitfol &&
+	echo xyzzy >nitfol &&
+	test-tool chmtime +10 nitfol &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s xyzzy frotz
+	else
+		printf xyzzy >frotz
+		# the symlink property propagates from the index
+	fi &&
+	git diff-index -M -p $tree >current &&
+	compare_diff_patch expected current &&
 
-AA: needs update
-AN: needs update
-DF/DF: needs update
-MD: needs update
-MM: needs update
-MN: needs update
-ND: needs update
-NM: needs update
-TT: needs update
-Z/AA: needs update
-Z/AN: needs update
-Z/MD: needs update
-Z/MM: needs update
-Z/MN: needs update
-Z/ND: needs update
-Z/NM: needs update
-ok 58 - diff-files with A in cache and B checked out
+	>expected &&
+	git diff-index -M -p -w $tree >current &&
+	compare_diff_patch expected current
 
-expecting success of 4002.59 'diff-tree O A == diff-tree -R A O': 
-	git diff-tree $tree_O $tree_A >.test-a &&
-	git diff-tree -R $tree_A $tree_O >.test-b &&
-	cmp -s .test-a .test-b
+ok 4 - diff identical, but newly created symlink and file
 
-ok 59 - diff-tree O A == diff-tree -R A O
+expecting success of 4011.5 'diff different symlink and file': 
+	new=$(symlink_oid yxyyz) &&
+	cat >expected <<-EOF &&
+	diff --git a/frotz b/frotz
+	index $symlink..$new 120000
+	--- a/frotz
+	+++ b/frotz
+	@@ -1 +1 @@
+	-xyzzy
+	\ No newline at end of file
+	+yxyyz
+	\ No newline at end of file
+	diff --git a/nitfol b/nitfol
+	index $symlink..$new 100644
+	--- a/nitfol
+	+++ b/nitfol
+	@@ -1 +1 @@
+	-xyzzy
+	+yxyyz
+	EOF
+	rm -f frotz &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s yxyyz frotz
+	else
+		printf yxyyz >frotz
+		# the symlink property propagates from the index
+	fi &&
+	echo yxyyz >nitfol &&
+	git diff-index -M -p $tree >current &&
+	compare_diff_patch expected current
 
-expecting success of 4002.60 'diff-tree -r O A == diff-tree -r -R A O': 
-	git diff-tree -r $tree_O $tree_A >.test-a &&
-	git diff-tree -r -R $tree_A $tree_O >.test-b &&
-	cmp -s .test-a .test-b
+ok 5 - diff different symlink and file
 
-ok 60 - diff-tree -r O A == diff-tree -r -R A O
+expecting success of 4011.6 'diff symlinks with non-existing targets': 
+	ln -s narf pinky &&
+	ln -s take\ over brain &&
+	test_must_fail git diff --no-index pinky brain >output 2>output.err &&
+	grep narf output &&
+	test_must_be_empty output.err
 
-expecting success of 4002.61 'diff-tree B A == diff-tree -R A B': 
-	git diff-tree $tree_B $tree_A >.test-a &&
-	git diff-tree -R $tree_A $tree_B >.test-b &&
-	cmp -s .test-a .test-b
+-narf
+ok 6 - diff symlinks with non-existing targets
 
-ok 61 - diff-tree B A == diff-tree -R A B
+expecting success of 4011.7 'setup symlinks with attributes': 
+	echo "*.bin diff=bin" >>.gitattributes &&
+	echo content >file.bin &&
+	ln -s file.bin link.bin &&
+	git add -N file.bin link.bin
 
-expecting success of 4002.62 'diff-tree -r B A == diff-tree -r -R A B': 
-	git diff-tree -r $tree_B $tree_A >.test-a &&
-	git diff-tree -r -R $tree_A $tree_B >.test-b &&
-	cmp -s .test-a .test-b
-ok 62 - diff-tree -r B A == diff-tree -r -R A B
+ok 7 - setup symlinks with attributes
 
-expecting success of 4002.63 'diff can read from stdin': 
-	test_must_fail git diff --no-index -- MN - < NN |
-		sed "/^index/d; s#/-#/NN#" >.test-a &&
-	test_must_fail git diff --no-index -- MN NN |
-		grep -v "^index" >.test-b &&
-	test_cmp .test-a .test-b
+expecting success of 4011.8 'symlinks do not respect userdiff config by path': 
+	file=$(short_oid file.bin) &&
+	link=$(symlink_oid file.bin) &&
+	cat >expect <<-EOF &&
+	diff --git a/file.bin b/file.bin
+	new file mode 100644
+	index 0000000..$file
+	Binary files /dev/null and b/file.bin differ
+	diff --git a/link.bin b/link.bin
+	new file mode 120000
+	index 0000000..$link
+	--- /dev/null
+	+++ b/link.bin
+	@@ -0,0 +1 @@
+	+file.bin
+	\ No newline at end of file
+	EOF
+	git config diff.bin.binary true &&
+	git diff file.bin link.bin >actual &&
+	test_cmp expect actual
 
-ok 63 - diff can read from stdin
+ok 8 - symlinks do not respect userdiff config by path
 
-# passed all 63 test(s)
-1..63
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4012-diff-binary.sh ***
@@ -224992,651 +228207,6 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3906-stash-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/.git/
-expecting success of 3906.1 'git_stash: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Saved working directory and index state WIP on no_submodule: 27611a5 Base
-Merging Version stash was based on with Stashed changes
-On branch no_submodule
-Your branch is up to date with 'origin/no_submodule'.
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   .gitmodules
-	new file:   sub1
-	new file:   uninitialized_sub
-
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_stash: added submodule creates empty directory
-
-checking known breakage of 3906.2 'git_stash: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Saved working directory and index state WIP on no_submodule: 27611a5 Base
---- expect	2025-12-18 01:35:22.438773267 +0000
-+++ actual	2025-12-18 01:35:22.514773267 +0000
-@@ -2,5 +2,3 @@
- expect
- file1
- file2
--
--sub1:
-not ok 2 - git_stash: added submodule leaves existing empty directory alone # TODO known breakage
-
-checking known breakage of 3906.3 'git_stash: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Saved working directory and index state WIP on replace_sub1_with_file: 2364f5a Replace sub1 with file
-Merging Version stash was based on with Stashed changes
-On branch replace_sub1_with_file
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   .gitmodules
-	deleted:    sub1
-
-no changes added to commit (use "git add" and/or "git commit -a")
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 cf8d5939a67bef46c85d0f50732c37b6fac1d92a M	.gitmodules
-:160000 100644 63c430421a9604f896526f8a04236bdfe3ac1fc1 d95f3ad14dee633a758d2e331151e950dd13e4ed T	sub1
-not ok 3 - git_stash: replace tracked file with submodule creates empty directory # TODO known breakage
-
-checking known breakage of 3906.4 'git_stash: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Saved working directory and index state WIP on replace_sub1_with_directory: cb28587 Replace sub1 with directory
-Merging Version stash was based on with Stashed changes
-error: 'sub1/file1' appears as both a file and as a directory
-error: 'sub1/file2' appears as both a file and as a directory
-error: 'sub1/file3' appears as both a file and as a directory
-On branch replace_sub1_with_directory
-Your branch is up to date with 'origin/replace_sub1_with_directory'.
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   sub1
-	deleted:    sub1/file1
-	deleted:    sub1/file2
-	deleted:    sub1/file3
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   .gitmodules
-
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 cf8d5939a67bef46c85d0f50732c37b6fac1d92a M	.gitmodules
-not ok 4 - git_stash: replace directory with submodule # TODO known breakage
-
-checking known breakage of 3906.5 'git_stash: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Saved working directory and index state WIP on add_sub1: 09bcf53 Add sub1
-warning: unable to rmdir 'sub1': Directory not empty
-Merging Version stash was based on with Stashed changes
-On branch add_sub1
-Your branch is up to date with 'origin/add_sub1'.
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	deleted:    sub1
-
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    .gitmodules
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	sub1/
-
-'actual' is not empty, it contains:
-:000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
-:000000 160000 0000000000000000000000000000000000000000 63c430421a9604f896526f8a04236bdfe3ac1fc1 A	uninitialized_sub
-not ok 5 - git_stash: removed submodule leaves submodule directory and its contents in place # TODO known breakage
-
-checking known breakage of 3906.6 'git_stash: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Saved working directory and index state WIP on add_sub1: 09bcf53 Add sub1
-warning: unable to rmdir 'sub1': Directory not empty
-Merging Version stash was based on with Stashed changes
-On branch add_sub1
-Your branch is up to date with 'origin/add_sub1'.
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	deleted:    sub1
-
-Changes not staged for commit:
-  (use "git add/rm <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	deleted:    .gitmodules
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	sub1/
-
-'actual' is not empty, it contains:
-:000000 100644 0000000000000000000000000000000000000000 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 A	.gitmodules
-:000000 160000 0000000000000000000000000000000000000000 63c430421a9604f896526f8a04236bdfe3ac1fc1 A	uninitialized_sub
-not ok 6 - git_stash: removed submodule leaves submodule containing a .git directory alone # TODO known breakage
-
-expecting success of 3906.7 'git_stash: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-ok 7 - git_stash: replace submodule with a directory must fail
-
-expecting success of 3906.8 'git_stash: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-ok 8 - git_stash: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 3906.9 'git_stash: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
-not ok 9 - git_stash: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 3906.10 'git_stash: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git read-tree -u -m replace_sub1_with_file
-not ok 10 - git_stash: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-checking known breakage of 3906.11 'git_stash: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-No local changes to save
---- expect	2025-12-18 01:35:25.958773267 +0000
-+++ actual	2025-12-18 01:35:25.994773267 +0000
-@@ -1,3 +1,4 @@
-+M  sub1
- actual
- expect
- file1
-not ok 11 - git_stash: modified submodule does not update submodule work tree # TODO known breakage
-
-checking known breakage of 3906.12 'git_stash: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-No local changes to save
---- expect	2025-12-18 01:35:26.350773267 +0000
-+++ actual	2025-12-18 01:35:26.378773267 +0000
-@@ -1,3 +1,4 @@
-+M  sub1
- actual
- expect
- file1
-not ok 12 - git_stash: modified submodule does not update submodule work tree to invalid commit # TODO known breakage
-
-checking known breakage of 3906.13 'git_stash: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-No local changes to save
---- expect	2025-12-18 01:35:26.666773267 +0000
-+++ actual	2025-12-18 01:35:26.722773267 +0000
-@@ -1,3 +1,4 @@
-+M  sub1
- actual
- expect
- file1
-not ok 13 - git_stash: modified submodule does not update submodule work tree from invalid commit # TODO known breakage
-
-expecting success of 3906.14 'git_stash: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-ok 14 - git_stash: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 3906.15 'stash push with submodule.recurse=true preserves dirty submodule worktree': 
-	setup_basic &&
-	(
-		cd main &&
-		git config submodule.recurse true &&
-		echo "x" >main_file.t &&
-		echo "y" >sub/sub_file.t &&
-		git stash push &&
-		test_must_fail git -C sub diff --quiet
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/sub/.git/
-[master (root-commit) af789f4] sub_file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub_file.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/main/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/main/sub'...
-done.
-[master (root-commit) d3a5de8] main_file
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 main_file.t
- create mode 160000 sub
-Saved working directory and index state WIP on master: d3a5de8 main_file
-ok 15 - stash push with submodule.recurse=true preserves dirty submodule worktree
-
-expecting success of 3906.16 'stash push and pop with submodule.recurse=true preserves dirty submodule worktree': 
-	setup_basic &&
-	(
-		cd main &&
-		git config submodule.recurse true &&
-		echo "x" >main_file.t &&
-		echo "y" >sub/sub_file.t &&
-		git stash push &&
-		git stash pop &&
-		test_must_fail git -C sub diff --quiet
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/sub/.git/
-[master (root-commit) af789f4] sub_file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub_file.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/main/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t3906-stash-submodule/main/sub'...
-done.
-[master (root-commit) d3a5de8] main_file
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 main_file.t
- create mode 160000 sub
-Saved working directory and index state WIP on master: d3a5de8 main_file
-Merging Version stash was based on with Stashed changes
-On branch master
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-  (commit or discard the untracked or modified content in submodules)
-	modified:   main_file.t
-	modified:   sub (modified content)
-
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (ee331cc507c2f3e6ac052edd8b1cc51dc982b38c)
-ok 16 - stash push and pop with submodule.recurse=true preserves dirty submodule worktree
-
-# still have 10 known breakage(s)
-# passed all remaining 6 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4019-diff-wserror.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4019-diff-wserror/.git/
 expecting success of 4019.1 'setup': 
@@ -225785,10536 +228355,3806 @@
 	grep No normal >/dev/null
 
 
-ok 10 - without -space (attribute)
-
-expecting success of 4019.11 'with indent-non-tab only': 
-
-	rm -f .gitattributes &&
-	git config core.whitespace indent,-trailing,-space &&
-	prepare_output &&
-
-	grep Eight error >/dev/null &&
-	grep HT normal >/dev/null &&
-	grep With normal >/dev/null &&
-	grep Return normal >/dev/null &&
-	grep No normal >/dev/null
-
-
-ok 11 - with indent-non-tab only
-
-expecting success of 4019.12 'with indent-non-tab only (attribute)': 
-
-	test_might_fail git config --unset core.whitespace &&
-	echo "F whitespace=indent,-trailing,-space" >.gitattributes &&
-	prepare_output &&
-
-	grep Eight error >/dev/null &&
-	grep HT normal >/dev/null &&
-	grep With normal >/dev/null &&
-	grep Return normal >/dev/null &&
-	grep No normal >/dev/null
-
-
-ok 12 - with indent-non-tab only (attribute)
-
-expecting success of 4019.13 'with indent-non-tab only, tabwidth=10': 
-
-	rm -f .gitattributes &&
-	git config core.whitespace indent,tabwidth=10,-trailing,-space &&
-	prepare_output &&
-
-	grep Eight normal >/dev/null &&
-	grep HT normal >/dev/null &&
-	grep With normal >/dev/null &&
-	grep Return normal >/dev/null &&
-	grep No normal >/dev/null
-
-
-ok 13 - with indent-non-tab only, tabwidth=10
-
-expecting success of 4019.14 'with indent-non-tab only, tabwidth=10 (attribute)': 
-
-	test_might_fail git config --unset core.whitespace &&
-	echo "F whitespace=indent,-trailing,-space,tabwidth=10" >.gitattributes &&
-	prepare_output &&
-
-	grep Eight normal >/dev/null &&
-	grep HT normal >/dev/null &&
-	grep With normal >/dev/null &&
-	grep Return normal >/dev/null &&
-	grep No normal >/dev/null
-
-
-ok 14 - with indent-non-tab only, tabwidth=10 (attribute)
-
-expecting success of 4019.15 'with cr-at-eol': 
-
-	rm -f .gitattributes &&
-	git config core.whitespace cr-at-eol &&
-	prepare_output &&
-
-	grep Eight normal >/dev/null &&
-	grep HT error >/dev/null &&
-	grep With error >/dev/null &&
-	grep Return normal >/dev/null &&
-	grep No normal >/dev/null
-
-
-ok 15 - with cr-at-eol
-
-expecting success of 4019.16 'with cr-at-eol (attribute)': 
-
-	test_might_fail git config --unset core.whitespace &&
-	echo "F whitespace=trailing,cr-at-eol" >.gitattributes &&
-	prepare_output &&
-
-	grep Eight normal >/dev/null &&
-	grep HT error >/dev/null &&
-	grep With error >/dev/null &&
-	grep Return normal >/dev/null &&
-	grep No normal >/dev/null
-
-
-ok 16 - with cr-at-eol (attribute)
-
-expecting success of 4019.17 'trailing empty lines (1)': 
-
-	rm -f .gitattributes &&
-	test_must_fail git diff --check >output &&
-	grep "new blank line at" output &&
-	grep "trailing whitespace" output
-
-
-F:6: new blank line at EOF.
-F:3: trailing whitespace.
-F:4: trailing whitespace.
-ok 17 - trailing empty lines (1)
-
-expecting success of 4019.18 'trailing empty lines (2)': 
-
-	echo "F -whitespace" >.gitattributes &&
-	git diff --check >output &&
-	test_must_be_empty output
-
-
-ok 18 - trailing empty lines (2)
-
-expecting success of 4019.19 'checkdiff shows correct line number for trailing blank lines': 
-
-	printf "a\nb\n" > G &&
-	git add G &&
-	printf "x\nx\nx\na\nb\nc\n\n" > G &&
-	[ "$(git diff --check -- G)" = "G:7: new blank line at EOF." ]
-
-
-ok 19 - checkdiff shows correct line number for trailing blank lines
-
-expecting success of 4019.20 'do not color trailing cr in context': 
-	test_might_fail git config --unset core.whitespace &&
-	rm -f .gitattributes &&
-	echo AAAQ | tr Q "\015" >G &&
-	git add G &&
-	echo BBBQ | tr Q "\015" >>G &&
-	git diff --color G | tr "\015" Q >output &&
-	grep "BBB.*${blue_grep}Q" output &&
-	grep "AAA.*\[mQ" output
-
-
-+BBBQ
- AAAQ
-ok 20 - do not color trailing cr in context
-
-expecting success of 4019.21 'color new trailing blank lines': 
-	test_write_lines a b "" "" >x &&
-	git add x &&
-	test_write_lines a "" "" "" c "" "" "" "" >x &&
-	git diff --color x >output &&
-	cnt=$($grep_a "${blue_grep}" output | wc -l) &&
-	test $cnt = 2
-
-ok 21 - color new trailing blank lines
-
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4020-diff-external.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4020-diff-external/.git/
-expecting success of 4020.1 'setup': 
-
-	test_tick &&
-	echo initial >file &&
-	git add file &&
-	git commit -m initial &&
-
-	test_tick &&
-	echo second >file &&
-	before=$(git hash-object file) &&
-	before=$(git rev-parse --short $before) &&
-	git add file &&
-	git commit -m second &&
-
-	test_tick &&
-	echo third >file
-
-[master (root-commit) b6d2089] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master f3562cd] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 4020.2 'GIT_EXTERNAL_DIFF environment': 
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
-	EOF
-	GIT_EXTERNAL_DIFF=echo git diff >out &&
-	cut -d" " -f1,3- <out >actual &&
-	test_cmp expect actual
-
-
-ok 2 - GIT_EXTERNAL_DIFF environment
-
-expecting success of 4020.3 'GIT_EXTERNAL_DIFF environment should apply only to diff': 
-	GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 3 - GIT_EXTERNAL_DIFF environment should apply only to diff
-
-expecting success of 4020.4 'GIT_EXTERNAL_DIFF environment and --no-ext-diff': 
-	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 4 - GIT_EXTERNAL_DIFF environment and --no-ext-diff
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 4020.5 'typechange diff': 
-	rm -f file &&
-	ln -s elif file &&
-
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 120000
-	EOF
-	GIT_EXTERNAL_DIFF=echo git diff >out &&
-	cut -d" " -f1,3-4,6- <out >actual &&
-	test_cmp expect actual &&
-
-	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
-	git diff >expect &&
-	test_cmp expect actual
-
-ok 5 - typechange diff
-
-expecting success of 4020.6 'diff.external': 
-	git reset --hard &&
-	echo third >file &&
-	test_config diff.external echo &&
-
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
-	EOF
-	git diff >out &&
-	cut -d" " -f1,3-4,6- <out >actual &&
-	test_cmp expect actual
-
-HEAD is now at f3562cd second
-ok 6 - diff.external
-
-expecting success of 4020.7 'diff.external should apply only to diff': 
-	test_config diff.external echo &&
-	git log -p -1 HEAD >out &&
-	grep "^diff --git a/file b/file" out
-
-diff --git a/file b/file
-ok 7 - diff.external should apply only to diff
-
-expecting success of 4020.8 'diff.external and --no-ext-diff': 
-	test_config diff.external echo &&
-	git diff --no-ext-diff >out &&
-	grep "^diff --git a/file b/file" out
-
-diff --git a/file b/file
-ok 8 - diff.external and --no-ext-diff
-
-expecting success of 4020.9 'diff attribute': 
-	git reset --hard &&
-	echo third >file &&
-
-	git config diff.parrot.command echo &&
-
-	echo >.gitattributes "file diff=parrot" &&
-
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
-	EOF
-	git diff >out &&
-	cut -d" " -f1,3-4,6- <out >actual &&
-	test_cmp expect actual
-
-HEAD is now at f3562cd second
-ok 9 - diff attribute
-
-expecting success of 4020.10 'diff attribute should apply only to diff': 
-	git log -p -1 HEAD >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 10 - diff attribute should apply only to diff
-
-expecting success of 4020.11 'diff attribute and --no-ext-diff': 
-	git diff --no-ext-diff >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 11 - diff attribute and --no-ext-diff
-
-expecting success of 4020.12 'diff attribute': 
-
-	git config --unset diff.parrot.command &&
-	git config diff.color.command echo &&
-
-	echo >.gitattributes "file diff=color" &&
-
-	cat >expect <<-EOF &&
-	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
-	EOF
-	git diff >out &&
-	cut -d" " -f1,3-4,6- <out >actual &&
-	test_cmp expect actual
-
-ok 12 - diff attribute
-
-expecting success of 4020.13 'diff attribute should apply only to diff': 
-	git log -p -1 HEAD >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 13 - diff attribute should apply only to diff
-
-expecting success of 4020.14 'diff attribute and --no-ext-diff': 
-	git diff --no-ext-diff >out &&
-	grep "^diff --git a/file b/file" out
-
-
-diff --git a/file b/file
-ok 14 - diff attribute and --no-ext-diff
-
-expecting success of 4020.15 'GIT_EXTERNAL_DIFF trumps diff.external': 
-	>.gitattributes &&
-	test_config diff.external "echo ext-global" &&
-
-	cat >expect <<-EOF &&
-	ext-env file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
-	EOF
-	GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
-	cut -d" " -f1-2,4- <out >actual &&
-	test_cmp expect actual
-
-ok 15 - GIT_EXTERNAL_DIFF trumps diff.external
-
-expecting success of 4020.16 'attributes trump GIT_EXTERNAL_DIFF and diff.external': 
-	test_config diff.foo.command "echo ext-attribute" &&
-	test_config diff.external "echo ext-global" &&
-	echo "file diff=foo" >.gitattributes &&
-
-	cat >expect <<-EOF &&
-	ext-attribute file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
-	EOF
-	GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
-	cut -d" " -f1-2,4- <out >actual &&
-	test_cmp expect actual
-
-ok 16 - attributes trump GIT_EXTERNAL_DIFF and diff.external
-
-expecting success of 4020.17 'no diff with -diff': 
-	echo >.gitattributes "file -diff" &&
-	git diff >out &&
-	grep Binary out
-
-Binary files a/file and b/file differ
-ok 17 - no diff with -diff
-
-expecting success of 4020.18 'force diff with "diff"': 
-	after=$(git hash-object file) &&
-	after=$(git rev-parse --short $after) &&
-	echo >.gitattributes "file diff" &&
-	git diff >actual &&
-	sed -e "s/^index .*/index $before..$after 100644/" \
-		"$TEST_DIRECTORY"/t4020/diff.NUL >expected-diff &&
-	test_cmp expected-diff actual
-
-ok 18 - force diff with "diff"
-
-expecting success of 4020.19 'GIT_EXTERNAL_DIFF with more than one changed files': 
-	echo anotherfile > file2 &&
-	git add file2 &&
-	git commit -m "added 2nd file" &&
-	echo modified >file2 &&
-	GIT_EXTERNAL_DIFF=echo git diff
-
-[master 314ec38] added 2nd file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-file /tmp/git-blob-BN9bMY/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
-file2 /tmp/git-blob-2zHEGl/file2 abc9fa522731419e7eaa3d472e3cb3d99e475c49 100644 file2 0000000000000000000000000000000000000000 100644
-ok 19 - GIT_EXTERNAL_DIFF with more than one changed files
-
-expecting success of 4020.20 'GIT_EXTERNAL_DIFF path counter/total': 
-	write_script external-diff.sh <<-\EOF &&
-	echo $GIT_DIFF_PATH_COUNTER of $GIT_DIFF_PATH_TOTAL >>counter.txt
-	EOF
-	>counter.txt &&
-	cat >expect <<-\EOF &&
-	1 of 2
-	2 of 2
-	EOF
-	GIT_EXTERNAL_DIFF=./external-diff.sh git diff &&
-	test_cmp expect counter.txt
-
-ok 20 - GIT_EXTERNAL_DIFF path counter/total
-
-expecting success of 4020.21 'GIT_EXTERNAL_DIFF generates pretty paths': 
-	test_when_finished "git rm -f file.ext" &&
-	touch file.ext &&
-	git add file.ext &&
-	echo with extension > file.ext &&
-
-	cat >expect <<-EOF &&
-	file.ext
-	EOF
-	GIT_EXTERNAL_DIFF=echo git diff file.ext >out &&
-	basename $(cut -d" " -f2 <out) >actual &&
-	test_cmp expect actual
-
-rm 'file.ext'
-ok 21 - GIT_EXTERNAL_DIFF generates pretty paths
-
-expecting success of 4020.22 'external diff with autocrlf = true': 
-	test_config core.autocrlf true &&
-	GIT_EXTERNAL_DIFF=./fake-diff.sh git diff &&
-	test $(wc -l <crlfed.txt) = $(keep_only_cr <crlfed.txt | wc -c)
-
-warning: in the working copy of 'file2', LF will be replaced by CRLF the next time Git touches it
-ok 22 - external diff with autocrlf = true
-
-expecting success of 4020.23 'diff --cached': 
-	test_config core.autocrlf true &&
-	git add file &&
-	git update-index --assume-unchanged file &&
-	echo second >file &&
-	git diff --cached >actual &&
-	test_cmp expected-diff actual
-
-ok 23 - diff --cached
-
-expecting success of 4020.24 'clean up crlf leftovers': 
-	git update-index --no-assume-unchanged file &&
-	rm -f file* &&
-	git reset --hard
-
-HEAD is now at 314ec38 added 2nd file
-ok 24 - clean up crlf leftovers
-
-expecting success of 4020.25 'submodule diff': 
-	git init sub &&
-	( cd sub && test_commit sub1 ) &&
-	git add sub &&
-	test_tick &&
-	git commit -m "add submodule" &&
-	( cd sub && test_commit sub2 ) &&
-	write_script gather_pre_post.sh <<-\EOF &&
-	echo "$1 $4" # path, mode
-	cat "$2" # old file
-	cat "$5" # new file
-	EOF
-	GIT_EXTERNAL_DIFF=./gather_pre_post.sh git diff >actual &&
-	cat >expected <<-EOF &&
-	sub 160000
-	Subproject commit $(git rev-parse HEAD:sub)
-	Subproject commit $(cd sub && git rev-parse HEAD)
-	EOF
-	test_cmp expected actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4020-diff-external/sub/.git/
-[master (root-commit) e2fb92c] sub1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub1.t
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[master bcd8781] add submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-[master 6a9164c] sub2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub2.t
-ok 25 - submodule diff
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4021-format-patch-numbered.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4022-diff-rewrite.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4022-diff-rewrite/.git/
-expecting success of 4022.1 'setup': 
-
-	COPYING_test_data >test.data &&
-	cp test.data test &&
-	git add test &&
-	tr \
-	  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
-	  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
-	  <test.data >test &&
-	echo "to be deleted" >test2 &&
-	blob=$(git hash-object test2) &&
-	blob=$(git rev-parse --short $blob) &&
-	git add test2
-
-
-ok 1 - setup
-
-expecting success of 4022.2 'detect rewrite': 
-
-	actual=$(git diff-files -B --summary test) &&
-	expr "$actual" : " rewrite test ([0-9]*%)$"
-
-
-19
-ok 2 - detect rewrite
-
-expecting success of 4022.3 'show deletion diff without -D': 
-
-	rm test2 &&
-	git diff -- test2 >actual &&
-	test_cmp expect actual
-
-ok 3 - show deletion diff without -D
-
-expecting success of 4022.4 'suppress deletion diff with -D': 
-
-	git diff -D -- test2 >actual &&
-	test_cmp expect actual
-
-ok 4 - suppress deletion diff with -D
-
-expecting success of 4022.5 'show deletion diff with -B': 
-
-	git diff -B -- test >actual &&
-	grep "Linus Torvalds" actual
-
--			Linus Torvalds
-ok 5 - show deletion diff with -B
-
-expecting success of 4022.6 'suppress deletion diff with -B -D': 
-
-	git diff -B -D -- test >actual &&
-	grep -v "Linus Torvalds" actual
-
-diff --git a/test b/test
-dissimilarity index 99%
-index 27063eb..f1f2e4d 100644
---- a/test
-+++ b/test
-@@ -?,? +1,18 @@
-+
-+ Abgr gung gur bayl inyvq irefvba bs gur TCY nf sne nf guvf cebwrpg
-+ vf pbaprearq vf _guvf_ cnegvphyne irefvba bs gur yvprafr (vr i2, abg
-+ i2.2 be i3.k be jungrire), hayrff rkcyvpvgyl bgurejvfr fgngrq.
-+
-+ UBJRIRE, va beqre gb nyybj n zvtengvba gb TCYi3 vs gung frrzf yvxr
-+ n tbbq vqrn, V nyfb nfx gung crbcyr vaibyirq jvgu gur cebwrpg znxr
-+ gurve cersreraprf xabja. Va cnegvphyne, vs lbh gehfg zr gb znxr gung
-+ qrpvfvba, lbh zvtug abgr fb va lbhe pbclevtug zrffntr, vr fbzrguvat
-+ yvxr
-+
-+	Guvf svyr vf yvprafrq haqre gur TCY i2, be n yngre irefvba
-+	ng gur qvfpergvba bs Yvahf.
-+
-+  zvtug nibvq vffhrf. Ohg jr pna nyfb whfg qrpvqr gb flapuebavmr naq
-+  pbagnpg nyy pbclevtug ubyqref ba erpbeq vs/jura gur bppnfvba nevfrf.
-+
-+			Yvahf Gbeinyqf
-ok 6 - suppress deletion diff with -B -D
-
-expecting success of 4022.7 'prepare a file that ends with an incomplete line': 
-	test_seq 1 99 >seq &&
-	printf 100 >>seq &&
-	git add seq &&
-	git commit seq -m seq
-
-[master (root-commit) 2d6607f] seq
- Author: A U Thor <author@example.com>
- 1 file changed, 100 insertions(+)
- create mode 100644 seq
-ok 7 - prepare a file that ends with an incomplete line
-
-expecting success of 4022.8 'rewrite the middle 90% of sequence file and terminate with newline': 
-	test_seq 1 5 >seq &&
-	test_seq 9331 9420 >>seq &&
-	test_seq 96 100 >>seq
-
-ok 8 - rewrite the middle 90% of sequence file and terminate with newline
-
-expecting success of 4022.9 'confirm that sequence file is considered a rewrite': 
-	git diff -B seq >res &&
-	grep "dissimilarity index" res
-
-dissimilarity index 92%
-ok 9 - confirm that sequence file is considered a rewrite
-
-expecting success of 4022.10 'no newline at eof is on its own line without -B': 
-	git diff seq >res &&
-	grep "^\\\\ " res &&
-	! grep "^..*\\\\ " res
-
-\ No newline at end of file
-ok 10 - no newline at eof is on its own line without -B
-
-expecting success of 4022.11 'no newline at eof is on its own line with -B': 
-	git diff -B seq >res &&
-	grep "^\\\\ " res &&
-	! grep "^..*\\\\ " res
-
-\ No newline at end of file
-ok 11 - no newline at eof is on its own line with -B
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4015-diff-whitespace.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4015-diff-whitespace/.git/
-expecting success of 4015.1 'status with --patch (different)': 
-		echo foo >x &&
-		git add x &&
-		echo bar >x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-diff --git a/x b/x
-index 257cc56..5716ca5 100644
---- a/x
-+++ b/x
-@@ -1 +1 @@
--foo
-+bar
-ok 1 - status with --patch (different)
-
-expecting success of 4015.2 'status with --patch (mode differs)': 
-		test_when_finished "git update-index --chmod=-x x" &&
-		echo foo >x &&
-		git add x &&
-		git update-index --chmod=+x x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-diff --git a/x b/x
-old mode 100755
-new mode 100644
-ok 2 - status with --patch (mode differs)
-
-expecting success of 4015.3 'status with --patch (removing an empty file)': 
-		: >x &&
-		git add x &&
-		rm x &&
-		test_expect_code 1 git diff -w $opts --exit-code -- x
-	
-diff --git a/x b/x
-deleted file mode 100644
-index e69de29..0000000
-ok 3 - status with --patch (removing an empty file)
-
-expecting success of 4015.4 'status with --patch (different but equivalent)': 
-		echo foo >x &&
-		git add x &&
-		echo " foo" >x &&
-		$expect_failure git diff -w $opts --exit-code x
-	
-ok 4 - status with --patch (different but equivalent)
-
-expecting success of 4015.5 'status with --quiet (different)': 
-		echo foo >x &&
-		git add x &&
-		echo bar >x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-ok 5 - status with --quiet (different)
-
-expecting success of 4015.6 'status with --quiet (mode differs)': 
-		test_when_finished "git update-index --chmod=-x x" &&
-		echo foo >x &&
-		git add x &&
-		git update-index --chmod=+x x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-ok 6 - status with --quiet (mode differs)
-
-expecting success of 4015.7 'status with --quiet (removing an empty file)': 
-		: >x &&
-		git add x &&
-		rm x &&
-		test_expect_code 1 git diff -w $opts --exit-code -- x
-	
-ok 7 - status with --quiet (removing an empty file)
-
-expecting success of 4015.8 'status with --quiet (different but equivalent)': 
-		echo foo >x &&
-		git add x &&
-		echo " foo" >x &&
-		$expect_failure git diff -w $opts --exit-code x
-	
-ok 8 - status with --quiet (different but equivalent)
-
-expecting success of 4015.9 'status with -s (different)': 
-		echo foo >x &&
-		git add x &&
-		echo bar >x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-ok 9 - status with -s (different)
-
-expecting success of 4015.10 'status with -s (mode differs)': 
-		test_when_finished "git update-index --chmod=-x x" &&
-		echo foo >x &&
-		git add x &&
-		git update-index --chmod=+x x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-ok 10 - status with -s (mode differs)
-
-expecting success of 4015.11 'status with -s (removing an empty file)': 
-		: >x &&
-		git add x &&
-		rm x &&
-		test_expect_code 1 git diff -w $opts --exit-code -- x
-	
-ok 11 - status with -s (removing an empty file)
-
-expecting success of 4015.12 'status with -s (different but equivalent)': 
-		echo foo >x &&
-		git add x &&
-		echo " foo" >x &&
-		$expect_failure git diff -w $opts --exit-code x
-	
-ok 12 - status with -s (different but equivalent)
-
-expecting success of 4015.13 'status with --stat (different)': 
-		echo foo >x &&
-		git add x &&
-		echo bar >x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
- x | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - status with --stat (different)
-
-expecting success of 4015.14 'status with --stat (mode differs)': 
-		test_when_finished "git update-index --chmod=-x x" &&
-		echo foo >x &&
-		git add x &&
-		git update-index --chmod=+x x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
- x | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 14 - status with --stat (mode differs)
-
-expecting success of 4015.15 'status with --stat (removing an empty file)': 
-		: >x &&
-		git add x &&
-		rm x &&
-		test_expect_code 1 git diff -w $opts --exit-code -- x
-	
- x | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 15 - status with --stat (removing an empty file)
-
-expecting success of 4015.16 'status with --stat (different but equivalent)': 
-		echo foo >x &&
-		git add x &&
-		echo " foo" >x &&
-		$expect_failure git diff -w $opts --exit-code x
-	
-ok 16 - status with --stat (different but equivalent)
-
-expecting success of 4015.17 'status with --shortstat (different)': 
-		echo foo >x &&
-		git add x &&
-		echo bar >x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 17 - status with --shortstat (different)
-
-expecting success of 4015.18 'status with --shortstat (mode differs)': 
-		test_when_finished "git update-index --chmod=-x x" &&
-		echo foo >x &&
-		git add x &&
-		git update-index --chmod=+x x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 18 - status with --shortstat (mode differs)
-
-expecting success of 4015.19 'status with --shortstat (removing an empty file)': 
-		: >x &&
-		git add x &&
-		rm x &&
-		test_expect_code 1 git diff -w $opts --exit-code -- x
-	
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 19 - status with --shortstat (removing an empty file)
-
-expecting success of 4015.20 'status with --shortstat (different but equivalent)': 
-		echo foo >x &&
-		git add x &&
-		echo " foo" >x &&
-		$expect_failure git diff -w $opts --exit-code x
-	
-ok 20 - status with --shortstat (different but equivalent)
-
-expecting success of 4015.21 'status with --dirstat=lines (different)': 
-		echo foo >x &&
-		git add x &&
-		echo bar >x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-ok 21 - status with --dirstat=lines (different)
-
-expecting success of 4015.22 'status with --dirstat=lines (mode differs)': 
-		test_when_finished "git update-index --chmod=-x x" &&
-		echo foo >x &&
-		git add x &&
-		git update-index --chmod=+x x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-ok 22 - status with --dirstat=lines (mode differs)
-
-expecting success of 4015.23 'status with --dirstat=lines (removing an empty file)': 
-		: >x &&
-		git add x &&
-		rm x &&
-		test_expect_code 1 git diff -w $opts --exit-code -- x
-	
-ok 23 - status with --dirstat=lines (removing an empty file)
-
-expecting success of 4015.24 'status with --dirstat=lines (different but equivalent)': 
-		echo foo >x &&
-		git add x &&
-		echo " foo" >x &&
-		$expect_failure git diff -w $opts --exit-code x
-	
-ok 24 - status with --dirstat=lines (different but equivalent)
-
-expecting success of 4015.25 'status with --raw (different)': 
-		echo foo >x &&
-		git add x &&
-		echo bar >x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-:100644 100644 257cc56 0000000 M	x
-ok 25 - status with --raw (different)
-
-expecting success of 4015.26 'status with --raw (mode differs)': 
-		test_when_finished "git update-index --chmod=-x x" &&
-		echo foo >x &&
-		git add x &&
-		git update-index --chmod=+x x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-:100755 100644 257cc56 0000000 M	x
-ok 26 - status with --raw (mode differs)
-
-expecting success of 4015.27 'status with --raw (removing an empty file)': 
-		: >x &&
-		git add x &&
-		rm x &&
-		test_expect_code 1 git diff -w $opts --exit-code -- x
-	
-:100644 000000 e69de29 0000000 D	x
-ok 27 - status with --raw (removing an empty file)
-
-expecting success of 4015.28 'status with --raw (different but equivalent)': 
-		echo foo >x &&
-		git add x &&
-		echo " foo" >x &&
-		$expect_failure git diff -w $opts --exit-code x
-	
-:100644 100644 257cc56 0000000 M	x
-ok 28 - status with --raw (different but equivalent)
-
-expecting success of 4015.29 'status with --name-only (different)': 
-		echo foo >x &&
-		git add x &&
-		echo bar >x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-x
-ok 29 - status with --name-only (different)
-
-expecting success of 4015.30 'status with --name-only (mode differs)': 
-		test_when_finished "git update-index --chmod=-x x" &&
-		echo foo >x &&
-		git add x &&
-		git update-index --chmod=+x x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-x
-ok 30 - status with --name-only (mode differs)
-
-expecting success of 4015.31 'status with --name-only (removing an empty file)': 
-		: >x &&
-		git add x &&
-		rm x &&
-		test_expect_code 1 git diff -w $opts --exit-code -- x
-	
-x
-ok 31 - status with --name-only (removing an empty file)
-
-expecting success of 4015.32 'status with --name-only (different but equivalent)': 
-		echo foo >x &&
-		git add x &&
-		echo " foo" >x &&
-		$expect_failure git diff -w $opts --exit-code x
-	
-x
-ok 32 - status with --name-only (different but equivalent)
-
-expecting success of 4015.33 'status with --name-status (different)': 
-		echo foo >x &&
-		git add x &&
-		echo bar >x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-M	x
-ok 33 - status with --name-status (different)
-
-expecting success of 4015.34 'status with --name-status (mode differs)': 
-		test_when_finished "git update-index --chmod=-x x" &&
-		echo foo >x &&
-		git add x &&
-		git update-index --chmod=+x x &&
-		test_expect_code 1 git diff -w $opts --exit-code x
-	
-M	x
-ok 34 - status with --name-status (mode differs)
-
-expecting success of 4015.35 'status with --name-status (removing an empty file)': 
-		: >x &&
-		git add x &&
-		rm x &&
-		test_expect_code 1 git diff -w $opts --exit-code -- x
-	
-D	x
-ok 35 - status with --name-status (removing an empty file)
-
-expecting success of 4015.36 'status with --name-status (different but equivalent)': 
-		echo foo >x &&
-		git add x &&
-		echo " foo" >x &&
-		$expect_failure git diff -w $opts --exit-code x
-	
-M	x
-ok 36 - status with --name-status (different but equivalent)
-
-expecting success of 4015.37 'Ray Lehtiniemi's example': 
-	cat <<-\EOF >x &&
-	do {
-	   nothing;
-	} while (0);
-	EOF
-	git update-index --add x &&
-	old_hash_x=$(git hash-object x) &&
-	before=$(git rev-parse --short "$old_hash_x") &&
-
-	cat <<-\EOF >x &&
-	do
-	{
-	   nothing;
-	}
-	while (0);
-	EOF
-	new_hash_x=$(git hash-object x) &&
-	after=$(git rev-parse --short "$new_hash_x") &&
-
-	cat <<-EOF >expect &&
-	diff --git a/x b/x
-	index $before..$after 100644
-	--- a/x
-	+++ b/x
-	@@ -1,3 +1,5 @@
-	-do {
-	+do
-	+{
-	    nothing;
-	-} while (0);
-	+}
-	+while (0);
-	EOF
-
-	git diff >out &&
-	test_cmp expect out &&
-
-	git diff -w >out &&
-	test_cmp expect out &&
-
-	git diff -b >out &&
-	test_cmp expect out
-
-ok 37 - Ray Lehtiniemi's example
-
-expecting success of 4015.38 'another test, without options': 
-	tr Q "\015" <<-\EOF >x &&
-	whitespace at beginning
-	whitespace change
-	whitespace in the middle
-	whitespace at end
-	unchanged line
-	CR at endQ
-	EOF
-
-	git update-index x &&
-	old_hash_x=$(git hash-object x) &&
-	before=$(git rev-parse --short "$old_hash_x") &&
-
-	tr "_" " " <<-\EOF >x &&
-	_	whitespace at beginning
-	whitespace 	 change
-	white space in the middle
-	whitespace at end__
-	unchanged line
-	CR at end
-	EOF
-	new_hash_x=$(git hash-object x) &&
-	after=$(git rev-parse --short "$new_hash_x") &&
-
-	tr "Q_" "\015 " <<-EOF >expect &&
-	diff --git a/x b/x
-	index $before..$after 100644
-	--- a/x
-	+++ b/x
-	@@ -1,6 +1,6 @@
-	-whitespace at beginning
-	-whitespace change
-	-whitespace in the middle
-	-whitespace at end
-	+ 	whitespace at beginning
-	+whitespace 	 change
-	+white space in the middle
-	+whitespace at end__
-	 unchanged line
-	-CR at endQ
-	+CR at end
-	EOF
-
-	git diff >out &&
-	test_cmp expect out &&
-
-	git diff -w >out &&
-	test_must_be_empty out &&
-
-	git diff -w -b >out &&
-	test_must_be_empty out &&
-
-	git diff -w --ignore-space-at-eol >out &&
-	test_must_be_empty out &&
-
-	git diff -w -b --ignore-space-at-eol >out &&
-	test_must_be_empty out &&
-
-	git diff -w --ignore-cr-at-eol >out &&
-	test_must_be_empty out &&
-
-	tr "Q_" "\015 " <<-EOF >expect &&
-	diff --git a/x b/x
-	index $before..$after 100644
-	--- a/x
-	+++ b/x
-	@@ -1,6 +1,6 @@
-	-whitespace at beginning
-	+_	whitespace at beginning
-	 whitespace 	 change
-	-whitespace in the middle
-	+white space in the middle
-	 whitespace at end__
-	 unchanged line
-	 CR at end
-	EOF
-	git diff -b >out &&
-	test_cmp expect out &&
-
-	git diff -b --ignore-space-at-eol >out &&
-	test_cmp expect out &&
-
-	git diff -b --ignore-cr-at-eol >out &&
-	test_cmp expect out &&
-
-	tr "Q_" "\015 " <<-EOF >expect &&
-	diff --git a/x b/x
-	index $before..$after 100644
-	--- a/x
-	+++ b/x
-	@@ -1,6 +1,6 @@
-	-whitespace at beginning
-	-whitespace change
-	-whitespace in the middle
-	+_	whitespace at beginning
-	+whitespace 	 change
-	+white space in the middle
-	 whitespace at end__
-	 unchanged line
-	 CR at end
-	EOF
-	git diff --ignore-space-at-eol >out &&
-	test_cmp expect out &&
-
-	git diff --ignore-space-at-eol --ignore-cr-at-eol >out &&
-	test_cmp expect out &&
-
-	tr "Q_" "\015 " <<-EOF >expect &&
-	diff --git a/x b/x
-	index_$before..$after 100644
-	--- a/x
-	+++ b/x
-	@@ -1,6 +1,6 @@
-	-whitespace at beginning
-	-whitespace change
-	-whitespace in the middle
-	-whitespace at end
-	+_	whitespace at beginning
-	+whitespace_	_change
-	+white space in the middle
-	+whitespace at end__
-	 unchanged line
-	 CR at end
-	EOF
-	git diff --ignore-cr-at-eol >out &&
-	test_cmp expect out
-
-ok 38 - another test, without options
-
-expecting success of 4015.39 'ignore-blank-lines: only new lines': 
-	test_seq 5 >x &&
-	git update-index x &&
-	test_seq 5 | sed "/3/i\\
-" >x &&
-	git diff --ignore-blank-lines >out &&
-	test_must_be_empty out
-
-ok 39 - ignore-blank-lines: only new lines
-
-expecting success of 4015.40 'ignore-blank-lines: only new lines with space': 
-	test_seq 5 >x &&
-	git update-index x &&
-	test_seq 5 | sed "/3/i\\
- " >x &&
-	git diff -w --ignore-blank-lines >out &&
-	test_must_be_empty out
-
-ok 40 - ignore-blank-lines: only new lines with space
-
-expecting success of 4015.41 'ignore-blank-lines: after change': 
-	cat <<-\EOF >x &&
-	1
-	2
-
-	3
-	4
-	5
-
-	6
-	7
-	EOF
-	git update-index x &&
-	cat <<-\EOF >x &&
-	change
-
-	1
-	2
-	3
-	4
-	5
-	6
-
-	7
-	EOF
-	git diff --inter-hunk-context=100 --ignore-blank-lines >out.tmp &&
-	cat <<-\EOF >expected &&
-	diff --git a/x b/x
-	--- a/x
-	+++ b/x
-	@@ -1,6 +1,7 @@
-	+change
-	+
-	 1
-	 2
-	-
-	 3
-	 4
-	 5
-	EOF
-	compare_diff_patch expected out.tmp
-
-ok 41 - ignore-blank-lines: after change
-
-expecting success of 4015.42 'ignore-blank-lines: before change': 
-	cat <<-\EOF >x &&
-	1
-	2
-
-	3
-	4
-	5
-	6
-	7
-	EOF
-	git update-index x &&
-	cat <<-\EOF >x &&
-
-	1
-	2
-	3
-	4
-	5
-
-	6
-	7
-	change
-	EOF
-	git diff --inter-hunk-context=100 --ignore-blank-lines >out.tmp &&
-	cat <<-\EOF >expected &&
-	diff --git a/x b/x
-	--- a/x
-	+++ b/x
-	@@ -4,5 +4,7 @@
-	 3
-	 4
-	 5
-	+
-	 6
-	 7
-	+change
-	EOF
-	compare_diff_patch expected out.tmp
-
-ok 42 - ignore-blank-lines: before change
-
-expecting success of 4015.43 'ignore-blank-lines: between changes': 
-	cat <<-\EOF >x &&
-	1
-	2
-	3
-	4
-	5
-
-
-	6
-	7
-	8
-	9
-	10
-	EOF
-	git update-index x &&
-	cat <<-\EOF >x &&
-	change
-	1
-	2
-
-	3
-	4
-	5
-	6
-	7
-	8
-
-	9
-	10
-	change
-	EOF
-	git diff --ignore-blank-lines >out.tmp &&
-	cat <<-\EOF >expected &&
-	diff --git a/x b/x
-	--- a/x
-	+++ b/x
-	@@ -1,5 +1,7 @@
-	+change
-	 1
-	 2
-	+
-	 3
-	 4
-	 5
-	@@ -8,5 +8,7 @@
-	 6
-	 7
-	 8
-	+
-	 9
-	 10
-	+change
-	EOF
-	compare_diff_patch expected out.tmp
-
-ok 43 - ignore-blank-lines: between changes
-
-expecting success of 4015.44 'ignore-blank-lines: between changes (with interhunkctx)': 
-	test_seq 10 >x &&
-	git update-index x &&
-	cat <<-\EOF >x &&
-	change
-	1
-	2
-
-	3
-	4
-	5
-
-	6
-	7
-	8
-	9
-
-	10
-	change
-	EOF
-	git diff --inter-hunk-context=2 --ignore-blank-lines >out.tmp &&
-	cat <<-\EOF >expected &&
-	diff --git a/x b/x
-	--- a/x
-	+++ b/x
-	@@ -1,10 +1,15 @@
-	+change
-	 1
-	 2
-	+
-	 3
-	 4
-	 5
-	+
-	 6
-	 7
-	 8
-	 9
-	+
-	 10
-	+change
-	EOF
-	compare_diff_patch expected out.tmp
-
-ok 44 - ignore-blank-lines: between changes (with interhunkctx)
-
-expecting success of 4015.45 'ignore-blank-lines: scattered spaces': 
-	test_seq 10 >x &&
-	git update-index x &&
-	cat <<-\EOF >x &&
-	change
-	1
-	2
-	3
-
-	4
-
-	5
-
-	6
-
-
-	7
-
-	8
-	9
-	10
-	change
-	EOF
-	git diff --inter-hunk-context=4 --ignore-blank-lines >out.tmp &&
-	cat <<-\EOF >expected &&
-	diff --git a/x b/x
-	--- a/x
-	+++ b/x
-	@@ -1,3 +1,4 @@
-	+change
-	 1
-	 2
-	 3
-	@@ -8,3 +15,4 @@
-	 8
-	 9
-	 10
-	+change
-	EOF
-	compare_diff_patch expected out.tmp
-
-ok 45 - ignore-blank-lines: scattered spaces
-
-expecting success of 4015.46 'ignore-blank-lines: spaces coalesce': 
-	test_seq 6 >x &&
-	git update-index x &&
-	cat <<-\EOF >x &&
-	change
-	1
-	2
-	3
-
-	4
-
-	5
-
-	6
-	change
-	EOF
-	git diff --inter-hunk-context=4 --ignore-blank-lines >out.tmp &&
-	cat <<-\EOF >expected &&
-	diff --git a/x b/x
-	--- a/x
-	+++ b/x
-	@@ -1,6 +1,11 @@
-	+change
-	 1
-	 2
-	 3
-	+
-	 4
-	+
-	 5
-	+
-	 6
-	+change
-	EOF
-	compare_diff_patch expected out.tmp
-
-ok 46 - ignore-blank-lines: spaces coalesce
-
-expecting success of 4015.47 'ignore-blank-lines: mix changes and blank lines': 
-	test_seq 16 >x &&
-	git update-index x &&
-	cat <<-\EOF >x &&
-	change
-	1
-	2
-
-	3
-	4
-	5
-	change
-	6
-	7
-	8
-
-	9
-	10
-	11
-	change
-	12
-	13
-	14
-
-	15
-	16
-	change
-	EOF
-	git diff --ignore-blank-lines >out.tmp &&
-	cat <<-\EOF >expected &&
-	diff --git a/x b/x
-	--- a/x
-	+++ b/x
-	@@ -1,8 +1,11 @@
-	+change
-	 1
-	 2
-	+
-	 3
-	 4
-	 5
-	+change
-	 6
-	 7
-	 8
-	@@ -9,8 +13,11 @@
-	 9
-	 10
-	 11
-	+change
-	 12
-	 13
-	 14
-	+
-	 15
-	 16
-	+change
-	EOF
-	compare_diff_patch expected out.tmp
-
-ok 47 - ignore-blank-lines: mix changes and blank lines
-
-expecting success of 4015.48 'check mixed spaces and tabs in indent': 
-	# This is indented with SP HT SP.
-	echo " 	 foo();" >x &&
-	test_must_fail git diff --check >check &&
-	grep "space before tab in indent" check
-
-x:1: space before tab in indent.
-ok 48 - check mixed spaces and tabs in indent
-
-expecting success of 4015.49 'check mixed tabs and spaces in indent': 
-	# This is indented with HT SP HT.
-	echo "	 	foo();" >x &&
-	test_must_fail git diff --check >check &&
-	grep "space before tab in indent" check
-
-x:1: space before tab in indent.
-ok 49 - check mixed tabs and spaces in indent
-
-expecting success of 4015.50 'check with no whitespace errors': 
-	git commit -m "snapshot" &&
-	echo "foo();" >x &&
-	git diff --check
-
-[master (root-commit) e1e82b5] snapshot
- Author: A U Thor <author@example.com>
- 1 file changed, 16 insertions(+)
- create mode 100644 x
-ok 50 - check with no whitespace errors
-
-expecting success of 4015.51 'check with trailing whitespace': 
-	echo "foo(); " >x &&
-	test_must_fail git diff --check
-
-x:1: trailing whitespace.
-+foo(); 
-ok 51 - check with trailing whitespace
-
-expecting success of 4015.52 'check with space before tab in indent': 
-	# indent has space followed by hard tab
-	echo " 	foo();" >x &&
-	test_must_fail git diff --check
-
-x:1: space before tab in indent.
-+ 	foo();
-ok 52 - check with space before tab in indent
-
-expecting success of 4015.53 '--check and --exit-code are not exclusive': 
-	git checkout x &&
-	git diff --check --exit-code
-
-Updated 1 path from the index
-ok 53 - --check and --exit-code are not exclusive
-
-expecting success of 4015.54 '--check and --quiet are not exclusive': 
-	git diff --check --quiet
-
-ok 54 - --check and --quiet are not exclusive
-
-expecting success of 4015.55 '-w and --exit-code interact sensibly': 
-	test_when_finished "git checkout x" &&
-	{
-		test_seq 15 &&
-		echo " 16"
-	} >x &&
-	test_must_fail git diff --exit-code &&
-	git diff -w >actual &&
-	test_must_be_empty actual &&
-	git diff -w --exit-code
-
-diff --git a/x b/x
-index 469c856..bd0db19 100644
---- a/x
-+++ b/x
-@@ -13,4 +13,4 @@
- 13
- 14
- 15
--16
-+ 16
-Updated 1 path from the index
-ok 55 - -w and --exit-code interact sensibly
-
-expecting success of 4015.56 '-I and --exit-code interact sensibly': 
-	test_when_finished "git checkout x" &&
-	{
-		test_seq 15 &&
-		echo " 16"
-	} >x &&
-	test_must_fail git diff --exit-code &&
-	git diff -I. >actual &&
-	test_must_be_empty actual &&
-	git diff -I. --exit-code
-
-diff --git a/x b/x
-index 469c856..bd0db19 100644
---- a/x
-+++ b/x
-@@ -13,4 +13,4 @@
- 13
- 14
- 15
--16
-+ 16
-Updated 1 path from the index
-ok 56 - -I and --exit-code interact sensibly
-
-expecting success of 4015.57 'check staged with no whitespace errors': 
-	echo "foo();" >x &&
-	git add x &&
-	git diff --cached --check
-
-ok 57 - check staged with no whitespace errors
-
-expecting success of 4015.58 'check staged with trailing whitespace': 
-	echo "foo(); " >x &&
-	git add x &&
-	test_must_fail git diff --cached --check
-
-x:1: trailing whitespace.
-+foo(); 
-ok 58 - check staged with trailing whitespace
-
-expecting success of 4015.59 'check staged with space before tab in indent': 
-	# indent has space followed by hard tab
-	echo " 	foo();" >x &&
-	git add x &&
-	test_must_fail git diff --cached --check
-
-x:1: space before tab in indent.
-+ 	foo();
-ok 59 - check staged with space before tab in indent
-
-expecting success of 4015.60 'check with no whitespace errors (diff-index)': 
-	echo "foo();" >x &&
-	git add x &&
-	git diff-index --check HEAD
-
-ok 60 - check with no whitespace errors (diff-index)
-
-expecting success of 4015.61 'check with trailing whitespace (diff-index)': 
-	echo "foo(); " >x &&
-	git add x &&
-	test_must_fail git diff-index --check HEAD
-
-x:1: trailing whitespace.
-+foo(); 
-ok 61 - check with trailing whitespace (diff-index)
-
-expecting success of 4015.62 'check with space before tab in indent (diff-index)': 
-	# indent has space followed by hard tab
-	echo " 	foo();" >x &&
-	git add x &&
-	test_must_fail git diff-index --check HEAD
-
-x:1: space before tab in indent.
-+ 	foo();
-ok 62 - check with space before tab in indent (diff-index)
-
-expecting success of 4015.63 'check staged with no whitespace errors (diff-index)': 
-	echo "foo();" >x &&
-	git add x &&
-	git diff-index --cached --check HEAD
-
-ok 63 - check staged with no whitespace errors (diff-index)
-
-expecting success of 4015.64 'check staged with trailing whitespace (diff-index)': 
-	echo "foo(); " >x &&
-	git add x &&
-	test_must_fail git diff-index --cached --check HEAD
-
-x:1: trailing whitespace.
-+foo(); 
-ok 64 - check staged with trailing whitespace (diff-index)
-
-expecting success of 4015.65 'check staged with space before tab in indent (diff-index)': 
-	# indent has space followed by hard tab
-	echo " 	foo();" >x &&
-	git add x &&
-	test_must_fail git diff-index --cached --check HEAD
-
-x:1: space before tab in indent.
-+ 	foo();
-ok 65 - check staged with space before tab in indent (diff-index)
-
-expecting success of 4015.66 'check with no whitespace errors (diff-tree)': 
-	echo "foo();" >x &&
-	git commit -m "new commit" x &&
-	git diff-tree --check HEAD^ HEAD
-
-[master 8a0c590] new commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 16 deletions(-)
-ok 66 - check with no whitespace errors (diff-tree)
-
-expecting success of 4015.67 'check with trailing whitespace (diff-tree)': 
-	echo "foo(); " >x &&
-	git commit -m "another commit" x &&
-	test_must_fail git diff-tree --check HEAD^ HEAD
-
-[master e1bfb27] another commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-x:1: trailing whitespace.
-+foo(); 
-ok 67 - check with trailing whitespace (diff-tree)
-
-expecting success of 4015.68 'check with space before tab in indent (diff-tree)': 
-	# indent has space followed by hard tab
-	echo " 	foo();" >x &&
-	git commit -m "yet another" x &&
-	test_must_fail git diff-tree --check HEAD^ HEAD
-
-[master 59fa0e9] yet another
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-x:1: space before tab in indent.
-+ 	foo();
-ok 68 - check with space before tab in indent (diff-tree)
-
-expecting success of 4015.69 'check with ignored trailing whitespace attr (diff-tree)': 
-	test_when_finished "git reset --hard HEAD^" &&
-
-	# create a whitespace error that should be ignored
-	echo "* -whitespace" >.gitattributes &&
-	git add .gitattributes &&
-	echo "foo(); " >x &&
-	git add x &&
-	git commit -m "add trailing space" &&
-
-	# with a worktree diff-tree ignores the whitespace error
-	git diff-tree --root --check HEAD &&
-
-	# without a worktree diff-tree still ignores the whitespace error
-	git -C .git diff-tree --root --check HEAD
-
-[master fd6b52c] add trailing space
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 .gitattributes
-fd6b52cef13aeb6b7f1885c9b07026c3aa5a1035
-fd6b52cef13aeb6b7f1885c9b07026c3aa5a1035
-HEAD is now at 59fa0e9 yet another
-ok 69 - check with ignored trailing whitespace attr (diff-tree)
-
-expecting success of 4015.70 'check trailing whitespace (trailing-space: off)': 
-	git config core.whitespace "-trailing-space" &&
-	echo "foo ();   " >x &&
-	git diff --check
-
-ok 70 - check trailing whitespace (trailing-space: off)
-
-expecting success of 4015.71 'check trailing whitespace (trailing-space: on)': 
-	git config core.whitespace "trailing-space" &&
-	echo "foo ();   " >x &&
-	test_must_fail git diff --check
-
-x:1: trailing whitespace.
-+foo ();   
-ok 71 - check trailing whitespace (trailing-space: on)
-
-expecting success of 4015.72 'check space before tab in indent (space-before-tab: off)': 
-	# indent contains space followed by HT
-	git config core.whitespace "-space-before-tab" &&
-	echo " 	foo ();" >x &&
-	git diff --check
-
-ok 72 - check space before tab in indent (space-before-tab: off)
-
-expecting success of 4015.73 'check space before tab in indent (space-before-tab: on)': 
-	# indent contains space followed by HT
-	git config core.whitespace "space-before-tab" &&
-	echo " 	foo ();   " >x &&
-	test_must_fail git diff --check
-
-x:1: trailing whitespace, space before tab in indent.
-+ 	foo ();   
-ok 73 - check space before tab in indent (space-before-tab: on)
-
-expecting success of 4015.74 'check spaces as indentation (indent-with-non-tab: off)': 
-	git config core.whitespace "-indent-with-non-tab" &&
-	echo "        foo ();" >x &&
-	git diff --check
-
-ok 74 - check spaces as indentation (indent-with-non-tab: off)
-
-expecting success of 4015.75 'check spaces as indentation (indent-with-non-tab: on)': 
-	git config core.whitespace "indent-with-non-tab" &&
-	echo "        foo ();" >x &&
-	test_must_fail git diff --check
-
-x:1: indent with spaces.
-+        foo ();
-ok 75 - check spaces as indentation (indent-with-non-tab: on)
-
-expecting success of 4015.76 'ditto, but tabwidth=9': 
-	git config core.whitespace "indent-with-non-tab,tabwidth=9" &&
-	git diff --check
-
-ok 76 - ditto, but tabwidth=9
-
-expecting success of 4015.77 'check tabs and spaces as indentation (indent-with-non-tab: on)': 
-	git config core.whitespace "indent-with-non-tab" &&
-	echo "	                foo ();" >x &&
-	test_must_fail git diff --check
-
-x:1: indent with spaces.
-+	                foo ();
-ok 77 - check tabs and spaces as indentation (indent-with-non-tab: on)
-
-expecting success of 4015.78 'ditto, but tabwidth=10': 
-	git config core.whitespace "indent-with-non-tab,tabwidth=10" &&
-	test_must_fail git diff --check
-
-x:1: indent with spaces.
-+	                foo ();
-ok 78 - ditto, but tabwidth=10
-
-expecting success of 4015.79 'ditto, but tabwidth=20': 
-	git config core.whitespace "indent-with-non-tab,tabwidth=20" &&
-	git diff --check
-
-ok 79 - ditto, but tabwidth=20
-
-expecting success of 4015.80 'check tabs as indentation (tab-in-indent: off)': 
-	git config core.whitespace "-tab-in-indent" &&
-	echo "	foo ();" >x &&
-	git diff --check
-
-ok 80 - check tabs as indentation (tab-in-indent: off)
-
-expecting success of 4015.81 'check tabs as indentation (tab-in-indent: on)': 
-	git config core.whitespace "tab-in-indent" &&
-	echo "	foo ();" >x &&
-	test_must_fail git diff --check
-
-x:1: tab in indent.
-+	foo ();
-ok 81 - check tabs as indentation (tab-in-indent: on)
-
-expecting success of 4015.82 'check tabs and spaces as indentation (tab-in-indent: on)': 
-	git config core.whitespace "tab-in-indent" &&
-	echo "	                foo ();" >x &&
-	test_must_fail git diff --check
-
-x:1: tab in indent.
-+	                foo ();
-ok 82 - check tabs and spaces as indentation (tab-in-indent: on)
-
-expecting success of 4015.83 'ditto, but tabwidth=1 (must be irrelevant)': 
-	git config core.whitespace "tab-in-indent,tabwidth=1" &&
-	test_must_fail git diff --check
-
-x:1: tab in indent.
-+	                foo ();
-ok 83 - ditto, but tabwidth=1 (must be irrelevant)
-
-expecting success of 4015.84 'check tab-in-indent and indent-with-non-tab conflict': 
-	git config core.whitespace "tab-in-indent,indent-with-non-tab" &&
-	echo "foo ();" >x &&
-	test_must_fail git diff --check
-
-fatal: cannot enforce both tab-in-indent and indent-with-non-tab
-ok 84 - check tab-in-indent and indent-with-non-tab conflict
-
-expecting success of 4015.85 'check tab-in-indent excluded from wildcard whitespace attribute': 
-	git config --unset core.whitespace &&
-	echo "x whitespace" >.gitattributes &&
-	echo "	  foo ();" >x &&
-	git diff --check &&
-	rm -f .gitattributes
-
-ok 85 - check tab-in-indent excluded from wildcard whitespace attribute
-
-expecting success of 4015.86 'line numbers in --check output are correct': 
-	echo "" >x &&
-	echo "foo(); " >>x &&
-	test_must_fail git diff --check >check &&
-	grep "x:2:" check
-
-x:2: trailing whitespace.
-ok 86 - line numbers in --check output are correct
-
-expecting success of 4015.87 'checkdiff detects new trailing blank lines (1)': 
-	echo "foo();" >x &&
-	echo "" >>x &&
-	test_must_fail git diff --check >check &&
-	grep "new blank line" check
-
-x:2: new blank line at EOF.
-ok 87 - checkdiff detects new trailing blank lines (1)
-
-expecting success of 4015.88 'checkdiff detects new trailing blank lines (2)': 
-	test_write_lines a b "" "" >x &&
-	git add x &&
-	test_write_lines a "" "" "" "" >x &&
-	test_must_fail git diff --check >check &&
-	grep "new blank line" check
-
-x:2: new blank line at EOF.
-ok 88 - checkdiff detects new trailing blank lines (2)
-
-expecting success of 4015.89 'checkdiff allows new blank lines': 
-	git checkout x &&
-	mv x y &&
-	(
-		echo "/* This is new */" &&
-		echo "" &&
-		cat y
-	) >x &&
-	git diff --check
-
-Updated 1 path from the index
-ok 89 - checkdiff allows new blank lines
-
-expecting success of 4015.90 'whitespace-only changes not reported (diff)': 
-	git reset --hard &&
-	echo >x "hello world" &&
-	git add x &&
-	git commit -m "hello 1" &&
-	echo >x "hello  world" &&
-	git diff -b >actual &&
-	test_must_be_empty actual
-
-HEAD is now at 59fa0e9 yet another
-[master 5a2317e] hello 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 90 - whitespace-only changes not reported (diff)
-
-expecting success of 4015.91 'whitespace-only changes not reported (diffstat)': 
-	# reuse state from previous test
-	git diff --stat -b >actual &&
-	test_must_be_empty actual
-
-ok 91 - whitespace-only changes not reported (diffstat)
-
-expecting success of 4015.92 'whitespace changes with modification reported (diffstat)': 
-	git reset --hard &&
-	echo >x "hello  world" &&
-	git update-index --chmod=+x x &&
-	git diff --stat --cached -b >actual &&
-	cat <<-EOF >expect &&
-	 x | 0
-	 1 file changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	test_cmp expect actual
-
-HEAD is now at 5a2317e hello 1
-ok 92 - whitespace changes with modification reported (diffstat)
-
-expecting success of 4015.93 'whitespace-only changes reported across renames (diffstat)': 
-	git reset --hard &&
-	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
-	git add x &&
-	git commit -m "base" &&
-	sed -e "5s/^/ /" x >z &&
-	git rm x &&
-	git add z &&
-	git diff -w -M --cached --stat >actual &&
-	cat <<-EOF >expect &&
-	 x => z | 0
-	 1 file changed, 0 insertions(+), 0 deletions(-)
-	EOF
-	test_cmp expect actual
-
-HEAD is now at 5a2317e hello 1
-[master bb02800] base
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+), 1 deletion(-)
-rm 'x'
-ok 93 - whitespace-only changes reported across renames (diffstat)
-
-expecting success of 4015.94 'whitespace-only changes reported across renames': 
-	git reset --hard HEAD~1 &&
-	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
-	git add x &&
-	hash_x=$(git hash-object x) &&
-	before=$(git rev-parse --short "$hash_x") &&
-	git commit -m "base" &&
-	sed -e "5s/^/ /" x >z &&
-	git rm x &&
-	git add z &&
-	hash_z=$(git hash-object z) &&
-	after=$(git rev-parse --short "$hash_z") &&
-	git diff -w -M --cached >actual.raw &&
-	sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" actual.raw >actual &&
-	cat <<-EOF >expect &&
-	diff --git a/x b/z
-	similarity index NUM%
-	rename from x
-	rename to z
-	index $before..$after 100644
-	EOF
-	test_cmp expect actual
-
-HEAD is now at 5a2317e hello 1
-[master bb02800] base
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+), 1 deletion(-)
-rm 'x'
-ok 94 - whitespace-only changes reported across renames
-
-expecting success of 4015.95 'rename empty': 
-	git reset --hard &&
-	>empty &&
-	git add empty &&
-	git commit -m empty &&
-	git mv empty void &&
-	git diff -w --cached -M >current &&
-	test_cmp expected current
-
-HEAD is now at bb02800 base
-[master c4f276a] empty
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 empty
-ok 95 - rename empty
-
-expecting success of 4015.96 'combined diff with autocrlf conversion': 
-
-	git reset --hard &&
-	test_commit "one side" x hello one-side &&
-	git checkout HEAD^ &&
-	echo >x goodbye &&
-	git commit -m "the other side" x &&
-	git config core.autocrlf true &&
-	test_must_fail git merge one-side >actual &&
-	test_grep "Automatic merge failed" actual &&
-
-	git diff >actual.raw &&
-	sed -e "1,/^@@@/d" actual.raw >actual &&
-	! grep "^-" actual
-
-
-HEAD is now at c4f276a empty
-[master daf548d] one side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 9 deletions(-)
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at c4f276a empty
-[detached HEAD fbb6449] the other side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 9 deletions(-)
-Automatic merge failed; fix conflicts and then commit the result.
-ok 96 - combined diff with autocrlf conversion
-
-expecting success of 4015.97 'setup diff colors': 
-	git config color.diff.plain normal &&
-	git config color.diff.meta bold &&
-	git config color.diff.frag cyan &&
-	git config color.diff.func normal &&
-	git config color.diff.old red &&
-	git config color.diff.new green &&
-	git config color.diff.commit yellow &&
-	git config color.diff.whitespace blue &&
-
-	git config core.autocrlf false
-
-ok 97 - setup diff colors
-
-expecting success of 4015.98 'diff that introduces a line with only tabs': 
-	git config core.whitespace blank-at-eol &&
-	git reset --hard &&
-	echo "test" >x &&
-	old_hash_x=$(git hash-object x) &&
-	before=$(git rev-parse --short "$old_hash_x") &&
-	git commit -m "initial" x &&
-	echo "{NTN}" | tr "NT" "\n\t" >>x &&
-	new_hash_x=$(git hash-object x) &&
-	after=$(git rev-parse --short "$new_hash_x") &&
-	git diff --color >current.raw &&
-	test_decode_color <current.raw >current &&
-
-	cat >expected <<-EOF &&
-	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index $before..$after 100644<RESET>
-	<BOLD>--- a/x<RESET>
-	<BOLD>+++ b/x<RESET>
-	<CYAN>@@ -1 +1,4 @@<RESET>
-	 test<RESET>
-	<GREEN>+<RESET><GREEN>{<RESET>
-	<GREEN>+<RESET><BLUE>	<RESET>
-	<GREEN>+<RESET><GREEN>}<RESET>
-	EOF
-
-	test_cmp expected current
-
-HEAD is now at fbb6449 the other side
-[detached HEAD b654c4d] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 98 - diff that introduces a line with only tabs
-
-expecting success of 4015.99 'diff that introduces and removes ws breakages': 
-	git reset --hard &&
-	{
-		echo "0. blank-at-eol " &&
-		echo "1. blank-at-eol "
-	} >x &&
-	old_hash_x=$(git hash-object x) &&
-	before=$(git rev-parse --short "$old_hash_x") &&
-	git commit -a --allow-empty -m preimage &&
-	{
-		echo "0. blank-at-eol " &&
-		echo "1. still-blank-at-eol " &&
-		echo "2. and a new line "
-	} >x &&
-	new_hash_x=$(git hash-object x) &&
-	after=$(git rev-parse --short "$new_hash_x") &&
-
-	git diff --color >current.raw &&
-	test_decode_color <current.raw >current &&
-
-	cat >expected <<-EOF &&
-	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index $before..$after 100644<RESET>
-	<BOLD>--- a/x<RESET>
-	<BOLD>+++ b/x<RESET>
-	<CYAN>@@ -1,2 +1,3 @@<RESET>
-	 0. blank-at-eol <RESET>
-	<RED>-1. blank-at-eol <RESET>
-	<GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
-	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
-	EOF
-
-	test_cmp expected current
-
-HEAD is now at b654c4d initial
-[detached HEAD a8a97bc] preimage
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-ok 99 - diff that introduces and removes ws breakages
-
-expecting success of 4015.100 'ws-error-highlight test setup': 
-
-	git reset --hard &&
-	{
-		echo "0. blank-at-eol " &&
-		echo "1. blank-at-eol "
-	} >x &&
-	old_hash_x=$(git hash-object x) &&
-	before=$(git rev-parse --short "$old_hash_x") &&
-	git commit -a --allow-empty -m preimage &&
-	{
-		echo "0. blank-at-eol " &&
-		echo "1. still-blank-at-eol " &&
-		echo "2. and a new line "
-	} >x &&
-	new_hash_x=$(git hash-object x) &&
-	after=$(git rev-parse --short "$new_hash_x") &&
-
-	cat >expect.default-old <<-EOF &&
-	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index $before..$after 100644<RESET>
-	<BOLD>--- a/x<RESET>
-	<BOLD>+++ b/x<RESET>
-	<CYAN>@@ -1,2 +1,3 @@<RESET>
-	 0. blank-at-eol <RESET>
-	<RED>-<RESET><RED>1. blank-at-eol<RESET><BLUE> <RESET>
-	<GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
-	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
-	EOF
-
-	cat >expect.all <<-EOF &&
-	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index $before..$after 100644<RESET>
-	<BOLD>--- a/x<RESET>
-	<BOLD>+++ b/x<RESET>
-	<CYAN>@@ -1,2 +1,3 @@<RESET>
-	 <RESET>0. blank-at-eol<RESET><BLUE> <RESET>
-	<RED>-<RESET><RED>1. blank-at-eol<RESET><BLUE> <RESET>
-	<GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
-	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
-	EOF
-
-	cat >expect.none <<-EOF
-	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index $before..$after 100644<RESET>
-	<BOLD>--- a/x<RESET>
-	<BOLD>+++ b/x<RESET>
-	<CYAN>@@ -1,2 +1,3 @@<RESET>
-	 0. blank-at-eol <RESET>
-	<RED>-1. blank-at-eol <RESET>
-	<GREEN>+1. still-blank-at-eol <RESET>
-	<GREEN>+2. and a new line <RESET>
-	EOF
-
-
-HEAD is now at a8a97bc preimage
-[detached HEAD 641766e] preimage
- Author: A U Thor <author@example.com>
-ok 100 - ws-error-highlight test setup
-
-expecting success of 4015.101 'test --ws-error-highlight option': 
-
-	git diff --color --ws-error-highlight=default,old >current.raw &&
-	test_decode_color <current.raw >current &&
-	test_cmp expect.default-old current &&
-
-	git diff --color --ws-error-highlight=all >current.raw &&
-	test_decode_color <current.raw >current &&
-	test_cmp expect.all current &&
-
-	git diff --color --ws-error-highlight=none >current.raw &&
-	test_decode_color <current.raw >current &&
-	test_cmp expect.none current
-
-
-ok 101 - test --ws-error-highlight option
-
-expecting success of 4015.102 'test diff.wsErrorHighlight config': 
-
-	git -c diff.wsErrorHighlight=default,old diff --color >current.raw &&
-	test_decode_color <current.raw >current &&
-	test_cmp expect.default-old current &&
-
-	git -c diff.wsErrorHighlight=all diff --color >current.raw &&
-	test_decode_color <current.raw >current &&
-	test_cmp expect.all current &&
-
-	git -c diff.wsErrorHighlight=none diff --color >current.raw &&
-	test_decode_color <current.raw >current &&
-	test_cmp expect.none current
-
-
-ok 102 - test diff.wsErrorHighlight config
-
-expecting success of 4015.103 'option overrides diff.wsErrorHighlight': 
-
-	git -c diff.wsErrorHighlight=none \
-		diff --color --ws-error-highlight=default,old >current.raw &&
-	test_decode_color <current.raw >current &&
-	test_cmp expect.default-old current &&
-
-	git -c diff.wsErrorHighlight=default \
-		diff --color --ws-error-highlight=all >current.raw &&
-	test_decode_color <current.raw >current &&
-	test_cmp expect.all current &&
-
-	git -c diff.wsErrorHighlight=all \
-		diff --color --ws-error-highlight=none >current.raw &&
-	test_decode_color <current.raw >current &&
-	test_cmp expect.none current
-
-
-ok 103 - option overrides diff.wsErrorHighlight
-
-expecting success of 4015.104 'detect moved code, complete file': 
-	git reset --hard &&
-	cat <<-\EOF >test.c &&
-	#include<stdio.h>
-	main()
-	{
-	printf("Hello World");
-	}
-	EOF
-	git add test.c &&
-	git commit -m "add main function" &&
-	file=$(git rev-parse --short HEAD:test.c) &&
-	git mv test.c main.c &&
-	test_config color.diff.oldMoved "normal red" &&
-	test_config color.diff.newMoved "normal green" &&
-	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	cat >expected <<-EOF &&
-	<BOLD>diff --git a/main.c b/main.c<RESET>
-	<BOLD>new file mode 100644<RESET>
-	<BOLD>index 0000000..$file<RESET>
-	<BOLD>--- /dev/null<RESET>
-	<BOLD>+++ b/main.c<RESET>
-	<CYAN>@@ -0,0 +1,5 @@<RESET>
-	<BGREEN>+<RESET><BGREEN>#include<stdio.h><RESET>
-	<BGREEN>+<RESET><BGREEN>main()<RESET>
-	<BGREEN>+<RESET><BGREEN>{<RESET>
-	<BGREEN>+<RESET><BGREEN>printf("Hello World");<RESET>
-	<BGREEN>+<RESET><BGREEN>}<RESET>
-	<BOLD>diff --git a/test.c b/test.c<RESET>
-	<BOLD>deleted file mode 100644<RESET>
-	<BOLD>index $file..0000000<RESET>
-	<BOLD>--- a/test.c<RESET>
-	<BOLD>+++ /dev/null<RESET>
-	<CYAN>@@ -1,5 +0,0 @@<RESET>
-	<BRED>-#include<stdio.h><RESET>
-	<BRED>-main()<RESET>
-	<BRED>-{<RESET>
-	<BRED>-printf("Hello World");<RESET>
-	<BRED>-}<RESET>
-	EOF
-
-	test_cmp expected actual
-
-HEAD is now at 641766e preimage
-[detached HEAD 36350aa] add main function
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+)
- create mode 100644 test.c
-ok 104 - detect moved code, complete file
-
-expecting success of 4015.105 'detect malicious moved code, inside file': 
-	test_config color.diff.oldMoved "normal red" &&
-	test_config color.diff.newMoved "normal green" &&
-	test_config color.diff.oldMovedAlternative "blue" &&
-	test_config color.diff.newMovedAlternative "yellow" &&
-	git reset --hard &&
-	cat <<-\EOF >main.c &&
-		#include<stdio.h>
-		int stuff()
-		{
-			printf("Hello ");
-			printf("World\n");
-		}
-
-		int secure_foo(struct user *u)
-		{
-			if (!u->is_allowed_foo)
-				return;
-			foo(u);
-		}
-
-		int main()
-		{
-			foo();
-		}
-	EOF
-	cat <<-\EOF >test.c &&
-		#include<stdio.h>
-		int bar()
-		{
-			printf("Hello World, but different\n");
-		}
-
-		int another_function()
-		{
-			bar();
-		}
-	EOF
-	git add main.c test.c &&
-	git commit -m "add main and test file" &&
-	before_main=$(git rev-parse --short HEAD:main.c) &&
-	before_test=$(git rev-parse --short HEAD:test.c) &&
-	cat <<-\EOF >main.c &&
-		#include<stdio.h>
-		int stuff()
-		{
-			printf("Hello ");
-			printf("World\n");
-		}
-
-		int main()
-		{
-			foo();
-		}
-	EOF
-	cat <<-\EOF >test.c &&
-		#include<stdio.h>
-		int bar()
-		{
-			printf("Hello World, but different\n");
-		}
-
-		int secure_foo(struct user *u)
-		{
-			foo(u);
-			if (!u->is_allowed_foo)
-				return;
-		}
-
-		int another_function()
-		{
-			bar();
-		}
-	EOF
-	hash_main=$(git hash-object main.c) &&
-	after_main=$(git rev-parse --short "$hash_main") &&
-	hash_test=$(git hash-object test.c) &&
-	after_test=$(git rev-parse --short "$hash_test") &&
-	git diff HEAD --no-renames --color-moved=zebra --color >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	cat <<-EOF >expected &&
-	<BOLD>diff --git a/main.c b/main.c<RESET>
-	<BOLD>index $before_main..$after_main 100644<RESET>
-	<BOLD>--- a/main.c<RESET>
-	<BOLD>+++ b/main.c<RESET>
-	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
-	 printf("World\n");<RESET>
-	 }<RESET>
-	 <RESET>
-	<BRED>-int secure_foo(struct user *u)<RESET>
-	<BRED>-{<RESET>
-	<BLUE>-if (!u->is_allowed_foo)<RESET>
-	<BLUE>-return;<RESET>
-	<RED>-foo(u);<RESET>
-	<RED>-}<RESET>
-	<RED>-<RESET>
-	 int main()<RESET>
-	 {<RESET>
-	 foo();<RESET>
-	<BOLD>diff --git a/test.c b/test.c<RESET>
-	<BOLD>index $before_test..$after_test 100644<RESET>
-	<BOLD>--- a/test.c<RESET>
-	<BOLD>+++ b/test.c<RESET>
-	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
-	 printf("Hello World, but different\n");<RESET>
-	 }<RESET>
-	 <RESET>
-	<BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
-	<BGREEN>+<RESET><BGREEN>{<RESET>
-	<GREEN>+<RESET><GREEN>foo(u);<RESET>
-	<BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
-	<BGREEN>+<RESET><BGREEN>return;<RESET>
-	<GREEN>+<RESET><GREEN>}<RESET>
-	<GREEN>+<RESET>
-	 int another_function()<RESET>
-	 {<RESET>
-	 bar();<RESET>
-	EOF
-
-	test_cmp expected actual
-
-HEAD is now at 36350aa add main function
-[detached HEAD 727fc3d] add main and test file
- Author: A U Thor <author@example.com>
- 2 files changed, 25 insertions(+), 2 deletions(-)
- create mode 100644 main.c
-ok 105 - detect malicious moved code, inside file
-
-expecting success of 4015.106 'plain moved code, inside file': 
-	test_config color.diff.oldMoved "normal red" &&
-	test_config color.diff.newMoved "normal green" &&
-	test_config color.diff.oldMovedAlternative "blue" &&
-	test_config color.diff.newMovedAlternative "yellow" &&
-	# needs previous test as setup
-	git diff HEAD --no-renames --color-moved=plain --color >actual.raw &&
-	test_decode_color <actual.raw >actual &&
-	cat <<-EOF >expected &&
-	<BOLD>diff --git a/main.c b/main.c<RESET>
-	<BOLD>index $before_main..$after_main 100644<RESET>
-	<BOLD>--- a/main.c<RESET>
-	<BOLD>+++ b/main.c<RESET>
-	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
-	 printf("World\n");<RESET>
-	 }<RESET>
-	 <RESET>
-	<BRED>-int secure_foo(struct user *u)<RESET>
-	<BRED>-{<RESET>
-	<BRED>-if (!u->is_allowed_foo)<RESET>
-	<BRED>-return;<RESET>
-	<BRED>-foo(u);<RESET>
-	<BRED>-}<RESET>
-	<BRED>-<RESET>
-	 int main()<RESET>
-	 {<RESET>
-	 foo();<RESET>
-	<BOLD>diff --git a/test.c b/test.c<RESET>
-	<BOLD>index $before_test..$after_test 100644<RESET>
-	<BOLD>--- a/test.c<RESET>
-	<BOLD>+++ b/test.c<RESET>
-	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
-	 printf("Hello World, but different\n");<RESET>
-	 }<RESET>
-	 <RESET>
-	<BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
-	<BGREEN>+<RESET><BGREEN>{<RESET>
-	<BGREEN>+<RESET><BGREEN>foo(u);<RESET>
-	<BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
-	<BGREEN>+<RESET><BGREEN>return;<RESET>
-	<BGREEN>+<RESET><BGREEN>}<RESET>
-	<BGREEN>+<RESET>
-	 int another_function()<RESET>
-	 {<RESET>
-	 bar();<RESET>
-	EOF
-
-	test_cmp expected actual
-
-ok 106 - plain moved code, inside file
-
-expecting success of 4015.107 'detect blocks of moved code': 
-	git reset --hard &&
-	cat <<-\EOF >lines.txt &&
-		long line 1
-		long line 2
-		long line 3
-		line 4
-		line 5
-		line 6
-		line 7
-		line 8
-		line 9
-		line 10
-		line 11
-		line 12
-		line 13
-		long line 14
-		long line 15
-		long line 16
-	EOF
-	git add lines.txt &&
-	git commit -m "add poetry" &&
-	cat <<-\EOF >lines.txt &&
-		line 4
-		line 5
-		line 6
-		line 7
-		line 8
-		line 9
-		long line 1
-		long line 2
-		long line 3
-		long line 14
-		long line 15
-		long line 16
-		line 10
-		line 11
-		line 12
-		line 13
-	EOF
-	test_config color.diff.oldMoved "magenta" &&
-	test_config color.diff.newMoved "cyan" &&
-	test_config color.diff.oldMovedAlternative "blue" &&
-	test_config color.diff.newMovedAlternative "yellow" &&
-	test_config color.diff.oldMovedDimmed "normal magenta" &&
-	test_config color.diff.newMovedDimmed "normal cyan" &&
-	test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
-	test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
-	git diff HEAD --no-renames --color-moved=blocks --color >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
-	<BOLD>--- a/lines.txt<RESET>
-	<BOLD>+++ b/lines.txt<RESET>
-	<CYAN>@@ -1,16 +1,16 @@<RESET>
-	<MAGENTA>-long line 1<RESET>
-	<MAGENTA>-long line 2<RESET>
-	<MAGENTA>-long line 3<RESET>
-	 line 4<RESET>
-	 line 5<RESET>
-	 line 6<RESET>
-	 line 7<RESET>
-	 line 8<RESET>
-	 line 9<RESET>
-	<CYAN>+<RESET><CYAN>long line 1<RESET>
-	<CYAN>+<RESET><CYAN>long line 2<RESET>
-	<CYAN>+<RESET><CYAN>long line 3<RESET>
-	<CYAN>+<RESET><CYAN>long line 14<RESET>
-	<CYAN>+<RESET><CYAN>long line 15<RESET>
-	<CYAN>+<RESET><CYAN>long line 16<RESET>
-	 line 10<RESET>
-	 line 11<RESET>
-	 line 12<RESET>
-	 line 13<RESET>
-	<MAGENTA>-long line 14<RESET>
-	<MAGENTA>-long line 15<RESET>
-	<MAGENTA>-long line 16<RESET>
-	EOF
-	test_cmp expected actual
-
-
-HEAD is now at 727fc3d add main and test file
-[detached HEAD 0f7fe07] add poetry
- Author: A U Thor <author@example.com>
- 1 file changed, 16 insertions(+)
- create mode 100644 lines.txt
-ok 107 - detect blocks of moved code
-
-expecting success of 4015.108 'detect permutations inside moved code -- dimmed-zebra': 
-	# reuse setup from test before!
-	test_config color.diff.oldMoved "magenta" &&
-	test_config color.diff.newMoved "cyan" &&
-	test_config color.diff.oldMovedAlternative "blue" &&
-	test_config color.diff.newMovedAlternative "yellow" &&
-	test_config color.diff.oldMovedDimmed "normal magenta" &&
-	test_config color.diff.newMovedDimmed "normal cyan" &&
-	test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
-	test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
-	git diff HEAD --no-renames --color-moved=dimmed-zebra --color >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
-	<BOLD>--- a/lines.txt<RESET>
-	<BOLD>+++ b/lines.txt<RESET>
-	<CYAN>@@ -1,16 +1,16 @@<RESET>
-	<BMAGENTA>-long line 1<RESET>
-	<BMAGENTA>-long line 2<RESET>
-	<BMAGENTA>-long line 3<RESET>
-	 line 4<RESET>
-	 line 5<RESET>
-	 line 6<RESET>
-	 line 7<RESET>
-	 line 8<RESET>
-	 line 9<RESET>
-	<BCYAN>+<RESET><BCYAN>long line 1<RESET>
-	<BCYAN>+<RESET><BCYAN>long line 2<RESET>
-	<CYAN>+<RESET><CYAN>long line 3<RESET>
-	<YELLOW>+<RESET><YELLOW>long line 14<RESET>
-	<BYELLOW>+<RESET><BYELLOW>long line 15<RESET>
-	<BYELLOW>+<RESET><BYELLOW>long line 16<RESET>
-	 line 10<RESET>
-	 line 11<RESET>
-	 line 12<RESET>
-	 line 13<RESET>
-	<BMAGENTA>-long line 14<RESET>
-	<BMAGENTA>-long line 15<RESET>
-	<BMAGENTA>-long line 16<RESET>
-	EOF
-	test_cmp expected actual
-
-ok 108 - detect permutations inside moved code -- dimmed-zebra
-
-expecting success of 4015.109 'zebra alternate color is only used when necessary': 
-	cat >old.txt <<-\EOF &&
-	line 1A should be marked as oldMoved newMovedAlternate
-	line 1B should be marked as oldMoved newMovedAlternate
-	unchanged
-	line 2A should be marked as oldMoved newMovedAlternate
-	line 2B should be marked as oldMoved newMovedAlternate
-	line 3A should be marked as oldMovedAlternate newMoved
-	line 3B should be marked as oldMovedAlternate newMoved
-	unchanged
-	line 4A should be marked as oldMoved newMovedAlternate
-	line 4B should be marked as oldMoved newMovedAlternate
-	line 5A should be marked as oldMovedAlternate newMoved
-	line 5B should be marked as oldMovedAlternate newMoved
-	line 6A should be marked as oldMoved newMoved
-	line 6B should be marked as oldMoved newMoved
-	EOF
-	cat >new.txt <<-\EOF &&
-	  line 1A should be marked as oldMoved newMovedAlternate
-	  line 1B should be marked as oldMoved newMovedAlternate
-	unchanged
-	  line 3A should be marked as oldMovedAlternate newMoved
-	  line 3B should be marked as oldMovedAlternate newMoved
-	  line 2A should be marked as oldMoved newMovedAlternate
-	  line 2B should be marked as oldMoved newMovedAlternate
-	unchanged
-	  line 6A should be marked as oldMoved newMoved
-	  line 6B should be marked as oldMoved newMoved
-	    line 4A should be marked as oldMoved newMovedAlternate
-	    line 4B should be marked as oldMoved newMovedAlternate
-	  line 5A should be marked as oldMovedAlternate newMoved
-	  line 5B should be marked as oldMovedAlternate newMoved
-	EOF
-	test_expect_code 1 git diff --no-index --color --color-moved=zebra \
-		 --color-moved-ws=allow-indentation-change \
-		 old.txt new.txt >output &&
-	grep -v index output | test_decode_color >actual &&
-	cat >expected <<-\EOF &&
-	<BOLD>diff --git a/old.txt b/new.txt<RESET>
-	<BOLD>--- a/old.txt<RESET>
-	<BOLD>+++ b/new.txt<RESET>
-	<CYAN>@@ -1,14 +1,14 @@<RESET>
-	<BOLD;MAGENTA>-line 1A should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;MAGENTA>-line 1B should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 1A should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 1B should be marked as oldMoved newMovedAlternate<RESET>
-	 unchanged<RESET>
-	<BOLD;MAGENTA>-line 2A should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;MAGENTA>-line 2B should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;BLUE>-line 3A should be marked as oldMovedAlternate newMoved<RESET>
-	<BOLD;BLUE>-line 3B should be marked as oldMovedAlternate newMoved<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 3A should be marked as oldMovedAlternate newMoved<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 3B should be marked as oldMovedAlternate newMoved<RESET>
-	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>  line 2A should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>  line 2B should be marked as oldMoved newMovedAlternate<RESET>
-	 unchanged<RESET>
-	<BOLD;MAGENTA>-line 4A should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;MAGENTA>-line 4B should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;BLUE>-line 5A should be marked as oldMovedAlternate newMoved<RESET>
-	<BOLD;BLUE>-line 5B should be marked as oldMovedAlternate newMoved<RESET>
-	<BOLD;MAGENTA>-line 6A should be marked as oldMoved newMoved<RESET>
-	<BOLD;MAGENTA>-line 6B should be marked as oldMoved newMoved<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 6A should be marked as oldMoved newMoved<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 6B should be marked as oldMoved newMoved<RESET>
-	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>    line 4A should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>    line 4B should be marked as oldMoved newMovedAlternate<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 5A should be marked as oldMovedAlternate newMoved<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 5B should be marked as oldMovedAlternate newMoved<RESET>
-	EOF
-	test_cmp expected actual
-
-ok 109 - zebra alternate color is only used when necessary
-
-expecting success of 4015.110 'short lines of opposite sign do not get marked as moved': 
-	cat >old.txt <<-\EOF &&
-	this line should be marked as moved
-	unchanged
-	unchanged
-	unchanged
-	unchanged
-	too short
-	this line should be marked as oldMoved newMoved
-	this line should be marked as oldMovedAlternate newMoved
-	unchanged 1
-	unchanged 2
-	unchanged 3
-	unchanged 4
-	this line should be marked as oldMoved newMoved/newMovedAlternate
-	EOF
-	cat >new.txt <<-\EOF &&
-	too short
-	unchanged
-	unchanged
-	this line should be marked as moved
-	too short
-	unchanged
-	unchanged
-	this line should be marked as oldMoved newMoved/newMovedAlternate
-	unchanged 1
-	unchanged 2
-	this line should be marked as oldMovedAlternate newMoved
-	this line should be marked as oldMoved newMoved/newMovedAlternate
-	unchanged 3
-	this line should be marked as oldMoved newMoved
-	unchanged 4
-	EOF
-	test_expect_code 1 git diff --no-index --color --color-moved=zebra \
-		old.txt new.txt >output && cat output &&
-	grep -v index output | test_decode_color >actual &&
-	cat >expect <<-\EOF &&
-	<BOLD>diff --git a/old.txt b/new.txt<RESET>
-	<BOLD>--- a/old.txt<RESET>
-	<BOLD>+++ b/new.txt<RESET>
-	<CYAN>@@ -1,13 +1,15 @@<RESET>
-	<BOLD;MAGENTA>-this line should be marked as moved<RESET>
-	<GREEN>+<RESET><GREEN>too short<RESET>
-	 unchanged<RESET>
-	 unchanged<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as moved<RESET>
-	<GREEN>+<RESET><GREEN>too short<RESET>
-	 unchanged<RESET>
-	 unchanged<RESET>
-	<RED>-too short<RESET>
-	<BOLD;MAGENTA>-this line should be marked as oldMoved newMoved<RESET>
-	<BOLD;BLUE>-this line should be marked as oldMovedAlternate newMoved<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
-	 unchanged 1<RESET>
-	 unchanged 2<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMovedAlternate newMoved<RESET>
-	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
-	 unchanged 3<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved<RESET>
-	 unchanged 4<RESET>
-	<BOLD;MAGENTA>-this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
-	EOF
-	test_cmp expect actual
-
-diff --git a/old.txt b/new.txt
-index b69be6f..7db2c55 100644
---- a/old.txt
-+++ b/new.txt
-@@ -1,13 +1,15 @@
--this line should be marked as moved
-+too short
- unchanged
- unchanged
-+this line should be marked as moved
-+too short
- unchanged
- unchanged
--too short
--this line should be marked as oldMoved newMoved
--this line should be marked as oldMovedAlternate newMoved
-+this line should be marked as oldMoved newMoved/newMovedAlternate
- unchanged 1
- unchanged 2
-+this line should be marked as oldMovedAlternate newMoved
-+this line should be marked as oldMoved newMoved/newMovedAlternate
- unchanged 3
-+this line should be marked as oldMoved newMoved
- unchanged 4
--this line should be marked as oldMoved newMoved/newMovedAlternate
-ok 110 - short lines of opposite sign do not get marked as moved
-
-expecting success of 4015.111 'cmd option assumes configured colored-moved': 
-	test_config color.diff.oldMoved "magenta" &&
-	test_config color.diff.newMoved "cyan" &&
-	test_config color.diff.oldMovedAlternative "blue" &&
-	test_config color.diff.newMovedAlternative "yellow" &&
-	test_config color.diff.oldMovedDimmed "normal magenta" &&
-	test_config color.diff.newMovedDimmed "normal cyan" &&
-	test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
-	test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
-	test_config diff.colorMoved zebra &&
-	git diff HEAD --no-renames --color-moved --color >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
-	<BOLD>--- a/lines.txt<RESET>
-	<BOLD>+++ b/lines.txt<RESET>
-	<CYAN>@@ -1,16 +1,16 @@<RESET>
-	<MAGENTA>-long line 1<RESET>
-	<MAGENTA>-long line 2<RESET>
-	<MAGENTA>-long line 3<RESET>
-	 line 4<RESET>
-	 line 5<RESET>
-	 line 6<RESET>
-	 line 7<RESET>
-	 line 8<RESET>
-	 line 9<RESET>
-	<CYAN>+<RESET><CYAN>long line 1<RESET>
-	<CYAN>+<RESET><CYAN>long line 2<RESET>
-	<CYAN>+<RESET><CYAN>long line 3<RESET>
-	<YELLOW>+<RESET><YELLOW>long line 14<RESET>
-	<YELLOW>+<RESET><YELLOW>long line 15<RESET>
-	<YELLOW>+<RESET><YELLOW>long line 16<RESET>
-	 line 10<RESET>
-	 line 11<RESET>
-	 line 12<RESET>
-	 line 13<RESET>
-	<MAGENTA>-long line 14<RESET>
-	<MAGENTA>-long line 15<RESET>
-	<MAGENTA>-long line 16<RESET>
-	EOF
-	test_cmp expected actual
-
-ok 111 - cmd option assumes configured colored-moved
-
-expecting success of 4015.112 'no effect on diff from --color-moved with --word-diff': 
-	cat <<-\EOF >text.txt &&
-	Lorem Ipsum is simply dummy text of the printing and typesetting industry.
-	EOF
-	git add text.txt &&
-	git commit -a -m "clean state" &&
-	cat <<-\EOF >text.txt &&
-	simply Lorem Ipsum dummy is text of the typesetting and printing industry.
-	EOF
-	git diff --color-moved --word-diff >actual &&
-	git diff --word-diff >expect &&
-	test_cmp expect actual
-
-[detached HEAD 17804c5] clean state
- Author: A U Thor <author@example.com>
- 2 files changed, 7 insertions(+), 6 deletions(-)
- create mode 100644 text.txt
-ok 112 - no effect on diff from --color-moved with --word-diff
-
-expecting success of 4015.113 'no effect on show from --color-moved with --word-diff': 
-	git show --color-moved --word-diff >actual &&
-	git show --word-diff >expect &&
-	test_cmp expect actual
-
-ok 113 - no effect on show from --color-moved with --word-diff
-
-expecting success of 4015.114 'set up whitespace tests': 
-	git reset --hard &&
-	# Note that these lines have no leading or trailing whitespace.
-	cat <<-\EOF >lines.txt &&
-	line 1
-	line 2
-	line 3
-	line 4
-	line 5
-	long line 6
-	long line 7
-	long line 8
-	long line 9
-	EOF
-	git add lines.txt &&
-	git commit -m "add poetry" &&
-	git config color.diff.oldMoved "magenta" &&
-	git config color.diff.newMoved "cyan"
-
-HEAD is now at 17804c5 clean state
-[detached HEAD 20118d6] add poetry
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+), 14 deletions(-)
-ok 114 - set up whitespace tests
-
-expecting success of 4015.115 'move detection ignoring whitespace ': 
-	q_to_tab <<-\EOF >lines.txt &&
-	Qlong line 6
-	Qlong line 7
-	Qlong line 8
-	Qchanged long line 9
-	line 1
-	line 2
-	line 3
-	line 4
-	line 5
-	EOF
-	git diff HEAD --no-renames --color-moved --color >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
-	<BOLD>--- a/lines.txt<RESET>
-	<BOLD>+++ b/lines.txt<RESET>
-	<CYAN>@@ -1,9 +1,9 @@<RESET>
-	<GREEN>+<RESET>	<GREEN>long line 6<RESET>
-	<GREEN>+<RESET>	<GREEN>long line 7<RESET>
-	<GREEN>+<RESET>	<GREEN>long line 8<RESET>
-	<GREEN>+<RESET>	<GREEN>changed long line 9<RESET>
-	 line 1<RESET>
-	 line 2<RESET>
-	 line 3<RESET>
-	 line 4<RESET>
-	 line 5<RESET>
-	<RED>-long line 6<RESET>
-	<RED>-long line 7<RESET>
-	<RED>-long line 8<RESET>
-	<RED>-long line 9<RESET>
-	EOF
-	test_cmp expected actual &&
-
-	git diff HEAD --no-renames --color-moved --color \
-		--color-moved-ws=ignore-all-space >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
-	<BOLD>--- a/lines.txt<RESET>
-	<BOLD>+++ b/lines.txt<RESET>
-	<CYAN>@@ -1,9 +1,9 @@<RESET>
-	<CYAN>+<RESET>	<CYAN>long line 6<RESET>
-	<CYAN>+<RESET>	<CYAN>long line 7<RESET>
-	<CYAN>+<RESET>	<CYAN>long line 8<RESET>
-	<GREEN>+<RESET>	<GREEN>changed long line 9<RESET>
-	 line 1<RESET>
-	 line 2<RESET>
-	 line 3<RESET>
-	 line 4<RESET>
-	 line 5<RESET>
-	<MAGENTA>-long line 6<RESET>
-	<MAGENTA>-long line 7<RESET>
-	<MAGENTA>-long line 8<RESET>
-	<RED>-long line 9<RESET>
-	EOF
-	test_cmp expected actual
-
-ok 115 - move detection ignoring whitespace 
-
-expecting success of 4015.116 'move detection ignoring whitespace changes': 
-	git reset --hard &&
-	# Lines 6-8 have a space change, but 9 is new whitespace
-	q_to_tab <<-\EOF >lines.txt &&
-	longQline 6
-	longQline 7
-	longQline 8
-	long liQne 9
-	line 1
-	line 2
-	line 3
-	line 4
-	line 5
-	EOF
-
-	git diff HEAD --no-renames --color-moved --color >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
-	<BOLD>--- a/lines.txt<RESET>
-	<BOLD>+++ b/lines.txt<RESET>
-	<CYAN>@@ -1,9 +1,9 @@<RESET>
-	<GREEN>+<RESET><GREEN>long	line 6<RESET>
-	<GREEN>+<RESET><GREEN>long	line 7<RESET>
-	<GREEN>+<RESET><GREEN>long	line 8<RESET>
-	<GREEN>+<RESET><GREEN>long li	ne 9<RESET>
-	 line 1<RESET>
-	 line 2<RESET>
-	 line 3<RESET>
-	 line 4<RESET>
-	 line 5<RESET>
-	<RED>-long line 6<RESET>
-	<RED>-long line 7<RESET>
-	<RED>-long line 8<RESET>
-	<RED>-long line 9<RESET>
-	EOF
-	test_cmp expected actual &&
-
-	git diff HEAD --no-renames --color-moved --color \
-		--color-moved-ws=ignore-space-change >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
-	<BOLD>--- a/lines.txt<RESET>
-	<BOLD>+++ b/lines.txt<RESET>
-	<CYAN>@@ -1,9 +1,9 @@<RESET>
-	<CYAN>+<RESET><CYAN>long	line 6<RESET>
-	<CYAN>+<RESET><CYAN>long	line 7<RESET>
-	<CYAN>+<RESET><CYAN>long	line 8<RESET>
-	<GREEN>+<RESET><GREEN>long li	ne 9<RESET>
-	 line 1<RESET>
-	 line 2<RESET>
-	 line 3<RESET>
-	 line 4<RESET>
-	 line 5<RESET>
-	<MAGENTA>-long line 6<RESET>
-	<MAGENTA>-long line 7<RESET>
-	<MAGENTA>-long line 8<RESET>
-	<RED>-long line 9<RESET>
-	EOF
-	test_cmp expected actual
-
-HEAD is now at 20118d6 add poetry
-ok 116 - move detection ignoring whitespace changes
+ok 10 - without -space (attribute)
 
-expecting success of 4015.117 'move detection ignoring whitespace at eol': 
-	git reset --hard &&
-	# Lines 6-9 have new eol whitespace, but 9 also has it in the middle
-	q_to_tab <<-\EOF >lines.txt &&
-	long line 6Q
-	long line 7Q
-	long line 8Q
-	longQline 9Q
-	line 1
-	line 2
-	line 3
-	line 4
-	line 5
-	EOF
+expecting success of 4019.11 'with indent-non-tab only': 
 
-	# avoid cluttering the output with complaints about our eol whitespace
-	test_config core.whitespace -blank-at-eol &&
+	rm -f .gitattributes &&
+	git config core.whitespace indent,-trailing,-space &&
+	prepare_output &&
 
-	git diff HEAD --no-renames --color-moved --color >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
-	<BOLD>--- a/lines.txt<RESET>
-	<BOLD>+++ b/lines.txt<RESET>
-	<CYAN>@@ -1,9 +1,9 @@<RESET>
-	<GREEN>+<RESET><GREEN>long line 6	<RESET>
-	<GREEN>+<RESET><GREEN>long line 7	<RESET>
-	<GREEN>+<RESET><GREEN>long line 8	<RESET>
-	<GREEN>+<RESET><GREEN>long	line 9	<RESET>
-	 line 1<RESET>
-	 line 2<RESET>
-	 line 3<RESET>
-	 line 4<RESET>
-	 line 5<RESET>
-	<RED>-long line 6<RESET>
-	<RED>-long line 7<RESET>
-	<RED>-long line 8<RESET>
-	<RED>-long line 9<RESET>
-	EOF
-	test_cmp expected actual &&
+	grep Eight error >/dev/null &&
+	grep HT normal >/dev/null &&
+	grep With normal >/dev/null &&
+	grep Return normal >/dev/null &&
+	grep No normal >/dev/null
 
-	git diff HEAD --no-renames --color-moved --color \
-		--color-moved-ws=ignore-space-at-eol >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
-	<BOLD>--- a/lines.txt<RESET>
-	<BOLD>+++ b/lines.txt<RESET>
-	<CYAN>@@ -1,9 +1,9 @@<RESET>
-	<CYAN>+<RESET><CYAN>long line 6	<RESET>
-	<CYAN>+<RESET><CYAN>long line 7	<RESET>
-	<CYAN>+<RESET><CYAN>long line 8	<RESET>
-	<GREEN>+<RESET><GREEN>long	line 9	<RESET>
-	 line 1<RESET>
-	 line 2<RESET>
-	 line 3<RESET>
-	 line 4<RESET>
-	 line 5<RESET>
-	<MAGENTA>-long line 6<RESET>
-	<MAGENTA>-long line 7<RESET>
-	<MAGENTA>-long line 8<RESET>
-	<RED>-long line 9<RESET>
-	EOF
-	test_cmp expected actual
 
-HEAD is now at 20118d6 add poetry
-ok 117 - move detection ignoring whitespace at eol
+ok 11 - with indent-non-tab only
 
-expecting success of 4015.118 'clean up whitespace-test colors': 
-	git config --unset color.diff.oldMoved &&
-	git config --unset color.diff.newMoved
+expecting success of 4019.12 'with indent-non-tab only (attribute)': 
 
-ok 118 - clean up whitespace-test colors
+	test_might_fail git config --unset core.whitespace &&
+	echo "F whitespace=indent,-trailing,-space" >.gitattributes &&
+	prepare_output &&
 
-expecting success of 4015.119 '--color-moved block at end of diff output respects MIN_ALNUM_COUNT': 
-	git reset --hard &&
-	>bar &&
-	cat <<-\EOF >foo &&
-	irrelevant_line
-	line1
-	EOF
-	git add foo bar &&
-	git commit -m x &&
+	grep Eight error >/dev/null &&
+	grep HT normal >/dev/null &&
+	grep With normal >/dev/null &&
+	grep Return normal >/dev/null &&
+	grep No normal >/dev/null
 
-	cat <<-\EOF >bar &&
-	line1
-	EOF
-	cat <<-\EOF >foo &&
-	irrelevant_line
-	EOF
 
-	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat >expected <<-\EOF &&
-	<BOLD>diff --git a/bar b/bar<RESET>
-	<BOLD>--- a/bar<RESET>
-	<BOLD>+++ b/bar<RESET>
-	<CYAN>@@ -0,0 +1 @@<RESET>
-	<GREEN>+<RESET><GREEN>line1<RESET>
-	<BOLD>diff --git a/foo b/foo<RESET>
-	<BOLD>--- a/foo<RESET>
-	<BOLD>+++ b/foo<RESET>
-	<CYAN>@@ -1,2 +1 @@<RESET>
-	 irrelevant_line<RESET>
-	<RED>-line1<RESET>
-	EOF
+ok 12 - with indent-non-tab only (attribute)
 
-	test_cmp expected actual
+expecting success of 4019.13 'with indent-non-tab only, tabwidth=10': 
 
-HEAD is now at 20118d6 add poetry
-[detached HEAD 3843ae4] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 bar
- create mode 100644 foo
-ok 119 - --color-moved block at end of diff output respects MIN_ALNUM_COUNT
+	rm -f .gitattributes &&
+	git config core.whitespace indent,tabwidth=10,-trailing,-space &&
+	prepare_output &&
 
-expecting success of 4015.120 '--color-moved respects MIN_ALNUM_COUNT': 
-	git reset --hard &&
-	cat <<-\EOF >foo &&
-	nineteen chars 456789
-	irrelevant_line
-	twenty chars 234567890
-	EOF
-	>bar &&
-	git add foo bar &&
-	git commit -m x &&
+	grep Eight normal >/dev/null &&
+	grep HT normal >/dev/null &&
+	grep With normal >/dev/null &&
+	grep Return normal >/dev/null &&
+	grep No normal >/dev/null
 
-	cat <<-\EOF >foo &&
-	irrelevant_line
-	EOF
-	cat <<-\EOF >bar &&
-	twenty chars 234567890
-	nineteen chars 456789
-	EOF
 
-	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat >expected <<-\EOF &&
-	<BOLD>diff --git a/bar b/bar<RESET>
-	<BOLD>--- a/bar<RESET>
-	<BOLD>+++ b/bar<RESET>
-	<CYAN>@@ -0,0 +1,2 @@<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>twenty chars 234567890<RESET>
-	<GREEN>+<RESET><GREEN>nineteen chars 456789<RESET>
-	<BOLD>diff --git a/foo b/foo<RESET>
-	<BOLD>--- a/foo<RESET>
-	<BOLD>+++ b/foo<RESET>
-	<CYAN>@@ -1,3 +1 @@<RESET>
-	<RED>-nineteen chars 456789<RESET>
-	 irrelevant_line<RESET>
-	<BOLD;MAGENTA>-twenty chars 234567890<RESET>
-	EOF
+ok 13 - with indent-non-tab only, tabwidth=10
 
-	test_cmp expected actual
+expecting success of 4019.14 'with indent-non-tab only, tabwidth=10 (attribute)': 
 
-HEAD is now at 3843ae4 x
-[detached HEAD 2380d1c] x
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 1 deletion(-)
-ok 120 - --color-moved respects MIN_ALNUM_COUNT
+	test_might_fail git config --unset core.whitespace &&
+	echo "F whitespace=indent,-trailing,-space,tabwidth=10" >.gitattributes &&
+	prepare_output &&
 
-expecting success of 4015.121 '--color-moved treats adjacent blocks as separate for MIN_ALNUM_COUNT': 
-	git reset --hard &&
-	cat <<-\EOF >foo &&
-	7charsA
-	irrelevant_line
-	7charsB
-	7charsC
-	EOF
-	>bar &&
-	git add foo bar &&
-	git commit -m x &&
+	grep Eight normal >/dev/null &&
+	grep HT normal >/dev/null &&
+	grep With normal >/dev/null &&
+	grep Return normal >/dev/null &&
+	grep No normal >/dev/null
 
-	cat <<-\EOF >foo &&
-	irrelevant_line
-	EOF
-	cat <<-\EOF >bar &&
-	7charsB
-	7charsC
-	7charsA
-	EOF
 
-	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat >expected <<-\EOF &&
-	<BOLD>diff --git a/bar b/bar<RESET>
-	<BOLD>--- a/bar<RESET>
-	<BOLD>+++ b/bar<RESET>
-	<CYAN>@@ -0,0 +1,3 @@<RESET>
-	<GREEN>+<RESET><GREEN>7charsB<RESET>
-	<GREEN>+<RESET><GREEN>7charsC<RESET>
-	<GREEN>+<RESET><GREEN>7charsA<RESET>
-	<BOLD>diff --git a/foo b/foo<RESET>
-	<BOLD>--- a/foo<RESET>
-	<BOLD>+++ b/foo<RESET>
-	<CYAN>@@ -1,4 +1 @@<RESET>
-	<RED>-7charsA<RESET>
-	 irrelevant_line<RESET>
-	<RED>-7charsB<RESET>
-	<RED>-7charsC<RESET>
-	EOF
+ok 14 - with indent-non-tab only, tabwidth=10 (attribute)
 
-	test_cmp expected actual
+expecting success of 4019.15 'with cr-at-eol': 
 
-HEAD is now at 2380d1c x
-[detached HEAD df13bcb] x
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 2 deletions(-)
-ok 121 - --color-moved treats adjacent blocks as separate for MIN_ALNUM_COUNT
+	rm -f .gitattributes &&
+	git config core.whitespace cr-at-eol &&
+	prepare_output &&
 
-expecting success of 4015.122 '--color-moved rewinds for MIN_ALNUM_COUNT': 
-	git reset --hard &&
-	test_write_lines >file \
-		A B C one two three four five six seven D E F G H I J &&
-	git add file &&
-	test_write_lines >file \
-		one two A B C D E F G H I J two three four five six seven &&
-	git diff --color-moved=zebra -- file &&
+	grep Eight normal >/dev/null &&
+	grep HT error >/dev/null &&
+	grep With error >/dev/null &&
+	grep Return normal >/dev/null &&
+	grep No normal >/dev/null
 
-	git diff --color-moved=zebra --color -- file >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	cat >expected <<-\EOF &&
-	<BOLD>diff --git a/file b/file<RESET>
-	<BOLD>--- a/file<RESET>
-	<BOLD>+++ b/file<RESET>
-	<CYAN>@@ -1,13 +1,8 @@<RESET>
-	<GREEN>+<RESET><GREEN>one<RESET>
-	<GREEN>+<RESET><GREEN>two<RESET>
-	 A<RESET>
-	 B<RESET>
-	 C<RESET>
-	<RED>-one<RESET>
-	<BOLD;MAGENTA>-two<RESET>
-	<BOLD;MAGENTA>-three<RESET>
-	<BOLD;MAGENTA>-four<RESET>
-	<BOLD;MAGENTA>-five<RESET>
-	<BOLD;MAGENTA>-six<RESET>
-	<BOLD;MAGENTA>-seven<RESET>
-	 D<RESET>
-	 E<RESET>
-	 F<RESET>
-	<CYAN>@@ -15,3 +10,9 @@<RESET> <RESET>G<RESET>
-	 H<RESET>
-	 I<RESET>
-	 J<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>two<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>three<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>four<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>five<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>six<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>seven<RESET>
-	EOF
 
-	test_cmp expected actual
+ok 15 - with cr-at-eol
 
-HEAD is now at df13bcb x
-diff --git a/file b/file
-index 9c6a1c7..fa3558c 100644
---- a/file
-+++ b/file
-@@ -1,13 +1,8 @@
-+one
-+two
- A
- B
- C
--one
--two
--three
--four
--five
--six
--seven
- D
- E
- F
-@@ -15,3 +10,9 @@ G
- H
- I
- J
-+two
-+three
-+four
-+five
-+six
-+seven
-ok 122 - --color-moved rewinds for MIN_ALNUM_COUNT
+expecting success of 4019.16 'with cr-at-eol (attribute)': 
 
-expecting success of 4015.123 'move detection with submodules': 
-	test_create_repo bananas &&
-	echo ripe >bananas/recipe &&
-	git -C bananas add recipe &&
-	test_commit fruit &&
-	test_commit -C bananas recipe &&
-	git submodule add ./bananas &&
-	git add bananas &&
-	git commit -a -m "bananas are like a heavy library?" &&
-	echo foul >bananas/recipe &&
-	echo ripe >fruit.t &&
+	test_might_fail git config --unset core.whitespace &&
+	echo "F whitespace=trailing,cr-at-eol" >.gitattributes &&
+	prepare_output &&
 
-	git diff --submodule=diff --color-moved --color >actual &&
+	grep Eight normal >/dev/null &&
+	grep HT error >/dev/null &&
+	grep With error >/dev/null &&
+	grep Return normal >/dev/null &&
+	grep No normal >/dev/null
 
-	# no move detection as the moved line is across repository boundaries.
-	test_decode_color <actual >decoded_actual &&
-	! grep BGREEN decoded_actual &&
-	! grep BRED decoded_actual &&
 
-	# nor did we mess with it another way
-	git diff --submodule=diff --color >expect.raw &&
-	test_decode_color <expect.raw >expect &&
-	test_cmp expect decoded_actual &&
-	rm -rf bananas &&
-	git submodule deinit bananas
+ok 16 - with cr-at-eol (attribute)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4015-diff-whitespace/bananas/.git/
-[detached HEAD a5c8711] fruit
- Author: A U Thor <author@example.com>
- 2 files changed, 18 insertions(+)
- create mode 100644 file
- create mode 100644 fruit.t
-[master (root-commit) 9469881] recipe
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 recipe
- create mode 100644 recipe.t
-Adding existing repo at 'bananas' to the index
-[detached HEAD 82f96c4] bananas are like a heavy library?
- Author: A U Thor <author@example.com>
- 3 files changed, 12 insertions(+), 7 deletions(-)
- create mode 100644 .gitmodules
- create mode 160000 bananas
-Submodule 'bananas' (./bananas) unregistered for path 'bananas'
-ok 123 - move detection with submodules
+expecting success of 4019.17 'trailing empty lines (1)': 
 
-expecting success of 4015.124 'only move detection ignores white spaces': 
-	git reset --hard &&
-	q_to_tab <<-\EOF >text.txt &&
-		a long line to exceed per-line minimum
-		another long line to exceed per-line minimum
-		original file
-	EOF
-	git add text.txt &&
-	git commit -m "add text" &&
-	q_to_tab <<-\EOF >text.txt &&
-		Qa long line to exceed per-line minimum
-		Qanother long line to exceed per-line minimum
-		new file
-	EOF
+	rm -f .gitattributes &&
+	test_must_fail git diff --check >output &&
+	grep "new blank line at" output &&
+	grep "trailing whitespace" output
 
-	# Make sure we get a different diff using -w
-	git diff --color --color-moved -w >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	q_to_tab <<-\EOF >expected &&
-	<BOLD>diff --git a/text.txt b/text.txt<RESET>
-	<BOLD>--- a/text.txt<RESET>
-	<BOLD>+++ b/text.txt<RESET>
-	<CYAN>@@ -1,3 +1,3 @@<RESET>
-	 Qa long line to exceed per-line minimum<RESET>
-	 Qanother long line to exceed per-line minimum<RESET>
-	<RED>-original file<RESET>
-	<GREEN>+<RESET><GREEN>new file<RESET>
-	EOF
-	test_cmp expected actual &&
 
-	# And now ignoring white space only in the move detection
-	git diff --color --color-moved \
-		--color-moved-ws=ignore-all-space,ignore-space-change,ignore-space-at-eol >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
-	q_to_tab <<-\EOF >expected &&
-	<BOLD>diff --git a/text.txt b/text.txt<RESET>
-	<BOLD>--- a/text.txt<RESET>
-	<BOLD>+++ b/text.txt<RESET>
-	<CYAN>@@ -1,3 +1,3 @@<RESET>
-	<BOLD;MAGENTA>-a long line to exceed per-line minimum<RESET>
-	<BOLD;MAGENTA>-another long line to exceed per-line minimum<RESET>
-	<RED>-original file<RESET>
-	<BOLD;CYAN>+<RESET>Q<BOLD;CYAN>a long line to exceed per-line minimum<RESET>
-	<BOLD;CYAN>+<RESET>Q<BOLD;CYAN>another long line to exceed per-line minimum<RESET>
-	<GREEN>+<RESET><GREEN>new file<RESET>
-	EOF
-	test_cmp expected actual
+F:6: new blank line at EOF.
+F:3: trailing whitespace.
+F:4: trailing whitespace.
+ok 17 - trailing empty lines (1)
 
-HEAD is now at 82f96c4 bananas are like a heavy library?
-[detached HEAD 3bfc51e] add text
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 1 deletion(-)
-ok 124 - only move detection ignores white spaces
+expecting success of 4019.18 'trailing empty lines (2)': 
 
-expecting success of 4015.125 'compare whitespace delta across moved blocks': 
+	echo "F -whitespace" >.gitattributes &&
+	git diff --check >output &&
+	test_must_be_empty output
 
-	git reset --hard &&
-	q_to_tab <<-\EOF >text.txt &&
-	QIndented
-	QText across
-	Qsome lines
-	QBut! <- this stands out
-	QAdjusting with
-	QQdifferent starting
-	Qwhite spaces
-	QAnother outlier
-	QQQIndented
-	QQQText across
-	QQQfive lines
-	QQQthat has similar lines
-	QQQto previous blocks, but with different indent
-	QQQYetQAnotherQoutlierQ
-	QLine with internal w h i t e s p a c e change
-	EOF
 
-	git add text.txt &&
-	git commit -m "add text.txt" &&
+ok 18 - trailing empty lines (2)
 
-	q_to_tab <<-\EOF >text.txt &&
-	QQIndented
-	QQText across
-	QQsome lines
-	QQQBut! <- this stands out
-	Adjusting with
-	Qdifferent starting
-	white spaces
-	AnotherQoutlier
-	QQIndented
-	QQText across
-	QQfive lines
-	QQthat has similar lines
-	QQto previous blocks, but with different indent
-	QQYetQAnotherQoutlier
-	QLine with internal whitespace change
-	EOF
+expecting success of 4019.19 'checkdiff shows correct line number for trailing blank lines': 
 
-	git diff --color --color-moved --color-moved-ws=allow-indentation-change >actual.raw &&
-	grep -v "index" actual.raw | test_decode_color >actual &&
+	printf "a\nb\n" > G &&
+	git add G &&
+	printf "x\nx\nx\na\nb\nc\n\n" > G &&
+	[ "$(git diff --check -- G)" = "G:7: new blank line at EOF." ]
 
-	q_to_tab <<-\EOF >expected &&
-		<BOLD>diff --git a/text.txt b/text.txt<RESET>
-		<BOLD>--- a/text.txt<RESET>
-		<BOLD>+++ b/text.txt<RESET>
-		<CYAN>@@ -1,15 +1,15 @@<RESET>
-		<BOLD;MAGENTA>-QIndented<RESET>
-		<BOLD;MAGENTA>-QText across<RESET>
-		<BOLD;MAGENTA>-Qsome lines<RESET>
-		<RED>-QBut! <- this stands out<RESET>
-		<BOLD;MAGENTA>-QAdjusting with<RESET>
-		<BOLD;MAGENTA>-QQdifferent starting<RESET>
-		<BOLD;MAGENTA>-Qwhite spaces<RESET>
-		<RED>-QAnother outlier<RESET>
-		<BOLD;MAGENTA>-QQQIndented<RESET>
-		<BOLD;MAGENTA>-QQQText across<RESET>
-		<BOLD;MAGENTA>-QQQfive lines<RESET>
-		<BOLD;MAGENTA>-QQQthat has similar lines<RESET>
-		<BOLD;MAGENTA>-QQQto previous blocks, but with different indent<RESET>
-		<RED>-QQQYetQAnotherQoutlierQ<RESET>
-		<RED>-QLine with internal w h i t e s p a c e change<RESET>
-		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Indented<RESET>
-		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Text across<RESET>
-		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>some lines<RESET>
-		<GREEN>+<RESET>QQQ<GREEN>But! <- this stands out<RESET>
-		<BOLD;CYAN>+<RESET><BOLD;CYAN>Adjusting with<RESET>
-		<BOLD;CYAN>+<RESET>Q<BOLD;CYAN>different starting<RESET>
-		<BOLD;CYAN>+<RESET><BOLD;CYAN>white spaces<RESET>
-		<GREEN>+<RESET><GREEN>AnotherQoutlier<RESET>
-		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Indented<RESET>
-		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Text across<RESET>
-		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>five lines<RESET>
-		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>that has similar lines<RESET>
-		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>to previous blocks, but with different indent<RESET>
-		<GREEN>+<RESET>QQ<GREEN>YetQAnotherQoutlier<RESET>
-		<GREEN>+<RESET>Q<GREEN>Line with internal whitespace change<RESET>
-	EOF
 
-	test_cmp expected actual
+ok 19 - checkdiff shows correct line number for trailing blank lines
 
-HEAD is now at 3bfc51e add text
-[detached HEAD 7dd9671] add text.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 15 insertions(+), 3 deletions(-)
-ok 125 - compare whitespace delta across moved blocks
+expecting success of 4019.20 'do not color trailing cr in context': 
+	test_might_fail git config --unset core.whitespace &&
+	rm -f .gitattributes &&
+	echo AAAQ | tr Q "\015" >G &&
+	git add G &&
+	echo BBBQ | tr Q "\015" >>G &&
+	git diff --color G | tr "\015" Q >output &&
+	grep "BBB.*${blue_grep}Q" output &&
+	grep "AAA.*\[mQ" output
 
-expecting success of 4015.126 'bogus settings in move detection erroring out': 
-	test_must_fail git diff --color-moved=bogus 2>err &&
-	test_grep "must be one of" err &&
-	test_grep bogus err &&
 
-	test_must_fail git -c diff.colormoved=bogus diff 2>err &&
-	test_grep "must be one of" err &&
-	test_grep "from command-line config" err &&
++BBBQ
+ AAAQ
+ok 20 - do not color trailing cr in context
 
-	test_must_fail git diff --color-moved-ws=bogus 2>err &&
-	test_grep "possible values" err &&
-	test_grep bogus err &&
+expecting success of 4019.21 'color new trailing blank lines': 
+	test_write_lines a b "" "" >x &&
+	git add x &&
+	test_write_lines a "" "" "" c "" "" "" "" >x &&
+	git diff --color x >output &&
+	cnt=$($grep_a "${blue_grep}" output | wc -l) &&
+	test $cnt = 2
 
-	test_must_fail git -c diff.colormovedws=bogus diff 2>err &&
-	test_grep "possible values" err &&
-	test_grep "from command-line config" err
+ok 21 - color new trailing blank lines
 
-error: color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'
-error: bad --color-moved argument: bogus
-error: color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'
-fatal: unable to parse 'diff.colormoved' from command-line config
-error: unknown color-moved-ws mode 'bogus', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'
-error: unknown color-moved-ws mode 'bogus', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'
-error: invalid mode 'bogus' in --color-moved-ws
-error: unknown color-moved-ws mode 'bogus', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'
-fatal: unable to parse 'diff.colormovedws' from command-line config
-ok 126 - bogus settings in move detection erroring out
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4020-diff-external.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4020-diff-external/.git/
+expecting success of 4020.1 'setup': 
 
-expecting success of 4015.127 'compare whitespace delta incompatible with other space options': 
-	test_must_fail git diff \
-		--color-moved-ws=allow-indentation-change,ignore-all-space \
-		2>err &&
-	test_grep allow-indentation-change err
+	test_tick &&
+	echo initial >file &&
+	git add file &&
+	git commit -m initial &&
 
-error: color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes
-error: invalid mode 'allow-indentation-change,ignore-all-space' in --color-moved-ws
-ok 127 - compare whitespace delta incompatible with other space options
+	test_tick &&
+	echo second >file &&
+	before=$(git hash-object file) &&
+	before=$(git rev-parse --short $before) &&
+	git add file &&
+	git commit -m second &&
 
-expecting success of 4015.128 'compare mixed whitespace delta across moved blocks': 
+	test_tick &&
+	echo third >file
 
-	git reset --hard &&
-	tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
-	^__
-	|____too short without
-	^
-	___being grouped across blank line
-	${EMPTY}
-	context
-	lines
-	to
-	anchor
-	____Indented text to
-	_Q____be further indented by four spaces across
-	____Qseveral lines
-	QQ____These two lines have had their
-	____indentation reduced by four spaces
-	Qdifferent indentation change
-	____too short
+[master (root-commit) b6d2089] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master f3562cd] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 4020.2 'GIT_EXTERNAL_DIFF environment': 
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
 	EOF
+	GIT_EXTERNAL_DIFF=echo git diff >out &&
+	cut -d" " -f1,3- <out >actual &&
+	test_cmp expect actual
 
-	git add text.txt &&
-	git commit -m "add text.txt" &&
 
-	tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
-	context
-	lines
-	to
-	anchor
-	QIndented text to
-	QQbe further indented by four spaces across
-	Q____several lines
-	${EMPTY}
-	QQtoo short without
-	${EMPTY}
-	^Q_______being grouped across blank line
-	${EMPTY}
-	Q_QThese two lines have had their
-	indentation reduced by four spaces
-	QQdifferent indentation change
-	__Qtoo short
-	EOF
+ok 2 - GIT_EXTERNAL_DIFF environment
 
-	git -c color.diff.whitespace="normal red" \
-		-c core.whitespace=space-before-tab \
-		diff --color --color-moved --ws-error-highlight=all \
-		--color-moved-ws=allow-indentation-change >actual.raw &&
-	grep -v "index" actual.raw | tr "\f\v" "^|" | test_decode_color >actual &&
+expecting success of 4020.3 'GIT_EXTERNAL_DIFF environment should apply only to diff': 
+	GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD >out &&
+	grep "^diff --git a/file b/file" out
 
-	cat <<-\EOF >expected &&
-	<BOLD>diff --git a/text.txt b/text.txt<RESET>
-	<BOLD>--- a/text.txt<RESET>
-	<BOLD>+++ b/text.txt<RESET>
-	<CYAN>@@ -1,16 +1,16 @@<RESET>
-	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET><BRED>  <RESET>
-	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>|    too short without<RESET>
-	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET>
-	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>   being grouped across blank line<RESET>
-	<BOLD;MAGENTA>-<RESET>
-	 <RESET>context<RESET>
-	 <RESET>lines<RESET>
-	 <RESET>to<RESET>
-	 <RESET>anchor<RESET>
-	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>    Indented text to<RESET>
-	<BOLD;MAGENTA>-<RESET><BRED> <RESET>	<BOLD;MAGENTA>    be further indented by four spaces across<RESET>
-	<BOLD;MAGENTA>-<RESET><BRED>    <RESET>	<BOLD;MAGENTA>several lines<RESET>
-	<BOLD;BLUE>-<RESET>		<BOLD;BLUE>    These two lines have had their<RESET>
-	<BOLD;BLUE>-<RESET><BOLD;BLUE>    indentation reduced by four spaces<RESET>
-	<BOLD;MAGENTA>-<RESET>	<BOLD;MAGENTA>different indentation change<RESET>
-	<RED>-<RESET><RED>    too short<RESET>
-	<BOLD;CYAN>+<RESET>	<BOLD;CYAN>Indented text to<RESET>
-	<BOLD;CYAN>+<RESET>		<BOLD;CYAN>be further indented by four spaces across<RESET>
-	<BOLD;CYAN>+<RESET>	<BOLD;CYAN>    several lines<RESET>
-	<BOLD;YELLOW>+<RESET>
-	<BOLD;YELLOW>+<RESET>		<BOLD;YELLOW>too short without<RESET>
-	<BOLD;YELLOW>+<RESET>
-	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>^	       being grouped across blank line<RESET>
-	<BOLD;YELLOW>+<RESET>
-	<BOLD;CYAN>+<RESET>	<BRED> <RESET>	<BOLD;CYAN>These two lines have had their<RESET>
-	<BOLD;CYAN>+<RESET><BOLD;CYAN>indentation reduced by four spaces<RESET>
-	<BOLD;YELLOW>+<RESET>		<BOLD;YELLOW>different indentation change<RESET>
-	<GREEN>+<RESET><BRED>  <RESET>	<GREEN>too short<RESET>
-	EOF
 
-	test_cmp expected actual
+diff --git a/file b/file
+ok 3 - GIT_EXTERNAL_DIFF environment should apply only to diff
 
-HEAD is now at 7dd9671 add text.txt
-[detached HEAD 9fe2176] add text.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 16 insertions(+), 15 deletions(-)
-ok 128 - compare mixed whitespace delta across moved blocks
+expecting success of 4020.4 'GIT_EXTERNAL_DIFF environment and --no-ext-diff': 
+	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >out &&
+	grep "^diff --git a/file b/file" out
 
-expecting success of 4015.129 'combine --ignore-blank-lines with --function-context': 
-	test_write_lines 1 "" 2 3 4 5 >a &&
-	test_write_lines 1    2 3 4   >b &&
-	test_must_fail git diff --no-index \
-		--ignore-blank-lines --function-context a b >actual.raw &&
-	sed -n "/@@/,\$p" <actual.raw >actual &&
-	cat <<-\EOF >expect &&
-	@@ -1,6 +1,4 @@
-	 1
-	-
-	 2
-	 3
-	 4
-	-5
+
+diff --git a/file b/file
+ok 4 - GIT_EXTERNAL_DIFF environment and --no-ext-diff
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 4020.5 'typechange diff': 
+	rm -f file &&
+	ln -s elif file &&
+
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 120000
 	EOF
+	GIT_EXTERNAL_DIFF=echo git diff >out &&
+	cut -d" " -f1,3-4,6- <out >actual &&
+	test_cmp expect actual &&
+
+	GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
+	git diff >expect &&
 	test_cmp expect actual
 
-ok 129 - combine --ignore-blank-lines with --function-context
+ok 5 - typechange diff
 
-expecting success of 4015.130 'combine --ignore-blank-lines with --function-context 2': 
-	test_write_lines    a b c "" function 1 2 3 4 5 "" 6 7 8 9 >a &&
-	test_write_lines "" a b c "" function 1 2 3 4 5    6 7 8   >b &&
-	test_must_fail git diff --no-index \
-		--ignore-blank-lines --function-context a b >actual.raw &&
-	sed -n "/@@/,\$p" <actual.raw >actual &&
-	cat <<-\EOF >expect &&
-	@@ -5,11 +6,9 @@ c
-	 function
-	 1
-	 2
-	 3
-	 4
-	 5
-	-
-	 6
-	 7
-	 8
-	-9
+expecting success of 4020.6 'diff.external': 
+	git reset --hard &&
+	echo third >file &&
+	test_config diff.external echo &&
+
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
 	EOF
+	git diff >out &&
+	cut -d" " -f1,3-4,6- <out >actual &&
 	test_cmp expect actual
 
-ok 130 - combine --ignore-blank-lines with --function-context 2
-
-# passed all 130 test(s)
-1..130
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4024-diff-optimize-common.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4024-diff-optimize-common/.git/
-expecting success of 4024.1 'setup': 
+HEAD is now at f3562cd second
+ok 6 - diff.external
 
-	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 &&
+expecting success of 4020.7 'diff.external should apply only to diff': 
+	test_config diff.external echo &&
+	git log -p -1 HEAD >out &&
+	grep "^diff --git a/file b/file" out
 
-		git add file-a$n file-b$n file-c$n file-d$n &&
+diff --git a/file b/file
+ok 7 - diff.external should apply only to diff
 
-		( 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 &&
+expecting success of 4020.8 'diff.external and --no-ext-diff': 
+	test_config diff.external echo &&
+	git diff --no-ext-diff >out &&
+	grep "^diff --git a/file b/file" out
 
-		expect_pattern $n || return 1
+diff --git a/file b/file
+ok 8 - diff.external and --no-ext-diff
 
-	done >expect
+expecting success of 4020.9 'diff attribute': 
+	git reset --hard &&
+	echo third >file &&
 
-ok 1 - setup
+	git config diff.parrot.command echo &&
 
-expecting success of 4024.2 'diff -U0': 
+	echo >.gitattributes "file diff=parrot" &&
 
-	for n in $sample
-	do
-		git diff -U0 file-?$n || return 1
-	done | zc >actual &&
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
+	EOF
+	git diff >out &&
+	cut -d" " -f1,3-4,6- <out >actual &&
 	test_cmp expect actual
 
+HEAD is now at f3562cd second
+ok 9 - diff attribute
 
-ok 2 - diff -U0
+expecting success of 4020.10 'diff attribute should apply only to diff': 
+	git log -p -1 HEAD >out &&
+	grep "^diff --git a/file b/file" out
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4013-diff-various.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4013-diff-various/.git/
-expecting success of 4013.1 'setup': 
 
-	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
-	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
-	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+diff --git a/file b/file
+ok 10 - diff attribute should apply only to diff
 
-	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 4020.11 'diff attribute and --no-ext-diff': 
+	git diff --no-ext-diff >out &&
+	grep "^diff --git a/file b/file" out
 
-	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 &&
+diff --git a/file b/file
+ok 11 - diff attribute and --no-ext-diff
 
-	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 4020.12 'diff attribute': 
 
-	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 &&
+	git config --unset diff.parrot.command &&
+	git config diff.color.command echo &&
 
-	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 &&
+	echo >.gitattributes "file diff=color" &&
 
-	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 &&
+	cat >expect <<-EOF &&
+	file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
+	EOF
+	git diff >out &&
+	cut -d" " -f1,3-4,6- <out >actual &&
+	test_cmp expect actual
 
-	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 &&
+ok 12 - diff attribute
 
-	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 4020.13 'diff attribute should apply only to diff': 
+	git log -p -1 HEAD >out &&
+	grep "^diff --git a/file b/file" out
 
-	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 &&
+diff --git a/file b/file
+ok 13 - diff attribute should apply only to diff
 
-	test_write_lines A B C >>file0 &&
-	test_write_lines 1 2 >>dir/sub &&
-	git update-index file0 dir/sub &&
+expecting success of 4020.14 'diff attribute and --no-ext-diff': 
+	git diff --no-ext-diff >out &&
+	grep "^diff --git a/file b/file" out
 
-	mkdir dir3 &&
-	cp dir/sub dir3/sub &&
-	test-tool chmtime +1 dir3/sub &&
 
-	git config log.showroot false &&
-	git commit --amend &&
+diff --git a/file b/file
+ok 14 - diff attribute and --no-ext-diff
 
-	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 4020.15 'GIT_EXTERNAL_DIFF trumps diff.external': 
+	>.gitattributes &&
+	test_config diff.external "echo ext-global" &&
 
-	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 &&
+	cat >expect <<-EOF &&
+	ext-env file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
+	EOF
+	GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
+	cut -d" " -f1-2,4- <out >actual &&
+	test_cmp expect actual
 
-	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 &&
+ok 15 - GIT_EXTERNAL_DIFF trumps diff.external
 
-	# 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 4020.16 'attributes trump GIT_EXTERNAL_DIFF and diff.external': 
+	test_config diff.foo.command "echo ext-attribute" &&
+	test_config diff.external "echo ext-global" &&
+	echo "file diff=foo" >.gitattributes &&
 
-	git config diff.renames false &&
+	cat >expect <<-EOF &&
+	ext-attribute file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
+	EOF
+	GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
+	cut -d" " -f1-2,4- <out >actual &&
+	test_cmp expect actual
 
-	git show-branch
+ok 16 - attributes trump GIT_EXTERNAL_DIFF and diff.external
 
-[master (root-commit) 444ac55] Initial
+expecting success of 4020.17 'no diff with -diff': 
+	echo >.gitattributes "file -diff" &&
+	git diff >out &&
+	grep Binary out
+
+Binary files a/file and b/file differ
+ok 17 - no diff with -diff
+
+expecting success of 4020.18 'force diff with "diff"': 
+	after=$(git hash-object file) &&
+	after=$(git rev-parse --short $after) &&
+	echo >.gitattributes "file diff" &&
+	git diff >actual &&
+	sed -e "s/^index .*/index $before..$after 100644/" \
+		"$TEST_DIRECTORY"/t4020/diff.NUL >expected-diff &&
+	test_cmp expected-diff actual
+
+ok 18 - force diff with "diff"
+
+expecting success of 4020.19 'GIT_EXTERNAL_DIFF with more than one changed files': 
+	echo anotherfile > file2 &&
+	git add file2 &&
+	git commit -m "added 2nd file" &&
+	echo modified >file2 &&
+	GIT_EXTERNAL_DIFF=echo git diff
+
+[master 314ec38] added 2nd file
  Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 dir/sub
- create mode 100644 file0
+ 1 file changed, 1 insertion(+)
  create mode 100644 file2
-[master 1bde4ae] Second
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+), 3 deletions(-)
- delete mode 100644 file2
-[master 9a6d494] Third
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 file1
-Switched to branch 'side'
-[side c7a2ab9] Side
- Author: A U Thor <author@example.com>
- 3 files changed, 9 insertions(+)
- create mode 100644 file3
-Switched to branch 'master'
-From .
- * branch            side       -> FETCH_HEAD
-Merge made by the 'ours' strategy.
-[master 59d314a] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Mon Jun 26 00:04:00 2006 +0000
-Switched to a new branch 'rearrange'
-[rearrange cd4e72f] Rearranged lines in dir/sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-Switched to a new branch 'mode'
-[mode b7e0bc6] update mode
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 file0
-Switched to branch 'master'
-Switched to a new branch 'note'
-[note a6f3643] update mode (file2)
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 file2
-Switched to branch 'master'
-! [initial] Initial
- * [master] Merge branch 'side'
-  ! [mode] update mode
-   ! [note] update mode (file2)
-    ! [rearrange] Rearranged lines in dir/sub
-     ! [side] Side
-------
-    +  [rearrange] Rearranged lines in dir/sub
-   +   [note] update mode (file2)
-  +    [mode] update mode
- -     [master] Merge branch 'side'
- *   + [side] Side
- *     [master^] Third
- *     [master~2] Second
-+*++++ [initial] Initial
-ok 1 - setup
+file /tmp/git-blob-l7W98P/file e019be006cf33489e2d0177a3837a2384eddebc5 100644 file 0000000000000000000000000000000000000000 100644
+file2 /tmp/git-blob-MnA5fz/file2 abc9fa522731419e7eaa3d472e3cb3d99e475c49 100644 file2 0000000000000000000000000000000000000000 100644
+ok 19 - GIT_EXTERNAL_DIFF with more than one changed files
 
-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 4020.20 'GIT_EXTERNAL_DIFF path counter/total': 
+	write_script external-diff.sh <<-\EOF &&
+	echo $GIT_DIFF_PATH_COUNTER of $GIT_DIFF_PATH_TOTAL >>counter.txt
+	EOF
+	>counter.txt &&
+	cat >expect <<-\EOF &&
+	1 of 2
+	2 of 2
+	EOF
+	GIT_EXTERNAL_DIFF=./external-diff.sh git diff &&
+	test_cmp expect counter.txt
 
-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
-	
-ok 3 - git diff-tree -r initial # magic is (not used)
+ok 20 - GIT_EXTERNAL_DIFF path counter/total
 
-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
-	
-ok 4 - git diff-tree -r --abbrev initial # magic is (not used)
+expecting success of 4020.21 'GIT_EXTERNAL_DIFF generates pretty paths': 
+	test_when_finished "git rm -f file.ext" &&
+	touch file.ext &&
+	git add file.ext &&
+	echo with extension > file.ext &&
 
-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
-	
-ok 5 - git diff-tree -r --abbrev=4 initial # magic is (not used)
+	cat >expect <<-EOF &&
+	file.ext
+	EOF
+	GIT_EXTERNAL_DIFF=echo git diff file.ext >out &&
+	basename $(cut -d" " -f2 <out) >actual &&
+	test_cmp expect actual
 
-expecting success of 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
-	
-ok 6 - git diff-tree --root initial # magic is (not used)
+rm 'file.ext'
+ok 21 - GIT_EXTERNAL_DIFF generates pretty paths
 
-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
-	
-ok 7 - git diff-tree --root --abbrev initial # magic is (not used)
+expecting success of 4020.22 'external diff with autocrlf = true': 
+	test_config core.autocrlf true &&
+	GIT_EXTERNAL_DIFF=./fake-diff.sh git diff &&
+	test $(wc -l <crlfed.txt) = $(keep_only_cr <crlfed.txt | wc -c)
 
-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
-	
-ok 8 - git diff-tree --root --abbrev initial # magic is noellipses
+warning: in the working copy of 'file2', LF will be replaced by CRLF the next time Git touches it
+ok 22 - external diff with autocrlf = true
 
-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
-	
-ok 9 - git diff-tree --root -r initial # magic is (not used)
+expecting success of 4020.23 'diff --cached': 
+	test_config core.autocrlf true &&
+	git add file &&
+	git update-index --assume-unchanged file &&
+	echo second >file &&
+	git diff --cached >actual &&
+	test_cmp expected-diff actual
 
-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
-	
-ok 10 - git diff-tree --root -r --abbrev initial # magic is (not used)
+ok 23 - diff --cached
 
-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
-	
-ok 11 - git diff-tree --root -r --abbrev initial # magic is noellipses
+expecting success of 4020.24 'clean up crlf leftovers': 
+	git update-index --no-assume-unchanged file &&
+	rm -f file* &&
+	git reset --hard
 
-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
-	
-ok 12 - git diff-tree --root -r --abbrev=4 initial # magic is (not used)
+HEAD is now at 314ec38 added 2nd file
+ok 24 - clean up crlf leftovers
 
-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
-	
-ok 13 - git diff-tree --root -r --abbrev=4 initial # magic is noellipses
+expecting success of 4020.25 'submodule diff': 
+	git init sub &&
+	( cd sub && test_commit sub1 ) &&
+	git add sub &&
+	test_tick &&
+	git commit -m "add submodule" &&
+	( cd sub && test_commit sub2 ) &&
+	write_script gather_pre_post.sh <<-\EOF &&
+	echo "$1 $4" # path, mode
+	cat "$2" # old file
+	cat "$5" # new file
+	EOF
+	GIT_EXTERNAL_DIFF=./gather_pre_post.sh git diff >actual &&
+	cat >expected <<-EOF &&
+	sub 160000
+	Subproject commit $(git rev-parse HEAD:sub)
+	Subproject commit $(cd sub && git rev-parse HEAD)
+	EOF
+	test_cmp expected actual
 
-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
-	
-ok 14 - git diff-tree -p initial # magic is (not used)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4020-diff-external/sub/.git/
+[master (root-commit) e2fb92c] sub1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub1.t
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[master bcd8781] add submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+[master 6a9164c] sub2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub2.t
+ok 25 - submodule diff
 
-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
-	
-ok 15 - git diff-tree --root -p initial # magic is (not used)
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4021-format-patch-numbered.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4021-format-patch-numbered/.git/
+expecting success of 4021.1 'setup': 
 
-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
-	
-ok 16 - git diff-tree --root -p --abbrev=10 initial # magic is (not used)
+	echo A > file &&
+	git add file &&
+	git commit -m First &&
 
-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
-	
-ok 17 - git diff-tree --root -p --full-index initial # magic is (not used)
+	echo B >> file &&
+	git commit -a -m Second &&
 
-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
-	
-ok 18 - git diff-tree --root -p --full-index --abbrev=10 initial # magic is (not used)
+	echo C >> file &&
+	git commit -a -m Third
 
-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
-	
-ok 19 - git diff-tree --patch-with-stat initial # magic is (not used)
 
-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
-	
-ok 20 - git diff-tree --root --patch-with-stat initial # magic is (not used)
+[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 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
-	
-ok 21 - git diff-tree --patch-with-raw initial # magic is (not used)
+expecting success of 4021.2 'single patch defaults to no numbers': 
+	git format-patch --stdout HEAD~1 >patch0.single &&
+	test_single_no_numbered patch0.single
 
-expecting success of 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
-	
-ok 22 - git diff-tree --root --patch-with-raw initial # magic is (not used)
+ok 2 - single patch defaults to no numbers
 
-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
-	
-ok 23 - git diff-tree --pretty initial # magic is (not used)
+expecting success of 4021.3 'multiple patch defaults to numbered': 
 
-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
-	
-ok 24 - git diff-tree --pretty --root initial # magic is (not used)
+	git format-patch --stdout HEAD~2 >patch0.multiple &&
+	test_numbered patch0.multiple
 
-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
-	
-ok 25 - git diff-tree --pretty -p initial # magic is (not used)
 
-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
-	
-ok 26 - git diff-tree --pretty --stat initial # magic is (not used)
+Subject: [PATCH 1/2] Second
+Subject: [PATCH 2/2] Third
+ok 3 - multiple patch defaults to numbered
 
-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
-	
-ok 27 - git diff-tree --pretty --summary initial # magic is (not used)
+expecting success of 4021.4 'Use --numbered': 
 
-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
-	
-ok 28 - git diff-tree --pretty --stat --summary initial # magic is (not used)
+	git format-patch --numbered --stdout HEAD~1 >patch1 &&
+	test_single_numbered patch1
 
-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
-	
-ok 29 - git diff-tree --pretty --root -p initial # magic is (not used)
 
-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
-	
-ok 30 - git diff-tree --pretty --root --stat initial # magic is (not used)
+Subject: [PATCH 1/1] Third
+ok 4 - Use --numbered
 
-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
-	
-ok 31 - git diff-tree --pretty --root --summary initial # magic is (not used)
+expecting success of 4021.5 'format.numbered = true': 
 
-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
-	
-ok 32 - git diff-tree --pretty --root --summary -r initial # magic is (not used)
+	git config format.numbered true &&
+	git format-patch --stdout HEAD~2 >patch2 &&
+	test_numbered patch2
 
-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
-	
-ok 33 - git diff-tree --pretty --root --stat --summary initial # magic is (not used)
 
-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
-	
-ok 34 - git diff-tree --pretty --patch-with-stat initial # magic is (not used)
+Subject: [PATCH 1/2] Second
+Subject: [PATCH 2/2] Third
+ok 5 - format.numbered = true
 
-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
-	
-ok 35 - git diff-tree --pretty --root --patch-with-stat initial # magic is (not used)
+expecting success of 4021.6 'format.numbered && single patch': 
 
-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
-	
-ok 36 - git diff-tree --pretty --patch-with-raw initial # magic is (not used)
+	git format-patch --stdout HEAD^ > patch3 &&
+	test_single_numbered patch3
 
-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
-	
-ok 37 - git diff-tree --pretty --root --patch-with-raw initial # magic is (not used)
 
-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
-	
-ok 38 - git diff-tree --pretty=oneline initial # magic is (not used)
+Subject: [PATCH 1/1] Third
+ok 6 - format.numbered && single patch
 
-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
-	
-ok 39 - git diff-tree --pretty=oneline --root initial # magic is (not used)
+expecting success of 4021.7 'format.numbered && --no-numbered': 
 
-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
-	
-ok 40 - git diff-tree --pretty=oneline -p initial # magic is (not used)
+	git format-patch --no-numbered --stdout HEAD~2 >patch4 &&
+	test_no_numbered patch4
 
-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
-	
-ok 41 - git diff-tree --pretty=oneline --root -p initial # magic is (not used)
 
-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
-	
-ok 42 - git diff-tree --pretty=oneline --patch-with-stat initial # magic is (not used)
+ok 7 - format.numbered && --no-numbered
 
-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
-	
-ok 43 - git diff-tree --pretty=oneline --root --patch-with-stat initial # magic is (not used)
+expecting success of 4021.8 'format.numbered && --keep-subject': 
 
-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
-	
-ok 44 - git diff-tree --pretty=oneline --patch-with-raw initial # magic is (not used)
+	git format-patch --keep-subject --stdout HEAD^ >patch4a &&
+	grep "^Subject: Third" patch4a
 
-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
-	
-ok 45 - git diff-tree --pretty=oneline --root --patch-with-raw initial # magic is (not used)
 
-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
-	
-ok 46 - git diff-tree --pretty side # magic is (not used)
+Subject: Third
+ok 8 - format.numbered && --keep-subject
 
-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
-	
-ok 47 - git diff-tree --pretty -p side # magic is (not used)
+expecting success of 4021.9 'format.numbered = auto': 
 
-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
-	
-ok 48 - git diff-tree --pretty --patch-with-stat side # magic is (not used)
+	git config format.numbered auto &&
+	git format-patch --stdout HEAD~2 > patch5 &&
+	test_numbered patch5
 
-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
-	
-ok 49 - git diff-tree initial mode # magic is (not used)
 
-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
-	
-ok 50 - git diff-tree --stat initial mode # magic is (not used)
+Subject: [PATCH 1/2] Second
+Subject: [PATCH 2/2] Third
+ok 9 - format.numbered = auto
 
-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
-	
-ok 51 - git diff-tree --summary initial mode # magic is (not used)
+expecting success of 4021.10 'format.numbered = auto && single patch': 
 
-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
-	
-ok 52 - git diff-tree master # magic is (not used)
+	git format-patch --stdout HEAD^ > patch6 &&
+	test_single_no_numbered patch6
 
-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
-	
-ok 53 - git diff-tree -m master # magic is (not used)
 
-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
-	
-ok 54 - git diff-tree -p master # magic is (not used)
+ok 10 - format.numbered = auto && single patch
 
-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
-	
-ok 55 - git diff-tree -p -m master # magic is (not used)
+expecting success of 4021.11 'format.numbered = auto && --no-numbered': 
 
-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
-	
-ok 56 - git diff-tree -c master # magic is (not used)
+	git format-patch --no-numbered --stdout HEAD~2 > patch7 &&
+	test_no_numbered patch7
 
-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
-	
-ok 57 - git diff-tree -c --abbrev master # magic is (not used)
 
-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
-	
-ok 58 - git diff-tree -c --abbrev master # magic is noellipses
+ok 11 - format.numbered = auto && --no-numbered
 
-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
-	
-ok 59 - git diff-tree --cc master # magic is (not used)
+expecting success of 4021.12 '--start-number && --numbered': 
 
-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
-	
-ok 60 - git diff-tree -c --stat master # magic is (not used)
+	git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 &&
+	grep "^Subject: \[PATCH 3/3\]" patch8
 
-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
-	
-ok 61 - git diff-tree --cc --stat master # magic is (not used)
+Subject: [PATCH 3/3] Third
+ok 12 - --start-number && --numbered
 
-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
-	
-ok 62 - git diff-tree -c --stat --summary master # magic is (not used)
+expecting success of 4021.13 'single patch with cover-letter defaults to numbers': 
+	git format-patch --cover-letter --stdout HEAD~1 >patch9.single &&
+	test_single_cover_letter_numbered patch9.single
 
-expecting success of 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
-	
-ok 63 - git diff-tree --cc --stat --summary master # magic is (not used)
+Subject: [PATCH 0/1] *** SUBJECT HERE ***
+Subject: [PATCH 1/1] Third
+ok 13 - single patch with cover-letter defaults to numbers
 
-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
-	
-ok 64 - git diff-tree -c --stat --summary side # magic is (not used)
+expecting success of 4021.14 'Use --no-numbered and --cover-letter single patch': 
+	git format-patch --no-numbered --stdout --cover-letter HEAD~1 >patch10 &&
+	test_no_numbered patch10
 
-expecting success of 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
-	
-ok 65 - git diff-tree --cc --stat --summary side # magic is (not used)
+ok 14 - Use --no-numbered and --cover-letter single patch
 
-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
-	
-ok 66 - git diff-tree --cc --shortstat master # magic is (not used)
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4022-diff-rewrite.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4022-diff-rewrite/.git/
+expecting success of 4022.1 'setup': 
 
-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
-	
-ok 67 - git diff-tree --cc --summary REVERSE # magic is (not used)
+	COPYING_test_data >test.data &&
+	cp test.data test &&
+	git add test &&
+	tr \
+	  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+	  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
+	  <test.data >test &&
+	echo "to be deleted" >test2 &&
+	blob=$(git hash-object test2) &&
+	blob=$(git rev-parse --short $blob) &&
+	git add test2
 
-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
-	
-ok 68 - git diff-tree --cc --patch-with-stat master # magic is (not used)
 
-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
-	
-ok 69 - git diff-tree --cc --patch-with-stat --summary master # magic is (not used)
+ok 1 - setup
 
-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
-	
-ok 70 - git diff-tree --cc --patch-with-stat --summary side # magic is (not used)
+expecting success of 4022.2 'detect rewrite': 
 
-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
-	
-ok 71 - git log master # magic is (not used)
+	actual=$(git diff-files -B --summary test) &&
+	expr "$actual" : " rewrite test ([0-9]*%)$"
 
-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
-	
-ok 72 - git log -p master # magic is (not used)
 
-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
-	
-ok 73 - git log --root master # magic is (not used)
+19
+ok 2 - detect rewrite
 
-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
-	
-ok 74 - git log --root -p master # magic is (not used)
+expecting success of 4022.3 'show deletion diff without -D': 
 
-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
-	
-ok 75 - git log --patch-with-stat master # magic is (not used)
+	rm test2 &&
+	git diff -- test2 >actual &&
+	test_cmp expect 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
-	
-ok 76 - git log --root --patch-with-stat master # magic is (not used)
+ok 3 - show deletion diff without -D
 
-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
-	
-ok 77 - git log --root --patch-with-stat --summary master # magic is (not used)
+expecting success of 4022.4 'suppress deletion diff with -D': 
 
-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
-	
-ok 78 - git log --root -c --patch-with-stat --summary master # magic is (not used)
+	git diff -D -- test2 >actual &&
+	test_cmp expect 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
-	
-ok 79 - git log --root --cc --patch-with-stat --summary master # magic is (not used)
+ok 4 - suppress deletion diff with -D
 
-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
-	
-ok 80 - git log --no-diff-merges -p --first-parent master # magic is (not used)
+expecting success of 4022.5 'show deletion diff with -B': 
 
-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
-	
-ok 81 - git log --diff-merges=off -p --first-parent master # magic is (not used)
+	git diff -B -- test >actual &&
+	grep "Linus Torvalds" 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
-	
-ok 82 - git log --first-parent --diff-merges=off -p master # magic is (not used)
+-			Linus Torvalds
+ok 5 - show deletion diff with -B
 
-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
-	
-ok 83 - git log -p --first-parent master # magic is (not used)
+expecting success of 4022.6 'suppress deletion diff with -B -D': 
 
-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
-	
-ok 84 - git log -p --diff-merges=first-parent master # magic is (not used)
+	git diff -B -D -- test >actual &&
+	grep -v "Linus Torvalds" 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
-	
-ok 85 - git log --diff-merges=first-parent master # magic is (not used)
+diff --git a/test b/test
+dissimilarity index 99%
+index 27063eb..f1f2e4d 100644
+--- a/test
++++ b/test
+@@ -?,? +1,18 @@
++
++ Abgr gung gur bayl inyvq irefvba bs gur TCY nf sne nf guvf cebwrpg
++ vf pbaprearq vf _guvf_ cnegvphyne irefvba bs gur yvprafr (vr i2, abg
++ i2.2 be i3.k be jungrire), hayrff rkcyvpvgyl bgurejvfr fgngrq.
++
++ UBJRIRE, va beqre gb nyybj n zvtengvba gb TCYi3 vs gung frrzf yvxr
++ n tbbq vqrn, V nyfb nfx gung crbcyr vaibyirq jvgu gur cebwrpg znxr
++ gurve cersreraprf xabja. Va cnegvphyne, vs lbh gehfg zr gb znxr gung
++ qrpvfvba, lbh zvtug abgr fb va lbhe pbclevtug zrffntr, vr fbzrguvat
++ yvxr
++
++	Guvf svyr vf yvprafrq haqre gur TCY i2, be n yngre irefvba
++	ng gur qvfpergvba bs Yvahf.
++
++  zvtug nibvq vffhrf. Ohg jr pna nyfb whfg qrpvqr gb flapuebavmr naq
++  pbagnpg nyy pbclevtug ubyqref ba erpbeq vs/jura gur bppnfvba nevfrf.
++
++			Yvahf Gbeinyqf
+ok 6 - suppress deletion diff with -B -D
 
-expecting success of 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
-	
-ok 86 - git log -m -p --first-parent master # magic is (not used)
+expecting success of 4022.7 'prepare a file that ends with an incomplete line': 
+	test_seq 1 99 >seq &&
+	printf 100 >>seq &&
+	git add seq &&
+	git commit seq -m seq
 
-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
-	
-ok 87 - git log -m -p master # magic is (not used)
+[master (root-commit) 2d6607f] seq
+ Author: A U Thor <author@example.com>
+ 1 file changed, 100 insertions(+)
+ create mode 100644 seq
+ok 7 - prepare a file that ends with an incomplete line
 
-expecting success of 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
-	
-ok 88 - git log --cc -m -p master # magic is (not used)
+expecting success of 4022.8 'rewrite the middle 90% of sequence file and terminate with newline': 
+	test_seq 1 5 >seq &&
+	test_seq 9331 9420 >>seq &&
+	test_seq 96 100 >>seq
 
-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
-	
-ok 89 - git log -c -m -p master # magic is (not used)
+ok 8 - rewrite the middle 90% of sequence file and terminate with newline
 
-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
-	
-ok 90 - git log -m --raw master # magic is (not used)
+expecting success of 4022.9 'confirm that sequence file is considered a rewrite': 
+	git diff -B seq >res &&
+	grep "dissimilarity index" res
+
+dissimilarity index 92%
+ok 9 - confirm that sequence file is considered a rewrite
+
+expecting success of 4022.10 'no newline at eof is on its own line without -B': 
+	git diff seq >res &&
+	grep "^\\\\ " res &&
+	! grep "^..*\\\\ " res
+
+\ No newline at end of file
+ok 10 - no newline at eof is on its own line without -B
+
+expecting success of 4022.11 'no newline at eof is on its own line with -B': 
+	git diff -B seq >res &&
+	grep "^\\\\ " res &&
+	! grep "^..*\\\\ " res
+
+\ No newline at end of file
+ok 11 - no newline at eof is on its own line with -B
 
-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
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4015-diff-whitespace.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4015-diff-whitespace/.git/
+expecting success of 4015.1 'status with --patch (different)': 
+		echo foo >x &&
+		git add x &&
+		echo bar >x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 91 - git log -m --stat master # magic is (not used)
+diff --git a/x b/x
+index 257cc56..5716ca5 100644
+--- a/x
++++ b/x
+@@ -1 +1 @@
+-foo
++bar
+ok 1 - status with --patch (different)
 
-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 4015.2 'status with --patch (mode differs)': 
+		test_when_finished "git update-index --chmod=-x x" &&
+		echo foo >x &&
+		git add x &&
+		git update-index --chmod=+x x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 92 - git log -SF master # magic is (not used)
+diff --git a/x b/x
+old mode 100755
+new mode 100644
+ok 2 - status with --patch (mode differs)
 
-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 4015.3 'status with --patch (removing an empty file)': 
+		: >x &&
+		git add x &&
+		rm x &&
+		test_expect_code 1 git diff -w $opts --exit-code -- x
 	
-ok 93 - git log -S F master # magic is (not used)
+diff --git a/x b/x
+deleted file mode 100644
+index e69de29..0000000
+ok 3 - status with --patch (removing an empty file)
 
-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 4015.4 'status with --patch (different but equivalent)': 
+		echo foo >x &&
+		git add x &&
+		echo " foo" >x &&
+		$expect_failure git diff -w $opts --exit-code x
 	
-ok 94 - git log -SF -p master # magic is (not used)
+ok 4 - status with --patch (different but equivalent)
 
-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 4015.5 'status with --quiet (different)': 
+		echo foo >x &&
+		git add x &&
+		echo bar >x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 95 - git log -SF master --max-count=0 # magic is (not used)
+ok 5 - status with --quiet (different)
 
-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 4015.6 'status with --quiet (mode differs)': 
+		test_when_finished "git update-index --chmod=-x x" &&
+		echo foo >x &&
+		git add x &&
+		git update-index --chmod=+x x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 96 - git log -SF master --max-count=1 # magic is (not used)
+ok 6 - status with --quiet (mode differs)
 
-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 4015.7 'status with --quiet (removing an empty file)': 
+		: >x &&
+		git add x &&
+		rm x &&
+		test_expect_code 1 git diff -w $opts --exit-code -- x
 	
-ok 97 - git log -SF master --max-count=2 # magic is (not used)
+ok 7 - status with --quiet (removing an empty file)
 
-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 4015.8 'status with --quiet (different but equivalent)': 
+		echo foo >x &&
+		git add x &&
+		echo " foo" >x &&
+		$expect_failure git diff -w $opts --exit-code x
 	
-ok 98 - git log -GF master # magic is (not used)
+ok 8 - status with --quiet (different but equivalent)
 
-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 4015.9 'status with -s (different)': 
+		echo foo >x &&
+		git add x &&
+		echo bar >x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 99 - git log -GF -p master # magic is (not used)
+ok 9 - status with -s (different)
 
-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 4015.10 'status with -s (mode differs)': 
+		test_when_finished "git update-index --chmod=-x x" &&
+		echo foo >x &&
+		git add x &&
+		git update-index --chmod=+x x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 100 - git log -GF -p --pickaxe-all master # magic is (not used)
+ok 10 - status with -s (mode differs)
 
-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 4015.11 'status with -s (removing an empty file)': 
+		: >x &&
+		git add x &&
+		rm x &&
+		test_expect_code 1 git diff -w $opts --exit-code -- x
 	
-ok 101 - git log -IA -IB -I1 -I2 -p master # magic is (not used)
+ok 11 - status with -s (removing an empty file)
 
-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 4015.12 'status with -s (different but equivalent)': 
+		echo foo >x &&
+		git add x &&
+		echo " foo" >x &&
+		$expect_failure git diff -w $opts --exit-code x
 	
-ok 102 - git log --decorate --all # magic is (not used)
+ok 12 - status with -s (different but equivalent)
 
-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 4015.13 'status with --stat (different)': 
+		echo foo >x &&
+		git add x &&
+		echo bar >x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 103 - git log --decorate=full --all # magic is (not used)
+ x | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - status with --stat (different)
 
-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 4015.14 'status with --stat (mode differs)': 
+		test_when_finished "git update-index --chmod=-x x" &&
+		echo foo >x &&
+		git add x &&
+		git update-index --chmod=+x x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 104 - git log --decorate --clear-decorations --all # magic is (not used)
+ x | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 14 - status with --stat (mode differs)
 
-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 4015.15 'status with --stat (removing an empty file)': 
+		: >x &&
+		git add x &&
+		rm x &&
+		test_expect_code 1 git diff -w $opts --exit-code -- x
 	
-ok 105 - git log --decorate=full --clear-decorations --all # magic is (not used)
+ x | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 15 - status with --stat (removing an empty file)
 
-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 4015.16 'status with --stat (different but equivalent)': 
+		echo foo >x &&
+		git add x &&
+		echo " foo" >x &&
+		$expect_failure git diff -w $opts --exit-code x
 	
-ok 106 - git rev-list --parents HEAD # magic is (not used)
+ok 16 - status with --stat (different but equivalent)
 
-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 4015.17 'status with --shortstat (different)': 
+		echo foo >x &&
+		git add x &&
+		echo bar >x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 107 - git rev-list --children HEAD # magic is (not used)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 17 - status with --shortstat (different)
 
-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 4015.18 'status with --shortstat (mode differs)': 
+		test_when_finished "git update-index --chmod=-x x" &&
+		echo foo >x &&
+		git add x &&
+		git update-index --chmod=+x x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 108 - git whatchanged master # magic is (not used)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 18 - status with --shortstat (mode differs)
 
-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 4015.19 'status with --shortstat (removing an empty file)': 
+		: >x &&
+		git add x &&
+		rm x &&
+		test_expect_code 1 git diff -w $opts --exit-code -- x
 	
-ok 109 - git whatchanged master # magic is noellipses
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 19 - status with --shortstat (removing an empty file)
 
-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 4015.20 'status with --shortstat (different but equivalent)': 
+		echo foo >x &&
+		git add x &&
+		echo " foo" >x &&
+		$expect_failure git diff -w $opts --exit-code x
 	
-ok 110 - git whatchanged -p master # magic is (not used)
+ok 20 - status with --shortstat (different but equivalent)
 
-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 4015.21 'status with --dirstat=lines (different)': 
+		echo foo >x &&
+		git add x &&
+		echo bar >x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 111 - git whatchanged --root master # magic is (not used)
+ok 21 - status with --dirstat=lines (different)
 
-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 4015.22 'status with --dirstat=lines (mode differs)': 
+		test_when_finished "git update-index --chmod=-x x" &&
+		echo foo >x &&
+		git add x &&
+		git update-index --chmod=+x x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 112 - git whatchanged --root master # magic is noellipses
+ok 22 - status with --dirstat=lines (mode differs)
 
-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 4015.23 'status with --dirstat=lines (removing an empty file)': 
+		: >x &&
+		git add x &&
+		rm x &&
+		test_expect_code 1 git diff -w $opts --exit-code -- x
 	
-ok 113 - git whatchanged --root -p master # magic is (not used)
+ok 23 - status with --dirstat=lines (removing an empty file)
 
-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 4015.24 'status with --dirstat=lines (different but equivalent)': 
+		echo foo >x &&
+		git add x &&
+		echo " foo" >x &&
+		$expect_failure git diff -w $opts --exit-code x
 	
-ok 114 - git whatchanged --patch-with-stat master # magic is (not used)
+ok 24 - status with --dirstat=lines (different but equivalent)
 
-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 4015.25 'status with --raw (different)': 
+		echo foo >x &&
+		git add x &&
+		echo bar >x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 115 - git whatchanged --root --patch-with-stat master # magic is (not used)
+:100644 100644 257cc56 0000000 M	x
+ok 25 - status with --raw (different)
 
-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 4015.26 'status with --raw (mode differs)': 
+		test_when_finished "git update-index --chmod=-x x" &&
+		echo foo >x &&
+		git add x &&
+		git update-index --chmod=+x x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 116 - git whatchanged --root --patch-with-stat --summary master # magic is (not used)
+:100755 100644 257cc56 0000000 M	x
+ok 26 - status with --raw (mode differs)
 
-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 4015.27 'status with --raw (removing an empty file)': 
+		: >x &&
+		git add x &&
+		rm x &&
+		test_expect_code 1 git diff -w $opts --exit-code -- x
 	
-ok 117 - git whatchanged --root -c --patch-with-stat --summary master # magic is (not used)
+:100644 000000 e69de29 0000000 D	x
+ok 27 - status with --raw (removing an empty file)
 
-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 4015.28 'status with --raw (different but equivalent)': 
+		echo foo >x &&
+		git add x &&
+		echo " foo" >x &&
+		$expect_failure git diff -w $opts --exit-code x
 	
-ok 118 - git whatchanged --root --cc --patch-with-stat --summary master # magic is (not used)
+:100644 100644 257cc56 0000000 M	x
+ok 28 - status with --raw (different but equivalent)
 
-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 4015.29 'status with --name-only (different)': 
+		echo foo >x &&
+		git add x &&
+		echo bar >x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 119 - git whatchanged -SF master # magic is (not used)
+x
+ok 29 - status with --name-only (different)
 
-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 4015.30 'status with --name-only (mode differs)': 
+		test_when_finished "git update-index --chmod=-x x" &&
+		echo foo >x &&
+		git add x &&
+		git update-index --chmod=+x x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 120 - git whatchanged -SF master # magic is noellipses
+x
+ok 30 - status with --name-only (mode differs)
 
-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 4015.31 'status with --name-only (removing an empty file)': 
+		: >x &&
+		git add x &&
+		rm x &&
+		test_expect_code 1 git diff -w $opts --exit-code -- x
 	
-ok 121 - git whatchanged -SF -p master # magic is (not used)
+x
+ok 31 - status with --name-only (removing an empty file)
 
-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 4015.32 'status with --name-only (different but equivalent)': 
+		echo foo >x &&
+		git add x &&
+		echo " foo" >x &&
+		$expect_failure git diff -w $opts --exit-code x
 	
-ok 122 - git log --patch-with-stat master -- dir/ # magic is (not used)
+x
+ok 32 - status with --name-only (different but equivalent)
 
-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 4015.33 'status with --name-status (different)': 
+		echo foo >x &&
+		git add x &&
+		echo bar >x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 123 - git whatchanged --patch-with-stat master -- dir/ # magic is (not used)
+M	x
+ok 33 - status with --name-status (different)
 
-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 4015.34 'status with --name-status (mode differs)': 
+		test_when_finished "git update-index --chmod=-x x" &&
+		echo foo >x &&
+		git add x &&
+		git update-index --chmod=+x x &&
+		test_expect_code 1 git diff -w $opts --exit-code x
 	
-ok 124 - git log --patch-with-stat --summary master -- dir/ # magic is (not used)
+M	x
+ok 34 - status with --name-status (mode differs)
 
-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 4015.35 'status with --name-status (removing an empty file)': 
+		: >x &&
+		git add x &&
+		rm x &&
+		test_expect_code 1 git diff -w $opts --exit-code -- x
 	
-ok 125 - git whatchanged --patch-with-stat --summary master -- dir/ # magic is (not used)
+D	x
+ok 35 - status with --name-status (removing an empty file)
 
-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 4015.36 'status with --name-status (different but equivalent)': 
+		echo foo >x &&
+		git add x &&
+		echo " foo" >x &&
+		$expect_failure git diff -w $opts --exit-code x
 	
-ok 126 - git show initial # magic is (not used)
+M	x
+ok 36 - status with --name-status (different but equivalent)
 
-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
-	
-ok 127 - git show --root initial # magic is (not used)
+expecting success of 4015.37 'Ray Lehtiniemi's example': 
+	cat <<-\EOF >x &&
+	do {
+	   nothing;
+	} while (0);
+	EOF
+	git update-index --add x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 
-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
-	
-ok 128 - git show side # magic is (not used)
+	cat <<-\EOF >x &&
+	do
+	{
+	   nothing;
+	}
+	while (0);
+	EOF
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-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
-	
-ok 129 - git show master # magic is (not used)
+	cat <<-EOF >expect &&
+	diff --git a/x b/x
+	index $before..$after 100644
+	--- a/x
+	+++ b/x
+	@@ -1,3 +1,5 @@
+	-do {
+	+do
+	+{
+	    nothing;
+	-} while (0);
+	+}
+	+while (0);
+	EOF
 
-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
-	
-ok 130 - git show -c master # magic is (not used)
+	git diff >out &&
+	test_cmp expect out &&
 
-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
-	
-ok 131 - git show -m master # magic is (not used)
+	git diff -w >out &&
+	test_cmp expect out &&
 
-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
-	
-ok 132 - git show --first-parent master # magic is (not used)
+	git diff -b >out &&
+	test_cmp expect out
 
-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
-	
-ok 133 - git show --stat side # magic is (not used)
+ok 37 - Ray Lehtiniemi's example
 
-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
-	
-ok 134 - git show --stat --summary side # magic is (not used)
+expecting success of 4015.38 'another test, without options': 
+	tr Q "\015" <<-\EOF >x &&
+	whitespace at beginning
+	whitespace change
+	whitespace in the middle
+	whitespace at end
+	unchanged line
+	CR at endQ
+	EOF
 
-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
-	
-ok 135 - git show --patch-with-stat side # magic is (not used)
+	git update-index x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 
-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
-	
-ok 136 - git show --patch-with-raw side # magic is (not used)
+	tr "_" " " <<-\EOF >x &&
+	_	whitespace at beginning
+	whitespace 	 change
+	white space in the middle
+	whitespace at end__
+	unchanged line
+	CR at end
+	EOF
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-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
-	
-ok 137 - git show --patch-with-raw side # magic is noellipses
+	tr "Q_" "\015 " <<-EOF >expect &&
+	diff --git a/x b/x
+	index $before..$after 100644
+	--- a/x
+	+++ b/x
+	@@ -1,6 +1,6 @@
+	-whitespace at beginning
+	-whitespace change
+	-whitespace in the middle
+	-whitespace at end
+	+ 	whitespace at beginning
+	+whitespace 	 change
+	+white space in the middle
+	+whitespace at end__
+	 unchanged line
+	-CR at endQ
+	+CR at end
+	EOF
 
-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
-	
-ok 138 - git show --patch-with-stat --summary side # magic is (not used)
+	git diff >out &&
+	test_cmp expect out &&
 
-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
-	
-ok 139 - git format-patch --stdout initial..side # magic is (not used)
+	git diff -w >out &&
+	test_must_be_empty out &&
 
-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
-	
-ok 140 - git format-patch --stdout initial..master^ # magic is (not used)
+	git diff -w -b >out &&
+	test_must_be_empty out &&
 
-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
-	
-ok 141 - git format-patch --stdout initial..master # magic is (not used)
+	git diff -w --ignore-space-at-eol >out &&
+	test_must_be_empty out &&
 
-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
-	
-ok 142 - git format-patch --stdout --no-numbered initial..master # magic is (not used)
+	git diff -w -b --ignore-space-at-eol >out &&
+	test_must_be_empty out &&
 
-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
-	
-ok 143 - git format-patch --stdout --numbered initial..master # magic is (not used)
+	git diff -w --ignore-cr-at-eol >out &&
+	test_must_be_empty out &&
 
-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
-	
-ok 144 - git format-patch --attach --stdout initial..side # magic is (not used)
+	tr "Q_" "\015 " <<-EOF >expect &&
+	diff --git a/x b/x
+	index $before..$after 100644
+	--- a/x
+	+++ b/x
+	@@ -1,6 +1,6 @@
+	-whitespace at beginning
+	+_	whitespace at beginning
+	 whitespace 	 change
+	-whitespace in the middle
+	+white space in the middle
+	 whitespace at end__
+	 unchanged line
+	 CR at end
+	EOF
+	git diff -b >out &&
+	test_cmp expect out &&
 
-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
-	
-ok 145 - git format-patch --attach --stdout --suffix=.diff initial..side # magic is (not used)
+	git diff -b --ignore-space-at-eol >out &&
+	test_cmp expect out &&
 
-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
-	
-ok 146 - git format-patch --attach --stdout initial..master^ # magic is (not used)
+	git diff -b --ignore-cr-at-eol >out &&
+	test_cmp expect out &&
 
-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
-	
-ok 147 - git format-patch --attach --stdout initial..master # magic is (not used)
+	tr "Q_" "\015 " <<-EOF >expect &&
+	diff --git a/x b/x
+	index $before..$after 100644
+	--- a/x
+	+++ b/x
+	@@ -1,6 +1,6 @@
+	-whitespace at beginning
+	-whitespace change
+	-whitespace in the middle
+	+_	whitespace at beginning
+	+whitespace 	 change
+	+white space in the middle
+	 whitespace at end__
+	 unchanged line
+	 CR at end
+	EOF
+	git diff --ignore-space-at-eol >out &&
+	test_cmp expect out &&
 
-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
-	
-ok 148 - git format-patch --inline --stdout initial..side # magic is (not used)
+	git diff --ignore-space-at-eol --ignore-cr-at-eol >out &&
+	test_cmp expect out &&
 
-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
-	
-ok 149 - git format-patch --inline --stdout initial..master^ # magic is (not used)
+	tr "Q_" "\015 " <<-EOF >expect &&
+	diff --git a/x b/x
+	index_$before..$after 100644
+	--- a/x
+	+++ b/x
+	@@ -1,6 +1,6 @@
+	-whitespace at beginning
+	-whitespace change
+	-whitespace in the middle
+	-whitespace at end
+	+_	whitespace at beginning
+	+whitespace_	_change
+	+white space in the middle
+	+whitespace at end__
+	 unchanged line
+	 CR at end
+	EOF
+	git diff --ignore-cr-at-eol >out &&
+	test_cmp expect out
 
-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
-	
-ok 150 - git format-patch --inline --stdout --numbered-files initial..master # magic is (not used)
+ok 38 - another test, without options
 
-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
-	
-ok 151 - git format-patch --inline --stdout initial..master # magic is (not used)
+expecting success of 4015.39 'ignore-blank-lines: only new lines': 
+	test_seq 5 >x &&
+	git update-index x &&
+	test_seq 5 | sed "/3/i\\
+" >x &&
+	git diff --ignore-blank-lines >out &&
+	test_must_be_empty out
 
-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
-	
-ok 152 - git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master # magic is (not used)
+ok 39 - ignore-blank-lines: only new lines
 
-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
-	
-ok 153 - git config format.subjectprefix DIFFERENT_PREFIX # magic is (not used)
+expecting success of 4015.40 'ignore-blank-lines: only new lines with space': 
+	test_seq 5 >x &&
+	git update-index x &&
+	test_seq 5 | sed "/3/i\\
+ " >x &&
+	git diff -w --ignore-blank-lines >out &&
+	test_must_be_empty out
 
-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
-	
-ok 154 - git format-patch --inline --stdout initial..master^^ # magic is (not used)
+ok 40 - ignore-blank-lines: only new lines with space
 
-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
-	
-ok 155 - git format-patch --stdout --cover-letter -n initial..master^ # magic is (not used)
+expecting success of 4015.41 'ignore-blank-lines: after change': 
+	cat <<-\EOF >x &&
+	1
+	2
 
-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
-	
-ok 156 - git diff --abbrev initial..side # magic is (not used)
+	3
+	4
+	5
 
-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
-	
-ok 157 - git diff -U initial..side # magic is (not used)
+	6
+	7
+	EOF
+	git update-index x &&
+	cat <<-\EOF >x &&
+	change
 
-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
-	
-ok 158 - git diff -U1 initial..side # magic is (not used)
+	1
+	2
+	3
+	4
+	5
+	6
 
-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
-	
-ok 159 - git diff -r initial..side # magic is (not used)
+	7
+	EOF
+	git diff --inter-hunk-context=100 --ignore-blank-lines >out.tmp &&
+	cat <<-\EOF >expected &&
+	diff --git a/x b/x
+	--- a/x
+	+++ b/x
+	@@ -1,6 +1,7 @@
+	+change
+	+
+	 1
+	 2
+	-
+	 3
+	 4
+	 5
+	EOF
+	compare_diff_patch expected out.tmp
 
-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
-	
-ok 160 - git diff --stat initial..side # magic is (not used)
+ok 41 - ignore-blank-lines: after change
 
-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
-	
-ok 161 - git diff -r --stat initial..side # magic is (not used)
+expecting success of 4015.42 'ignore-blank-lines: before change': 
+	cat <<-\EOF >x &&
+	1
+	2
 
-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
-	
-ok 162 - git diff initial..side # magic is (not used)
+	3
+	4
+	5
+	6
+	7
+	EOF
+	git update-index x &&
+	cat <<-\EOF >x &&
 
-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
-	
-ok 163 - git diff --patch-with-stat initial..side # magic is (not used)
+	1
+	2
+	3
+	4
+	5
 
-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
-	
-ok 164 - git diff --patch-with-raw initial..side # magic is (not used)
+	6
+	7
+	change
+	EOF
+	git diff --inter-hunk-context=100 --ignore-blank-lines >out.tmp &&
+	cat <<-\EOF >expected &&
+	diff --git a/x b/x
+	--- a/x
+	+++ b/x
+	@@ -4,5 +4,7 @@
+	 3
+	 4
+	 5
+	+
+	 6
+	 7
+	+change
+	EOF
+	compare_diff_patch expected out.tmp
 
-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
-	
-ok 165 - git diff --patch-with-raw initial..side # magic is noellipses
+ok 42 - ignore-blank-lines: before change
 
-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
-	
-ok 166 - git diff --patch-with-stat -r initial..side # magic is (not used)
+expecting success of 4015.43 'ignore-blank-lines: between changes': 
+	cat <<-\EOF >x &&
+	1
+	2
+	3
+	4
+	5
 
-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
-	
-ok 167 - git diff --patch-with-raw -r initial..side # magic is (not used)
 
-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
-	
-ok 168 - git diff --patch-with-raw -r initial..side # magic is noellipses
+	6
+	7
+	8
+	9
+	10
+	EOF
+	git update-index x &&
+	cat <<-\EOF >x &&
+	change
+	1
+	2
 
-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
-	
-ok 169 - git diff --name-status dir2 dir # magic is (not used)
+	3
+	4
+	5
+	6
+	7
+	8
 
-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
-	
-ok 170 - git diff --no-index --name-status dir2 dir # magic is (not used)
+	9
+	10
+	change
+	EOF
+	git diff --ignore-blank-lines >out.tmp &&
+	cat <<-\EOF >expected &&
+	diff --git a/x b/x
+	--- a/x
+	+++ b/x
+	@@ -1,5 +1,7 @@
+	+change
+	 1
+	 2
+	+
+	 3
+	 4
+	 5
+	@@ -8,5 +8,7 @@
+	 6
+	 7
+	 8
+	+
+	 9
+	 10
+	+change
+	EOF
+	compare_diff_patch expected out.tmp
 
-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
-	
-ok 171 - git diff --no-index --name-status -- dir2 dir # magic is (not used)
+ok 43 - ignore-blank-lines: between changes
 
-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
-	
-ok 172 - git diff --no-index dir dir3 # magic is (not used)
+expecting success of 4015.44 'ignore-blank-lines: between changes (with interhunkctx)': 
+	test_seq 10 >x &&
+	git update-index x &&
+	cat <<-\EOF >x &&
+	change
+	1
+	2
 
-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
-	
-ok 173 - git diff master master^ side # magic is (not used)
+	3
+	4
+	5
 
-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
-	
-ok 174 - git diff --line-prefix=abc master master^ side # magic is (not used)
+	6
+	7
+	8
+	9
 
-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
-	
-ok 175 - git diff --dirstat master~1 master~2 # magic is (not used)
+	10
+	change
+	EOF
+	git diff --inter-hunk-context=2 --ignore-blank-lines >out.tmp &&
+	cat <<-\EOF >expected &&
+	diff --git a/x b/x
+	--- a/x
+	+++ b/x
+	@@ -1,10 +1,15 @@
+	+change
+	 1
+	 2
+	+
+	 3
+	 4
+	 5
+	+
+	 6
+	 7
+	 8
+	 9
+	+
+	 10
+	+change
+	EOF
+	compare_diff_patch expected out.tmp
 
-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
-	
-ok 176 - git diff --dirstat initial rearrange # magic is (not used)
+ok 44 - ignore-blank-lines: between changes (with interhunkctx)
+
+expecting success of 4015.45 'ignore-blank-lines: scattered spaces': 
+	test_seq 10 >x &&
+	git update-index x &&
+	cat <<-\EOF >x &&
+	change
+	1
+	2
+	3
+
+	4
+
+	5
+
+	6
+
+
+	7
+
+	8
+	9
+	10
+	change
+	EOF
+	git diff --inter-hunk-context=4 --ignore-blank-lines >out.tmp &&
+	cat <<-\EOF >expected &&
+	diff --git a/x b/x
+	--- a/x
+	+++ b/x
+	@@ -1,3 +1,4 @@
+	+change
+	 1
+	 2
+	 3
+	@@ -8,3 +15,4 @@
+	 8
+	 9
+	 10
+	+change
+	EOF
+	compare_diff_patch expected out.tmp
+
+ok 45 - ignore-blank-lines: scattered spaces
+
+expecting success of 4015.46 'ignore-blank-lines: spaces coalesce': 
+	test_seq 6 >x &&
+	git update-index x &&
+	cat <<-\EOF >x &&
+	change
+	1
+	2
+	3
+
+	4
+
+	5
+
+	6
+	change
+	EOF
+	git diff --inter-hunk-context=4 --ignore-blank-lines >out.tmp &&
+	cat <<-\EOF >expected &&
+	diff --git a/x b/x
+	--- a/x
+	+++ b/x
+	@@ -1,6 +1,11 @@
+	+change
+	 1
+	 2
+	 3
+	+
+	 4
+	+
+	 5
+	+
+	 6
+	+change
+	EOF
+	compare_diff_patch expected out.tmp
+
+ok 46 - ignore-blank-lines: spaces coalesce
+
+expecting success of 4015.47 'ignore-blank-lines: mix changes and blank lines': 
+	test_seq 16 >x &&
+	git update-index x &&
+	cat <<-\EOF >x &&
+	change
+	1
+	2
+
+	3
+	4
+	5
+	change
+	6
+	7
+	8
+
+	9
+	10
+	11
+	change
+	12
+	13
+	14
+
+	15
+	16
+	change
+	EOF
+	git diff --ignore-blank-lines >out.tmp &&
+	cat <<-\EOF >expected &&
+	diff --git a/x b/x
+	--- a/x
+	+++ b/x
+	@@ -1,8 +1,11 @@
+	+change
+	 1
+	 2
+	+
+	 3
+	 4
+	 5
+	+change
+	 6
+	 7
+	 8
+	@@ -9,8 +13,11 @@
+	 9
+	 10
+	 11
+	+change
+	 12
+	 13
+	 14
+	+
+	 15
+	 16
+	+change
+	EOF
+	compare_diff_patch expected out.tmp
+
+ok 47 - ignore-blank-lines: mix changes and blank lines
+
+expecting success of 4015.48 'check mixed spaces and tabs in indent': 
+	# This is indented with SP HT SP.
+	echo " 	 foo();" >x &&
+	test_must_fail git diff --check >check &&
+	grep "space before tab in indent" check
+
+x:1: space before tab in indent.
+ok 48 - check mixed spaces and tabs in indent
+
+expecting success of 4015.49 'check mixed tabs and spaces in indent': 
+	# This is indented with HT SP HT.
+	echo "	 	foo();" >x &&
+	test_must_fail git diff --check >check &&
+	grep "space before tab in indent" check
+
+x:1: space before tab in indent.
+ok 49 - check mixed tabs and spaces in indent
+
+expecting success of 4015.50 'check with no whitespace errors': 
+	git commit -m "snapshot" &&
+	echo "foo();" >x &&
+	git diff --check
+
+[master (root-commit) e1e82b5] snapshot
+ Author: A U Thor <author@example.com>
+ 1 file changed, 16 insertions(+)
+ create mode 100644 x
+ok 50 - check with no whitespace errors
+
+expecting success of 4015.51 'check with trailing whitespace': 
+	echo "foo(); " >x &&
+	test_must_fail git diff --check
+
+x:1: trailing whitespace.
++foo(); 
+ok 51 - check with trailing whitespace
+
+expecting success of 4015.52 'check with space before tab in indent': 
+	# indent has space followed by hard tab
+	echo " 	foo();" >x &&
+	test_must_fail git diff --check
+
+x:1: space before tab in indent.
++ 	foo();
+ok 52 - check with space before tab in indent
+
+expecting success of 4015.53 '--check and --exit-code are not exclusive': 
+	git checkout x &&
+	git diff --check --exit-code
+
+Updated 1 path from the index
+ok 53 - --check and --exit-code are not exclusive
+
+expecting success of 4015.54 '--check and --quiet are not exclusive': 
+	git diff --check --quiet
+
+ok 54 - --check and --quiet are not exclusive
+
+expecting success of 4015.55 '-w and --exit-code interact sensibly': 
+	test_when_finished "git checkout x" &&
+	{
+		test_seq 15 &&
+		echo " 16"
+	} >x &&
+	test_must_fail git diff --exit-code &&
+	git diff -w >actual &&
+	test_must_be_empty actual &&
+	git diff -w --exit-code
+
+diff --git a/x b/x
+index 469c856..bd0db19 100644
+--- a/x
++++ b/x
+@@ -13,4 +13,4 @@
+ 13
+ 14
+ 15
+-16
++ 16
+Updated 1 path from the index
+ok 55 - -w and --exit-code interact sensibly
+
+expecting success of 4015.56 '-I and --exit-code interact sensibly': 
+	test_when_finished "git checkout x" &&
+	{
+		test_seq 15 &&
+		echo " 16"
+	} >x &&
+	test_must_fail git diff --exit-code &&
+	git diff -I. >actual &&
+	test_must_be_empty actual &&
+	git diff -I. --exit-code
+
+diff --git a/x b/x
+index 469c856..bd0db19 100644
+--- a/x
++++ b/x
+@@ -13,4 +13,4 @@
+ 13
+ 14
+ 15
+-16
++ 16
+Updated 1 path from the index
+ok 56 - -I and --exit-code interact sensibly
+
+expecting success of 4015.57 'check staged with no whitespace errors': 
+	echo "foo();" >x &&
+	git add x &&
+	git diff --cached --check
+
+ok 57 - check staged with no whitespace errors
+
+expecting success of 4015.58 'check staged with trailing whitespace': 
+	echo "foo(); " >x &&
+	git add x &&
+	test_must_fail git diff --cached --check
+
+x:1: trailing whitespace.
++foo(); 
+ok 58 - check staged with trailing whitespace
+
+expecting success of 4015.59 'check staged with space before tab in indent': 
+	# indent has space followed by hard tab
+	echo " 	foo();" >x &&
+	git add x &&
+	test_must_fail git diff --cached --check
+
+x:1: space before tab in indent.
++ 	foo();
+ok 59 - check staged with space before tab in indent
+
+expecting success of 4015.60 'check with no whitespace errors (diff-index)': 
+	echo "foo();" >x &&
+	git add x &&
+	git diff-index --check HEAD
+
+ok 60 - check with no whitespace errors (diff-index)
+
+expecting success of 4015.61 'check with trailing whitespace (diff-index)': 
+	echo "foo(); " >x &&
+	git add x &&
+	test_must_fail git diff-index --check HEAD
+
+x:1: trailing whitespace.
++foo(); 
+ok 61 - check with trailing whitespace (diff-index)
+
+expecting success of 4015.62 'check with space before tab in indent (diff-index)': 
+	# indent has space followed by hard tab
+	echo " 	foo();" >x &&
+	git add x &&
+	test_must_fail git diff-index --check HEAD
+
+x:1: space before tab in indent.
++ 	foo();
+ok 62 - check with space before tab in indent (diff-index)
+
+expecting success of 4015.63 'check staged with no whitespace errors (diff-index)': 
+	echo "foo();" >x &&
+	git add x &&
+	git diff-index --cached --check HEAD
+
+ok 63 - check staged with no whitespace errors (diff-index)
+
+expecting success of 4015.64 'check staged with trailing whitespace (diff-index)': 
+	echo "foo(); " >x &&
+	git add x &&
+	test_must_fail git diff-index --cached --check HEAD
+
+x:1: trailing whitespace.
++foo(); 
+ok 64 - check staged with trailing whitespace (diff-index)
+
+expecting success of 4015.65 'check staged with space before tab in indent (diff-index)': 
+	# indent has space followed by hard tab
+	echo " 	foo();" >x &&
+	git add x &&
+	test_must_fail git diff-index --cached --check HEAD
+
+x:1: space before tab in indent.
++ 	foo();
+ok 65 - check staged with space before tab in indent (diff-index)
+
+expecting success of 4015.66 'check with no whitespace errors (diff-tree)': 
+	echo "foo();" >x &&
+	git commit -m "new commit" x &&
+	git diff-tree --check HEAD^ HEAD
+
+[master 8a0c590] new commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 16 deletions(-)
+ok 66 - check with no whitespace errors (diff-tree)
+
+expecting success of 4015.67 'check with trailing whitespace (diff-tree)': 
+	echo "foo(); " >x &&
+	git commit -m "another commit" x &&
+	test_must_fail git diff-tree --check HEAD^ HEAD
+
+[master e1bfb27] another commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+x:1: trailing whitespace.
++foo(); 
+ok 67 - check with trailing whitespace (diff-tree)
+
+expecting success of 4015.68 'check with space before tab in indent (diff-tree)': 
+	# indent has space followed by hard tab
+	echo " 	foo();" >x &&
+	git commit -m "yet another" x &&
+	test_must_fail git diff-tree --check HEAD^ HEAD
+
+[master 59fa0e9] yet another
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+x:1: space before tab in indent.
++ 	foo();
+ok 68 - check with space before tab in indent (diff-tree)
+
+expecting success of 4015.69 'check with ignored trailing whitespace attr (diff-tree)': 
+	test_when_finished "git reset --hard HEAD^" &&
+
+	# create a whitespace error that should be ignored
+	echo "* -whitespace" >.gitattributes &&
+	git add .gitattributes &&
+	echo "foo(); " >x &&
+	git add x &&
+	git commit -m "add trailing space" &&
+
+	# with a worktree diff-tree ignores the whitespace error
+	git diff-tree --root --check HEAD &&
+
+	# without a worktree diff-tree still ignores the whitespace error
+	git -C .git diff-tree --root --check HEAD
+
+[master fd6b52c] add trailing space
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 .gitattributes
+fd6b52cef13aeb6b7f1885c9b07026c3aa5a1035
+fd6b52cef13aeb6b7f1885c9b07026c3aa5a1035
+HEAD is now at 59fa0e9 yet another
+ok 69 - check with ignored trailing whitespace attr (diff-tree)
+
+expecting success of 4015.70 'check trailing whitespace (trailing-space: off)': 
+	git config core.whitespace "-trailing-space" &&
+	echo "foo ();   " >x &&
+	git diff --check
+
+ok 70 - check trailing whitespace (trailing-space: off)
+
+expecting success of 4015.71 'check trailing whitespace (trailing-space: on)': 
+	git config core.whitespace "trailing-space" &&
+	echo "foo ();   " >x &&
+	test_must_fail git diff --check
+
+x:1: trailing whitespace.
++foo ();   
+ok 71 - check trailing whitespace (trailing-space: on)
+
+expecting success of 4015.72 'check space before tab in indent (space-before-tab: off)': 
+	# indent contains space followed by HT
+	git config core.whitespace "-space-before-tab" &&
+	echo " 	foo ();" >x &&
+	git diff --check
+
+ok 72 - check space before tab in indent (space-before-tab: off)
+
+expecting success of 4015.73 'check space before tab in indent (space-before-tab: on)': 
+	# indent contains space followed by HT
+	git config core.whitespace "space-before-tab" &&
+	echo " 	foo ();   " >x &&
+	test_must_fail git diff --check
+
+x:1: trailing whitespace, space before tab in indent.
++ 	foo ();   
+ok 73 - check space before tab in indent (space-before-tab: on)
+
+expecting success of 4015.74 'check spaces as indentation (indent-with-non-tab: off)': 
+	git config core.whitespace "-indent-with-non-tab" &&
+	echo "        foo ();" >x &&
+	git diff --check
+
+ok 74 - check spaces as indentation (indent-with-non-tab: off)
+
+expecting success of 4015.75 'check spaces as indentation (indent-with-non-tab: on)': 
+	git config core.whitespace "indent-with-non-tab" &&
+	echo "        foo ();" >x &&
+	test_must_fail git diff --check
+
+x:1: indent with spaces.
++        foo ();
+ok 75 - check spaces as indentation (indent-with-non-tab: on)
+
+expecting success of 4015.76 'ditto, but tabwidth=9': 
+	git config core.whitespace "indent-with-non-tab,tabwidth=9" &&
+	git diff --check
+
+ok 76 - ditto, but tabwidth=9
+
+expecting success of 4015.77 'check tabs and spaces as indentation (indent-with-non-tab: on)': 
+	git config core.whitespace "indent-with-non-tab" &&
+	echo "	                foo ();" >x &&
+	test_must_fail git diff --check
+
+x:1: indent with spaces.
++	                foo ();
+ok 77 - check tabs and spaces as indentation (indent-with-non-tab: on)
+
+expecting success of 4015.78 'ditto, but tabwidth=10': 
+	git config core.whitespace "indent-with-non-tab,tabwidth=10" &&
+	test_must_fail git diff --check
+
+x:1: indent with spaces.
++	                foo ();
+ok 78 - ditto, but tabwidth=10
+
+expecting success of 4015.79 'ditto, but tabwidth=20': 
+	git config core.whitespace "indent-with-non-tab,tabwidth=20" &&
+	git diff --check
+
+ok 79 - ditto, but tabwidth=20
+
+expecting success of 4015.80 'check tabs as indentation (tab-in-indent: off)': 
+	git config core.whitespace "-tab-in-indent" &&
+	echo "	foo ();" >x &&
+	git diff --check
+
+ok 80 - check tabs as indentation (tab-in-indent: off)
+
+expecting success of 4015.81 'check tabs as indentation (tab-in-indent: on)': 
+	git config core.whitespace "tab-in-indent" &&
+	echo "	foo ();" >x &&
+	test_must_fail git diff --check
+
+x:1: tab in indent.
++	foo ();
+ok 81 - check tabs as indentation (tab-in-indent: on)
+
+expecting success of 4015.82 'check tabs and spaces as indentation (tab-in-indent: on)': 
+	git config core.whitespace "tab-in-indent" &&
+	echo "	                foo ();" >x &&
+	test_must_fail git diff --check
+
+x:1: tab in indent.
++	                foo ();
+ok 82 - check tabs and spaces as indentation (tab-in-indent: on)
+
+expecting success of 4015.83 'ditto, but tabwidth=1 (must be irrelevant)': 
+	git config core.whitespace "tab-in-indent,tabwidth=1" &&
+	test_must_fail git diff --check
+
+x:1: tab in indent.
++	                foo ();
+ok 83 - ditto, but tabwidth=1 (must be irrelevant)
+
+expecting success of 4015.84 'check tab-in-indent and indent-with-non-tab conflict': 
+	git config core.whitespace "tab-in-indent,indent-with-non-tab" &&
+	echo "foo ();" >x &&
+	test_must_fail git diff --check
+
+fatal: cannot enforce both tab-in-indent and indent-with-non-tab
+ok 84 - check tab-in-indent and indent-with-non-tab conflict
+
+expecting success of 4015.85 'check tab-in-indent excluded from wildcard whitespace attribute': 
+	git config --unset core.whitespace &&
+	echo "x whitespace" >.gitattributes &&
+	echo "	  foo ();" >x &&
+	git diff --check &&
+	rm -f .gitattributes
+
+ok 85 - check tab-in-indent excluded from wildcard whitespace attribute
+
+expecting success of 4015.86 'line numbers in --check output are correct': 
+	echo "" >x &&
+	echo "foo(); " >>x &&
+	test_must_fail git diff --check >check &&
+	grep "x:2:" check
+
+x:2: trailing whitespace.
+ok 86 - line numbers in --check output are correct
+
+expecting success of 4015.87 'checkdiff detects new trailing blank lines (1)': 
+	echo "foo();" >x &&
+	echo "" >>x &&
+	test_must_fail git diff --check >check &&
+	grep "new blank line" check
+
+x:2: new blank line at EOF.
+ok 87 - checkdiff detects new trailing blank lines (1)
+
+expecting success of 4015.88 'checkdiff detects new trailing blank lines (2)': 
+	test_write_lines a b "" "" >x &&
+	git add x &&
+	test_write_lines a "" "" "" "" >x &&
+	test_must_fail git diff --check >check &&
+	grep "new blank line" check
+
+x:2: new blank line at EOF.
+ok 88 - checkdiff detects new trailing blank lines (2)
+
+expecting success of 4015.89 'checkdiff allows new blank lines': 
+	git checkout x &&
+	mv x y &&
+	(
+		echo "/* This is new */" &&
+		echo "" &&
+		cat y
+	) >x &&
+	git diff --check
+
+Updated 1 path from the index
+ok 89 - checkdiff allows new blank lines
+
+expecting success of 4015.90 'whitespace-only changes not reported (diff)': 
+	git reset --hard &&
+	echo >x "hello world" &&
+	git add x &&
+	git commit -m "hello 1" &&
+	echo >x "hello  world" &&
+	git diff -b >actual &&
+	test_must_be_empty actual
+
+HEAD is now at 59fa0e9 yet another
+[master 5a2317e] hello 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 90 - whitespace-only changes not reported (diff)
+
+expecting success of 4015.91 'whitespace-only changes not reported (diffstat)': 
+	# reuse state from previous test
+	git diff --stat -b >actual &&
+	test_must_be_empty actual
+
+ok 91 - whitespace-only changes not reported (diffstat)
+
+expecting success of 4015.92 'whitespace changes with modification reported (diffstat)': 
+	git reset --hard &&
+	echo >x "hello  world" &&
+	git update-index --chmod=+x x &&
+	git diff --stat --cached -b >actual &&
+	cat <<-EOF >expect &&
+	 x | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	test_cmp expect actual
+
+HEAD is now at 5a2317e hello 1
+ok 92 - whitespace changes with modification reported (diffstat)
+
+expecting success of 4015.93 'whitespace-only changes reported across renames (diffstat)': 
+	git reset --hard &&
+	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
+	git add x &&
+	git commit -m "base" &&
+	sed -e "5s/^/ /" x >z &&
+	git rm x &&
+	git add z &&
+	git diff -w -M --cached --stat >actual &&
+	cat <<-EOF >expect &&
+	 x => z | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	test_cmp expect actual
+
+HEAD is now at 5a2317e hello 1
+[master bb02800] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+rm 'x'
+ok 93 - whitespace-only changes reported across renames (diffstat)
+
+expecting success of 4015.94 'whitespace-only changes reported across renames': 
+	git reset --hard HEAD~1 &&
+	for i in 1 2 3 4 5 6 7 8 9; do echo "$i$i$i$i$i$i" || return 1; done >x &&
+	git add x &&
+	hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$hash_x") &&
+	git commit -m "base" &&
+	sed -e "5s/^/ /" x >z &&
+	git rm x &&
+	git add z &&
+	hash_z=$(git hash-object z) &&
+	after=$(git rev-parse --short "$hash_z") &&
+	git diff -w -M --cached >actual.raw &&
+	sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" actual.raw >actual &&
+	cat <<-EOF >expect &&
+	diff --git a/x b/z
+	similarity index NUM%
+	rename from x
+	rename to z
+	index $before..$after 100644
+	EOF
+	test_cmp expect actual
+
+HEAD is now at 5a2317e hello 1
+[master bb02800] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+rm 'x'
+ok 94 - whitespace-only changes reported across renames
+
+expecting success of 4015.95 'rename empty': 
+	git reset --hard &&
+	>empty &&
+	git add empty &&
+	git commit -m empty &&
+	git mv empty void &&
+	git diff -w --cached -M >current &&
+	test_cmp expected current
+
+HEAD is now at bb02800 base
+[master c4f276a] empty
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 empty
+ok 95 - rename empty
+
+expecting success of 4015.96 'combined diff with autocrlf conversion': 
+
+	git reset --hard &&
+	test_commit "one side" x hello one-side &&
+	git checkout HEAD^ &&
+	echo >x goodbye &&
+	git commit -m "the other side" x &&
+	git config core.autocrlf true &&
+	test_must_fail git merge one-side >actual &&
+	test_grep "Automatic merge failed" actual &&
+
+	git diff >actual.raw &&
+	sed -e "1,/^@@@/d" actual.raw >actual &&
+	! grep "^-" actual
+
+
+HEAD is now at c4f276a empty
+[master daf548d] one side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+Note: switching to 'HEAD^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at c4f276a empty
+[detached HEAD fbb6449] the other side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+Automatic merge failed; fix conflicts and then commit the result.
+ok 96 - combined diff with autocrlf conversion
+
+expecting success of 4015.97 'setup diff colors': 
+	git config color.diff.plain normal &&
+	git config color.diff.meta bold &&
+	git config color.diff.frag cyan &&
+	git config color.diff.func normal &&
+	git config color.diff.old red &&
+	git config color.diff.new green &&
+	git config color.diff.commit yellow &&
+	git config color.diff.whitespace blue &&
+
+	git config core.autocrlf false
+
+ok 97 - setup diff colors
+
+expecting success of 4015.98 'diff that introduces a line with only tabs': 
+	git config core.whitespace blank-at-eol &&
+	git reset --hard &&
+	echo "test" >x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
+	git commit -m "initial" x &&
+	echo "{NTN}" | tr "NT" "\n\t" >>x &&
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
+	git diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
+
+	cat >expected <<-EOF &&
+	<BOLD>diff --git a/x b/x<RESET>
+	<BOLD>index $before..$after 100644<RESET>
+	<BOLD>--- a/x<RESET>
+	<BOLD>+++ b/x<RESET>
+	<CYAN>@@ -1 +1,4 @@<RESET>
+	 test<RESET>
+	<GREEN>+<RESET><GREEN>{<RESET>
+	<GREEN>+<RESET><BLUE>	<RESET>
+	<GREEN>+<RESET><GREEN>}<RESET>
+	EOF
+
+	test_cmp expected current
+
+HEAD is now at fbb6449 the other side
+[detached HEAD b654c4d] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 98 - diff that introduces a line with only tabs
+
+expecting success of 4015.99 'diff that introduces and removes ws breakages': 
+	git reset --hard &&
+	{
+		echo "0. blank-at-eol " &&
+		echo "1. blank-at-eol "
+	} >x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
+	git commit -a --allow-empty -m preimage &&
+	{
+		echo "0. blank-at-eol " &&
+		echo "1. still-blank-at-eol " &&
+		echo "2. and a new line "
+	} >x &&
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
+
+	git diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
+
+	cat >expected <<-EOF &&
+	<BOLD>diff --git a/x b/x<RESET>
+	<BOLD>index $before..$after 100644<RESET>
+	<BOLD>--- a/x<RESET>
+	<BOLD>+++ b/x<RESET>
+	<CYAN>@@ -1,2 +1,3 @@<RESET>
+	 0. blank-at-eol <RESET>
+	<RED>-1. blank-at-eol <RESET>
+	<GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
+	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
+	EOF
+
+	test_cmp expected current
+
+HEAD is now at b654c4d initial
+[detached HEAD a8a97bc] preimage
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ok 99 - diff that introduces and removes ws breakages
+
+expecting success of 4015.100 'ws-error-highlight test setup': 
+
+	git reset --hard &&
+	{
+		echo "0. blank-at-eol " &&
+		echo "1. blank-at-eol "
+	} >x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
+	git commit -a --allow-empty -m preimage &&
+	{
+		echo "0. blank-at-eol " &&
+		echo "1. still-blank-at-eol " &&
+		echo "2. and a new line "
+	} >x &&
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
+
+	cat >expect.default-old <<-EOF &&
+	<BOLD>diff --git a/x b/x<RESET>
+	<BOLD>index $before..$after 100644<RESET>
+	<BOLD>--- a/x<RESET>
+	<BOLD>+++ b/x<RESET>
+	<CYAN>@@ -1,2 +1,3 @@<RESET>
+	 0. blank-at-eol <RESET>
+	<RED>-<RESET><RED>1. blank-at-eol<RESET><BLUE> <RESET>
+	<GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
+	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
+	EOF
+
+	cat >expect.all <<-EOF &&
+	<BOLD>diff --git a/x b/x<RESET>
+	<BOLD>index $before..$after 100644<RESET>
+	<BOLD>--- a/x<RESET>
+	<BOLD>+++ b/x<RESET>
+	<CYAN>@@ -1,2 +1,3 @@<RESET>
+	 <RESET>0. blank-at-eol<RESET><BLUE> <RESET>
+	<RED>-<RESET><RED>1. blank-at-eol<RESET><BLUE> <RESET>
+	<GREEN>+<RESET><GREEN>1. still-blank-at-eol<RESET><BLUE> <RESET>
+	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
+	EOF
+
+	cat >expect.none <<-EOF
+	<BOLD>diff --git a/x b/x<RESET>
+	<BOLD>index $before..$after 100644<RESET>
+	<BOLD>--- a/x<RESET>
+	<BOLD>+++ b/x<RESET>
+	<CYAN>@@ -1,2 +1,3 @@<RESET>
+	 0. blank-at-eol <RESET>
+	<RED>-1. blank-at-eol <RESET>
+	<GREEN>+1. still-blank-at-eol <RESET>
+	<GREEN>+2. and a new line <RESET>
+	EOF
+
+
+HEAD is now at a8a97bc preimage
+[detached HEAD 641766e] preimage
+ Author: A U Thor <author@example.com>
+ok 100 - ws-error-highlight test setup
+
+expecting success of 4015.101 'test --ws-error-highlight option': 
+
+	git diff --color --ws-error-highlight=default,old >current.raw &&
+	test_decode_color <current.raw >current &&
+	test_cmp expect.default-old current &&
+
+	git diff --color --ws-error-highlight=all >current.raw &&
+	test_decode_color <current.raw >current &&
+	test_cmp expect.all current &&
+
+	git diff --color --ws-error-highlight=none >current.raw &&
+	test_decode_color <current.raw >current &&
+	test_cmp expect.none current
 
-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
-	
-ok 177 - git diff --dirstat-by-file initial rearrange # magic is (not used)
 
-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
-	
-ok 178 - git diff --dirstat --cc master~1 master # magic is (not used)
+ok 101 - test --ws-error-highlight option
 
-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
-	
-ok 179 - git diff --raw initial # magic is (not used)
+expecting success of 4015.102 'test diff.wsErrorHighlight config': 
 
-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
-	
-ok 180 - git diff --raw initial # magic is noellipses
+	git -c diff.wsErrorHighlight=default,old diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
+	test_cmp expect.default-old current &&
 
-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
-	
-ok 181 - git diff --raw --abbrev=4 initial # magic is (not used)
+	git -c diff.wsErrorHighlight=all diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
+	test_cmp expect.all current &&
 
-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
-	
-ok 182 - git diff --raw --abbrev=4 initial # magic is noellipses
+	git -c diff.wsErrorHighlight=none diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
+	test_cmp expect.none current
 
-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
-	
-ok 183 - git diff --raw --no-abbrev initial # magic is (not used)
 
-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
-	
-ok 184 - git diff --no-index --raw dir2 dir # magic is (not used)
+ok 102 - test diff.wsErrorHighlight config
 
-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
-	
-ok 185 - git diff --no-index --raw dir2 dir # magic is noellipses
+expecting success of 4015.103 'option overrides diff.wsErrorHighlight': 
 
-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
-	
-ok 186 - git diff --no-index --raw --abbrev=4 dir2 dir # magic is (not used)
+	git -c diff.wsErrorHighlight=none \
+		diff --color --ws-error-highlight=default,old >current.raw &&
+	test_decode_color <current.raw >current &&
+	test_cmp expect.default-old current &&
 
-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
-	
-ok 187 - git diff --no-index --raw --abbrev=4 dir2 dir # magic is noellipses
+	git -c diff.wsErrorHighlight=default \
+		diff --color --ws-error-highlight=all >current.raw &&
+	test_decode_color <current.raw >current &&
+	test_cmp expect.all current &&
 
-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
-	
-ok 188 - git diff --no-index --raw --no-abbrev dir2 dir # magic is (not used)
+	git -c diff.wsErrorHighlight=all \
+		diff --color --ws-error-highlight=none >current.raw &&
+	test_decode_color <current.raw >current &&
+	test_cmp expect.none current
 
-expecting success of 4013.189 'git diff-tree --pretty --root --stat --compact-summary initial # magic is (not used)': 
+
+ok 103 - option overrides diff.wsErrorHighlight
+
+expecting success of 4015.104 'detect moved code, complete file': 
+	git reset --hard &&
+	cat <<-\EOF >test.c &&
+	#include<stdio.h>
+	main()
+	{
+	printf("Hello World");
+	}
+	EOF
+	git add test.c &&
+	git commit -m "add main function" &&
+	file=$(git rev-parse --short HEAD:test.c) &&
+	git mv test.c main.c &&
+	test_config color.diff.oldMoved "normal red" &&
+	test_config color.diff.newMoved "normal green" &&
+	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat >expected <<-EOF &&
+	<BOLD>diff --git a/main.c b/main.c<RESET>
+	<BOLD>new file mode 100644<RESET>
+	<BOLD>index 0000000..$file<RESET>
+	<BOLD>--- /dev/null<RESET>
+	<BOLD>+++ b/main.c<RESET>
+	<CYAN>@@ -0,0 +1,5 @@<RESET>
+	<BGREEN>+<RESET><BGREEN>#include<stdio.h><RESET>
+	<BGREEN>+<RESET><BGREEN>main()<RESET>
+	<BGREEN>+<RESET><BGREEN>{<RESET>
+	<BGREEN>+<RESET><BGREEN>printf("Hello World");<RESET>
+	<BGREEN>+<RESET><BGREEN>}<RESET>
+	<BOLD>diff --git a/test.c b/test.c<RESET>
+	<BOLD>deleted file mode 100644<RESET>
+	<BOLD>index $file..0000000<RESET>
+	<BOLD>--- a/test.c<RESET>
+	<BOLD>+++ /dev/null<RESET>
+	<CYAN>@@ -1,5 +0,0 @@<RESET>
+	<BRED>-#include<stdio.h><RESET>
+	<BRED>-main()<RESET>
+	<BRED>-{<RESET>
+	<BRED>-printf("Hello World");<RESET>
+	<BRED>-}<RESET>
+	EOF
+
+	test_cmp expected actual
+
+HEAD is now at 641766e preimage
+[detached HEAD 36350aa] add main function
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 test.c
+ok 104 - detect moved code, complete file
+
+expecting success of 4015.105 'detect malicious moved code, inside file': 
+	test_config color.diff.oldMoved "normal red" &&
+	test_config color.diff.newMoved "normal green" &&
+	test_config color.diff.oldMovedAlternative "blue" &&
+	test_config color.diff.newMovedAlternative "yellow" &&
+	git reset --hard &&
+	cat <<-\EOF >main.c &&
+		#include<stdio.h>
+		int stuff()
 		{
-			echo "$ git $cmd"
-			case "$magic" in
-			"")
-				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
-			noellipses)
-				git $cmd ;;
-			esac |
-			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
-			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
-			echo "\$"
-		} >"$actual" &&
-		if test -f "$expect"
-		then
-			process_diffs "$actual" >actual &&
-			process_diffs "$expect" >expect &&
-			case $cmd in
-			*format-patch* | *-stat*)
-				test_cmp expect 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 189 - git diff-tree --pretty --root --stat --compact-summary initial # magic is (not used)
+			printf("Hello ");
+			printf("World\n");
+		}
 
-expecting success of 4013.190 'git diff-tree --pretty -R --root --stat --compact-summary initial # magic is (not used)': 
+		int secure_foo(struct user *u)
 		{
-			echo "$ git $cmd"
-			case "$magic" in
-			"")
-				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
-			noellipses)
-				git $cmd ;;
-			esac |
-			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
-			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
-			echo "\$"
-		} >"$actual" &&
-		if test -f "$expect"
-		then
-			process_diffs "$actual" >actual &&
-			process_diffs "$expect" >expect &&
-			case $cmd in
-			*format-patch* | *-stat*)
-				test_cmp expect 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 190 - git diff-tree --pretty -R --root --stat --compact-summary initial # magic is (not used)
+			if (!u->is_allowed_foo)
+				return;
+			foo(u);
+		}
 
-expecting success of 4013.191 'git diff-tree --pretty note # magic is (not used)': 
+		int main()
 		{
-			echo "$ git $cmd"
-			case "$magic" in
-			"")
-				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
-			noellipses)
-				git $cmd ;;
-			esac |
-			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
-			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
-			echo "\$"
-		} >"$actual" &&
-		if test -f "$expect"
-		then
-			process_diffs "$actual" >actual &&
-			process_diffs "$expect" >expect &&
-			case $cmd in
-			*format-patch* | *-stat*)
-				test_cmp expect 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 191 - git diff-tree --pretty note # magic is (not used)
+			foo();
+		}
+	EOF
+	cat <<-\EOF >test.c &&
+		#include<stdio.h>
+		int bar()
+		{
+			printf("Hello World, but different\n");
+		}
 
-expecting success of 4013.192 'git diff-tree --pretty --notes note # magic is (not used)': 
+		int another_function()
 		{
-			echo "$ git $cmd"
-			case "$magic" in
-			"")
-				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
-			noellipses)
-				git $cmd ;;
-			esac |
-			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
-			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
-			echo "\$"
-		} >"$actual" &&
-		if test -f "$expect"
-		then
-			process_diffs "$actual" >actual &&
-			process_diffs "$expect" >expect &&
-			case $cmd in
-			*format-patch* | *-stat*)
-				test_cmp expect 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 192 - git diff-tree --pretty --notes note # magic is (not used)
+			bar();
+		}
+	EOF
+	git add main.c test.c &&
+	git commit -m "add main and test file" &&
+	before_main=$(git rev-parse --short HEAD:main.c) &&
+	before_test=$(git rev-parse --short HEAD:test.c) &&
+	cat <<-\EOF >main.c &&
+		#include<stdio.h>
+		int stuff()
+		{
+			printf("Hello ");
+			printf("World\n");
+		}
 
-expecting success of 4013.193 'git diff-tree --format=%N note # magic is (not used)': 
+		int main()
 		{
-			echo "$ git $cmd"
-			case "$magic" in
-			"")
-				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
-			noellipses)
-				git $cmd ;;
-			esac |
-			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
-			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
-			echo "\$"
-		} >"$actual" &&
-		if test -f "$expect"
-		then
-			process_diffs "$actual" >actual &&
-			process_diffs "$expect" >expect &&
-			case $cmd in
-			*format-patch* | *-stat*)
-				test_cmp expect 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 193 - git diff-tree --format=%N note # magic is (not used)
+			foo();
+		}
+	EOF
+	cat <<-\EOF >test.c &&
+		#include<stdio.h>
+		int bar()
+		{
+			printf("Hello World, but different\n");
+		}
 
-expecting success of 4013.194 'git diff-tree --stat --compact-summary initial mode # magic is (not used)': 
+		int secure_foo(struct user *u)
 		{
-			echo "$ git $cmd"
-			case "$magic" in
-			"")
-				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
-			noellipses)
-				git $cmd ;;
-			esac |
-			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
-			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
-			echo "\$"
-		} >"$actual" &&
-		if test -f "$expect"
-		then
-			process_diffs "$actual" >actual &&
-			process_diffs "$expect" >expect &&
-			case $cmd in
-			*format-patch* | *-stat*)
-				test_cmp expect 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 194 - git diff-tree --stat --compact-summary initial mode # magic is (not used)
+			foo(u);
+			if (!u->is_allowed_foo)
+				return;
+		}
 
-expecting success of 4013.195 'git diff-tree -R --stat --compact-summary initial mode # magic is (not used)': 
+		int another_function()
 		{
-			echo "$ git $cmd"
-			case "$magic" in
-			"")
-				GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
-			noellipses)
-				git $cmd ;;
-			esac |
-			sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
-			    -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
-			echo "\$"
-		} >"$actual" &&
-		if test -f "$expect"
-		then
-			process_diffs "$actual" >actual &&
-			process_diffs "$expect" >expect &&
-			case $cmd in
-			*format-patch* | *-stat*)
-				test_cmp expect 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)
+			bar();
+		}
+	EOF
+	hash_main=$(git hash-object main.c) &&
+	after_main=$(git rev-parse --short "$hash_main") &&
+	hash_test=$(git hash-object test.c) &&
+	after_test=$(git rev-parse --short "$hash_test") &&
+	git diff HEAD --no-renames --color-moved=zebra --color >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat <<-EOF >expected &&
+	<BOLD>diff --git a/main.c b/main.c<RESET>
+	<BOLD>index $before_main..$after_main 100644<RESET>
+	<BOLD>--- a/main.c<RESET>
+	<BOLD>+++ b/main.c<RESET>
+	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
+	 printf("World\n");<RESET>
+	 }<RESET>
+	 <RESET>
+	<BRED>-int secure_foo(struct user *u)<RESET>
+	<BRED>-{<RESET>
+	<BLUE>-if (!u->is_allowed_foo)<RESET>
+	<BLUE>-return;<RESET>
+	<RED>-foo(u);<RESET>
+	<RED>-}<RESET>
+	<RED>-<RESET>
+	 int main()<RESET>
+	 {<RESET>
+	 foo();<RESET>
+	<BOLD>diff --git a/test.c b/test.c<RESET>
+	<BOLD>index $before_test..$after_test 100644<RESET>
+	<BOLD>--- a/test.c<RESET>
+	<BOLD>+++ b/test.c<RESET>
+	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
+	 printf("Hello World, but different\n");<RESET>
+	 }<RESET>
+	 <RESET>
+	<BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
+	<BGREEN>+<RESET><BGREEN>{<RESET>
+	<GREEN>+<RESET><GREEN>foo(u);<RESET>
+	<BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
+	<BGREEN>+<RESET><BGREEN>return;<RESET>
+	<GREEN>+<RESET><GREEN>}<RESET>
+	<GREEN>+<RESET>
+	 int another_function()<RESET>
+	 {<RESET>
+	 bar();<RESET>
+	EOF
 
-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
 
-ok 196 - log -m matches pure log
+HEAD is now at 36350aa add main function
+[detached HEAD 727fc3d] add main and test file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 25 insertions(+), 2 deletions(-)
+ create mode 100644 main.c
+ok 105 - detect malicious moved code, inside file
+
+expecting success of 4015.106 'plain moved code, inside file': 
+	test_config color.diff.oldMoved "normal red" &&
+	test_config color.diff.newMoved "normal green" &&
+	test_config color.diff.oldMovedAlternative "blue" &&
+	test_config color.diff.newMovedAlternative "yellow" &&
+	# needs previous test as setup
+	git diff HEAD --no-renames --color-moved=plain --color >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat <<-EOF >expected &&
+	<BOLD>diff --git a/main.c b/main.c<RESET>
+	<BOLD>index $before_main..$after_main 100644<RESET>
+	<BOLD>--- a/main.c<RESET>
+	<BOLD>+++ b/main.c<RESET>
+	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
+	 printf("World\n");<RESET>
+	 }<RESET>
+	 <RESET>
+	<BRED>-int secure_foo(struct user *u)<RESET>
+	<BRED>-{<RESET>
+	<BRED>-if (!u->is_allowed_foo)<RESET>
+	<BRED>-return;<RESET>
+	<BRED>-foo(u);<RESET>
+	<BRED>-}<RESET>
+	<BRED>-<RESET>
+	 int main()<RESET>
+	 {<RESET>
+	 foo();<RESET>
+	<BOLD>diff --git a/test.c b/test.c<RESET>
+	<BOLD>index $before_test..$after_test 100644<RESET>
+	<BOLD>--- a/test.c<RESET>
+	<BOLD>+++ b/test.c<RESET>
+	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
+	 printf("Hello World, but different\n");<RESET>
+	 }<RESET>
+	 <RESET>
+	<BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
+	<BGREEN>+<RESET><BGREEN>{<RESET>
+	<BGREEN>+<RESET><BGREEN>foo(u);<RESET>
+	<BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
+	<BGREEN>+<RESET><BGREEN>return;<RESET>
+	<BGREEN>+<RESET><BGREEN>}<RESET>
+	<BGREEN>+<RESET>
+	 int another_function()<RESET>
+	 {<RESET>
+	 bar();<RESET>
+	EOF
 
-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
 
-ok 197 - log --diff-merges=on matches --diff-merges=separate
+ok 106 - plain moved code, inside file
 
-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 &&
+expecting success of 4015.107 'detect blocks of moved code': 
+	git reset --hard &&
+	cat <<-\EOF >lines.txt &&
+		long line 1
+		long line 2
+		long line 3
+		line 4
+		line 5
+		line 6
+		line 7
+		line 8
+		line 9
+		line 10
+		line 11
+		line 12
+		line 13
+		long line 14
+		long line 15
+		long line 16
+	EOF
+	git add lines.txt &&
+	git commit -m "add poetry" &&
+	cat <<-\EOF >lines.txt &&
+		line 4
+		line 5
+		line 6
+		line 7
+		line 8
+		line 9
+		long line 1
+		long line 2
+		long line 3
+		long line 14
+		long line 15
+		long line 16
+		line 10
+		line 11
+		line 12
+		line 13
+	EOF
+	test_config color.diff.oldMoved "magenta" &&
+	test_config color.diff.newMoved "cyan" &&
+	test_config color.diff.oldMovedAlternative "blue" &&
+	test_config color.diff.newMovedAlternative "yellow" &&
+	test_config color.diff.oldMovedDimmed "normal magenta" &&
+	test_config color.diff.newMovedDimmed "normal cyan" &&
+	test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
+	test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
+	git diff HEAD --no-renames --color-moved=blocks --color >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,16 +1,16 @@<RESET>
+	<MAGENTA>-long line 1<RESET>
+	<MAGENTA>-long line 2<RESET>
+	<MAGENTA>-long line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	 line 6<RESET>
+	 line 7<RESET>
+	 line 8<RESET>
+	 line 9<RESET>
+	<CYAN>+<RESET><CYAN>long line 1<RESET>
+	<CYAN>+<RESET><CYAN>long line 2<RESET>
+	<CYAN>+<RESET><CYAN>long line 3<RESET>
+	<CYAN>+<RESET><CYAN>long line 14<RESET>
+	<CYAN>+<RESET><CYAN>long line 15<RESET>
+	<CYAN>+<RESET><CYAN>long line 16<RESET>
+	 line 10<RESET>
+	 line 11<RESET>
+	 line 12<RESET>
+	 line 13<RESET>
+	<MAGENTA>-long line 14<RESET>
+	<MAGENTA>-long line 15<RESET>
+	<MAGENTA>-long line 16<RESET>
+	EOF
 	test_cmp expected actual
 
-ok 198 - log --dd matches --diff-merges=1 -p
 
-expecting success of 4013.199 'deny wrong log.diffMerges config': 
-	test_config log.diffMerges wrong-value &&
-	test_expect_code 128 git log
+HEAD is now at 727fc3d add main and test file
+[detached HEAD 0f7fe07] add poetry
+ Author: A U Thor <author@example.com>
+ 1 file changed, 16 insertions(+)
+ create mode 100644 lines.txt
+ok 107 - detect blocks of moved code
 
-fatal: bad config variable 'log.diffmerges' in file '.git/config' at line 8
-ok 199 - deny wrong log.diffMerges config
+expecting success of 4015.108 'detect permutations inside moved code -- dimmed-zebra': 
+	# reuse setup from test before!
+	test_config color.diff.oldMoved "magenta" &&
+	test_config color.diff.newMoved "cyan" &&
+	test_config color.diff.oldMovedAlternative "blue" &&
+	test_config color.diff.newMovedAlternative "yellow" &&
+	test_config color.diff.oldMovedDimmed "normal magenta" &&
+	test_config color.diff.newMovedDimmed "normal cyan" &&
+	test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
+	test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
+	git diff HEAD --no-renames --color-moved=dimmed-zebra --color >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,16 +1,16 @@<RESET>
+	<BMAGENTA>-long line 1<RESET>
+	<BMAGENTA>-long line 2<RESET>
+	<BMAGENTA>-long line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	 line 6<RESET>
+	 line 7<RESET>
+	 line 8<RESET>
+	 line 9<RESET>
+	<BCYAN>+<RESET><BCYAN>long line 1<RESET>
+	<BCYAN>+<RESET><BCYAN>long line 2<RESET>
+	<CYAN>+<RESET><CYAN>long line 3<RESET>
+	<YELLOW>+<RESET><YELLOW>long line 14<RESET>
+	<BYELLOW>+<RESET><BYELLOW>long line 15<RESET>
+	<BYELLOW>+<RESET><BYELLOW>long line 16<RESET>
+	 line 10<RESET>
+	 line 11<RESET>
+	 line 12<RESET>
+	 line 13<RESET>
+	<BMAGENTA>-long line 14<RESET>
+	<BMAGENTA>-long line 15<RESET>
+	<BMAGENTA>-long line 16<RESET>
+	EOF
+	test_cmp expected actual
 
-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 &&
+ok 108 - detect permutations inside moved code -- dimmed-zebra
+
+expecting success of 4015.109 'zebra alternate color is only used when necessary': 
+	cat >old.txt <<-\EOF &&
+	line 1A should be marked as oldMoved newMovedAlternate
+	line 1B should be marked as oldMoved newMovedAlternate
+	unchanged
+	line 2A should be marked as oldMoved newMovedAlternate
+	line 2B should be marked as oldMoved newMovedAlternate
+	line 3A should be marked as oldMovedAlternate newMoved
+	line 3B should be marked as oldMovedAlternate newMoved
+	unchanged
+	line 4A should be marked as oldMoved newMovedAlternate
+	line 4B should be marked as oldMoved newMovedAlternate
+	line 5A should be marked as oldMovedAlternate newMoved
+	line 5B should be marked as oldMovedAlternate newMoved
+	line 6A should be marked as oldMoved newMoved
+	line 6B should be marked as oldMoved newMoved
+	EOF
+	cat >new.txt <<-\EOF &&
+	  line 1A should be marked as oldMoved newMovedAlternate
+	  line 1B should be marked as oldMoved newMovedAlternate
+	unchanged
+	  line 3A should be marked as oldMovedAlternate newMoved
+	  line 3B should be marked as oldMovedAlternate newMoved
+	  line 2A should be marked as oldMoved newMovedAlternate
+	  line 2B should be marked as oldMoved newMovedAlternate
+	unchanged
+	  line 6A should be marked as oldMoved newMoved
+	  line 6B should be marked as oldMoved newMoved
+	    line 4A should be marked as oldMoved newMovedAlternate
+	    line 4B should be marked as oldMoved newMovedAlternate
+	  line 5A should be marked as oldMovedAlternate newMoved
+	  line 5B should be marked as oldMovedAlternate newMoved
+	EOF
+	test_expect_code 1 git diff --no-index --color --color-moved=zebra \
+		 --color-moved-ws=allow-indentation-change \
+		 old.txt new.txt >output &&
+	grep -v index output | test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/old.txt b/new.txt<RESET>
+	<BOLD>--- a/old.txt<RESET>
+	<BOLD>+++ b/new.txt<RESET>
+	<CYAN>@@ -1,14 +1,14 @@<RESET>
+	<BOLD;MAGENTA>-line 1A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;MAGENTA>-line 1B should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 1A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 1B should be marked as oldMoved newMovedAlternate<RESET>
+	 unchanged<RESET>
+	<BOLD;MAGENTA>-line 2A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;MAGENTA>-line 2B should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;BLUE>-line 3A should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;BLUE>-line 3B should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 3A should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 3B should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>  line 2A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>  line 2B should be marked as oldMoved newMovedAlternate<RESET>
+	 unchanged<RESET>
+	<BOLD;MAGENTA>-line 4A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;MAGENTA>-line 4B should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;BLUE>-line 5A should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;BLUE>-line 5B should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;MAGENTA>-line 6A should be marked as oldMoved newMoved<RESET>
+	<BOLD;MAGENTA>-line 6B should be marked as oldMoved newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 6A should be marked as oldMoved newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 6B should be marked as oldMoved newMoved<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>    line 4A should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>    line 4B should be marked as oldMoved newMovedAlternate<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 5A should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>  line 5B should be marked as oldMovedAlternate newMoved<RESET>
+	EOF
 	test_cmp expected actual
 
-ok 200 - git config log.diffMerges first-parent
+ok 109 - zebra alternate color is only used when necessary
 
-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 &&
+expecting success of 4015.110 'short lines of opposite sign do not get marked as moved': 
+	cat >old.txt <<-\EOF &&
+	this line should be marked as moved
+	unchanged
+	unchanged
+	unchanged
+	unchanged
+	too short
+	this line should be marked as oldMoved newMoved
+	this line should be marked as oldMovedAlternate newMoved
+	unchanged 1
+	unchanged 2
+	unchanged 3
+	unchanged 4
+	this line should be marked as oldMoved newMoved/newMovedAlternate
+	EOF
+	cat >new.txt <<-\EOF &&
+	too short
+	unchanged
+	unchanged
+	this line should be marked as moved
+	too short
+	unchanged
+	unchanged
+	this line should be marked as oldMoved newMoved/newMovedAlternate
+	unchanged 1
+	unchanged 2
+	this line should be marked as oldMovedAlternate newMoved
+	this line should be marked as oldMoved newMoved/newMovedAlternate
+	unchanged 3
+	this line should be marked as oldMoved newMoved
+	unchanged 4
+	EOF
+	test_expect_code 1 git diff --no-index --color --color-moved=zebra \
+		old.txt new.txt >output && cat output &&
+	grep -v index output | test_decode_color >actual &&
+	cat >expect <<-\EOF &&
+	<BOLD>diff --git a/old.txt b/new.txt<RESET>
+	<BOLD>--- a/old.txt<RESET>
+	<BOLD>+++ b/new.txt<RESET>
+	<CYAN>@@ -1,13 +1,15 @@<RESET>
+	<BOLD;MAGENTA>-this line should be marked as moved<RESET>
+	<GREEN>+<RESET><GREEN>too short<RESET>
+	 unchanged<RESET>
+	 unchanged<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as moved<RESET>
+	<GREEN>+<RESET><GREEN>too short<RESET>
+	 unchanged<RESET>
+	 unchanged<RESET>
+	<RED>-too short<RESET>
+	<BOLD;MAGENTA>-this line should be marked as oldMoved newMoved<RESET>
+	<BOLD;BLUE>-this line should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
+	 unchanged 1<RESET>
+	 unchanged 2<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMovedAlternate newMoved<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
+	 unchanged 3<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>this line should be marked as oldMoved newMoved<RESET>
+	 unchanged 4<RESET>
+	<BOLD;MAGENTA>-this line should be marked as oldMoved newMoved/newMovedAlternate<RESET>
+	EOF
+	test_cmp expect actual
+
+diff --git a/old.txt b/new.txt
+index b69be6f..7db2c55 100644
+--- a/old.txt
++++ b/new.txt
+@@ -1,13 +1,15 @@
+-this line should be marked as moved
++too short
+ unchanged
+ unchanged
++this line should be marked as moved
++too short
+ unchanged
+ unchanged
+-too short
+-this line should be marked as oldMoved newMoved
+-this line should be marked as oldMovedAlternate newMoved
++this line should be marked as oldMoved newMoved/newMovedAlternate
+ unchanged 1
+ unchanged 2
++this line should be marked as oldMovedAlternate newMoved
++this line should be marked as oldMoved newMoved/newMovedAlternate
+ unchanged 3
++this line should be marked as oldMoved newMoved
+ unchanged 4
+-this line should be marked as oldMoved newMoved/newMovedAlternate
+ok 110 - short lines of opposite sign do not get marked as moved
+
+expecting success of 4015.111 'cmd option assumes configured colored-moved': 
+	test_config color.diff.oldMoved "magenta" &&
+	test_config color.diff.newMoved "cyan" &&
+	test_config color.diff.oldMovedAlternative "blue" &&
+	test_config color.diff.newMovedAlternative "yellow" &&
+	test_config color.diff.oldMovedDimmed "normal magenta" &&
+	test_config color.diff.newMovedDimmed "normal cyan" &&
+	test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
+	test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
+	test_config diff.colorMoved zebra &&
+	git diff HEAD --no-renames --color-moved --color >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,16 +1,16 @@<RESET>
+	<MAGENTA>-long line 1<RESET>
+	<MAGENTA>-long line 2<RESET>
+	<MAGENTA>-long line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	 line 6<RESET>
+	 line 7<RESET>
+	 line 8<RESET>
+	 line 9<RESET>
+	<CYAN>+<RESET><CYAN>long line 1<RESET>
+	<CYAN>+<RESET><CYAN>long line 2<RESET>
+	<CYAN>+<RESET><CYAN>long line 3<RESET>
+	<YELLOW>+<RESET><YELLOW>long line 14<RESET>
+	<YELLOW>+<RESET><YELLOW>long line 15<RESET>
+	<YELLOW>+<RESET><YELLOW>long line 16<RESET>
+	 line 10<RESET>
+	 line 11<RESET>
+	 line 12<RESET>
+	 line 13<RESET>
+	<MAGENTA>-long line 14<RESET>
+	<MAGENTA>-long line 15<RESET>
+	<MAGENTA>-long line 16<RESET>
+	EOF
 	test_cmp expected actual
 
-ok 201 - git config log.diffMerges first-parent vs -m
+ok 111 - cmd option assumes configured colored-moved
 
-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 4015.112 'no effect on diff from --color-moved with --word-diff': 
+	cat <<-\EOF >text.txt &&
+	Lorem Ipsum is simply dummy text of the printing and typesetting industry.
+	EOF
+	git add text.txt &&
+	git commit -a -m "clean state" &&
+	cat <<-\EOF >text.txt &&
+	simply Lorem Ipsum dummy is text of the typesetting and printing industry.
+	EOF
+	git diff --color-moved --word-diff >actual &&
+	git diff --word-diff >expect &&
+	test_cmp expect actual
 
-ok 202 - git diff-index -m
+[detached HEAD 17804c5] clean state
+ Author: A U Thor <author@example.com>
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+ create mode 100644 text.txt
+ok 112 - no effect on diff from --color-moved with --word-diff
 
-expecting success of 4013.203 'log -S requires an argument': 
-	test_must_fail git log -S
+expecting success of 4015.113 'no effect on show from --color-moved with --word-diff': 
+	git show --color-moved --word-diff >actual &&
+	git show --word-diff >expect &&
+	test_cmp expect actual
 
-error: switch `S' requires a value
-ok 203 - log -S requires an argument
+ok 113 - no effect on show from --color-moved with --word-diff
 
-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 4015.114 'set up whitespace tests': 
+	git reset --hard &&
+	# Note that these lines have no leading or trailing whitespace.
+	cat <<-\EOF >lines.txt &&
+	line 1
+	line 2
+	line 3
+	line 4
+	line 5
+	long line 6
+	long line 7
+	long line 8
+	long line 9
+	EOF
+	git add lines.txt &&
+	git commit -m "add poetry" &&
+	git config color.diff.oldMoved "magenta" &&
+	git config color.diff.newMoved "cyan"
 
-ok 204 - diff --cached on unborn branch
+HEAD is now at 17804c5 clean state
+[detached HEAD 20118d6] add poetry
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+), 14 deletions(-)
+ok 114 - set up whitespace tests
 
-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 &&
+expecting success of 4015.115 'move detection ignoring whitespace ': 
+	q_to_tab <<-\EOF >lines.txt &&
+	Qlong line 6
+	Qlong line 7
+	Qlong line 8
+	Qchanged long line 9
+	line 1
+	line 2
+	line 3
+	line 4
+	line 5
+	EOF
+	git diff HEAD --no-renames --color-moved --color >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,9 +1,9 @@<RESET>
+	<GREEN>+<RESET>	<GREEN>long line 6<RESET>
+	<GREEN>+<RESET>	<GREEN>long line 7<RESET>
+	<GREEN>+<RESET>	<GREEN>long line 8<RESET>
+	<GREEN>+<RESET>	<GREEN>changed long line 9<RESET>
+	 line 1<RESET>
+	 line 2<RESET>
+	 line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	<RED>-long line 6<RESET>
+	<RED>-long line 7<RESET>
+	<RED>-long line 8<RESET>
+	<RED>-long line 9<RESET>
+	EOF
+	test_cmp expected actual &&
+
+	git diff HEAD --no-renames --color-moved --color \
+		--color-moved-ws=ignore-all-space >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,9 +1,9 @@<RESET>
+	<CYAN>+<RESET>	<CYAN>long line 6<RESET>
+	<CYAN>+<RESET>	<CYAN>long line 7<RESET>
+	<CYAN>+<RESET>	<CYAN>long line 8<RESET>
+	<GREEN>+<RESET>	<GREEN>changed long line 9<RESET>
+	 line 1<RESET>
+	 line 2<RESET>
+	 line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	<MAGENTA>-long line 6<RESET>
+	<MAGENTA>-long line 7<RESET>
+	<MAGENTA>-long line 8<RESET>
+	<RED>-long line 9<RESET>
+	EOF
 	test_cmp expected actual
 
-ok 205 - diff --cached -- file on unborn branch
+ok 115 - move detection ignoring whitespace 
 
-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 4015.116 'move detection ignoring whitespace changes': 
+	git reset --hard &&
+	# Lines 6-8 have a space change, but 9 is new whitespace
+	q_to_tab <<-\EOF >lines.txt &&
+	longQline 6
+	longQline 7
+	longQline 8
+	long liQne 9
+	line 1
+	line 2
+	line 3
+	line 4
+	line 5
+	EOF
 
-ok 206 - diff --line-prefix with spaces
+	git diff HEAD --no-renames --color-moved --color >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,9 +1,9 @@<RESET>
+	<GREEN>+<RESET><GREEN>long	line 6<RESET>
+	<GREEN>+<RESET><GREEN>long	line 7<RESET>
+	<GREEN>+<RESET><GREEN>long	line 8<RESET>
+	<GREEN>+<RESET><GREEN>long li	ne 9<RESET>
+	 line 1<RESET>
+	 line 2<RESET>
+	 line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	<RED>-long line 6<RESET>
+	<RED>-long line 7<RESET>
+	<RED>-long line 8<RESET>
+	<RED>-long line 9<RESET>
+	EOF
+	test_cmp expected actual &&
 
-expecting success of 4013.207 'diff-tree --stdin with log formatting': 
-	cat >expect <<-\EOF &&
-	Side
-	Third
-	Second
+	git diff HEAD --no-renames --color-moved --color \
+		--color-moved-ws=ignore-space-change >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,9 +1,9 @@<RESET>
+	<CYAN>+<RESET><CYAN>long	line 6<RESET>
+	<CYAN>+<RESET><CYAN>long	line 7<RESET>
+	<CYAN>+<RESET><CYAN>long	line 8<RESET>
+	<GREEN>+<RESET><GREEN>long li	ne 9<RESET>
+	 line 1<RESET>
+	 line 2<RESET>
+	 line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	<MAGENTA>-long line 6<RESET>
+	<MAGENTA>-long line 7<RESET>
+	<MAGENTA>-long line 8<RESET>
+	<RED>-long line 9<RESET>
 	EOF
-	git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
-	test_cmp expect actual
+	test_cmp expected actual
 
-ok 207 - diff-tree --stdin with log formatting
+HEAD is now at 20118d6 add poetry
+ok 116 - move detection ignoring whitespace changes
 
-expecting success of 4013.208 'diff-tree --stdin with pathspec': 
-	cat >expect <<-EOF &&
-	Third
+expecting success of 4015.117 'move detection ignoring whitespace at eol': 
+	git reset --hard &&
+	# Lines 6-9 have new eol whitespace, but 9 also has it in the middle
+	q_to_tab <<-\EOF >lines.txt &&
+	long line 6Q
+	long line 7Q
+	long line 8Q
+	longQline 9Q
+	line 1
+	line 2
+	line 3
+	line 4
+	line 5
+	EOF
 
-	dir/sub
-	Second
+	# avoid cluttering the output with complaints about our eol whitespace
+	test_config core.whitespace -blank-at-eol &&
 
-	dir/sub
+	git diff HEAD --no-renames --color-moved --color >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,9 +1,9 @@<RESET>
+	<GREEN>+<RESET><GREEN>long line 6	<RESET>
+	<GREEN>+<RESET><GREEN>long line 7	<RESET>
+	<GREEN>+<RESET><GREEN>long line 8	<RESET>
+	<GREEN>+<RESET><GREEN>long	line 9	<RESET>
+	 line 1<RESET>
+	 line 2<RESET>
+	 line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	<RED>-long line 6<RESET>
+	<RED>-long line 7<RESET>
+	<RED>-long line 8<RESET>
+	<RED>-long line 9<RESET>
 	EOF
-	git rev-list master^ |
-	git diff-tree -r --stdin --name-only --format=%s dir >actual &&
-	test_cmp expect actual
+	test_cmp expected actual &&
 
-ok 208 - diff-tree --stdin with pathspec
+	git diff HEAD --no-renames --color-moved --color \
+		--color-moved-ws=ignore-space-at-eol >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+	<BOLD>--- a/lines.txt<RESET>
+	<BOLD>+++ b/lines.txt<RESET>
+	<CYAN>@@ -1,9 +1,9 @@<RESET>
+	<CYAN>+<RESET><CYAN>long line 6	<RESET>
+	<CYAN>+<RESET><CYAN>long line 7	<RESET>
+	<CYAN>+<RESET><CYAN>long line 8	<RESET>
+	<GREEN>+<RESET><GREEN>long	line 9	<RESET>
+	 line 1<RESET>
+	 line 2<RESET>
+	 line 3<RESET>
+	 line 4<RESET>
+	 line 5<RESET>
+	<MAGENTA>-long line 6<RESET>
+	<MAGENTA>-long line 7<RESET>
+	<MAGENTA>-long line 8<RESET>
+	<RED>-long line 9<RESET>
+	EOF
+	test_cmp expected actual
 
-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>
+HEAD is now at 20118d6 add poetry
+ok 117 - move detection ignoring whitespace at eol
 
-	dir/sub
-	<Third>
+expecting success of 4015.118 'clean up whitespace-test colors': 
+	git config --unset color.diff.oldMoved &&
+	git config --unset color.diff.newMoved
 
-	dir/sub
-	<Second>
+ok 118 - clean up whitespace-test colors
 
-	dir/sub
+expecting success of 4015.119 '--color-moved block at end of diff output respects MIN_ALNUM_COUNT': 
+	git reset --hard &&
+	>bar &&
+	cat <<-\EOF >foo &&
+	irrelevant_line
+	line1
 	EOF
-	test_cmp expect actual
+	git add foo bar &&
+	git commit -m x &&
 
-ok 209 - show A B ... -- <pathspec>
+	cat <<-\EOF >bar &&
+	line1
+	EOF
+	cat <<-\EOF >foo &&
+	irrelevant_line
+	EOF
 
-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
+	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/bar b/bar<RESET>
+	<BOLD>--- a/bar<RESET>
+	<BOLD>+++ b/bar<RESET>
+	<CYAN>@@ -0,0 +1 @@<RESET>
+	<GREEN>+<RESET><GREEN>line1<RESET>
+	<BOLD>diff --git a/foo b/foo<RESET>
+	<BOLD>--- a/foo<RESET>
+	<BOLD>+++ b/foo<RESET>
+	<CYAN>@@ -1,2 +1 @@<RESET>
+	 irrelevant_line<RESET>
+	<RED>-line1<RESET>
+	EOF
 
-Switched to branch 'master'
-[master 4362559] Set up -I<regex> test file
+	test_cmp expected actual
+
+HEAD is now at 20118d6 add poetry
+[detached HEAD 3843ae4] x
  Author: A U Thor <author@example.com>
- 1 file changed, 44 insertions(+), 3 deletions(-)
-ok 210 - diff -I<regex>: setup
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+ok 119 - --color-moved block at end of diff output respects MIN_ALNUM_COUNT
 
-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 4015.120 '--color-moved respects MIN_ALNUM_COUNT': 
+	git reset --hard &&
+	cat <<-\EOF >foo &&
+	nineteen chars 456789
+	irrelevant_line
+	twenty chars 234567890
 	EOF
-	compare_diff_patch expect actual
+	>bar &&
+	git add foo bar &&
+	git commit -m x &&
 
-ok 211 - diff -I<regex>
+	cat <<-\EOF >foo &&
+	irrelevant_line
+	EOF
+	cat <<-\EOF >bar &&
+	twenty chars 234567890
+	nineteen chars 456789
+	EOF
 
-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(-)
+	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/bar b/bar<RESET>
+	<BOLD>--- a/bar<RESET>
+	<BOLD>+++ b/bar<RESET>
+	<CYAN>@@ -0,0 +1,2 @@<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>twenty chars 234567890<RESET>
+	<GREEN>+<RESET><GREEN>nineteen chars 456789<RESET>
+	<BOLD>diff --git a/foo b/foo<RESET>
+	<BOLD>--- a/foo<RESET>
+	<BOLD>+++ b/foo<RESET>
+	<CYAN>@@ -1,3 +1 @@<RESET>
+	<RED>-nineteen chars 456789<RESET>
+	 irrelevant_line<RESET>
+	<BOLD;MAGENTA>-twenty chars 234567890<RESET>
 	EOF
-	test_cmp expect actual
 
-ok 212 - diff -I<regex> --stat
+	test_cmp expected actual
 
-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
+HEAD is now at 3843ae4 x
+[detached HEAD 2380d1c] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ok 120 - --color-moved respects MIN_ALNUM_COUNT
 
-error: invalid regex given to -I: '^[124-9'
-ok 213 - diff -I<regex>: detect malformed regex
+expecting success of 4015.121 '--color-moved treats adjacent blocks as separate for MIN_ALNUM_COUNT': 
+	git reset --hard &&
+	cat <<-\EOF >foo &&
+	7charsA
+	irrelevant_line
+	7charsB
+	7charsC
+	EOF
+	>bar &&
+	git add foo bar &&
+	git commit -m x &&
 
-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
+	cat <<-\EOF >foo &&
+	irrelevant_line
+	EOF
+	cat <<-\EOF >bar &&
+	7charsB
+	7charsC
+	7charsA
+	EOF
 
-ok 214 - diff-files does not respect diff.noPrefix
+	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/bar b/bar<RESET>
+	<BOLD>--- a/bar<RESET>
+	<BOLD>+++ b/bar<RESET>
+	<CYAN>@@ -0,0 +1,3 @@<RESET>
+	<GREEN>+<RESET><GREEN>7charsB<RESET>
+	<GREEN>+<RESET><GREEN>7charsC<RESET>
+	<GREEN>+<RESET><GREEN>7charsA<RESET>
+	<BOLD>diff --git a/foo b/foo<RESET>
+	<BOLD>--- a/foo<RESET>
+	<BOLD>+++ b/foo<RESET>
+	<CYAN>@@ -1,4 +1 @@<RESET>
+	<RED>-7charsA<RESET>
+	 irrelevant_line<RESET>
+	<RED>-7charsB<RESET>
+	<RED>-7charsC<RESET>
+	EOF
 
-expecting success of 4013.215 'diff-files respects --no-prefix': 
-	git diff-files -p --no-prefix >actual &&
-	check_prefix actual file0 file0
+	test_cmp expected actual
 
-ok 215 - diff-files respects --no-prefix
+HEAD is now at 2380d1c x
+[detached HEAD df13bcb] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+ok 121 - --color-moved treats adjacent blocks as separate for MIN_ALNUM_COUNT
 
-expecting success of 4013.216 'diff respects diff.noPrefix': 
-	git -c diff.noPrefix diff >actual &&
-	check_prefix actual file0 file0
+expecting success of 4015.122 '--color-moved rewinds for MIN_ALNUM_COUNT': 
+	git reset --hard &&
+	test_write_lines >file \
+		A B C one two three four five six seven D E F G H I J &&
+	git add file &&
+	test_write_lines >file \
+		one two A B C D E F G H I J two three four five six seven &&
+	git diff --color-moved=zebra -- file &&
 
-ok 216 - diff respects diff.noPrefix
+	git diff --color-moved=zebra --color -- file >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	cat >expected <<-\EOF &&
+	<BOLD>diff --git a/file b/file<RESET>
+	<BOLD>--- a/file<RESET>
+	<BOLD>+++ b/file<RESET>
+	<CYAN>@@ -1,13 +1,8 @@<RESET>
+	<GREEN>+<RESET><GREEN>one<RESET>
+	<GREEN>+<RESET><GREEN>two<RESET>
+	 A<RESET>
+	 B<RESET>
+	 C<RESET>
+	<RED>-one<RESET>
+	<BOLD;MAGENTA>-two<RESET>
+	<BOLD;MAGENTA>-three<RESET>
+	<BOLD;MAGENTA>-four<RESET>
+	<BOLD;MAGENTA>-five<RESET>
+	<BOLD;MAGENTA>-six<RESET>
+	<BOLD;MAGENTA>-seven<RESET>
+	 D<RESET>
+	 E<RESET>
+	 F<RESET>
+	<CYAN>@@ -15,3 +10,9 @@<RESET> <RESET>G<RESET>
+	 H<RESET>
+	 I<RESET>
+	 J<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>two<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>three<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>four<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>five<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>six<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>seven<RESET>
+	EOF
 
-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
+	test_cmp expected actual
 
-ok 217 - diff --default-prefix overrides diff.noPrefix
+HEAD is now at df13bcb x
+diff --git a/file b/file
+index 9c6a1c7..fa3558c 100644
+--- a/file
++++ b/file
+@@ -1,13 +1,8 @@
++one
++two
+ A
+ B
+ C
+-one
+-two
+-three
+-four
+-five
+-six
+-seven
+ D
+ E
+ F
+@@ -15,3 +10,9 @@ G
+ H
+ I
+ J
++two
++three
++four
++five
++six
++seven
+ok 122 - --color-moved rewinds for MIN_ALNUM_COUNT
 
-expecting success of 4013.218 'diff respects diff.mnemonicPrefix': 
-	git -c diff.mnemonicPrefix diff >actual &&
-	check_prefix actual i/file0 w/file0
+expecting success of 4015.123 'move detection with submodules': 
+	test_create_repo bananas &&
+	echo ripe >bananas/recipe &&
+	git -C bananas add recipe &&
+	test_commit fruit &&
+	test_commit -C bananas recipe &&
+	git submodule add ./bananas &&
+	git add bananas &&
+	git commit -a -m "bananas are like a heavy library?" &&
+	echo foul >bananas/recipe &&
+	echo ripe >fruit.t &&
 
-ok 218 - diff respects diff.mnemonicPrefix
+	git diff --submodule=diff --color-moved --color >actual &&
 
-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
+	# no move detection as the moved line is across repository boundaries.
+	test_decode_color <actual >decoded_actual &&
+	! grep BGREEN decoded_actual &&
+	! grep BRED decoded_actual &&
 
-ok 219 - diff --default-prefix overrides diff.mnemonicPrefix
+	# nor did we mess with it another way
+	git diff --submodule=diff --color >expect.raw &&
+	test_decode_color <expect.raw >expect &&
+	test_cmp expect decoded_actual &&
+	rm -rf bananas &&
+	git submodule deinit bananas
 
-expecting success of 4013.220 'diff respects diff.srcPrefix': 
-	git -c diff.srcPrefix=x/ diff >actual &&
-	check_prefix actual x/file0 b/file0
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4015-diff-whitespace/bananas/.git/
+[detached HEAD a5c8711] fruit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 18 insertions(+)
+ create mode 100644 file
+ create mode 100644 fruit.t
+[master (root-commit) 9469881] recipe
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 recipe
+ create mode 100644 recipe.t
+Adding existing repo at 'bananas' to the index
+[detached HEAD 82f96c4] bananas are like a heavy library?
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+), 7 deletions(-)
+ create mode 100644 .gitmodules
+ create mode 160000 bananas
+Submodule 'bananas' (./bananas) unregistered for path 'bananas'
+ok 123 - move detection with submodules
 
-ok 220 - diff respects diff.srcPrefix
+expecting success of 4015.124 'only move detection ignores white spaces': 
+	git reset --hard &&
+	q_to_tab <<-\EOF >text.txt &&
+		a long line to exceed per-line minimum
+		another long line to exceed per-line minimum
+		original file
+	EOF
+	git add text.txt &&
+	git commit -m "add text" &&
+	q_to_tab <<-\EOF >text.txt &&
+		Qa long line to exceed per-line minimum
+		Qanother long line to exceed per-line minimum
+		new file
+	EOF
 
-expecting success of 4013.221 'diff respects diff.dstPrefix': 
-	git -c diff.dstPrefix=y/ diff >actual &&
-	check_prefix actual a/file0 y/file0
+	# Make sure we get a different diff using -w
+	git diff --color --color-moved -w >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	q_to_tab <<-\EOF >expected &&
+	<BOLD>diff --git a/text.txt b/text.txt<RESET>
+	<BOLD>--- a/text.txt<RESET>
+	<BOLD>+++ b/text.txt<RESET>
+	<CYAN>@@ -1,3 +1,3 @@<RESET>
+	 Qa long line to exceed per-line minimum<RESET>
+	 Qanother long line to exceed per-line minimum<RESET>
+	<RED>-original file<RESET>
+	<GREEN>+<RESET><GREEN>new file<RESET>
+	EOF
+	test_cmp expected actual &&
 
-ok 221 - diff respects diff.dstPrefix
+	# And now ignoring white space only in the move detection
+	git diff --color --color-moved \
+		--color-moved-ws=ignore-all-space,ignore-space-change,ignore-space-at-eol >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >actual &&
+	q_to_tab <<-\EOF >expected &&
+	<BOLD>diff --git a/text.txt b/text.txt<RESET>
+	<BOLD>--- a/text.txt<RESET>
+	<BOLD>+++ b/text.txt<RESET>
+	<CYAN>@@ -1,3 +1,3 @@<RESET>
+	<BOLD;MAGENTA>-a long line to exceed per-line minimum<RESET>
+	<BOLD;MAGENTA>-another long line to exceed per-line minimum<RESET>
+	<RED>-original file<RESET>
+	<BOLD;CYAN>+<RESET>Q<BOLD;CYAN>a long line to exceed per-line minimum<RESET>
+	<BOLD;CYAN>+<RESET>Q<BOLD;CYAN>another long line to exceed per-line minimum<RESET>
+	<GREEN>+<RESET><GREEN>new file<RESET>
+	EOF
+	test_cmp expected 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
+HEAD is now at 82f96c4 bananas are like a heavy library?
+[detached HEAD 3bfc51e] add text
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+ok 124 - only move detection ignores white spaces
 
-ok 222 - diff --src-prefix overrides diff.srcPrefix
+expecting success of 4015.125 'compare whitespace delta across moved blocks': 
 
-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
+	git reset --hard &&
+	q_to_tab <<-\EOF >text.txt &&
+	QIndented
+	QText across
+	Qsome lines
+	QBut! <- this stands out
+	QAdjusting with
+	QQdifferent starting
+	Qwhite spaces
+	QAnother outlier
+	QQQIndented
+	QQQText across
+	QQQfive lines
+	QQQthat has similar lines
+	QQQto previous blocks, but with different indent
+	QQQYetQAnotherQoutlierQ
+	QLine with internal w h i t e s p a c e change
+	EOF
 
-ok 223 - diff --dst-prefix overrides diff.dstPrefix
+	git add text.txt &&
+	git commit -m "add text.txt" &&
 
-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
+	q_to_tab <<-\EOF >text.txt &&
+	QQIndented
+	QQText across
+	QQsome lines
+	QQQBut! <- this stands out
+	Adjusting with
+	Qdifferent starting
+	white spaces
+	AnotherQoutlier
+	QQIndented
+	QQText across
+	QQfive lines
+	QQthat has similar lines
+	QQto previous blocks, but with different indent
+	QQYetQAnotherQoutlier
+	QLine with internal whitespace change
+	EOF
 
-ok 224 - diff.{src,dst}Prefix ignored with diff.noPrefix
+	git diff --color --color-moved --color-moved-ws=allow-indentation-change >actual.raw &&
+	grep -v "index" actual.raw | test_decode_color >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
+	q_to_tab <<-\EOF >expected &&
+		<BOLD>diff --git a/text.txt b/text.txt<RESET>
+		<BOLD>--- a/text.txt<RESET>
+		<BOLD>+++ b/text.txt<RESET>
+		<CYAN>@@ -1,15 +1,15 @@<RESET>
+		<BOLD;MAGENTA>-QIndented<RESET>
+		<BOLD;MAGENTA>-QText across<RESET>
+		<BOLD;MAGENTA>-Qsome lines<RESET>
+		<RED>-QBut! <- this stands out<RESET>
+		<BOLD;MAGENTA>-QAdjusting with<RESET>
+		<BOLD;MAGENTA>-QQdifferent starting<RESET>
+		<BOLD;MAGENTA>-Qwhite spaces<RESET>
+		<RED>-QAnother outlier<RESET>
+		<BOLD;MAGENTA>-QQQIndented<RESET>
+		<BOLD;MAGENTA>-QQQText across<RESET>
+		<BOLD;MAGENTA>-QQQfive lines<RESET>
+		<BOLD;MAGENTA>-QQQthat has similar lines<RESET>
+		<BOLD;MAGENTA>-QQQto previous blocks, but with different indent<RESET>
+		<RED>-QQQYetQAnotherQoutlierQ<RESET>
+		<RED>-QLine with internal w h i t e s p a c e change<RESET>
+		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Indented<RESET>
+		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Text across<RESET>
+		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>some lines<RESET>
+		<GREEN>+<RESET>QQQ<GREEN>But! <- this stands out<RESET>
+		<BOLD;CYAN>+<RESET><BOLD;CYAN>Adjusting with<RESET>
+		<BOLD;CYAN>+<RESET>Q<BOLD;CYAN>different starting<RESET>
+		<BOLD;CYAN>+<RESET><BOLD;CYAN>white spaces<RESET>
+		<GREEN>+<RESET><GREEN>AnotherQoutlier<RESET>
+		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Indented<RESET>
+		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>Text across<RESET>
+		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>five lines<RESET>
+		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>that has similar lines<RESET>
+		<BOLD;CYAN>+<RESET>QQ<BOLD;CYAN>to previous blocks, but with different indent<RESET>
+		<GREEN>+<RESET>QQ<GREEN>YetQAnotherQoutlier<RESET>
+		<GREEN>+<RESET>Q<GREEN>Line with internal whitespace change<RESET>
+	EOF
 
-ok 225 - diff.{src,dst}Prefix ignored with diff.mnemonicPrefix
+	test_cmp expected actual
 
-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
+HEAD is now at 3bfc51e add text
+[detached HEAD 7dd9671] add text.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+ok 125 - compare whitespace delta across moved blocks
 
-ok 226 - diff.{src,dst}Prefix ignored with --default-prefix
+expecting success of 4015.126 'bogus settings in move detection erroring out': 
+	test_must_fail git diff --color-moved=bogus 2>err &&
+	test_grep "must be one of" err &&
+	test_grep bogus 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
+	test_must_fail git -c diff.colormoved=bogus diff 2>err &&
+	test_grep "must be one of" err &&
+	test_grep "from command-line config" err &&
 
-error: invalid option: --no-rename
-ok 227 - diff --no-renames cannot be abbreviated
+	test_must_fail git diff --color-moved-ws=bogus 2>err &&
+	test_grep "possible values" err &&
+	test_grep bogus err &&
 
-# passed all 227 test(s)
-1..227
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4025-hunk-header.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4025-hunk-header/.git/
-expecting success of 4025.1 'setup': 
+	test_must_fail git -c diff.colormovedws=bogus diff 2>err &&
+	test_grep "possible values" err &&
+	test_grep "from command-line config" err
 
-	(
-		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 &&
+error: color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'
+error: bad --color-moved argument: bogus
+error: color moved setting must be one of 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', 'plain'
+fatal: unable to parse 'diff.colormoved' from command-line config
+error: unknown color-moved-ws mode 'bogus', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'
+error: unknown color-moved-ws mode 'bogus', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'
+error: invalid mode 'bogus' in --color-moved-ws
+error: unknown color-moved-ws mode 'bogus', possible values are 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'
+fatal: unable to parse 'diff.colormovedws' from command-line config
+ok 126 - bogus settings in move detection erroring out
 
-	sed -e "/^  [EP]/s/$/ modified/" <file >file+ &&
-	mv file+ file
+expecting success of 4015.127 'compare whitespace delta incompatible with other space options': 
+	test_must_fail git diff \
+		--color-moved-ws=allow-indentation-change,ignore-all-space \
+		2>err &&
+	test_grep allow-indentation-change err
 
+error: color-moved-ws: allow-indentation-change cannot be combined with other whitespace modes
+error: invalid mode 'allow-indentation-change,ignore-all-space' in --color-moved-ws
+ok 127 - compare whitespace delta incompatible with other space options
 
-ok 1 - setup
+expecting success of 4015.128 'compare mixed whitespace delta across moved blocks': 
 
-expecting success of 4025.2 'hunk header truncation with an overly long line': 
+	git reset --hard &&
+	tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
+	^__
+	|____too short without
+	^
+	___being grouped across blank line
+	${EMPTY}
+	context
+	lines
+	to
+	anchor
+	____Indented text to
+	_Q____be further indented by four spaces across
+	____Qseveral lines
+	QQ____These two lines have had their
+	____indentation reduced by four spaces
+	Qdifferent indentation change
+	____too short
+	EOF
+
+	git add text.txt &&
+	git commit -m "add text.txt" &&
+
+	tr "^|Q_" "\f\v\t " <<-EOF >text.txt &&
+	context
+	lines
+	to
+	anchor
+	QIndented text to
+	QQbe further indented by four spaces across
+	Q____several lines
+	${EMPTY}
+	QQtoo short without
+	${EMPTY}
+	^Q_______being grouped across blank line
+	${EMPTY}
+	Q_QThese two lines have had their
+	indentation reduced by four spaces
+	QQdifferent indentation change
+	__Qtoo short
+	EOF
+
+	git -c color.diff.whitespace="normal red" \
+		-c core.whitespace=space-before-tab \
+		diff --color --color-moved --ws-error-highlight=all \
+		--color-moved-ws=allow-indentation-change >actual.raw &&
+	grep -v "index" actual.raw | tr "\f\v" "^|" | test_decode_color >actual &&
+
+	cat <<-\EOF >expected &&
+	<BOLD>diff --git a/text.txt b/text.txt<RESET>
+	<BOLD>--- a/text.txt<RESET>
+	<BOLD>+++ b/text.txt<RESET>
+	<CYAN>@@ -1,16 +1,16 @@<RESET>
+	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET><BRED>  <RESET>
+	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>|    too short without<RESET>
+	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>^<RESET>
+	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>   being grouped across blank line<RESET>
+	<BOLD;MAGENTA>-<RESET>
+	 <RESET>context<RESET>
+	 <RESET>lines<RESET>
+	 <RESET>to<RESET>
+	 <RESET>anchor<RESET>
+	<BOLD;MAGENTA>-<RESET><BOLD;MAGENTA>    Indented text to<RESET>
+	<BOLD;MAGENTA>-<RESET><BRED> <RESET>	<BOLD;MAGENTA>    be further indented by four spaces across<RESET>
+	<BOLD;MAGENTA>-<RESET><BRED>    <RESET>	<BOLD;MAGENTA>several lines<RESET>
+	<BOLD;BLUE>-<RESET>		<BOLD;BLUE>    These two lines have had their<RESET>
+	<BOLD;BLUE>-<RESET><BOLD;BLUE>    indentation reduced by four spaces<RESET>
+	<BOLD;MAGENTA>-<RESET>	<BOLD;MAGENTA>different indentation change<RESET>
+	<RED>-<RESET><RED>    too short<RESET>
+	<BOLD;CYAN>+<RESET>	<BOLD;CYAN>Indented text to<RESET>
+	<BOLD;CYAN>+<RESET>		<BOLD;CYAN>be further indented by four spaces across<RESET>
+	<BOLD;CYAN>+<RESET>	<BOLD;CYAN>    several lines<RESET>
+	<BOLD;YELLOW>+<RESET>
+	<BOLD;YELLOW>+<RESET>		<BOLD;YELLOW>too short without<RESET>
+	<BOLD;YELLOW>+<RESET>
+	<BOLD;YELLOW>+<RESET><BOLD;YELLOW>^	       being grouped across blank line<RESET>
+	<BOLD;YELLOW>+<RESET>
+	<BOLD;CYAN>+<RESET>	<BRED> <RESET>	<BOLD;CYAN>These two lines have had their<RESET>
+	<BOLD;CYAN>+<RESET><BOLD;CYAN>indentation reduced by four spaces<RESET>
+	<BOLD;YELLOW>+<RESET>		<BOLD;YELLOW>different indentation change<RESET>
+	<GREEN>+<RESET><BRED>  <RESET>	<GREEN>too short<RESET>
+	EOF
 
-	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
 
+HEAD is now at 7dd9671 add text.txt
+[detached HEAD 9fe2176] add text.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 16 insertions(+), 15 deletions(-)
+ok 128 - compare mixed whitespace delta across moved blocks
+
+expecting success of 4015.129 'combine --ignore-blank-lines with --function-context': 
+	test_write_lines 1 "" 2 3 4 5 >a &&
+	test_write_lines 1    2 3 4   >b &&
+	test_must_fail git diff --no-index \
+		--ignore-blank-lines --function-context a b >actual.raw &&
+	sed -n "/@@/,\$p" <actual.raw >actual &&
+	cat <<-\EOF >expect &&
+	@@ -1,6 +1,4 @@
+	 1
+	-
+	 2
+	 3
+	 4
+	-5
+	EOF
+	test_cmp expect actual
 
-ok 2 - hunk header truncation with an overly long line
+ok 129 - combine --ignore-blank-lines with --function-context
 
-# passed all 2 test(s)
-1..2
+expecting success of 4015.130 'combine --ignore-blank-lines with --function-context 2': 
+	test_write_lines    a b c "" function 1 2 3 4 5 "" 6 7 8 9 >a &&
+	test_write_lines "" a b c "" function 1 2 3 4 5    6 7 8   >b &&
+	test_must_fail git diff --no-index \
+		--ignore-blank-lines --function-context a b >actual.raw &&
+	sed -n "/@@/,\$p" <actual.raw >actual &&
+	cat <<-\EOF >expect &&
+	@@ -5,11 +6,9 @@ c
+	 function
+	 1
+	 2
+	 3
+	 4
+	 5
+	-
+	 6
+	 7
+	 8
+	-9
+	EOF
+	test_cmp expect actual
+
+ok 130 - combine --ignore-blank-lines with --function-context 2
+
+# passed all 130 test(s)
+1..130
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4023-diff-rename-typechange.sh ***
@@ -236452,6 +232292,79 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4025-hunk-header.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4024-diff-optimize-common.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4024-diff-optimize-common/.git/
+expecting success of 4024.1 'setup': 
+
+	for n in $sample
+	do
+		( zs $n && echo a ) >file-a$n &&
+		( echo b && zs $n && echo ) >file-b$n &&
+		( printf c && zs $n ) >file-c$n &&
+		( echo d && zs $n ) >file-d$n &&
+
+		git add file-a$n file-b$n file-c$n file-d$n &&
+
+		( zs $n && echo A ) >file-a$n &&
+		( echo B && zs $n && echo ) >file-b$n &&
+		( printf C && zs $n ) >file-c$n &&
+		( echo D && zs $n ) >file-d$n &&
+
+		expect_pattern $n || return 1
+
+	done >expect
+
+ok 1 - setup
+
+expecting success of 4024.2 'diff -U0': 
+
+	for n in $sample
+	do
+		git diff -U0 file-?$n || return 1
+	done | zc >actual &&
+	test_cmp expect actual
+
+
+ok 2 - diff -U0
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4026-color.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4026-color/.git/
 expecting success of 4026.1 'reset': 
@@ -236714,698 +232627,6 @@
 1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4031-diff-rewrite-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4031-diff-rewrite-binary/.git/
-expecting success of 4031.1 'create binary file with changes': 
-	make_file "\\0" &&
-	git add file &&
-	make_file "\\01"
-
-ok 1 - create binary file with changes
-
-expecting success of 4031.2 'vanilla diff is binary': 
-	git diff >diff &&
-	grep "Binary files a/file and b/file differ" diff
-
-Binary files a/file and b/file differ
-ok 2 - vanilla diff is binary
-
-expecting success of 4031.3 'rewrite diff is binary': 
-	git diff -B >diff &&
-	grep "dissimilarity index" diff &&
-	grep "Binary files a/file and b/file differ" diff
-
-dissimilarity index 99%
-Binary files a/file and b/file differ
-ok 3 - rewrite diff is binary
-
-expecting success of 4031.4 'rewrite diff can show binary patch': 
-	git diff -B --binary >diff &&
-	grep "dissimilarity index" diff &&
-	grep "GIT binary patch" diff
-
-dissimilarity index 99%
-GIT binary patch
-ok 4 - rewrite diff can show binary patch
-
-expecting success of 4031.5 'rewrite diff --numstat shows binary changes': 
-	git diff -B --numstat --summary >diff &&
-	grep -e "-	-	" diff &&
-	grep " rewrite file" diff
-
--	-	file
- rewrite file (99%)
-ok 5 - rewrite diff --numstat shows binary changes
-
-expecting success of 4031.6 'diff --stat counts binary rewrite as 0 lines': 
-	git diff -B --stat --summary >diff &&
-	grep "Bin" diff &&
-	test_grep "0 insertions.*0 deletions" diff &&
-	grep " rewrite file" diff
-
- file | Bin 902 -> 902 bytes
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rewrite file (99%)
-ok 6 - diff --stat counts binary rewrite as 0 lines
-
-expecting success of 4031.7 'setup textconv': 
-	echo file diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/dump
-
-ok 7 - setup textconv
-
-expecting success of 4031.8 'rewrite diff respects textconv': 
-	git diff -B >diff &&
-	grep "dissimilarity index" diff &&
-	grep "^-61" diff &&
-	grep "^-0" diff
-
-dissimilarity index 99%
--61
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
--0
-ok 8 - rewrite diff respects textconv
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4030-diff-textconv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4030-diff-textconv/.git/
-expecting success of 4030.1 'setup binary file with history': 
-	test_commit --printf one file "\\0\\n" &&
-	test_commit --printf --append two file "\\01\\n"
-
-[master (root-commit) f1b27dd] one
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[master e1c09e5] two
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 1 - setup binary file with history
-
-expecting success of 4030.2 'file is considered binary by porcelain': 
-	git diff HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
-
-ok 2 - file is considered binary by porcelain
-
-expecting success of 4030.3 'file is considered binary by plumbing': 
-	git diff-tree -p HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
-
-ok 3 - file is considered binary by plumbing
-
-expecting success of 4030.4 'setup textconv filters': 
-	echo file diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/hexdump &&
-	git config diff.fail.textconv false
-
-ok 4 - setup textconv filters
-
-expecting success of 4030.5 'diff produces text': 
-	git diff HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual
-
-ok 5 - diff produces text
-
-expecting success of 4030.6 'show commit produces text': 
-	git show HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual
-
-ok 6 - show commit produces text
-
-expecting success of 4030.7 'diff-tree produces binary': 
-	git diff-tree -p HEAD^ HEAD >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.binary actual
-
-ok 7 - diff-tree produces binary
-
-expecting success of 4030.8 'log produces text': 
-	git log -1 -p >log &&
-	find_diff <log >actual &&
-	test_cmp expect.text actual
-
-ok 8 - log produces text
-
-expecting success of 4030.9 'format-patch produces binary': 
-	git format-patch --no-binary --stdout HEAD^ >patch &&
-	find_diff <patch >actual &&
-	test_cmp expect.binary actual
-
-ok 9 - format-patch produces binary
-
-expecting success of 4030.10 'status -v produces text': 
-	git reset --soft HEAD^ &&
-	git status -v >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.text actual &&
-	git reset --soft HEAD@{1}
-
-ok 10 - status -v produces text
-
-expecting success of 4030.11 'show blob produces binary': 
-	git show HEAD:file >actual &&
-	printf "\\0\\n\\01\\n" >expect &&
-	test_cmp expect actual
-
-ok 11 - show blob produces binary
-
-expecting success of 4030.12 'show --textconv blob produces text': 
-	git show --textconv HEAD:file >actual &&
-	printf "0\\n1\\n" >expect &&
-	test_cmp expect actual
-
-ok 12 - show --textconv blob produces text
-
-expecting success of 4030.13 'show --no-textconv blob produces binary': 
-	git show --no-textconv HEAD:file >actual &&
-	printf "\\0\\n\\01\\n" >expect &&
-	test_cmp expect actual
-
-ok 13 - show --no-textconv blob produces binary
-
-expecting success of 4030.14 'grep-diff (-G) operates on textconv data (add)': 
-	echo one >expect &&
-	git log --root --format=%s -G0 >actual &&
-	test_cmp expect actual
-
-ok 14 - grep-diff (-G) operates on textconv data (add)
-
-expecting success of 4030.15 'grep-diff (-G) operates on textconv data (modification)': 
-	echo two >expect &&
-	git log --root --format=%s -G1 >actual &&
-	test_cmp expect actual
-
-ok 15 - grep-diff (-G) operates on textconv data (modification)
-
-expecting success of 4030.16 'pickaxe (-S) operates on textconv data (add)': 
-	echo one >expect &&
-	git log --root --format=%s -S0 >actual &&
-	test_cmp expect actual
-
-ok 16 - pickaxe (-S) operates on textconv data (add)
-
-expecting success of 4030.17 'pickaxe (-S) operates on textconv data (modification)': 
-	echo two >expect &&
-	git log --root --format=%s -S1 >actual &&
-	test_cmp expect actual
-
-ok 17 - pickaxe (-S) operates on textconv data (modification)
-
-expecting success of 4030.18 'diffstat does not run textconv': 
-	echo file diff=fail >.gitattributes &&
-	git diff --stat HEAD^ HEAD >actual &&
-	test_cmp expect.stat actual &&
-
-	head -n1 <expect.stat >expect.line1 &&
-	head -n1 <actual >actual.line1 &&
-	test_cmp expect.line1 actual.line1
-
-ok 18 - diffstat does not run textconv
-
-expecting success of 4030.19 'textconv does not act on symlinks': 
-	rm -f file &&
-	test_ln_s_add frotz file &&
-	git commit -m typechange &&
-	git show >diff &&
-	find_diff <diff >actual &&
-	test_cmp expect.typechange actual
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-[master 552bf47] typechange
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 120000 file
-ok 19 - textconv does not act on symlinks
-
-# passed all 19 test(s)
-1..19
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4027-diff-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4027-diff-submodule/.git/
 expecting success of 4027.1 'setup': 
@@ -237745,9002 +232966,16278 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4033-diff-patience.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4033-diff-patience/.git/
-expecting success of 4033.1 '--ignore-space-at-eol with a single appended character': 
-	printf "a\nb\nc\n" >pre &&
-	printf "a\nbX\nc\n" >post &&
-	test_must_fail git diff --no-index \
-		--patience --ignore-space-at-eol pre post >diff &&
-	grep "^+.*X" diff
-
-+bX
-ok 1 - --ignore-space-at-eol with a single appended character
+*** t4030-diff-textconv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
 
-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
+[master (root-commit) f1b27dd] one
  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
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[master e1c09e5] two
  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
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 1 - setup binary file with history
 
-expecting success of 4033.3 'patience diff from attributes': 
-		test_must_fail git -c diff.driver.algorithm=$STRATEGY diff --no-index file1 file2 > output &&
-		test_cmp expect output
-	
-ok 3 - patience diff from attributes
+expecting success of 4030.2 'file is considered binary by porcelain': 
+	git diff HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
 
-expecting success of 4033.4 'diff from attributes with bare repo with source': 
-		git -C bare.git --attr-source=branchA -c diff.driver.algorithm=myers \
-			-c diff.driverA.algorithm=$STRATEGY \
-			diff HEAD:file1 HEAD:file2 >output &&
-		test_cmp expect output
-	
-ok 4 - diff from attributes with bare repo with source
+ok 2 - file is considered binary by porcelain
 
-expecting success of 4033.5 'diff from attributes with bare repo with invalid source': 
-		test_must_fail git -C bare.git --attr-source=invalid-branch diff \
-			HEAD:file1 HEAD:file2
-	
-fatal: bad --attr-source or GIT_ATTR_SOURCE
-ok 5 - diff from attributes with bare repo with invalid source
+expecting success of 4030.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 4033.6 'patience diff from attributes has valid diffstat': 
-		echo "file* diff=driver" >.gitattributes &&
-		git config diff.driver.algorithm "$STRATEGY" &&
-		test_must_fail git diff --stat --no-index file1 file2 > output &&
-		test_cmp expect_diffstat output
-	
-ok 6 - patience diff from attributes has valid diffstat
+ok 3 - file is considered binary by plumbing
 
-expecting success of 4033.7 'patience diff': 
-		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
-		test_cmp expect output
-	
-ok 7 - patience diff
+expecting success of 4030.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 4033.8 'patience diff command line precedence before attributes': 
-		echo "file* diff=driver" >.gitattributes &&
-		git config diff.driver.algorithm myers &&
-		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
-		test_cmp expect output
-	
-ok 8 - patience diff command line precedence before attributes
+ok 4 - setup textconv filters
 
-expecting success of 4033.9 'patience diff attributes precedence before config': 
-		git config diff.algorithm default &&
-		echo "file* diff=driver" >.gitattributes &&
-		git config diff.driver.algorithm "$STRATEGY" &&
-		test_must_fail git diff --no-index file1 file2 > output &&
-		test_cmp expect output
-	
-ok 9 - patience diff attributes precedence before config
+expecting success of 4030.5 'diff produces text': 
+	git diff HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual
 
-expecting success of 4033.10 'patience diff output is valid': 
-		mv file2 expect &&
-		git apply < output &&
-		test_cmp expect file2
-	
-ok 10 - patience diff output is valid
+ok 5 - diff produces text
 
-expecting success of 4033.11 'completely different files': 
-		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
-		test_cmp expect output
-	
-ok 11 - completely different files
+expecting success of 4030.6 'show commit produces text': 
+	git show HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual
 
-# passed all 11 test(s)
-1..11
+ok 6 - show commit produces text
+
+expecting success of 4030.7 'diff-tree produces binary': 
+	git diff-tree -p HEAD^ HEAD >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.binary actual
+
+ok 7 - diff-tree produces binary
+
+expecting success of 4030.8 'log produces text': 
+	git log -1 -p >log &&
+	find_diff <log >actual &&
+	test_cmp expect.text actual
+
+ok 8 - log produces text
+
+expecting success of 4030.9 'format-patch produces binary': 
+	git format-patch --no-binary --stdout HEAD^ >patch &&
+	find_diff <patch >actual &&
+	test_cmp expect.binary actual
+
+ok 9 - format-patch produces binary
+
+expecting success of 4030.10 'status -v produces text': 
+	git reset --soft HEAD^ &&
+	git status -v >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.text actual &&
+	git reset --soft HEAD@{1}
+
+ok 10 - status -v produces text
+
+expecting success of 4030.11 'show blob produces binary': 
+	git show HEAD:file >actual &&
+	printf "\\0\\n\\01\\n" >expect &&
+	test_cmp expect actual
+
+ok 11 - show blob produces binary
+
+expecting success of 4030.12 'show --textconv blob produces text': 
+	git show --textconv HEAD:file >actual &&
+	printf "0\\n1\\n" >expect &&
+	test_cmp expect actual
+
+ok 12 - show --textconv blob produces text
+
+expecting success of 4030.13 'show --no-textconv blob produces binary': 
+	git show --no-textconv HEAD:file >actual &&
+	printf "\\0\\n\\01\\n" >expect &&
+	test_cmp expect actual
+
+ok 13 - show --no-textconv blob produces binary
+
+expecting success of 4030.14 'grep-diff (-G) operates on textconv data (add)': 
+	echo one >expect &&
+	git log --root --format=%s -G0 >actual &&
+	test_cmp expect actual
+
+ok 14 - grep-diff (-G) operates on textconv data (add)
+
+expecting success of 4030.15 'grep-diff (-G) operates on textconv data (modification)': 
+	echo two >expect &&
+	git log --root --format=%s -G1 >actual &&
+	test_cmp expect actual
+
+ok 15 - grep-diff (-G) operates on textconv data (modification)
+
+expecting success of 4030.16 'pickaxe (-S) operates on textconv data (add)': 
+	echo one >expect &&
+	git log --root --format=%s -S0 >actual &&
+	test_cmp expect actual
+
+ok 16 - pickaxe (-S) operates on textconv data (add)
+
+expecting success of 4030.17 'pickaxe (-S) operates on textconv data (modification)': 
+	echo two >expect &&
+	git log --root --format=%s -S1 >actual &&
+	test_cmp expect actual
+
+ok 17 - pickaxe (-S) operates on textconv data (modification)
+
+expecting success of 4030.18 'diffstat does not run textconv': 
+	echo file diff=fail >.gitattributes &&
+	git diff --stat HEAD^ HEAD >actual &&
+	test_cmp expect.stat actual &&
+
+	head -n1 <expect.stat >expect.line1 &&
+	head -n1 <actual >actual.line1 &&
+	test_cmp expect.line1 actual.line1
+
+ok 18 - diffstat does not run textconv
+
+expecting success of 4030.19 'textconv does not act on symlinks': 
+	rm -f file &&
+	test_ln_s_add frotz file &&
+	git commit -m typechange &&
+	git show >diff &&
+	find_diff <diff >actual &&
+	test_cmp expect.typechange actual
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master 552bf47] typechange
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 120000 file
+ok 19 - textconv does not act on symlinks
+
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4032-diff-inter-hunk-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4032-diff-inter-hunk-context/.git/
-expecting success of 4032.1 'diff -U0, 1 common line: count hunks (2)': 
-		test 2 = 2
-	
-ok 1 - diff -U0, 1 common line: count hunks (2)
+*** t4014-format-patch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4014-format-patch/.git/
+expecting success of 4014.1 'setup': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
+	cat file >elif &&
+	git add file elif &&
+	test_tick &&
+	git commit -m Initial &&
+	git checkout -b side &&
 
-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
+	test_write_lines 1 2 5 6 A B C 7 8 9 10 >file &&
+	test_chmod +x elif &&
+	test_tick &&
+	git commit -m "Side changes #1" &&
 
-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)
+	test_write_lines D E F >>file &&
+	git update-index file &&
+	test_tick &&
+	git commit -m "Side changes #2" &&
+	git tag C2 &&
 
-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
+	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file &&
+	git update-index file &&
+	test_tick &&
+	git commit -m "Side changes #3 with \\n backslash-n in it." &&
+
+	git checkout main &&
+	git diff-tree -p C2 >patch &&
+	git apply --index <patch &&
+	test_tick &&
+	git commit -m "Main accepts moral equivalent of #2" &&
+
+	git checkout side &&
+	git checkout -b patchid &&
+	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file2 &&
+	test_write_lines 1 2 3 A 4 B C 7 8 9 10 D E F 5 6 >file3 &&
+	test_write_lines 8 9 10 >file &&
+	git add file file2 file3 &&
+	test_tick &&
+	git commit -m "patchid 1" &&
+	test_write_lines 4 A B 7 8 9 10 >file2 &&
+	test_write_lines 8 9 10 5 6 >file3 &&
+	git add file2 file3 &&
+	test_tick &&
+	git commit -m "patchid 2" &&
+	test_write_lines 10 5 6 >file &&
+	git add file &&
+	test_tick &&
+	git commit -m "patchid 3" &&
+
+	git checkout -b empty main &&
+	test_tick &&
+	git commit --allow-empty -m "empty commit" &&
+
+	git checkout main
+
+[main (root-commit) e27066e] Initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 20 insertions(+)
+ create mode 100644 elif
+ create mode 100644 file
+Switched to a new branch 'side'
+[side 1135adf] Side changes #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 elif
+[side fd00575] Side changes #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+[side 18ed22a] Side changes #3 with \n backslash-n in it.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+Switched to branch 'main'
+[main 333d5cb] Main accepts moral equivalent of #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+Switched to branch 'side'
+Switched to a new branch 'patchid'
+[patchid 866b619] patchid 1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 32 insertions(+), 13 deletions(-)
+ create mode 100644 file2
+ create mode 100644 file3
+[patchid b0e76a3] patchid 2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 21 deletions(-)
+[patchid e905b62] patchid 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Switched to a new branch 'empty'
+[empty 289be11] empty commit
+ Author: A U Thor <author@example.com>
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 4014.2 'format-patch --ignore-if-in-upstream': 
+	git format-patch --stdout main..side >patch0 &&
+	grep "^From " patch0 >from0 &&
+	test_line_count = 3 from0
+
+ok 2 - format-patch --ignore-if-in-upstream
+
+expecting success of 4014.3 'format-patch --ignore-if-in-upstream': 
+	git format-patch --stdout \
+		--ignore-if-in-upstream main..side >patch1 &&
+	grep "^From " patch1 >from1 &&
+	test_line_count = 2 from1
+
+ok 3 - format-patch --ignore-if-in-upstream
+
+expecting success of 4014.4 'format-patch --ignore-if-in-upstream handles tags': 
+	git tag -a v1 -m tag side &&
+	git tag -a v2 -m tag main &&
+	git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
+	grep "^From " patch1 >from1 &&
+	test_line_count = 2 from1
+
+ok 4 - format-patch --ignore-if-in-upstream handles tags
+
+expecting success of 4014.5 'format-patch doesn't consider merge commits': 
+	git checkout -b feature main &&
+	echo "Another line" >>file &&
+	test_tick &&
+	git commit -am "Feature branch change #1" &&
+	echo "Yet another line" >>file &&
+	test_tick &&
+	git commit -am "Feature branch change #2" &&
+	git checkout -b merger main &&
+	test_tick &&
+	git merge --no-ff feature &&
+	git format-patch -3 --stdout >patch &&
+	grep "^From " patch >from &&
+	test_line_count = 3 from
+
+Switched to a new branch 'feature'
+[feature a59b7ab] Feature branch change #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[feature 099a2d9] Feature branch change #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'merger'
+Merge made by the 'ort' strategy.
+ file | 2 ++
+ 1 file changed, 2 insertions(+)
+ok 5 - format-patch doesn't consider merge commits
+
+expecting success of 4014.6 'format-patch result applies': 
+	git checkout -b rebuild-0 main &&
+	git am -3 patch0 &&
+	git rev-list main.. >list &&
+	test_line_count = 2 list
+
+Switched to a new branch 'rebuild-0'
+Applying: Side changes #1
+Applying: Side changes #2
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+670fb98 Side changes #1
+virtual Side changes #2
+found 1 common ancestor:
+virtual 8359489d93991065cdaa748bd96dcb831b3d60ca
+No changes -- Patch already applied.
+Applying: Side changes #3 with \n backslash-n in it.
+ok 6 - format-patch result applies
+
+expecting success of 4014.7 'format-patch --ignore-if-in-upstream result applies': 
+	git checkout -b rebuild-1 main &&
+	git am -3 patch1 &&
+	git rev-list main.. >list &&
+	test_line_count = 2 list
+
+Switched to a new branch 'rebuild-1'
+Applying: Side changes #1
+Applying: Side changes #3 with \n backslash-n in it.
+ok 7 - format-patch --ignore-if-in-upstream result applies
+
+expecting success of 4014.8 'commit did not screw up the log message': 
+	git cat-file commit side >actual &&
+	grep "^Side .* with .* backslash-n" actual
+
+Side changes #3 with \n backslash-n in it.
+ok 8 - commit did not screw up the log message
+
+expecting success of 4014.9 'format-patch did not screw up the log message': 
+	grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
+	grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
+
+Subject: [PATCH 3/3] Side changes #3 with \n backslash-n in it.
+Subject: [PATCH 2/2] Side changes #3 with \n backslash-n in it.
+ok 9 - format-patch did not screw up the log message
+
+expecting success of 4014.10 'replay did not screw up the log message': 
+	git cat-file commit rebuild-1 >actual &&
+	grep "^Side .* with .* backslash-n" actual
+
+Side changes #3 with \n backslash-n in it.
+ok 10 - replay did not screw up the log message
+
+expecting success of 4014.11 'format-patch empty commit': 
+	git format-patch --stdout main..empty >empty &&
+	grep "^From " empty >from &&
+	test_line_count = 1 from
+
+ok 11 - format-patch empty commit
+
+expecting success of 4014.12 'extra headers': 
+	git config format.headers "To: R E Cipient <rcipient@example.com>
+" &&
+	git config --add format.headers "Cc: S E Cipient <scipient@example.com>
+" &&
+	git format-patch --stdout main..side >patch2 &&
+	sed -e "/^\$/q" patch2 >hdrs2 &&
+	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
+	grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2
+
+To: R E Cipient <rcipient@example.com>
+Cc: S E Cipient <scipient@example.com>
+ok 12 - extra headers
+
+expecting success of 4014.13 'extra headers without newlines': 
+	git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
+	git config --add format.headers "Cc: S E Cipient <scipient@example.com>" &&
+	git format-patch --stdout main..side >patch3 &&
+	sed -e "/^\$/q" patch3 >hdrs3 &&
+	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
+	grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
+
+To: R E Cipient <rcipient@example.com>
+Cc: S E Cipient <scipient@example.com>
+ok 13 - extra headers without newlines
+
+expecting success of 4014.14 'extra headers with multiple To:s': 
+	git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
+	git config --add format.headers "To: S E Cipient <scipient@example.com>" &&
+	git format-patch --stdout main..side >patch4 &&
+	sed -e "/^\$/q" patch4 >hdrs4 &&
+	grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
+	grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
+
+To: R E Cipient <rcipient@example.com>,
+    S E Cipient <scipient@example.com>
+ok 14 - extra headers with multiple To:s
+
+expecting success of 4014.15 'additional command line cc (ascii)': 
+	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
+	git format-patch --cc="S E Cipient <scipient@example.com>" --stdout main..side >patch5 &&
+	sed -e "/^\$/q" patch5 >hdrs5 &&
+	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
+	grep "^ *S E Cipient <scipient@example.com>\$" hdrs5
+
+Cc: R E Cipient <rcipient@example.com>,
+    S E Cipient <scipient@example.com>
+ok 15 - additional command line cc (ascii)
+
+checking known breakage of 4014.16 'additional command line cc (rfc822)': 
+	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
+	git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout main..side >patch5 &&
+	sed -e "/^\$/q" patch5 >hdrs5 &&
+	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
+	grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" hdrs5
+
+Cc: R E Cipient <rcipient@example.com>,
+not ok 16 - additional command line cc (rfc822) # TODO known breakage
+
+expecting success of 4014.17 'command line headers': 
+	git config --unset-all format.headers &&
+	git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout main..side >patch6 &&
+	sed -e "/^\$/q" patch6 >hdrs6 &&
+	grep "^Cc: R E Cipient <rcipient@example.com>\$" hdrs6
+
+Cc: R E Cipient <rcipient@example.com>
+ok 17 - command line headers
+
+expecting success of 4014.18 'configuration headers and command line headers': 
+	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
+	git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout main..side >patch7 &&
+	sed -e "/^\$/q" patch7 >hdrs7 &&
+	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs7 &&
+	grep "^ *S E Cipient <scipient@example.com>\$" hdrs7
+
+Cc: R E Cipient <rcipient@example.com>,
+    S E Cipient <scipient@example.com>
+ok 18 - configuration headers and command line headers
+
+expecting success of 4014.19 'command line To: header (ascii)': 
+	git config --unset-all format.headers &&
+	git format-patch --to="R E Cipient <rcipient@example.com>" --stdout main..side >patch8 &&
+	sed -e "/^\$/q" patch8 >hdrs8 &&
+	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs8
+
+To: R E Cipient <rcipient@example.com>
+ok 19 - command line To: header (ascii)
+
+checking known breakage of 4014.20 'command line To: header (rfc822)': 
+	git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout main..side >patch8 &&
+	sed -e "/^\$/q" patch8 >hdrs8 &&
+	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs8
+
+not ok 20 - command line To: header (rfc822) # TODO known breakage
+
+checking known breakage of 4014.21 'command line To: header (rfc2047)': 
+	git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout main..side >patch8 &&
+	sed -e "/^\$/q" patch8 >hdrs8 &&
+	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs8
+
+not ok 21 - command line To: header (rfc2047) # TODO known breakage
+
+expecting success of 4014.22 'configuration To: header (ascii)': 
+	git config format.to "R E Cipient <rcipient@example.com>" &&
+	git format-patch --stdout main..side >patch9 &&
+	sed -e "/^\$/q" patch9 >hdrs9 &&
+	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs9
+
+To: R E Cipient <rcipient@example.com>
+ok 22 - configuration To: header (ascii)
+
+checking known breakage of 4014.23 'configuration To: header (rfc822)': 
+	git config format.to "R. E. Cipient <rcipient@example.com>" &&
+	git format-patch --stdout main..side >patch9 &&
+	sed -e "/^\$/q" patch9 >hdrs9 &&
+	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs9
+
+not ok 23 - configuration To: header (rfc822) # TODO known breakage
+
+checking known breakage of 4014.24 'configuration To: header (rfc2047)': 
+	git config format.to "R Ä Cipient <rcipient@example.com>" &&
+	git format-patch --stdout main..side >patch9 &&
+	sed -e "/^\$/q" patch9 >hdrs9 &&
+	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs9
+
+not ok 24 - configuration To: header (rfc2047) # TODO known breakage
+
+expecting success of 4014.25 'format.from=false': 
+	git -c format.from=false format-patch --stdout main..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
+	check_patch patch &&
+	! grep "^From: C O Mitter <committer@example.com>\$" hdrs
+
+From: A U Thor <author@example.com>
+From: A U Thor <author@example.com>
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Date: Thu, 7 Apr 2005 15:15:13 -0700
+Date: Thu, 7 Apr 2005 15:16:13 -0700
+Subject: [PATCH 1/3] Side changes #1
+Subject: [PATCH 2/3] Side changes #2
+Subject: [PATCH 3/3] Side changes #3 with \n backslash-n in it.
+ok 25 - format.from=false
+
+expecting success of 4014.26 'format.from=true': 
+	git -c format.from=true format-patch --stdout main..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
+	check_patch hdrs &&
+	grep "^From: C O Mitter <committer@example.com>\$" hdrs
+
+From: C O Mitter <committer@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 1/3] Side changes #1
+From: C O Mitter <committer@example.com>
+ok 26 - format.from=true
+
+expecting success of 4014.27 'format.from with address': 
+	git -c format.from="F R Om <from@example.com>" format-patch --stdout main..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
+	check_patch hdrs &&
+	grep "^From: F R Om <from@example.com>\$" hdrs
+
+From: F R Om <from@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 1/3] Side changes #1
+From: F R Om <from@example.com>
+ok 27 - format.from with address
+
+expecting success of 4014.28 '--no-from overrides format.from': 
+	git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout main..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
+	check_patch hdrs &&
+	! grep "^From: F R Om <from@example.com>\$" hdrs
+
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 1/3] Side changes #1
+ok 28 - --no-from overrides format.from
+
+expecting success of 4014.29 '--from overrides format.from': 
+	git -c format.from="F R Om <from@example.com>" format-patch --from --stdout main..side >patch &&
+	sed -e "/^\$/q" patch >hdrs &&
+	check_patch hdrs &&
+	! grep "^From: F R Om <from@example.com>\$" hdrs
+
+From: C O Mitter <committer@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 1/3] Side changes #1
+ok 29 - --from overrides format.from
+
+expecting success of 4014.30 '--no-to overrides config.to': 
+	git config --replace-all format.to \
+		"R E Cipient <rcipient@example.com>" &&
+	git format-patch --no-to --stdout main..side >patch10 &&
+	sed -e "/^\$/q" patch10 >hdrs10 &&
+	check_patch hdrs10 &&
+	! grep "^To: R E Cipient <rcipient@example.com>\$" hdrs10
+
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 1/3] Side changes #1
+ok 30 - --no-to overrides config.to
+
+expecting success of 4014.31 '--no-to and --to replaces config.to': 
+	git config --replace-all format.to \
+		"Someone <someone@out.there>" &&
+	git format-patch --no-to --to="Someone Else <else@out.there>" \
+		--stdout main..side >patch11 &&
+	sed -e "/^\$/q" patch11 >hdrs11 &&
+	check_patch hdrs11 &&
+	! grep "^To: Someone <someone@out.there>\$" hdrs11 &&
+	grep "^To: Someone Else <else@out.there>\$" hdrs11
+
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 1/3] Side changes #1
+To: Someone Else <else@out.there>
+ok 31 - --no-to and --to replaces config.to
+
+expecting success of 4014.32 '--no-cc overrides config.cc': 
+	git config --replace-all format.cc \
+		"C E Cipient <rcipient@example.com>" &&
+	git format-patch --no-cc --stdout main..side >patch12 &&
+	sed -e "/^\$/q" patch12 >hdrs12 &&
+	check_patch hdrs12 &&
+	! grep "^Cc: C E Cipient <rcipient@example.com>\$" hdrs12
+
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 1/3] Side changes #1
+ok 32 - --no-cc overrides config.cc
+
+expecting success of 4014.33 '--no-add-header overrides config.headers': 
+	git config --replace-all format.headers \
+		"Header1: B E Cipient <rcipient@example.com>" &&
+	git format-patch --no-add-header --stdout main..side >patch13 &&
+	sed -e "/^\$/q" patch13 >hdrs13 &&
+	check_patch hdrs13 &&
+	! grep "^Header1: B E Cipient <rcipient@example.com>\$" hdrs13
+
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 1/3] Side changes #1
+ok 33 - --no-add-header overrides config.headers
+
+expecting success of 4014.34 'multiple files': 
+	rm -rf patches/ &&
+	git checkout side &&
+	git format-patch -o patches/ main &&
+	ls patches/0001-Side-changes-1.patch patches/0002-Side-changes-2.patch patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+
+Switched to branch 'side'
+patches/0001-Side-changes-1.patch
+patches/0002-Side-changes-2.patch
+patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+patches/0001-Side-changes-1.patch
+patches/0002-Side-changes-2.patch
+patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+ok 34 - multiple files
+
+expecting success of 4014.35 'filename length limit': 
+	test_when_finished "rm -f 000*" &&
+	rm -rf 000[1-9]-*.patch &&
+	for len in 15 25 35
+	do
+		git format-patch --filename-max-length=$len -3 side &&
+		max=$(
+			for patch in 000[1-9]-*.patch
+			do
+				echo "$patch" | wc -c || exit 1
+			done |
+			sort -nr |
+			head -n 1
+		) &&
+		test $max -le $len || return 1
+	done
+
+0001-Sid.patch
+0002-Sid.patch
+0003-Sid.patch
+0001-Side-changes-.patch
+0002-Side-changes-.patch
+0003-Side-changes-.patch
+0001-Side-changes-1.patch
+0002-Side-changes-2.patch
+0003-Side-changes-3-with-n-b.patch
+ok 35 - filename length limit
+
+expecting success of 4014.36 'filename length limit from config': 
+	test_when_finished "rm -f 000*" &&
+	rm -rf 000[1-9]-*.patch &&
+	for len in 15 25 35
+	do
+		git -c format.filenameMaxLength=$len format-patch -3 side &&
+		max=$(
+			for patch in 000[1-9]-*.patch
+			do
+				echo "$patch" | wc -c || exit 1
+			done |
+			sort -nr |
+			head -n 1
+		) &&
+		test $max -le $len || return 1
+	done
+
+0001-Sid.patch
+0002-Sid.patch
+0003-Sid.patch
+0001-Side-changes-.patch
+0002-Side-changes-.patch
+0003-Side-changes-.patch
+0001-Side-changes-1.patch
+0002-Side-changes-2.patch
+0003-Side-changes-3-with-n-b.patch
+ok 36 - filename length limit from config
+
+expecting success of 4014.37 'filename limit applies only to basename': 
+	test_when_finished "rm -rf patches/" &&
+	rm -rf patches/ &&
+	for len in 15 25 35
+	do
+		git format-patch -o patches --filename-max-length=$len -3 side &&
+		max=$(
+			for patch in patches/000[1-9]-*.patch
+			do
+				echo "${patch#patches/}" | wc -c || exit 1
+			done |
+			sort -nr |
+			head -n 1
+		) &&
+		test $max -le $len || return 1
+	done
+
+patches/0001-Sid.patch
+patches/0002-Sid.patch
+patches/0003-Sid.patch
+patches/0001-Side-changes-.patch
+patches/0002-Side-changes-.patch
+patches/0003-Side-changes-.patch
+patches/0001-Side-changes-1.patch
+patches/0002-Side-changes-2.patch
+patches/0003-Side-changes-3-with-n-b.patch
+ok 37 - filename limit applies only to basename
+
+expecting success of 4014.38 'reroll count': 
+	rm -fr patches &&
+	git format-patch -o patches --cover-letter --reroll-count 4 main..side >list &&
+	! grep -v "^patches/v4-000[0-3]-" list &&
+	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
+	! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
+
+ok 38 - reroll count
+
+expecting success of 4014.39 'reroll count (-v)': 
+	rm -fr patches &&
+	git format-patch -o patches --cover-letter -v4 main..side >list &&
+	! grep -v "^patches/v4-000[0-3]-" list &&
+	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
+	! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
+
+ok 39 - reroll count (-v)
+
+expecting success of 4014.40 'reroll count (-v) with a fractional number': 
+	rm -fr patches &&
+	git format-patch -o patches --cover-letter -v4.4 main..side >list &&
+	! grep -v "^patches/v4.4-000[0-3]-" list &&
+	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
+	! grep -v "^Subject: \[PATCH v4.4 [0-3]/3\] " subjects
+
+ok 40 - reroll count (-v) with a fractional number
+
+expecting success of 4014.41 'reroll (-v) count with a non number': 
+	rm -fr patches &&
+	git format-patch -o patches --cover-letter -v4rev2 main..side >list &&
+	! grep -v "^patches/v4rev2-000[0-3]-" list &&
+	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
+	! grep -v "^Subject: \[PATCH v4rev2 [0-3]/3\] " subjects
+
+ok 41 - reroll (-v) count with a non number
+
+expecting success of 4014.42 'reroll (-v) count with a non-pathname character': 
+	rm -fr patches &&
+	git format-patch -o patches --cover-letter -v4---..././../--1/.2//  main..side >list &&
+	! grep -v "patches/v4-\.-\.-\.-1-\.2-000[0-3]-" list &&
+	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
+	! grep -v "^Subject: \[PATCH v4---\.\.\./\./\.\./--1/\.2// [0-3]/3\] " subjects
+
+ok 42 - reroll (-v) count with a non-pathname character
+
+expecting success of 4014.43 'no threading': 
+	git checkout side &&
+	check_threading expect.no-threading main
+
+Already on 'side'
+ok 43 - no threading
+
+expecting success of 4014.44 'thread': 
+	check_threading expect.thread --thread main
+
+ok 44 - thread
+
+expecting success of 4014.45 '--thread overrides format.thread=deep': 
+	test_config format.thread deep &&
+	check_threading expect.thread --thread main
+
+ok 45 - --thread overrides format.thread=deep
+
+expecting success of 4014.46 'thread in-reply-to': 
+	check_threading expect.in-reply-to --in-reply-to="<test.message>" \
+		--thread main
+
+ok 46 - thread in-reply-to
+
+expecting success of 4014.47 'thread cover-letter': 
+	check_threading expect.cover-letter --cover-letter --thread main
+
+ok 47 - thread cover-letter
+
+expecting success of 4014.48 'thread cover-letter in-reply-to': 
+	check_threading expect.cl-irt --cover-letter \
+		--in-reply-to="<test.message>" --thread main
+
+ok 48 - thread cover-letter in-reply-to
+
+expecting success of 4014.49 'thread explicit shallow': 
+	check_threading expect.cl-irt --cover-letter \
+		--in-reply-to="<test.message>" --thread=shallow main
+
+ok 49 - thread explicit shallow
+
+expecting success of 4014.50 'thread deep': 
+	check_threading expect.deep --thread=deep main
+
+ok 50 - thread deep
+
+expecting success of 4014.51 'thread deep in-reply-to': 
+	check_threading expect.deep-irt  --thread=deep \
+		--in-reply-to="<test.message>" main
+
+ok 51 - thread deep in-reply-to
+
+expecting success of 4014.52 'thread deep cover-letter': 
+	check_threading expect.deep-cl --cover-letter --thread=deep main
+
+ok 52 - thread deep cover-letter
+
+expecting success of 4014.53 'thread deep cover-letter in-reply-to': 
+	check_threading expect.deep-cl-irt --cover-letter \
+		--in-reply-to="<test.message>" --thread=deep main
+
+ok 53 - thread deep cover-letter in-reply-to
+
+expecting success of 4014.54 'thread via config': 
+	test_config format.thread true &&
+	check_threading expect.thread main
+
+ok 54 - thread via config
+
+expecting success of 4014.55 'thread deep via config': 
+	test_config format.thread deep &&
+	check_threading expect.deep main
+
+ok 55 - thread deep via config
+
+expecting success of 4014.56 'thread config + override': 
+	test_config format.thread deep &&
+	check_threading expect.thread --thread main
+
+ok 56 - thread config + override
+
+expecting success of 4014.57 'thread config + --no-thread': 
+	test_config format.thread deep &&
+	check_threading expect.no-threading --no-thread main
+
+ok 57 - thread config + --no-thread
+
+expecting success of 4014.58 'excessive subject': 
+	rm -rf patches/ &&
+	git checkout side &&
+	before=$(git hash-object file) &&
+	before=$(git rev-parse --short $before) &&
+	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >>file &&
+	after=$(git hash-object file) &&
+	after=$(git rev-parse --short $after) &&
+	git update-index file &&
+	git commit -m "This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch." &&
+	git format-patch -o patches/ main..side &&
+	ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
+
+Already on 'side'
+[side 2a7e73c] This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 16 insertions(+)
+patches/0001-Side-changes-1.patch
+patches/0002-Side-changes-2.patch
+patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
+patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
+ok 58 - excessive subject
+
+expecting success of 4014.59 'failure to write cover-letter aborts gracefully': 
+	test_when_finished "rmdir 0000-cover-letter.patch" &&
+	mkdir 0000-cover-letter.patch &&
+	test_must_fail git format-patch --no-renames --cover-letter -1
+
+error: cannot open patch file ./0000-cover-letter.patch: Is a directory
+fatal: failed to create cover-letter file
+0000-cover-letter.patch
+ok 59 - failure to write cover-letter aborts gracefully
+
+expecting success of 4014.60 'cover-letter inherits diff options': 
+	git mv file foo &&
+	git commit -m foo &&
+	git format-patch --no-renames --cover-letter -1 &&
+	check_patch 0000-cover-letter.patch &&
+	! grep "file => foo .* 0 *\$" 0000-cover-letter.patch &&
+	git format-patch --cover-letter -1 -M &&
+	grep "file => foo .* 0 *\$" 0000-cover-letter.patch
+
+[side b90b9c2] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => foo (100%)
+0000-cover-letter.patch
+0001-foo.patch
+From: C O Mitter <committer@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 0/1] *** SUBJECT HERE ***
+0000-cover-letter.patch
+0001-foo.patch
+ file => foo | 0
+ok 60 - cover-letter inherits diff options
+
+expecting success of 4014.61 'shortlog of cover-letter wraps overly-long onelines': 
+	git format-patch --cover-letter -2 &&
+	sed -e "1,/A U Thor/d" -e "/^\$/q" 0000-cover-letter.patch >output &&
+	test_cmp expect output
+
+0000-cover-letter.patch
+0001-This-is-an-excessively-long-subject-line-for-a-messa.patch
+0002-foo.patch
+ok 61 - shortlog of cover-letter wraps overly-long onelines
+
+expecting success of 4014.62 'format-patch respects -U': 
+	git format-patch -U4 -2 &&
+	sed -e "1,/^diff/d" -e "/^+5/q" \
+		<0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \
+		>output &&
+	test_cmp expect output
+
+0001-This-is-an-excessively-long-subject-line-for-a-messa.patch
+0002-foo.patch
+ok 62 - format-patch respects -U
+
+expecting success of 4014.63 'format-patch -p suppresses stat': 
+	git format-patch -p -2 &&
+	sed -e "1,/^\$/d" -e "/^+5/q" 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch >output &&
+	test_cmp expect output
+
+0001-This-is-an-excessively-long-subject-line-for-a-messa.patch
+0002-foo.patch
+ok 63 - format-patch -p suppresses stat
+
+expecting success of 4014.64 'format-patch from a subdirectory (1)': 
+	filename=$(
+		rm -rf sub &&
+		mkdir -p sub/dir &&
+		cd sub/dir &&
+		git format-patch -1
+	) &&
+	case "$filename" in
+	0*)
+		;; # ok
+	*)
+		echo "Oops? $filename"
+		false
+		;;
+	esac &&
+	test -f "$filename"
+
+ok 64 - format-patch from a subdirectory (1)
+
+expecting success of 4014.65 'format-patch from a subdirectory (2)': 
+	filename=$(
+		rm -rf sub &&
+		mkdir -p sub/dir &&
+		cd sub/dir &&
+		git format-patch -1 -o ..
+	) &&
+	case "$filename" in
+	../0*)
+		;; # ok
+	*)
+		echo "Oops? $filename"
+		false
+		;;
+	esac &&
+	basename=$(expr "$filename" : ".*/\(.*\)") &&
+	test -f "sub/$basename"
+
+ok 65 - format-patch from a subdirectory (2)
+
+expecting success of 4014.66 'format-patch from a subdirectory (3)': 
+	rm -f 0* &&
+	filename=$(
+		rm -rf sub &&
+		mkdir -p sub/dir &&
+		cd sub/dir &&
+		git format-patch -1 -o "$TRASH_DIRECTORY"
+	) &&
+	basename=$(expr "$filename" : ".*/\(.*\)") &&
+	test -f "$basename"
+
+ok 66 - format-patch from a subdirectory (3)
+
+expecting success of 4014.67 'format-patch --in-reply-to': 
+	git format-patch -1 --stdout --in-reply-to "baz@foo.bar" >patch8 &&
+	grep "^In-Reply-To: <baz@foo.bar>" patch8 &&
+	grep "^References: <baz@foo.bar>" patch8
+
+In-Reply-To: <baz@foo.bar>
+References: <baz@foo.bar>
+ok 67 - format-patch --in-reply-to
+
+expecting success of 4014.68 'format-patch --signoff': 
+	git format-patch -1 --signoff --stdout >out &&
+	grep "^Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" out
+
+Signed-off-by: C O Mitter <committer@example.com>
+ok 68 - format-patch --signoff
+
+expecting success of 4014.69 'format-patch --notes --signoff': 
+	git notes --ref test add -m "test message" HEAD &&
+	git format-patch -1 --signoff --stdout --notes=test >out &&
+	# Three dashes must come after S-o-b
+	! sed "/^Signed-off-by: /q" out | grep "test message" &&
+	sed "1,/^Signed-off-by: /d" out | grep "test message" &&
+	# Notes message must come after three dashes
+	! sed "/^---$/q" out | grep "test message" &&
+	sed "1,/^---$/d" out | grep "test message"
+
+    test message
+    test message
+ok 69 - format-patch --notes --signoff
+
+expecting success of 4014.70 'format-patch notes output control': 
+	git notes add -m "notes config message" HEAD &&
+	test_when_finished git notes remove HEAD &&
+
+	git format-patch -1 --stdout >out &&
+	! grep "notes config message" out &&
+	git format-patch -1 --stdout --notes >out &&
+	grep "notes config message" out &&
+	git format-patch -1 --stdout --no-notes >out &&
+	! grep "notes config message" out &&
+	git format-patch -1 --stdout --notes --no-notes >out &&
+	! grep "notes config message" out &&
+	git format-patch -1 --stdout --no-notes --notes >out &&
+	grep "notes config message" out &&
+
+	test_config format.notes true &&
+	git format-patch -1 --stdout >out &&
+	grep "notes config message" out &&
+	git format-patch -1 --stdout --notes >out &&
+	grep "notes config message" out &&
+	git format-patch -1 --stdout --no-notes >out &&
+	! grep "notes config message" out &&
+	git format-patch -1 --stdout --notes --no-notes >out &&
+	! grep "notes config message" out &&
+	git format-patch -1 --stdout --no-notes --notes >out &&
+	grep "notes config message" out
+
+    notes config message
+    notes config message
+    notes config message
+    notes config message
+    notes config message
+Removing note for object HEAD
+ok 70 - format-patch notes output control
+
+expecting success of 4014.71 'format-patch with multiple notes refs': 
+	git notes --ref note1 add -m "this is note 1" HEAD &&
+	test_when_finished git notes --ref note1 remove HEAD &&
+	git notes --ref note2 add -m "this is note 2" HEAD &&
+	test_when_finished git notes --ref note2 remove HEAD &&
+
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git format-patch -1 --stdout --notes=note1 >out &&
+	grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git format-patch -1 --stdout --notes=note2 >out &&
+	! grep "this is note 1" out &&
+	grep "this is note 2" out &&
+	git format-patch -1 --stdout --notes=note1 --notes=note2 >out &&
+	grep "this is note 1" out &&
+	grep "this is note 2" out &&
+
+	test_config format.notes note1 &&
+	git format-patch -1 --stdout >out &&
+	grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git format-patch -1 --stdout --no-notes >out &&
+	! grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git format-patch -1 --stdout --notes=note2 >out &&
+	grep "this is note 1" out &&
+	grep "this is note 2" out &&
+	git format-patch -1 --stdout --no-notes --notes=note2 >out &&
+	! grep "this is note 1" out &&
+	grep "this is note 2" out &&
+
+	git config --add format.notes note2 &&
+	git format-patch -1 --stdout >out &&
+	grep "this is note 1" out &&
+	grep "this is note 2" out &&
+	git format-patch -1 --stdout --no-notes >out &&
+	! grep "this is note 1" out &&
+	! grep "this is note 2" out
+
+    this is note 1
+    this is note 2
+    this is note 1
+    this is note 2
+    this is note 1
+    this is note 1
+    this is note 2
+    this is note 2
+    this is note 1
+    this is note 2
+Removing note for object HEAD
+Removing note for object HEAD
+ok 71 - format-patch with multiple notes refs
 
-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 4014.72 'format-patch with multiple notes refs in config': 
+	test_when_finished "test_unconfig format.notes" &&
 
-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
+	git notes --ref note1 add -m "this is note 1" HEAD &&
+	test_when_finished git notes --ref note1 remove HEAD &&
+	git notes --ref note2 add -m "this is note 2" HEAD &&
+	test_when_finished git notes --ref note2 remove HEAD &&
 
-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)
+	git config format.notes note1 &&
+	git format-patch -1 --stdout >out &&
+	grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git config format.notes note2 &&
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	grep "this is note 2" out &&
+	git config --add format.notes note1 &&
+	git format-patch -1 --stdout >out &&
+	grep "this is note 1" out &&
+	grep "this is note 2" 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
+	git config --replace-all format.notes note1 &&
+	git config --add format.notes false &&
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git config --add format.notes note2 &&
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	grep "this is note 2" out
 
-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)
+    this is note 1
+    this is note 2
+    this is note 1
+    this is note 2
+    this is note 2
+Removing note for object HEAD
+Removing note for object HEAD
+ok 72 - format-patch with multiple notes refs in config
 
-expecting success of 4032.10 'diff -U0, 2 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 10 - diff -U0, 2 common lines: count hunks (2)
+expecting success of 4014.73 'options no longer allowed for format-patch': 
+	test_must_fail git format-patch --name-only 2>output &&
+	test_cmp expect.name-only output &&
+	test_must_fail git format-patch --name-status 2>output &&
+	test_cmp expect.name-status output &&
+	test_must_fail git format-patch --check 2>output &&
+	test_cmp expect.check output
 
-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)
+ok 73 - options no longer allowed for format-patch
 
-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 4014.74 'format-patch --numstat should produce a patch': 
+	git format-patch --numstat --stdout main..side >output &&
+	grep "^diff --git a/" output >diff &&
+	test_line_count = 5 diff
 
-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 74 - format-patch --numstat should produce a patch
 
-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 4014.75 'format-patch -- <path>': 
+	rm -f *.patch &&
+	git checkout -b pathspec main &&
 
-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)
+	echo file_a 1 >file_a &&
+	echo file_b 1 >file_b &&
+	git add file_a file_b &&
+	git commit -m pathspec_initial &&
 
-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)
+	echo file_a 2 >>file_a &&
+	git add file_a &&
+	git commit -m pathspec_a &&
 
-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)
+	echo file_b 2 >>file_b &&
+	git add file_b &&
+	git commit -m pathspec_b &&
 
-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)
+	echo file_a 3 >>file_a &&
+	echo file_b 3 >>file_b &&
+	git add file_a file_b &&
+	git commit -m pathspec_ab &&
 
-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)
+	cat >expect <<-\EOF &&
+	0001-pathspec_initial.patch
+	0002-pathspec_a.patch
+	0003-pathspec_ab.patch
+	EOF
 
-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)
+	git format-patch main..pathspec -- file_a >output &&
+	test_cmp expect output &&
+	! grep file_b *.patch
 
-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)
+Switched to a new branch 'pathspec'
+[pathspec d52bb05] pathspec_initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file_a
+ create mode 100644 file_b
+[pathspec b3666cb] pathspec_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[pathspec a150355] pathspec_b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[pathspec 32e34ab] pathspec_ab
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ok 75 - format-patch -- <path>
 
-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 4014.76 'format-patch --ignore-if-in-upstream HEAD': 
+	git checkout side &&
+	git format-patch --ignore-if-in-upstream HEAD
 
-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
+Switched to branch 'side'
+ok 76 - format-patch --ignore-if-in-upstream HEAD
 
-expecting success of 4032.24 '(diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)': 
-		test 1 = 1
-	
-ok 24 - (diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)
+expecting success of 4014.77 'get git version': 
+	git_version=$(git --version) &&
+	git_version=${git_version##* }
 
-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
+ok 77 - get git version
 
-expecting success of 4032.26 '(diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)': 
-		test 1 = 1
-	
-ok 26 - (diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)
+expecting success of 4014.78 'format-patch default signature': 
+	git format-patch --stdout -1 >patch &&
+	tail -n 3 patch >output &&
+	signature >expect &&
+	test_cmp expect output
 
-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
+ok 78 - format-patch default signature
 
-expecting success of 4032.28 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 28 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+expecting success of 4014.79 'format-patch --signature': 
+	git format-patch --stdout --signature="my sig" -1 >patch &&
+	tail -n 3 patch >output &&
+	signature "my sig" >expect &&
+	test_cmp expect output
 
-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)
+ok 79 - format-patch --signature
 
-expecting success of 4032.30 '(diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 30 - (diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)
+expecting success of 4014.80 'format-patch with format.signature config': 
+	git config format.signature "config sig" &&
+	git format-patch --stdout -1 >output &&
+	grep "config sig" output
 
-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)
+config sig
+ok 80 - format-patch with format.signature config
 
-expecting success of 4032.32 '(diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)': 
-		test 2 = 2
-	
-ok 32 - (diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)
+expecting success of 4014.81 'format-patch --signature overrides format.signature': 
+	git config format.signature "config sig" &&
+	git format-patch --stdout --signature="overrides" -1 >output &&
+	! grep "config sig" output &&
+	grep "overrides" output
 
-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)
+overrides
+ok 81 - format-patch --signature overrides format.signature
 
-expecting success of 4032.34 '(diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 34 - (diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)
+expecting success of 4014.82 'format-patch --no-signature ignores format.signature': 
+	git config format.signature "config sig" &&
+	git format-patch --stdout --signature="my sig" --no-signature \
+		-1 >output &&
+	check_patch output &&
+	! grep "config sig" output &&
+	! grep "my sig" output &&
+	! grep "^-- \$" output
 
-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)
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH] foo
+ok 82 - format-patch --no-signature ignores format.signature
 
-expecting success of 4032.36 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
-		test 1 = 1
-	
-ok 36 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
+expecting success of 4014.83 'format-patch --signature --cover-letter': 
+	git config --unset-all format.signature &&
+	git format-patch --stdout --signature="my sig" --cover-letter \
+		-1 >output &&
+	grep "my sig" output >sig &&
+	test_line_count = 2 sig
 
-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
+ok 83 - format-patch --signature --cover-letter
 
-fatal: bad numeric config value 'asdf' for 'diff.interhunkcontext' in file .git/config: invalid unit
-fatal: bad config variable 'diff.interhunkcontext' in file '.git/config' at line 7
-ok 37 - diff.interHunkContext invalid
+expecting success of 4014.84 'format.signature="" suppresses signatures': 
+	git config format.signature "" &&
+	git format-patch --stdout -1 >output &&
+	check_patch output &&
+	! grep "^-- \$" output
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4036-format-patch-signer-mime.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4036-format-patch-signer-mime/.git/
-expecting success of 4036.1 'setup': 
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH] foo
+ok 84 - format.signature="" suppresses signatures
 
-	>F &&
-	git add F &&
-	git commit -m initial &&
-	echo new line >F &&
+expecting success of 4014.85 'format-patch --no-signature suppresses signatures': 
+	git config --unset-all format.signature &&
+	git format-patch --stdout --no-signature -1 >output &&
+	check_patch output &&
+	! grep "^-- \$" output
 
-	test_tick &&
-	git commit -m "This adds some lines to F" F
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH] foo
+ok 85 - format-patch --no-signature suppresses signatures
 
+expecting success of 4014.86 'format-patch --signature="" suppresses signatures': 
+	git format-patch --stdout --signature="" -1 >output &&
+	check_patch output &&
+	! grep "^-- \$" output
 
-[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
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH] foo
+ok 86 - format-patch --signature="" suppresses signatures
 
-expecting success of 4036.2 'format normally': 
+expecting success of 4014.87 'prepare mail-signature input': 
+	cat >mail-signature <<-\EOF
 
-	git format-patch --stdout -1 >output &&
-	! grep Content-Type output
+	Test User <test.email@kernel.org>
+	http://git.kernel.org/cgit/git/git.git
 
+	git.kernel.org/?p=git/git.git;a=summary
 
-ok 2 - format normally
+	EOF
 
-expecting success of 4036.3 'format with signoff without funny signer name': 
+ok 87 - prepare mail-signature input
 
-	git format-patch -s --stdout -1 >output &&
-	! grep Content-Type output
+expecting success of 4014.88 '--signature-file=file works': 
+	git format-patch --stdout --signature-file=mail-signature -1 >output &&
+	check_patch output &&
+	sed -e "1,/^-- \$/d" output >actual &&
+	{
+		cat mail-signature && echo
+	} >expect &&
+	test_cmp expect actual
 
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH] foo
+ok 88 - --signature-file=file works
 
-ok 3 - format with signoff without funny signer name
+expecting success of 4014.89 'format.signaturefile works': 
+	test_config format.signaturefile mail-signature &&
+	git format-patch --stdout -1 >output &&
+	check_patch output &&
+	sed -e "1,/^-- \$/d" output >actual &&
+	{
+		cat mail-signature && echo
+	} >expect &&
+	test_cmp expect actual
 
-expecting success of 4036.4 'format with non ASCII signer name': 
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH] foo
+ok 89 - format.signaturefile works
 
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 >output &&
-	grep Content-Type output
+expecting success of 4014.90 '--no-signature suppresses format.signaturefile ': 
+	test_config format.signaturefile mail-signature &&
+	git format-patch --stdout --no-signature -1 >output &&
+	check_patch output &&
+	! grep "^-- \$" output
 
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH] foo
+ok 90 - --no-signature suppresses format.signaturefile 
 
-Content-Type: text/plain; charset=UTF-8
-ok 4 - format with non ASCII signer name
+expecting success of 4014.91 '--signature-file overrides format.signaturefile': 
+	cat >other-mail-signature <<-\EOF &&
+	Use this other signature instead of mail-signature.
+	EOF
+	test_config format.signaturefile mail-signature &&
+	git format-patch --stdout \
+			--signature-file=other-mail-signature -1 >output &&
+	check_patch output &&
+	sed -e "1,/^-- \$/d" output >actual &&
+	{
+		cat other-mail-signature && echo
+	} >expect &&
+	test_cmp expect actual
 
-expecting success of 4036.5 'attach and signoff do not duplicate mime headers': 
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH] foo
+ok 91 - --signature-file overrides format.signaturefile
 
-	GIT_COMMITTER_NAME="��� ����" \
-	git format-patch -s --stdout -1 --attach >output &&
-	test $(grep -ci ^MIME-Version: output) = 1
+expecting success of 4014.92 '--signature overrides format.signaturefile': 
+	test_config format.signaturefile mail-signature &&
+	git format-patch --stdout --signature="my sig" -1 >output &&
+	check_patch output &&
+	grep "my sig" output
 
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH] foo
+my sig
+ok 92 - --signature overrides format.signaturefile
 
-ok 5 - attach and signoff do not duplicate mime headers
+checking prerequisite: TTY
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4035-diff-quiet.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4035-diff-quiet/.git/
-expecting success of 4035.1 'setup': 
-	echo 1 >a &&
-	git add . &&
-	git commit -m first &&
-	echo 2 >b &&
-	git add . &&
-	git commit -a -m second &&
-	mkdir -p test-outside/repo && (
-		cd test-outside/repo &&
-		git init &&
-		echo "1 1" >a &&
-		git add . &&
-		git commit -m 1
-	) &&
-	mkdir -p test-outside/non/git && (
-		cd test-outside/non/git &&
-		echo "1 1" >a &&
-		echo "1 1" >matching-file &&
-		echo "1 1 " >trailing-space &&
-		echo "1   1" >extra-space &&
-		echo "2" >never-match
-	)
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-[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.45.2/t/trash directory.t4035-diff-quiet/test-outside/repo/.git/
-[master (root-commit) f9eeef1] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-ok 1 - setup
+	# 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 4035.2 'git diff-tree HEAD^ HEAD': 
-	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD >cnt &&
-	test_line_count = 0 cnt
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-ok 2 - git diff-tree HEAD^ HEAD
+)
+prerequisite TTY ok
+expecting success of 4014.93 'format-patch --stdout paginates': 
+	rm -f pager_used &&
+	test_terminal env GIT_PAGER="wc >pager_used" git format-patch --stdout --all &&
+	test_path_is_file pager_used
 
-expecting success of 4035.3 'git diff-tree HEAD^ HEAD -- a': 
-	test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt &&
-	test_line_count = 0 cnt
+ok 93 - format-patch --stdout paginates
 
-ok 3 - git diff-tree HEAD^ HEAD -- a
+expecting success of 4014.94 'format-patch --stdout pagination can be disabled': 
+	rm -f pager_used &&
+	test_terminal env GIT_PAGER="wc >pager_used" git --no-pager format-patch --stdout --all &&
+	test_terminal env GIT_PAGER="wc >pager_used" git -c "pager.format-patch=false" format-patch --stdout --all &&
+	test_path_is_missing pager_used &&
+	test_path_is_missing .git/pager_used
 
-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
+From e27066e74e2522a272f220d17767ef6cab999734 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:13:13 -0700
+Subject: [PATCH 01/30] Initial
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 4 - git diff-tree HEAD^ HEAD -- b
+---
+ elif | 10 ++++++++++
+ file | 10 ++++++++++
+ 2 files changed, 20 insertions(+)
+ create mode 100644 elif
+ create mode 100644 file
 
-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
+diff --git a/elif b/elif
+new file mode 100644
+index 0000000..f00c965
+--- /dev/null
++++ b/elif
+@@ -0,0 +1,10 @@
++1
++2
++3
++4
++5
++6
++7
++8
++9
++10
+diff --git a/file b/file
+new file mode 100644
+index 0000000..f00c965
+--- /dev/null
++++ b/file
+@@ -0,0 +1,10 @@
++1
++2
++3
++4
++5
++6
++7
++8
++9
++10
+-- 
+2.45.2
 
-ok 5 - echo HEAD | git diff-tree --stdin
 
-expecting success of 4035.6 'git diff-tree HEAD HEAD': 
-	test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt &&
-	test_line_count = 0 cnt
+From 1135adfeed86678c55e1aad7c568046ee8215660 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 02/30] Side changes #1
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 6 - git diff-tree HEAD HEAD
+---
+ elif | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 elif
 
-expecting success of 4035.7 'git diff-files': 
-	test_expect_code 0 git diff-files --quiet >cnt &&
-	test_line_count = 0 cnt
+diff --git a/elif b/elif
+old mode 100644
+new mode 100755
+-- 
+2.45.2
 
-ok 7 - git diff-files
 
-expecting success of 4035.8 'git diff-index --cached HEAD': 
-	test_expect_code 0 git diff-index --quiet --cached HEAD >cnt &&
-	test_line_count = 0 cnt
+From fd00575a8382ce27c62b83730a40bcff1dc2f25f Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:15:13 -0700
+Subject: [PATCH 03/30] Side changes #2
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 8 - git diff-index --cached HEAD
+---
+ file | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
-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
+diff --git a/file b/file
+index f00c965..e5895ff 100644
+--- a/file
++++ b/file
+@@ -1,10 +1,14 @@
+ 1
+ 2
+-3
+-4
+ 5
+ 6
++A
++B
++C
+ 7
+ 8
+ 9
+ 10
++D
++E
++F
+-- 
+2.45.2
 
-ok 9 - git diff-index --cached HEAD^
 
-expecting success of 4035.10 'git diff-index --cached HEAD^': 
-	echo text >>b &&
-	echo 3 >c &&
-	git add . &&
-	test_expect_code 1 git diff-index --quiet --cached HEAD^ >cnt &&
-	test_line_count = 0 cnt
+From 18ed22aae56367787c36a882bd61281e07994f11 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:16:13 -0700
+Subject: [PATCH 04/30] Side changes #3 with \n backslash-n in it.
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-warning: adding embedded git repository: test-outside/repo
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> test-outside/repo
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached test-outside/repo
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-ok 10 - git diff-index --cached HEAD^
+---
+ file | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
-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 e5895ff..40f36c6 100644
+--- a/file
++++ b/file
+@@ -1,8 +1,10 @@
+-1
+-2
+ 5
+ 6
++1
++2
++3
+ A
++4
+ B
+ C
+ 7
+-- 
+2.45.2
 
-[master b583ee2] text in b
- Author: A U Thor <author@example.com>
- 9 files changed, 8 insertions(+)
- create mode 100644 c
- create mode 100644 cnt
- create mode 100644 test-outside/non/git/a
- create mode 100644 test-outside/non/git/extra-space
- create mode 100644 test-outside/non/git/matching-file
- create mode 100644 test-outside/non/git/never-match
- create mode 100644 test-outside/non/git/trailing-space
- create mode 160000 test-outside/repo
-ok 11 - git diff-tree -Stext HEAD^ HEAD -- b
 
-expecting success of 4035.12 'git diff-tree -Snot-found HEAD^ HEAD -- b': 
-	test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt &&
-	test_line_count = 0 cnt
+From 333d5cbbd01bc8841a452d443caa9913971d4ffb Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:17:13 -0700
+Subject: [PATCH 05/30] Main accepts moral equivalent of #2
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
+---
+ file | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
-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
+diff --git a/file b/file
+index f00c965..e5895ff 100644
+--- a/file
++++ b/file
+@@ -1,10 +1,14 @@
+ 1
+ 2
+-3
+-4
+ 5
+ 6
++A
++B
++C
+ 7
+ 8
+ 9
+ 10
++D
++E
++F
+-- 
+2.45.2
 
-ok 13 - git diff-files
 
-expecting success of 4035.14 'git diff-index --cached HEAD': 
-	git update-index c &&
-	test_expect_code 1 git diff-index --quiet --cached HEAD >cnt &&
-	test_line_count = 0 cnt
+From 866b6195304ada3156f0f8c97696b6f862ce5312 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:18:13 -0700
+Subject: [PATCH 06/30] patchid 1
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 14 - git diff-index --cached HEAD
+---
+ file  | 13 -------------
+ file2 | 16 ++++++++++++++++
+ file3 | 16 ++++++++++++++++
+ 3 files changed, 32 insertions(+), 13 deletions(-)
+ create mode 100644 file2
+ create mode 100644 file3
 
-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
-	)
+diff --git a/file b/file
+index 40f36c6..236483f 100644
+--- a/file
++++ b/file
+@@ -1,16 +1,3 @@
+-5
+-6
+-1
+-2
+-3
+-A
+-4
+-B
+-C
+-7
+ 8
+ 9
+ 10
+-D
+-E
+-F
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000..40f36c6
+--- /dev/null
++++ b/file2
+@@ -0,0 +1,16 @@
++5
++6
++1
++2
++3
++A
++4
++B
++C
++7
++8
++9
++10
++D
++E
++F
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..281fa8c
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,16 @@
++1
++2
++3
++A
++4
++B
++C
++7
++8
++9
++10
++D
++E
++F
++5
++6
+-- 
+2.45.2
 
-ok 15 - git diff, one file outside repo
 
-expecting success of 4035.16 'git diff, both files outside repo': 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet a matching-file &&
-		test_expect_code 1 git diff --quiet a extra-space
-	)
+From b0e76a38f7c5ec2ee722c28a446dbba613e87da4 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:19:13 -0700
+Subject: [PATCH 07/30] patchid 2
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 16 - git diff, both files outside repo
+---
+ file2 | 11 +----------
+ file3 | 11 -----------
+ 2 files changed, 1 insertion(+), 21 deletions(-)
 
-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
-	)
+diff --git a/file2 b/file2
+index 40f36c6..d082389 100644
+--- a/file2
++++ b/file2
+@@ -1,16 +1,7 @@
+-5
+-6
+-1
+-2
+-3
+-A
+ 4
++A
+ B
+-C
+ 7
+ 8
+ 9
+ 10
+-D
+-E
+-F
+diff --git a/file3 b/file3
+index 281fa8c..eb411a6 100644
+--- a/file3
++++ b/file3
+@@ -1,16 +1,5 @@
+-1
+-2
+-3
+-A
+-4
+-B
+-C
+-7
+ 8
+ 9
+ 10
+-D
+-E
+-F
+ 5
+ 6
+-- 
+2.45.2
 
-ok 17 - git diff --ignore-space-at-eol, one file outside repo
 
-expecting success of 4035.18 'git diff --ignore-space-at-eol, both files outside repo': 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet --ignore-space-at-eol a trailing-space &&
-		test_expect_code 1 git diff --quiet --ignore-space-at-eol a extra-space
-	)
+From e905b623a7eaecf172d0a5e51615566d7c1343c2 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:20:13 -0700
+Subject: [PATCH 08/30] patchid 3
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 18 - git diff --ignore-space-at-eol, both files outside repo
+---
+ file | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-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
-	)
+diff --git a/file b/file
+index 236483f..478d49a 100644
+--- a/file
++++ b/file
+@@ -1,3 +1,3 @@
+-8
+-9
+ 10
++5
++6
+-- 
+2.45.2
 
-ok 19 - git diff --ignore-all-space, one file outside repo
 
-expecting success of 4035.20 'git diff --ignore-all-space, both files outside repo': 
-	(
-		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
-		export GIT_CEILING_DIRECTORIES &&
-		cd test-outside/non/git &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a trailing-space &&
-		test_expect_code 0 git diff --quiet --ignore-all-space a extra-space &&
-		test_expect_code 1 git diff --quiet --ignore-all-space a never-match
-	)
+From 289be112e33a41491aad62fa3df2ba34eef65c7b Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:21:13 -0700
+Subject: [PATCH 09/30] empty commit
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 20 - git diff --ignore-all-space, both files outside repo
+-- 
+2.45.2
 
-expecting success of 4035.21 'git diff --quiet ignores stat-change only entries': 
-	test-tool chmtime +10 a &&
-	echo modified >>b &&
-	test_expect_code 1 git diff --quiet
 
-ok 21 - git diff --quiet ignores stat-change only entries
+From a59b7abc7125e1ae9086ad0e2bb18e7aeb3892f8 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:22:13 -0700
+Subject: [PATCH 10/30] Feature branch change #1
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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 &&
+---
+ file | 1 +
+ 1 file changed, 1 insertion(+)
 
-	printf "Hello\r\nWorld\n" >crlf.txt &&
-	git diff --quiet crlf.txt
+diff --git a/file b/file
+index e5895ff..3cb93e8 100644
+--- a/file
++++ b/file
+@@ -12,3 +12,4 @@ C
+ D
+ E
+ F
++Another line
+-- 
+2.45.2
 
-warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
-warning: in the working copy of 'crlf.txt', CRLF will be replaced by LF the next time Git touches it
-ok 22 - git diff --quiet on a path that need conversion
 
-# passed all 22 test(s)
-1..22
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4037-diff-r-t-dirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4037-diff-r-t-dirs/.git/
-expecting success of 4037.1 'setup': 
-	mkdir dc dr dt &&
-	>dc/1 &&
-	>dr/2 &&
-	>dt/3 &&
-	>fc &&
-	>fr &&
-	>ft &&
-	git add . &&
-	test_tick &&
-	git commit -m initial &&
+From 099a2d98b92b3120885ae3cb404eb5bd1589a993 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:23:13 -0700
+Subject: [PATCH 11/30] Feature branch change #2
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-	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
+---
+ file | 1 +
+ 1 file changed, 1 insertion(+)
 
-[master (root-commit) 26fc746] initial
- Author: A U Thor <author@example.com>
- 6 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dc/1
- create mode 100644 dr/2
- create mode 100644 dt/3
- create mode 100644 fc
- create mode 100644 fr
- create mode 100644 ft
-[master 25e238e] second
- Author: A U Thor <author@example.com>
- 9 files changed, 5 insertions(+)
- create mode 100644 da/4
- delete mode 100644 dr/2
- create mode 100644 dt
- delete mode 100644 dt/3
- delete mode 100644 fr
- delete mode 100644 ft
- create mode 100644 ft/5
-ok 1 - setup
+diff --git a/file b/file
+index 3cb93e8..b43af10 100644
+--- a/file
++++ b/file
+@@ -13,3 +13,4 @@ D
+ E
+ F
+ Another line
++Yet another line
+-- 
+2.45.2
 
-expecting success of 4037.2 'verify': 
-	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
-	test_cmp expect actual
 
-ok 2 - verify
+From 3f3c468bfe7d646f0fe648fe73447c928ea9f263 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 12/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t3903-stash.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-	test_expect_code 129 git stash push --invalid-option 2>usage &&
-	! grep "or: git stash" usage
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..a117704
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++this is note 2
+-- 
+2.45.2
 
-   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
+From 5ffb44224ddede33e133bb3247046b7205ce395e Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 13/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..e9404d1
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++this is note 1
+-- 
+2.45.2
 
-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
+From d52bb05e62b70ce6791a2dfe8771f1fc15cb0f30 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 14/30] pathspec_initial
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-[main (root-commit) fe7e97b] initial
- Author: A U Thor <author@example.com>
+---
+ file_a | 1 +
+ file_b | 1 +
  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
+ create mode 100644 file_a
+ create mode 100644 file_b
 
-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
+diff --git a/file_a b/file_a
+new file mode 100644
+index 0000000..fa8d3ba
+--- /dev/null
++++ b/file_a
+@@ -0,0 +1 @@
++file_a 1
+diff --git a/file_b b/file_b
+new file mode 100644
+index 0000000..ce75531
+--- /dev/null
++++ b/file_b
+@@ -0,0 +1 @@
++file_b 1
+-- 
+2.45.2
 
-ok 5 - parents of stash
 
-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
+From 41b2a365155179ca3afaf5ef24f8fe3620ed2ece Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 15/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-fatal: log for 'stash' only has 1 entries
-ok 6 - applying bogus stash does nothing
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index a117704..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-this is note 2
+-- 
+2.45.2
 
-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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	output
-	usage
+From 4f00d6da4df555156261fca80f4fe1a712c3355e Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 16/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 7 - apply does not need clean working directory
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index e9404d1..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-this is note 1
+-- 
+2.45.2
 
-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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	output
-	usage
+From b3666cba140ea95784970b480fd8dc43c9ecab34 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 17/30] pathspec_a
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 8 - apply does not clobber working directory changes
+---
+ file_a | 1 +
+ 1 file changed, 1 insertion(+)
 
-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)
+diff --git a/file_a b/file_a
+index fa8d3ba..2cab2d9 100644
+--- a/file_a
++++ b/file_a
+@@ -1 +1,2 @@
+ file_a 1
++file_a 2
+-- 
+2.45.2
 
-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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	output
-	usage
+From f6a869f96d107d7e3fb6e594d23bd2e3d0bdb6a9 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 18/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 9 - apply stashed changes
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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)
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..a117704
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++this is note 2
+-- 
+2.45.2
 
-HEAD is now at fe7e97b initial
-[main da68008] 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 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
+From c438ac80cdffb61bcb91633982253b61fec6df8d Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 19/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	output
-	usage
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-ok 10 - apply stashed changes (including index)
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..e9404d1
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++this is note 1
+-- 
+2.45.2
 
-expecting success of 3903.11 'unstashing in a subdirectory': 
-	git reset --hard HEAD &&
-	mkdir subdir &&
-	(
-		cd subdir &&
-		git stash apply
-	)
 
-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
+From 98f42947e0ce149e0f5d64b53bd16d59a4157451 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 20/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	../expect
-	../output
-	../usage
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 11 - unstashing in a subdirectory
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..b1bf3b6
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++notes config message
+-- 
+2.45.2
 
-expecting success of 3903.12 'stash drop complains of extra options': 
-	test_must_fail git stash drop --foo
 
-error: unknown option `foo'
-usage: git stash drop [-q | --quiet] [<stash>]
+From 2a7e73cc10cd91e47b5a5b0edc7652d31eb54003 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 21/30] This is an excessively long subject line for a message
+ due to the habit some projects have of not having a short, one-line subject
+ at the start of the commit message, but rather sticking a whole paragraph
+ right at the start as the only thing in the commit message. It had better not
+ become the filename for the patch.
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-    -q, --[no-]quiet      be quiet, only report errors
+---
+ file | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
 
-ok 12 - stash drop complains of extra options
+diff --git a/file b/file
+index 40f36c6..2dc5c23 100644
+--- a/file
++++ b/file
+@@ -14,3 +14,19 @@ C
+ D
+ E
+ F
++5
++6
++1
++2
++3
++A
++4
++B
++C
++7
++8
++9
++10
++D
++E
++F
+-- 
+2.45.2
 
-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)
 
-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
+From 670fb985b43c91b09477f4b496cc41d19da79985 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 22/30] Side changes #1
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expected
-	output
-	usage
+---
+ elif | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 elif
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 13 - drop top stash
+diff --git a/elif b/elif
+old mode 100644
+new mode 100755
+-- 
+2.45.2
 
-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)
 
-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
+From a150355cf0ae81cbc9348966b0deadf810a58912 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 23/30] pathspec_b
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expected
-	output
-	usage
+---
+ file_b | 1 +
+ 1 file changed, 1 insertion(+)
 
-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
+diff --git a/file_b b/file_b
+index ce75531..4b46764 100644
+--- a/file_b
++++ b/file_b
+@@ -1 +1,2 @@
+ file_b 1
++file_b 2
+-- 
+2.45.2
 
-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
+From 7b899ae8dea3b2bba021d4dd6890cb68c705f1f1 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 24/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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)
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..da5a1d5
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++test message
+-- 
+2.45.2
 
-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
+From 74ec0928a6dadbff80d85127103ae7887528b54c Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 25/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expected
-	output
-	usage
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 15 - drop middle stash by index
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index a117704..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-this is note 2
+-- 
+2.45.2
 
-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
+From 569fa67c3cb8f7bd1a952c35e478584c28fd1b7b Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 26/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-expecting success of 3903.17 'drop stash reflog updates refs/stash with rewrite': 
-	git init repo &&
-	(
-		cd repo &&
-		setup_stash
-	) &&
-	echo 9 >repo/file &&
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-	old_oid="$(git -C repo rev-parse stash@{0})" &&
-	git -C repo stash &&
-	new_oid="$(git -C repo rev-parse stash@{0})" &&
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index e9404d1..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-this is note 1
+-- 
+2.45.2
 
-	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
+From 3bced63a7bc9eaa09cbbf4c6e8154341cc0f33b4 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 27/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3903-stash/repo/.git/
-[main (root-commit) c512db6] 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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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)
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index b1bf3b6..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-notes config message
+-- 
+2.45.2
 
-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
+From b90b9c23c70534c70a59983c62d93ab2061d77db Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 28/30] foo
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (5c6ad4ca28e71ae3a007e6c77043d04bc42fa9ee)
-ok 18 - stash pop
+---
+ file => foo | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => foo (100%)
 
-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)
+diff --git a/file b/foo
+similarity index 100%
+rename from file
+rename to foo
+-- 
+2.45.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
 
-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
+From 7b10a919520d93d73715076684d729589ac4925a Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:16:13 -0700
+Subject: [PATCH 29/30] Side changes #3 with \n backslash-n in it.
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	expect
-	expect1
-	expect2
-	expected
-	output
-	repo/
-	usage
+---
+ file | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
-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
+diff --git a/file b/file
+index e5895ff..40f36c6 100644
+--- a/file
++++ b/file
+@@ -1,8 +1,10 @@
+-1
+-2
+ 5
+ 6
++1
++2
++3
+ A
++4
+ B
+ C
+ 7
+-- 
+2.45.2
 
-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
+From 32e34aba86c71477afd9157c4f6df9b787bde881 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 30/30] pathspec_ab
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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 &&
+---
+ file_a | 1 +
+ file_b | 1 +
+ 2 files changed, 2 insertions(+)
 
-	git stash &&
-	git stash apply --index -q >output.out 2>&1 &&
-	test_must_be_empty output.out
+diff --git a/file_a b/file_a
+index 2cab2d9..81f70dc 100644
+--- a/file_a
++++ b/file_a
+@@ -1,2 +1,3 @@
+ file_a 1
+ file_a 2
++file_a 3
+diff --git a/file_b b/file_b
+index 4b46764..3d9874d 100644
+--- a/file_b
++++ b/file_b
+@@ -1,2 +1,3 @@
+ file_b 1
+ file_b 2
++file_b 3
+-- 
+2.45.2
 
-rm 'other-file'
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 21 - apply --index -q is quiet
+From e27066e74e2522a272f220d17767ef6cab999734 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:13:13 -0700
+Subject: [PATCH 01/30] Initial
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-expecting success of 3903.22 'save -q is quiet': 
-	git stash save --quiet >output.out 2>&1 &&
-	test_must_be_empty output.out
+---
+ elif | 10 ++++++++++
+ file | 10 ++++++++++
+ 2 files changed, 20 insertions(+)
+ create mode 100644 elif
+ create mode 100644 file
 
-ok 22 - save -q is quiet
+diff --git a/elif b/elif
+new file mode 100644
+index 0000000..f00c965
+--- /dev/null
++++ b/elif
+@@ -0,0 +1,10 @@
++1
++2
++3
++4
++5
++6
++7
++8
++9
++10
+diff --git a/file b/file
+new file mode 100644
+index 0000000..f00c965
+--- /dev/null
++++ b/file
+@@ -0,0 +1,10 @@
++1
++2
++3
++4
++5
++6
++7
++8
++9
++10
+-- 
+2.45.2
 
-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
+From 1135adfeed86678c55e1aad7c568046ee8215660 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 02/30] Side changes #1
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ elif | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 elif
 
-ok 24 - pop -q --index works and is quiet
+diff --git a/elif b/elif
+old mode 100644
+new mode 100755
+-- 
+2.45.2
 
-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
+From fd00575a8382ce27c62b83730a40bcff1dc2f25f Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:15:13 -0700
+Subject: [PATCH 03/30] Side changes #2
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ file | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
-HEAD is now at d3a23d9 alternate second
-ok 26 - stash push -q --staged refreshes the index
+diff --git a/file b/file
+index f00c965..e5895ff 100644
+--- a/file
++++ b/file
+@@ -1,10 +1,14 @@
+ 1
+ 2
+-3
+-4
+ 5
+ 6
++A
++B
++C
+ 7
+ 8
+ 9
+ 10
++D
++E
++F
+-- 
+2.45.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 &&
 
-	git stash apply -q --index &&
-	git diff-files >actual &&
-	test_cmp expect actual
+From 18ed22aae56367787c36a882bd61281e07994f11 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:16:13 -0700
+Subject: [PATCH 04/30] Side changes #3 with \n backslash-n in it.
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 27 - stash apply -q --index refreshes the index
+---
+ file | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
-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)
+diff --git a/file b/file
+index e5895ff..40f36c6 100644
+--- a/file
++++ b/file
+@@ -1,8 +1,10 @@
+-1
+-2
+ 5
+ 6
++1
++2
++3
+ A
++4
+ B
+ C
+ 7
+-- 
+2.45.2
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 28 - stash -k
 
-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)
+From 333d5cbbd01bc8841a452d443caa9913971d4ffb Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:17:13 -0700
+Subject: [PATCH 05/30] Main accepts moral equivalent of #2
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-Saved working directory and index state WIP on stashbranch: d3a23d9 alternate second
-ok 29 - stash --no-keep-index
+---
+ file | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
-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)
+diff --git a/file b/file
+index f00c965..e5895ff 100644
+--- a/file
++++ b/file
+@@ -1,10 +1,14 @@
+ 1
+ 2
+-3
+-4
+ 5
+ 6
++A
++B
++C
+ 7
+ 8
+ 9
+ 10
++D
++E
++F
+-- 
+2.45.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
 
-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
+From 866b6195304ada3156f0f8c97696b6f862ce5312 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:18:13 -0700
+Subject: [PATCH 06/30] patchid 1
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (87589b9806264bae268601f80dfb73d1e02c4fa4)
-ok 30 - stash --staged
+---
+ file  | 13 -------------
+ file2 | 16 ++++++++++++++++
+ file3 | 16 ++++++++++++++++
+ 3 files changed, 32 insertions(+), 13 deletions(-)
+ create mode 100644 file2
+ create mode 100644 file3
 
-expecting success of 3903.31 '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
+diff --git a/file b/file
+index 40f36c6..236483f 100644
+--- a/file
++++ b/file
+@@ -1,16 +1,3 @@
+-5
+-6
+-1
+-2
+-3
+-A
+-4
+-B
+-C
+-7
+ 8
+ 9
+ 10
+-D
+-E
+-F
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000..40f36c6
+--- /dev/null
++++ b/file2
+@@ -0,0 +1,16 @@
++5
++6
++1
++2
++3
++A
++4
++B
++C
++7
++8
++9
++10
++D
++E
++F
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..281fa8c
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,16 @@
++1
++2
++3
++A
++4
++B
++C
++7
++8
++9
++10
++D
++E
++F
++5
++6
+-- 
+2.45.2
 
-fatal: subcommand wasn't specified; 'push' can't be assumed due to unexpected token 'drop'
-ok 31 - dont assume push with non-option args
 
-expecting success of 3903.32 '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)
+From b0e76a38f7c5ec2ee722c28a446dbba613e87da4 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:19:13 -0700
+Subject: [PATCH 07/30] patchid 2
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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>
+---
+ file2 | 11 +----------
+ file3 | 11 -----------
+ 2 files changed, 1 insertion(+), 21 deletions(-)
 
-    -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
+diff --git a/file2 b/file2
+index 40f36c6..d082389 100644
+--- a/file2
++++ b/file2
+@@ -1,16 +1,7 @@
+-5
+-6
+-1
+-2
+-3
+-A
+ 4
++A
+ B
+-C
+ 7
+ 8
+ 9
+ 10
+-D
+-E
+-F
+diff --git a/file3 b/file3
+index 281fa8c..eb411a6 100644
+--- a/file3
++++ b/file3
+@@ -1,16 +1,5 @@
+-1
+-2
+-3
+-A
+-4
+-B
+-C
+-7
+ 8
+ 9
+ 10
+-D
+-E
+-F
+ 5
+ 6
+-- 
+2.45.2
 
-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>]
 
-    -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
+From e905b623a7eaecf172d0a5e51615566d7c1343c2 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:20:13 -0700
+Subject: [PATCH 08/30] patchid 3
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 32 - stash --invalid-option
+---
+ file | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-expecting success of 3903.33 '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)"
+diff --git a/file b/file
+index 236483f..478d49a 100644
+--- a/file
++++ b/file
+@@ -1,3 +1,3 @@
+-8
+-9
+ 10
++5
++6
+-- 
+2.45.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
 
-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
+From 289be112e33a41491aad62fa3df2ba34eef65c7b Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:21:13 -0700
+Subject: [PATCH 09/30] empty commit
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 33 - stash an added file
+-- 
+2.45.2
 
-expecting success of 3903.34 '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
 
-HEAD is now at d3a23d9 alternate second
-error: Entry 'file4' not uptodate. Cannot merge.
-Cannot save the current worktree state
-rm 'file4'
-ok 34 - stash --intent-to-add file
+From a59b7abc7125e1ae9086ad0e2bb18e7aeb3892f8 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:22:13 -0700
+Subject: [PATCH 10/30] Feature branch change #1
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-expecting success of 3903.35 '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)"
+---
+ file | 1 +
+ 1 file changed, 1 insertion(+)
 
-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
+diff --git a/file b/file
+index e5895ff..3cb93e8 100644
+--- a/file
++++ b/file
+@@ -12,3 +12,4 @@ C
+ D
+ E
+ F
++Another line
+-- 
+2.45.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
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 35 - stash rm then recreate
+From 099a2d98b92b3120885ae3cb404eb5bd1589a993 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:23:13 -0700
+Subject: [PATCH 11/30] Feature branch change #2
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-expecting success of 3903.36 '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)"
+---
+ file | 1 +
+ 1 file changed, 1 insertion(+)
 
-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
+diff --git a/file b/file
+index 3cb93e8..b43af10 100644
+--- a/file
++++ b/file
+@@ -13,3 +13,4 @@ D
+ E
+ F
+ Another line
++Yet another line
+-- 
+2.45.2
 
-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
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 36 - stash rm and ignore
+From 3f3c468bfe7d646f0fe648fe73447c928ea9f263 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 12/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-expecting success of 3903.37 '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)"
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..a117704
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++this is note 2
+-- 
+2.45.2
 
-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
 
-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
+From 5ffb44224ddede33e133bb3247046b7205ce395e Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 13/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-ok 37 - stash rm and ignore (stage .gitignore)
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-checking prerequisite: SYMLINKS
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..e9404d1
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++this is note 1
+-- 
+2.45.2
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
 
-)
-prerequisite SYMLINKS ok
-expecting success of 3903.38 '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
+From d52bb05e62b70ce6791a2dfe8771f1fc15cb0f30 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 14/30] pathspec_initial
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ file_a | 1 +
+ file_b | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file_a
+ create mode 100644 file_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
+diff --git a/file_a b/file_a
+new file mode 100644
+index 0000000..fa8d3ba
+--- /dev/null
++++ b/file_a
+@@ -0,0 +1 @@
++file_a 1
+diff --git a/file_b b/file_b
+new file mode 100644
+index 0000000..ce75531
+--- /dev/null
++++ b/file_b
+@@ -0,0 +1 @@
++file_b 1
+-- 
+2.45.2
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 38 - stash file to symlink
 
-expecting success of 3903.39 '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
+From 41b2a365155179ca3afaf5ef24f8fe3620ed2ece Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 15/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index a117704..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-this is note 2
+-- 
+2.45.2
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 39 - stash file to symlink (stage rm)
 
-expecting success of 3903.40 '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
+From 4f00d6da4df555156261fca80f4fe1a712c3355e Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 16/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index e9404d1..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-this is note 1
+-- 
+2.45.2
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 40 - stash file to symlink (full stage)
 
-expecting success of 3903.41 '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"
+From b3666cba140ea95784970b480fd8dc43c9ecab34 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 17/30] pathspec_a
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-HEAD is now at d3a23d9 alternate second
-[stashbranch f202a25] Add symlink
- Author: A U Thor <author@example.com>
+---
+ file_a | 1 +
  1 file changed, 1 insertion(+)
- create mode 120000 filelink
-Saved working directory and index state On stashbranch: symlink to file
-ok 41 - stash symlink to file
 
-expecting success of 3903.42 'this must have re-created the symlink': 
-	test -h filelink &&
-	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+diff --git a/file_a b/file_a
+index fa8d3ba..2cab2d9 100644
+--- a/file_a
++++ b/file_a
+@@ -1 +1,2 @@
+ file_a 1
++file_a 2
+-- 
+2.45.2
 
-ok 42 - this must have re-created the symlink
 
-expecting success of 3903.43 'unstash must re-create the file': 
-	git stash apply &&
-	! test -h filelink &&
-	test bar = "$(cat file)"
+From f6a869f96d107d7e3fb6e594d23bd2e3d0bdb6a9 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 18/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..a117704
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++this is note 2
+-- 
+2.45.2
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 43 - unstash must re-create the file
 
-expecting success of 3903.44 'stash symlink to file (stage rm)': 
-	git reset --hard &&
-	git rm filelink &&
-	cp file filelink &&
-	git stash save "symlink to file (stage rm)"
+From c438ac80cdffb61bcb91633982253b61fec6df8d Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 19/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-HEAD is now at f202a25 Add symlink
-rm 'filelink'
-Saved working directory and index state On stashbranch: symlink to file (stage rm)
-ok 44 - stash symlink to file (stage rm)
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-expecting success of 3903.45 'this must have re-created the symlink': 
-	test -h filelink &&
-	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..e9404d1
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++this is note 1
+-- 
+2.45.2
 
-ok 45 - this must have re-created the symlink
 
-expecting success of 3903.46 'unstash must re-create the file': 
-	git stash apply &&
-	! test -h filelink &&
-	test bar = "$(cat file)"
+From 98f42947e0ce149e0f5d64b53bd16d59a4157451 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 20/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..b1bf3b6
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++notes config message
+-- 
+2.45.2
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 46 - unstash must re-create the file
 
-expecting success of 3903.47 '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)"
+From 2a7e73cc10cd91e47b5a5b0edc7652d31eb54003 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 21/30] This is an excessively long subject line for a message
+ due to the habit some projects have of not having a short, one-line subject
+ at the start of the commit message, but rather sticking a whole paragraph
+ right at the start as the only thing in the commit message. It had better not
+ become the filename for the patch.
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-HEAD is now at f202a25 Add symlink
-Saved working directory and index state On stashbranch: symlink to file (full stage)
-ok 47 - stash symlink to file (full stage)
+---
+ file | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
 
-expecting success of 3903.48 'this must have re-created the symlink': 
-	test -h filelink &&
-	case "$(ls -l filelink)" in *" filelink -> file") :;; *) false;; esac
+diff --git a/file b/file
+index 40f36c6..2dc5c23 100644
+--- a/file
++++ b/file
+@@ -14,3 +14,19 @@ C
+ D
+ E
+ F
++5
++6
++1
++2
++3
++A
++4
++B
++C
++7
++8
++9
++10
++D
++E
++F
+-- 
+2.45.2
 
-ok 48 - this must have re-created the symlink
 
-expecting success of 3903.49 'unstash must re-create the file': 
-	git stash apply &&
-	! test -h filelink &&
-	test bar = "$(cat file)"
+From 670fb985b43c91b09477f4b496cc41d19da79985 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:14:13 -0700
+Subject: [PATCH 22/30] Side changes #1
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ elif | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 elif
 
-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
+diff --git a/elif b/elif
+old mode 100644
+new mode 100755
+-- 
+2.45.2
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 49 - unstash must re-create the file
 
-checking known breakage of 3903.50 '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^
+From a150355cf0ae81cbc9348966b0deadf810a58912 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 23/30] pathspec_b
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-HEAD is now at f202a25 Add symlink
-[stashbranch 36c53af] Add file in dir
- Author: A U Thor <author@example.com>
+---
+ file_b | 1 +
  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
 
-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
+diff --git a/file_b b/file_b
+index ce75531..4b46764 100644
+--- a/file_b
++++ b/file_b
+@@ -1 +1,2 @@
+ file_b 1
++file_b 2
+-- 
+2.45.2
 
-no changes added to commit (use "git add" and/or "git commit -a")
-test_must_fail: command succeeded: git stash apply
-not ok 50 - stash directory to file # TODO known breakage
 
-checking known breakage of 3903.51 '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)"
+From 7b899ae8dea3b2bba021d4dd6890cb68c705f1f1 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 24/30] Notes added by 'git notes add'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-nothing added to commit but untracked files present (use "git add" to track)
-File file/file doesn't exist
-not ok 51 - stash file to directory # TODO known breakage
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+new file mode 100644
+index 0000000..da5a1d5
+--- /dev/null
++++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
+@@ -0,0 +1 @@
++test message
+-- 
+2.45.2
 
-expecting success of 3903.52 '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 52 - giving too many ref arguments does not modify files
+From 74ec0928a6dadbff80d85127103ae7887528b54c Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 25/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-expecting success of 3903.53 '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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-Too many revisions specified: 'stash@{0}' 'stash@{1}'
-ok 53 - drop: too many arguments errors out (does nothing)
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index a117704..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-this is note 2
+-- 
+2.45.2
 
-expecting success of 3903.54 '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 54 - show: too many arguments errors out (does nothing)
+From 569fa67c3cb8f7bd1a952c35e478584c28fd1b7b Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 26/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-expecting success of 3903.55 '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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-HEAD is now at 36c53af Add file in dir
-HEAD is now at 36c53af Add file in dir
-ok 55 - stash create - no changes
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index e9404d1..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-this is note 1
+-- 
+2.45.2
 
-expecting success of 3903.56 '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
+From 3bced63a7bc9eaa09cbbf4c6e8154341cc0f33b4 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 27/30] Notes removed by 'git notes remove'
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
 
-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 56 - stash branch - no stashes on stack, stash-like argument
+diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
+deleted file mode 100644
+index b1bf3b6..0000000
+--- a/b90b9c23c70534c70a59983c62d93ab2061d77db
++++ /dev/null
+@@ -1 +0,0 @@
+-notes config message
+-- 
+2.45.2
 
-expecting success of 3903.57 '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
+From b90b9c23c70534c70a59983c62d93ab2061d77db Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 28/30] foo
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-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
+---
+ file => foo | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => foo (100%)
 
-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 57 - stash branch - stashes on stack, stash-like argument
+diff --git a/file b/foo
+similarity index 100%
+rename from file
+rename to foo
+-- 
+2.45.2
 
-expecting success of 3903.58 '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 58 - stash branch complains with no arguments
+From 7b10a919520d93d73715076684d729589ac4925a Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:16:13 -0700
+Subject: [PATCH 29/30] Side changes #3 with \n backslash-n in it.
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-expecting success of 3903.59 '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
+---
+ file | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
 
-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 59 - stash show format defaults to --stat
+diff --git a/file b/file
+index e5895ff..40f36c6 100644
+--- a/file
++++ b/file
+@@ -1,8 +1,10 @@
+-1
+-2
+ 5
+ 6
++1
++2
++3
+ A
++4
+ B
+ C
+ 7
+-- 
+2.45.2
 
-expecting success of 3903.60 '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 60 - stash show - stashes on stack, stash-like argument
+From 32e34aba86c71477afd9157c4f6df9b787bde881 Mon Sep 17 00:00:00 2001
+From: A U Thor <author@example.com>
+Date: Thu, 7 Apr 2005 15:24:13 -0700
+Subject: [PATCH 30/30] pathspec_ab
+Header1: B E Cipient <rcipient@example.com>
+To: Someone <someone@out.there>
+Cc: C E Cipient <rcipient@example.com>
 
-expecting success of 3903.61 '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
+---
+ file_a | 1 +
+ file_b | 1 +
+ 2 files changed, 2 insertions(+)
 
-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 -p - stashes on stack, stash-like argument
+diff --git a/file_a b/file_a
+index 2cab2d9..81f70dc 100644
+--- a/file_a
++++ b/file_a
+@@ -1,2 +1,3 @@
+ file_a 1
+ file_a 2
++file_a 3
+diff --git a/file_b b/file_b
+index 4b46764..3d9874d 100644
+--- a/file_b
++++ b/file_b
+@@ -1,2 +1,3 @@
+ file_b 1
+ file_b 2
++file_b 3
+-- 
+2.45.2
 
-expecting success of 3903.62 '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
+ok 94 - format-patch --stdout pagination can be disabled
 
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-ok 62 - stash show - no stashes on stack, stash-like argument
+expecting success of 4014.95 'format-patch handles multi-line subjects': 
+	rm -rf patches/ &&
+	echo content >>file &&
+	test_write_lines one two three >msg &&
+	git add file &&
+	git commit -F msg &&
+	git format-patch -o patches -1 &&
+	grep ^Subject: patches/0001-one.patch >actual &&
+	echo "Subject: [PATCH] one two three" >expect &&
+	test_cmp expect actual
 
-expecting success of 3903.63 '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
+[side 17e47ba] one two three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+patches/0001-one.patch
+ok 95 - format-patch handles multi-line subjects
 
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-ok 63 - stash show -p - no stashes on stack, stash-like argument
+expecting success of 4014.96 'format-patch handles multi-line encoded subjects': 
+	rm -rf patches/ &&
+	echo content >>file &&
+	test_write_lines en två tre >msg &&
+	git add file &&
+	git commit -F msg &&
+	git format-patch -o patches -1 &&
+	grep ^Subject: patches/0001-en.patch >actual &&
+	echo "Subject: [PATCH] =?UTF-8?q?en=20tv=C3=A5=20tre?=" >expect &&
+	test_cmp expect actual
 
-expecting success of 3903.64 '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
+[side 1ba0afd] en två tre
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+patches/0001-en.patch
+ok 96 - format-patch handles multi-line encoded subjects
 
-HEAD is now at 662e8e5 second
-HEAD is now at 662e8e5 second
-ok 64 - stash show --patience shows diff
+expecting success of 4014.97 'format-patch wraps extremely long subject (ascii)': 
+	echo content >>file &&
+	git add file &&
+	git commit -m "$M512" &&
+	git format-patch --stdout -1 >patch &&
+	sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
+	test_cmp expect subject
 
-expecting success of 3903.65 '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
+[side d8c94d2] foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 97 - format-patch wraps extremely long subject (ascii)
 
-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
+expecting success of 4014.98 'format-patch wraps extremely long subject (rfc2047)': 
+	rm -rf patches/ &&
+	echo content >>file &&
+	git add file &&
+	git commit -m "$M512" &&
+	git format-patch --stdout -1 >patch &&
+	sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
+	test_cmp expect subject
 
-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
+[side 47388bc] föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 98 - format-patch wraps extremely long subject (rfc2047)
 
-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 65 - drop: fail early if specified stash is not a stash ref
+expecting success of 4014.99 'format-patch quotes dot in from-headers': 
+	check_author "Foo B. Bar"
 
-expecting success of 3903.66 '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
+[side 5de4424] author-check
+ Author: Foo B. Bar <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 99 - format-patch quotes dot in from-headers
 
-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
+expecting success of 4014.100 'format-patch quotes double-quote in from-headers': 
+	check_author "Foo \"The Baz\" 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/
-	usage
+[side d2402b7] author-check
+ Author: Foo "The Baz" Bar <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 100 - format-patch quotes double-quote in from-headers
 
-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 - pop: fail early if specified stash is not a stash ref
+expecting success of 4014.101 'format-patch uses rfc2047-encoded from-headers when necessary': 
+	check_author "Föo Bar"
 
-expecting success of 3903.67 '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
+[side 7d733d4] author-check
+ Author: Föo Bar <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 101 - format-patch uses rfc2047-encoded from-headers when necessary
 
-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 67 - ref with non-existent reflog
+expecting success of 4014.102 'rfc2047-encoded from-headers leave no rfc822 specials': 
+	check_author "Föo B. Bar"
 
-expecting success of 3903.68 '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
+[side 0fb2487] author-check
+ Author: Föo B. Bar <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 102 - rfc2047-encoded from-headers leave no rfc822 specials
 
-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 68 - invalid ref of the form stash@{n}, n >= N
+expecting success of 4014.103 'format-patch wraps moderately long from-header (ascii)': 
+	check_author "foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_"
 
-expecting success of 3903.69 '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
+[side 6a7ec41] author-check
+ Author: foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_ <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 103 - format-patch wraps moderately long from-header (ascii)
 
-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 69 - invalid ref of the form "n", n >= N
+expecting success of 4014.104 'format-patch wraps extremely long from-header (ascii)': 
+	check_author "Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar"
 
-expecting success of 3903.70 '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
+[side bfcd2fb] author-check
+ Author: Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 104 - format-patch wraps extremely long from-header (ascii)
 
-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
+expecting success of 4014.105 'format-patch wraps extremely long from-header (rfc822)': 
+	check_author "Foo.Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar 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
+[side eac30c8] author-check
+ Author: Foo.Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 105 - format-patch wraps extremely long from-header (rfc822)
 
-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 4014.106 'format-patch wraps extremely long from-header (rfc2047)': 
+	check_author "Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar"
 
-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
+[side 58493a9] author-check
+ Author: Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 106 - format-patch wraps extremely long from-header (rfc2047)
 
-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 4014.107 'format-patch wraps extremely long from-header (non-ASCII without Q-encoding)': 
+	echo content >>file &&
+	git add file &&
+	GIT_AUTHOR_NAME="Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar" \
+	git commit -m author-check &&
+	git format-patch --no-encode-email-headers --stdout -1 >patch &&
+	sed -n "/^From: /p; /^ /p; /^$/q" patch >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/
-	usage
+[side dff849b] author-check
+ Author: Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 107 - format-patch wraps extremely long from-header (non-ASCII without Q-encoding)
 
-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
+expecting success of 4014.108 'subject lines are unencoded with --no-encode-email-headers': 
+	echo content >>file &&
+	git add file &&
+	git commit -m "Foö" &&
+	git format-patch --no-encode-email-headers -1 --stdout >patch &&
+	grep ^Subject: patch >actual &&
+	test_cmp expect 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
+[side 8072171] Foö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 108 - subject lines are unencoded with --no-encode-email-headers
 
-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 4014.109 'subject lines are unencoded with format.encodeEmailHeaders=false': 
+	echo content >>file &&
+	git add file &&
+	git commit -m "Foö" &&
+	git config format.encodeEmailHeaders false &&
+	git format-patch -1 --stdout >patch &&
+	grep ^Subject: patch >actual &&
+	test_cmp expect actual
 
-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 70 - valid ref of the form "n", n < N
+[side 9a61d52] Foö
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 109 - subject lines are unencoded with format.encodeEmailHeaders=false
 
-expecting success of 3903.71 'branch: do not drop the stash if the branch exists': 
-	git stash clear &&
-	echo foo >file &&
+expecting success of 4014.110 '--encode-email-headers overrides format.encodeEmailHeaders': 
+	echo content >>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} --
+	git commit -m "Foö" &&
+	git config format.encodeEmailHeaders false &&
+	git format-patch --encode-email-headers -1 --stdout >patch &&
+	grep ^Subject: patch >actual &&
+	test_cmp expect actual
 
-[main 47d5e0e] initial
+[side 752f4f4] Foö
  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 71 - branch: do not drop the stash if the branch exists
+ 1 file changed, 1 insertion(+)
+ok 110 - --encode-email-headers overrides format.encodeEmailHeaders
 
-expecting success of 3903.72 'branch: should not drop the stash if the apply fails': 
-	git stash clear &&
-	git reset HEAD~1 --hard &&
-	echo foo >file &&
+expecting success of 4014.111 'subject lines do not have 822 atom-quoting': 
+	echo content >>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} --
+	git commit -m "header with . in it" &&
+	git format-patch -k -1 --stdout >patch &&
+	grep ^Subject: patch >actual &&
+	test_cmp expect actual
 
-HEAD is now at 662e8e5 second
-[main 47d5e0e] initial
+[side 1dbf506] header with . in it
  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
+ 1 file changed, 1 insertion(+)
+ok 111 - subject lines do not have 822 atom-quoting
 
-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 4014.112 'subject prefixes have space prepended': 
+	git format-patch -n -1 --stdout --subject-prefix=PREFIX >patch &&
+	grep ^Subject: patch >actual &&
+	test_cmp expect actual
 
-no changes added to commit (use "git add" and/or "git commit -a")
-68902b50f26eb6fc30df10f888c7728c286038c7
---
-Switched to branch 'main'
-M	file
-ok 72 - branch: should not drop the stash if the apply fails
+ok 112 - subject prefixes have space prepended
 
-expecting success of 3903.73 '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..."
+expecting success of 4014.113 'empty subject prefix does not have extra space': 
+	git format-patch -n -1 --stdout --subject-prefix= >patch &&
+	grep ^Subject: patch >actual &&
+	test_cmp expect actual
+
+ok 113 - empty subject prefix does not have extra space
+
+expecting success of 4014.114 '--rfc': 
+	cat >expect <<-\EOF &&
+	Subject: [RFC PATCH 1/1] header with . in it
+	EOF
+	git format-patch -n -1 --stdout --rfc >patch &&
+	grep "^Subject:" patch >actual &&
+	test_cmp expect actual
+
+ok 114 - --rfc
+
+expecting success of 4014.115 '--rfc does not overwrite prefix': 
+	cat >expect <<-\EOF &&
+	Subject: [RFC PATCH foobar 1/1] header with . in it
+	EOF
+	git -c format.subjectPrefix="PATCH foobar" \
+		format-patch -n -1 --stdout --rfc >patch &&
+	grep "^Subject:" patch >actual &&
 	test_cmp expect actual
 
-[main 307367e] subdir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/subfile1
-ok 73 - apply: show same status as git status (relative to ./)
-
-expecting success of 3903.74 '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 115 - --rfc does not overwrite prefix
 
-HEAD is now at 307367e subdir
-Saved working directory and index state WIP on main: 307367e subdir
-ok 74 - stash where working directory contains "HEAD" file
+expecting success of 4014.116 '--rfc is argument order independent': 
+	cat >expect <<-\EOF &&
+	Subject: [RFC PATCH foobar 1/1] header with . in it
+	EOF
+	git format-patch -n -1 --stdout --rfc \
+		--subject-prefix="PATCH foobar" >patch &&
+	grep "^Subject:" patch >actual &&
+	test_cmp expect actual
 
-expecting success of 3903.75 'store called with invalid commit': 
-	test_must_fail git stash store foo
+ok 116 - --rfc is argument order independent
 
-Cannot update refs/stash with foo
-ok 75 - store called with invalid commit
+expecting success of 4014.117 '--from=ident notices bogus ident': 
+	test_must_fail git format-patch -1 --stdout --from=foo >patch
 
-expecting success of 3903.76 'store called with non-stash commit': 
-	test_must_fail git stash store HEAD
+fatal: invalid ident line: foo
+ok 117 - --from=ident notices bogus ident
 
-fatal: '307367ef082bbeb26ff4d37194044be1a75ff404' is not a stash-like commit
-ok 76 - store called with non-stash commit
+expecting success of 4014.118 '--from=ident replaces author': 
+	git format-patch -1 --stdout --from="Me <me@example.com>" >patch &&
+	cat >expect <<-\EOF &&
+	From: Me <me@example.com>
 
-expecting success of 3903.77 '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
+	From: A U Thor <author@example.com>
 
-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
+	EOF
+	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
+	test_cmp expect patch.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
+ok 118 - --from=ident replaces author
 
-Dropped refs/stash@{0} (47ce57b251b2eb978437ea9bbc89e32969254a93)
-quux
-ok 77 - store updates stash ref and reflog
+expecting success of 4014.119 '--from uses committer ident': 
+	git format-patch -1 --stdout --from >patch &&
+	cat >expect <<-\EOF &&
+	From: C O Mitter <committer@example.com>
 
-expecting success of 3903.78 '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
+	From: A U Thor <author@example.com>
 
-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
+	EOF
+	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
+	test_cmp expect patch.head
 
-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 119 - --from uses committer ident
 
-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 4014.120 '--from omits redundant in-body header': 
+	git format-patch -1 --stdout --from="A U Thor <author@example.com>" >patch &&
+	cat >expect <<-\EOF &&
+	From: A U Thor <author@example.com>
 
-pig
-ok 78 - handle stash specification with spaces
+	EOF
+	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
+	test_cmp expect patch.head
 
-expecting success of 3903.79 'setup stash with index and worktree changes': 
-	git stash clear &&
-	git reset --hard &&
-	echo index >file &&
-	git add file &&
-	echo working >file &&
-	git stash
+ok 120 - --from omits redundant in-body header
 
-HEAD is now at 307367e subdir
-Saved working directory and index state WIP on main: 307367e subdir
-ok 79 - setup stash with index and worktree changes
+expecting success of 4014.121 'with --force-in-body-from, redundant in-body from is kept': 
+	git format-patch --force-in-body-from \
+		-1 --stdout --from="A U Thor <author@example.com>" >patch &&
+	cat >expect <<-\EOF &&
+	From: A U Thor <author@example.com>
 
-expecting success of 3903.80 'stash list -p shows simple diff': 
-	cat >expect <<-EOF &&
-	stash@{0}
+	From: A U Thor <author@example.com>
 
-	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
+	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
+	test_cmp expect patch.head
 
-ok 80 - stash list -p shows simple diff
+ok 121 - with --force-in-body-from, redundant in-body from is kept
 
-expecting success of 3903.81 'stash list --cc shows combined diff': 
+expecting success of 4014.122 'format.forceInBodyFrom, equivalent to --force-in-body-from': 
+	git -c format.forceInBodyFrom=yes format-patch \
+		-1 --stdout --from="A U Thor <author@example.com>" >patch &&
 	cat >expect <<-\EOF &&
-	stash@{0}
+	From: A U Thor <author@example.com>
+
+	From: A U Thor <author@example.com>
 
-	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
+	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
+	test_cmp expect patch.head
 
-ok 81 - stash list --cc shows combined diff
+ok 122 - format.forceInBodyFrom, equivalent to --force-in-body-from
 
-expecting success of 3903.82 '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 4014.123 'format.forceInBodyFrom, equivalent to --force-in-body-from': 
+	git -c format.forceInBodyFrom=yes format-patch --no-force-in-body-from \
+		-1 --stdout --from="A U Thor <author@example.com>" >patch &&
+	cat >expect <<-\EOF &&
+	From: A U Thor <author@example.com>
 
-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
+	EOF
+	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
+	test_cmp expect patch.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
+ok 123 - format.forceInBodyFrom, equivalent to --force-in-body-from
 
-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 4014.124 'in-body headers trigger content encoding': 
+	test_env GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
+	test_when_finished "git reset --hard HEAD^" &&
+	git format-patch -1 --stdout --from >patch &&
+	cat >expect <<-\EOF &&
+	From: C O Mitter <committer@example.com>
+	Content-Type: text/plain; charset=UTF-8
 
-ok 82 - stash is not confused by partial renames
+	From: éxötìc <author@example.com>
 
-expecting success of 3903.83 '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
+	EOF
+	sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" patch >patch.head &&
+	test_cmp expect patch.head
 
-Saved working directory and index state On main: test message
-ok 83 - push -m shows right message
+[side 5d5f14e] exotic
+ Author: éxötìc <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 exotic.t
+HEAD is now at 1dbf506 header with . in it
+ok 124 - in-body headers trigger content encoding
 
-expecting success of 3903.84 '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 &&
+expecting success of 4014.125 'signoff: commit with no body': 
+	append_signoff </dev/null >actual &&
+	cat <<-\EOF | sed "s/EOL$//" >expect &&
+	4:Subject: [PATCH] EOL
+	8:
+	9:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-Saved working directory and index state On main: unspaced test message
-ok 84 - push -m also works without space
+ok 125 - signoff: commit with no body
 
-expecting success of 3903.85 '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 &&
+expecting success of 4014.126 'signoff: commit with only subject': 
+	echo subject | append_signoff >actual &&
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-HEAD is now at 307367e subdir
-ok 85 - store -m foo shows right message
+ok 126 - signoff: commit with only subject
 
-expecting success of 3903.86 '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 &&
+expecting success of 4014.127 'signoff: commit with only subject that does not end with NL': 
+	printf subject | append_signoff >actual &&
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-HEAD is now at 307367e subdir
-ok 86 - store -mfoo shows right message
+ok 127 - signoff: commit with only subject that does not end with NL
 
-expecting success of 3903.87 '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 &&
+expecting success of 4014.128 'signoff: no existing signoffs': 
+	append_signoff <<-\EOF >actual &&
+	subject
+
+	body
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-HEAD is now at 307367e subdir
-ok 87 - store --message=foo shows right message
+ok 128 - signoff: no existing signoffs
 
-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 &&
+expecting success of 4014.129 'signoff: no existing signoffs and no trailing NL': 
+	printf "subject\n\nbody" | append_signoff >actual &&
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-HEAD is now at 307367e subdir
-ok 88 - store --message foo shows right message
+ok 129 - signoff: no existing signoffs and no trailing NL
 
-expecting success of 3903.89 '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 &&
+expecting success of 4014.130 'signoff: some random signoff': 
+	append_signoff <<-\EOF >actual &&
+	subject
+
+	body
+
+	Signed-off-by: my@house
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: my@house
+	12:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-Saved working directory and index state On main: test mfoo
-ok 89 - push -mfoo uses right message
+ok 130 - signoff: some random signoff
 
-expecting success of 3903.90 '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 4014.131 'signoff: misc conforming footer elements': 
+	append_signoff <<-\EOF >actual &&
+	subject
+
+	body
+
+	Signed-off-by: my@house
+	(cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
+	Tested-by: Some One <someone@example.com>
+	Bug: 1234
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: my@house
+	15:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-Saved working directory and index state On main: test message foo
-ok 90 - push --message foo is synonym for -mfoo
+ok 131 - signoff: misc conforming footer elements
 
-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 &&
+expecting success of 4014.132 'signoff: some random signoff-alike': 
+	append_signoff <<-\EOF >actual &&
+	subject
+
+	body
+	Fooled-by-me: my@house
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	11:
+	12:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-Saved working directory and index state On main: test message=foo
-ok 91 - push --message=foo is synonym for -mfoo
+ok 132 - signoff: some random signoff-alike
 
-expecting success of 3903.92 '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 4014.133 'signoff: not really a signoff': 
+	append_signoff <<-\EOF >actual &&
+	subject
+
+	I want to mention about Signed-off-by: here.
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:I want to mention about Signed-off-by: here.
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-Saved working directory and index state On main: test m foo
-ok 92 - push -m shows right message
+ok 133 - signoff: not really a signoff
 
-expecting success of 3903.93 '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 4014.134 'signoff: not really a signoff (2)': 
+	append_signoff <<-\EOF >actual &&
+	subject
+
+	My unfortunate
+	Signed-off-by: example happens to be wrapped here.
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:Signed-off-by: example happens to be wrapped here.
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-ok 93 - create stores correct message
+ok 134 - signoff: not really a signoff (2)
 
-expecting success of 3903.94 '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 4014.135 'signoff: valid S-o-b paragraph in the middle': 
+	append_signoff <<-\EOF >actual &&
+	subject
+
+	Signed-off-by: my@house
+	Signed-off-by: your@house
+
+	A lot of houses.
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:Signed-off-by: my@house
+	10:Signed-off-by: your@house
+	11:
+	13:
+	14:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-Switched to a new branch 'some/topic'
-Switched to branch 'main'
-A	foo
-ok 94 - create when branch name has /
+ok 135 - signoff: valid S-o-b paragraph in the middle
 
-expecting success of 3903.95 '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 &&
+expecting success of 4014.136 'signoff: the same signoff at the end': 
+	append_signoff <<-\EOF >actual &&
+	subject
+
+	body
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-ok 95 - create with multiple arguments for the message
+ok 136 - signoff: the same signoff at the end
 
-expecting success of 3903.96 '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 &&
+expecting success of 4014.137 'signoff: the same signoff at the end, no trailing NL': 
+	printf "subject\n\nSigned-off-by: C O Mitter <committer@example.com>" |
+		append_signoff >actual &&
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	9:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
 	test_cmp expect actual
 
-Note: switching to 'HEAD~1'.
+ok 137 - signoff: the same signoff at the end, no trailing NL
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 4014.138 'signoff: the same signoff NOT at the end': 
+	append_signoff <<-\EOF >actual &&
+	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:
+	body
 
-  git switch -c <new-branch-name>
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: my@house
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	12:Signed-off-by: my@house
+	EOF
+	test_cmp expect actual
 
-Or undo this operation with:
+ok 138 - signoff: the same signoff NOT at the end
 
-  git switch -
+expecting success of 4014.139 'signoff: tolerate garbage in conforming footer': 
+	append_signoff <<-\EOF >actual &&
+	subject
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	body
 
-HEAD is now at 47d5e0e initial
-A	foo
-Previous HEAD position was 47d5e0e initial
-Switched to branch 'main'
-A	foo
-ok 96 - create in a detached state
+	Tested-by: my@house
+	Some Trash
+	Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	13:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 
-expecting success of 3903.97 '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
+ok 139 - signoff: tolerate garbage in conforming footer
 
-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 4014.140 'signoff: respect trailer config': 
+	append_signoff <<-\EOF >actual &&
+	subject
 
-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
+	Myfooter: x
+	Some Trash
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	11:
+	12:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual &&
 
-Dropped refs/stash@{0} (77cde497b79c4bf69eca6c6f66d3d5d913caa5d5)
-ok 97 - stash -- <pathspec> stashes and restores the file
+	test_config trailer.Myfooter.ifexists add &&
+	append_signoff <<-\EOF >actual &&
+	subject
 
-expecting success of 3903.98 '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
+	Myfooter: x
+	Some Trash
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	11:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 
-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
+ok 140 - signoff: respect trailer config
 
-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 4014.141 'signoff: footer begins with non-signoff without @ sign': 
+	append_signoff <<-\EOF >actual &&
+	subject
 
-Dropped refs/stash@{0} (77cde497b79c4bf69eca6c6f66d3d5d913caa5d5)
-ok 98 - stash -- <pathspec> stashes in subdirectory
+	body
 
-expecting success of 3903.99 '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
+	Reviewed-id: Noone
+	Tested-by: my@house
+	Change-id: Ideadbeef
+	Signed-off-by: C O Mitter <committer@example.com>
+	Bug: 1234
+	EOF
+	cat >expect <<-\EOF &&
+	4:Subject: [PATCH] subject
+	8:
+	10:
+	14:Signed-off-by: C O Mitter <committer@example.com>
+	EOF
+	test_cmp expect actual
 
-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
+ok 141 - signoff: footer begins with non-signoff without @ sign
 
-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 4014.142 'format patch ignores color.ui': 
+	test_unconfig color.ui &&
+	git format-patch --stdout -1 >expect &&
+	test_config color.ui always &&
+	git format-patch --stdout -1 >actual &&
+	test_cmp expect actual
 
-Dropped refs/stash@{0} (39084c1f0c9f714051bc864ea9bde5fe251804e7)
-ok 99 - stash with multiple pathspec arguments
+ok 142 - format patch ignores color.ui
 
-expecting success of 3903.100 '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 4014.143 'format patch respects diff.relative': 
+	rm -rf subdir &&
+	mkdir subdir &&
+	echo other content >subdir/file2 &&
+	git add subdir/file2 &&
+	git commit -F msg &&
+	test_unconfig diff.relative &&
+	git format-patch --relative=subdir --stdout -1 >expect &&
+	test_config diff.relative true &&
+	git -C subdir format-patch --stdout -1 >actual &&
+	test_cmp expect actual
 
-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
+[side 961662c] en två tre
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/file2
+ok 143 - format patch respects diff.relative
 
-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 4014.144 'cover letter with invalid --cover-from-description and config': 
+	test_config branch.rebuild-1.description "config subject
 
-Dropped refs/stash@{0} (a0eb395f4ba4b07852ce751bcb1e058bceeddcd6)
-ok 100 - stash with file including $IFS character
+body" &&
+	test_must_fail git format-patch --cover-letter --cover-from-description garbage main &&
+	test_config format.coverFromDescription garbage &&
+	test_must_fail git format-patch --cover-letter main
 
-expecting success of 3903.101 '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
+fatal: garbage: invalid cover from description mode
+fatal: garbage: invalid cover from description mode
+ok 144 - cover letter with invalid --cover-from-description and config
 
-[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
+expecting success of 4014.145 'cover letter with format.coverFromDescription = default': 
+	test_config branch.rebuild-1.description "config subject
 
-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
+body" &&
+	test_config format.coverFromDescription default &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" 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
+Switched to branch 'rebuild-1'
+Subject: [PATCH 0/2] *** SUBJECT HERE ***
+config subject
+body
+ok 145 - cover letter with format.coverFromDescription = default
 
-Dropped refs/stash@{0} (a99e49675f8b387c63ffade2c2dafb4b31242b77)
-ok 101 - stash with pathspec matching multiple paths
+expecting success of 4014.146 'cover letter with --cover-from-description default': 
+	test_config branch.rebuild-1.description "config subject
 
-expecting success of 3903.102 '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
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description default main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" 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 102 - stash push -p with pathspec shows no changes only once
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] *** SUBJECT HERE ***
+config subject
+body
+ok 146 - cover letter with --cover-from-description default
 
-expecting success of 3903.103 '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
+expecting success of 4014.147 'cover letter with format.coverFromDescription = none': 
+	test_config branch.rebuild-1.description "config subject
 
-[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 103 - push <pathspec>: show no changes when there are none
+body" &&
+	test_config format.coverFromDescription none &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	! grep "^body$" actual
 
-expecting success of 3903.104 'push: <pathspec> not in the repository errors out': 
-	>untracked &&
-	test_must_fail git stash push untracked &&
-	test_path_is_file untracked
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] *** SUBJECT HERE ***
+*** BLURB HERE ***
+ok 147 - cover letter with format.coverFromDescription = none
 
-error: pathspec ':(prefix:0)untracked' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 104 - push: <pathspec> not in the repository errors out
+expecting success of 4014.148 'cover letter with --cover-from-description none': 
+	test_config branch.rebuild-1.description "config subject
 
-expecting success of 3903.105 'push: -q is quiet with changes': 
-	>foo &&
-	git add foo &&
-	git stash push -q >output 2>&1 &&
-	test_must_be_empty output
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description none main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	! grep "^body$" actual
 
-ok 105 - push: -q is quiet with changes
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] *** SUBJECT HERE ***
+*** BLURB HERE ***
+ok 148 - cover letter with --cover-from-description none
 
-expecting success of 3903.106 'push: -q is quiet with no changes': 
-	git stash push -q >output 2>&1 &&
-	test_must_be_empty output
+expecting success of 4014.149 'cover letter with format.coverFromDescription = message': 
+	test_config branch.rebuild-1.description "config subject
 
-ok 106 - push: -q is quiet with no changes
+body" &&
+	test_config format.coverFromDescription message &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
 
-expecting success of 3903.107 '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
-	)
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] *** SUBJECT HERE ***
+config subject
+body
+ok 149 - cover letter with format.coverFromDescription = message
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t3903-stash/foo_dir/.git/
-ok 107 - push: -q is quiet even if there is no initial commit
+expecting success of 4014.150 'cover letter with --cover-from-description message': 
+	test_config branch.rebuild-1.description "config subject
 
-expecting success of 3903.108 '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
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description message main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
 
-Saved working directory and index state WIP on main: 7a1ff97 two
-ok 108 - untracked files are left in place when -u is not given
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] *** SUBJECT HERE ***
+config subject
+body
+ok 150 - cover letter with --cover-from-description message
 
-expecting success of 3903.109 '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 4014.151 'cover letter with format.coverFromDescription = subject': 
+	test_config branch.rebuild-1.description "config subject
 
-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
+body" &&
+	test_config format.coverFromDescription subject &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
 
-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
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] config subject
+body
+ok 151 - cover letter with format.coverFromDescription = subject
 
-Dropped refs/stash@{0} (ee2f40a7fbffdfcabacf51aaa804cdfb77cbd5cc)
-ok 109 - stash without verb with pathspec
+expecting success of 4014.152 'cover letter with --cover-from-description subject': 
+	test_config branch.rebuild-1.description "config subject
 
-expecting success of 3903.110 '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)
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description subject main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
 
-[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
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] config subject
+body
+ok 152 - cover letter with --cover-from-description subject
 
-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 4014.153 'cover letter with --cover-from-description subject (UTF-8 subject line)': 
+	test_config branch.rebuild-1.description "Café?
 
-no changes added to commit (use "git add" and/or "git commit -a")
-Dropped refs/stash@{0} (ba2404f46c158deabdec1768576a3ec717c3bd0e)
-ok 110 - stash -k -- <pathspec> leaves unstaged files intact
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description subject --encode-email-headers main >actual &&
+	grep "^Subject: \[PATCH 0/2\] =?UTF-8?q?Caf=C3=A9=3F?=$" actual &&
+	! grep "Café" actual
 
-expecting success of 3903.111 '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
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] =?UTF-8?q?Caf=C3=A9=3F?=
+ok 153 - cover letter with --cover-from-description subject (UTF-8 subject line)
 
-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
+expecting success of 4014.154 'cover letter with format.coverFromDescription = auto (short subject line)': 
+	test_config branch.rebuild-1.description "config subject
 
-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
+body" &&
+	test_config format.coverFromDescription auto &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
 
-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
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] config subject
+body
+ok 154 - cover letter with format.coverFromDescription = auto (short subject line)
 
-Dropped refs/stash@{0} (2749eb7e55d7636b47e46aaec96ad1ff54f3d24c)
-ok 111 - stash -- <subdir> leaves untracked files in subdir intact
+expecting success of 4014.155 'cover letter with --cover-from-description auto (short subject line)': 
+	test_config branch.rebuild-1.description "config subject
 
-expecting success of 3903.112 '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
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description auto main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
 
-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
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] config subject
+body
+ok 155 - cover letter with --cover-from-description auto (short subject line)
 
-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 4014.156 'cover letter with format.coverFromDescription = auto (long subject line)': 
+	test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects
 
-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
+body" &&
+	test_config format.coverFromDescription auto &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual &&
+	grep "^body$" actual
 
-Dropped refs/stash@{0} (e57a3ec7bcb89795529c05afe9c1d3759e31605b)
-ok 112 - stash -- <subdir> works with binary files
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] *** SUBJECT HERE ***
+this is a really long first line and it is over 100 characters long which is the threshold for long subjects
+body
+ok 156 - cover letter with format.coverFromDescription = auto (long subject line)
 
-expecting success of 3903.113 '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 4014.157 'cover letter with --cover-from-description auto (long subject line)': 
+	test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects
 
-Saved working directory and index state WIP on main: f03eb4e test
-ok 113 - stash with user.name and user.email set works
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description auto main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual &&
+	grep "^body$" actual
 
-expecting success of 3903.114 '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
-	)
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] *** SUBJECT HERE ***
+this is a really long first line and it is over 100 characters long which is the threshold for long subjects
+body
+ok 157 - cover letter with --cover-from-description auto (long subject line)
 
-Saved working directory and index state WIP on main: f03eb4e test
-Author identity unknown
+expecting success of 4014.158 'cover letter with command-line --cover-from-description overrides config': 
+	test_config branch.rebuild-1.description "config subject
 
-*** Please tell me who you are.
+body" &&
+	test_config format.coverFromDescription none &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description subject main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
 
-Run
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] config subject
+body
+ok 158 - cover letter with command-line --cover-from-description overrides config
 
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
+expecting success of 4014.159 'cover letter using branch description (1)': 
+	git checkout rebuild-1 &&
+	test_config branch.rebuild-1.description hello &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep hello actual
 
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
+Already on 'rebuild-1'
+hello
+ok 159 - cover letter using branch description (1)
 
-fatal: no email was given and auto-detection is disabled
-Saved working directory and index state WIP on main: f03eb4e test
-ok 114 - stash works when user.name and user.email are not set
+expecting success of 4014.160 'cover letter using branch description (2)': 
+	git checkout rebuild-1 &&
+	test_config branch.rebuild-1.description hello &&
+	git format-patch --stdout --cover-letter rebuild-1~2..rebuild-1 >actual &&
+	grep hello actual
 
-expecting success of 3903.115 '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
+Already on 'rebuild-1'
+hello
+ok 160 - cover letter using branch description (2)
 
-[main ebe821f] to-remove
- 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 115 - stash --keep-index with file deleted in index does not resurrect it on disk
+expecting success of 4014.161 'cover letter using branch description (3)': 
+	git checkout rebuild-1 &&
+	test_config branch.rebuild-1.description hello &&
+	git format-patch --stdout --cover-letter ^main rebuild-1 >actual &&
+	grep hello actual
 
-expecting success of 3903.116 'stash apply should succeed with unmodified file': 
-	echo base >file &&
-	git add file &&
-	git commit -m base &&
+Already on 'rebuild-1'
+hello
+ok 161 - cover letter using branch description (3)
 
-	# now stash a modification
-	echo modified >file &&
-	git stash &&
+expecting success of 4014.162 'cover letter using branch description (4)': 
+	git checkout rebuild-1 &&
+	test_config branch.rebuild-1.description hello &&
+	git format-patch --stdout --cover-letter main.. >actual &&
+	grep hello actual
 
-	# make the file stat dirty
-	cp file other &&
-	mv other file &&
+Already on 'rebuild-1'
+hello
+ok 162 - cover letter using branch description (4)
 
-	git stash apply
+expecting success of 4014.163 'cover letter using branch description (5)': 
+	git checkout rebuild-1 &&
+	test_config branch.rebuild-1.description hello &&
+	git format-patch --stdout --cover-letter -2 HEAD >actual &&
+	grep hello actual
 
-[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
+Already on 'rebuild-1'
+hello
+ok 163 - cover letter using branch description (5)
 
-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 4014.164 'cover letter using branch description (6)': 
+	git checkout rebuild-1 &&
+	test_config branch.rebuild-1.description hello &&
+	git format-patch --stdout --cover-letter -2 >actual &&
+	grep hello actual
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 116 - stash apply should succeed with unmodified file
+Already on 'rebuild-1'
+hello
+ok 164 - cover letter using branch description (6)
 
-expecting success of 3903.117 '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 4014.165 'cover letter with --description-file': 
+	test_when_finished "rm -f description.txt" &&
+	cat >description.txt <<-\EOF &&
+	subject from file
 
-	git rev-parse --verify refs/stash:A.t
+	body from file
+	EOF
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description auto \
+		--description-file description.txt main >actual &&
+	grep "^Subject: \[PATCH 0/2\] subject from file$" actual &&
+	grep "^body from file$" actual
 
-[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 117 - stash handles skip-worktree entries nicely
+Already on 'rebuild-1'
+Subject: [PATCH 0/2] subject from file
+body from file
+ok 165 - cover letter with --description-file
 
-expecting success of 3903.118 '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/ &&
+expecting success of 4014.166 'cover letter with nothing': 
+	git format-patch --stdout --cover-letter >actual &&
+	test_line_count = 0 actual
 
-	# 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 &&
+ok 166 - cover letter with nothing
 
-	# 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
+expecting success of 4014.167 'cover letter auto': 
+	mkdir -p tmp &&
+	test_when_finished "rm -rf tmp;
+		git config --unset format.coverletter" &&
 
-Saved working directory and index state WIP on main: 3d10817 A
-ok 118 - stash with core.fsyncmethod=batch
+	git config format.coverletter auto &&
+	git format-patch -o tmp -1 >list &&
+	test_line_count = 1 list &&
+	git format-patch -o tmp -2 >list &&
+	test_line_count = 3 list
 
-expecting success of 3903.119 'git stash succeeds despite directory/file change': 
-	test_create_repo directory_file_switch_v1 &&
-	(
-		cd directory_file_switch_v1 &&
-		test_commit init &&
+ok 167 - cover letter auto
 
-		test_write_lines this file has some words >filler &&
-		git add filler &&
-		git commit -m filler &&
+expecting success of 4014.168 'cover letter auto user override': 
+	mkdir -p tmp &&
+	test_when_finished "rm -rf tmp;
+		git config --unset format.coverletter" &&
 
-		git rm filler &&
-		mkdir filler &&
-		echo contents >filler/file &&
-		git stash push
-	)
+	git config format.coverletter auto &&
+	git format-patch -o tmp --cover-letter -1 >list &&
+	test_line_count = 2 list &&
+	git format-patch -o tmp --cover-letter -2 >list &&
+	test_line_count = 3 list &&
+	git format-patch -o tmp --no-cover-letter -1 >list &&
+	test_line_count = 1 list &&
+	git format-patch -o tmp --no-cover-letter -2 >list &&
+	test_line_count = 2 list
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 119 - git stash succeeds despite directory/file change
+ok 168 - cover letter auto user override
 
-expecting success of 3903.120 'git stash can pop file -> directory saved changes': 
-	test_create_repo directory_file_switch_v2 &&
-	(
-		cd directory_file_switch_v2 &&
-		test_commit init &&
+expecting success of 4014.169 'format-patch --zero-commit': 
+	git format-patch --zero-commit --stdout v2..v1 >patch2 &&
+	grep "^From " patch2 | sort | uniq >actual &&
+	echo "From $ZERO_OID Mon Sep 17 00:00:00 2001" >expect &&
+	test_cmp expect actual
 
-		test_write_lines this file has some words >filler &&
-		git add filler &&
-		git commit -m filler &&
+ok 169 - format-patch --zero-commit
 
-		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
-	)
+expecting success of 4014.170 'From line has expected format': 
+	git format-patch --stdout v2..v1 >patch2 &&
+	grep "^From " patch2 >from &&
+	grep "^From $OID_REGEX Mon Sep 17 00:00:00 2001$" patch2 >filtered &&
+	test_cmp from filtered
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+ok 170 - From line has expected format
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	filler/
+expecting success of 4014.171 'format-patch -o with no leading directories': 
+	rm -fr patches &&
+	git format-patch -o patches main..side &&
+	count=$(git rev-list --count main..side) &&
+	ls patches >list &&
+	test_line_count = $count list
 
-ok 120 - git stash can pop file -> directory saved changes
+patches/0001-Side-changes-1.patch
+patches/0002-Side-changes-2.patch
+patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
+patches/0005-foo.patch
+patches/0006-one.patch
+patches/0007-en.patch
+patches/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
+patches/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
+patches/0010-author-check.patch
+patches/0011-author-check.patch
+patches/0012-author-check.patch
+patches/0013-author-check.patch
+patches/0014-author-check.patch
+patches/0015-author-check.patch
+patches/0016-author-check.patch
+patches/0017-author-check.patch
+patches/0018-author-check.patch
+patches/0019-Fo.patch
+patches/0020-Fo.patch
+patches/0021-Fo.patch
+patches/0022-header-with-.-in-it.patch
+patches/0023-en.patch
+ok 171 - format-patch -o with no leading directories
 
-expecting success of 3903.121 '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 4014.172 'format-patch -o with leading existing directories': 
+	rm -rf existing-dir &&
+	mkdir existing-dir &&
+	git format-patch -o existing-dir/patches main..side &&
+	count=$(git rev-list --count main..side) &&
+	ls existing-dir/patches >list &&
+	test_line_count = $count list
 
-		mkdir filler &&
-		test_write_lines some words >filler/file1 &&
-		test_write_lines and stuff >filler/file2 &&
-		git add filler &&
-		git commit -m filler &&
+existing-dir/patches/0001-Side-changes-1.patch
+existing-dir/patches/0002-Side-changes-2.patch
+existing-dir/patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+existing-dir/patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
+existing-dir/patches/0005-foo.patch
+existing-dir/patches/0006-one.patch
+existing-dir/patches/0007-en.patch
+existing-dir/patches/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
+existing-dir/patches/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
+existing-dir/patches/0010-author-check.patch
+existing-dir/patches/0011-author-check.patch
+existing-dir/patches/0012-author-check.patch
+existing-dir/patches/0013-author-check.patch
+existing-dir/patches/0014-author-check.patch
+existing-dir/patches/0015-author-check.patch
+existing-dir/patches/0016-author-check.patch
+existing-dir/patches/0017-author-check.patch
+existing-dir/patches/0018-author-check.patch
+existing-dir/patches/0019-Fo.patch
+existing-dir/patches/0020-Fo.patch
+existing-dir/patches/0021-Fo.patch
+existing-dir/patches/0022-header-with-.-in-it.patch
+existing-dir/patches/0023-en.patch
+ok 172 - format-patch -o with leading existing directories
 
-		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 4014.173 'format-patch -o with leading non-existing directories': 
+	rm -rf non-existing-dir &&
+	git format-patch -o non-existing-dir/patches main..side &&
+	count=$(git rev-list --count main..side) &&
+	test_path_is_dir non-existing-dir &&
+	ls non-existing-dir/patches >list &&
+	test_line_count = $count list
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+non-existing-dir/patches/0001-Side-changes-1.patch
+non-existing-dir/patches/0002-Side-changes-2.patch
+non-existing-dir/patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+non-existing-dir/patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
+non-existing-dir/patches/0005-foo.patch
+non-existing-dir/patches/0006-one.patch
+non-existing-dir/patches/0007-en.patch
+non-existing-dir/patches/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
+non-existing-dir/patches/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
+non-existing-dir/patches/0010-author-check.patch
+non-existing-dir/patches/0011-author-check.patch
+non-existing-dir/patches/0012-author-check.patch
+non-existing-dir/patches/0013-author-check.patch
+non-existing-dir/patches/0014-author-check.patch
+non-existing-dir/patches/0015-author-check.patch
+non-existing-dir/patches/0016-author-check.patch
+non-existing-dir/patches/0017-author-check.patch
+non-existing-dir/patches/0018-author-check.patch
+non-existing-dir/patches/0019-Fo.patch
+non-existing-dir/patches/0020-Fo.patch
+non-existing-dir/patches/0021-Fo.patch
+non-existing-dir/patches/0022-header-with-.-in-it.patch
+non-existing-dir/patches/0023-en.patch
+ok 173 - format-patch -o with leading non-existing directories
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	expect
-	filler
+expecting success of 4014.174 'format-patch format.outputDirectory option': 
+	test_config format.outputDirectory patches &&
+	rm -fr patches &&
+	git format-patch main..side &&
+	count=$(git rev-list --count main..side) &&
+	ls patches >list &&
+	test_line_count = $count list
 
-ok 121 - git stash can pop directory -> file saved changes
+patches/0001-Side-changes-1.patch
+patches/0002-Side-changes-2.patch
+patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
+patches/0005-foo.patch
+patches/0006-one.patch
+patches/0007-en.patch
+patches/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
+patches/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
+patches/0010-author-check.patch
+patches/0011-author-check.patch
+patches/0012-author-check.patch
+patches/0013-author-check.patch
+patches/0014-author-check.patch
+patches/0015-author-check.patch
+patches/0016-author-check.patch
+patches/0017-author-check.patch
+patches/0018-author-check.patch
+patches/0019-Fo.patch
+patches/0020-Fo.patch
+patches/0021-Fo.patch
+patches/0022-header-with-.-in-it.patch
+patches/0023-en.patch
+ok 174 - format-patch format.outputDirectory option
 
-expecting success of 3903.122 'restore untracked files even when we hit conflicts': 
-	git init restore_untracked_after_conflict &&
-	(
-		cd restore_untracked_after_conflict &&
+expecting success of 4014.175 'format-patch -o overrides format.outputDirectory': 
+	test_config format.outputDirectory patches &&
+	rm -fr patches patchset &&
+	git format-patch main..side -o patchset &&
+	test_path_is_missing patches &&
+	test_path_is_dir patchset
 
-		echo hi >a &&
-		echo there >b &&
-		git add . &&
-		git commit -m first &&
-		echo hello >a &&
-		echo something >c &&
+patchset/0001-Side-changes-1.patch
+patchset/0002-Side-changes-2.patch
+patchset/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+patchset/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
+patchset/0005-foo.patch
+patchset/0006-one.patch
+patchset/0007-en.patch
+patchset/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
+patchset/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
+patchset/0010-author-check.patch
+patchset/0011-author-check.patch
+patchset/0012-author-check.patch
+patchset/0013-author-check.patch
+patchset/0014-author-check.patch
+patchset/0015-author-check.patch
+patchset/0016-author-check.patch
+patchset/0017-author-check.patch
+patchset/0018-author-check.patch
+patchset/0019-Fo.patch
+patchset/0020-Fo.patch
+patchset/0021-Fo.patch
+patchset/0022-header-with-.-in-it.patch
+patchset/0023-en.patch
+ok 175 - format-patch -o overrides format.outputDirectory
 
-		git stash push --include-untracked &&
+expecting success of 4014.176 'format-patch forbids multiple outputs': 
+	rm -fr outfile outdir &&
+	test_must_fail \
+		git format-patch --stdout --output-directory=outdir &&
+	test_must_fail \
+		git format-patch --stdout --output=outfile &&
+	test_must_fail \
+		git format-patch --output=outfile --output-directory=outdir
 
-		echo conflict >a &&
-		git add a &&
-		git commit -m second &&
+fatal: options '--stdout' and '--output-directory' cannot be used together
+fatal: options '--stdout' and '--output' cannot be used together
+fatal: options '--output' and '--output-directory' cannot be used together
+ok 176 - format-patch forbids multiple outputs
 
-		test_must_fail git stash pop &&
+expecting success of 4014.177 'configured outdir does not conflict with output options': 
+	rm -fr outfile outdir &&
+	test_config format.outputDirectory outdir &&
+	git format-patch --stdout &&
+	test_path_is_missing outdir &&
+	git format-patch --output=outfile &&
+	test_path_is_missing outdir
 
-		test_path_is_file c
-	)
+ok 177 - configured outdir does not conflict with output options
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 4014.178 'format-patch --output': 
+	rm -fr outfile &&
+	git format-patch -3 --stdout HEAD >expect &&
+	git format-patch -3 --output=outfile HEAD &&
+	test_cmp expect outfile
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	c
+ok 178 - format-patch --output
 
-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 122 - restore untracked files even when we hit conflicts
+expecting success of 4014.179 'format-patch --cover-letter --output': 
+	rm -fr outfile &&
+	git format-patch --cover-letter -3 --stdout HEAD >expect &&
+	git format-patch --cover-letter -3 --output=outfile HEAD &&
+	test_cmp expect outfile
 
-expecting success of 3903.123 '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 179 - format-patch --cover-letter --output
 
-		cat >expect <<-EOF &&
-		error: could not write index
-		EOF
-		test_must_fail git stash create 2>err &&
-		test_cmp expect err
-	)
+expecting success of 4014.180 'format-patch --base': 
+	git checkout patchid &&
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/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 123 - stash create reports a locked index
+	git format-patch --stdout --base=HEAD~3 -1 >patch &&
+	tail -n 7 patch >actual1 &&
 
-expecting success of 3903.124 '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 &&
+	git format-patch --stdout --base=HEAD~3 HEAD~.. >patch &&
+	tail -n 7 patch >actual2 &&
 
-		cat >expect <<-EOF &&
-		error: could not write index
-		EOF
-		test_must_fail git stash push 2>err &&
-		test_cmp expect err
-	)
+	echo >expect &&
+	git rev-parse HEAD~3 >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >>expect &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 124 - stash push reports a locked index
+	git show --patch HEAD~2 >patch &&
+	git patch-id --stable <patch >patch.id.raw &&
+	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
 
-expecting success of 3903.125 '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 &&
+	git show --patch HEAD~1 >patch &&
+	git patch-id --stable <patch >patch.id.raw &&
+	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
 
-		cat >expect <<-EOF &&
-		error: could not write index
-		EOF
-		test_must_fail git stash apply 2>err &&
-		test_cmp expect err
-	)
+	signature >>expect &&
+	test_cmp expect actual1 &&
+	test_cmp expect actual2 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 125 - stash apply reports a locked index
+	echo >fail &&
+	echo "base-commit: $(cat commit-id-base)" >>fail &&
 
-# still have 2 known breakage(s)
-# passed all remaining 123 test(s)
-1..125
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4039-diff-assume-unchanged.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4039-diff-assume-unchanged/.git/
-expecting success of 4039.1 'setup': 
-	echo zero > zero &&
-	git add zero &&
-	git commit -m zero &&
-	echo one > one &&
-	echo two > two &&
-	blob=$(git hash-object one) &&
-	git add one two &&
-	git commit -m onetwo &&
-	git update-index --assume-unchanged one &&
-	echo borked >> one &&
-	test "$(git ls-files -v one)" = "h one"
+	git show --patch HEAD~2 >patch &&
+	git patch-id --unstable <patch >patch.id.raw &&
+	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
 
-[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
+	git show --patch HEAD~1 >patch &&
+	git patch-id --unstable <patch >patch.id.raw &&
+	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
 
-expecting success of 4039.2 'diff-index does not examine assume-unchanged entries': 
-	git diff-index HEAD^ -- one | grep -q $blob
+	signature >>fail &&
+	! test_cmp fail actual1 &&
+	! test_cmp fail actual2
 
-ok 2 - diff-index does not examine assume-unchanged entries
+Switched to branch 'patchid'
+--- fail	2024-11-14 19:33:41.804236601 +0000
++++ actual1	2024-11-14 19:33:41.628234808 +0000
+@@ -1,7 +1,7 @@
+ 
+ base-commit: 18ed22aae56367787c36a882bd61281e07994f11
+-prerequisite-patch-id: 28427b5266de797837da09880f31c6774f1acddd
+-prerequisite-patch-id: e6bf335459a53de8c1f2e3f7fcfa7f52b48e8a34
++prerequisite-patch-id: f7afebea9c46bbd99ee80c7d77c4ea784d8c29e4
++prerequisite-patch-id: 2617b88e9c5376b5aa36597467a68844063a7501
+ -- 
+ 2.45.2
+ 
+--- fail	2024-11-14 19:33:41.804236601 +0000
++++ actual2	2024-11-14 19:33:41.656235093 +0000
+@@ -1,7 +1,7 @@
+ 
+ base-commit: 18ed22aae56367787c36a882bd61281e07994f11
+-prerequisite-patch-id: 28427b5266de797837da09880f31c6774f1acddd
+-prerequisite-patch-id: e6bf335459a53de8c1f2e3f7fcfa7f52b48e8a34
++prerequisite-patch-id: f7afebea9c46bbd99ee80c7d77c4ea784d8c29e4
++prerequisite-patch-id: 2617b88e9c5376b5aa36597467a68844063a7501
+ -- 
+ 2.45.2
+ 
+ok 180 - format-patch --base
 
-expecting success of 4039.3 'diff-files does not examine assume-unchanged entries': 
-	rm one &&
-	test -z "$(git diff-files -- one)"
+expecting success of 4014.181 'format-patch --base errors out when base commit is in revision list': 
+	test_must_fail git format-patch --base=HEAD -2 &&
+	test_must_fail git format-patch --base=HEAD~1 -2 &&
+	git format-patch --stdout --base=HEAD~2 -2 >patch &&
+	grep "^base-commit:" patch >actual &&
+	git rev-parse HEAD~2 >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 
-ok 3 - diff-files does not examine assume-unchanged entries
+fatal: base commit should be the ancestor of revision list
+fatal: base commit shouldn't be in revision list
+ok 181 - format-patch --base errors out when base commit is in revision list
 
-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 4014.182 'format-patch --base errors out when base commit is not ancestor of revision list': 
+	# For history as below:
+	#
+	#    ---Q---P---Z---Y---*---X
+	#	 \             /
+	#	  ------------W
+	#
+	# If "format-patch Z..X" is given, P and Z can not be specified as the base commit
+	git checkout -b topic1 main &&
+	git rev-parse HEAD >commit-id-base &&
+	test_commit P &&
+	git rev-parse HEAD >commit-id-P &&
+	test_commit Z &&
+	git rev-parse HEAD >commit-id-Z &&
+	test_commit Y &&
+	git checkout -b topic2 main &&
+	test_commit W &&
+	git merge topic1 &&
+	test_commit X &&
+	test_must_fail git format-patch --base=$(cat commit-id-P) -3 &&
+	test_must_fail git format-patch --base=$(cat commit-id-Z) -3 &&
+	git format-patch --stdout --base=$(cat commit-id-base) -3 >patch &&
+	grep "^base-commit:" patch >actual &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 
-[master 4cf4df7] exec
+Switched to a new branch 'topic1'
+[topic1 1475cb4] P
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100755 exec
-ok 4 - find-copies-harder is not confused by mode bits
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4040-whitespace-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4040-whitespace-status/.git/
-expecting success of 4040.1 'setup': 
-	mkdir a b &&
-	echo >c &&
-	echo >a/d &&
-	echo >b/e &&
-	git add . &&
-	test_tick &&
-	git commit -m initial &&
-	echo " " >a/d &&
-	test_tick &&
-	git commit -a -m second &&
-	echo "  " >a/d &&
-	echo " " >b/e &&
-	git add a/d
-
-[master (root-commit) b80f2e3] initial
+ create mode 100644 P.t
+[topic1 b544364] Z
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Z.t
+[topic1 93f1071] Y
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Y.t
+Switched to a new branch 'topic2'
+[topic2 90e4a2d] W
  Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 W.t
+Merge made by the 'ort' strategy.
+ P.t | 1 +
+ Y.t | 1 +
+ Z.t | 1 +
  3 files changed, 3 insertions(+)
- create mode 100644 a/d
- create mode 100644 b/e
- create mode 100644 c
-[master 13a0478] second
+ create mode 100644 P.t
+ create mode 100644 Y.t
+ create mode 100644 Z.t
+[topic2 fcd940f] X
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 X.t
+fatal: base commit should be the ancestor of revision list
+fatal: base commit should be the ancestor of revision list
+ok 182 - format-patch --base errors out when base commit is not ancestor of revision list
 
-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 4014.183 'format-patch --base=auto': 
+	git checkout -b upstream main &&
+	git checkout -b local upstream &&
+	git branch --set-upstream-to=upstream &&
+	test_commit N1 &&
+	test_commit N2 &&
+	git format-patch --stdout --base=auto -2 >patch &&
+	grep "^base-commit:" patch >actual &&
+	git rev-parse upstream >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 
-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
+Switched to a new branch 'upstream'
+Switched to a new branch 'local'
+branch 'local' set up to track 'upstream'.
+[local 58a2c1a] N1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 N1.t
+[local 2092f1c] N2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 N2.t
+ok 183 - format-patch --base=auto
 
-ok 3 - diff-tree -b --exit-code
+expecting success of 4014.184 'format-patch errors out when history involves criss-cross': 
+	# setup criss-cross history
+	#
+	#   B---M1---D
+	#  / \ /
+	# A   X
+	#  \ / \
+	#   C---M2---E
+	#
+	git checkout main &&
+	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 branch --set-upstream-to=xbc &&
+	git merge xb &&
+	git checkout xbc &&
+	test_commit D &&
+	git checkout xcb &&
+	test_commit E &&
+	test_must_fail 	git format-patch --base=auto -1
 
-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
+Switched to branch 'main'
+[main d0903cd] 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 5339a31] 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 1a9241d] 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'
+branch 'xcb' set up to track 'xbc'.
+Merge made by the 'ort' strategy.
+ B.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to branch 'xbc'
+[xbc 475ff64] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Switched to branch 'xcb'
+Your branch and 'xbc' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+[xcb 425fa6a] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+fatal: could not find exact merge base
+ok 184 - format-patch errors out when history involves criss-cross
 
-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 4014.185 'format-patch format.useAutoBase whenAble history involves criss-cross': 
+	test_config format.useAutoBase whenAble &&
+	git format-patch -1 >patch &&
+	! grep "^base-commit:" patch
 
-expecting success of 4040.5 'diff-index -b -p --cached --exit-code': 
-	git diff -b --cached --exit-code HEAD &&
-	git diff-index -b -p --cached --exit-code HEAD
+ok 185 - format-patch format.useAutoBase whenAble history involves criss-cross
 
-ok 5 - diff-index -b -p --cached --exit-code
+expecting success of 4014.186 'format-patch format.useAutoBase option': 
+	git checkout local &&
+	test_config format.useAutoBase true &&
+	git format-patch --stdout -1 >patch &&
+	grep "^base-commit:" patch >actual &&
+	git rev-parse upstream >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 
-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
+Switched to branch 'local'
+Your branch is ahead of 'upstream' by 2 commits.
+  (use "git push" to publish your local commits)
+ok 186 - format-patch format.useAutoBase option
 
-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 4014.187 'format-patch format.useAutoBase option with whenAble': 
+	git checkout local &&
+	test_config format.useAutoBase whenAble &&
+	git format-patch --stdout -1 >patch &&
+	grep "^base-commit:" patch >actual &&
+	git rev-parse upstream >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 
-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
+Already on 'local'
+Your branch is ahead of 'upstream' by 2 commits.
+  (use "git push" to publish your local commits)
+ok 187 - format-patch format.useAutoBase option with whenAble
 
-ok 7 - diff-index -b -p --exit-code
+expecting success of 4014.188 'format-patch --base overrides format.useAutoBase': 
+	test_config format.useAutoBase true &&
+	git format-patch --stdout --base=HEAD~1 -1 >patch &&
+	grep "^base-commit:" patch >actual &&
+	git rev-parse HEAD~1 >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
 
-expecting success of 4040.8 'diff-files --exit-code': 
-	test_must_fail git diff --exit-code &&
-	test_must_fail git diff-files --exit-code
+ok 188 - format-patch --base overrides format.useAutoBase
 
-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 4014.189 'format-patch --no-base overrides format.useAutoBase': 
+	test_config format.useAutoBase true &&
+	git format-patch --stdout --no-base -1 >patch &&
+	! grep "^base-commit:" patch
 
-expecting success of 4040.9 'diff-files -b -p --exit-code': 
-	git diff -b --exit-code &&
-	git diff-files -b -p --exit-code
+ok 189 - format-patch --no-base overrides format.useAutoBase
 
-ok 9 - diff-files -b -p --exit-code
+expecting success of 4014.190 'format-patch --no-base overrides format.useAutoBase whenAble': 
+	test_config format.useAutoBase whenAble &&
+	git format-patch --stdout --no-base -1 >patch &&
+	! grep "^base-commit:" patch
 
-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
+ok 190 - format-patch --no-base overrides format.useAutoBase whenAble
 
-HEAD is now at 13a0478 second
-ok 10 - diff-files --diff-filter --quiet
+expecting success of 4014.191 'format-patch --base with --attach': 
+	git format-patch --attach=mimemime --stdout --base=HEAD~ -1 >patch &&
+	sed -n -e "/^base-commit:/s/.*/1/p" -e "/^---*mimemime--$/s/.*/2/p" \
+		patch >actual &&
+	test_write_lines 1 2 >expect &&
+	test_cmp expect actual
 
-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
+ok 191 - format-patch --base with --attach
 
-[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
+expecting success of 4014.192 'format-patch --attach cover-letter only is non-multipart': 
+	test_when_finished "rm -fr patches" &&
+	git format-patch -o patches --cover-letter --attach=mimemime --base=HEAD~ -1 &&
+	! grep -E "^--+mimemime" patches/0000*.patch &&
+	grep -E "^--+mimemime$" patches/0001*.patch >output &&
+	test_line_count = 2 output &&
+	grep -E "^--+mimemime--$" patches/0001*.patch >output &&
+	test_line_count = 1 output
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4042-diff-textconv-caching.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+patches/0000-cover-letter.patch
+patches/0001-N2.patch
+ok 192 - format-patch --attach cover-letter only is non-multipart
 
-[master (root-commit) e62c20e] one
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
- create mode 100644 bar.bin
- create mode 100644 foo.bin
- create mode 100755 helper
-[master ea2ff12] two
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-ok 1 - setup
+expecting success of 4014.193 'format-patch with format.attach': 
+	test_when_finished "rm -fr patches" &&
+	separator=attachment-separator &&
+	test_config format.attach "$separator" &&
+	filename=$(git format-patch -o patches -1) &&
+	grep "^Content-Type: multipart/.*$separator" "$filename"
 
-expecting success of 4042.2 'first textconv works': 
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+Content-Type: multipart/mixed; boundary="------------attachment-separator"
+ok 193 - format-patch with format.attach
 
-ok 2 - first textconv works
+expecting success of 4014.194 'format-patch with format.attach=disabled': 
+	test_when_finished "rm -fr patches" &&
+	separator=attachment-separator &&
+	test_config_global format.attach "$separator" &&
+	test_config format.attach "" &&
+	filename=$(git format-patch -o patches -1) &&
+	# The output should not even declare content type for text/plain.
+	! grep "^Content-Type: multipart/" "$filename"
 
-expecting success of 4042.3 'cached textconv produces same output': 
-	git diff HEAD^ HEAD >actual &&
-	test_cmp expect actual
+ok 194 - format-patch with format.attach=disabled
 
-ok 3 - cached textconv produces same output
+expecting success of 4014.195 '-c format.mboxrd format-patch': 
+	sp=" " &&
+	cat >msg <<-INPUT_END &&
+	mboxrd should escape the body
 
-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
+	From could trip up a loose mbox parser
+	>From extra escape for reversibility
+	>>From extra escape for reversibility 2
+	from lower case not escaped
+	Fromm bad speling not escaped
+	 From with leading space not escaped
 
-ok 4 - cached textconv does not run helper
+	F
+	From
+	From$sp
+	From    $sp
+	From	$sp
+	INPUT_END
 
-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
+	cat >expect <<-INPUT_END &&
+	>From could trip up a loose mbox parser
+	>>From extra escape for reversibility
+	>>>From extra escape for reversibility 2
+	from lower case not escaped
+	Fromm bad speling not escaped
+	 From with leading space not escaped
 
-ok 5 - changing textconv invalidates cache
+	F
+	From
+	From
+	From
+	From
+	INPUT_END
 
-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 &&
+	C=$(git commit-tree HEAD^^{tree} -p HEAD <msg) &&
+	git -c format.mboxrd format-patch --stdout -1 $C~1..$C >patch &&
+	git format-patch --pretty=mboxrd --stdout -1 $C~1..$C >compat &&
+	test_cmp patch compat &&
+	git grep -h --no-index -A11 \
+		"^>From could trip up a loose mbox parser" patch >actual &&
 	test_cmp expect actual
 
-ok 6 - switching diff driver produces correct results
-
-expecting success of 4042.7 'log notes cache and still use cache for -p': 
-	git log --no-walk -p refs/notes/textconv/magic HEAD
+ok 195 - -c format.mboxrd format-patch
 
-commit 9c639377525bb0485f64e3a844123312ec98541e
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+expecting success of 4014.196 'interdiff: setup': 
+	git checkout -b boop main &&
+	test_commit fnorp blorp &&
+	test_commit fleep blorp
 
-    ./helper other
+Switched to a new branch 'boop'
+[boop afed659] fnorp
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 blorp
+[boop 15bea9f] fleep
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 196 - interdiff: setup
 
-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
+expecting success of 4014.197 'interdiff: cover-letter': 
+	sed "y/q/ /" >expect <<-\EOF &&
+	+fleep
+	--q
+	EOF
+	git format-patch --cover-letter --interdiff=boop~2 -1 boop &&
+	test_grep "^Interdiff:$" 0000-cover-letter.patch &&
+	test_grep ! "^Interdiff:$" 0001-fleep.patch &&
+	sed "1,/^@@ /d; /^-- $/q" 0000-cover-letter.patch >actual &&
+	test_cmp expect actual
 
-commit ea2ff12718498fa427bb0f1e263e2ba2e26a440d
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
+0000-cover-letter.patch
+0001-fleep.patch
+Interdiff:
+ok 197 - interdiff: cover-letter
 
-    two
+expecting success of 4014.198 'interdiff: reroll-count': 
+	git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop &&
+	test_grep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
 
-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
+v2-0000-cover-letter.patch
+v2-0001-fleep.patch
+Interdiff against v1:
+ok 198 - interdiff: reroll-count
 
-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
+expecting success of 4014.199 'interdiff: reroll-count with a non-integer': 
+	git format-patch --cover-letter --interdiff=boop~2 -v2.2 -1 boop &&
+	test_grep "^Interdiff:$" v2.2-0000-cover-letter.patch
 
-ok 8 - caching is silently ignored outside repo
+v2.2-0000-cover-letter.patch
+v2.2-0001-fleep.patch
+Interdiff:
+ok 199 - interdiff: reroll-count with a non-integer
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4014-format-patch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4014-format-patch/.git/
-expecting success of 4014.1 'setup': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
-	cat file >elif &&
-	git add file elif &&
-	test_tick &&
-	git commit -m Initial &&
-	git checkout -b side &&
+expecting success of 4014.200 'interdiff: reroll-count with a integer': 
+	git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop &&
+	test_grep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
 
-	test_write_lines 1 2 5 6 A B C 7 8 9 10 >file &&
-	test_chmod +x elif &&
-	test_tick &&
-	git commit -m "Side changes #1" &&
+v2-0000-cover-letter.patch
+v2-0001-fleep.patch
+Interdiff against v1:
+ok 200 - interdiff: reroll-count with a integer
 
-	test_write_lines D E F >>file &&
-	git update-index file &&
-	test_tick &&
-	git commit -m "Side changes #2" &&
-	git tag C2 &&
+expecting success of 4014.201 'interdiff: solo-patch': 
+	cat >expect <<-\EOF &&
+	  +fleep
 
-	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file &&
-	git update-index file &&
-	test_tick &&
-	git commit -m "Side changes #3 with \\n backslash-n in it." &&
+	EOF
+	git format-patch --interdiff=boop~2 -1 boop &&
+	test_grep "^Interdiff:$" 0001-fleep.patch &&
+	sed "1,/^  @@ /d; /^$/q" 0001-fleep.patch >actual &&
+	test_cmp expect actual
 
-	git checkout main &&
-	git diff-tree -p C2 >patch &&
-	git apply --index <patch &&
-	test_tick &&
-	git commit -m "Main accepts moral equivalent of #2" &&
+0001-fleep.patch
+Interdiff:
+ok 201 - interdiff: solo-patch
 
-	git checkout side &&
-	git checkout -b patchid &&
-	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >file2 &&
-	test_write_lines 1 2 3 A 4 B C 7 8 9 10 D E F 5 6 >file3 &&
-	test_write_lines 8 9 10 >file &&
-	git add file file2 file3 &&
-	test_tick &&
-	git commit -m "patchid 1" &&
-	test_write_lines 4 A B 7 8 9 10 >file2 &&
-	test_write_lines 8 9 10 5 6 >file3 &&
-	git add file2 file3 &&
-	test_tick &&
-	git commit -m "patchid 2" &&
-	test_write_lines 10 5 6 >file &&
-	git add file &&
-	test_tick &&
-	git commit -m "patchid 3" &&
+expecting success of 4014.202 'format-patch does not respect diff.noprefix': 
+	git -c diff.noprefix format-patch -1 --stdout >actual &&
+	grep "^--- a/blorp" actual
 
-	git checkout -b empty main &&
-	test_tick &&
-	git commit --allow-empty -m "empty commit" &&
+--- a/blorp
+ok 202 - format-patch does not respect diff.noprefix
 
-	git checkout main
+expecting success of 4014.203 'format-patch respects format.noprefix': 
+	git -c format.noprefix format-patch -1 --stdout >actual &&
+	grep "^--- blorp" actual
 
-[main (root-commit) e27066e] Initial
- Author: A U Thor <author@example.com>
- 2 files changed, 20 insertions(+)
- create mode 100644 elif
- create mode 100644 file
-Switched to a new branch 'side'
-[side 1135adf] Side changes #1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 elif
-[side fd00575] Side changes #2
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+), 2 deletions(-)
-[side 18ed22a] Side changes #3 with \n backslash-n in it.
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+), 2 deletions(-)
-Switched to branch 'main'
-[main 333d5cb] Main accepts moral equivalent of #2
- Author: A U Thor <author@example.com>
- 1 file changed, 6 insertions(+), 2 deletions(-)
-Switched to branch 'side'
-Switched to a new branch 'patchid'
-[patchid 866b619] patchid 1
- Author: A U Thor <author@example.com>
- 3 files changed, 32 insertions(+), 13 deletions(-)
- create mode 100644 file2
- create mode 100644 file3
-[patchid b0e76a3] patchid 2
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 21 deletions(-)
-[patchid e905b62] patchid 3
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Switched to a new branch 'empty'
-[empty 289be11] empty commit
- Author: A U Thor <author@example.com>
-Switched to branch 'main'
-ok 1 - setup
+--- blorp
+ok 203 - format-patch respects format.noprefix
 
-expecting success of 4014.2 'format-patch --ignore-if-in-upstream': 
-	git format-patch --stdout main..side >patch0 &&
-	grep "^From " patch0 >from0 &&
-	test_line_count = 3 from0
+expecting success of 4014.204 'format-patch --default-prefix overrides format.noprefix': 
+	git -c format.noprefix \
+		format-patch -1 --default-prefix --stdout >actual &&
+	grep "^--- a/blorp" actual
 
-ok 2 - format-patch --ignore-if-in-upstream
+--- a/blorp
+ok 204 - format-patch --default-prefix overrides format.noprefix
 
-expecting success of 4014.3 'format-patch --ignore-if-in-upstream': 
-	git format-patch --stdout \
-		--ignore-if-in-upstream main..side >patch1 &&
-	grep "^From " patch1 >from1 &&
-	test_line_count = 2 from1
+# still have 5 known breakage(s)
+# passed all remaining 199 test(s)
+1..204
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4031-diff-rewrite-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4031-diff-rewrite-binary/.git/
+expecting success of 4031.1 'create binary file with changes': 
+	make_file "\\0" &&
+	git add file &&
+	make_file "\\01"
 
-ok 3 - format-patch --ignore-if-in-upstream
+ok 1 - create binary file with changes
 
-expecting success of 4014.4 'format-patch --ignore-if-in-upstream handles tags': 
-	git tag -a v1 -m tag side &&
-	git tag -a v2 -m tag main &&
-	git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
-	grep "^From " patch1 >from1 &&
-	test_line_count = 2 from1
+expecting success of 4031.2 'vanilla diff is binary': 
+	git diff >diff &&
+	grep "Binary files a/file and b/file differ" diff
 
-ok 4 - format-patch --ignore-if-in-upstream handles tags
+Binary files a/file and b/file differ
+ok 2 - vanilla diff is binary
 
-expecting success of 4014.5 'format-patch doesn't consider merge commits': 
-	git checkout -b feature main &&
-	echo "Another line" >>file &&
-	test_tick &&
-	git commit -am "Feature branch change #1" &&
-	echo "Yet another line" >>file &&
-	test_tick &&
-	git commit -am "Feature branch change #2" &&
-	git checkout -b merger main &&
-	test_tick &&
-	git merge --no-ff feature &&
-	git format-patch -3 --stdout >patch &&
-	grep "^From " patch >from &&
-	test_line_count = 3 from
+expecting success of 4031.3 'rewrite diff is binary': 
+	git diff -B >diff &&
+	grep "dissimilarity index" diff &&
+	grep "Binary files a/file and b/file differ" diff
 
-Switched to a new branch 'feature'
-[feature a59b7ab] Feature branch change #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[feature 099a2d9] Feature branch change #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'merger'
-Merge made by the 'ort' strategy.
- file | 2 ++
- 1 file changed, 2 insertions(+)
-ok 5 - format-patch doesn't consider merge commits
+dissimilarity index 99%
+Binary files a/file and b/file differ
+ok 3 - rewrite diff is binary
 
-expecting success of 4014.6 'format-patch result applies': 
-	git checkout -b rebuild-0 main &&
-	git am -3 patch0 &&
-	git rev-list main.. >list &&
-	test_line_count = 2 list
+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
 
-Switched to a new branch 'rebuild-0'
-Applying: Side changes #1
-Applying: Side changes #2
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-670fb98 Side changes #1
-virtual Side changes #2
-found 1 common ancestor:
-virtual 8359489d93991065cdaa748bd96dcb831b3d60ca
-No changes -- Patch already applied.
-Applying: Side changes #3 with \n backslash-n in it.
-ok 6 - format-patch result applies
+dissimilarity index 99%
+GIT binary patch
+ok 4 - rewrite diff can show binary patch
 
-expecting success of 4014.7 'format-patch --ignore-if-in-upstream result applies': 
-	git checkout -b rebuild-1 main &&
-	git am -3 patch1 &&
-	git rev-list main.. >list &&
-	test_line_count = 2 list
+expecting success of 4031.5 'rewrite diff --numstat shows binary changes': 
+	git diff -B --numstat --summary >diff &&
+	grep -e "-	-	" diff &&
+	grep " rewrite file" diff
 
-Switched to a new branch 'rebuild-1'
-Applying: Side changes #1
-Applying: Side changes #3 with \n backslash-n in it.
-ok 7 - format-patch --ignore-if-in-upstream result applies
+-	-	file
+ rewrite file (99%)
+ok 5 - rewrite diff --numstat shows binary changes
 
-expecting success of 4014.8 'commit did not screw up the log message': 
-	git cat-file commit side >actual &&
-	grep "^Side .* with .* backslash-n" actual
+expecting success of 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
 
-Side changes #3 with \n backslash-n in it.
-ok 8 - commit did not screw up the log message
+ 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 4014.9 'format-patch did not screw up the log message': 
-	grep "^Subject: .*Side changes #3 with .* backslash-n" patch0 &&
-	grep "^Subject: .*Side changes #3 with .* backslash-n" patch1
+expecting success of 4031.7 'setup textconv': 
+	echo file diff=foo >.gitattributes &&
+	git config diff.foo.textconv "\"$(pwd)\""/dump
 
-Subject: [PATCH 3/3] Side changes #3 with \n backslash-n in it.
-Subject: [PATCH 2/2] Side changes #3 with \n backslash-n in it.
-ok 9 - format-patch did not screw up the log message
+ok 7 - setup textconv
 
-expecting success of 4014.10 'replay did not screw up the log message': 
-	git cat-file commit rebuild-1 >actual &&
-	grep "^Side .* with .* backslash-n" actual
+expecting success of 4031.8 'rewrite diff respects textconv': 
+	git diff -B >diff &&
+	grep "dissimilarity index" diff &&
+	grep "^-61" diff &&
+	grep "^-0" diff
 
-Side changes #3 with \n backslash-n in it.
-ok 10 - replay did not screw up the log message
+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
 
-expecting success of 4014.11 'format-patch empty commit': 
-	git format-patch --stdout main..empty >empty &&
-	grep "^From " empty >from &&
-	test_line_count = 1 from
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4033-diff-patience.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4033-diff-patience/.git/
+expecting success of 4033.1 '--ignore-space-at-eol with a single appended character': 
+	printf "a\nb\nc\n" >pre &&
+	printf "a\nbX\nc\n" >post &&
+	test_must_fail git diff --no-index \
+		--patience --ignore-space-at-eol pre post >diff &&
+	grep "^+.*X" diff
 
-ok 11 - format-patch empty commit
++bX
+ok 1 - --ignore-space-at-eol with a single appended character
 
-expecting success of 4014.12 'extra headers': 
-	git config format.headers "To: R E Cipient <rcipient@example.com>
-" &&
-	git config --add format.headers "Cc: S E Cipient <scipient@example.com>
-" &&
-	git format-patch --stdout main..side >patch2 &&
-	sed -e "/^\$/q" patch2 >hdrs2 &&
-	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
-	grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2
+expecting success of 4033.2 'setup attributes files for tests with patience': 
+		git checkout -b master &&
+		echo "file* diff=driver" >.gitattributes &&
+		git add file1 file2 .gitattributes &&
+		git commit -m "adding files" &&
+		git checkout -b branchA &&
+		echo "file* diff=driverA" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -m "adding driverA as diff driver" &&
+		git checkout master &&
+		git clone --bare --no-local . bare.git
+	
+Switched to a new branch 'master'
+[master (root-commit) 946e965] adding files
+ Author: A U Thor <author@example.com>
+ 3 files changed, 52 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'branchA'
+[branchA 7cbc84d] adding driverA as diff driver
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+Cloning into bare repository 'bare.git'...
+ok 2 - setup attributes files for tests with patience
 
-To: R E Cipient <rcipient@example.com>
-Cc: S E Cipient <scipient@example.com>
-ok 12 - extra headers
+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 4014.13 'extra headers without newlines': 
-	git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
-	git config --add format.headers "Cc: S E Cipient <scipient@example.com>" &&
-	git format-patch --stdout main..side >patch3 &&
-	sed -e "/^\$/q" patch3 >hdrs3 &&
-	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
-	grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
+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
 
-To: R E Cipient <rcipient@example.com>
-Cc: S E Cipient <scipient@example.com>
-ok 13 - extra headers without newlines
+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 4014.14 'extra headers with multiple To:s': 
-	git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
-	git config --add format.headers "To: S E Cipient <scipient@example.com>" &&
-	git format-patch --stdout main..side >patch4 &&
-	sed -e "/^\$/q" patch4 >hdrs4 &&
-	grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
-	grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
+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
 
-To: R E Cipient <rcipient@example.com>,
-    S E Cipient <scipient@example.com>
-ok 14 - extra headers with multiple To:s
+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 4014.15 'additional command line cc (ascii)': 
-	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
-	git format-patch --cc="S E Cipient <scipient@example.com>" --stdout main..side >patch5 &&
-	sed -e "/^\$/q" patch5 >hdrs5 &&
-	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
-	grep "^ *S E Cipient <scipient@example.com>\$" hdrs5
+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
 
-Cc: R E Cipient <rcipient@example.com>,
-    S E Cipient <scipient@example.com>
-ok 15 - additional command line cc (ascii)
+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
 
-checking known breakage of 4014.16 'additional command line cc (rfc822)': 
-	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
-	git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout main..side >patch5 &&
-	sed -e "/^\$/q" patch5 >hdrs5 &&
-	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
-	grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" hdrs5
+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
 
-Cc: R E Cipient <rcipient@example.com>,
-not ok 16 - additional command line cc (rfc822) # TODO known breakage
+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 4014.17 'command line headers': 
-	git config --unset-all format.headers &&
-	git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout main..side >patch6 &&
-	sed -e "/^\$/q" patch6 >hdrs6 &&
-	grep "^Cc: R E Cipient <rcipient@example.com>\$" hdrs6
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4032-diff-inter-hunk-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4032-diff-inter-hunk-context/.git/
+expecting success of 4032.1 'diff -U0, 1 common line: count hunks (2)': 
+		test 2 = 2
+	
+ok 1 - diff -U0, 1 common line: count hunks (2)
 
-Cc: R E Cipient <rcipient@example.com>
-ok 17 - command line headers
+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 4014.18 'configuration headers and command line headers': 
-	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
-	git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout main..side >patch7 &&
-	sed -e "/^\$/q" patch7 >hdrs7 &&
-	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs7 &&
-	grep "^ *S E Cipient <scipient@example.com>\$" hdrs7
+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)
 
-Cc: R E Cipient <rcipient@example.com>,
-    S E Cipient <scipient@example.com>
-ok 18 - configuration headers and command line headers
+expecting success of 4032.4 'diff -U0 --inter-hunk-context=0, 1 common line: check output': 
+		git diff -U0 --inter-hunk-context=0 f1 | grep -v '^index ' >actual &&
+		test_cmp expected.f1.0.2 actual
+	
+ok 4 - diff -U0 --inter-hunk-context=0, 1 common line: check output
 
-expecting success of 4014.19 'command line To: header (ascii)': 
-	git config --unset-all format.headers &&
-	git format-patch --to="R E Cipient <rcipient@example.com>" --stdout main..side >patch8 &&
-	sed -e "/^\$/q" patch8 >hdrs8 &&
-	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs8
+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)
 
-To: R E Cipient <rcipient@example.com>
-ok 19 - command line To: header (ascii)
+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
 
-checking known breakage of 4014.20 'command line To: header (rfc822)': 
-	git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout main..side >patch8 &&
-	sed -e "/^\$/q" patch8 >hdrs8 &&
-	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs8
+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)
 
-not ok 20 - command line To: header (rfc822) # TODO known breakage
+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
 
-checking known breakage of 4014.21 'command line To: header (rfc2047)': 
-	git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout main..side >patch8 &&
-	sed -e "/^\$/q" patch8 >hdrs8 &&
-	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs8
+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)
 
-not ok 21 - command line To: header (rfc2047) # TODO known breakage
+expecting success of 4032.10 'diff -U0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 10 - diff -U0, 2 common lines: count hunks (2)
 
-expecting success of 4014.22 'configuration To: header (ascii)': 
-	git config format.to "R E Cipient <rcipient@example.com>" &&
-	git format-patch --stdout main..side >patch9 &&
-	sed -e "/^\$/q" patch9 >hdrs9 &&
-	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs9
+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)
 
-To: R E Cipient <rcipient@example.com>
-ok 22 - configuration To: header (ascii)
+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)
 
-checking known breakage of 4014.23 'configuration To: header (rfc822)': 
-	git config format.to "R. E. Cipient <rcipient@example.com>" &&
-	git format-patch --stdout main..side >patch9 &&
-	sed -e "/^\$/q" patch9 >hdrs9 &&
-	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs9
+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)
 
-not ok 23 - configuration To: header (rfc822) # TODO known breakage
+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)
 
-checking known breakage of 4014.24 'configuration To: header (rfc2047)': 
-	git config format.to "R Ä Cipient <rcipient@example.com>" &&
-	git format-patch --stdout main..side >patch9 &&
-	sed -e "/^\$/q" patch9 >hdrs9 &&
-	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs9
+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)
 
-not ok 24 - configuration To: header (rfc2047) # TODO known breakage
+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 4014.25 'format.from=false': 
-	git -c format.from=false format-patch --stdout main..side >patch &&
-	sed -e "/^\$/q" patch >hdrs &&
-	check_patch patch &&
-	! grep "^From: C O Mitter <committer@example.com>\$" hdrs
+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)
 
-From: A U Thor <author@example.com>
-From: A U Thor <author@example.com>
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Date: Thu, 7 Apr 2005 15:15:13 -0700
-Date: Thu, 7 Apr 2005 15:16:13 -0700
-Subject: [PATCH 1/3] Side changes #1
-Subject: [PATCH 2/3] Side changes #2
-Subject: [PATCH 3/3] Side changes #3 with \n backslash-n in it.
-ok 25 - format.from=false
+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 4014.26 'format.from=true': 
-	git -c format.from=true format-patch --stdout main..side >patch &&
-	sed -e "/^\$/q" patch >hdrs &&
-	check_patch hdrs &&
-	grep "^From: C O Mitter <committer@example.com>\$" hdrs
+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)
 
-From: C O Mitter <committer@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 1/3] Side changes #1
-From: C O Mitter <committer@example.com>
-ok 26 - format.from=true
+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 4014.27 'format.from with address': 
-	git -c format.from="F R Om <from@example.com>" format-patch --stdout main..side >patch &&
-	sed -e "/^\$/q" patch >hdrs &&
-	check_patch hdrs &&
-	grep "^From: F R Om <from@example.com>\$" hdrs
+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)
 
-From: F R Om <from@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 1/3] Side changes #1
-From: F R Om <from@example.com>
-ok 27 - format.from with address
+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 4014.28 '--no-from overrides format.from': 
-	git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout main..side >patch &&
-	sed -e "/^\$/q" patch >hdrs &&
-	check_patch hdrs &&
-	! grep "^From: F R Om <from@example.com>\$" hdrs
+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
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 1/3] Side changes #1
-ok 28 - --no-from overrides format.from
+expecting success of 4032.24 '(diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 24 - (diff.interHunkContext=1) diff -U0, 1 common line: count hunks (1)
 
-expecting success of 4014.29 '--from overrides format.from': 
-	git -c format.from="F R Om <from@example.com>" format-patch --from --stdout main..side >patch &&
-	sed -e "/^\$/q" patch >hdrs &&
-	check_patch hdrs &&
-	! grep "^From: F R Om <from@example.com>\$" hdrs
+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
 
-From: C O Mitter <committer@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 1/3] Side changes #1
-ok 29 - --from overrides format.from
+expecting success of 4032.26 '(diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)': 
+		test 1 = 1
+	
+ok 26 - (diff.interHunkContext=2) diff -U0, 1 common line: count hunks (1)
 
-expecting success of 4014.30 '--no-to overrides config.to': 
-	git config --replace-all format.to \
-		"R E Cipient <rcipient@example.com>" &&
-	git format-patch --no-to --stdout main..side >patch10 &&
-	sed -e "/^\$/q" patch10 >hdrs10 &&
-	check_patch hdrs10 &&
-	! grep "^To: R E Cipient <rcipient@example.com>\$" hdrs10
+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
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 1/3] Side changes #1
-ok 30 - --no-to overrides config.to
+expecting success of 4032.28 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 28 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
 
-expecting success of 4014.31 '--no-to and --to replaces config.to': 
-	git config --replace-all format.to \
-		"Someone <someone@out.there>" &&
-	git format-patch --no-to --to="Someone Else <else@out.there>" \
-		--stdout main..side >patch11 &&
-	sed -e "/^\$/q" patch11 >hdrs11 &&
-	check_patch hdrs11 &&
-	! grep "^To: Someone <someone@out.there>\$" hdrs11 &&
-	grep "^To: Someone Else <else@out.there>\$" hdrs11
+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)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 1/3] Side changes #1
-To: Someone Else <else@out.there>
-ok 31 - --no-to and --to replaces config.to
+expecting success of 4032.30 '(diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 30 - (diff.interHunkContext=1) diff -U0, 2 common lines: count hunks (2)
 
-expecting success of 4014.32 '--no-cc overrides config.cc': 
-	git config --replace-all format.cc \
-		"C E Cipient <rcipient@example.com>" &&
-	git format-patch --no-cc --stdout main..side >patch12 &&
-	sed -e "/^\$/q" patch12 >hdrs12 &&
-	check_patch hdrs12 &&
-	! grep "^Cc: C E Cipient <rcipient@example.com>\$" hdrs12
+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)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 1/3] Side changes #1
-ok 32 - --no-cc overrides config.cc
+expecting success of 4032.32 '(diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)': 
+		test 2 = 2
+	
+ok 32 - (diff.interHunkContext=0) diff -U1, 3 common lines: count hunks (2)
 
-expecting success of 4014.33 '--no-add-header overrides config.headers': 
-	git config --replace-all format.headers \
-		"Header1: B E Cipient <rcipient@example.com>" &&
-	git format-patch --no-add-header --stdout main..side >patch13 &&
-	sed -e "/^\$/q" patch13 >hdrs13 &&
-	check_patch hdrs13 &&
-	! grep "^Header1: B E Cipient <rcipient@example.com>\$" hdrs13
+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)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 1/3] Side changes #1
-ok 33 - --no-add-header overrides config.headers
+expecting success of 4032.34 '(diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 34 - (diff.interHunkContext=2) diff -U1, 3 common lines: count hunks (1)
 
-expecting success of 4014.34 'multiple files': 
-	rm -rf patches/ &&
-	git checkout side &&
-	git format-patch -o patches/ main &&
-	ls patches/0001-Side-changes-1.patch patches/0002-Side-changes-2.patch patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
+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)
 
-Switched to branch 'side'
-patches/0001-Side-changes-1.patch
-patches/0002-Side-changes-2.patch
-patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
-patches/0001-Side-changes-1.patch
-patches/0002-Side-changes-2.patch
-patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
-ok 34 - multiple files
+expecting success of 4032.36 '(diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)': 
+		test 1 = 1
+	
+ok 36 - (diff.interHunkContext=3) diff -U3, 9 common lines: count hunks (1)
 
-expecting success of 4014.35 'filename length limit': 
-	test_when_finished "rm -f 000*" &&
-	rm -rf 000[1-9]-*.patch &&
-	for len in 15 25 35
-	do
-		git format-patch --filename-max-length=$len -3 side &&
-		max=$(
-			for patch in 000[1-9]-*.patch
-			do
-				echo "$patch" | wc -c || exit 1
-			done |
-			sort -nr |
-			head -n 1
-		) &&
-		test $max -le $len || return 1
-	done
+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
 
-0001-Sid.patch
-0002-Sid.patch
-0003-Sid.patch
-0001-Side-changes-.patch
-0002-Side-changes-.patch
-0003-Side-changes-.patch
-0001-Side-changes-1.patch
-0002-Side-changes-2.patch
-0003-Side-changes-3-with-n-b.patch
-ok 35 - filename length limit
+fatal: bad numeric config value 'asdf' for 'diff.interhunkcontext' in file .git/config: invalid unit
+fatal: bad config variable 'diff.interhunkcontext' in file '.git/config' at line 7
+ok 37 - diff.interHunkContext invalid
 
-expecting success of 4014.36 'filename length limit from config': 
-	test_when_finished "rm -f 000*" &&
-	rm -rf 000[1-9]-*.patch &&
-	for len in 15 25 35
-	do
-		git -c format.filenameMaxLength=$len format-patch -3 side &&
-		max=$(
-			for patch in 000[1-9]-*.patch
-			do
-				echo "$patch" | wc -c || exit 1
-			done |
-			sort -nr |
-			head -n 1
-		) &&
-		test $max -le $len || return 1
-	done
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4035-diff-quiet.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4035-diff-quiet/.git/
+expecting success of 4035.1 'setup': 
+	echo 1 >a &&
+	git add . &&
+	git commit -m first &&
+	echo 2 >b &&
+	git add . &&
+	git commit -a -m second &&
+	mkdir -p test-outside/repo && (
+		cd test-outside/repo &&
+		git init &&
+		echo "1 1" >a &&
+		git add . &&
+		git commit -m 1
+	) &&
+	mkdir -p test-outside/non/git && (
+		cd test-outside/non/git &&
+		echo "1 1" >a &&
+		echo "1 1" >matching-file &&
+		echo "1 1 " >trailing-space &&
+		echo "1   1" >extra-space &&
+		echo "2" >never-match
+	)
 
-0001-Sid.patch
-0002-Sid.patch
-0003-Sid.patch
-0001-Side-changes-.patch
-0002-Side-changes-.patch
-0003-Side-changes-.patch
-0001-Side-changes-1.patch
-0002-Side-changes-2.patch
-0003-Side-changes-3-with-n-b.patch
-ok 36 - filename length limit from config
+[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.45.2/t/trash directory.t4035-diff-quiet/test-outside/repo/.git/
+[master (root-commit) f9eeef1] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+ok 1 - setup
 
-expecting success of 4014.37 'filename limit applies only to basename': 
-	test_when_finished "rm -rf patches/" &&
-	rm -rf patches/ &&
-	for len in 15 25 35
-	do
-		git format-patch -o patches --filename-max-length=$len -3 side &&
-		max=$(
-			for patch in patches/000[1-9]-*.patch
-			do
-				echo "${patch#patches/}" | wc -c || exit 1
-			done |
-			sort -nr |
-			head -n 1
-		) &&
-		test $max -le $len || return 1
-	done
+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
 
-patches/0001-Sid.patch
-patches/0002-Sid.patch
-patches/0003-Sid.patch
-patches/0001-Side-changes-.patch
-patches/0002-Side-changes-.patch
-patches/0003-Side-changes-.patch
-patches/0001-Side-changes-1.patch
-patches/0002-Side-changes-2.patch
-patches/0003-Side-changes-3-with-n-b.patch
-ok 37 - filename limit applies only to basename
+ok 2 - git diff-tree HEAD^ HEAD
 
-expecting success of 4014.38 'reroll count': 
-	rm -fr patches &&
-	git format-patch -o patches --cover-letter --reroll-count 4 main..side >list &&
-	! grep -v "^patches/v4-000[0-3]-" list &&
-	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
-	! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
+expecting success of 4035.3 'git diff-tree HEAD^ HEAD -- a': 
+	test_expect_code 0 git diff-tree --quiet HEAD^ HEAD -- a >cnt &&
+	test_line_count = 0 cnt
 
-ok 38 - reroll count
+ok 3 - git diff-tree HEAD^ HEAD -- a
 
-expecting success of 4014.39 'reroll count (-v)': 
-	rm -fr patches &&
-	git format-patch -o patches --cover-letter -v4 main..side >list &&
-	! grep -v "^patches/v4-000[0-3]-" list &&
-	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
-	! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
+expecting success of 4035.4 'git diff-tree HEAD^ HEAD -- b': 
+	test_expect_code 1 git diff-tree --quiet HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
 
-ok 39 - reroll count (-v)
+ok 4 - git diff-tree HEAD^ HEAD -- b
 
-expecting success of 4014.40 'reroll count (-v) with a fractional number': 
-	rm -fr patches &&
-	git format-patch -o patches --cover-letter -v4.4 main..side >list &&
-	! grep -v "^patches/v4.4-000[0-3]-" list &&
-	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
-	! grep -v "^Subject: \[PATCH v4.4 [0-3]/3\] " subjects
+expecting success of 4035.5 'echo HEAD | git diff-tree --stdin': 
+	echo $(git rev-parse HEAD) |
+	test_expect_code 1 git diff-tree --quiet --stdin >cnt &&
+	test_line_count = 1 cnt
 
-ok 40 - reroll count (-v) with a fractional number
+ok 5 - echo HEAD | git diff-tree --stdin
 
-expecting success of 4014.41 'reroll (-v) count with a non number': 
-	rm -fr patches &&
-	git format-patch -o patches --cover-letter -v4rev2 main..side >list &&
-	! grep -v "^patches/v4rev2-000[0-3]-" list &&
-	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
-	! grep -v "^Subject: \[PATCH v4rev2 [0-3]/3\] " subjects
+expecting success of 4035.6 'git diff-tree HEAD HEAD': 
+	test_expect_code 0 git diff-tree --quiet HEAD HEAD >cnt &&
+	test_line_count = 0 cnt
 
-ok 41 - reroll (-v) count with a non number
+ok 6 - git diff-tree HEAD HEAD
 
-expecting success of 4014.42 'reroll (-v) count with a non-pathname character': 
-	rm -fr patches &&
-	git format-patch -o patches --cover-letter -v4---..././../--1/.2//  main..side >list &&
-	! grep -v "patches/v4-\.-\.-\.-1-\.2-000[0-3]-" list &&
-	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
-	! grep -v "^Subject: \[PATCH v4---\.\.\./\./\.\./--1/\.2// [0-3]/3\] " subjects
+expecting success of 4035.7 'git diff-files': 
+	test_expect_code 0 git diff-files --quiet >cnt &&
+	test_line_count = 0 cnt
 
-ok 42 - reroll (-v) count with a non-pathname character
+ok 7 - git diff-files
 
-expecting success of 4014.43 'no threading': 
-	git checkout side &&
-	check_threading expect.no-threading main
+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
 
-Already on 'side'
-ok 43 - no threading
+ok 8 - git diff-index --cached HEAD
 
-expecting success of 4014.44 'thread': 
-	check_threading expect.thread --thread main
+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 44 - thread
+ok 9 - git diff-index --cached HEAD^
 
-expecting success of 4014.45 '--thread overrides format.thread=deep': 
-	test_config format.thread deep &&
-	check_threading expect.thread --thread main
+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
 
-ok 45 - --thread overrides format.thread=deep
+warning: adding embedded git repository: test-outside/repo
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> test-outside/repo
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached test-outside/repo
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+ok 10 - git diff-index --cached HEAD^
 
-expecting success of 4014.46 'thread in-reply-to': 
-	check_threading expect.in-reply-to --in-reply-to="<test.message>" \
-		--thread main
+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
 
-ok 46 - thread in-reply-to
+[master b583ee2] text in b
+ Author: A U Thor <author@example.com>
+ 9 files changed, 8 insertions(+)
+ create mode 100644 c
+ create mode 100644 cnt
+ create mode 100644 test-outside/non/git/a
+ create mode 100644 test-outside/non/git/extra-space
+ create mode 100644 test-outside/non/git/matching-file
+ create mode 100644 test-outside/non/git/never-match
+ create mode 100644 test-outside/non/git/trailing-space
+ create mode 160000 test-outside/repo
+ok 11 - git diff-tree -Stext HEAD^ HEAD -- b
 
-expecting success of 4014.47 'thread cover-letter': 
-	check_threading expect.cover-letter --cover-letter --thread main
+expecting success of 4035.12 'git diff-tree -Snot-found HEAD^ HEAD -- b': 
+	test_expect_code 0 git diff-tree --quiet -Snot-found HEAD^ HEAD -- b >cnt &&
+	test_line_count = 0 cnt
 
-ok 47 - thread cover-letter
+ok 12 - git diff-tree -Snot-found HEAD^ HEAD -- b
 
-expecting success of 4014.48 'thread cover-letter in-reply-to': 
-	check_threading expect.cl-irt --cover-letter \
-		--in-reply-to="<test.message>" --thread main
+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 48 - thread cover-letter in-reply-to
+ok 13 - git diff-files
 
-expecting success of 4014.49 'thread explicit shallow': 
-	check_threading expect.cl-irt --cover-letter \
-		--in-reply-to="<test.message>" --thread=shallow main
+expecting success of 4035.14 'git diff-index --cached HEAD': 
+	git update-index c &&
+	test_expect_code 1 git diff-index --quiet --cached HEAD >cnt &&
+	test_line_count = 0 cnt
 
-ok 49 - thread explicit shallow
+ok 14 - git diff-index --cached HEAD
 
-expecting success of 4014.50 'thread deep': 
-	check_threading expect.deep --thread=deep main
+expecting success of 4035.15 'git diff, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet a ../non/git/matching-file &&
+		test_expect_code 1 git diff --quiet a ../non/git/extra-space
+	)
 
-ok 50 - thread deep
+ok 15 - git diff, one file outside repo
 
-expecting success of 4014.51 'thread deep in-reply-to': 
-	check_threading expect.deep-irt  --thread=deep \
-		--in-reply-to="<test.message>" main
+expecting success of 4035.16 'git diff, both files outside repo': 
+	(
+		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd test-outside/non/git &&
+		test_expect_code 0 git diff --quiet a matching-file &&
+		test_expect_code 1 git diff --quiet a extra-space
+	)
 
-ok 51 - thread deep in-reply-to
+ok 16 - git diff, both files outside repo
 
-expecting success of 4014.52 'thread deep cover-letter': 
-	check_threading expect.deep-cl --cover-letter --thread=deep main
+expecting success of 4035.17 'git diff --ignore-space-at-eol, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet --ignore-space-at-eol a ../non/git/trailing-space &&
+		test_expect_code 1 git diff --quiet --ignore-space-at-eol a ../non/git/extra-space
+	)
 
-ok 52 - thread deep cover-letter
+ok 17 - git diff --ignore-space-at-eol, one file outside repo
 
-expecting success of 4014.53 'thread deep cover-letter in-reply-to': 
-	check_threading expect.deep-cl-irt --cover-letter \
-		--in-reply-to="<test.message>" --thread=deep main
+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 53 - thread deep cover-letter in-reply-to
+ok 18 - git diff --ignore-space-at-eol, both files outside repo
 
-expecting success of 4014.54 'thread via config': 
-	test_config format.thread true &&
-	check_threading expect.thread main
+expecting success of 4035.19 'git diff --ignore-all-space, one file outside repo': 
+	(
+		cd test-outside/repo &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/trailing-space &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a ../non/git/extra-space &&
+		test_expect_code 1 git diff --quiet --ignore-all-space a ../non/git/never-match
+	)
 
-ok 54 - thread via config
+ok 19 - git diff --ignore-all-space, one file outside repo
 
-expecting success of 4014.55 'thread deep via config': 
-	test_config format.thread deep &&
-	check_threading expect.deep main
+expecting success of 4035.20 'git diff --ignore-all-space, both files outside repo': 
+	(
+		GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY/test-outside" &&
+		export GIT_CEILING_DIRECTORIES &&
+		cd test-outside/non/git &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a trailing-space &&
+		test_expect_code 0 git diff --quiet --ignore-all-space a extra-space &&
+		test_expect_code 1 git diff --quiet --ignore-all-space a never-match
+	)
 
-ok 55 - thread deep via config
+ok 20 - git diff --ignore-all-space, both files outside repo
 
-expecting success of 4014.56 'thread config + override': 
-	test_config format.thread deep &&
-	check_threading expect.thread --thread main
+expecting success of 4035.21 'git diff --quiet ignores stat-change only entries': 
+	test-tool chmtime +10 a &&
+	echo modified >>b &&
+	test_expect_code 1 git diff --quiet
 
-ok 56 - thread config + override
+ok 21 - git diff --quiet ignores stat-change only entries
 
-expecting success of 4014.57 'thread config + --no-thread': 
-	test_config format.thread deep &&
-	check_threading expect.no-threading --no-thread main
+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 57 - thread config + --no-thread
+	printf "Hello\r\nWorld\n" >crlf.txt &&
+	git diff --quiet crlf.txt
 
-expecting success of 4014.58 'excessive subject': 
-	rm -rf patches/ &&
-	git checkout side &&
-	before=$(git hash-object file) &&
-	before=$(git rev-parse --short $before) &&
-	test_write_lines 5 6 1 2 3 A 4 B C 7 8 9 10 D E F >>file &&
-	after=$(git hash-object file) &&
-	after=$(git rev-parse --short $after) &&
-	git update-index file &&
-	git commit -m "This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch." &&
-	git format-patch -o patches/ main..side &&
-	ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
+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
 
-Already on 'side'
-[side 2a7e73c] This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch.
- Author: A U Thor <author@example.com>
- 1 file changed, 16 insertions(+)
-patches/0001-Side-changes-1.patch
-patches/0002-Side-changes-2.patch
-patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
-patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
-patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
-ok 58 - excessive subject
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4036-format-patch-signer-mime.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4036-format-patch-signer-mime/.git/
+expecting success of 4036.1 'setup': 
 
-expecting success of 4014.59 'failure to write cover-letter aborts gracefully': 
-	test_when_finished "rmdir 0000-cover-letter.patch" &&
-	mkdir 0000-cover-letter.patch &&
-	test_must_fail git format-patch --no-renames --cover-letter -1
+	>F &&
+	git add F &&
+	git commit -m initial &&
+	echo new line >F &&
 
-error: cannot open patch file ./0000-cover-letter.patch: Is a directory
-fatal: failed to create cover-letter file
-0000-cover-letter.patch
-ok 59 - failure to write cover-letter aborts gracefully
+	test_tick &&
+	git commit -m "This adds some lines to F" F
 
-expecting success of 4014.60 'cover-letter inherits diff options': 
-	git mv file foo &&
-	git commit -m foo &&
-	git format-patch --no-renames --cover-letter -1 &&
-	check_patch 0000-cover-letter.patch &&
-	! grep "file => foo .* 0 *\$" 0000-cover-letter.patch &&
-	git format-patch --cover-letter -1 -M &&
-	grep "file => foo .* 0 *\$" 0000-cover-letter.patch
 
-[side b90b9c2] foo
+[master (root-commit) bf01fa7] initial
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => foo (100%)
-0000-cover-letter.patch
-0001-foo.patch
-From: C O Mitter <committer@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 0/1] *** SUBJECT HERE ***
-0000-cover-letter.patch
-0001-foo.patch
- file => foo | 0
-ok 60 - cover-letter inherits diff options
-
-expecting success of 4014.61 'shortlog of cover-letter wraps overly-long onelines': 
-	git format-patch --cover-letter -2 &&
-	sed -e "1,/A U Thor/d" -e "/^\$/q" 0000-cover-letter.patch >output &&
-	test_cmp expect output
-
-0000-cover-letter.patch
-0001-This-is-an-excessively-long-subject-line-for-a-messa.patch
-0002-foo.patch
-ok 61 - shortlog of cover-letter wraps overly-long onelines
-
-expecting success of 4014.62 'format-patch respects -U': 
-	git format-patch -U4 -2 &&
-	sed -e "1,/^diff/d" -e "/^+5/q" \
-		<0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \
-		>output &&
-	test_cmp expect output
-
-0001-This-is-an-excessively-long-subject-line-for-a-messa.patch
-0002-foo.patch
-ok 62 - format-patch respects -U
+ 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 4014.63 'format-patch -p suppresses stat': 
-	git format-patch -p -2 &&
-	sed -e "1,/^\$/d" -e "/^+5/q" 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch >output &&
-	test_cmp expect output
+expecting success of 4036.2 'format normally': 
 
-0001-This-is-an-excessively-long-subject-line-for-a-messa.patch
-0002-foo.patch
-ok 63 - format-patch -p suppresses stat
+	git format-patch --stdout -1 >output &&
+	! grep Content-Type output
 
-expecting success of 4014.64 'format-patch from a subdirectory (1)': 
-	filename=$(
-		rm -rf sub &&
-		mkdir -p sub/dir &&
-		cd sub/dir &&
-		git format-patch -1
-	) &&
-	case "$filename" in
-	0*)
-		;; # ok
-	*)
-		echo "Oops? $filename"
-		false
-		;;
-	esac &&
-	test -f "$filename"
 
-ok 64 - format-patch from a subdirectory (1)
+ok 2 - format normally
 
-expecting success of 4014.65 'format-patch from a subdirectory (2)': 
-	filename=$(
-		rm -rf sub &&
-		mkdir -p sub/dir &&
-		cd sub/dir &&
-		git format-patch -1 -o ..
-	) &&
-	case "$filename" in
-	../0*)
-		;; # ok
-	*)
-		echo "Oops? $filename"
-		false
-		;;
-	esac &&
-	basename=$(expr "$filename" : ".*/\(.*\)") &&
-	test -f "sub/$basename"
+expecting success of 4036.3 'format with signoff without funny signer name': 
 
-ok 65 - format-patch from a subdirectory (2)
+	git format-patch -s --stdout -1 >output &&
+	! grep Content-Type output
 
-expecting success of 4014.66 'format-patch from a subdirectory (3)': 
-	rm -f 0* &&
-	filename=$(
-		rm -rf sub &&
-		mkdir -p sub/dir &&
-		cd sub/dir &&
-		git format-patch -1 -o "$TRASH_DIRECTORY"
-	) &&
-	basename=$(expr "$filename" : ".*/\(.*\)") &&
-	test -f "$basename"
 
-ok 66 - format-patch from a subdirectory (3)
+ok 3 - format with signoff without funny signer name
 
-expecting success of 4014.67 'format-patch --in-reply-to': 
-	git format-patch -1 --stdout --in-reply-to "baz@foo.bar" >patch8 &&
-	grep "^In-Reply-To: <baz@foo.bar>" patch8 &&
-	grep "^References: <baz@foo.bar>" patch8
+expecting success of 4036.4 'format with non ASCII signer name': 
 
-In-Reply-To: <baz@foo.bar>
-References: <baz@foo.bar>
-ok 67 - format-patch --in-reply-to
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 >output &&
+	grep Content-Type output
 
-expecting success of 4014.68 'format-patch --signoff': 
-	git format-patch -1 --signoff --stdout >out &&
-	grep "^Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" out
 
-Signed-off-by: C O Mitter <committer@example.com>
-ok 68 - format-patch --signoff
+Content-Type: text/plain; charset=UTF-8
+ok 4 - format with non ASCII signer name
 
-expecting success of 4014.69 'format-patch --notes --signoff': 
-	git notes --ref test add -m "test message" HEAD &&
-	git format-patch -1 --signoff --stdout --notes=test >out &&
-	# Three dashes must come after S-o-b
-	! sed "/^Signed-off-by: /q" out | grep "test message" &&
-	sed "1,/^Signed-off-by: /d" out | grep "test message" &&
-	# Notes message must come after three dashes
-	! sed "/^---$/q" out | grep "test message" &&
-	sed "1,/^---$/d" out | grep "test message"
+expecting success of 4036.5 'attach and signoff do not duplicate mime headers': 
 
-    test message
-    test message
-ok 69 - format-patch --notes --signoff
+	GIT_COMMITTER_NAME="��� ����" \
+	git format-patch -s --stdout -1 --attach >output &&
+	test $(grep -ci ^MIME-Version: output) = 1
 
-expecting success of 4014.70 'format-patch notes output control': 
-	git notes add -m "notes config message" HEAD &&
-	test_when_finished git notes remove HEAD &&
 
-	git format-patch -1 --stdout >out &&
-	! grep "notes config message" out &&
-	git format-patch -1 --stdout --notes >out &&
-	grep "notes config message" out &&
-	git format-patch -1 --stdout --no-notes >out &&
-	! grep "notes config message" out &&
-	git format-patch -1 --stdout --notes --no-notes >out &&
-	! grep "notes config message" out &&
-	git format-patch -1 --stdout --no-notes --notes >out &&
-	grep "notes config message" out &&
+ok 5 - attach and signoff do not duplicate mime headers
 
-	test_config format.notes true &&
-	git format-patch -1 --stdout >out &&
-	grep "notes config message" out &&
-	git format-patch -1 --stdout --notes >out &&
-	grep "notes config message" out &&
-	git format-patch -1 --stdout --no-notes >out &&
-	! grep "notes config message" out &&
-	git format-patch -1 --stdout --notes --no-notes >out &&
-	! grep "notes config message" out &&
-	git format-patch -1 --stdout --no-notes --notes >out &&
-	grep "notes config message" out
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4037-diff-r-t-dirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4037-diff-r-t-dirs/.git/
+expecting success of 4037.1 'setup': 
+	mkdir dc dr dt &&
+	>dc/1 &&
+	>dr/2 &&
+	>dt/3 &&
+	>fc &&
+	>fr &&
+	>ft &&
+	git add . &&
+	test_tick &&
+	git commit -m initial &&
 
-    notes config message
-    notes config message
-    notes config message
-    notes config message
-    notes config message
-Removing note for object HEAD
-ok 70 - format-patch notes output control
+	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
 
-expecting success of 4014.71 'format-patch with multiple notes refs': 
-	git notes --ref note1 add -m "this is note 1" HEAD &&
-	test_when_finished git notes --ref note1 remove HEAD &&
-	git notes --ref note2 add -m "this is note 2" HEAD &&
-	test_when_finished git notes --ref note2 remove HEAD &&
+[master (root-commit) 26fc746] initial
+ Author: A U Thor <author@example.com>
+ 6 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dc/1
+ create mode 100644 dr/2
+ create mode 100644 dt/3
+ create mode 100644 fc
+ create mode 100644 fr
+ create mode 100644 ft
+[master 25e238e] second
+ Author: A U Thor <author@example.com>
+ 9 files changed, 5 insertions(+)
+ create mode 100644 da/4
+ delete mode 100644 dr/2
+ create mode 100644 dt
+ delete mode 100644 dt/3
+ delete mode 100644 fr
+ delete mode 100644 ft
+ create mode 100644 ft/5
+ok 1 - setup
 
-	git format-patch -1 --stdout >out &&
-	! grep "this is note 1" out &&
-	! grep "this is note 2" out &&
-	git format-patch -1 --stdout --notes=note1 >out &&
-	grep "this is note 1" out &&
-	! grep "this is note 2" out &&
-	git format-patch -1 --stdout --notes=note2 >out &&
-	! grep "this is note 1" out &&
-	grep "this is note 2" out &&
-	git format-patch -1 --stdout --notes=note1 --notes=note2 >out &&
-	grep "this is note 1" out &&
-	grep "this is note 2" out &&
+expecting success of 4037.2 'verify': 
+	git diff-tree -r -t --name-status HEAD^ HEAD >actual &&
+	test_cmp expect actual
 
-	test_config format.notes note1 &&
-	git format-patch -1 --stdout >out &&
-	grep "this is note 1" out &&
-	! grep "this is note 2" out &&
-	git format-patch -1 --stdout --no-notes >out &&
-	! grep "this is note 1" out &&
-	! grep "this is note 2" out &&
-	git format-patch -1 --stdout --notes=note2 >out &&
-	grep "this is note 1" out &&
-	grep "this is note 2" out &&
-	git format-patch -1 --stdout --no-notes --notes=note2 >out &&
-	! grep "this is note 1" out &&
-	grep "this is note 2" out &&
+ok 2 - verify
 
-	git config --add format.notes note2 &&
-	git format-patch -1 --stdout >out &&
-	grep "this is note 1" out &&
-	grep "this is note 2" out &&
-	git format-patch -1 --stdout --no-notes >out &&
-	! grep "this is note 1" out &&
-	! grep "this is note 2" out
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4039-diff-assume-unchanged.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4039-diff-assume-unchanged/.git/
+expecting success of 4039.1 'setup': 
+	echo zero > zero &&
+	git add zero &&
+	git commit -m zero &&
+	echo one > one &&
+	echo two > two &&
+	blob=$(git hash-object one) &&
+	git add one two &&
+	git commit -m onetwo &&
+	git update-index --assume-unchanged one &&
+	echo borked >> one &&
+	test "$(git ls-files -v one)" = "h one"
 
-    this is note 1
-    this is note 2
-    this is note 1
-    this is note 2
-    this is note 1
-    this is note 1
-    this is note 2
-    this is note 2
-    this is note 1
-    this is note 2
-Removing note for object HEAD
-Removing note for object HEAD
-ok 71 - format-patch with multiple notes refs
+[master (root-commit) fbf511c] zero
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 zero
+[master 3144717] onetwo
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100644 two
+ok 1 - setup
 
-expecting success of 4014.72 'format-patch with multiple notes refs in config': 
-	test_when_finished "test_unconfig format.notes" &&
+expecting success of 4039.2 'diff-index does not examine assume-unchanged entries': 
+	git diff-index HEAD^ -- one | grep -q $blob
 
-	git notes --ref note1 add -m "this is note 1" HEAD &&
-	test_when_finished git notes --ref note1 remove HEAD &&
-	git notes --ref note2 add -m "this is note 2" HEAD &&
-	test_when_finished git notes --ref note2 remove HEAD &&
+ok 2 - diff-index does not examine assume-unchanged entries
 
-	git config format.notes note1 &&
-	git format-patch -1 --stdout >out &&
-	grep "this is note 1" out &&
-	! grep "this is note 2" out &&
-	git config format.notes note2 &&
-	git format-patch -1 --stdout >out &&
-	! grep "this is note 1" out &&
-	grep "this is note 2" out &&
-	git config --add format.notes note1 &&
-	git format-patch -1 --stdout >out &&
-	grep "this is note 1" out &&
-	grep "this is note 2" out &&
+expecting success of 4039.3 'diff-files does not examine assume-unchanged entries': 
+	rm one &&
+	test -z "$(git diff-files -- one)"
 
-	git config --replace-all format.notes note1 &&
-	git config --add format.notes false &&
-	git format-patch -1 --stdout >out &&
-	! grep "this is note 1" out &&
-	! grep "this is note 2" out &&
-	git config --add format.notes note2 &&
-	git format-patch -1 --stdout >out &&
-	! grep "this is note 1" out &&
-	grep "this is note 2" out
+ok 3 - diff-files does not examine assume-unchanged entries
 
-    this is note 1
-    this is note 2
-    this is note 1
-    this is note 2
-    this is note 2
-Removing note for object HEAD
-Removing note for object HEAD
-ok 72 - format-patch with multiple notes refs in config
+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 4014.73 'options no longer allowed for format-patch': 
-	test_must_fail git format-patch --name-only 2>output &&
-	test_cmp expect.name-only output &&
-	test_must_fail git format-patch --name-status 2>output &&
-	test_cmp expect.name-status output &&
-	test_must_fail git format-patch --check 2>output &&
-	test_cmp expect.check output
+[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
 
-ok 73 - options no longer allowed for format-patch
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4013-diff-various.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4013-diff-various/.git/
+expecting success of 4013.1 'setup': 
 
-expecting success of 4014.74 'format-patch --numstat should produce a patch': 
-	git format-patch --numstat --stdout main..side >output &&
-	grep "^diff --git a/" output >diff &&
-	test_line_count = 5 diff
+	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 &&
 
-ok 74 - format-patch --numstat should produce a patch
+	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 4014.75 'format-patch -- <path>': 
-	rm -f *.patch &&
-	git checkout -b pathspec main &&
+	git branch initial &&
+	git branch side &&
 
-	echo file_a 1 >file_a &&
-	echo file_b 1 >file_b &&
-	git add file_a file_b &&
-	git commit -m pathspec_initial &&
+	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 &&
 
-	echo file_a 2 >>file_a &&
-	git add file_a &&
-	git commit -m pathspec_a &&
+	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." &&
 
-	echo file_b 2 >>file_b &&
-	git add file_b &&
-	git commit -m pathspec_b &&
+	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 &&
 
-	echo file_a 3 >>file_a &&
-	echo file_b 3 >>file_b &&
-	git add file_a file_b &&
-	git commit -m pathspec_ab &&
+	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 &&
 
-	cat >expect <<-\EOF &&
-	0001-pathspec_initial.patch
-	0002-pathspec_a.patch
-	0003-pathspec_ab.patch
-	EOF
+	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 format-patch main..pathspec -- file_a >output &&
-	test_cmp expect output &&
-	! grep file_b *.patch
+	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 &&
 
-Switched to a new branch 'pathspec'
-[pathspec d52bb05] pathspec_initial
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file_a
- create mode 100644 file_b
-[pathspec b3666cb] pathspec_a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[pathspec a150355] pathspec_b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[pathspec 32e34ab] pathspec_ab
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
-ok 75 - format-patch -- <path>
+	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 4014.76 'format-patch --ignore-if-in-upstream HEAD': 
-	git checkout side &&
-	git format-patch --ignore-if-in-upstream HEAD
+	git checkout master &&
+	git pull -s ours --no-rebase . side &&
 
-Switched to branch 'side'
-ok 76 - format-patch --ignore-if-in-upstream HEAD
+	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 4014.77 'get git version': 
-	git_version=$(git --version) &&
-	git_version=${git_version##* }
+	test_write_lines A B C >>file0 &&
+	test_write_lines 1 2 >>dir/sub &&
+	git update-index file0 dir/sub &&
 
-ok 77 - get git version
+	mkdir dir3 &&
+	cp dir/sub dir3/sub &&
+	test-tool chmtime +1 dir3/sub &&
 
-expecting success of 4014.78 'format-patch default signature': 
-	git format-patch --stdout -1 >patch &&
-	tail -n 3 patch >output &&
-	signature >expect &&
-	test_cmp expect output
+	git config log.showroot false &&
+	git commit --amend &&
 
-ok 78 - format-patch default signature
+	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 4014.79 'format-patch --signature': 
-	git format-patch --stdout --signature="my sig" -1 >patch &&
-	tail -n 3 patch >output &&
-	signature "my sig" >expect &&
-	test_cmp expect output
+	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 &&
 
-ok 79 - format-patch --signature
+	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 4014.80 'format-patch with format.signature config': 
-	git config format.signature "config sig" &&
-	git format-patch --stdout -1 >output &&
-	grep "config sig" output
+	# 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 &&
 
-config sig
-ok 80 - format-patch with format.signature config
+	git config diff.renames false &&
 
-expecting success of 4014.81 'format-patch --signature overrides format.signature': 
-	git config format.signature "config sig" &&
-	git format-patch --stdout --signature="overrides" -1 >output &&
-	! grep "config sig" output &&
-	grep "overrides" output
+	git show-branch
 
-overrides
-ok 81 - format-patch --signature overrides format.signature
+[master (root-commit) 444ac55] Initial
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 100644 dir/sub
+ create mode 100644 file0
+ create mode 100644 file2
+[master 1bde4ae] Second
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+ delete mode 100644 file2
+[master 9a6d494] Third
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 file1
+Switched to branch 'side'
+[side c7a2ab9] Side
+ Author: A U Thor <author@example.com>
+ 3 files changed, 9 insertions(+)
+ create mode 100644 file3
+Switched to branch 'master'
+From .
+ * branch            side       -> FETCH_HEAD
+Merge made by the 'ours' strategy.
+[master 59d314a] Merge branch 'side'
+ Author: A U Thor <author@example.com>
+ Date: Mon Jun 26 00:04:00 2006 +0000
+Switched to a new branch 'rearrange'
+[rearrange cd4e72f] Rearranged lines in dir/sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'master'
+Switched to a new branch 'mode'
+[mode b7e0bc6] update mode
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 file0
+Switched to branch 'master'
+Switched to a new branch 'note'
+[note a6f3643] update mode (file2)
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ mode change 100644 => 100755 file2
+Switched to branch 'master'
+! [initial] Initial
+ * [master] Merge branch 'side'
+  ! [mode] update mode
+   ! [note] update mode (file2)
+    ! [rearrange] Rearranged lines in dir/sub
+     ! [side] Side
+------
+    +  [rearrange] Rearranged lines in dir/sub
+   +   [note] update mode (file2)
+  +    [mode] update mode
+ -     [master] Merge branch 'side'
+ *   + [side] Side
+ *     [master^] Third
+ *     [master~2] Second
++*++++ [initial] Initial
+ok 1 - setup
 
-expecting success of 4014.82 'format-patch --no-signature ignores format.signature': 
-	git config format.signature "config sig" &&
-	git format-patch --stdout --signature="my sig" --no-signature \
-		-1 >output &&
-	check_patch output &&
-	! grep "config sig" output &&
-	! grep "my sig" output &&
-	! grep "^-- \$" output
+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)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH] foo
-ok 82 - format-patch --no-signature ignores format.signature
+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
+	
+ok 3 - git diff-tree -r initial # magic is (not used)
 
-expecting success of 4014.83 'format-patch --signature --cover-letter': 
-	git config --unset-all format.signature &&
-	git format-patch --stdout --signature="my sig" --cover-letter \
-		-1 >output &&
-	grep "my sig" output >sig &&
-	test_line_count = 2 sig
+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
+	
+ok 4 - git diff-tree -r --abbrev initial # magic is (not used)
 
-ok 83 - format-patch --signature --cover-letter
+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
+	
+ok 5 - git diff-tree -r --abbrev=4 initial # magic is (not used)
 
-expecting success of 4014.84 'format.signature="" suppresses signatures': 
-	git config format.signature "" &&
-	git format-patch --stdout -1 >output &&
-	check_patch output &&
-	! grep "^-- \$" output
+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
+	
+ok 6 - git diff-tree --root initial # magic is (not used)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH] foo
-ok 84 - format.signature="" suppresses signatures
+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
+	
+ok 7 - git diff-tree --root --abbrev initial # magic is (not used)
 
-expecting success of 4014.85 'format-patch --no-signature suppresses signatures': 
-	git config --unset-all format.signature &&
-	git format-patch --stdout --no-signature -1 >output &&
-	check_patch output &&
-	! grep "^-- \$" output
+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
+	
+ok 8 - git diff-tree --root --abbrev initial # magic is noellipses
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH] foo
-ok 85 - format-patch --no-signature suppresses signatures
+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
+	
+ok 9 - git diff-tree --root -r initial # magic is (not used)
 
-expecting success of 4014.86 'format-patch --signature="" suppresses signatures': 
-	git format-patch --stdout --signature="" -1 >output &&
-	check_patch output &&
-	! grep "^-- \$" output
+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
+	
+ok 10 - git diff-tree --root -r --abbrev initial # magic is (not used)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH] foo
-ok 86 - format-patch --signature="" suppresses signatures
+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
+	
+ok 11 - git diff-tree --root -r --abbrev initial # magic is noellipses
 
-expecting success of 4014.87 'prepare mail-signature input': 
-	cat >mail-signature <<-\EOF
+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
+	
+ok 12 - git diff-tree --root -r --abbrev=4 initial # magic is (not used)
 
-	Test User <test.email@kernel.org>
-	http://git.kernel.org/cgit/git/git.git
+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
+	
+ok 13 - git diff-tree --root -r --abbrev=4 initial # magic is noellipses
 
-	git.kernel.org/?p=git/git.git;a=summary
+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
+	
+ok 14 - git diff-tree -p initial # magic is (not used)
 
-	EOF
+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
+	
+ok 15 - git diff-tree --root -p initial # magic is (not used)
 
-ok 87 - prepare mail-signature input
+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
+	
+ok 16 - git diff-tree --root -p --abbrev=10 initial # magic is (not used)
 
-expecting success of 4014.88 '--signature-file=file works': 
-	git format-patch --stdout --signature-file=mail-signature -1 >output &&
-	check_patch output &&
-	sed -e "1,/^-- \$/d" output >actual &&
-	{
-		cat mail-signature && echo
-	} >expect &&
-	test_cmp expect actual
+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
+	
+ok 17 - git diff-tree --root -p --full-index initial # magic is (not used)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH] foo
-ok 88 - --signature-file=file works
+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
+	
+ok 18 - git diff-tree --root -p --full-index --abbrev=10 initial # magic is (not used)
 
-expecting success of 4014.89 'format.signaturefile works': 
-	test_config format.signaturefile mail-signature &&
-	git format-patch --stdout -1 >output &&
-	check_patch output &&
-	sed -e "1,/^-- \$/d" output >actual &&
-	{
-		cat mail-signature && echo
-	} >expect &&
-	test_cmp expect actual
+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
+	
+ok 19 - git diff-tree --patch-with-stat initial # magic is (not used)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH] foo
-ok 89 - format.signaturefile works
+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
+	
+ok 20 - git diff-tree --root --patch-with-stat initial # magic is (not used)
 
-expecting success of 4014.90 '--no-signature suppresses format.signaturefile ': 
-	test_config format.signaturefile mail-signature &&
-	git format-patch --stdout --no-signature -1 >output &&
-	check_patch output &&
-	! grep "^-- \$" output
+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
+	
+ok 21 - git diff-tree --patch-with-raw initial # magic is (not used)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH] foo
-ok 90 - --no-signature suppresses format.signaturefile 
+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
+	
+ok 22 - git diff-tree --root --patch-with-raw initial # magic is (not used)
 
-expecting success of 4014.91 '--signature-file overrides format.signaturefile': 
-	cat >other-mail-signature <<-\EOF &&
-	Use this other signature instead of mail-signature.
-	EOF
-	test_config format.signaturefile mail-signature &&
-	git format-patch --stdout \
-			--signature-file=other-mail-signature -1 >output &&
-	check_patch output &&
-	sed -e "1,/^-- \$/d" output >actual &&
-	{
-		cat other-mail-signature && echo
-	} >expect &&
-	test_cmp expect actual
+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
+	
+ok 23 - git diff-tree --pretty initial # magic is (not used)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH] foo
-ok 91 - --signature-file overrides format.signaturefile
+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
+	
+ok 24 - git diff-tree --pretty --root initial # magic is (not used)
 
-expecting success of 4014.92 '--signature overrides format.signaturefile': 
-	test_config format.signaturefile mail-signature &&
-	git format-patch --stdout --signature="my sig" -1 >output &&
-	check_patch output &&
-	grep "my sig" output
+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
+	
+ok 25 - git diff-tree --pretty -p initial # magic is (not used)
 
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH] foo
-my sig
-ok 92 - --signature overrides format.signaturefile
+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
+	
+ok 26 - git diff-tree --pretty --stat initial # magic is (not used)
 
-checking prerequisite: TTY
+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
+	
+ok 27 - git diff-tree --pretty --summary initial # magic is (not used)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+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
+	
+ok 28 - git diff-tree --pretty --stat --summary initial # magic is (not used)
 
-	# 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 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
+	
+ok 29 - git diff-tree --pretty --root -p initial # magic is (not used)
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+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
+	
+ok 30 - git diff-tree --pretty --root --stat initial # magic is (not used)
 
-)
-prerequisite TTY ok
-expecting success of 4014.93 'format-patch --stdout paginates': 
-	rm -f pager_used &&
-	test_terminal env GIT_PAGER="wc >pager_used" git format-patch --stdout --all &&
-	test_path_is_file pager_used
+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
+	
+ok 31 - git diff-tree --pretty --root --summary initial # magic is (not used)
 
-ok 93 - format-patch --stdout paginates
+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
+	
+ok 32 - git diff-tree --pretty --root --summary -r initial # magic is (not used)
 
-expecting success of 4014.94 'format-patch --stdout pagination can be disabled': 
-	rm -f pager_used &&
-	test_terminal env GIT_PAGER="wc >pager_used" git --no-pager format-patch --stdout --all &&
-	test_terminal env GIT_PAGER="wc >pager_used" git -c "pager.format-patch=false" format-patch --stdout --all &&
-	test_path_is_missing pager_used &&
-	test_path_is_missing .git/pager_used
+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
+	
+ok 33 - git diff-tree --pretty --root --stat --summary initial # magic is (not used)
 
-From e27066e74e2522a272f220d17767ef6cab999734 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:13:13 -0700
-Subject: [PATCH 01/30] Initial
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 34 - git diff-tree --pretty --patch-with-stat initial # magic is (not used)
 
----
- elif | 10 ++++++++++
- file | 10 ++++++++++
- 2 files changed, 20 insertions(+)
- create mode 100644 elif
- create mode 100644 file
+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
+	
+ok 35 - git diff-tree --pretty --root --patch-with-stat initial # magic is (not used)
 
-diff --git a/elif b/elif
-new file mode 100644
-index 0000000..f00c965
---- /dev/null
-+++ b/elif
-@@ -0,0 +1,10 @@
-+1
-+2
-+3
-+4
-+5
-+6
-+7
-+8
-+9
-+10
-diff --git a/file b/file
-new file mode 100644
-index 0000000..f00c965
---- /dev/null
-+++ b/file
-@@ -0,0 +1,10 @@
-+1
-+2
-+3
-+4
-+5
-+6
-+7
-+8
-+9
-+10
--- 
-2.45.2
+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
+	
+ok 36 - git diff-tree --pretty --patch-with-raw initial # magic is (not used)
 
+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
+	
+ok 37 - git diff-tree --pretty --root --patch-with-raw initial # magic is (not used)
 
-From 1135adfeed86678c55e1aad7c568046ee8215660 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 02/30] Side changes #1
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 38 - git diff-tree --pretty=oneline initial # magic is (not used)
 
----
- elif | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 elif
+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
+	
+ok 39 - git diff-tree --pretty=oneline --root initial # magic is (not used)
 
-diff --git a/elif b/elif
-old mode 100644
-new mode 100755
--- 
-2.45.2
+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
+	
+ok 40 - git diff-tree --pretty=oneline -p initial # magic is (not used)
 
+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
+	
+ok 41 - git diff-tree --pretty=oneline --root -p initial # magic is (not used)
 
-From fd00575a8382ce27c62b83730a40bcff1dc2f25f Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:15:13 -0700
-Subject: [PATCH 03/30] Side changes #2
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 42 - git diff-tree --pretty=oneline --patch-with-stat initial # magic is (not used)
 
----
- file | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+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
+	
+ok 43 - git diff-tree --pretty=oneline --root --patch-with-stat initial # magic is (not used)
 
-diff --git a/file b/file
-index f00c965..e5895ff 100644
---- a/file
-+++ b/file
-@@ -1,10 +1,14 @@
- 1
- 2
--3
--4
- 5
- 6
-+A
-+B
-+C
- 7
- 8
- 9
- 10
-+D
-+E
-+F
--- 
-2.45.2
+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
+	
+ok 44 - git diff-tree --pretty=oneline --patch-with-raw initial # magic is (not used)
 
+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
+	
+ok 45 - git diff-tree --pretty=oneline --root --patch-with-raw initial # magic is (not used)
 
-From 18ed22aae56367787c36a882bd61281e07994f11 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:16:13 -0700
-Subject: [PATCH 04/30] Side changes #3 with \n backslash-n in it.
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 46 - git diff-tree --pretty side # magic is (not used)
 
----
- file | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+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
+	
+ok 47 - git diff-tree --pretty -p side # magic is (not used)
 
-diff --git a/file b/file
-index e5895ff..40f36c6 100644
---- a/file
-+++ b/file
-@@ -1,8 +1,10 @@
--1
--2
- 5
- 6
-+1
-+2
-+3
- A
-+4
- B
- C
- 7
--- 
-2.45.2
+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
+	
+ok 48 - git diff-tree --pretty --patch-with-stat side # magic is (not used)
 
+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
+	
+ok 49 - git diff-tree initial mode # magic is (not used)
 
-From 333d5cbbd01bc8841a452d443caa9913971d4ffb Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:17:13 -0700
-Subject: [PATCH 05/30] Main accepts moral equivalent of #2
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 50 - git diff-tree --stat initial mode # magic is (not used)
 
----
- file | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+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
+	
+ok 51 - git diff-tree --summary initial mode # magic is (not used)
 
-diff --git a/file b/file
-index f00c965..e5895ff 100644
---- a/file
-+++ b/file
-@@ -1,10 +1,14 @@
- 1
- 2
--3
--4
- 5
- 6
-+A
-+B
-+C
- 7
- 8
- 9
- 10
-+D
-+E
-+F
--- 
-2.45.2
+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
+	
+ok 52 - git diff-tree master # magic is (not used)
 
+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
+	
+ok 53 - git diff-tree -m master # magic is (not used)
 
-From 866b6195304ada3156f0f8c97696b6f862ce5312 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:18:13 -0700
-Subject: [PATCH 06/30] patchid 1
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 54 - git diff-tree -p master # magic is (not used)
 
----
- file  | 13 -------------
- file2 | 16 ++++++++++++++++
- file3 | 16 ++++++++++++++++
- 3 files changed, 32 insertions(+), 13 deletions(-)
- create mode 100644 file2
- create mode 100644 file3
+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
+	
+ok 55 - git diff-tree -p -m master # magic is (not used)
 
-diff --git a/file b/file
-index 40f36c6..236483f 100644
---- a/file
-+++ b/file
-@@ -1,16 +1,3 @@
--5
--6
--1
--2
--3
--A
--4
--B
--C
--7
- 8
- 9
- 10
--D
--E
--F
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..40f36c6
---- /dev/null
-+++ b/file2
-@@ -0,0 +1,16 @@
-+5
-+6
-+1
-+2
-+3
-+A
-+4
-+B
-+C
-+7
-+8
-+9
-+10
-+D
-+E
-+F
-diff --git a/file3 b/file3
-new file mode 100644
-index 0000000..281fa8c
---- /dev/null
-+++ b/file3
-@@ -0,0 +1,16 @@
-+1
-+2
-+3
-+A
-+4
-+B
-+C
-+7
-+8
-+9
-+10
-+D
-+E
-+F
-+5
-+6
--- 
-2.45.2
+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
+	
+ok 56 - git diff-tree -c master # magic is (not used)
 
+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
+	
+ok 57 - git diff-tree -c --abbrev master # magic is (not used)
 
-From b0e76a38f7c5ec2ee722c28a446dbba613e87da4 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:19:13 -0700
-Subject: [PATCH 07/30] patchid 2
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 58 - git diff-tree -c --abbrev master # magic is noellipses
 
----
- file2 | 11 +----------
- file3 | 11 -----------
- 2 files changed, 1 insertion(+), 21 deletions(-)
+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
+	
+ok 59 - git diff-tree --cc master # magic is (not used)
 
-diff --git a/file2 b/file2
-index 40f36c6..d082389 100644
---- a/file2
-+++ b/file2
-@@ -1,16 +1,7 @@
--5
--6
--1
--2
--3
--A
- 4
-+A
- B
--C
- 7
- 8
- 9
- 10
--D
--E
--F
-diff --git a/file3 b/file3
-index 281fa8c..eb411a6 100644
---- a/file3
-+++ b/file3
-@@ -1,16 +1,5 @@
--1
--2
--3
--A
--4
--B
--C
--7
- 8
- 9
- 10
--D
--E
--F
- 5
- 6
--- 
-2.45.2
+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
+	
+ok 60 - git diff-tree -c --stat master # magic is (not used)
 
+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
+	
+ok 61 - git diff-tree --cc --stat master # magic is (not used)
 
-From e905b623a7eaecf172d0a5e51615566d7c1343c2 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:20:13 -0700
-Subject: [PATCH 08/30] patchid 3
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 62 - git diff-tree -c --stat --summary master # magic is (not used)
 
----
- file | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+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
+	
+ok 63 - git diff-tree --cc --stat --summary master # magic is (not used)
 
-diff --git a/file b/file
-index 236483f..478d49a 100644
---- a/file
-+++ b/file
-@@ -1,3 +1,3 @@
--8
--9
- 10
-+5
-+6
--- 
-2.45.2
+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
+	
+ok 64 - git diff-tree -c --stat --summary side # magic is (not used)
 
+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
+	
+ok 65 - git diff-tree --cc --stat --summary side # magic is (not used)
 
-From 289be112e33a41491aad62fa3df2ba34eef65c7b Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:21:13 -0700
-Subject: [PATCH 09/30] empty commit
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 66 - git diff-tree --cc --shortstat master # magic is (not used)
 
--- 
-2.45.2
+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
+	
+ok 67 - git diff-tree --cc --summary REVERSE # magic is (not used)
 
+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
+	
+ok 68 - git diff-tree --cc --patch-with-stat master # magic is (not used)
 
-From a59b7abc7125e1ae9086ad0e2bb18e7aeb3892f8 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:22:13 -0700
-Subject: [PATCH 10/30] Feature branch change #1
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 69 - git diff-tree --cc --patch-with-stat --summary master # magic is (not used)
 
----
- file | 1 +
- 1 file changed, 1 insertion(+)
+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
+	
+ok 70 - git diff-tree --cc --patch-with-stat --summary side # magic is (not used)
 
-diff --git a/file b/file
-index e5895ff..3cb93e8 100644
---- a/file
-+++ b/file
-@@ -12,3 +12,4 @@ C
- D
- E
- F
-+Another line
--- 
-2.45.2
+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
+	
+ok 71 - git log master # magic is (not used)
 
+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
+	
+ok 72 - git log -p master # magic is (not used)
 
-From 099a2d98b92b3120885ae3cb404eb5bd1589a993 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:23:13 -0700
-Subject: [PATCH 11/30] Feature branch change #2
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 73 - git log --root master # magic is (not used)
 
----
- file | 1 +
- 1 file changed, 1 insertion(+)
+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
+	
+ok 74 - git log --root -p master # magic is (not used)
 
-diff --git a/file b/file
-index 3cb93e8..b43af10 100644
---- a/file
-+++ b/file
-@@ -13,3 +13,4 @@ D
- E
- F
- Another line
-+Yet another line
--- 
-2.45.2
+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
+	
+ok 75 - git log --patch-with-stat master # magic is (not used)
 
+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
+	
+ok 76 - git log --root --patch-with-stat master # magic is (not used)
 
-From 3f3c468bfe7d646f0fe648fe73447c928ea9f263 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 12/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 77 - git log --root --patch-with-stat --summary master # magic is (not used)
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 78 - git log --root -c --patch-with-stat --summary master # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..a117704
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+this is note 2
--- 
-2.45.2
+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
+	
+ok 79 - git log --root --cc --patch-with-stat --summary master # magic is (not used)
 
+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
+	
+ok 80 - git log --no-diff-merges -p --first-parent master # magic is (not used)
 
-From 5ffb44224ddede33e133bb3247046b7205ce395e Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 13/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 81 - git log --diff-merges=off -p --first-parent master # magic is (not used)
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 82 - git log --first-parent --diff-merges=off -p master # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..e9404d1
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+this is note 1
--- 
-2.45.2
+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
+	
+ok 83 - git log -p --first-parent master # magic is (not used)
 
+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
+	
+ok 84 - git log -p --diff-merges=first-parent master # magic is (not used)
 
-From d52bb05e62b70ce6791a2dfe8771f1fc15cb0f30 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 14/30] pathspec_initial
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 85 - git log --diff-merges=first-parent master # magic is (not used)
 
----
- file_a | 1 +
- file_b | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 file_a
- create mode 100644 file_b
+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
+	
+ok 86 - git log -m -p --first-parent master # magic is (not used)
 
-diff --git a/file_a b/file_a
-new file mode 100644
-index 0000000..fa8d3ba
---- /dev/null
-+++ b/file_a
-@@ -0,0 +1 @@
-+file_a 1
-diff --git a/file_b b/file_b
-new file mode 100644
-index 0000000..ce75531
---- /dev/null
-+++ b/file_b
-@@ -0,0 +1 @@
-+file_b 1
--- 
-2.45.2
+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
+	
+ok 87 - git log -m -p master # magic is (not used)
 
+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
+	
+ok 88 - git log --cc -m -p master # magic is (not used)
 
-From 41b2a365155179ca3afaf5ef24f8fe3620ed2ece Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 15/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 89 - git log -c -m -p master # magic is (not used)
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 90 - git log -m --raw master # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index a117704..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--this is note 2
--- 
-2.45.2
+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
+	
+ok 91 - git log -m --stat master # magic is (not used)
 
+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
+	
+ok 92 - git log -SF master # magic is (not used)
 
-From 4f00d6da4df555156261fca80f4fe1a712c3355e Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 16/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 93 - git log -S F master # magic is (not used)
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 94 - git log -SF -p master # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index e9404d1..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--this is note 1
--- 
-2.45.2
+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
+	
+ok 95 - git log -SF master --max-count=0 # magic is (not used)
 
+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
+	
+ok 96 - git log -SF master --max-count=1 # magic is (not used)
 
-From b3666cba140ea95784970b480fd8dc43c9ecab34 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 17/30] pathspec_a
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 97 - git log -SF master --max-count=2 # magic is (not used)
 
----
- file_a | 1 +
- 1 file changed, 1 insertion(+)
+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
+	
+ok 98 - git log -GF master # magic is (not used)
 
-diff --git a/file_a b/file_a
-index fa8d3ba..2cab2d9 100644
---- a/file_a
-+++ b/file_a
-@@ -1 +1,2 @@
- file_a 1
-+file_a 2
--- 
-2.45.2
+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
+	
+ok 99 - git log -GF -p master # magic is (not used)
 
+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
+	
+ok 100 - git log -GF -p --pickaxe-all master # magic is (not used)
 
-From f6a869f96d107d7e3fb6e594d23bd2e3d0bdb6a9 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 18/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 101 - git log -IA -IB -I1 -I2 -p master # magic is (not used)
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 102 - git log --decorate --all # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..a117704
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+this is note 2
--- 
-2.45.2
+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
+	
+ok 103 - git log --decorate=full --all # magic is (not used)
 
+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
+	
+ok 104 - git log --decorate --clear-decorations --all # magic is (not used)
 
-From c438ac80cdffb61bcb91633982253b61fec6df8d Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 19/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 105 - git log --decorate=full --clear-decorations --all # magic is (not used)
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 106 - git rev-list --parents HEAD # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..e9404d1
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+this is note 1
--- 
-2.45.2
+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
+	
+ok 107 - git rev-list --children HEAD # magic is (not used)
 
+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
+	
+ok 108 - git whatchanged master # magic is (not used)
 
-From 98f42947e0ce149e0f5d64b53bd16d59a4157451 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 20/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 109 - git whatchanged master # magic is noellipses
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 110 - git whatchanged -p master # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..b1bf3b6
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+notes config message
--- 
-2.45.2
+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
+	
+ok 111 - git whatchanged --root master # magic is (not used)
 
+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
+	
+ok 112 - git whatchanged --root master # magic is noellipses
 
-From 2a7e73cc10cd91e47b5a5b0edc7652d31eb54003 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 21/30] This is an excessively long subject line for a message
- due to the habit some projects have of not having a short, one-line subject
- at the start of the commit message, but rather sticking a whole paragraph
- right at the start as the only thing in the commit message. It had better not
- become the filename for the patch.
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 113 - git whatchanged --root -p master # magic is (not used)
 
----
- file | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+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
+	
+ok 114 - git whatchanged --patch-with-stat master # magic is (not used)
 
-diff --git a/file b/file
-index 40f36c6..2dc5c23 100644
---- a/file
-+++ b/file
-@@ -14,3 +14,19 @@ C
- D
- E
- F
-+5
-+6
-+1
-+2
-+3
-+A
-+4
-+B
-+C
-+7
-+8
-+9
-+10
-+D
-+E
-+F
--- 
-2.45.2
+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
+	
+ok 115 - git whatchanged --root --patch-with-stat master # magic is (not used)
 
+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
+	
+ok 116 - git whatchanged --root --patch-with-stat --summary master # magic is (not used)
 
-From 670fb985b43c91b09477f4b496cc41d19da79985 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 22/30] Side changes #1
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 117 - git whatchanged --root -c --patch-with-stat --summary master # magic is (not used)
 
----
- elif | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 elif
+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
+	
+ok 118 - git whatchanged --root --cc --patch-with-stat --summary master # magic is (not used)
 
-diff --git a/elif b/elif
-old mode 100644
-new mode 100755
--- 
-2.45.2
+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
+	
+ok 119 - git whatchanged -SF master # magic is (not used)
 
+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
+	
+ok 120 - git whatchanged -SF master # magic is noellipses
 
-From a150355cf0ae81cbc9348966b0deadf810a58912 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 23/30] pathspec_b
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 121 - git whatchanged -SF -p master # magic is (not used)
 
----
- file_b | 1 +
- 1 file changed, 1 insertion(+)
+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
+	
+ok 122 - git log --patch-with-stat master -- dir/ # magic is (not used)
 
-diff --git a/file_b b/file_b
-index ce75531..4b46764 100644
---- a/file_b
-+++ b/file_b
-@@ -1 +1,2 @@
- file_b 1
-+file_b 2
--- 
-2.45.2
+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
+	
+ok 123 - git whatchanged --patch-with-stat master -- dir/ # magic is (not used)
 
+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
+	
+ok 124 - git log --patch-with-stat --summary master -- dir/ # magic is (not used)
 
-From 7b899ae8dea3b2bba021d4dd6890cb68c705f1f1 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 24/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 125 - git whatchanged --patch-with-stat --summary master -- dir/ # magic is (not used)
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 126 - git show initial # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..da5a1d5
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+test message
--- 
-2.45.2
+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
+	
+ok 127 - git show --root initial # magic is (not used)
 
+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
+	
+ok 128 - git show side # magic is (not used)
 
-From 74ec0928a6dadbff80d85127103ae7887528b54c Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 25/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 129 - git show master # magic is (not used)
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 130 - git show -c master # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index a117704..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--this is note 2
--- 
-2.45.2
+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
+	
+ok 131 - git show -m master # magic is (not used)
 
+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
+	
+ok 132 - git show --first-parent master # magic is (not used)
 
-From 569fa67c3cb8f7bd1a952c35e478584c28fd1b7b Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 26/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 133 - git show --stat side # magic is (not used)
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 134 - git show --stat --summary side # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index e9404d1..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--this is note 1
--- 
-2.45.2
+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
+	
+ok 135 - git show --patch-with-stat side # magic is (not used)
 
+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
+	
+ok 136 - git show --patch-with-raw side # magic is (not used)
 
-From 3bced63a7bc9eaa09cbbf4c6e8154341cc0f33b4 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 27/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 137 - git show --patch-with-raw side # magic is noellipses
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
+	
+ok 138 - git show --patch-with-stat --summary side # magic is (not used)
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index b1bf3b6..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--notes config message
--- 
-2.45.2
+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
+	
+ok 139 - git format-patch --stdout initial..side # magic is (not used)
 
+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
+	
+ok 140 - git format-patch --stdout initial..master^ # magic is (not used)
 
-From b90b9c23c70534c70a59983c62d93ab2061d77db Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 28/30] foo
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 141 - git format-patch --stdout initial..master # magic is (not used)
 
----
- file => foo | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => foo (100%)
+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
+	
+ok 142 - git format-patch --stdout --no-numbered initial..master # magic is (not used)
 
-diff --git a/file b/foo
-similarity index 100%
-rename from file
-rename to foo
--- 
-2.45.2
+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
+	
+ok 143 - git format-patch --stdout --numbered initial..master # magic is (not used)
 
+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
+	
+ok 144 - git format-patch --attach --stdout initial..side # magic is (not used)
 
-From 7b10a919520d93d73715076684d729589ac4925a Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:16:13 -0700
-Subject: [PATCH 29/30] Side changes #3 with \n backslash-n in it.
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 145 - git format-patch --attach --stdout --suffix=.diff initial..side # magic is (not used)
 
----
- file | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+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
+	
+ok 146 - git format-patch --attach --stdout initial..master^ # magic is (not used)
 
-diff --git a/file b/file
-index e5895ff..40f36c6 100644
---- a/file
-+++ b/file
-@@ -1,8 +1,10 @@
--1
--2
- 5
- 6
-+1
-+2
-+3
- A
-+4
- B
- C
- 7
--- 
-2.45.2
+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
+	
+ok 147 - git format-patch --attach --stdout initial..master # magic is (not used)
+
+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
+	
+ok 148 - git format-patch --inline --stdout initial..side # magic is (not used)
 
+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
+	
+ok 149 - git format-patch --inline --stdout initial..master^ # magic is (not used)
 
-From 32e34aba86c71477afd9157c4f6df9b787bde881 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 30/30] pathspec_ab
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 150 - git format-patch --inline --stdout --numbered-files initial..master # magic is (not used)
 
----
- file_a | 1 +
- file_b | 1 +
- 2 files changed, 2 insertions(+)
+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
+	
+ok 151 - git format-patch --inline --stdout initial..master # magic is (not used)
 
-diff --git a/file_a b/file_a
-index 2cab2d9..81f70dc 100644
---- a/file_a
-+++ b/file_a
-@@ -1,2 +1,3 @@
- file_a 1
- file_a 2
-+file_a 3
-diff --git a/file_b b/file_b
-index 4b46764..3d9874d 100644
---- a/file_b
-+++ b/file_b
-@@ -1,2 +1,3 @@
- file_b 1
- file_b 2
-+file_b 3
--- 
-2.45.2
+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
+	
+ok 152 - git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master # magic is (not used)
 
-From e27066e74e2522a272f220d17767ef6cab999734 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:13:13 -0700
-Subject: [PATCH 01/30] Initial
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 153 - git config format.subjectprefix DIFFERENT_PREFIX # magic is (not used)
 
----
- elif | 10 ++++++++++
- file | 10 ++++++++++
- 2 files changed, 20 insertions(+)
- create mode 100644 elif
- create mode 100644 file
+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
+	
+ok 154 - git format-patch --inline --stdout initial..master^^ # magic is (not used)
 
-diff --git a/elif b/elif
-new file mode 100644
-index 0000000..f00c965
---- /dev/null
-+++ b/elif
-@@ -0,0 +1,10 @@
-+1
-+2
-+3
-+4
-+5
-+6
-+7
-+8
-+9
-+10
-diff --git a/file b/file
-new file mode 100644
-index 0000000..f00c965
---- /dev/null
-+++ b/file
-@@ -0,0 +1,10 @@
-+1
-+2
-+3
-+4
-+5
-+6
-+7
-+8
-+9
-+10
--- 
-2.45.2
+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
+	
+ok 155 - git format-patch --stdout --cover-letter -n initial..master^ # magic is (not used)
 
+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
+	
+ok 156 - git diff --abbrev initial..side # magic is (not used)
 
-From 1135adfeed86678c55e1aad7c568046ee8215660 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 02/30] Side changes #1
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 157 - git diff -U initial..side # magic is (not used)
 
----
- elif | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 elif
+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
+	
+ok 158 - git diff -U1 initial..side # magic is (not used)
 
-diff --git a/elif b/elif
-old mode 100644
-new mode 100755
--- 
-2.45.2
+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
+	
+ok 159 - git diff -r initial..side # magic is (not used)
 
+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
+	
+ok 160 - git diff --stat initial..side # magic is (not used)
 
-From fd00575a8382ce27c62b83730a40bcff1dc2f25f Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:15:13 -0700
-Subject: [PATCH 03/30] Side changes #2
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 161 - git diff -r --stat initial..side # magic is (not used)
 
----
- file | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+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
+	
+ok 162 - git diff initial..side # magic is (not used)
 
-diff --git a/file b/file
-index f00c965..e5895ff 100644
---- a/file
-+++ b/file
-@@ -1,10 +1,14 @@
- 1
- 2
--3
--4
- 5
- 6
-+A
-+B
-+C
- 7
- 8
- 9
- 10
-+D
-+E
-+F
--- 
-2.45.2
+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
+	
+ok 163 - git diff --patch-with-stat initial..side # magic is (not used)
 
+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
+	
+ok 164 - git diff --patch-with-raw initial..side # magic is (not used)
 
-From 18ed22aae56367787c36a882bd61281e07994f11 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:16:13 -0700
-Subject: [PATCH 04/30] Side changes #3 with \n backslash-n in it.
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 165 - git diff --patch-with-raw initial..side # magic is noellipses
 
----
- file | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+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
+	
+ok 166 - git diff --patch-with-stat -r initial..side # magic is (not used)
 
-diff --git a/file b/file
-index e5895ff..40f36c6 100644
---- a/file
-+++ b/file
-@@ -1,8 +1,10 @@
--1
--2
- 5
- 6
-+1
-+2
-+3
- A
-+4
- B
- C
- 7
--- 
-2.45.2
+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
+	
+ok 167 - git diff --patch-with-raw -r initial..side # magic is (not used)
 
+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
+	
+ok 168 - git diff --patch-with-raw -r initial..side # magic is noellipses
 
-From 333d5cbbd01bc8841a452d443caa9913971d4ffb Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:17:13 -0700
-Subject: [PATCH 05/30] Main accepts moral equivalent of #2
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 169 - git diff --name-status dir2 dir # magic is (not used)
 
----
- file | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+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
+	
+ok 170 - git diff --no-index --name-status dir2 dir # magic is (not used)
 
-diff --git a/file b/file
-index f00c965..e5895ff 100644
---- a/file
-+++ b/file
-@@ -1,10 +1,14 @@
- 1
- 2
--3
--4
- 5
- 6
-+A
-+B
-+C
- 7
- 8
- 9
- 10
-+D
-+E
-+F
--- 
-2.45.2
+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
+	
+ok 171 - git diff --no-index --name-status -- dir2 dir # magic is (not used)
 
+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
+	
+ok 172 - git diff --no-index dir dir3 # magic is (not used)
 
-From 866b6195304ada3156f0f8c97696b6f862ce5312 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:18:13 -0700
-Subject: [PATCH 06/30] patchid 1
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 173 - git diff master master^ side # magic is (not used)
 
----
- file  | 13 -------------
- file2 | 16 ++++++++++++++++
- file3 | 16 ++++++++++++++++
- 3 files changed, 32 insertions(+), 13 deletions(-)
- create mode 100644 file2
- create mode 100644 file3
+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
+	
+ok 174 - git diff --line-prefix=abc master master^ side # magic is (not used)
 
-diff --git a/file b/file
-index 40f36c6..236483f 100644
---- a/file
-+++ b/file
-@@ -1,16 +1,3 @@
--5
--6
--1
--2
--3
--A
--4
--B
--C
--7
- 8
- 9
- 10
--D
--E
--F
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..40f36c6
---- /dev/null
-+++ b/file2
-@@ -0,0 +1,16 @@
-+5
-+6
-+1
-+2
-+3
-+A
-+4
-+B
-+C
-+7
-+8
-+9
-+10
-+D
-+E
-+F
-diff --git a/file3 b/file3
-new file mode 100644
-index 0000000..281fa8c
---- /dev/null
-+++ b/file3
-@@ -0,0 +1,16 @@
-+1
-+2
-+3
-+A
-+4
-+B
-+C
-+7
-+8
-+9
-+10
-+D
-+E
-+F
-+5
-+6
--- 
-2.45.2
+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
+	
+ok 175 - git diff --dirstat master~1 master~2 # magic is (not used)
 
+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
+	
+ok 176 - git diff --dirstat initial rearrange # magic is (not used)
 
-From b0e76a38f7c5ec2ee722c28a446dbba613e87da4 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:19:13 -0700
-Subject: [PATCH 07/30] patchid 2
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 177 - git diff --dirstat-by-file initial rearrange # magic is (not used)
 
----
- file2 | 11 +----------
- file3 | 11 -----------
- 2 files changed, 1 insertion(+), 21 deletions(-)
+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
+	
+ok 178 - git diff --dirstat --cc master~1 master # magic is (not used)
 
-diff --git a/file2 b/file2
-index 40f36c6..d082389 100644
---- a/file2
-+++ b/file2
-@@ -1,16 +1,7 @@
--5
--6
--1
--2
--3
--A
- 4
-+A
- B
--C
- 7
- 8
- 9
- 10
--D
--E
--F
-diff --git a/file3 b/file3
-index 281fa8c..eb411a6 100644
---- a/file3
-+++ b/file3
-@@ -1,16 +1,5 @@
--1
--2
--3
--A
--4
--B
--C
--7
- 8
- 9
- 10
--D
--E
--F
- 5
- 6
--- 
-2.45.2
+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
+	
+ok 179 - git diff --raw initial # magic is (not used)
 
+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
+	
+ok 180 - git diff --raw initial # magic is noellipses
 
-From e905b623a7eaecf172d0a5e51615566d7c1343c2 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:20:13 -0700
-Subject: [PATCH 08/30] patchid 3
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 181 - git diff --raw --abbrev=4 initial # magic is (not used)
 
----
- file | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+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
+	
+ok 182 - git diff --raw --abbrev=4 initial # magic is noellipses
 
-diff --git a/file b/file
-index 236483f..478d49a 100644
---- a/file
-+++ b/file
-@@ -1,3 +1,3 @@
--8
--9
- 10
-+5
-+6
--- 
-2.45.2
+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
+	
+ok 183 - git diff --raw --no-abbrev initial # magic is (not used)
 
+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
+	
+ok 184 - git diff --no-index --raw dir2 dir # magic is (not used)
 
-From 289be112e33a41491aad62fa3df2ba34eef65c7b Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:21:13 -0700
-Subject: [PATCH 09/30] empty commit
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 185 - git diff --no-index --raw dir2 dir # magic is noellipses
 
--- 
-2.45.2
+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
+	
+ok 186 - git diff --no-index --raw --abbrev=4 dir2 dir # magic is (not used)
 
+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
+	
+ok 187 - git diff --no-index --raw --abbrev=4 dir2 dir # magic is noellipses
 
-From a59b7abc7125e1ae9086ad0e2bb18e7aeb3892f8 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:22:13 -0700
-Subject: [PATCH 10/30] Feature branch change #1
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 188 - git diff --no-index --raw --no-abbrev dir2 dir # magic is (not used)
 
----
- file | 1 +
- 1 file changed, 1 insertion(+)
+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
+	
+ok 189 - git diff-tree --pretty --root --stat --compact-summary initial # magic is (not used)
 
-diff --git a/file b/file
-index e5895ff..3cb93e8 100644
---- a/file
-+++ b/file
-@@ -12,3 +12,4 @@ C
- D
- E
- F
-+Another line
--- 
-2.45.2
+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
+	
+ok 190 - git diff-tree --pretty -R --root --stat --compact-summary initial # magic is (not used)
 
+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
+	
+ok 191 - git diff-tree --pretty note # magic is (not used)
 
-From 099a2d98b92b3120885ae3cb404eb5bd1589a993 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:23:13 -0700
-Subject: [PATCH 11/30] Feature branch change #2
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
+	
+ok 192 - git diff-tree --pretty --notes note # magic is (not used)
 
----
- file | 1 +
- 1 file changed, 1 insertion(+)
+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
+	
+ok 193 - git diff-tree --format=%N note # magic is (not used)
 
-diff --git a/file b/file
-index 3cb93e8..b43af10 100644
---- a/file
-+++ b/file
-@@ -13,3 +13,4 @@ D
- E
- F
- Another line
-+Yet another line
--- 
-2.45.2
+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
+	
+ok 194 - git diff-tree --stat --compact-summary initial mode # magic is (not used)
 
+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)
 
-From 3f3c468bfe7d646f0fe648fe73447c928ea9f263 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 12/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+ok 196 - log -m matches pure log
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..a117704
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+this is note 2
--- 
-2.45.2
+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
 
+ok 197 - log --diff-merges=on matches --diff-merges=separate
 
-From 5ffb44224ddede33e133bb3247046b7205ce395e Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 13/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+ok 198 - log --dd matches --diff-merges=1 -p
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..e9404d1
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+this is note 1
--- 
-2.45.2
+expecting success of 4013.199 'deny wrong log.diffMerges config': 
+	test_config log.diffMerges wrong-value &&
+	test_expect_code 128 git log
 
+fatal: bad config variable 'log.diffmerges' in file '.git/config' at line 8
+ok 199 - deny wrong log.diffMerges config
 
-From d52bb05e62b70ce6791a2dfe8771f1fc15cb0f30 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 14/30] pathspec_initial
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
 
----
- file_a | 1 +
- file_b | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 file_a
- create mode 100644 file_b
+ok 200 - git config log.diffMerges first-parent
 
-diff --git a/file_a b/file_a
-new file mode 100644
-index 0000000..fa8d3ba
---- /dev/null
-+++ b/file_a
-@@ -0,0 +1 @@
-+file_a 1
-diff --git a/file_b b/file_b
-new file mode 100644
-index 0000000..ce75531
---- /dev/null
-+++ b/file_b
-@@ -0,0 +1 @@
-+file_b 1
--- 
-2.45.2
+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
 
+ok 201 - git config log.diffMerges first-parent vs -m
 
-From 41b2a365155179ca3afaf5ef24f8fe3620ed2ece Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 15/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+ok 202 - git diff-index -m
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index a117704..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--this is note 2
--- 
-2.45.2
+expecting success of 4013.203 'log -S requires an argument': 
+	test_must_fail git log -S
 
+error: switch `S' requires a value
+ok 203 - log -S requires an argument
 
-From 4f00d6da4df555156261fca80f4fe1a712c3355e Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 16/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+ok 204 - diff --cached on unborn branch
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index e9404d1..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--this is note 1
--- 
-2.45.2
+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
 
+ok 205 - diff --cached -- file on unborn branch
 
-From b3666cba140ea95784970b480fd8dc43c9ecab34 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 17/30] pathspec_a
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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
 
----
- file_a | 1 +
- 1 file changed, 1 insertion(+)
+ok 206 - diff --line-prefix with spaces
 
-diff --git a/file_a b/file_a
-index fa8d3ba..2cab2d9 100644
---- a/file_a
-+++ b/file_a
-@@ -1 +1,2 @@
- file_a 1
-+file_a 2
--- 
-2.45.2
+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
 
+ok 207 - diff-tree --stdin with log formatting
 
-From f6a869f96d107d7e3fb6e594d23bd2e3d0bdb6a9 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 18/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+expecting success of 4013.208 'diff-tree --stdin with pathspec': 
+	cat >expect <<-EOF &&
+	Third
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+	dir/sub
+	Second
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..a117704
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+this is note 2
--- 
-2.45.2
+	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
 
-From c438ac80cdffb61bcb91633982253b61fec6df8d Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 19/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+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>
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+	dir/sub
+	<Third>
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..e9404d1
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+this is note 1
--- 
-2.45.2
+	dir/sub
+	<Second>
 
+	dir/sub
+	EOF
+	test_cmp expect actual
 
-From 98f42947e0ce149e0f5d64b53bd16d59a4157451 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 20/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+ok 209 - show A B ... -- <pathspec>
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..b1bf3b6
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+notes config message
--- 
-2.45.2
+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
 
+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
 
-From 2a7e73cc10cd91e47b5a5b0edc7652d31eb54003 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 21/30] This is an excessively long subject line for a message
- due to the habit some projects have of not having a short, one-line subject
- at the start of the commit message, but rather sticking a whole paragraph
- right at the start as the only thing in the commit message. It had better not
- become the filename for the patch.
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+ok 211 - diff -I<regex>
 
----
- file | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+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
 
-diff --git a/file b/file
-index 40f36c6..2dc5c23 100644
---- a/file
-+++ b/file
-@@ -14,3 +14,19 @@ C
- D
- E
- F
-+5
-+6
-+1
-+2
-+3
-+A
-+4
-+B
-+C
-+7
-+8
-+9
-+10
-+D
-+E
-+F
--- 
-2.45.2
+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
 
-From 670fb985b43c91b09477f4b496cc41d19da79985 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:14:13 -0700
-Subject: [PATCH 22/30] Side changes #1
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+error: invalid regex given to -I: '^[124-9'
+ok 213 - diff -I<regex>: detect malformed regex
 
----
- elif | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- mode change 100644 => 100755 elif
+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
 
-diff --git a/elif b/elif
-old mode 100644
-new mode 100755
--- 
-2.45.2
+ok 214 - diff-files does not respect diff.noPrefix
 
+expecting success of 4013.215 'diff-files respects --no-prefix': 
+	git diff-files -p --no-prefix >actual &&
+	check_prefix actual file0 file0
 
-From a150355cf0ae81cbc9348966b0deadf810a58912 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 23/30] pathspec_b
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+ok 215 - diff-files respects --no-prefix
 
----
- file_b | 1 +
- 1 file changed, 1 insertion(+)
+expecting success of 4013.216 'diff respects diff.noPrefix': 
+	git -c diff.noPrefix diff >actual &&
+	check_prefix actual file0 file0
 
-diff --git a/file_b b/file_b
-index ce75531..4b46764 100644
---- a/file_b
-+++ b/file_b
-@@ -1 +1,2 @@
- file_b 1
-+file_b 2
--- 
-2.45.2
+ok 216 - diff respects diff.noPrefix
 
+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
 
-From 7b899ae8dea3b2bba021d4dd6890cb68c705f1f1 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 24/30] Notes added by 'git notes add'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+ok 217 - diff --default-prefix overrides diff.noPrefix
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+expecting success of 4013.218 'diff respects diff.mnemonicPrefix': 
+	git -c diff.mnemonicPrefix diff >actual &&
+	check_prefix actual i/file0 w/file0
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-new file mode 100644
-index 0000000..da5a1d5
---- /dev/null
-+++ b/b90b9c23c70534c70a59983c62d93ab2061d77db
-@@ -0,0 +1 @@
-+test message
--- 
-2.45.2
+ok 218 - diff respects diff.mnemonicPrefix
 
+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
 
-From 74ec0928a6dadbff80d85127103ae7887528b54c Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 25/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+ok 219 - diff --default-prefix overrides diff.mnemonicPrefix
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+expecting success of 4013.220 'diff respects diff.srcPrefix': 
+	git -c diff.srcPrefix=x/ diff >actual &&
+	check_prefix actual x/file0 b/file0
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index a117704..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--this is note 2
--- 
-2.45.2
+ok 220 - diff respects diff.srcPrefix
 
+expecting success of 4013.221 'diff respects diff.dstPrefix': 
+	git -c diff.dstPrefix=y/ diff >actual &&
+	check_prefix actual a/file0 y/file0
 
-From 569fa67c3cb8f7bd1a952c35e478584c28fd1b7b Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 26/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+ok 221 - diff respects diff.dstPrefix
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index e9404d1..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--this is note 1
--- 
-2.45.2
+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
 
-From 3bced63a7bc9eaa09cbbf4c6e8154341cc0f33b4 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 27/30] Notes removed by 'git notes remove'
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+ok 223 - diff --dst-prefix overrides diff.dstPrefix
 
----
- b90b9c23c70534c70a59983c62d93ab2061d77db | 1 -
- 1 file changed, 1 deletion(-)
- delete mode 100644 b90b9c23c70534c70a59983c62d93ab2061d77db
+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
 
-diff --git a/b90b9c23c70534c70a59983c62d93ab2061d77db b/b90b9c23c70534c70a59983c62d93ab2061d77db
-deleted file mode 100644
-index b1bf3b6..0000000
---- a/b90b9c23c70534c70a59983c62d93ab2061d77db
-+++ /dev/null
-@@ -1 +0,0 @@
--notes config message
--- 
-2.45.2
+ok 224 - diff.{src,dst}Prefix ignored with diff.noPrefix
 
+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
 
-From b90b9c23c70534c70a59983c62d93ab2061d77db Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 28/30] foo
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+ok 225 - diff.{src,dst}Prefix ignored with diff.mnemonicPrefix
 
----
- file => foo | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => foo (100%)
+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
 
-diff --git a/file b/foo
-similarity index 100%
-rename from file
-rename to foo
--- 
-2.45.2
+ok 226 - diff.{src,dst}Prefix ignored with --default-prefix
 
+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
 
-From 7b10a919520d93d73715076684d729589ac4925a Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:16:13 -0700
-Subject: [PATCH 29/30] Side changes #3 with \n backslash-n in it.
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+error: invalid option: --no-rename
+ok 227 - diff --no-renames cannot be abbreviated
 
----
- file | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+# passed all 227 test(s)
+1..227
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4018-diff-funcname.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4018-diff-funcname/.git/
+expecting success of 4018.1 'setup': 
+	# a non-trivial custom pattern
+	git config diff.custom1.funcname "!static
+!String
+[^ 	].*s.*" &&
 
-diff --git a/file b/file
-index e5895ff..40f36c6 100644
---- a/file
-+++ b/file
-@@ -1,8 +1,10 @@
--1
--2
- 5
- 6
-+1
-+2
-+3
- A
-+4
- B
- C
- 7
--- 
-2.45.2
+	# a custom pattern which matches to end of line
+	git config diff.custom2.funcname "......Beer\$" &&
 
+	# alternation in pattern
+	git config diff.custom3.funcname "Beer$" &&
+	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
 
-From 32e34aba86c71477afd9157c4f6df9b787bde881 Mon Sep 17 00:00:00 2001
-From: A U Thor <author@example.com>
-Date: Thu, 7 Apr 2005 15:24:13 -0700
-Subject: [PATCH 30/30] pathspec_ab
-Header1: B E Cipient <rcipient@example.com>
-To: Someone <someone@out.there>
-Cc: C E Cipient <rcipient@example.com>
+	# for regexp compilation tests
+	echo A >A.java &&
+	echo B >B.java
 
----
- file_a | 1 +
- file_b | 1 +
- 2 files changed, 2 insertions(+)
+ok 1 - setup
 
-diff --git a/file_a b/file_a
-index 2cab2d9..81f70dc 100644
---- a/file_a
-+++ b/file_a
-@@ -1,2 +1,3 @@
- file_a 1
- file_a 2
-+file_a 3
-diff --git a/file_b b/file_b
-index 4b46764..3d9874d 100644
---- a/file_b
-+++ b/file_b
-@@ -1,2 +1,3 @@
- file_b 1
- file_b 2
-+file_b 3
--- 
-2.45.2
+expecting success of 4018.2 'setup: test-tool userdiff': 
+	# Make sure additions to builtin_drivers are sorted
+	test_when_finished "rm builtin-drivers.sorted" &&
+	test-tool userdiff list-builtin-drivers >builtin-drivers &&
+	test_file_not_empty builtin-drivers &&
+	sort <builtin-drivers >builtin-drivers.sorted &&
+	test_cmp builtin-drivers.sorted builtin-drivers &&
 
-ok 94 - format-patch --stdout pagination can be disabled
+	# Ditto, but "custom" requires the .git directory and config
+	# to be setup and read.
+	test_when_finished "rm custom-drivers.sorted" &&
+	test-tool userdiff list-custom-drivers >custom-drivers &&
+	test_file_not_empty custom-drivers &&
+	sort <custom-drivers >custom-drivers.sorted &&
+	test_cmp custom-drivers.sorted custom-drivers
 
-expecting success of 4014.95 'format-patch handles multi-line subjects': 
-	rm -rf patches/ &&
-	echo content >>file &&
-	test_write_lines one two three >msg &&
-	git add file &&
-	git commit -F msg &&
-	git format-patch -o patches -1 &&
-	grep ^Subject: patches/0001-one.patch >actual &&
-	echo "Subject: [PATCH] one two three" >expect &&
-	test_cmp expect actual
+ok 2 - setup: test-tool userdiff
 
-[side 17e47ba] one two three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-patches/0001-one.patch
-ok 95 - format-patch handles multi-line subjects
+expecting success of 4018.3 'builtin ada pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 3 - builtin ada pattern compiles
 
-expecting success of 4014.96 'format-patch handles multi-line encoded subjects': 
-	rm -rf patches/ &&
-	echo content >>file &&
-	test_write_lines en två tre >msg &&
-	git add file &&
-	git commit -F msg &&
-	git format-patch -o patches -1 &&
-	grep ^Subject: patches/0001-en.patch >actual &&
-	echo "Subject: [PATCH] =?UTF-8?q?en=20tv=C3=A5=20tre?=" >expect &&
-	test_cmp expect actual
+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
 
-[side 1ba0afd] en två tre
+expecting success of 4018.5 'builtin ada pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to a new branch 'master'
+[master (root-commit) 09f480a] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-patches/0001-en.patch
-ok 96 - format-patch handles multi-line encoded subjects
-
-expecting success of 4014.97 'format-patch wraps extremely long subject (ascii)': 
-	echo content >>file &&
-	git add file &&
-	git commit -m "$M512" &&
-	git format-patch --stdout -1 >patch &&
-	sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
-	test_cmp expect subject
-
-[side d8c94d2] foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar foo bar
+ 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(+)
-ok 97 - format-patch wraps extremely long subject (ascii)
+ 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 4014.98 'format-patch wraps extremely long subject (rfc2047)': 
-	rm -rf patches/ &&
-	echo content >>file &&
-	git add file &&
-	git commit -m "$M512" &&
-	git format-patch --stdout -1 >patch &&
-	sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
-	test_cmp expect subject
+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
 
-[side 47388bc] föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar föö bar
+expecting success of 4018.7 'builtin bash wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 7 - builtin bash wordRegex pattern compiles
+
+expecting success of 4018.8 'builtin bash pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 76aba7f] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 98 - format-patch wraps extremely long subject (rfc2047)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 2a04301] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 8 - builtin bash pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.99 'format-patch quotes dot in from-headers': 
-	check_author "Foo B. Bar"
+expecting success of 4018.9 'builtin bibtex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 9 - builtin bibtex pattern compiles
 
-[side 5de4424] author-check
- Author: Foo B. Bar <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 99 - format-patch quotes dot in from-headers
+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 4014.100 'format-patch quotes double-quote in from-headers': 
-	check_author "Foo \"The Baz\" Bar"
+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
 
-[side d2402b7] author-check
- Author: Foo "The Baz" Bar <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 100 - format-patch quotes double-quote in from-headers
+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 4014.101 'format-patch uses rfc2047-encoded from-headers when necessary': 
-	check_author "Föo Bar"
+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
 
-[side 7d733d4] author-check
- Author: Föo Bar <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 101 - format-patch uses rfc2047-encoded from-headers when necessary
+expecting success of 4018.14 'builtin cpp pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 421387d] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 41525d0] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 14 - builtin cpp pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.102 'rfc2047-encoded from-headers leave no rfc822 specials': 
-	check_author "Föo B. Bar"
+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
 
-[side 0fb2487] author-check
- Author: Föo B. Bar <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 102 - rfc2047-encoded from-headers leave no rfc822 specials
+expecting success of 4018.16 'builtin csharp wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 16 - builtin csharp wordRegex pattern compiles
 
-expecting success of 4014.103 'format-patch wraps moderately long from-header (ascii)': 
-	check_author "foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_"
+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
 
-[side 6a7ec41] author-check
- Author: foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_foo_bar_ <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 103 - format-patch wraps moderately long from-header (ascii)
+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 4014.104 'format-patch wraps extremely long from-header (ascii)': 
-	check_author "Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar"
+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
 
-[side bfcd2fb] author-check
- Author: Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 104 - format-patch wraps extremely long from-header (ascii)
+expecting success of 4018.20 'builtin css pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 5bdd255] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 54fe80d] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 20 - builtin css pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.105 'format-patch wraps extremely long from-header (rfc822)': 
-	check_author "Foo.Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar"
+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
 
-[side eac30c8] author-check
- Author: Foo.Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 105 - format-patch wraps extremely long from-header (rfc822)
+expecting success of 4018.22 'builtin dts wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 22 - builtin dts wordRegex pattern compiles
 
-expecting success of 4014.106 'format-patch wraps extremely long from-header (rfc2047)': 
-	check_author "Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar"
+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
 
-[side 58493a9] author-check
- Author: Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 106 - format-patch wraps extremely long from-header (rfc2047)
+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 4014.107 'format-patch wraps extremely long from-header (non-ASCII without Q-encoding)': 
-	echo content >>file &&
-	git add file &&
-	GIT_AUTHOR_NAME="Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar" \
-	git commit -m author-check &&
-	git format-patch --no-encode-email-headers --stdout -1 >patch &&
-	sed -n "/^From: /p; /^ /p; /^$/q" patch >actual &&
-	test_cmp expect actual
+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
 
-[side dff849b] author-check
- Author: Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 107 - format-patch wraps extremely long from-header (non-ASCII without Q-encoding)
+expecting success of 4018.26 'builtin elixir pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 91672cc] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA b439317] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 26 - builtin elixir pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.108 'subject lines are unencoded with --no-encode-email-headers': 
-	echo content >>file &&
-	git add file &&
-	git commit -m "Foö" &&
-	git format-patch --no-encode-email-headers -1 --stdout >patch &&
-	grep ^Subject: patch >actual &&
-	test_cmp expect actual
+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
 
-[side 8072171] Foö
+expecting success of 4018.28 'builtin fortran wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 28 - builtin fortran wordRegex pattern compiles
+
+expecting success of 4018.29 'builtin fortran pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 07df8aa] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 108 - subject lines are unencoded with --no-encode-email-headers
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA d0563d5] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 29 - builtin fortran pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.109 'subject lines are unencoded with format.encodeEmailHeaders=false': 
-	echo content >>file &&
-	git add file &&
-	git commit -m "Foö" &&
-	git config format.encodeEmailHeaders false &&
-	git format-patch -1 --stdout >patch &&
-	grep ^Subject: patch >actual &&
-	test_cmp expect actual
+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
 
-[side 9a61d52] Foö
+expecting success of 4018.31 'builtin fountain wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 31 - builtin fountain wordRegex pattern compiles
+
+expecting success of 4018.32 'builtin fountain pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master fe25a8f] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 109 - subject lines are unencoded with format.encodeEmailHeaders=false
+ 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 4014.110 '--encode-email-headers overrides format.encodeEmailHeaders': 
-	echo content >>file &&
-	git add file &&
-	git commit -m "Foö" &&
-	git config format.encodeEmailHeaders false &&
-	git format-patch --encode-email-headers -1 --stdout >patch &&
-	grep ^Subject: patch >actual &&
-	test_cmp expect actual
+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
 
-[side 752f4f4] Foö
+expecting success of 4018.34 'builtin golang wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 34 - builtin golang wordRegex pattern compiles
+
+expecting success of 4018.35 'builtin golang pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 4856536] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 110 - --encode-email-headers overrides format.encodeEmailHeaders
+ 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 4014.111 'subject lines do not have 822 atom-quoting': 
-	echo content >>file &&
-	git add file &&
-	git commit -m "header with . in it" &&
-	git format-patch -k -1 --stdout >patch &&
-	grep ^Subject: patch >actual &&
-	test_cmp expect actual
+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
 
-[side 1dbf506] header with . in it
+expecting success of 4018.37 'builtin html wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 37 - builtin html wordRegex pattern compiles
+
+expecting success of 4018.38 'builtin html pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master da316a7] changing gitattributes
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 111 - subject lines do not have 822 atom-quoting
+ 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 4014.112 'subject prefixes have space prepended': 
-	git format-patch -n -1 --stdout --subject-prefix=PREFIX >patch &&
-	grep ^Subject: patch >actual &&
-	test_cmp expect actual
+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 112 - subject prefixes have space prepended
+expecting success of 4018.40 'builtin java wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 40 - builtin java wordRegex pattern compiles
 
-expecting success of 4014.113 'empty subject prefix does not have extra space': 
-	git format-patch -n -1 --stdout --subject-prefix= >patch &&
-	grep ^Subject: patch >actual &&
-	test_cmp expect actual
+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
 
-ok 113 - empty subject prefix does not have extra space
+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 4014.114 '--rfc': 
-	cat >expect <<-\EOF &&
-	Subject: [RFC PATCH 1/1] header with . in it
-	EOF
-	git format-patch -n -1 --stdout --rfc >patch &&
-	grep "^Subject:" patch >actual &&
-	test_cmp expect actual
+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
 
-ok 114 - --rfc
+expecting success of 4018.44 'builtin kotlin pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master fba906f] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 411b675] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 44 - builtin kotlin pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.115 '--rfc does not overwrite prefix': 
-	cat >expect <<-\EOF &&
-	Subject: [RFC PATCH foobar 1/1] header with . in it
-	EOF
-	git -c format.subjectPrefix="PATCH foobar" \
-		format-patch -n -1 --stdout --rfc >patch &&
-	grep "^Subject:" patch >actual &&
-	test_cmp expect actual
+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
 
-ok 115 - --rfc does not overwrite prefix
+expecting success of 4018.46 'builtin markdown wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 46 - builtin markdown wordRegex pattern compiles
 
-expecting success of 4014.116 '--rfc is argument order independent': 
-	cat >expect <<-\EOF &&
-	Subject: [RFC PATCH foobar 1/1] header with . in it
-	EOF
-	git format-patch -n -1 --stdout --rfc \
-		--subject-prefix="PATCH foobar" >patch &&
-	grep "^Subject:" patch >actual &&
-	test_cmp expect actual
+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
 
-ok 116 - --rfc is argument order independent
+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 4014.117 '--from=ident notices bogus ident': 
-	test_must_fail git format-patch -1 --stdout --from=foo >patch
+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
 
-fatal: invalid ident line: foo
-ok 117 - --from=ident notices bogus ident
+expecting success of 4018.50 'builtin matlab pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 4125614] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 96677f0] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 50 - builtin matlab pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.118 '--from=ident replaces author': 
-	git format-patch -1 --stdout --from="Me <me@example.com>" >patch &&
-	cat >expect <<-\EOF &&
-	From: Me <me@example.com>
+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
 
-	From: A U Thor <author@example.com>
+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
 
-	EOF
-	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
-	test_cmp expect patch.head
+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
 
-ok 118 - --from=ident replaces author
+expecting success of 4018.54 'builtin pascal pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 54 - builtin pascal pattern compiles
 
-expecting success of 4014.119 '--from uses committer ident': 
-	git format-patch -1 --stdout --from >patch &&
-	cat >expect <<-\EOF &&
-	From: C O Mitter <committer@example.com>
+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
 
-	From: A U Thor <author@example.com>
+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
 
-	EOF
-	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
-	test_cmp expect patch.head
+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
 
-ok 119 - --from uses committer ident
+expecting success of 4018.58 'builtin perl wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 58 - builtin perl wordRegex pattern compiles
 
-expecting success of 4014.120 '--from omits redundant in-body header': 
-	git format-patch -1 --stdout --from="A U Thor <author@example.com>" >patch &&
-	cat >expect <<-\EOF &&
-	From: A U Thor <author@example.com>
+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
 
-	EOF
-	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
-	test_cmp expect patch.head
+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
 
-ok 120 - --from omits redundant in-body header
+expecting success of 4018.61 'builtin php wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 61 - builtin php wordRegex pattern compiles
 
-expecting success of 4014.121 'with --force-in-body-from, redundant in-body from is kept': 
-	git format-patch --force-in-body-from \
-		-1 --stdout --from="A U Thor <author@example.com>" >patch &&
-	cat >expect <<-\EOF &&
-	From: A U Thor <author@example.com>
+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
 
-	From: A U Thor <author@example.com>
+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
 
-	EOF
-	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
-	test_cmp expect patch.head
+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
 
-ok 121 - with --force-in-body-from, redundant in-body from is kept
+expecting success of 4018.65 'builtin python pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master ad7b0c8] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 9820662] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 65 - builtin python pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.122 'format.forceInBodyFrom, equivalent to --force-in-body-from': 
-	git -c format.forceInBodyFrom=yes format-patch \
-		-1 --stdout --from="A U Thor <author@example.com>" >patch &&
-	cat >expect <<-\EOF &&
-	From: A U Thor <author@example.com>
+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
 
-	From: A U Thor <author@example.com>
+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
 
-	EOF
-	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
-	test_cmp expect patch.head
+expecting success of 4018.68 'builtin ruby pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 41412bb] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 6cd7147] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 68 - builtin ruby pattern compiles on bare repo with --attr-source
 
-ok 122 - format.forceInBodyFrom, equivalent to --force-in-body-from
+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 4014.123 'format.forceInBodyFrom, equivalent to --force-in-body-from': 
-	git -c format.forceInBodyFrom=yes format-patch --no-force-in-body-from \
-		-1 --stdout --from="A U Thor <author@example.com>" >patch &&
-	cat >expect <<-\EOF &&
-	From: A U Thor <author@example.com>
+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
 
-	EOF
-	sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
-	test_cmp expect patch.head
+expecting success of 4018.71 'builtin rust pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 26ff60e] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA d9df4e2] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 71 - builtin rust pattern compiles on bare repo with --attr-source
 
-ok 123 - format.forceInBodyFrom, equivalent to --force-in-body-from
+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 4014.124 'in-body headers trigger content encoding': 
-	test_env GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
-	test_when_finished "git reset --hard HEAD^" &&
-	git format-patch -1 --stdout --from >patch &&
-	cat >expect <<-\EOF &&
-	From: C O Mitter <committer@example.com>
-	Content-Type: text/plain; charset=UTF-8
+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
 
-	From: éxötìc <author@example.com>
+expecting success of 4018.74 'builtin scheme pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 1b524cd] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA a0d1221] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 74 - builtin scheme pattern compiles on bare repo with --attr-source
 
-	EOF
-	sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" patch >patch.head &&
-	test_cmp expect patch.head
+expecting success of 4018.75 'builtin tex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 75 - builtin tex pattern compiles
 
-[side 5d5f14e] exotic
- Author: éxötìc <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 exotic.t
-HEAD is now at 1dbf506 header with . in it
-ok 124 - in-body headers trigger content encoding
+expecting success of 4018.76 'builtin tex wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 76 - builtin tex wordRegex pattern compiles
 
-expecting success of 4014.125 'signoff: commit with no body': 
-	append_signoff </dev/null >actual &&
-	cat <<-\EOF | sed "s/EOL$//" >expect &&
-	4:Subject: [PATCH] EOL
-	8:
-	9:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.77 'builtin tex pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master de4ccc4] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 6368b67] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 77 - builtin tex pattern compiles on bare repo with --attr-source
 
-ok 125 - signoff: commit with no body
+expecting success of 4018.78 'builtin custom1 pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 78 - builtin custom1 pattern compiles
 
-expecting success of 4014.126 'signoff: commit with only subject': 
-	echo subject | append_signoff >actual &&
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	9:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.79 'builtin custom1 wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 79 - builtin custom1 wordRegex pattern compiles
 
-ok 126 - signoff: commit with only subject
+expecting success of 4018.80 'builtin custom1 pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 633ec55] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 5cb29de] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 80 - builtin custom1 pattern compiles on bare repo with --attr-source
 
-expecting success of 4014.127 'signoff: commit with only subject that does not end with NL': 
-	printf subject | append_signoff >actual &&
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	9:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.81 'builtin custom2 pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 81 - builtin custom2 pattern compiles
 
-ok 127 - signoff: commit with only subject that does not end with NL
+expecting success of 4018.82 'builtin custom2 wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 82 - builtin custom2 wordRegex pattern compiles
 
-expecting success of 4014.128 'signoff: no existing signoffs': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.83 'builtin custom2 pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 399f11a] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 3432bdd] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 83 - builtin custom2 pattern compiles on bare repo with --attr-source
 
-	body
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	10:
-	11:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.84 'builtin custom3 pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 84 - builtin custom3 pattern compiles
 
-ok 128 - signoff: no existing signoffs
+expecting success of 4018.85 'builtin custom3 wordRegex pattern compiles': 
+		echo "*.java diff=$p" >.gitattributes &&
+		test_expect_code 1 git diff --no-index --word-diff \
+			A.java B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+[-A-]{+B+}
+ok 85 - builtin custom3 wordRegex pattern compiles
 
-expecting success of 4014.129 'signoff: no existing signoffs and no trailing NL': 
-	printf "subject\n\nbody" | append_signoff >actual &&
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	10:
-	11:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.86 'builtin custom3 pattern compiles on bare repo with --attr-source': 
+		test_when_finished "rm -rf bare.git" &&
+		git checkout -B master &&
+		git add . &&
+		echo "*.java diff=notexist" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git checkout -B branchA &&
+		echo "*.java diff=$p" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -am "changing gitattributes" &&
+		git clone --bare --no-local . bare.git &&
+		git -C bare.git symbolic-ref HEAD refs/heads/master &&
+		test_expect_code 1 git -C bare.git --attr-source=branchA \
+			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
+		test_grep ! fatal msg &&
+		test_grep ! error msg
+	
+Switched to and reset branch 'master'
+M	.gitattributes
+[master 2a95308] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to and reset branch 'branchA'
+[branchA 90fa73a] changing gitattributes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'bare.git'...
+diff --git a/A.java b/B.java
+index f70f10e..223b783 100644
+--- a/A.java
++++ b/B.java
+@@ -1 +1 @@
+-A
++B
+ok 86 - builtin custom3 pattern compiles on bare repo with --attr-source
 
-ok 129 - signoff: no existing signoffs and no trailing NL
+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
 
-expecting success of 4014.130 'signoff: some random signoff': 
-	append_signoff <<-\EOF >actual &&
-	subject
+fatal: Last expression must not be negated: !static
+ok 87 - last regexp must not be negated
 
-	body
+expecting success of 4018.88 'setup hunk header tests': 
+	for i in $diffpatterns
+	do
+		echo "$i-* diff=$i" || return 1
+	done > .gitattributes &&
 
-	Signed-off-by: my@house
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	10:
-	11:Signed-off-by: my@house
-	12:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+	# add all test files to the index
+	(
+		cd "$TEST_DIRECTORY"/t4018 &&
+		git --git-dir="$TRASH_DIRECTORY/.git" add .
+	) &&
 
-ok 130 - signoff: some random signoff
+	# 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
 
-expecting success of 4014.131 'signoff: misc conforming footer elements': 
-	append_signoff <<-\EOF >actual &&
-	subject
+ok 88 - setup hunk header tests
 
-	body
+expecting success of 4018.89 'hunk header: README': 
+		git diff -U1 README >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ How to write RIGHT test cases
+ok 89 - hunk header: README
 
-	Signed-off-by: my@house
-	(cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
-	Tested-by: Some One <someone@example.com>
-	Bug: 1234
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	10:
-	11:Signed-off-by: my@house
-	15:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.90 'hunk header: bash-arithmetic-function': 
+		git diff -U1 bash-arithmetic-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 90 - hunk header: bash-arithmetic-function
 
-ok 131 - signoff: misc conforming footer elements
+expecting success of 4018.91 'hunk header: bash-bashism-style-compact': 
+		git diff -U1 bash-bashism-style-compact >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ function RIGHT {
+ok 91 - hunk header: bash-bashism-style-compact
 
-expecting success of 4014.132 'signoff: some random signoff-alike': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.92 'hunk header: bash-bashism-style-function': 
+		git diff -U1 bash-bashism-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT {
+ok 92 - hunk header: bash-bashism-style-function
 
-	body
-	Fooled-by-me: my@house
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	11:
-	12:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.93 'hunk header: bash-bashism-style-whitespace': 
+		git diff -U1 bash-bashism-style-whitespace >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function 	RIGHT 	( 	) 	{
+ok 93 - hunk header: bash-bashism-style-whitespace
 
-ok 132 - signoff: some random signoff-alike
+expecting success of 4018.94 'hunk header: bash-conditional-function': 
+		git diff -U1 bash-conditional-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 94 - hunk header: bash-conditional-function
 
-expecting success of 4014.133 'signoff: not really a signoff': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.95 'hunk header: bash-missing-parentheses': 
+		git diff -U1 bash-missing-parentheses >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ function RIGHT {
+ok 95 - hunk header: bash-missing-parentheses
 
-	I want to mention about Signed-off-by: here.
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	9:I want to mention about Signed-off-by: here.
-	10:
-	11:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.96 'hunk header: bash-mixed-style-compact': 
+		git diff -U1 bash-mixed-style-compact >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT(){
+ok 96 - hunk header: bash-mixed-style-compact
 
-ok 133 - signoff: not really a signoff
+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 4014.134 'signoff: not really a signoff (2)': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.98 'hunk header: bash-nested-functions': 
+		git diff -U1 bash-nested-functions >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT()
+ok 98 - hunk header: bash-nested-functions
 
-	My unfortunate
-	Signed-off-by: example happens to be wrapped here.
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	10:Signed-off-by: example happens to be wrapped here.
-	11:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.99 'hunk header: bash-other-characters': 
+		git diff -U1 bash-other-characters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ _RIGHT_0n()
+ok 99 - hunk header: bash-other-characters
 
-ok 134 - signoff: not really a signoff (2)
+expecting success of 4018.100 'hunk header: bash-posix-style-compact': 
+		git diff -U1 bash-posix-style-compact >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 100 - hunk header: bash-posix-style-compact
 
-expecting success of 4014.135 'signoff: valid S-o-b paragraph in the middle': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.101 'hunk header: bash-posix-style-function': 
+		git diff -U1 bash-posix-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 101 - hunk header: bash-posix-style-function
 
-	Signed-off-by: my@house
-	Signed-off-by: your@house
+expecting success of 4018.102 'hunk header: bash-posix-style-whitespace': 
+		git diff -U1 bash-posix-style-whitespace >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT 	( 	)
+ok 102 - hunk header: bash-posix-style-whitespace
 
-	A lot of houses.
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	9:Signed-off-by: my@house
-	10:Signed-off-by: your@house
-	11:
-	13:
-	14:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.103 'hunk header: bash-subshell-function': 
+		git diff -U1 bash-subshell-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 103 - hunk header: bash-subshell-function
 
-ok 135 - signoff: valid S-o-b paragraph in the middle
+expecting success of 4018.104 'hunk header: bash-trailing-comment': 
+		git diff -U1 bash-trailing-comment >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT()
+ok 104 - hunk header: bash-trailing-comment
 
-expecting success of 4014.136 'signoff: the same signoff at the end': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.105 'hunk header: cpp-c++-function': 
+		git diff -U1 cpp-c++-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ Item RIGHT::DoSomething( Args with_spaces )
+ok 105 - hunk header: cpp-c++-function
 
-	body
+expecting success of 4018.106 'hunk header: cpp-class-constructor': 
+		git diff -U1 cpp-class-constructor >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ Item::Item(int RIGHT)
+ok 106 - hunk header: cpp-class-constructor
 
-	Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	10:
-	11:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.107 'hunk header: cpp-class-constructor-mem-init': 
+		git diff -U1 cpp-class-constructor-mem-init >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ Item::Item(int RIGHT) :
+ok 107 - hunk header: cpp-class-constructor-mem-init
 
-ok 136 - signoff: the same signoff at the end
+expecting success of 4018.108 'hunk header: cpp-class-definition': 
+		git diff -U1 cpp-class-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ class RIGHT
+ok 108 - hunk header: cpp-class-definition
 
-expecting success of 4014.137 'signoff: the same signoff at the end, no trailing NL': 
-	printf "subject\n\nSigned-off-by: C O Mitter <committer@example.com>" |
-		append_signoff >actual &&
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	9:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.109 'hunk header: cpp-class-definition-derived': 
+		git diff -U1 cpp-class-definition-derived >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ class RIGHT :
+ok 109 - hunk header: cpp-class-definition-derived
 
-ok 137 - signoff: the same signoff at the end, no trailing NL
+expecting success of 4018.110 'hunk header: cpp-class-destructor': 
+		git diff -U1 cpp-class-destructor >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT::~RIGHT()
+ok 110 - hunk header: cpp-class-destructor
 
-expecting success of 4014.138 'signoff: the same signoff NOT at the end': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.111 'hunk header: cpp-function-returning-global-type': 
+		git diff -U1 cpp-function-returning-global-type >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ ::Item get::it::RIGHT()
+ok 111 - hunk header: cpp-function-returning-global-type
 
-	body
+expecting success of 4018.112 'hunk header: cpp-function-returning-nested': 
+		git diff -U1 cpp-function-returning-nested >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ get::Item get::it::RIGHT()
+ok 112 - hunk header: cpp-function-returning-nested
 
-	Signed-off-by: C O Mitter <committer@example.com>
-	Signed-off-by: my@house
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	10:
-	11:Signed-off-by: C O Mitter <committer@example.com>
-	12:Signed-off-by: my@house
-	EOF
-	test_cmp expect actual
+expecting success of 4018.113 'hunk header: cpp-function-returning-pointer': 
+		git diff -U1 cpp-function-returning-pointer >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ const char *get_it_RIGHT(char *ptr)
+ok 113 - hunk header: cpp-function-returning-pointer
 
-ok 138 - signoff: the same signoff NOT at the end
+expecting success of 4018.114 'hunk header: cpp-function-returning-reference': 
+		git diff -U1 cpp-function-returning-reference >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ string& get::it::RIGHT(char *ptr)
+ok 114 - hunk header: cpp-function-returning-reference
 
-expecting success of 4014.139 'signoff: tolerate garbage in conforming footer': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.115 'hunk header: cpp-gnu-style-function': 
+		git diff -U1 cpp-gnu-style-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT(int arg)
+ok 115 - hunk header: cpp-gnu-style-function
 
-	body
+expecting success of 4018.116 'hunk header: cpp-namespace-definition': 
+		git diff -U1 cpp-namespace-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ namespace RIGHT
+ok 116 - hunk header: cpp-namespace-definition
 
-	Tested-by: my@house
-	Some Trash
-	Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	10:
-	13:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.117 'hunk header: cpp-operator-definition': 
+		git diff -U1 cpp-operator-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ Value operator+(Value LEFT, Value RIGHT)
+ok 117 - hunk header: cpp-operator-definition
 
-ok 139 - signoff: tolerate garbage in conforming footer
+expecting success of 4018.118 'hunk header: cpp-skip-access-specifiers': 
+		git diff -U1 cpp-skip-access-specifiers >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ class RIGHT : public Baseclass
+ok 118 - hunk header: cpp-skip-access-specifiers
 
-expecting success of 4014.140 'signoff: respect trailer config': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.119 'hunk header: cpp-skip-comment-block': 
+		git diff -U1 cpp-skip-comment-block >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ struct item RIGHT(int i)
+ok 119 - hunk header: cpp-skip-comment-block
 
-	Myfooter: x
-	Some Trash
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	11:
-	12:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual &&
+expecting success of 4018.120 'hunk header: cpp-skip-labels': 
+		git diff -U1 cpp-skip-labels >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ void RIGHT (void)
+ok 120 - hunk header: cpp-skip-labels
 
-	test_config trailer.Myfooter.ifexists add &&
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.121 'hunk header: cpp-struct-definition': 
+		git diff -U1 cpp-struct-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ struct RIGHT {
+ok 121 - hunk header: cpp-struct-definition
 
-	Myfooter: x
-	Some Trash
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	11:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.122 'hunk header: cpp-struct-single-line': 
+		git diff -U1 cpp-struct-single-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,2 +6,2 @@ struct RIGHT_iterator_tag {};
+ok 122 - hunk header: cpp-struct-single-line
 
-ok 140 - signoff: respect trailer config
+expecting success of 4018.123 'hunk header: cpp-template-function-definition': 
+		git diff -U1 cpp-template-function-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ template<class T> int RIGHT(T arg)
+ok 123 - hunk header: cpp-template-function-definition
 
-expecting success of 4014.141 'signoff: footer begins with non-signoff without @ sign': 
-	append_signoff <<-\EOF >actual &&
-	subject
+expecting success of 4018.124 'hunk header: cpp-union-definition': 
+		git diff -U1 cpp-union-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ union RIGHT {
+ok 124 - hunk header: cpp-union-definition
 
-	body
+expecting success of 4018.125 'hunk header: cpp-void-c-function': 
+		git diff -U1 cpp-void-c-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ void RIGHT (void)
+ok 125 - hunk header: cpp-void-c-function
 
-	Reviewed-id: Noone
-	Tested-by: my@house
-	Change-id: Ideadbeef
-	Signed-off-by: C O Mitter <committer@example.com>
-	Bug: 1234
-	EOF
-	cat >expect <<-\EOF &&
-	4:Subject: [PATCH] subject
-	8:
-	10:
-	14:Signed-off-by: C O Mitter <committer@example.com>
-	EOF
-	test_cmp expect actual
+expecting success of 4018.126 'hunk header: csharp-exclude-assignments': 
+		git diff -U1 csharp-exclude-assignments >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -15,3 +15,3 @@ string Method(int RIGHT)
+ok 126 - hunk header: csharp-exclude-assignments
 
-ok 141 - signoff: footer begins with non-signoff without @ sign
+expecting success of 4018.127 'hunk header: csharp-exclude-control-statements': 
+		git diff -U1 csharp-exclude-control-statements >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -29,3 +29,3 @@ string Method(int RIGHT)
+ok 127 - hunk header: csharp-exclude-control-statements
 
-expecting success of 4014.142 'format patch ignores color.ui': 
-	test_unconfig color.ui &&
-	git format-patch --stdout -1 >expect &&
-	test_config color.ui always &&
-	git format-patch --stdout -1 >actual &&
-	test_cmp expect actual
+expecting success of 4018.128 'hunk header: csharp-exclude-exceptions': 
+		git diff -U1 csharp-exclude-exceptions >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -24,3 +24,3 @@ string Method(int RIGHT)
+ok 128 - hunk header: csharp-exclude-exceptions
 
-ok 142 - format patch ignores color.ui
+expecting success of 4018.129 'hunk header: csharp-exclude-generic-method-calls': 
+		git diff -U1 csharp-exclude-generic-method-calls >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string Method(int RIGHT)
+ok 129 - hunk header: csharp-exclude-generic-method-calls
 
-expecting success of 4014.143 'format patch respects diff.relative': 
-	rm -rf subdir &&
-	mkdir subdir &&
-	echo other content >subdir/file2 &&
-	git add subdir/file2 &&
-	git commit -F msg &&
-	test_unconfig diff.relative &&
-	git format-patch --relative=subdir --stdout -1 >expect &&
-	test_config diff.relative true &&
-	git -C subdir format-patch --stdout -1 >actual &&
-	test_cmp expect actual
+expecting success of 4018.130 'hunk header: csharp-exclude-init-dispose': 
+		git diff -U1 csharp-exclude-init-dispose >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -17,3 +17,3 @@ string Method(int RIGHT)
+ok 130 - hunk header: csharp-exclude-init-dispose
 
-[side 961662c] en två tre
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/file2
-ok 143 - format patch respects diff.relative
+expecting success of 4018.131 'hunk header: csharp-exclude-iterations': 
+		git diff -U1 csharp-exclude-iterations >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -21,3 +21,3 @@ string Method(int RIGHT)
+ok 131 - hunk header: csharp-exclude-iterations
 
-expecting success of 4014.144 'cover letter with invalid --cover-from-description and config': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.132 'hunk header: csharp-exclude-method-calls': 
+		git diff -U1 csharp-exclude-method-calls >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -15,3 +15,3 @@ string Method(int RIGHT)
+ok 132 - hunk header: csharp-exclude-method-calls
 
-body" &&
-	test_must_fail git format-patch --cover-letter --cover-from-description garbage main &&
-	test_config format.coverFromDescription garbage &&
-	test_must_fail git format-patch --cover-letter main
+expecting success of 4018.133 'hunk header: csharp-exclude-other': 
+		git diff -U1 csharp-exclude-other >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -15,3 +15,3 @@ string Method(int RIGHT)
+ok 133 - hunk header: csharp-exclude-other
 
-fatal: garbage: invalid cover from description mode
-fatal: garbage: invalid cover from description mode
-ok 144 - cover letter with invalid --cover-from-description and config
+expecting success of 4018.134 'hunk header: csharp-method': 
+		git diff -U1 csharp-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string Method(int RIGHT)
+ok 134 - hunk header: csharp-method
 
-expecting success of 4014.145 'cover letter with format.coverFromDescription = default': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.135 'hunk header: csharp-method-array': 
+		git diff -U1 csharp-method-array >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string[] Method(int RIGHT)
+ok 135 - hunk header: csharp-method-array
 
-body" &&
-	test_config format.coverFromDescription default &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter main >actual &&
-	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	grep "^config subject$" actual &&
-	grep "^body$" actual
+expecting success of 4018.136 'hunk header: csharp-method-explicit': 
+		git diff -U1 csharp-method-explicit >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ void IDisposable.Dispose() // RIGHT
+ok 136 - hunk header: csharp-method-explicit
 
-Switched to branch 'rebuild-1'
-Subject: [PATCH 0/2] *** SUBJECT HERE ***
-config subject
-body
-ok 145 - cover letter with format.coverFromDescription = default
+expecting success of 4018.137 'hunk header: csharp-method-generics': 
+		git diff -U1 csharp-method-generics >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ Example<int, string> Method<TA, TB>(TA RIGHT, TB b)
+ok 137 - hunk header: csharp-method-generics
 
-expecting success of 4014.146 'cover letter with --cover-from-description default': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.138 'hunk header: csharp-method-generics-alternate-spaces': 
+		git diff -U1 csharp-method-generics-alternate-spaces >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ Example<int,string> Method<TA ,TB>(TA RIGHT, TB b)
+ok 138 - hunk header: csharp-method-generics-alternate-spaces
 
-body" &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter --cover-from-description default main >actual &&
-	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	grep "^config subject$" actual &&
-	grep "^body$" actual
+expecting success of 4018.139 'hunk header: csharp-method-modifiers': 
+		git diff -U1 csharp-method-modifiers >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ static internal async Task Method(int RIGHT)
+ok 139 - hunk header: csharp-method-modifiers
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] *** SUBJECT HERE ***
-config subject
-body
-ok 146 - cover letter with --cover-from-description default
+expecting success of 4018.140 'hunk header: csharp-method-multiline': 
+		git diff -U1 csharp-method-multiline >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string Method_RIGHT(
+ok 140 - hunk header: csharp-method-multiline
 
-expecting success of 4014.147 'cover letter with format.coverFromDescription = none': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.141 'hunk header: csharp-method-params': 
+		git diff -U1 csharp-method-params >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string Method(int RIGHT, int b, int c = 42)
+ok 141 - hunk header: csharp-method-params
 
-body" &&
-	test_config format.coverFromDescription none &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter main >actual &&
-	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
-	grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	! grep "^config subject$" actual &&
-	! grep "^body$" actual
+expecting success of 4018.142 'hunk header: csharp-method-special-chars': 
+		git diff -U1 csharp-method-special-chars >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ @Some_Type @Method_With_Underscore(int RIGHT)
+ok 142 - hunk header: csharp-method-special-chars
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] *** SUBJECT HERE ***
-*** BLURB HERE ***
-ok 147 - cover letter with format.coverFromDescription = none
+expecting success of 4018.143 'hunk header: csharp-method-with-spacing': 
+		git diff -U1 csharp-method-with-spacing >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ string   Method 	( int 	RIGHT )
+ok 143 - hunk header: csharp-method-with-spacing
 
-expecting success of 4014.148 'cover letter with --cover-from-description none': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.144 'hunk header: csharp-property': 
+		git diff -U1 csharp-property >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ public bool RIGHT
+ok 144 - hunk header: csharp-property
 
-body" &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter --cover-from-description none main >actual &&
-	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
-	grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	! grep "^config subject$" actual &&
-	! grep "^body$" actual
+expecting success of 4018.145 'hunk header: csharp-property-braces-same-line': 
+		git diff -U1 csharp-property-braces-same-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ public bool RIGHT {
+ok 145 - hunk header: csharp-property-braces-same-line
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] *** SUBJECT HERE ***
-*** BLURB HERE ***
-ok 148 - cover letter with --cover-from-description none
+expecting success of 4018.146 'hunk header: css-attribute-value-selector': 
+		git diff -U1 css-attribute-value-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ [class*="RIGHT"] {
+ok 146 - hunk header: css-attribute-value-selector
 
-expecting success of 4014.149 'cover letter with format.coverFromDescription = message': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.147 'hunk header: css-block-level-@-statements': 
+		git diff -U1 css-block-level-@-statements >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ @keyframes RIGHT {
+ok 147 - hunk header: css-block-level-@-statements
 
-body" &&
-	test_config format.coverFromDescription message &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter main >actual &&
-	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	grep "^config subject$" actual &&
-	grep "^body$" actual
+expecting success of 4018.148 'hunk header: css-brace-in-col-1': 
+		git diff -U1 css-brace-in-col-1 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT label.control-label
+ok 148 - hunk header: css-brace-in-col-1
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] *** SUBJECT HERE ***
-config subject
-body
-ok 149 - cover letter with format.coverFromDescription = message
+expecting success of 4018.149 'hunk header: css-class-selector': 
+		git diff -U1 css-class-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ .RIGHT {
+ok 149 - hunk header: css-class-selector
 
-expecting success of 4014.150 'cover letter with --cover-from-description message': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.150 'hunk header: css-colon-eol': 
+		git diff -U1 css-colon-eol >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT h1 {
+ok 150 - hunk header: css-colon-eol
 
-body" &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter --cover-from-description message main >actual &&
-	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	grep "^config subject$" actual &&
-	grep "^body$" actual
+expecting success of 4018.151 'hunk header: css-colon-selector': 
+		git diff -U1 css-colon-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT a:hover {
+ok 151 - hunk header: css-colon-selector
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] *** SUBJECT HERE ***
-config subject
-body
-ok 150 - cover letter with --cover-from-description message
+expecting success of 4018.152 'hunk header: css-common': 
+		git diff -U1 css-common >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ RIGHT label.control-label {
+ok 152 - hunk header: css-common
 
-expecting success of 4014.151 'cover letter with format.coverFromDescription = subject': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.153 'hunk header: css-id-selector': 
+		git diff -U1 css-id-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ #RIGHT {
+ok 153 - hunk header: css-id-selector
 
-body" &&
-	test_config format.coverFromDescription subject &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter main >actual &&
-	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	! grep "^config subject$" actual &&
-	grep "^body$" actual
+expecting success of 4018.154 'hunk header: css-long-selector-list': 
+		git diff -U1 css-long-selector-list >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ div ul#RIGHT {
+ok 154 - hunk header: css-long-selector-list
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] config subject
-body
-ok 151 - cover letter with format.coverFromDescription = subject
+expecting success of 4018.155 'hunk header: css-prop-sans-indent': 
+		git diff -U1 css-prop-sans-indent >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT, label.control-label {
+ok 155 - hunk header: css-prop-sans-indent
 
-expecting success of 4014.152 'cover letter with --cover-from-description subject': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.156 'hunk header: css-root-selector': 
+		git diff -U1 css-root-selector >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ :RIGHT {
+ok 156 - hunk header: css-root-selector
 
-body" &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter --cover-from-description subject main >actual &&
-	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	! grep "^config subject$" actual &&
-	grep "^body$" actual
+expecting success of 4018.157 'hunk header: css-short-selector-list': 
+		git diff -U1 css-short-selector-list >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ label.control, div ul#RIGHT {
+ok 157 - hunk header: css-short-selector-list
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] config subject
-body
-ok 152 - cover letter with --cover-from-description subject
+expecting success of 4018.158 'hunk header: css-trailing-space': 
+		git diff -U1 css-trailing-space >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ RIGHT label.control-label {
+ok 158 - hunk header: css-trailing-space
 
-expecting success of 4014.153 'cover letter with --cover-from-description subject (UTF-8 subject line)': 
-	test_config branch.rebuild-1.description "Café?
+expecting success of 4018.159 'hunk header: custom1-pattern': 
+		git diff -U1 custom1-pattern >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ int special, RIGHT;
+ok 159 - hunk header: custom1-pattern
 
-body" &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter --cover-from-description subject --encode-email-headers main >actual &&
-	grep "^Subject: \[PATCH 0/2\] =?UTF-8?q?Caf=C3=A9=3F?=$" actual &&
-	! grep "Café" actual
+expecting success of 4018.160 'hunk header: custom2-match-to-end-of-line': 
+		git diff -U1 custom2-match-to-end-of-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ RIGHT_Beer
+ok 160 - hunk header: custom2-match-to-end-of-line
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] =?UTF-8?q?Caf=C3=A9=3F?=
-ok 153 - cover letter with --cover-from-description subject (UTF-8 subject line)
+expecting success of 4018.161 'hunk header: custom3-alternation-in-pattern': 
+		git diff -U1 custom3-alternation-in-pattern >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
+ok 161 - hunk header: custom3-alternation-in-pattern
 
-expecting success of 4014.154 'cover letter with format.coverFromDescription = auto (short subject line)': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.162 'hunk header: dts-labels': 
+		git diff -U1 dts-labels >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ label2: RIGHT {
+ok 162 - hunk header: dts-labels
 
-body" &&
-	test_config format.coverFromDescription auto &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter main >actual &&
-	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	! grep "^config subject$" actual &&
-	grep "^body$" actual
+expecting success of 4018.163 'hunk header: dts-node-unitless': 
+		git diff -U1 dts-node-unitless >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ RIGHT {
+ok 163 - hunk header: dts-node-unitless
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] config subject
-body
-ok 154 - cover letter with format.coverFromDescription = auto (short subject line)
+expecting success of 4018.164 'hunk header: dts-nodes': 
+		git diff -U1 dts-nodes >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 {
+ok 164 - hunk header: dts-nodes
 
-expecting success of 4014.155 'cover letter with --cover-from-description auto (short subject line)': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.165 'hunk header: dts-nodes-boolean-prop': 
+		git diff -U1 dts-nodes-boolean-prop >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ RIGHT@deadf00,4000 {
+ok 165 - hunk header: dts-nodes-boolean-prop
 
-body" &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter --cover-from-description auto main >actual &&
-	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	! grep "^config subject$" actual &&
-	grep "^body$" actual
+expecting success of 4018.166 'hunk header: dts-nodes-comment1': 
+		git diff -U1 dts-nodes-comment1 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 /* &a comment */ {
+ok 166 - hunk header: dts-nodes-comment1
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] config subject
-body
-ok 155 - cover letter with --cover-from-description auto (short subject line)
+expecting success of 4018.167 'hunk header: dts-nodes-comment2': 
+		git diff -U1 dts-nodes-comment2 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 { /* a trailing comment */
+ok 167 - hunk header: dts-nodes-comment2
 
-expecting success of 4014.156 'cover letter with format.coverFromDescription = auto (long subject line)': 
-	test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects
+expecting success of 4018.168 'hunk header: dts-nodes-multiline-prop': 
+		git diff -U1 dts-nodes-multiline-prop >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ RIGHT@deadf00,4000 {
+ok 168 - hunk header: dts-nodes-multiline-prop
 
-body" &&
-	test_config format.coverFromDescription auto &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter main >actual &&
-	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual &&
-	grep "^body$" actual
+expecting success of 4018.169 'hunk header: dts-reference': 
+		git diff -U1 dts-reference >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -7,3 +7,3 @@ &RIGHT {
+ok 169 - hunk header: dts-reference
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] *** SUBJECT HERE ***
-this is a really long first line and it is over 100 characters long which is the threshold for long subjects
-body
-ok 156 - cover letter with format.coverFromDescription = auto (long subject line)
+expecting success of 4018.170 'hunk header: dts-root': 
+		git diff -U1 dts-root >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
+ok 170 - hunk header: dts-root
 
-expecting success of 4014.157 'cover letter with --cover-from-description auto (long subject line)': 
-	test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects
+expecting success of 4018.171 'hunk header: dts-root-comment': 
+		git diff -U1 dts-root-comment >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
+ok 171 - hunk header: dts-root-comment
 
-body" &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter --cover-from-description auto main >actual &&
-	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual &&
-	grep "^body$" actual
+expecting success of 4018.172 'hunk header: elixir-do-not-pick-end': 
+		git diff -U1 elixir-do-not-pick-end >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,2 +4,2 @@ defmodule RIGHT do
+ok 172 - hunk header: elixir-do-not-pick-end
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] *** SUBJECT HERE ***
-this is a really long first line and it is over 100 characters long which is the threshold for long subjects
-body
-ok 157 - cover letter with --cover-from-description auto (long subject line)
+expecting success of 4018.173 'hunk header: elixir-ex-unit-test': 
+		git diff -U1 elixir-ex-unit-test >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ test "RIGHT" do
+ok 173 - hunk header: elixir-ex-unit-test
 
-expecting success of 4014.158 'cover letter with command-line --cover-from-description overrides config': 
-	test_config branch.rebuild-1.description "config subject
+expecting success of 4018.174 'hunk header: elixir-function': 
+		git diff -U1 elixir-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ def function(RIGHT, arg) do
+ok 174 - hunk header: elixir-function
 
-body" &&
-	test_config format.coverFromDescription none &&
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter --cover-from-description subject main >actual &&
-	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
-	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
-	! grep "^config subject$" actual &&
-	grep "^body$" actual
+expecting success of 4018.175 'hunk header: elixir-macro': 
+		git diff -U1 elixir-macro >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ defmacro foo(RIGHT) do
+ok 175 - hunk header: elixir-macro
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] config subject
-body
-ok 158 - cover letter with command-line --cover-from-description overrides config
+expecting success of 4018.176 'hunk header: elixir-module': 
+		git diff -U1 elixir-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ defmodule RIGHT do
+ok 176 - hunk header: elixir-module
 
-expecting success of 4014.159 'cover letter using branch description (1)': 
-	git checkout rebuild-1 &&
-	test_config branch.rebuild-1.description hello &&
-	git format-patch --stdout --cover-letter main >actual &&
-	grep hello actual
+expecting success of 4018.177 'hunk header: elixir-module-func': 
+		git diff -U1 elixir-module-func >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ def fun(RIGHT) do
+ok 177 - hunk header: elixir-module-func
 
-Already on 'rebuild-1'
-hello
-ok 159 - cover letter using branch description (1)
+expecting success of 4018.178 'hunk header: elixir-nested-module': 
+		git diff -U1 elixir-nested-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ defmodule MyApp.RIGHT do
+ok 178 - hunk header: elixir-nested-module
 
-expecting success of 4014.160 'cover letter using branch description (2)': 
-	git checkout rebuild-1 &&
-	test_config branch.rebuild-1.description hello &&
-	git format-patch --stdout --cover-letter rebuild-1~2..rebuild-1 >actual &&
-	grep hello actual
+expecting success of 4018.179 'hunk header: elixir-private-function': 
+		git diff -U1 elixir-private-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ defp function(RIGHT, arg) do
+ok 179 - hunk header: elixir-private-function
 
-Already on 'rebuild-1'
-hello
-ok 160 - cover letter using branch description (2)
+expecting success of 4018.180 'hunk header: elixir-protocol': 
+		git diff -U1 elixir-protocol >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ defprotocol RIGHT do
+ok 180 - hunk header: elixir-protocol
 
-expecting success of 4014.161 'cover letter using branch description (3)': 
-	git checkout rebuild-1 &&
-	test_config branch.rebuild-1.description hello &&
-	git format-patch --stdout --cover-letter ^main rebuild-1 >actual &&
-	grep hello actual
+expecting success of 4018.181 'hunk header: elixir-protocol-implementation': 
+		git diff -U1 elixir-protocol-implementation >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ defimpl RIGHT do
+ok 181 - hunk header: elixir-protocol-implementation
 
-Already on 'rebuild-1'
-hello
-ok 161 - cover letter using branch description (3)
+expecting success of 4018.182 'hunk header: fortran-block-data': 
+		git diff -U1 fortran-block-data >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,4 +2,4 @@ BLOCK DATA RIGHT
+ok 182 - hunk header: fortran-block-data
 
-expecting success of 4014.162 'cover letter using branch description (4)': 
-	git checkout rebuild-1 &&
-	test_config branch.rebuild-1.description hello &&
-	git format-patch --stdout --cover-letter main.. >actual &&
-	grep hello actual
+expecting success of 4018.183 'hunk header: fortran-comment': 
+		git diff -U1 fortran-comment >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -8,3 +8,3 @@ subroutine RIGHT
+ok 183 - hunk header: fortran-comment
 
-Already on 'rebuild-1'
-hello
-ok 162 - cover letter using branch description (4)
+expecting success of 4018.184 'hunk header: fortran-comment-keyword': 
+		git diff -U1 fortran-comment-keyword >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ subroutine RIGHT (funcA, funcB)
+ok 184 - hunk header: fortran-comment-keyword
 
-expecting success of 4014.163 'cover letter using branch description (5)': 
-	git checkout rebuild-1 &&
-	test_config branch.rebuild-1.description hello &&
-	git format-patch --stdout --cover-letter -2 HEAD >actual &&
-	grep hello actual
+expecting success of 4018.185 'hunk header: fortran-comment-legacy': 
+		git diff -U1 fortran-comment-legacy >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -8,3 +8,3 @@ subroutine RIGHT
+ok 185 - hunk header: fortran-comment-legacy
 
-Already on 'rebuild-1'
-hello
-ok 163 - cover letter using branch description (5)
+expecting success of 4018.186 'hunk header: fortran-comment-legacy-star': 
+		git diff -U1 fortran-comment-legacy-star >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -8,3 +8,3 @@ subroutine RIGHT
+ok 186 - hunk header: fortran-comment-legacy-star
 
-expecting success of 4014.164 'cover letter using branch description (6)': 
-	git checkout rebuild-1 &&
-	test_config branch.rebuild-1.description hello &&
-	git format-patch --stdout --cover-letter -2 >actual &&
-	grep hello actual
+expecting success of 4018.187 'hunk header: fortran-external-function': 
+		git diff -U1 fortran-external-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT(a, b) result(c)
+ok 187 - hunk header: fortran-external-function
 
-Already on 'rebuild-1'
-hello
-ok 164 - cover letter using branch description (6)
+expecting success of 4018.188 'hunk header: fortran-external-subroutine': 
+		git diff -U1 fortran-external-subroutine >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ subroutine RIGHT
+ok 188 - hunk header: fortran-external-subroutine
 
-expecting success of 4014.165 'cover letter with --description-file': 
-	test_when_finished "rm -f description.txt" &&
-	cat >description.txt <<-\EOF &&
-	subject from file
+expecting success of 4018.189 'hunk header: fortran-module': 
+		git diff -U1 fortran-module >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ module RIGHT
+ok 189 - hunk header: fortran-module
 
-	body from file
-	EOF
-	git checkout rebuild-1 &&
-	git format-patch --stdout --cover-letter --cover-from-description auto \
-		--description-file description.txt main >actual &&
-	grep "^Subject: \[PATCH 0/2\] subject from file$" actual &&
-	grep "^body from file$" actual
+expecting success of 4018.190 'hunk header: fortran-module-procedure': 
+		git diff -U1 fortran-module-procedure >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -8,3 +8,3 @@ module RIGHT
+ok 190 - hunk header: fortran-module-procedure
 
-Already on 'rebuild-1'
-Subject: [PATCH 0/2] subject from file
-body from file
-ok 165 - cover letter with --description-file
+expecting success of 4018.191 'hunk header: fortran-program': 
+		git diff -U1 fortran-program >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ program RIGHT
+ok 191 - hunk header: fortran-program
 
-expecting success of 4014.166 'cover letter with nothing': 
-	git format-patch --stdout --cover-letter >actual &&
-	test_line_count = 0 actual
+expecting success of 4018.192 'hunk header: fountain-scene': 
+		git diff -U1 fountain-scene >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ EXT. STREET RIGHT OUTSIDE - DAY
+ok 192 - hunk header: fountain-scene
 
-ok 166 - cover letter with nothing
+expecting success of 4018.193 'hunk header: golang-complex-function': 
+		git diff -U1 golang-complex-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ func (t *Test) RIGHT(a Type) (Type, error) {
+ok 193 - hunk header: golang-complex-function
 
-expecting success of 4014.167 'cover letter auto': 
-	mkdir -p tmp &&
-	test_when_finished "rm -rf tmp;
-		git config --unset format.coverletter" &&
+expecting success of 4018.194 'hunk header: golang-func': 
+		git diff -U1 golang-func >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ func RIGHT() {
+ok 194 - hunk header: golang-func
 
-	git config format.coverletter auto &&
-	git format-patch -o tmp -1 >list &&
-	test_line_count = 1 list &&
-	git format-patch -o tmp -2 >list &&
-	test_line_count = 3 list
+expecting success of 4018.195 'hunk header: golang-interface': 
+		git diff -U1 golang-interface >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ type RIGHT interface {
+ok 195 - hunk header: golang-interface
 
-ok 167 - cover letter auto
+expecting success of 4018.196 'hunk header: golang-long-func': 
+		git diff -U1 golang-long-func >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
+ok 196 - hunk header: golang-long-func
 
-expecting success of 4014.168 'cover letter auto user override': 
-	mkdir -p tmp &&
-	test_when_finished "rm -rf tmp;
-		git config --unset format.coverletter" &&
+expecting success of 4018.197 'hunk header: golang-struct': 
+		git diff -U1 golang-struct >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ type RIGHT struct {
+ok 197 - hunk header: golang-struct
 
-	git config format.coverletter auto &&
-	git format-patch -o tmp --cover-letter -1 >list &&
-	test_line_count = 2 list &&
-	git format-patch -o tmp --cover-letter -2 >list &&
-	test_line_count = 3 list &&
-	git format-patch -o tmp --no-cover-letter -1 >list &&
-	test_line_count = 1 list &&
-	git format-patch -o tmp --no-cover-letter -2 >list &&
-	test_line_count = 2 list
+expecting success of 4018.198 'hunk header: java-class-brace-on-separate-line': 
+		git diff -U1 java-class-brace-on-separate-line >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ class RIGHT
+ok 198 - hunk header: java-class-brace-on-separate-line
 
-ok 168 - cover letter auto user override
+expecting success of 4018.199 'hunk header: java-class-member-function': 
+		git diff -U1 java-class-member-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
+ok 199 - hunk header: java-class-member-function
 
-expecting success of 4014.169 'format-patch --zero-commit': 
-	git format-patch --zero-commit --stdout v2..v1 >patch2 &&
-	grep "^From " patch2 | sort | uniq >actual &&
-	echo "From $ZERO_OID Mon Sep 17 00:00:00 2001" >expect &&
-	test_cmp expect actual
+expecting success of 4018.200 'hunk header: java-class-space-before-type-parameters': 
+		git diff -U1 java-class-space-before-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ class RIGHT <TYPE, PARAMS, AFTER, SPACE> {
+ok 200 - hunk header: java-class-space-before-type-parameters
 
-ok 169 - format-patch --zero-commit
+expecting success of 4018.201 'hunk header: java-class-type-parameters': 
+		git diff -U1 java-class-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ class RIGHT<A, B> {
+ok 201 - hunk header: java-class-type-parameters
 
-expecting success of 4014.170 'From line has expected format': 
-	git format-patch --stdout v2..v1 >patch2 &&
-	grep "^From " patch2 >from &&
-	grep "^From $OID_REGEX Mon Sep 17 00:00:00 2001$" patch2 >filtered &&
-	test_cmp from filtered
+expecting success of 4018.202 'hunk header: java-class-type-parameters-implements': 
+		git diff -U1 java-class-type-parameters-implements >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ class RIGHT<A, B> implements List<A> {
+ok 202 - hunk header: java-class-type-parameters-implements
 
-ok 170 - From line has expected format
+expecting success of 4018.203 'hunk header: java-enum-constant': 
+		git diff -U1 java-enum-constant >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ private enum RIGHT {
+ok 203 - hunk header: java-enum-constant
 
-expecting success of 4014.171 'format-patch -o with no leading directories': 
-	rm -fr patches &&
-	git format-patch -o patches main..side &&
-	count=$(git rev-list --count main..side) &&
-	ls patches >list &&
-	test_line_count = $count list
+expecting success of 4018.204 'hunk header: java-interface-type-parameters': 
+		git diff -U1 java-interface-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ interface RIGHT<A, B> {
+ok 204 - hunk header: java-interface-type-parameters
 
-patches/0001-Side-changes-1.patch
-patches/0002-Side-changes-2.patch
-patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
-patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
-patches/0005-foo.patch
-patches/0006-one.patch
-patches/0007-en.patch
-patches/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
-patches/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
-patches/0010-author-check.patch
-patches/0011-author-check.patch
-patches/0012-author-check.patch
-patches/0013-author-check.patch
-patches/0014-author-check.patch
-patches/0015-author-check.patch
-patches/0016-author-check.patch
-patches/0017-author-check.patch
-patches/0018-author-check.patch
-patches/0019-Fo.patch
-patches/0020-Fo.patch
-patches/0021-Fo.patch
-patches/0022-header-with-.-in-it.patch
-patches/0023-en.patch
-ok 171 - format-patch -o with no leading directories
+expecting success of 4018.205 'hunk header: java-interface-type-parameters-extends': 
+		git diff -U1 java-interface-type-parameters-extends >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ interface RIGHT<A, B> extends Function<A, B> {
+ok 205 - hunk header: java-interface-type-parameters-extends
 
-expecting success of 4014.172 'format-patch -o with leading existing directories': 
-	rm -rf existing-dir &&
-	mkdir existing-dir &&
-	git format-patch -o existing-dir/patches main..side &&
-	count=$(git rev-list --count main..side) &&
-	ls existing-dir/patches >list &&
-	test_line_count = $count list
+expecting success of 4018.206 'hunk header: java-method-return-generic-bounded': 
+		git diff -U1 java-method-return-generic-bounded >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ public <T extends Bar & Foo<T>, R> Map<T, R[]> foo(String[] RIGHT) {
+ok 206 - hunk header: java-method-return-generic-bounded
 
-existing-dir/patches/0001-Side-changes-1.patch
-existing-dir/patches/0002-Side-changes-2.patch
-existing-dir/patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
-existing-dir/patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
-existing-dir/patches/0005-foo.patch
-existing-dir/patches/0006-one.patch
-existing-dir/patches/0007-en.patch
-existing-dir/patches/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
-existing-dir/patches/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
-existing-dir/patches/0010-author-check.patch
-existing-dir/patches/0011-author-check.patch
-existing-dir/patches/0012-author-check.patch
-existing-dir/patches/0013-author-check.patch
-existing-dir/patches/0014-author-check.patch
-existing-dir/patches/0015-author-check.patch
-existing-dir/patches/0016-author-check.patch
-existing-dir/patches/0017-author-check.patch
-existing-dir/patches/0018-author-check.patch
-existing-dir/patches/0019-Fo.patch
-existing-dir/patches/0020-Fo.patch
-existing-dir/patches/0021-Fo.patch
-existing-dir/patches/0022-header-with-.-in-it.patch
-existing-dir/patches/0023-en.patch
-ok 172 - format-patch -o with leading existing directories
+expecting success of 4018.207 'hunk header: java-method-return-generic-wildcard': 
+		git diff -U1 java-method-return-generic-wildcard >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ public List<? extends Comparable> foo(String[] RIGHT) {
+ok 207 - hunk header: java-method-return-generic-wildcard
 
-expecting success of 4014.173 'format-patch -o with leading non-existing directories': 
-	rm -rf non-existing-dir &&
-	git format-patch -o non-existing-dir/patches main..side &&
-	count=$(git rev-list --count main..side) &&
-	test_path_is_dir non-existing-dir &&
-	ls non-existing-dir/patches >list &&
-	test_line_count = $count list
+expecting success of 4018.208 'hunk header: java-nested-field': 
+		git diff -U1 java-nested-field >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ private static class RIGHT {
+ok 208 - hunk header: java-nested-field
 
-non-existing-dir/patches/0001-Side-changes-1.patch
-non-existing-dir/patches/0002-Side-changes-2.patch
-non-existing-dir/patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
-non-existing-dir/patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
-non-existing-dir/patches/0005-foo.patch
-non-existing-dir/patches/0006-one.patch
-non-existing-dir/patches/0007-en.patch
-non-existing-dir/patches/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
-non-existing-dir/patches/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
-non-existing-dir/patches/0010-author-check.patch
-non-existing-dir/patches/0011-author-check.patch
-non-existing-dir/patches/0012-author-check.patch
-non-existing-dir/patches/0013-author-check.patch
-non-existing-dir/patches/0014-author-check.patch
-non-existing-dir/patches/0015-author-check.patch
-non-existing-dir/patches/0016-author-check.patch
-non-existing-dir/patches/0017-author-check.patch
-non-existing-dir/patches/0018-author-check.patch
-non-existing-dir/patches/0019-Fo.patch
-non-existing-dir/patches/0020-Fo.patch
-non-existing-dir/patches/0021-Fo.patch
-non-existing-dir/patches/0022-header-with-.-in-it.patch
-non-existing-dir/patches/0023-en.patch
-ok 173 - format-patch -o with leading non-existing directories
+expecting success of 4018.209 'hunk header: java-non-sealed': 
+		git diff -U1 java-non-sealed >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ public static non-sealed class RIGHT extends SealedClass {
+ok 209 - hunk header: java-non-sealed
 
-expecting success of 4014.174 'format-patch format.outputDirectory option': 
-	test_config format.outputDirectory patches &&
-	rm -fr patches &&
-	git format-patch main..side &&
-	count=$(git rev-list --count main..side) &&
-	ls patches >list &&
-	test_line_count = $count list
+expecting success of 4018.210 'hunk header: java-record': 
+		git diff -U1 java-record >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public record RIGHT(int comp1, double comp2, String comp3) {
+ok 210 - hunk header: java-record
 
-patches/0001-Side-changes-1.patch
-patches/0002-Side-changes-2.patch
-patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
-patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
-patches/0005-foo.patch
-patches/0006-one.patch
-patches/0007-en.patch
-patches/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
-patches/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
-patches/0010-author-check.patch
-patches/0011-author-check.patch
-patches/0012-author-check.patch
-patches/0013-author-check.patch
-patches/0014-author-check.patch
-patches/0015-author-check.patch
-patches/0016-author-check.patch
-patches/0017-author-check.patch
-patches/0018-author-check.patch
-patches/0019-Fo.patch
-patches/0020-Fo.patch
-patches/0021-Fo.patch
-patches/0022-header-with-.-in-it.patch
-patches/0023-en.patch
-ok 174 - format-patch format.outputDirectory option
+expecting success of 4018.211 'hunk header: java-record-space-before-components': 
+		git diff -U1 java-record-space-before-components >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public record RIGHT (String components, String after, String space) {
+ok 211 - hunk header: java-record-space-before-components
 
-expecting success of 4014.175 'format-patch -o overrides format.outputDirectory': 
-	test_config format.outputDirectory patches &&
-	rm -fr patches patchset &&
-	git format-patch main..side -o patchset &&
-	test_path_is_missing patches &&
-	test_path_is_dir patchset
+expecting success of 4018.212 'hunk header: java-record-type-parameters': 
+		git diff -U1 java-record-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public record RIGHT<A, N extends Number>(A comp1, N comp2, int comp3) {
+ok 212 - hunk header: java-record-type-parameters
 
-patchset/0001-Side-changes-1.patch
-patchset/0002-Side-changes-2.patch
-patchset/0003-Side-changes-3-with-n-backslash-n-in-it.patch
-patchset/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
-patchset/0005-foo.patch
-patchset/0006-one.patch
-patchset/0007-en.patch
-patchset/0008-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-bar-foo-.patch
-patchset/0009-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-bar-f-ba.patch
-patchset/0010-author-check.patch
-patchset/0011-author-check.patch
-patchset/0012-author-check.patch
-patchset/0013-author-check.patch
-patchset/0014-author-check.patch
-patchset/0015-author-check.patch
-patchset/0016-author-check.patch
-patchset/0017-author-check.patch
-patchset/0018-author-check.patch
-patchset/0019-Fo.patch
-patchset/0020-Fo.patch
-patchset/0021-Fo.patch
-patchset/0022-header-with-.-in-it.patch
-patchset/0023-en.patch
-ok 175 - format-patch -o overrides format.outputDirectory
+expecting success of 4018.213 'hunk header: java-sealed': 
+		git diff -U1 java-sealed >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class Sealed { // RIGHT
+ok 213 - hunk header: java-sealed
 
-expecting success of 4014.176 'format-patch forbids multiple outputs': 
-	rm -fr outfile outdir &&
-	test_must_fail \
-		git format-patch --stdout --output-directory=outdir &&
-	test_must_fail \
-		git format-patch --stdout --output=outfile &&
-	test_must_fail \
-		git format-patch --output=outfile --output-directory=outdir
+expecting success of 4018.214 'hunk header: java-sealed-permits': 
+		git diff -U1 java-sealed-permits >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT permits PermittedA, PermittedB {
+ok 214 - hunk header: java-sealed-permits
+
+expecting success of 4018.215 'hunk header: java-sealed-type-parameters': 
+		git diff -U1 java-sealed-type-parameters >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> {
+ok 215 - hunk header: java-sealed-type-parameters
 
-fatal: options '--stdout' and '--output-directory' cannot be used together
-fatal: options '--stdout' and '--output' cannot be used together
-fatal: options '--output' and '--output-directory' cannot be used together
-ok 176 - format-patch forbids multiple outputs
+expecting success of 4018.216 'hunk header: java-sealed-type-parameters-implements-permits': 
+		git diff -U1 java-sealed-type-parameters-implements-permits >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> implements List<A> permits PermittedA,
+ok 216 - hunk header: java-sealed-type-parameters-implements-permits
 
-expecting success of 4014.177 'configured outdir does not conflict with output options': 
-	rm -fr outfile outdir &&
-	test_config format.outputDirectory outdir &&
-	git format-patch --stdout &&
-	test_path_is_missing outdir &&
-	git format-patch --output=outfile &&
-	test_path_is_missing outdir
+expecting success of 4018.217 'hunk header: java-sealed-type-parameters-permits': 
+		git diff -U1 java-sealed-type-parameters-permits >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> permits PermittedA, PermittedB {
+ok 217 - hunk header: java-sealed-type-parameters-permits
 
-ok 177 - configured outdir does not conflict with output options
+expecting success of 4018.218 'hunk header: kotlin-class': 
+		git diff -U1 kotlin-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ class RIGHT {
+ok 218 - hunk header: kotlin-class
 
-expecting success of 4014.178 'format-patch --output': 
-	rm -fr outfile &&
-	git format-patch -3 --stdout HEAD >expect &&
-	git format-patch -3 --output=outfile HEAD &&
-	test_cmp expect outfile
+expecting success of 4018.219 'hunk header: kotlin-enum-class': 
+		git diff -U1 kotlin-enum-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ enum class RIGHT{
+ok 219 - hunk header: kotlin-enum-class
 
-ok 178 - format-patch --output
+expecting success of 4018.220 'hunk header: kotlin-fun': 
+		git diff -U1 kotlin-fun >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ fun RIGHT(){
+ok 220 - hunk header: kotlin-fun
 
-expecting success of 4014.179 'format-patch --cover-letter --output': 
-	rm -fr outfile &&
-	git format-patch --cover-letter -3 --stdout HEAD >expect &&
-	git format-patch --cover-letter -3 --output=outfile HEAD &&
-	test_cmp expect outfile
+expecting success of 4018.221 'hunk header: kotlin-inheritace-class': 
+		git diff -U1 kotlin-inheritace-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ open class RIGHT{
+ok 221 - hunk header: kotlin-inheritace-class
 
-ok 179 - format-patch --cover-letter --output
+expecting success of 4018.222 'hunk header: kotlin-inline-class': 
+		git diff -U1 kotlin-inline-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ value class RIGHT(Args){
+ok 222 - hunk header: kotlin-inline-class
 
-expecting success of 4014.180 'format-patch --base': 
-	git checkout patchid &&
+expecting success of 4018.223 'hunk header: kotlin-interface': 
+		git diff -U1 kotlin-interface >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ interface RIGHT{
+ok 223 - hunk header: kotlin-interface
 
-	git format-patch --stdout --base=HEAD~3 -1 >patch &&
-	tail -n 7 patch >actual1 &&
+expecting success of 4018.224 'hunk header: kotlin-nested-fun': 
+		git diff -U1 kotlin-nested-fun >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,3 +5,3 @@ fun RIGHT(  a:Int){
+ok 224 - hunk header: kotlin-nested-fun
 
-	git format-patch --stdout --base=HEAD~3 HEAD~.. >patch &&
-	tail -n 7 patch >actual2 &&
+expecting success of 4018.225 'hunk header: kotlin-public-class': 
+		git diff -U1 kotlin-public-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ public class RIGHT{
+ok 225 - hunk header: kotlin-public-class
 
-	echo >expect &&
-	git rev-parse HEAD~3 >commit-id-base &&
-	echo "base-commit: $(cat commit-id-base)" >>expect &&
+expecting success of 4018.226 'hunk header: kotlin-sealed-class': 
+		git diff -U1 kotlin-sealed-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,3 +3,3 @@ sealed class RIGHT {
+ok 226 - hunk header: kotlin-sealed-class
 
-	git show --patch HEAD~2 >patch &&
-	git patch-id --stable <patch >patch.id.raw &&
-	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
+expecting success of 4018.227 'hunk header: markdown-heading-indented': 
+		git diff -U1 markdown-heading-indented >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -5,2 +5,2 @@    ### RIGHT
+ok 227 - hunk header: markdown-heading-indented
 
-	git show --patch HEAD~1 >patch &&
-	git patch-id --stable <patch >patch.id.raw &&
-	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>expect &&
+expecting success of 4018.228 'hunk header: markdown-heading-non-headings': 
+		git diff -U1 markdown-heading-non-headings >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -16,2 +16,2 @@ # RIGHT
+ok 228 - hunk header: markdown-heading-non-headings
 
-	signature >>expect &&
-	test_cmp expect actual1 &&
-	test_cmp expect actual2 &&
+expecting success of 4018.229 'hunk header: matlab-class-definition': 
+		git diff -U1 matlab-class-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ classdef RIGHT
+ok 229 - hunk header: matlab-class-definition
 
-	echo >fail &&
-	echo "base-commit: $(cat commit-id-base)" >>fail &&
+expecting success of 4018.230 'hunk header: matlab-function': 
+		git diff -U1 matlab-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function y = RIGHT()
+ok 230 - hunk header: matlab-function
 
-	git show --patch HEAD~2 >patch &&
-	git patch-id --unstable <patch >patch.id.raw &&
-	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
+expecting success of 4018.231 'hunk header: matlab-octave-section-1': 
+		git diff -U1 matlab-octave-section-1 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,2 +2,2 @@ %%% RIGHT section
+ok 231 - hunk header: matlab-octave-section-1
 
-	git show --patch HEAD~1 >patch &&
-	git patch-id --unstable <patch >patch.id.raw &&
-	awk "{print \"prerequisite-patch-id:\", \$1}" <patch.id.raw >>fail &&
+expecting success of 4018.232 'hunk header: matlab-octave-section-2': 
+		git diff -U1 matlab-octave-section-2 >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,2 +2,2 @@ ## RIGHT section
+ok 232 - hunk header: matlab-octave-section-2
 
-	signature >>fail &&
-	! test_cmp fail actual1 &&
-	! test_cmp fail actual2
+expecting success of 4018.233 'hunk header: matlab-section': 
+		git diff -U1 matlab-section >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,2 +2,2 @@ %% RIGHT section
+ok 233 - hunk header: matlab-section
 
-Switched to branch 'patchid'
---- fail	2025-12-18 01:35:33.446773267 +0000
-+++ actual1	2025-12-18 01:35:33.286773267 +0000
-@@ -1,7 +1,7 @@
- 
- base-commit: 18ed22aae56367787c36a882bd61281e07994f11
--prerequisite-patch-id: 28427b5266de797837da09880f31c6774f1acddd
--prerequisite-patch-id: e6bf335459a53de8c1f2e3f7fcfa7f52b48e8a34
-+prerequisite-patch-id: f7afebea9c46bbd99ee80c7d77c4ea784d8c29e4
-+prerequisite-patch-id: 2617b88e9c5376b5aa36597467a68844063a7501
- -- 
- 2.45.2
- 
---- fail	2025-12-18 01:35:33.446773267 +0000
-+++ actual2	2025-12-18 01:35:33.322773267 +0000
-@@ -1,7 +1,7 @@
- 
- base-commit: 18ed22aae56367787c36a882bd61281e07994f11
--prerequisite-patch-id: 28427b5266de797837da09880f31c6774f1acddd
--prerequisite-patch-id: e6bf335459a53de8c1f2e3f7fcfa7f52b48e8a34
-+prerequisite-patch-id: f7afebea9c46bbd99ee80c7d77c4ea784d8c29e4
-+prerequisite-patch-id: 2617b88e9c5376b5aa36597467a68844063a7501
- -- 
- 2.45.2
- 
-ok 180 - format-patch --base
+expecting success of 4018.234 'hunk header: perl-skip-end-of-heredoc': 
+		git diff -U1 perl-skip-end-of-heredoc >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -6,3 +6,3 @@ sub RIGHTwithheredocument {
+ok 234 - hunk header: perl-skip-end-of-heredoc
 
-expecting success of 4014.181 'format-patch --base errors out when base commit is in revision list': 
-	test_must_fail git format-patch --base=HEAD -2 &&
-	test_must_fail git format-patch --base=HEAD~1 -2 &&
-	git format-patch --stdout --base=HEAD~2 -2 >patch &&
-	grep "^base-commit:" patch >actual &&
-	git rev-parse HEAD~2 >commit-id-base &&
-	echo "base-commit: $(cat commit-id-base)" >expect &&
-	test_cmp expect actual
+expecting success of 4018.235 'hunk header: perl-skip-forward-decl': 
+		git diff -U1 perl-skip-forward-decl >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -9,2 +9,2 @@ package RIGHT;
+ok 235 - hunk header: perl-skip-forward-decl
 
-fatal: base commit should be the ancestor of revision list
-fatal: base commit shouldn't be in revision list
-ok 181 - format-patch --base errors out when base commit is in revision list
+expecting success of 4018.236 'hunk header: perl-skip-sub-in-pod': 
+		git diff -U1 perl-skip-sub-in-pod >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -15,3 +15,3 @@ =head1 SYNOPSIS_RIGHT
+ok 236 - hunk header: perl-skip-sub-in-pod
 
-expecting success of 4014.182 'format-patch --base errors out when base commit is not ancestor of revision list': 
-	# For history as below:
-	#
-	#    ---Q---P---Z---Y---*---X
-	#	 \             /
-	#	  ------------W
-	#
-	# If "format-patch Z..X" is given, P and Z can not be specified as the base commit
-	git checkout -b topic1 main &&
-	git rev-parse HEAD >commit-id-base &&
-	test_commit P &&
-	git rev-parse HEAD >commit-id-P &&
-	test_commit Z &&
-	git rev-parse HEAD >commit-id-Z &&
-	test_commit Y &&
-	git checkout -b topic2 main &&
-	test_commit W &&
-	git merge topic1 &&
-	test_commit X &&
-	test_must_fail git format-patch --base=$(cat commit-id-P) -3 &&
-	test_must_fail git format-patch --base=$(cat commit-id-Z) -3 &&
-	git format-patch --stdout --base=$(cat commit-id-base) -3 >patch &&
-	grep "^base-commit:" patch >actual &&
-	echo "base-commit: $(cat commit-id-base)" >expect &&
-	test_cmp expect actual
+expecting success of 4018.237 'hunk header: perl-sub-definition': 
+		git diff -U1 perl-sub-definition >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ sub RIGHT {
+ok 237 - hunk header: perl-sub-definition
 
-Switched to a new branch 'topic1'
-[topic1 1475cb4] P
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 P.t
-[topic1 b544364] Z
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 Z.t
-[topic1 93f1071] Y
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 Y.t
-Switched to a new branch 'topic2'
-[topic2 90e4a2d] W
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 W.t
-Merge made by the 'ort' strategy.
- P.t | 1 +
- Y.t | 1 +
- Z.t | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 P.t
- create mode 100644 Y.t
- create mode 100644 Z.t
-[topic2 fcd940f] X
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 X.t
-fatal: base commit should be the ancestor of revision list
-fatal: base commit should be the ancestor of revision list
-ok 182 - format-patch --base errors out when base commit is not ancestor of revision list
+expecting success of 4018.238 'hunk header: perl-sub-definition-kr-brace': 
+		git diff -U1 perl-sub-definition-kr-brace >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ sub RIGHT
+ok 238 - hunk header: perl-sub-definition-kr-brace
 
-expecting success of 4014.183 'format-patch --base=auto': 
-	git checkout -b upstream main &&
-	git checkout -b local upstream &&
-	git branch --set-upstream-to=upstream &&
-	test_commit N1 &&
-	test_commit N2 &&
-	git format-patch --stdout --base=auto -2 >patch &&
-	grep "^base-commit:" patch >actual &&
-	git rev-parse upstream >commit-id-base &&
-	echo "base-commit: $(cat commit-id-base)" >expect &&
-	test_cmp expect actual
+expecting success of 4018.239 'hunk header: php-abstract-class': 
+		git diff -U1 php-abstract-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ abstract class RIGHT
+ok 239 - hunk header: php-abstract-class
 
-Switched to a new branch 'upstream'
-Switched to a new branch 'local'
-branch 'local' set up to track 'upstream'.
-[local 58a2c1a] N1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 N1.t
-[local 2092f1c] N2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 N2.t
-ok 183 - format-patch --base=auto
+expecting success of 4018.240 'hunk header: php-abstract-method': 
+		git diff -U1 php-abstract-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ abstract public function RIGHT(): ?string
+ok 240 - hunk header: php-abstract-method
 
-expecting success of 4014.184 'format-patch errors out when history involves criss-cross': 
-	# setup criss-cross history
-	#
-	#   B---M1---D
-	#  / \ /
-	# A   X
-	#  \ / \
-	#   C---M2---E
-	#
-	git checkout main &&
-	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 branch --set-upstream-to=xbc &&
-	git merge xb &&
-	git checkout xbc &&
-	test_commit D &&
-	git checkout xcb &&
-	test_commit E &&
-	test_must_fail 	git format-patch --base=auto -1
+expecting success of 4018.241 'hunk header: php-class': 
+		git diff -U1 php-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ class RIGHT
+ok 241 - hunk header: php-class
 
-Switched to branch 'main'
-[main d0903cd] 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 5339a31] 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 1a9241d] 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'
-branch 'xcb' set up to track 'xbc'.
-Merge made by the 'ort' strategy.
- B.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'xbc'
-[xbc 475ff64] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Switched to branch 'xcb'
-Your branch and 'xbc' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-[xcb 425fa6a] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-fatal: could not find exact merge base
-ok 184 - format-patch errors out when history involves criss-cross
+expecting success of 4018.242 'hunk header: php-enum': 
+		git diff -U1 php-enum >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ enum RIGHT: string
+ok 242 - hunk header: php-enum
 
-expecting success of 4014.185 'format-patch format.useAutoBase whenAble history involves criss-cross': 
-	test_config format.useAutoBase whenAble &&
-	git format-patch -1 >patch &&
-	! grep "^base-commit:" patch
+expecting success of 4018.243 'hunk header: php-final-class': 
+		git diff -U1 php-final-class >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ final class RIGHT
+ok 243 - hunk header: php-final-class
 
-ok 185 - format-patch format.useAutoBase whenAble history involves criss-cross
+expecting success of 4018.244 'hunk header: php-final-method': 
+		git diff -U1 php-final-method >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -4,3 +4,3 @@ final public function RIGHT(): string
+ok 244 - hunk header: php-final-method
 
-expecting success of 4014.186 'format-patch format.useAutoBase option': 
-	git checkout local &&
-	test_config format.useAutoBase true &&
-	git format-patch --stdout -1 >patch &&
-	grep "^base-commit:" patch >actual &&
-	git rev-parse upstream >commit-id-base &&
-	echo "base-commit: $(cat commit-id-base)" >expect &&
-	test_cmp expect actual
+expecting success of 4018.245 'hunk header: php-function': 
+		git diff -U1 php-function >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -2,3 +2,3 @@ function RIGHT()
+ok 245 - hunk header: php-function
 
-Switched to branch 'local'
-Your branch is ahead of 'upstream' by 2 commits.
-  (use "git push" to publish your local commits)
-ok 186 - format-patch format.useAutoBase option
+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 4014.187 'format-patch format.useAutoBase option with whenAble': 
-	git checkout local &&
-	test_config format.useAutoBase whenAble &&
-	git format-patch --stdout -1 >patch &&
-	grep "^base-commit:" patch >actual &&
-	git rev-parse upstream >commit-id-base &&
-	echo "base-commit: $(cat commit-id-base)" >expect &&
-	test_cmp expect 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
 
-Already on 'local'
-Your branch is ahead of 'upstream' by 2 commits.
-  (use "git push" to publish your local commits)
-ok 187 - format-patch format.useAutoBase option with whenAble
+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 4014.188 'format-patch --base overrides format.useAutoBase': 
-	test_config format.useAutoBase true &&
-	git format-patch --stdout --base=HEAD~1 -1 >patch &&
-	grep "^base-commit:" patch >actual &&
-	git rev-parse HEAD~1 >commit-id-base &&
-	echo "base-commit: $(cat commit-id-base)" >expect &&
-	test_cmp expect 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 188 - format-patch --base overrides format.useAutoBase
+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 4014.189 'format-patch --no-base overrides format.useAutoBase': 
-	test_config format.useAutoBase true &&
-	git format-patch --stdout --no-base -1 >patch &&
-	! grep "^base-commit:" patch
+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 189 - format-patch --no-base overrides format.useAutoBase
+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 4014.190 'format-patch --no-base overrides format.useAutoBase whenAble': 
-	test_config format.useAutoBase whenAble &&
-	git format-patch --stdout --no-base -1 >patch &&
-	! grep "^base-commit:" patch
+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
 
-ok 190 - format-patch --no-base overrides format.useAutoBase whenAble
+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 4014.191 'format-patch --base with --attach': 
-	git format-patch --attach=mimemime --stdout --base=HEAD~ -1 >patch &&
-	sed -n -e "/^base-commit:/s/.*/1/p" -e "/^---*mimemime--$/s/.*/2/p" \
-		patch >actual &&
-	test_write_lines 1 2 >expect &&
-	test_cmp expect 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 191 - format-patch --base with --attach
+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 4014.192 'format-patch --attach cover-letter only is non-multipart': 
-	test_when_finished "rm -fr patches" &&
-	git format-patch -o patches --cover-letter --attach=mimemime --base=HEAD~ -1 &&
-	! grep -E "^--+mimemime" patches/0000*.patch &&
-	grep -E "^--+mimemime$" patches/0001*.patch >output &&
-	test_line_count = 2 output &&
-	grep -E "^--+mimemime--$" patches/0001*.patch >output &&
-	test_line_count = 1 output
+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
 
-patches/0000-cover-letter.patch
-patches/0001-N2.patch
-ok 192 - format-patch --attach cover-letter only is non-multipart
+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 4014.193 'format-patch with format.attach': 
-	test_when_finished "rm -fr patches" &&
-	separator=attachment-separator &&
-	test_config format.attach "$separator" &&
-	filename=$(git format-patch -o patches -1) &&
-	grep "^Content-Type: multipart/.*$separator" "$filename"
+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
 
-Content-Type: multipart/mixed; boundary="------------attachment-separator"
-ok 193 - format-patch with format.attach
+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 4014.194 'format-patch with format.attach=disabled': 
-	test_when_finished "rm -fr patches" &&
-	separator=attachment-separator &&
-	test_config_global format.attach "$separator" &&
-	test_config format.attach "" &&
-	filename=$(git format-patch -o patches -1) &&
-	# The output should not even declare content type for text/plain.
-	! grep "^Content-Type: multipart/" "$filename"
+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
 
-ok 194 - format-patch with format.attach=disabled
+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 4014.195 '-c format.mboxrd format-patch': 
-	sp=" " &&
-	cat >msg <<-INPUT_END &&
-	mboxrd should escape the body
+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
 
-	From could trip up a loose mbox parser
-	>From extra escape for reversibility
-	>>From extra escape for reversibility 2
-	from lower case not escaped
-	Fromm bad speling not escaped
-	 From with leading space not escaped
+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
 
-	F
-	From
-	From$sp
-	From    $sp
-	From	$sp
-	INPUT_END
+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
 
-	cat >expect <<-INPUT_END &&
-	>From could trip up a loose mbox parser
-	>>From extra escape for reversibility
-	>>>From extra escape for reversibility 2
-	from lower case not escaped
-	Fromm bad speling not escaped
-	 From with leading space not escaped
+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
 
-	F
-	From
-	From
-	From
-	From
-	INPUT_END
+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
 
-	C=$(git commit-tree HEAD^^{tree} -p HEAD <msg) &&
-	git -c format.mboxrd format-patch --stdout -1 $C~1..$C >patch &&
-	git format-patch --pretty=mboxrd --stdout -1 $C~1..$C >compat &&
-	test_cmp patch compat &&
-	git grep -h --no-index -A11 \
-		"^>From could trip up a loose mbox parser" patch >actual &&
-	test_cmp expect actual
+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
 
-ok 195 - -c format.mboxrd format-patch
+expecting success of 4018.269 'hunk header: scheme-top-level-define': 
+		git diff -U1 scheme-top-level-define >actual &&
+		grep '@@ .* @@.*RIGHT' actual
+	
+@@ -3,2 +3,2 @@ (define (some-func x y z) RIGHT
+ok 269 - hunk header: scheme-top-level-define
 
-expecting success of 4014.196 'interdiff: setup': 
-	git checkout -b boop main &&
-	test_commit fnorp blorp &&
-	test_commit fleep blorp
+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
 
-Switched to a new branch 'boop'
-[boop afed659] fnorp
+# passed all 270 test(s)
+1..270
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4040-whitespace-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4040-whitespace-status/.git/
+expecting success of 4040.1 'setup': 
+	mkdir a b &&
+	echo >c &&
+	echo >a/d &&
+	echo >b/e &&
+	git add . &&
+	test_tick &&
+	git commit -m initial &&
+	echo " " >a/d &&
+	test_tick &&
+	git commit -a -m second &&
+	echo "  " >a/d &&
+	echo " " >b/e &&
+	git add a/d
+
+[master (root-commit) b80f2e3] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 blorp
-[boop 15bea9f] fleep
+ 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 196 - interdiff: setup
+ok 1 - setup
 
-expecting success of 4014.197 'interdiff: cover-letter': 
-	sed "y/q/ /" >expect <<-\EOF &&
-	+fleep
-	--q
-	EOF
-	git format-patch --cover-letter --interdiff=boop~2 -1 boop &&
-	test_grep "^Interdiff:$" 0000-cover-letter.patch &&
-	test_grep ! "^Interdiff:$" 0001-fleep.patch &&
-	sed "1,/^@@ /d; /^-- $/q" 0000-cover-letter.patch >actual &&
-	test_cmp expect actual
+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
 
-0000-cover-letter.patch
-0001-fleep.patch
-Interdiff:
-ok 197 - interdiff: cover-letter
+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 4014.198 'interdiff: reroll-count': 
-	git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop &&
-	test_grep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
+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
 
-v2-0000-cover-letter.patch
-v2-0001-fleep.patch
-Interdiff against v1:
-ok 198 - interdiff: reroll-count
+ok 3 - diff-tree -b --exit-code
 
-expecting success of 4014.199 'interdiff: reroll-count with a non-integer': 
-	git format-patch --cover-letter --interdiff=boop~2 -v2.2 -1 boop &&
-	test_grep "^Interdiff:$" v2.2-0000-cover-letter.patch
+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
 
-v2.2-0000-cover-letter.patch
-v2.2-0001-fleep.patch
-Interdiff:
-ok 199 - interdiff: reroll-count with a non-integer
+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 4014.200 'interdiff: reroll-count with a integer': 
-	git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop &&
-	test_grep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
+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
 
-v2-0000-cover-letter.patch
-v2-0001-fleep.patch
-Interdiff against v1:
-ok 200 - interdiff: reroll-count with a integer
+ok 5 - diff-index -b -p --cached --exit-code
 
-expecting success of 4014.201 'interdiff: solo-patch': 
-	cat >expect <<-\EOF &&
-	  +fleep
+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
 
-	EOF
-	git format-patch --interdiff=boop~2 -1 boop &&
-	test_grep "^Interdiff:$" 0001-fleep.patch &&
-	sed "1,/^  @@ /d; /^$/q" 0001-fleep.patch >actual &&
-	test_cmp expect actual
+diff --git a/a/d b/a/d
+index 8d1c8b6..1a4baf5 100644
+--- a/a/d
++++ b/a/d
+@@ -1 +1 @@
+- 
++  
+diff --git a/b/e b/b/e
+index 8b13789..8d1c8b6 100644
+--- a/b/e
++++ b/b/e
+@@ -1 +1 @@
+-
++ 
+:100644 100644 8d1c8b69c3fce7bea45c73efd06983e3c419a92f 1a4baf536d705b9c814847cb7a708a0e63d5b976 M	a/d
+:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
+ok 6 - diff-index --exit-code
 
-0001-fleep.patch
-Interdiff:
-ok 201 - interdiff: solo-patch
+expecting success of 4040.7 'diff-index -b -p --exit-code': 
+	git diff -b --exit-code HEAD &&
+	git diff-index -b -p --exit-code HEAD
 
-expecting success of 4014.202 'format-patch does not respect diff.noprefix': 
-	git -c diff.noprefix format-patch -1 --stdout >actual &&
-	grep "^--- a/blorp" actual
+ok 7 - diff-index -b -p --exit-code
 
---- a/blorp
-ok 202 - format-patch does not respect diff.noprefix
+expecting success of 4040.8 'diff-files --exit-code': 
+	test_must_fail git diff --exit-code &&
+	test_must_fail git diff-files --exit-code
 
-expecting success of 4014.203 'format-patch respects format.noprefix': 
-	git -c format.noprefix format-patch -1 --stdout >actual &&
-	grep "^--- blorp" actual
+diff --git a/b/e b/b/e
+index 8b13789..8d1c8b6 100644
+--- a/b/e
++++ b/b/e
+@@ -1 +1 @@
+-
++ 
+:100644 100644 8b137891791fe96927ad78e64b0aad7bded08bdc 0000000000000000000000000000000000000000 M	b/e
+ok 8 - diff-files --exit-code
 
---- blorp
-ok 203 - format-patch respects format.noprefix
+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 4014.204 'format-patch --default-prefix overrides format.noprefix': 
-	git -c format.noprefix \
-		format-patch -1 --default-prefix --stdout >actual &&
-	grep "^--- a/blorp" actual
+ok 9 - diff-files -b -p --exit-code
 
---- a/blorp
-ok 204 - format-patch --default-prefix overrides format.noprefix
+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
 
-# still have 5 known breakage(s)
-# passed all remaining 199 test(s)
-1..204
+HEAD is now at 13a0478 second
+ok 10 - diff-files --diff-filter --quiet
+
+expecting success of 4040.11 'diff-tree --diff-filter --quiet': 
+	git commit -a -m "worktree state" &&
+	test_must_fail git diff-tree --diff-filter=M --quiet HEAD^ HEAD
+
+[master c0a31dc] worktree state
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 a/d
+ok 11 - diff-tree --diff-filter --quiet
+
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4043-diff-rename-binary.sh ***
@@ -246783,6 +249280,163 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4042-diff-textconv-caching.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4042-diff-textconv-caching/.git/
+expecting success of 4042.1 'setup': 
+	echo foo content 1 >foo.bin &&
+	echo bar content 1 >bar.bin &&
+	git add . &&
+	git commit -m one &&
+	foo1=$(git rev-parse --short HEAD:foo.bin) &&
+	bar1=$(git rev-parse --short HEAD:bar.bin) &&
+	echo foo content 2 >foo.bin &&
+	echo bar content 2 >bar.bin &&
+	git commit -a -m two &&
+	foo2=$(git rev-parse --short HEAD:foo.bin) &&
+	bar2=$(git rev-parse --short HEAD:bar.bin) &&
+	echo "*.bin diff=magic" >.gitattributes &&
+	git config diff.magic.textconv ./helper &&
+	git config diff.magic.cachetextconv true
+
+[master (root-commit) e62c20e] one
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+)
+ create mode 100644 bar.bin
+ create mode 100644 foo.bin
+ create mode 100755 helper
+[master ea2ff12] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ok 1 - setup
+
+expecting success of 4042.2 'first textconv works': 
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 2 - first textconv works
+
+expecting success of 4042.3 'cached textconv produces same output': 
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 3 - cached textconv produces same output
+
+expecting success of 4042.4 'cached textconv does not run helper': 
+	rm -f helper.out &&
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual &&
+	! test -r helper.out
+
+ok 4 - cached textconv does not run helper
+
+expecting success of 4042.5 'changing textconv invalidates cache': 
+	echo other >other &&
+	git config diff.magic.textconv "./helper other" &&
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 5 - changing textconv invalidates cache
+
+expecting success of 4042.6 'switching diff driver produces correct results': 
+	git config diff.moremagic.textconv ./helper &&
+	echo foo.bin diff=moremagic >>.gitattributes &&
+	git diff HEAD^ HEAD >actual &&
+	test_cmp expect actual
+
+ok 6 - switching diff driver produces correct results
+
+expecting success of 4042.7 'log notes cache and still use cache for -p': 
+	git log --no-walk -p refs/notes/textconv/magic HEAD
+
+commit 9c639377525bb0485f64e3a844123312ec98541e
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    ./helper other
+
+diff --git a/1345db2c9189a61ef9932f66b656afc986bee58f b/1345db2c9189a61ef9932f66b656afc986bee58f
+new file mode 100644
+index 0000000..01b25c5
+--- /dev/null
++++ b/1345db2c9189a61ef9932f66b656afc986bee58f
+@@ -0,0 +1,2 @@
++converted: other
++converted: foo content 2
+diff --git a/28283d51eeb71548ff81d02404b90103b494b983 b/28283d51eeb71548ff81d02404b90103b494b983
+new file mode 100644
+index 0000000..dcd63a4
+--- /dev/null
++++ b/28283d51eeb71548ff81d02404b90103b494b983
+@@ -0,0 +1,2 @@
++converted: other
++converted: bar content 2
+diff --git a/d5b9fe314e6004caf906e730045d20689167b3fb b/d5b9fe314e6004caf906e730045d20689167b3fb
+new file mode 100644
+index 0000000..7ef0353
+--- /dev/null
++++ b/d5b9fe314e6004caf906e730045d20689167b3fb
+@@ -0,0 +1,2 @@
++converted: other
++converted: foo content 1
+diff --git a/fcf91668044fda4a569b9374589b26dada7adc49 b/fcf91668044fda4a569b9374589b26dada7adc49
+new file mode 100644
+index 0000000..5ead606
+--- /dev/null
++++ b/fcf91668044fda4a569b9374589b26dada7adc49
+@@ -0,0 +1,2 @@
++converted: other
++converted: bar content 1
+
+commit ea2ff12718498fa427bb0f1e263e2ba2e26a440d
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    two
+
+diff --git a/bar.bin b/bar.bin
+index fcf9166..28283d5 100644
+--- a/bar.bin
++++ b/bar.bin
+@@ -1,2 +1,2 @@
+ converted: other
+-converted: bar content 1
++converted: bar content 2
+diff --git a/foo.bin b/foo.bin
+index d5b9fe3..1345db2 100644
+--- a/foo.bin
++++ b/foo.bin
+@@ -1 +1 @@
+-converted: foo content 1
++converted: foo content 2
+ok 7 - log notes cache and still use cache for -p
+
+expecting success of 4042.8 'caching is silently ignored outside repo': 
+	mkdir -p non-repo &&
+	echo one >non-repo/one &&
+	echo two >non-repo/two &&
+	echo "* diff=test" >attr &&
+	test_expect_code 1 \
+	nongit git -c core.attributesFile="$PWD/attr" \
+		   -c diff.test.textconv="tr a-z A-Z <" \
+		   -c diff.test.cachetextconv=true \
+		   diff --no-index one two >actual &&
+	cat >expect <<-\EOF &&
+	diff --git a/one b/two
+	index 5626abf..f719efd 100644
+	--- a/one
+	+++ b/two
+	@@ -1 +1 @@
+	-ONE
+	+TWO
+	EOF
+	test_cmp expect actual
+
+ok 8 - caching is silently ignored outside repo
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4034-diff-words.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4034-diff-words/.git/
 expecting success of 4034.1 'setup': 
@@ -248190,158 +250844,6 @@
 1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4048-diff-combined-binary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4049-diff-stat-count.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4049-diff-stat-count/.git/
 expecting success of 4049.1 'setup': 
@@ -248424,104 +250926,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4050-diff-histogram.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4050-diff-histogram/.git/
-expecting success of 4050.1 'setup attributes files for tests with histogram': 
-		git checkout -b master &&
-		echo "file* diff=driver" >.gitattributes &&
-		git add file1 file2 .gitattributes &&
-		git commit -m "adding files" &&
-		git checkout -b branchA &&
-		echo "file* diff=driverA" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -m "adding driverA as diff driver" &&
-		git checkout master &&
-		git clone --bare --no-local . bare.git
-	
-Switched to a new branch 'master'
-[master (root-commit) 946e965] adding files
- Author: A U Thor <author@example.com>
- 3 files changed, 52 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'branchA'
-[branchA 7cbc84d] adding driverA as diff driver
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'master'
-Cloning into bare repository 'bare.git'...
-ok 1 - setup attributes files for tests with histogram
-
-expecting success of 4050.2 'histogram diff from attributes': 
-		test_must_fail git -c diff.driver.algorithm=$STRATEGY diff --no-index file1 file2 > output &&
-		test_cmp expect output
-	
-ok 2 - histogram diff from attributes
-
-expecting success of 4050.3 'diff from attributes with bare repo with source': 
-		git -C bare.git --attr-source=branchA -c diff.driver.algorithm=myers \
-			-c diff.driverA.algorithm=$STRATEGY \
-			diff HEAD:file1 HEAD:file2 >output &&
-		test_cmp expect output
-	
-ok 3 - diff from attributes with bare repo with source
-
-expecting success of 4050.4 'diff from attributes with bare repo with invalid source': 
-		test_must_fail git -C bare.git --attr-source=invalid-branch diff \
-			HEAD:file1 HEAD:file2
-	
-fatal: bad --attr-source or GIT_ATTR_SOURCE
-ok 4 - diff from attributes with bare repo with invalid source
-
-expecting success of 4050.5 'histogram diff from attributes has valid diffstat': 
-		echo "file* diff=driver" >.gitattributes &&
-		git config diff.driver.algorithm "$STRATEGY" &&
-		test_must_fail git diff --stat --no-index file1 file2 > output &&
-		test_cmp expect_diffstat output
-	
-ok 5 - histogram diff from attributes has valid diffstat
-
-expecting success of 4050.6 'histogram diff': 
-		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
-		test_cmp expect output
-	
-ok 6 - histogram diff
-
-expecting success of 4050.7 'histogram diff command line precedence before attributes': 
-		echo "file* diff=driver" >.gitattributes &&
-		git config diff.driver.algorithm myers &&
-		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
-		test_cmp expect output
-	
-ok 7 - histogram diff command line precedence before attributes
-
-expecting success of 4050.8 'histogram diff attributes precedence before config': 
-		git config diff.algorithm default &&
-		echo "file* diff=driver" >.gitattributes &&
-		git config diff.driver.algorithm "$STRATEGY" &&
-		test_must_fail git diff --no-index file1 file2 > output &&
-		test_cmp expect output
-	
-ok 8 - histogram diff attributes precedence before config
-
-expecting success of 4050.9 'histogram diff output is valid': 
-		mv file2 expect &&
-		git apply < output &&
-		test_cmp expect file2
-	
-ok 9 - histogram diff output is valid
-
-expecting success of 4050.10 'completely different files': 
-		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
-		test_cmp expect output
-	
-ok 10 - completely different files
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4038-diff-combined.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4038-diff-combined/.git/
 expecting success of 4038.1 'setup': 
@@ -248994,8 +251398,8 @@
 [detached HEAD 22de592] empty3
  Author: A U Thor <author@example.com>
  1 file changed, 5 insertions(+)
---- .tmp-1	2025-12-18 01:35:35.862773267 +0000
-+++ .tmp-2	2025-12-18 01:35:35.862773267 +0000
+--- .tmp-1	2024-11-14 19:33:52.624346790 +0000
++++ .tmp-2	2024-11-14 19:33:52.632346872 +0000
 @@ -1,8 +1,9 @@
  -- 3
  ---1
@@ -249889,8 +252293,8 @@
 Auto-merging subdir/file0
 CONFLICT (content): Merge conflict in subdir/file0
 Automatic merge failed; fix conflicts and then commit the result.
---- expected	2025-12-18 01:35:37.098773267 +0000
-+++ out	2025-12-18 01:35:37.102773267 +0000
+--- expected	2024-11-14 19:33:56.372384959 +0000
++++ out	2024-11-14 19:33:56.388385122 +0000
 @@ -1,7 +1,7 @@
 -diff --cc file0
 +diff --cc subdir/file0
@@ -249909,6695 +252313,2614 @@
 1..39
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4047-diff-dirstat.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4047-diff-dirstat/.git/
-expecting success of 4047.1 'setup': 
-	mkdir unchanged &&
-	mkdir changed &&
-	mkdir rearranged &&
-	mkdir src &&
-	mkdir src/copy &&
-	mkdir src/copy/unchanged &&
-	mkdir src/copy/changed &&
-	mkdir src/copy/rearranged &&
-	mkdir src/move &&
-	mkdir src/move/unchanged &&
-	mkdir src/move/changed &&
-	mkdir src/move/rearranged &&
-	cat <<EOF >unchanged/text &&
-unchanged       line #0
-unchanged       line #1
-unchanged       line #2
-unchanged       line #3
-unchanged       line #4
-unchanged       line #5
-unchanged       line #6
-unchanged       line #7
-unchanged       line #8
-unchanged       line #9
-EOF
-	cat <<EOF >changed/text &&
-changed         line #0
-changed         line #1
-changed         line #2
-changed         line #3
-changed         line #4
-changed         line #5
-changed         line #6
-changed         line #7
-changed         line #8
-changed         line #9
-EOF
-	cat <<EOF >rearranged/text &&
-rearranged      line #0
-rearranged      line #1
-rearranged      line #2
-rearranged      line #3
-rearranged      line #4
-rearranged      line #5
-rearranged      line #6
-rearranged      line #7
-rearranged      line #8
-rearranged      line #9
-EOF
-	cat <<EOF >src/copy/unchanged/text &&
-copy  unchanged line #0
-copy  unchanged line #1
-copy  unchanged line #2
-copy  unchanged line #3
-copy  unchanged line #4
-copy  unchanged line #5
-copy  unchanged line #6
-copy  unchanged line #7
-copy  unchanged line #8
-copy  unchanged line #9
-EOF
-	cat <<EOF >src/copy/changed/text &&
-copy    changed line #0
-copy    changed line #1
-copy    changed line #2
-copy    changed line #3
-copy    changed line #4
-copy    changed line #5
-copy    changed line #6
-copy    changed line #7
-copy    changed line #8
-copy    changed line #9
-EOF
-	cat <<EOF >src/copy/rearranged/text &&
-copy rearranged line #0
-copy rearranged line #1
-copy rearranged line #2
-copy rearranged line #3
-copy rearranged line #4
-copy rearranged line #5
-copy rearranged line #6
-copy rearranged line #7
-copy rearranged line #8
-copy rearranged line #9
-EOF
-	cat <<EOF >src/move/unchanged/text &&
-move  unchanged line #0
-move  unchanged line #1
-move  unchanged line #2
-move  unchanged line #3
-move  unchanged line #4
-move  unchanged line #5
-move  unchanged line #6
-move  unchanged line #7
-move  unchanged line #8
-move  unchanged line #9
-EOF
-	cat <<EOF >src/move/changed/text &&
-move    changed line #0
-move    changed line #1
-move    changed line #2
-move    changed line #3
-move    changed line #4
-move    changed line #5
-move    changed line #6
-move    changed line #7
-move    changed line #8
-move    changed line #9
-EOF
-	cat <<EOF >src/move/rearranged/text &&
-move rearranged line #0
-move rearranged line #1
-move rearranged line #2
-move rearranged line #3
-move rearranged line #4
-move rearranged line #5
-move rearranged line #6
-move rearranged line #7
-move rearranged line #8
-move rearranged line #9
-EOF
-	git add . &&
-	git commit -m "initial" &&
-	mkdir dst &&
-	mkdir dst/copy &&
-	mkdir dst/copy/unchanged &&
-	mkdir dst/copy/changed &&
-	mkdir dst/copy/rearranged &&
-	mkdir dst/move &&
-	mkdir dst/move/unchanged &&
-	mkdir dst/move/changed &&
-	mkdir dst/move/rearranged &&
-	cat <<EOF >changed/text &&
-CHANGED XXXXXXX line #0
-changed         line #1
-changed         line #2
-changed         line #3
-changed         line #4
-changed         line #5
-changed         line #6
-changed         line #7
-changed         line #8
-changed         line #9
-EOF
-	cat <<EOF >rearranged/text &&
-rearranged      line #1
-rearranged      line #0
-rearranged      line #2
-rearranged      line #3
-rearranged      line #4
-rearranged      line #5
-rearranged      line #6
-rearranged      line #7
-rearranged      line #8
-rearranged      line #9
-EOF
-	cat <<EOF >dst/copy/unchanged/text &&
-copy  unchanged line #0
-copy  unchanged line #1
-copy  unchanged line #2
-copy  unchanged line #3
-copy  unchanged line #4
-copy  unchanged line #5
-copy  unchanged line #6
-copy  unchanged line #7
-copy  unchanged line #8
-copy  unchanged line #9
-EOF
-	cat <<EOF >dst/copy/changed/text &&
-copy XXXCHANGED line #0
-copy    changed line #1
-copy    changed line #2
-copy    changed line #3
-copy    changed line #4
-copy    changed line #5
-copy    changed line #6
-copy    changed line #7
-copy    changed line #8
-copy    changed line #9
-EOF
-	cat <<EOF >dst/copy/rearranged/text &&
-copy rearranged line #1
-copy rearranged line #0
-copy rearranged line #2
-copy rearranged line #3
-copy rearranged line #4
-copy rearranged line #5
-copy rearranged line #6
-copy rearranged line #7
-copy rearranged line #8
-copy rearranged line #9
-EOF
-	cat <<EOF >dst/move/unchanged/text &&
-move  unchanged line #0
-move  unchanged line #1
-move  unchanged line #2
-move  unchanged line #3
-move  unchanged line #4
-move  unchanged line #5
-move  unchanged line #6
-move  unchanged line #7
-move  unchanged line #8
-move  unchanged line #9
-EOF
-	cat <<EOF >dst/move/changed/text &&
-move XXXCHANGED line #0
-move    changed line #1
-move    changed line #2
-move    changed line #3
-move    changed line #4
-move    changed line #5
-move    changed line #6
-move    changed line #7
-move    changed line #8
-move    changed line #9
-EOF
-	cat <<EOF >dst/move/rearranged/text &&
-move rearranged line #1
-move rearranged line #0
-move rearranged line #2
-move rearranged line #3
-move rearranged line #4
-move rearranged line #5
-move rearranged line #6
-move rearranged line #7
-move rearranged line #8
-move rearranged line #9
-EOF
-	git add . &&
-	git rm -r src/move/unchanged &&
-	git rm -r src/move/changed &&
-	git rm -r src/move/rearranged &&
-	git commit -m "changes" &&
-	git config diff.renames false
+*** t4048-diff-combined-binary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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) b34d487] initial
+[main (root-commit) 4aaee60] one
  Author: A U Thor <author@example.com>
- 9 files changed, 90 insertions(+)
- create mode 100644 changed/text
- create mode 100644 rearranged/text
- create mode 100644 src/copy/changed/text
- create mode 100644 src/copy/rearranged/text
- create mode 100644 src/copy/unchanged/text
- create mode 100644 src/move/changed/text
- create mode 100644 src/move/rearranged/text
- create mode 100644 src/move/unchanged/text
- create mode 100644 unchanged/text
-rm 'src/move/unchanged/text'
-rm 'src/move/changed/text'
-rm 'src/move/rearranged/text'
-[master 3da6c5d] changes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binary
+[main 37524dd] two
  Author: A U Thor <author@example.com>
- 8 files changed, 34 insertions(+), 4 deletions(-)
- create mode 100644 dst/copy/changed/text
- create mode 100644 dst/copy/rearranged/text
- create mode 100644 dst/copy/unchanged/text
- rename {src => dst}/move/changed/text (90%)
- rename {src => dst}/move/rearranged/text (100%)
- rename {src => dst}/move/unchanged/text (100%)
-ok 1 - setup
-
-expecting success of 4047.2 'sanity check setup (--numstat)': 
-	git diff --numstat HEAD^..HEAD >actual_diff_stat &&
-	test_cmp expect_diff_stat actual_diff_stat &&
-	git diff --numstat -M HEAD^..HEAD >actual_diff_stat_M &&
-	test_cmp expect_diff_stat_M actual_diff_stat_M &&
-	git diff --numstat -C -C HEAD^..HEAD >actual_diff_stat_CC &&
-	test_cmp expect_diff_stat_CC actual_diff_stat_CC
-
-ok 2 - sanity check setup (--numstat)
-
-expecting success of 4047.3 'various ways to misspell --dirstat': 
-	test_must_fail git show --dirstat10 &&
-	test_must_fail git show --dirstat10,files &&
-	test_must_fail git show -X=20 &&
-	test_must_fail git show -X=20,cumulative
-
-fatal: unrecognized argument: --dirstat10
-fatal: unrecognized argument: --dirstat10,files
-fatal: Failed to parse --dirstat/-X option parameter:
-  Unknown dirstat parameter '=20'
-
-fatal: Failed to parse --dirstat/-X option parameter:
-  Unknown dirstat parameter '=20'
-
-ok 3 - various ways to misspell --dirstat
-
-expecting success of 4047.4 'vanilla --dirstat': 
-	git diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 4 - vanilla --dirstat
-
-expecting success of 4047.5 'vanilla -X': 
-	git diff -X HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff -X -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff -X -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 5 - vanilla -X
-
-expecting success of 4047.6 'explicit defaults: --dirstat=changes,noncumulative,3': 
-	git diff --dirstat=changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 6 - explicit defaults: --dirstat=changes,noncumulative,3
-
-expecting success of 4047.7 'explicit defaults: -Xchanges,noncumulative,3': 
-	git diff -Xchanges,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff -Xchanges,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff -Xchanges,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 7 - explicit defaults: -Xchanges,noncumulative,3
-
-expecting success of 4047.8 'later options override earlier options:': 
-	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
-	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 8 - later options override earlier options:
-
-expecting success of 4047.9 'non-defaults in config overridden by explicit defaults on command line': 
-	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 9 - non-defaults in config overridden by explicit defaults on command line
-
-expecting success of 4047.10 '--dirstat=0': 
-	git diff --dirstat=0 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 10 - --dirstat=0
-
-expecting success of 4047.11 '-X0': 
-	git diff -X0 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff -X0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff -X0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 11 - -X0
-
-expecting success of 4047.12 'diff.dirstat=0': 
-	git -c diff.dirstat=0 diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=0 diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=0 diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 12 - diff.dirstat=0
-
-expecting success of 4047.13 '--dirstat=0 --cumulative': 
-	git diff --dirstat=0 --cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=0 --cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=0 --cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 13 - --dirstat=0 --cumulative
-
-expecting success of 4047.14 '--dirstat=0,cumulative': 
-	git diff --dirstat=0,cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=0,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=0,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 14 - --dirstat=0,cumulative
-
-expecting success of 4047.15 '-X0,cumulative': 
-	git diff -X0,cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff -X0,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff -X0,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 15 - -X0,cumulative
-
-expecting success of 4047.16 'diff.dirstat=0,cumulative': 
-	git -c diff.dirstat=0,cumulative diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=0,cumulative diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=0,cumulative diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 16 - diff.dirstat=0,cumulative
-
-expecting success of 4047.17 'diff.dirstat=0 & --dirstat=cumulative': 
-	git -c diff.dirstat=0 diff --dirstat=cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=0 diff --dirstat=cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=0 diff --dirstat=cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 17 - diff.dirstat=0 & --dirstat=cumulative
-
-expecting success of 4047.18 '--dirstat-by-file': 
-	git diff --dirstat-by-file HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat-by-file -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat-by-file -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 18 - --dirstat-by-file
-
-expecting success of 4047.19 '--dirstat=files': 
-	git diff --dirstat=files HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 19 - --dirstat=files
-
-expecting success of 4047.20 'diff.dirstat=files': 
-	git -c diff.dirstat=files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 20 - diff.dirstat=files
-
-expecting success of 4047.21 '--dirstat-by-file=10': 
-	git diff --dirstat-by-file=10 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat-by-file=10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat-by-file=10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 21 - --dirstat-by-file=10
-
-expecting success of 4047.22 '--dirstat=files,10': 
-	git diff --dirstat=files,10 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 22 - --dirstat=files,10
-
-expecting success of 4047.23 'diff.dirstat=10,files': 
-	git -c diff.dirstat=10,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=10,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=10,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 23 - diff.dirstat=10,files
-
-expecting success of 4047.24 '--dirstat-by-file --cumulative': 
-	git diff --dirstat-by-file --cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat-by-file --cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat-by-file --cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 24 - --dirstat-by-file --cumulative
-
-expecting success of 4047.25 '--dirstat=files,cumulative': 
-	git diff --dirstat=files,cumulative HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 25 - --dirstat=files,cumulative
-
-expecting success of 4047.26 'diff.dirstat=cumulative,files': 
-	git -c diff.dirstat=cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 26 - diff.dirstat=cumulative,files
-
-expecting success of 4047.27 '--dirstat=files,cumulative,10': 
-	git diff --dirstat=files,cumulative,10 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative,10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative,10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 27 - --dirstat=files,cumulative,10
-
-expecting success of 4047.28 'diff.dirstat=10,cumulative,files': 
-	git -c diff.dirstat=10,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=10,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=10,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 28 - diff.dirstat=10,cumulative,files
-
-expecting success of 4047.29 '--dirstat=files,cumulative,16.7': 
-	git diff --dirstat=files,cumulative,16.7 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative,16.7 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative,16.7 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 29 - --dirstat=files,cumulative,16.7
-
-expecting success of 4047.30 'diff.dirstat=16.7,cumulative,files': 
-	git -c diff.dirstat=16.7,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=16.7,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=16.7,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 30 - diff.dirstat=16.7,cumulative,files
-
-expecting success of 4047.31 'diff.dirstat=16.70,cumulative,files': 
-	git -c diff.dirstat=16.70,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=16.70,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=16.70,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 31 - diff.dirstat=16.70,cumulative,files
-
-expecting success of 4047.32 '--dirstat=files,cumulative,27.2': 
-	git diff --dirstat=files,cumulative,27.2 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative,27.2 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative,27.2 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 32 - --dirstat=files,cumulative,27.2
-
-expecting success of 4047.33 '--dirstat=files,cumulative,27.09': 
-	git diff --dirstat=files,cumulative,27.09 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=files,cumulative,27.09 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=files,cumulative,27.09 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 33 - --dirstat=files,cumulative,27.09
-
-expecting success of 4047.34 '--dirstat=lines': 
-	git diff --dirstat=lines HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=lines -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=lines -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 34 - --dirstat=lines
-
-expecting success of 4047.35 'diff.dirstat=lines': 
-	git -c diff.dirstat=lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 35 - diff.dirstat=lines
-
-expecting success of 4047.36 '--dirstat=lines,0': 
-	git diff --dirstat=lines,0 HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git diff --dirstat=lines,0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git diff --dirstat=lines,0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 36 - --dirstat=lines,0
-
-expecting success of 4047.37 'diff.dirstat=0,lines': 
-	git -c diff.dirstat=0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	git -c diff.dirstat=0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	git -c diff.dirstat=0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
-
-ok 37 - diff.dirstat=0,lines
-
-expecting success of 4047.38 '--dirstat=future_param,lines,0 should fail loudly': 
-	test_must_fail git diff --dirstat=future_param,lines,0 HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_must_be_empty actual_diff_dirstat &&
-	test_grep -q "future_param" actual_error &&
-	test_grep -q "\--dirstat" actual_error
-
-ok 38 - --dirstat=future_param,lines,0 should fail loudly
-
-expecting success of 4047.39 '--dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters': 
-	test_must_fail git diff --dirstat=dummy1,cumulative,2dummy HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_must_be_empty actual_diff_dirstat &&
-	test_grep -q "dummy1" actual_error &&
-	test_grep -q "2dummy" actual_error &&
-	test_grep -q "\--dirstat" actual_error
-
-ok 39 - --dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters
-
-expecting success of 4047.40 'diff.dirstat=future_param,0,lines should warn, but still work': 
-	git -c diff.dirstat=future_param,0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_cmp expect_diff_dirstat actual_diff_dirstat &&
-	test_grep -q "future_param" actual_error &&
-	test_grep -q "diff\\.dirstat" actual_error &&
-
-	git -c diff.dirstat=future_param,0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
-	test_grep -q "future_param" actual_error &&
-	test_grep -q "diff\\.dirstat" actual_error &&
-
-	git -c diff.dirstat=future_param,0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC 2>actual_error &&
-	test_debug "cat actual_error" &&
-	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
-	test_grep -q "future_param" actual_error &&
-	test_grep -q "diff\\.dirstat" actual_error
-
-ok 40 - diff.dirstat=future_param,0,lines should warn, but still work
-
-expecting success of 4047.41 '--shortstat --dirstat should output only one dirstat': 
-	git diff --shortstat --dirstat=changes HEAD^..HEAD >out &&
-	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_changes &&
-	test_line_count = 1 actual_diff_shortstat_dirstat_changes &&
-
-	git diff --shortstat --dirstat=lines HEAD^..HEAD >out &&
-	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_lines &&
-	test_line_count = 1 actual_diff_shortstat_dirstat_lines &&
-
-	git diff --shortstat --dirstat=files HEAD^..HEAD >out &&
-	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_files &&
-	test_line_count = 1 actual_diff_shortstat_dirstat_files
-
-ok 41 - --shortstat --dirstat should output only one dirstat
-
-# passed all 41 test(s)
-1..41
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4054-diff-bogus-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4054-diff-bogus-tree/.git/
-expecting success of 4054.1 'create bogus tree': 
-	name=$(echo $ZERO_OID | sed -e "s/00/Q/g") &&
-	bogus_tree=$(
-		printf "100644 fooQ$name" |
-		q_to_nul |
-		git hash-object --literally -w --stdin -t tree
-	)
-
-ok 1 - create bogus tree
-
-expecting success of 4054.2 'create tree with matching file': 
-	echo bar >foo &&
-	git add foo &&
-	good_tree=$(git write-tree) &&
-	blob=$(git rev-parse :foo)
-
-ok 2 - create tree with matching file
-
-expecting success of 4054.3 'raw diff shows null sha1 (addition)': 
-	echo ":000000 100644 $ZERO_OID $ZERO_OID A	foo" >expect &&
-	git diff-tree $EMPTY_TREE $bogus_tree >actual &&
-	test_cmp expect actual
-
-ok 3 - raw diff shows null sha1 (addition)
-
-expecting success of 4054.4 'raw diff shows null sha1 (removal)': 
-	echo ":100644 000000 $ZERO_OID $ZERO_OID D	foo" >expect &&
-	git diff-tree $bogus_tree $EMPTY_TREE >actual &&
-	test_cmp expect actual
-
-ok 4 - raw diff shows null sha1 (removal)
-
-expecting success of 4054.5 'raw diff shows null sha1 (modification)': 
-	echo ":100644 100644 $blob $ZERO_OID M	foo" >expect &&
-	git diff-tree $good_tree $bogus_tree >actual &&
-	test_cmp expect actual
-
-ok 5 - raw diff shows null sha1 (modification)
+ 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 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 &&
+expecting success of 4048.2 'diff -m indicates binary-ness': 
+	git show --format=%s -m >actual &&
 	test_cmp expect actual
 
-ok 6 - raw diff shows null sha1 (other direction)
+ok 2 - diff -m indicates binary-ness
 
-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 &&
+expecting success of 4048.3 'diff -c indicates binary-ness': 
+	git show --format=%s -c >actual &&
 	test_cmp expect actual
 
-ok 7 - raw diff shows null sha1 (reverse)
+ok 3 - diff -c indicates binary-ness
 
-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 &&
+expecting success of 4048.4 'diff --cc indicates binary-ness': 
+	git show --format=%s --cc >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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4051-diff-function-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 -
+ok 4 - diff --cc indicates binary-ness
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 9f6e181 initial
-[detached HEAD cf16009] hello_dummy
+Switched to branch 'main'
+[main faa5b8e] one
  Author: A U Thor <author@example.com>
- 1 file changed, 41 deletions(-)
-[detached HEAD d307f65] changed_hello_dummy
+ 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(-)
-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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4055-diff-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4055-diff-context/.git/
-expecting success of 4055.1 'setup': 
-	cat >template <<-\EOF &&
-	firstline
-	b
-	c
-	d
-	e
-	f
-	preline
-	TARGET
-	postline
-	i
-	j
-	k
-	l
-	m
-	n
-	EOF
-	sed "/TARGET/d" >x <template &&
-	git update-index --add x &&
-	git commit -m initial &&
-
-	sed "s/TARGET/ADDED/" >x <template &&
-	git update-index --add x &&
-	git commit -m next &&
-
-	sed "s/TARGET/MODIFIED/" >x <template
-
-[master (root-commit) aee64db] initial
+Switched to a new branch 'branch-text'
+[branch-text 9b74371] three
  Author: A U Thor <author@example.com>
- 1 file changed, 14 insertions(+)
- create mode 100644 x
-[master 4ef1dc5] next
+ 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>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 4055.2 'the default number of context lines is 3': 
-	git diff >output &&
-	! grep "^ d" output &&
-	grep "^ e" output &&
-	grep "^ j" output &&
-	! grep "^ k" output
-
- e
- j
-ok 2 - the default number of context lines is 3
-
-expecting success of 4055.3 'diff.context honored by "log"': 
-	git log -1 -p >output &&
-	! grep firstline output &&
-	git config diff.context 8 &&
-	git log -1 -p >output &&
-	grep "^ firstline" output
-
- firstline
-ok 3 - diff.context honored by "log"
-
-expecting success of 4055.4 'The -U option overrides diff.context': 
-	git config diff.context 8 &&
-	git log -U4 -1 >output &&
-	! grep "^ firstline" output
-
-ok 4 - The -U option overrides diff.context
-
-expecting success of 4055.5 'diff.context honored by "diff"': 
-	git config diff.context 8 &&
-	git diff >output &&
-	grep "^ firstline" output
-
- firstline
-ok 5 - diff.context honored by "diff"
-
-expecting success of 4055.6 'plumbing not affected': 
-	git config diff.context 8 &&
-	git diff-files -p >output &&
-	! grep "^ firstline" output
-
-ok 6 - plumbing not affected
-
-expecting success of 4055.7 'non-integer config parsing': 
-	git config diff.context no &&
-	test_must_fail git diff 2>output &&
-	test_grep "bad numeric config value" output
-
-fatal: bad numeric config value 'no' for 'diff.context' in file .git/config: invalid unit
-ok 7 - non-integer config parsing
-
-expecting success of 4055.8 'negative integer config parsing': 
-	git config diff.context -1 &&
-	test_must_fail git diff 2>output &&
-	test_grep "bad config variable" output
-
-fatal: bad config variable 'diff.context' in file '.git/config' at line 7
-ok 8 - negative integer config parsing
-
-expecting success of 4055.9 '-U0 is valid, so is diff.context=0': 
-	git config diff.context 0 &&
-	git diff >output &&
-	grep "^-ADDED" output &&
-	grep "^+MODIFIED" output
-
--ADDED
-+MODIFIED
-ok 9 - -U0 is valid, so is diff.context=0
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4053-diff-no-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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)
+ok 5 - setup non-binary with binary attribute
 
-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 &&
+expecting success of 4048.6 'diff -m respects binary attribute': 
+	git show --format=%s -m >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
+ok 6 - diff -m respects binary attribute
 
-	test_expect_code 1 git diff --no-index old new-link >actual &&
+expecting success of 4048.7 'diff -c respects binary attribute': 
+	git show --format=%s -c >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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4058-diff-duplicates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4058-diff-duplicates/.git/
-expecting success of 4058.1 'create trees with duplicate entries': 
-	blob_one=$(echo one | git hash-object -w --stdin) &&
-	blob_two=$(echo two | git hash-object -w --stdin) &&
-	inner_one_a=$(make_tree \
-		100644 inner $blob_one
-	) &&
-	inner_one_b=$(make_tree \
-		100644 inner $blob_two \
-		100644 inner $blob_two \
-		100644 inner $blob_two
-	) &&
-	outer_one=$(make_tree \
-		040000 outer $inner_one_a \
-		040000 outer $inner_one_b
-	) &&
-	inner_two=$(make_tree \
-		100644 inner $blob_one \
-		100644 inner $blob_two \
-		100644 inner $blob_two \
-		100644 inner $blob_two
-	) &&
-	outer_two=$(make_tree \
-		040000 outer $inner_two
-	) &&
-	git tag one $outer_one &&
-	git tag two $outer_two
-
-ok 1 - create trees with duplicate entries
-
-expecting success of 4058.2 'create tree without duplicate entries': 
-	blob_one=$(echo one | git hash-object -w --stdin) &&
-	outer_three=$(make_tree \
-		100644 renamed $blob_one
-	) &&
-	git tag three $outer_three
-
-ok 2 - create tree without duplicate entries
+ok 7 - diff -c respects binary attribute
 
-expecting success of 4058.3 'diff-tree between duplicate trees': 
-	# See NOTICE at top of file
-	{
-		printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
-		printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
-		printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
-		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
-		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
-		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n"
-	} >expect &&
-	git diff-tree -r --no-abbrev one two >actual &&
+expecting success of 4048.8 'diff --cc respects binary attribute': 
+	git show --format=%s --cc >actual &&
 	test_cmp expect actual
 
-ok 3 - diff-tree between duplicate trees
-
-expecting success of 4058.4 'diff-tree with renames': 
-	# See NOTICE at top of file.
-	git diff-tree -M -r --no-abbrev one two >actual &&
-	test_must_be_empty actual
-
-ok 4 - diff-tree with renames
+ok 8 - diff --cc respects binary attribute
 
-expecting success of 4058.5 'diff-tree FROM duplicate tree': 
-	# See NOTICE at top of file.
-	{
-		printf ":100644 000000 $blob_one $ZERO_OID D\touter/inner\n" &&
-		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
-		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
-		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
-		printf ":000000 100644 $ZERO_OID $blob_one A\trenamed\n"
-	} >expect &&
-	git diff-tree -r --no-abbrev one three >actual &&
-	test_cmp expect actual
+expecting success of 4048.9 'setup textconv attribute': 
+	echo "text diff=upcase" >.gitattributes &&
+	git config diff.upcase.textconv "tr a-z A-Z <"
 
-ok 5 - diff-tree FROM duplicate tree
+ok 9 - setup textconv attribute
 
-expecting success of 4058.6 'diff-tree FROM duplicate tree, with renames': 
-	# See NOTICE at top of file.
-	{
-		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
-		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
-		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
-		printf ":100644 100644 $blob_one $blob_one R100\touter/inner\trenamed\n"
-	} >expect &&
-	git diff-tree -M -r --no-abbrev one three >actual &&
+expecting success of 4048.10 'diff -m respects textconv attribute': 
+	git show --format=%s -m >actual &&
 	test_cmp expect actual
 
-ok 6 - diff-tree FROM duplicate tree, with renames
-
-expecting success of 4058.7 'create a few commits': 
-	git commit-tree -m "Duplicate Entries" two^{tree} >commit_id &&
-	git branch base $(cat commit_id) &&
-
-	git commit-tree -p $(cat commit_id) -m "Just one" three^{tree} >up &&
-	git branch update $(cat up) &&
-
-	git commit-tree -p $(cat up) -m "Back to weird" two^{tree} >final &&
-	git branch final $(cat final) &&
-
-	rm commit_id up final
-
-ok 7 - create a few commits
-
-checking known breakage of 4058.8 'git read-tree does not segfault': 
-	test_when_finished rm .git/index.lock &&
-	test_might_fail git read-tree --reset base
-
-Segmentation fault
-test_must_fail: died by signal 11: git read-tree --reset base
-not ok 8 - git read-tree does not segfault # TODO known breakage
-
-checking known breakage of 4058.9 'reset --hard does not segfault': 
-	test_when_finished rm .git/index.lock &&
-	git checkout base &&
-	test_might_fail git reset --hard
-
-Switched to branch 'base'
-M	outer/inner
-D	outer/inner
-D	outer/inner
-D	outer/inner
-Segmentation fault
-test_must_fail: died by signal 11: git reset --hard
-not ok 9 - reset --hard does not segfault # TODO known breakage
-
-checking known breakage of 4058.10 'git diff HEAD does not segfault': 
-	git checkout base &&
-	GIT_TEST_CHECK_CACHE_TREE=false &&
-	git reset --hard &&
-	test_might_fail git diff HEAD
-
-Already on 'base'
-M	outer/inner
-D	outer/inner
-D	outer/inner
-D	outer/inner
-HEAD is now at 0a0d081 Duplicate Entries
-Segmentation fault
-test_must_fail: died by signal 11: git diff HEAD
-not ok 10 - git diff HEAD does not segfault # TODO known breakage
-
-checking known breakage of 4058.11 'can switch to another branch when status is empty': 
-	git clean -ffdqx &&
-	git status --porcelain -uno >actual &&
-	test_must_be_empty actual &&
-	git checkout update
-
-error: Your local changes to the following files would be overwritten by checkout:
-	outer/inner
-Please commit your changes or stash them before you switch branches.
-Aborting
-not ok 11 - can switch to another branch when status is empty # TODO known breakage
-
-expecting success of 4058.12 'forcibly switch to another branch, verify status empty': 
-	git checkout -f update &&
-	git status --porcelain -uno >actual &&
-	test_must_be_empty actual
-
-Switched to branch 'update'
-ok 12 - forcibly switch to another branch, verify status empty
-
-expecting success of 4058.13 'fast-forward from non-duplicate entries to duplicate': 
-	git merge final
-
-Updating 4814dcd..c713d2c
-Fast-forward
- renamed => outer/inner | 0
- outer/inner            | 1 +
- outer/inner            | 1 +
- outer/inner            | 1 +
- 4 files changed, 3 insertions(+)
- rename renamed => outer/inner (100%)
- create mode 100644 outer/inner
- create mode 100644 outer/inner
- create mode 100644 outer/inner
-ok 13 - fast-forward from non-duplicate entries to duplicate
-
-checking known breakage of 4058.14 'clean status, switch branches, status still clean': 
-	git status --porcelain -uno >actual &&
-	test_must_be_empty actual &&
-	git checkout base &&
-	git status --porcelain -uno >actual &&
-	test_must_be_empty actual
-
-'actual' is not empty, it contains:
-M  outer/inner
-not ok 14 - clean status, switch branches, status still clean # TODO known breakage
-
-expecting success of 4058.15 'switch to base branch and force status to be clean': 
-	git checkout base &&
-	GIT_TEST_CHECK_CACHE_TREE=false git reset --hard &&
-	git status --porcelain -uno >actual &&
-	test_must_be_empty actual
-
-Switched to branch 'base'
-M	outer/inner
-D	outer/inner
-D	outer/inner
-D	outer/inner
-HEAD is now at 0a0d081 Duplicate Entries
-ok 15 - switch to base branch and force status to be clean
-
-checking known breakage of 4058.16 'fast-forward from duplicate entries to non-duplicate': 
-	git merge update
-
-Segmentation fault
-not ok 16 - fast-forward from duplicate entries to non-duplicate # TODO known breakage
-
-# still have 6 known breakage(s)
-# passed all remaining 10 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4056-diff-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+ok 10 - diff -m respects textconv attribute
 
-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 &&
+expecting success of 4048.11 'diff -c respects textconv attribute': 
+	git show --format=%s -c >actual &&
 	test_cmp expect actual
 
-ok 19 - diff --rotate-to
+ok 11 - diff -c respects textconv attribute
 
-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 &&
+expecting success of 4048.12 'diff --cc respects textconv attribute': 
+	git show --format=%s --cc >actual &&
 	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
+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 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
+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
 
-ok 23 - log --skip-to
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4057-diff-combined-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4057-diff-combined-paths/.git/
-expecting success of 4057.1 'trivial merge - combine-diff empty': 
-	for i in $(test_seq 1 9)
-	do
-		echo $i >$i.txt &&
-		git add $i.txt || return 1
-	done &&
-	git commit -m "init" &&
-	git checkout -b side &&
-	for i in $(test_seq 2 9)
-	do
-		echo $i/2 >>$i.txt || return 1
-	done &&
-	git commit -a -m "side 2-9" &&
-	git checkout main &&
-	echo 1/2 >1.txt &&
-	git commit -a -m "main 1" &&
-	git merge side &&
-	>diffc.expect &&
-	diffc_verify
-
-[main (root-commit) 0e4c78d] init
- Author: A U Thor <author@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 1.txt
- create mode 100644 2.txt
- create mode 100644 3.txt
- create mode 100644 4.txt
- create mode 100644 5.txt
- create mode 100644 6.txt
- create mode 100644 7.txt
- create mode 100644 8.txt
- create mode 100644 9.txt
-Switched to a new branch 'side'
-[side 18d7b5a] side 2-9
- Author: A U Thor <author@example.com>
- 8 files changed, 8 insertions(+)
-Switched to branch 'main'
-[main 0d0c265] main 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Merge made by the 'ort' strategy.
- 2.txt | 1 +
- 3.txt | 1 +
- 4.txt | 1 +
- 5.txt | 1 +
- 6.txt | 1 +
- 7.txt | 1 +
- 8.txt | 1 +
- 9.txt | 1 +
- 8 files changed, 8 insertions(+)
-ok 1 - trivial merge - combine-diff empty
-
-expecting success of 4057.2 'only one truly conflicting path': 
-	git checkout side &&
-	for i in $(test_seq 2 9)
-	do
-		echo $i/3 >>$i.txt || return 1
-	done &&
-	echo "4side" >>4.txt &&
-	git commit -a -m "side 2-9 +4" &&
-	git checkout main &&
-	for i in $(test_seq 1 9)
-	do
-		echo $i/3 >>$i.txt || return 1
-	done &&
-	echo "4main" >>4.txt &&
-	git commit -a -m "main 1-9 +4" &&
-	test_must_fail git merge side &&
-	cat <<-\EOF >4.txt &&
-	4
-	4/2
-	4/3
-	4main
-	4side
-	EOF
-	git add 4.txt &&
-	git commit -m "merge side (2)" &&
-	echo 4.txt >diffc.expect &&
-	diffc_verify
-
-Switched to branch 'side'
-[side ff32fb3] side 2-9 +4
- Author: A U Thor <author@example.com>
- 8 files changed, 9 insertions(+)
-Switched to branch 'main'
-[main 0b5ecd8] main 1-9 +4
- Author: A U Thor <author@example.com>
- 9 files changed, 10 insertions(+)
-Auto-merging 4.txt
-CONFLICT (content): Merge conflict in 4.txt
+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.
-[main 6619a01] merge side (2)
- Author: A U Thor <author@example.com>
-ok 2 - only one truly conflicting path
-
-expecting success of 4057.3 'merge introduces new file': 
-	git checkout side &&
-	for i in $(test_seq 5 9)
-	do
-		echo $i/4 >>$i.txt || return 1
-	done &&
-	git commit -a -m "side 5-9" &&
-	git checkout main &&
-	for i in $(test_seq 1 3)
-	do
-		echo $i/4 >>$i.txt || return 1
-	done &&
-	git commit -a -m "main 1-3 +4hello" &&
-	git merge side &&
-	echo "Hello World" >4hello.txt &&
-	git add 4hello.txt &&
-	git commit --amend &&
-	echo 4hello.txt >diffc.expect &&
-	diffc_verify
-
-Switched to branch 'side'
-[side e8c29ca] side 5-9
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
-Switched to branch 'main'
-[main 0635bd5] main 1-3 +4hello
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Merge made by the 'ort' strategy.
- 5.txt | 1 +
- 6.txt | 1 +
- 7.txt | 1 +
- 8.txt | 1 +
- 9.txt | 1 +
- 5 files changed, 5 insertions(+)
-[main 7d30ccd] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-ok 3 - merge introduces new file
-
-expecting success of 4057.4 'merge removed a file': 
-	git checkout side &&
-	for i in $(test_seq 5 9)
-	do
-		echo $i/5 >>$i.txt || return 1
-	done &&
-	git commit -a -m "side 5-9" &&
-	git checkout main &&
-	for i in $(test_seq 1 3)
-	do
-		echo $i/4 >>$i.txt || return 1
-	done &&
-	git commit -a -m "main 1-3" &&
-	git merge side &&
-	git rm 4.txt &&
-	git commit --amend &&
-	echo 4.txt >diffc.expect &&
-	diffc_verify
-
-Switched to branch 'side'
-[side da3ab5d] side 5-9
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
-Switched to branch 'main'
-[main 61e8724] main 1-3
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
-Merge made by the 'ort' strategy.
- 5.txt | 1 +
- 6.txt | 1 +
- 7.txt | 1 +
- 8.txt | 1 +
- 9.txt | 1 +
- 5 files changed, 5 insertions(+)
-rm '4.txt'
-[main dd9bbd5] Merge branch 'side'
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-ok 4 - merge removed a file
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4062-diff-pickaxe.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4062-diff-pickaxe/.git/
-expecting success of 4062.1 'setup': 
-	test_commit initial &&
-	printf "%04096d" 0 >4096-zeroes.txt &&
-	git add 4096-zeroes.txt &&
-	test_tick &&
-	git commit -m "A 4k file"
-
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[master 98d74df] A 4k file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4096-zeroes.txt
-ok 1 - setup
-
-expecting success of 4062.2 '-G matches': 
-	git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
-	test 4096-zeroes.txt = "$(cat out)"
-
-ok 2 - -G matches
-
-expecting success of 4062.3 '-S --pickaxe-regex': 
-	git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
-	test 4096-zeroes.txt = "$(cat out)"
-
-ok 3 - -S --pickaxe-regex
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4059-diff-submodule-not-initialized.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4063-diff-blobs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4063-diff-blobs/.git/
-expecting success of 4063.1 'create some blobs': 
-	echo one >one &&
-	echo two >two &&
-	chmod +x two &&
-	git add . &&
-
-	# cover systems where modes are ignored
-	git update-index --chmod=+x two &&
-
-	git commit -m base &&
-
-	sha1_one=$(git rev-parse HEAD:one) &&
-	sha1_two=$(git rev-parse HEAD:two)
-
-[master (root-commit) e18d699] base
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100755 two
-ok 1 - create some blobs
-
-expecting success of 4063.2 'diff by sha1': 
-	run_diff $sha1_one $sha1_two
-
-ok 2 - diff by sha1
-
-expecting success of 4063.3 'index of sha1 diff': 
-	check_index $sha1_one $sha1_two
-
-index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871 100644
-ok 3 - index of sha1 diff
-
-expecting success of 4063.4 'sha1 diff uses arguments as paths': 
-	check_paths $sha1_one $sha1_two
-
-diff --git a/5626abf0f72e58d7a153368ba57db4c673c0e171 b/f719efd430d52bcfc8566a43b2eb655688d38871
-ok 4 - sha1 diff uses arguments as paths
-
-expecting success of 4063.5 'sha1 diff has no mode change': 
-	! grep mode diff
-
-ok 5 - sha1 diff has no mode change
-
-expecting success of 4063.6 'diff by tree:path (run)': 
-	run_diff HEAD:one HEAD:two
-
-ok 6 - diff by tree:path (run)
-
-expecting success of 4063.7 'index of tree:path diff': 
-	check_index $sha1_one $sha1_two
-
-index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
-ok 7 - index of tree:path diff
-
-expecting success of 4063.8 'tree:path diff uses filenames as paths': 
-	check_paths one two
-
-diff --git a/one b/two
-ok 8 - tree:path diff uses filenames as paths
-
-expecting success of 4063.9 'tree:path diff shows mode change': 
-	check_mode 100644 100755
-
-old mode 100644
-new mode 100755
-ok 9 - tree:path diff shows mode change
-
-expecting success of 4063.10 'diff by ranged tree:path': 
-	run_diff HEAD:one..HEAD:two
-
-ok 10 - diff by ranged tree:path
-
-expecting success of 4063.11 'index of ranged tree:path diff': 
-	check_index $sha1_one $sha1_two
-
-index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
-ok 11 - index of ranged tree:path diff
-
-expecting success of 4063.12 'ranged tree:path diff uses filenames as paths': 
-	check_paths one two
-
-diff --git a/one b/two
-ok 12 - ranged tree:path diff uses filenames as paths
-
-expecting success of 4063.13 'ranged tree:path diff shows mode change': 
-	check_mode 100644 100755
-
-old mode 100644
-new mode 100755
-ok 13 - ranged tree:path diff shows mode change
-
-expecting success of 4063.14 'diff blob against file': 
-	run_diff HEAD:one two
-
-ok 14 - diff blob against file
-
-expecting success of 4063.15 'index of blob-file diff': 
-	check_index $sha1_one $sha1_two
-
-index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
-ok 15 - index of blob-file diff
-
-expecting success of 4063.16 'blob-file diff uses filename as paths': 
-	check_paths one two
-
-diff --git a/one b/two
-ok 16 - blob-file diff uses filename as paths
-
-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 4063.17 'blob-file diff shows mode change': 
-	check_mode 100644 100755
-
-old mode 100644
-new mode 100755
-ok 17 - blob-file diff shows mode change
-
-expecting success of 4063.18 'blob-file diff prefers filename to sha1': 
-	run_diff $sha1_one two &&
-	check_paths two two
-
-diff --git a/two b/two
-ok 18 - blob-file diff prefers filename to sha1
+ok 14 - diff --cc respects textconv on worktree file
 
-# passed all 18 test(s)
-1..18
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4065-diff-anchored.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4065-diff-anchored/.git/
-expecting success of 4065.1 '--anchored': 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
-
-	# normally, c is moved to produce the smallest diff
-	test_expect_code 1 git diff --no-index pre post >diff &&
-	grep "^+c" diff &&
-
-	# with anchor, a is moved
-	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
-	grep "^+a" diff
-
-+c
-+a
-ok 1 - --anchored
-
-expecting success of 4065.2 '--anchored multiple': 
-	printf "a\nb\nc\nd\ne\nf\n" >pre &&
-	printf "c\na\nb\nf\nd\ne\n" >post &&
-
-	# with 1 anchor, c is not moved, but f is moved
-	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
-	grep "^+a" diff && # a is moved instead of c
-	grep "^+f" diff &&
-
-	# with 2 anchors, c and f are not moved
-	test_expect_code 1 git diff --no-index --anchored=c --anchored=f pre post >diff &&
-	grep "^+a" diff &&
-	grep "^+d" diff # d is moved instead of f
-
-+a
-+f
-+a
-+d
-ok 2 - --anchored multiple
-
-expecting success of 4065.3 '--anchored with nonexistent line has no effect': 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
-
-	test_expect_code 1 git diff --no-index --anchored=x pre post >diff &&
-	grep "^+c" diff
-
-+c
-ok 3 - --anchored with nonexistent line has no effect
-
-expecting success of 4065.4 '--anchored with non-unique line has no effect': 
-	printf "a\nb\nc\nd\ne\nc\n" >pre &&
-	printf "c\na\nb\nc\nd\ne\n" >post &&
-
-	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
-	grep "^+c" diff
-
-+c
-ok 4 - --anchored with non-unique line has no effect
-
-expecting success of 4065.5 'diff still produced with impossible multiple --anchored': 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
-
-	test_expect_code 1 git diff --no-index --anchored=a --anchored=c pre post >diff &&
-	mv post expected_post &&
-
-	# Ensure that the diff is correct by applying it and then
-	# comparing the result with the original
-	git apply diff &&
-	diff expected_post post
-
-ok 5 - diff still produced with impossible multiple --anchored
-
-expecting success of 4065.6 'later algorithm arguments override earlier ones': 
-	printf "a\nb\nc\n" >pre &&
-	printf "c\na\nb\n" >post &&
-
-	test_expect_code 1 git diff --no-index --patience --anchored=c pre post >diff &&
-	grep "^+a" diff &&
-
-	test_expect_code 1 git diff --no-index --anchored=c --patience pre post >diff &&
-	grep "^+c" diff &&
-
-	test_expect_code 1 git diff --no-index --histogram --anchored=c pre post >diff &&
-	grep "^+a" diff &&
-
-	test_expect_code 1 git diff --no-index --anchored=c --histogram pre post >diff &&
-	grep "^+c" diff
-
-+a
-+c
-+a
-+c
-ok 6 - later algorithm arguments override earlier ones
-
-expecting success of 4065.7 '--anchored works with other commands like "git show"': 
-	printf "a\nb\nc\n" >file &&
-	git add file &&
-	git commit -m foo &&
-	printf "c\na\nb\n" >file &&
-	git add file &&
-	git commit -m foo &&
-
-	# with anchor, a is moved
-	git show --patience --anchored=c >diff &&
-	grep "^+a" diff
-
-[master (root-commit) 59a79f0] foo
+*** t4050-diff-histogram.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4050-diff-histogram/.git/
+expecting success of 4050.1 'setup attributes files for tests with histogram': 
+		git checkout -b master &&
+		echo "file* diff=driver" >.gitattributes &&
+		git add file1 file2 .gitattributes &&
+		git commit -m "adding files" &&
+		git checkout -b branchA &&
+		echo "file* diff=driverA" >.gitattributes &&
+		git add .gitattributes &&
+		git commit -m "adding driverA as diff driver" &&
+		git checkout master &&
+		git clone --bare --no-local . bare.git
+	
+Switched to a new branch 'master'
+[master (root-commit) 946e965] adding files
  Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 file
-[master 798b1ed] foo
+ 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(-)
-+a
-ok 7 - --anchored works with other commands like "git show"
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4061-diff-indent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-	}
+Switched to branch 'master'
+Cloning into bare repository 'bare.git'...
+ok 1 - setup attributes files for tests with histogram
 
-	3
-	4
-	EOF
+expecting success of 4050.2 'histogram diff from attributes': 
+		test_must_fail git -c diff.driver.algorithm=$STRATEGY diff --no-index file1 file2 > output &&
+		test_cmp expect output
+	
+ok 2 - histogram diff from attributes
 
-	git add spaces.txt functions.c &&
-	test_tick &&
-	git commit -m initial &&
-	git branch old &&
+expecting success of 4050.3 'diff from attributes with bare repo with source': 
+		git -C bare.git --attr-source=branchA -c diff.driver.algorithm=myers \
+			-c diff.driverA.algorithm=$STRATEGY \
+			diff HEAD:file1 HEAD:file2 >output &&
+		test_cmp expect output
+	
+ok 3 - diff from attributes with bare repo with source
 
-	cat <<-\EOF >spaces.txt &&
-	1
-	2
-	a
+expecting success of 4050.4 'diff from attributes with bare repo with invalid source': 
+		test_must_fail git -C bare.git --attr-source=invalid-branch diff \
+			HEAD:file1 HEAD:file2
+	
+fatal: bad --attr-source or GIT_ATTR_SOURCE
+ok 4 - diff from attributes with bare repo with invalid source
 
-	b
-	a
+expecting success of 4050.5 'histogram diff from attributes has valid diffstat': 
+		echo "file* diff=driver" >.gitattributes &&
+		git config diff.driver.algorithm "$STRATEGY" &&
+		test_must_fail git diff --stat --no-index file1 file2 > output &&
+		test_cmp expect_diffstat output
+	
+ok 5 - histogram diff from attributes has valid diffstat
 
-	b
-	3
-	4
-	EOF
+expecting success of 4050.6 'histogram diff': 
+		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
+		test_cmp expect output
+	
+ok 6 - histogram diff
 
-	cat <<-\EOF >functions.c &&
-	1
-	2
-	/* function */
-	bar() {
-	    foo
-	}
+expecting success of 4050.7 'histogram diff command line precedence before attributes': 
+		echo "file* diff=driver" >.gitattributes &&
+		git config diff.driver.algorithm myers &&
+		test_must_fail git diff --no-index "--diff-algorithm=$STRATEGY" file1 file2 > output &&
+		test_cmp expect output
+	
+ok 7 - histogram diff command line precedence before attributes
 
-	/* function */
-	foo() {
-	    foo
-	}
+expecting success of 4050.8 'histogram diff attributes precedence before config': 
+		git config diff.algorithm default &&
+		echo "file* diff=driver" >.gitattributes &&
+		git config diff.driver.algorithm "$STRATEGY" &&
+		test_must_fail git diff --no-index file1 file2 > output &&
+		test_cmp expect output
+	
+ok 8 - histogram diff attributes precedence before config
 
-	3
-	4
-	EOF
+expecting success of 4050.9 'histogram diff output is valid': 
+		mv file2 expect &&
+		git apply < output &&
+		test_cmp expect file2
+	
+ok 9 - histogram diff output is valid
 
-	git add spaces.txt functions.c &&
-	test_tick &&
-	git commit -m initial &&
-	git branch new &&
+expecting success of 4050.10 'completely different files': 
+		test_must_fail git diff --no-index "--$STRATEGY" uniq1 uniq2 > output &&
+		test_cmp expect output
+	
+ok 10 - completely different files
 
-	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
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4051-diff-function-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 
-	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
+	grep -v "delete me from hello" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag changed_hello file.c &&
 
-	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
+	grep -v "delete me from includes" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	commit_and_tag changed_includes file.c &&
 
-	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
+	cat "$dir/appended1.c" >>file.c &&
+	commit_and_tag appended file.c &&
 
-[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
+	cat "$dir/appended2.c" >>file.c &&
+	commit_and_tag extended file.c &&
 
-expecting success of 4061.2 'diff: ugly spaces': 
-	git diff --no-indent-heuristic old new -- spaces.txt >out &&
-	compare_diff spaces-expect out
+	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 &&
 
-ok 2 - diff: ugly spaces
+	git checkout initial &&
+	cat "$dir/hello.c" "$dir/dummy.c" >file.c &&
+	commit_and_tag hello_dummy file.c &&
 
-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
+	# overlap function context of 1st change and -u context of 2nd change
+	grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
+	sed "2a\\
+	     extra line" <"$dir/dummy.c" >>file.c &&
+	commit_and_tag changed_hello_dummy file.c &&
 
-ok 3 - diff: --no-indent-heuristic overrides config
+	git checkout initial &&
+	grep -v "delete me from hello" <file.c >file.c.new &&
+	mv file.c.new file.c &&
+	cat "$dir/appended1.c" >>file.c &&
+	commit_and_tag changed_hello_appended file.c
 
-expecting success of 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
+[master (root-commit) 9f6e181] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 72 insertions(+)
+ create mode 100644 file.c
+[master 5e132d0] changed_hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master 964b054] changed_includes
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master d0cff11] appended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 15 insertions(+)
+[master d16114c] extended
+ Author: A U Thor <author@example.com>
+ 1 file changed, 35 insertions(+)
+[master fa474ba] long_common_tail
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+Note: switching to 'initial'.
 
-ok 4 - diff: nice spaces with --indent-heuristic
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 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
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-ok 5 - diff: nice spaces with diff.indentHeuristic=true
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-ok 6 - diff: --indent-heuristic with --patience
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 7 - diff: --indent-heuristic with --histogram
+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 4061.8 'diff: ugly functions': 
-	git diff --no-indent-heuristic old new -- functions.c >out &&
-	compare_diff functions-expect out
+expecting success of 4051.2 'changed function': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 2 - changed function
 
-ok 8 - diff: ugly functions
+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 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
+expecting success of 4051.4 ' context includes comment': 
+	grep "^ .*Hello comment" changed_hello.diff
 
-ok 9 - diff: nice functions with --indent-heuristic
+  * Hello comment.
+ok 4 -  context includes comment
 
-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
+expecting success of 4051.5 ' context includes begin': 
+	grep "^ .*Begin of hello" changed_hello.diff
 
-ok 10 - blame: nice spaces with --indent-heuristic
+ static void hello(void)	// Begin of hello
+ok 5 -  context includes begin
 
-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
+expecting success of 4051.6 ' context includes end': 
+	grep "^ .*End of hello" changed_hello.diff
 
-ok 11 - blame: nice spaces with diff.indentHeuristic=true
+ }	// End of hello
+ok 6 -  context includes end
 
-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
+expecting success of 4051.7 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" changed_hello.diff) -le 1
 
-ok 12 - blame: ugly spaces with --no-indent-heuristic
+ok 7 -  context does not include other functions
 
-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
+expecting success of 4051.8 ' context does not include preceding empty lines': 
+	test "$(first_context_line <changed_hello.diff)" != " "
 
-ok 13 - blame: ugly spaces with diff.indentHeuristic=false
+ok 8 -  context does not include preceding empty lines
 
-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
+expecting success of 4051.9 ' context does not include trailing empty lines': 
+	test "$(last_context_line <changed_hello.diff)" != " "
 
-ok 14 - blame: --no-indent-heuristic overrides config
+ok 9 -  context does not include trailing empty lines
 
-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
+expecting success of 4051.10 'changed includes': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 10 - changed includes
 
-ok 15 - blame: --indent-heuristic overrides config
+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 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
+expecting success of 4051.12 ' context includes begin': 
+	grep "^ .*Begin.h" changed_includes.diff
 
-ok 16 - diff-tree: nice spaces with --indent-heuristic
+ #include <Begin.h>
+ok 12 -  context includes begin
 
-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
+expecting success of 4051.13 ' context includes end': 
+	grep "^ .*End.h" changed_includes.diff
 
-ok 17 - diff-tree: nice spaces with diff.indentHeuristic=true
+ #include <End.h>
+ok 13 -  context includes end
 
-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
+expecting success of 4051.14 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
 
-ok 18 - diff-tree: ugly spaces with --no-indent-heuristic
+ok 14 -  context does not include other functions
 
-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
+expecting success of 4051.15 ' context does not include trailing empty lines': 
+	test "$(last_context_line <changed_includes.diff)" != " "
 
-ok 19 - diff-tree: ugly spaces with diff.indentHeuristic=false
+ok 15 -  context does not include trailing empty lines
 
-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
+expecting success of 4051.16 'appended function': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 16 - appended function
 
-ok 20 - diff-tree: --indent-heuristic overrides config
+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 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
+expecting success of 4051.18 ' context includes begin': 
+	grep "^[+].*Begin of first part" appended.diff
 
-ok 21 - diff-tree: --no-indent-heuristic overrides config
++int appended(void) // Begin of first part
+ok 18 -  context includes begin
 
-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
+expecting success of 4051.19 ' context includes end': 
+	grep "^[+].*End of first part" appended.diff
 
-Switched to a new branch 'diff-index'
-Switched to branch 'main'
-ok 22 - diff-index: nice spaces with --indent-heuristic
++	printf("End of first part\n");
+ok 19 -  context includes end
 
-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
+expecting success of 4051.20 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" appended.diff) -le 1
 
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 23 - diff-index: nice spaces with diff.indentHeuristic=true
+ok 20 -  context does not include other functions
 
-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
+expecting success of 4051.21 'appended function part': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 21 - appended function part
 
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 24 - diff-index: ugly spaces with --no-indent-heuristic
+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 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
+expecting success of 4051.23 ' context includes begin': 
+	grep "^ .*Begin of first part" extended.diff
 
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 25 - diff-index: ugly spaces with diff.indentHeuristic=false
+ int appended(void) // Begin of first part
+ok 23 -  context includes begin
 
-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
+expecting success of 4051.24 ' context includes end': 
+	grep "^[+].*End of second part" extended.diff
 
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 26 - diff-index: --indent-heuristic overrides config
++}	// End of second part
+ok 24 -  context includes end
 
-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 4051.25 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" extended.diff) -le 2
 
-Switched to and reset branch 'diff-index'
-Switched to branch 'main'
-ok 27 - diff-index: --no-indent-heuristic overrides config
+ok 25 -  context does not include other functions
 
-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 4051.26 ' context does not include preceding empty lines': 
+	test "$(first_context_line <extended.diff)" != " "
 
-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
+ok 26 -  context does not include preceding empty lines
 
-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
+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
 
-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 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 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
+expecting success of 4051.29 ' context includes begin': 
+	grep "^ .*Begin of first part" long_common_tail.diff
 
-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
+ int appended(void) // Begin of first part
+ok 29 -  context includes begin
 
-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
+expecting success of 4051.30 ' context includes end': 
+	grep "^ .*End of second part" long_common_tail.diff
 
-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
+ }	// End of second part
+ok 30 -  context includes end
 
-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
+expecting success of 4051.31 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" long_common_tail.diff) -le 2
 
-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
+ok 31 -  context does not include other functions
 
-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
+expecting success of 4051.32 ' context does not include preceding empty lines': 
+	test "$(first_context_line <long_common_tail.diff)" != " "
 
-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
+ok 32 -  context does not include preceding empty lines
 
-# passed all 33 test(s)
-1..33
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4064-diff-oidfind.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4064-diff-oidfind/.git/
-expecting success of 4064.1 'setup ': 
-	git commit --allow-empty -m "empty initial commit" &&
+expecting success of 4051.33 'changed function plus appended function': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 33 - changed function plus appended function
 
-	echo "Hello, world!" >greeting &&
-	git add greeting &&
-	git commit -m "add the greeting blob" && # borrowed from Git from the Bottom Up
-	git tag -m "the blob" greeting $(git rev-parse HEAD:greeting) &&
+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
 
-	echo asdf >unrelated &&
-	git add unrelated &&
-	git commit -m "unrelated history" &&
+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
 
-	git revert HEAD^ &&
+ static void hello(void)	// Begin of hello
++int appended(void) // Begin of first part
+ok 35 -  context includes begin
 
-	git commit --allow-empty -m "another unrelated commit"
+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
 
-[master (root-commit) 274b021] empty initial commit
- Author: A U Thor <author@example.com>
-[master bae5752] add the greeting blob
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 greeting
-[master 87e1d9b] unrelated history
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unrelated
-[master 395f7b3] Revert "add the greeting blob"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 deletion(-)
- delete mode 100644 greeting
-[master edd3a99] another unrelated commit
- Author: A U Thor <author@example.com>
-ok 1 - setup 
+ }	// End of hello
++	printf("End of first part\n");
+ok 36 -  context includes end
 
-expecting success of 4064.2 'find the greeting blob': 
-	cat >expect <<-EOF &&
-	Revert "add the greeting blob"
-	add the greeting blob
-	EOF
+expecting success of 4051.37 ' context does not include other functions': 
+	test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
 
-	git log --format=%s --find-object=greeting^{blob} >actual &&
+ok 37 -  context does not include other functions
 
-	test_cmp expect actual
+expecting success of 4051.38 'changed two consecutive functions': 
+		git diff $options "$name^" "$name" >"$name.diff"
+	
+ok 38 - changed two consecutive functions
 
-ok 2 - find the greeting blob
+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 4064.3 'setup a tree': 
-	mkdir a &&
-	echo asdf >a/file &&
-	git add a/file &&
-	git commit -m "add a file in a subdirectory"
+expecting success of 4051.40 ' context includes begin': 
+	grep "^ .*Begin of hello" changed_hello_dummy.diff &&
+	grep "^ .*Begin of dummy" changed_hello_dummy.diff
 
-[master 5912b3f] add a file in a subdirectory
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/file
-ok 3 - setup a tree
+ static void hello(void)	// Begin of hello
+ static int dummy(void)	// Begin of dummy
+ok 40 -  context includes begin
 
-expecting success of 4064.4 'find a tree': 
-	cat >expect <<-EOF &&
-	add a file in a subdirectory
-	EOF
+expecting success of 4051.41 ' context includes end': 
+	grep "^ .*End of hello" changed_hello_dummy.diff &&
+	grep "^ .*End of dummy" changed_hello_dummy.diff
 
-	git log --format=%s -t --find-object=HEAD:a >actual &&
+ }	// End of hello
+ }	// End of dummy
+ok 41 -  context includes end
 
-	test_cmp expect actual
+expecting success of 4051.42 ' overlapping hunks are merged': 
+	test $(grep -c "^@@" changed_hello_dummy.diff) -eq 1
 
-ok 4 - find a tree
+ok 42 -  overlapping hunks are merged
 
-expecting success of 4064.5 'setup a submodule': 
-	test_create_repo sub &&
-	test_commit -C sub sub &&
-	git submodule add ./sub sub &&
-	git commit -a -m "add sub"
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4054-diff-bogus-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4054-diff-bogus-tree/.git/
+expecting success of 4054.1 'create bogus tree': 
+	name=$(echo $ZERO_OID | sed -e "s/00/Q/g") &&
+	bogus_tree=$(
+		printf "100644 fooQ$name" |
+		q_to_nul |
+		git hash-object --literally -w --stdin -t tree
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4064-diff-oidfind/sub/.git/
-[master (root-commit) 672648c] sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 sub.t
-Adding existing repo at 'sub' to the index
-[master 9b6ab80] add sub
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 5 - setup a submodule
+ok 1 - create bogus tree
 
-expecting success of 4064.6 'find a submodule': 
-	cat >expect <<-EOF &&
-	add sub
-	EOF
+expecting success of 4054.2 'create tree with matching file': 
+	echo bar >foo &&
+	git add foo &&
+	good_tree=$(git write-tree) &&
+	blob=$(git rev-parse :foo)
 
-	git log --format=%s --find-object=HEAD:sub >actual &&
+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 6 - find a submodule
+ok 3 - raw diff shows null sha1 (addition)
 
-expecting success of 4064.7 'set up merge tests': 
-	test_commit base &&
+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
 
-	git checkout -b boring base^ &&
-	echo boring >file &&
-	git add file &&
-	git commit -m boring &&
+ok 4 - raw diff shows null sha1 (removal)
 
-	git checkout -b interesting base^ &&
-	echo interesting >file &&
-	git add file &&
-	git commit -m interesting &&
+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
 
-	blob=$(git rev-parse interesting:file)
+ok 5 - raw diff shows null sha1 (modification)
 
-[master df80aba] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'boring'
-[boring 6e5eceb] boring
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Switched to a new branch 'interesting'
-[interesting 9f8795e] interesting
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 7 - set up merge tests
+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
 
-expecting success of 4064.8 'detect merge which introduces blob': 
-	git checkout -B merge base &&
-	git merge --no-commit boring &&
-	echo interesting >file &&
-	git commit -am "introduce blob" &&
-	git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual &&
-	cat >expect <<-\EOF &&
-	introduce blob
+ok 6 - raw diff shows null sha1 (other direction)
 
-	AM	file
-	EOF
+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
 
-Switched to a new branch 'merge'
-Automatic merge went well; stopped before committing as requested
-[merge 691f20d] introduce blob
- Author: A U Thor <author@example.com>
-ok 8 - detect merge which introduces blob
-
-expecting success of 4064.9 'detect merge which removes blob': 
-	git checkout -B merge interesting &&
-	git merge --no-commit base &&
-	echo boring >file &&
-	git commit -am "remove blob" &&
-	git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual &&
-	cat >expect <<-\EOF &&
-	remove blob
+ok 7 - raw diff shows null sha1 (reverse)
 
-	MA	file
-	EOF
+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
 
-Reset branch 'merge'
-Automatic merge went well; stopped before committing as requested
-[merge 5a6d6f7] remove blob
- Author: A U Thor <author@example.com>
-ok 9 - detect merge which removes blob
+ok 8 - raw diff shows null sha1 (index)
 
-expecting success of 4064.10 'do not detect merge that does not touch blob': 
-	git checkout -B merge interesting &&
-	git merge -m "untouched blob" base &&
-	git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual &&
-	cat >expect <<-\EOF &&
-	untouched blob
+expecting success of 4054.9 'patch fails due to bogus sha1 (addition)': 
+	test_must_fail git diff-tree -p $EMPTY_TREE $bogus_tree
 
-	EOF
-	test_cmp expect actual
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 9 - patch fails due to bogus sha1 (addition)
 
-Reset branch 'merge'
-Merge made by the 'ort' strategy.
- base.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 10 - do not detect merge that does not touch blob
+expecting success of 4054.10 'patch fails due to bogus sha1 (removal)': 
+	test_must_fail git diff-tree -p $bogus_tree $EMPTY_TREE
 
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4066-diff-emit-delay.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 10 - patch fails due to bogus sha1 (removal)
 
-[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 4054.11 'patch fails due to bogus sha1 (modification)': 
+	test_must_fail git diff-tree -p $good_tree $bogus_tree
 
-expecting success of 4066.2 'log --cc -p --stat --color-moved': 
-	cat >expect <<-EOF &&
-	commit D
-	---
-	 D.t | 1 +
-	 1 file changed, 1 insertion(+)
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 11 - patch fails due to bogus sha1 (modification)
 
-	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 4054.12 'patch fails due to bogus sha1 (other direction)': 
+	test_must_fail git diff-tree -p $bogus_tree $good_tree
 
-	 B.t | 1 +
-	 1 file changed, 1 insertion(+)
-	commit C
-	---
-	 C.t | 1 +
-	 1 file changed, 1 insertion(+)
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 12 - patch fails due to bogus sha1 (other direction)
 
-	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 4054.13 'patch fails due to bogus sha1 (reverse)': 
+	test_must_fail git diff-tree -R -p $good_tree $bogus_tree
 
-	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(+)
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 13 - patch fails due to bogus sha1 (reverse)
 
-	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 4054.14 'patch fails due to bogus sha1 (index)': 
+	test_must_fail git diff-index -p $bogus_tree
 
-ok 2 - log --cc -p --stat --color-moved
+fatal: unable to read 0000000000000000000000000000000000000000
+ok 14 - patch fails due to bogus sha1 (index)
 
-# passed all 2 test(s)
-1..2
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4018-diff-funcname.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4018-diff-funcname/.git/
-expecting success of 4018.1 'setup': 
-	# a non-trivial custom pattern
-	git config diff.custom1.funcname "!static
-!String
-[^ 	].*s.*" &&
+*** t4047-diff-dirstat.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4047-diff-dirstat/.git/
+expecting success of 4047.1 'setup': 
+	mkdir unchanged &&
+	mkdir changed &&
+	mkdir rearranged &&
+	mkdir src &&
+	mkdir src/copy &&
+	mkdir src/copy/unchanged &&
+	mkdir src/copy/changed &&
+	mkdir src/copy/rearranged &&
+	mkdir src/move &&
+	mkdir src/move/unchanged &&
+	mkdir src/move/changed &&
+	mkdir src/move/rearranged &&
+	cat <<EOF >unchanged/text &&
+unchanged       line #0
+unchanged       line #1
+unchanged       line #2
+unchanged       line #3
+unchanged       line #4
+unchanged       line #5
+unchanged       line #6
+unchanged       line #7
+unchanged       line #8
+unchanged       line #9
+EOF
+	cat <<EOF >changed/text &&
+changed         line #0
+changed         line #1
+changed         line #2
+changed         line #3
+changed         line #4
+changed         line #5
+changed         line #6
+changed         line #7
+changed         line #8
+changed         line #9
+EOF
+	cat <<EOF >rearranged/text &&
+rearranged      line #0
+rearranged      line #1
+rearranged      line #2
+rearranged      line #3
+rearranged      line #4
+rearranged      line #5
+rearranged      line #6
+rearranged      line #7
+rearranged      line #8
+rearranged      line #9
+EOF
+	cat <<EOF >src/copy/unchanged/text &&
+copy  unchanged line #0
+copy  unchanged line #1
+copy  unchanged line #2
+copy  unchanged line #3
+copy  unchanged line #4
+copy  unchanged line #5
+copy  unchanged line #6
+copy  unchanged line #7
+copy  unchanged line #8
+copy  unchanged line #9
+EOF
+	cat <<EOF >src/copy/changed/text &&
+copy    changed line #0
+copy    changed line #1
+copy    changed line #2
+copy    changed line #3
+copy    changed line #4
+copy    changed line #5
+copy    changed line #6
+copy    changed line #7
+copy    changed line #8
+copy    changed line #9
+EOF
+	cat <<EOF >src/copy/rearranged/text &&
+copy rearranged line #0
+copy rearranged line #1
+copy rearranged line #2
+copy rearranged line #3
+copy rearranged line #4
+copy rearranged line #5
+copy rearranged line #6
+copy rearranged line #7
+copy rearranged line #8
+copy rearranged line #9
+EOF
+	cat <<EOF >src/move/unchanged/text &&
+move  unchanged line #0
+move  unchanged line #1
+move  unchanged line #2
+move  unchanged line #3
+move  unchanged line #4
+move  unchanged line #5
+move  unchanged line #6
+move  unchanged line #7
+move  unchanged line #8
+move  unchanged line #9
+EOF
+	cat <<EOF >src/move/changed/text &&
+move    changed line #0
+move    changed line #1
+move    changed line #2
+move    changed line #3
+move    changed line #4
+move    changed line #5
+move    changed line #6
+move    changed line #7
+move    changed line #8
+move    changed line #9
+EOF
+	cat <<EOF >src/move/rearranged/text &&
+move rearranged line #0
+move rearranged line #1
+move rearranged line #2
+move rearranged line #3
+move rearranged line #4
+move rearranged line #5
+move rearranged line #6
+move rearranged line #7
+move rearranged line #8
+move rearranged line #9
+EOF
+	git add . &&
+	git commit -m "initial" &&
+	mkdir dst &&
+	mkdir dst/copy &&
+	mkdir dst/copy/unchanged &&
+	mkdir dst/copy/changed &&
+	mkdir dst/copy/rearranged &&
+	mkdir dst/move &&
+	mkdir dst/move/unchanged &&
+	mkdir dst/move/changed &&
+	mkdir dst/move/rearranged &&
+	cat <<EOF >changed/text &&
+CHANGED XXXXXXX line #0
+changed         line #1
+changed         line #2
+changed         line #3
+changed         line #4
+changed         line #5
+changed         line #6
+changed         line #7
+changed         line #8
+changed         line #9
+EOF
+	cat <<EOF >rearranged/text &&
+rearranged      line #1
+rearranged      line #0
+rearranged      line #2
+rearranged      line #3
+rearranged      line #4
+rearranged      line #5
+rearranged      line #6
+rearranged      line #7
+rearranged      line #8
+rearranged      line #9
+EOF
+	cat <<EOF >dst/copy/unchanged/text &&
+copy  unchanged line #0
+copy  unchanged line #1
+copy  unchanged line #2
+copy  unchanged line #3
+copy  unchanged line #4
+copy  unchanged line #5
+copy  unchanged line #6
+copy  unchanged line #7
+copy  unchanged line #8
+copy  unchanged line #9
+EOF
+	cat <<EOF >dst/copy/changed/text &&
+copy XXXCHANGED line #0
+copy    changed line #1
+copy    changed line #2
+copy    changed line #3
+copy    changed line #4
+copy    changed line #5
+copy    changed line #6
+copy    changed line #7
+copy    changed line #8
+copy    changed line #9
+EOF
+	cat <<EOF >dst/copy/rearranged/text &&
+copy rearranged line #1
+copy rearranged line #0
+copy rearranged line #2
+copy rearranged line #3
+copy rearranged line #4
+copy rearranged line #5
+copy rearranged line #6
+copy rearranged line #7
+copy rearranged line #8
+copy rearranged line #9
+EOF
+	cat <<EOF >dst/move/unchanged/text &&
+move  unchanged line #0
+move  unchanged line #1
+move  unchanged line #2
+move  unchanged line #3
+move  unchanged line #4
+move  unchanged line #5
+move  unchanged line #6
+move  unchanged line #7
+move  unchanged line #8
+move  unchanged line #9
+EOF
+	cat <<EOF >dst/move/changed/text &&
+move XXXCHANGED line #0
+move    changed line #1
+move    changed line #2
+move    changed line #3
+move    changed line #4
+move    changed line #5
+move    changed line #6
+move    changed line #7
+move    changed line #8
+move    changed line #9
+EOF
+	cat <<EOF >dst/move/rearranged/text &&
+move rearranged line #1
+move rearranged line #0
+move rearranged line #2
+move rearranged line #3
+move rearranged line #4
+move rearranged line #5
+move rearranged line #6
+move rearranged line #7
+move rearranged line #8
+move rearranged line #9
+EOF
+	git add . &&
+	git rm -r src/move/unchanged &&
+	git rm -r src/move/changed &&
+	git rm -r src/move/rearranged &&
+	git commit -m "changes" &&
+	git config diff.renames false
 
-	# a custom pattern which matches to end of line
-	git config diff.custom2.funcname "......Beer\$" &&
+[master (root-commit) b34d487] initial
+ Author: A U Thor <author@example.com>
+ 9 files changed, 90 insertions(+)
+ create mode 100644 changed/text
+ create mode 100644 rearranged/text
+ create mode 100644 src/copy/changed/text
+ create mode 100644 src/copy/rearranged/text
+ create mode 100644 src/copy/unchanged/text
+ create mode 100644 src/move/changed/text
+ create mode 100644 src/move/rearranged/text
+ create mode 100644 src/move/unchanged/text
+ create mode 100644 unchanged/text
+rm 'src/move/unchanged/text'
+rm 'src/move/changed/text'
+rm 'src/move/rearranged/text'
+[master 3da6c5d] changes
+ Author: A U Thor <author@example.com>
+ 8 files changed, 34 insertions(+), 4 deletions(-)
+ create mode 100644 dst/copy/changed/text
+ create mode 100644 dst/copy/rearranged/text
+ create mode 100644 dst/copy/unchanged/text
+ rename {src => dst}/move/changed/text (90%)
+ rename {src => dst}/move/rearranged/text (100%)
+ rename {src => dst}/move/unchanged/text (100%)
+ok 1 - setup
 
-	# alternation in pattern
-	git config diff.custom3.funcname "Beer$" &&
-	git config diff.custom3.xfuncname "^[ 	]*((public|static).*)$" &&
+expecting success of 4047.2 'sanity check setup (--numstat)': 
+	git diff --numstat HEAD^..HEAD >actual_diff_stat &&
+	test_cmp expect_diff_stat actual_diff_stat &&
+	git diff --numstat -M HEAD^..HEAD >actual_diff_stat_M &&
+	test_cmp expect_diff_stat_M actual_diff_stat_M &&
+	git diff --numstat -C -C HEAD^..HEAD >actual_diff_stat_CC &&
+	test_cmp expect_diff_stat_CC actual_diff_stat_CC
 
-	# for regexp compilation tests
-	echo A >A.java &&
-	echo B >B.java
+ok 2 - sanity check setup (--numstat)
 
-ok 1 - setup
+expecting success of 4047.3 'various ways to misspell --dirstat': 
+	test_must_fail git show --dirstat10 &&
+	test_must_fail git show --dirstat10,files &&
+	test_must_fail git show -X=20 &&
+	test_must_fail git show -X=20,cumulative
 
-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 &&
+fatal: unrecognized argument: --dirstat10
+fatal: unrecognized argument: --dirstat10,files
+fatal: Failed to parse --dirstat/-X option parameter:
+  Unknown dirstat parameter '=20'
 
-	# 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
+fatal: Failed to parse --dirstat/-X option parameter:
+  Unknown dirstat parameter '=20'
 
-ok 2 - setup: test-tool userdiff
+ok 3 - various ways to misspell --dirstat
 
-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 4047.4 'vanilla --dirstat': 
+	git diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-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
+ok 4 - vanilla --dirstat
 
-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 4047.5 'vanilla -X': 
+	git diff -X HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff -X -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff -X -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-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
+ok 5 - vanilla -X
 
-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 4047.6 'explicit defaults: --dirstat=changes,noncumulative,3': 
+	git diff --dirstat=changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-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
+ok 6 - explicit defaults: --dirstat=changes,noncumulative,3
 
-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 4047.7 'explicit defaults: -Xchanges,noncumulative,3': 
+	git diff -Xchanges,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff -Xchanges,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff -Xchanges,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-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
+ok 7 - explicit defaults: -Xchanges,noncumulative,3
 
-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 4047.8 'later options override earlier options:': 
+	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,10,cumulative,changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
+	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files --dirstat=10 --dirstat=cumulative --dirstat=changes --dirstat=noncumulative -X3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-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
+ok 8 - later options override earlier options:
 
-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 4047.9 'non-defaults in config overridden by explicit defaults on command line': 
+	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=files,cumulative,50 diff --dirstat=changes,noncumulative,3 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-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
+ok 9 - non-defaults in config overridden by explicit defaults on command line
 
-expecting success of 4018.15 'builtin csharp pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 15 - builtin csharp pattern compiles
+expecting success of 4047.10 '--dirstat=0': 
+	git diff --dirstat=0 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-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
+ok 10 - --dirstat=0
 
-expecting success of 4018.17 'builtin csharp pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 1baa7f2] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA c0f2914] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 17 - builtin csharp pattern compiles on bare repo with --attr-source
+expecting success of 4047.11 '-X0': 
+	git diff -X0 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff -X0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff -X0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 11 - -X0
 
-expecting success of 4018.19 'builtin css wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 19 - builtin css wordRegex pattern compiles
+expecting success of 4047.12 'diff.dirstat=0': 
+	git -c diff.dirstat=0 diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=0 diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=0 diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 4018.20 'builtin css pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 5bdd255] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 54fe80d] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 20 - builtin css pattern compiles on bare repo with --attr-source
+ok 12 - diff.dirstat=0
 
-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 4047.13 '--dirstat=0 --cumulative': 
+	git diff --dirstat=0 --cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=0 --cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=0 --cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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 13 - --dirstat=0 --cumulative
 
-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 4047.14 '--dirstat=0,cumulative': 
+	git diff --dirstat=0,cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=0,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=0,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 14 - --dirstat=0,cumulative
 
-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 4047.15 '-X0,cumulative': 
+	git diff -X0,cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff -X0,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff -X0,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 15 - -X0,cumulative
 
-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 4047.16 'diff.dirstat=0,cumulative': 
+	git -c diff.dirstat=0,cumulative diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=0,cumulative diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=0,cumulative diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 16 - diff.dirstat=0,cumulative
 
-expecting success of 4018.29 'builtin fortran pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 07df8aa] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA d0563d5] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 29 - builtin fortran pattern compiles on bare repo with --attr-source
+expecting success of 4047.17 'diff.dirstat=0 & --dirstat=cumulative': 
+	git -c diff.dirstat=0 diff --dirstat=cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=0 diff --dirstat=cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=0 diff --dirstat=cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 17 - diff.dirstat=0 & --dirstat=cumulative
 
-expecting success of 4018.31 'builtin fountain wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 31 - builtin fountain wordRegex pattern compiles
+expecting success of 4047.18 '--dirstat-by-file': 
+	git diff --dirstat-by-file HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat-by-file -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat-by-file -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 18 - --dirstat-by-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
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 33 - builtin golang pattern compiles
+expecting success of 4047.19 '--dirstat=files': 
+	git diff --dirstat=files HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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 19 - --dirstat=files
 
-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 4047.20 'diff.dirstat=files': 
+	git -c diff.dirstat=files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 20 - diff.dirstat=files
 
-expecting success of 4018.37 'builtin html wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 37 - builtin html wordRegex pattern compiles
+expecting success of 4047.21 '--dirstat-by-file=10': 
+	git diff --dirstat-by-file=10 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat-by-file=10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat-by-file=10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 21 - --dirstat-by-file=10
 
-expecting success of 4018.39 'builtin java pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 39 - builtin java pattern compiles
+expecting success of 4047.22 '--dirstat=files,10': 
+	git diff --dirstat=files,10 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 22 - --dirstat=files,10
 
-expecting success of 4018.41 'builtin java pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master c684627] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA dc9d6db] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 41 - builtin java pattern compiles on bare repo with --attr-source
+expecting success of 4047.23 'diff.dirstat=10,files': 
+	git -c diff.dirstat=10,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=10,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=10,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 23 - diff.dirstat=10,files
 
-expecting success of 4018.43 'builtin kotlin wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 43 - builtin kotlin wordRegex pattern compiles
+expecting success of 4047.24 '--dirstat-by-file --cumulative': 
+	git diff --dirstat-by-file --cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat-by-file --cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat-by-file --cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 24 - --dirstat-by-file --cumulative
 
-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 4047.25 '--dirstat=files,cumulative': 
+	git diff --dirstat=files,cumulative HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 25 - --dirstat=files,cumulative
 
-expecting success of 4018.47 'builtin markdown pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master a36ac80] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA b175325] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 47 - builtin markdown pattern compiles on bare repo with --attr-source
+expecting success of 4047.26 'diff.dirstat=cumulative,files': 
+	git -c diff.dirstat=cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 26 - diff.dirstat=cumulative,files
 
-expecting success of 4018.49 'builtin matlab wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 49 - builtin matlab wordRegex pattern compiles
+expecting success of 4047.27 '--dirstat=files,cumulative,10': 
+	git diff --dirstat=files,cumulative,10 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative,10 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative,10 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 27 - --dirstat=files,cumulative,10
 
-expecting success of 4018.51 'builtin objc pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 51 - builtin objc pattern compiles
+expecting success of 4047.28 'diff.dirstat=10,cumulative,files': 
+	git -c diff.dirstat=10,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=10,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=10,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 28 - diff.dirstat=10,cumulative,files
 
-expecting success of 4018.53 'builtin objc pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 542b906] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 40e9567] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 53 - builtin objc pattern compiles on bare repo with --attr-source
+expecting success of 4047.29 '--dirstat=files,cumulative,16.7': 
+	git diff --dirstat=files,cumulative,16.7 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative,16.7 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative,16.7 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 29 - --dirstat=files,cumulative,16.7
 
-expecting success of 4018.55 'builtin pascal wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 55 - builtin pascal wordRegex pattern compiles
+expecting success of 4047.30 'diff.dirstat=16.7,cumulative,files': 
+	git -c diff.dirstat=16.7,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=16.7,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=16.7,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 30 - diff.dirstat=16.7,cumulative,files
 
-expecting success of 4018.57 'builtin perl pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 57 - builtin perl pattern compiles
+expecting success of 4047.31 'diff.dirstat=16.70,cumulative,files': 
+	git -c diff.dirstat=16.70,cumulative,files diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=16.70,cumulative,files diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=16.70,cumulative,files diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 31 - diff.dirstat=16.70,cumulative,files
 
-expecting success of 4018.59 'builtin perl pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master ada864b] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 6fd3d2c] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 59 - builtin perl pattern compiles on bare repo with --attr-source
+expecting success of 4047.32 '--dirstat=files,cumulative,27.2': 
+	git diff --dirstat=files,cumulative,27.2 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative,27.2 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative,27.2 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 32 - --dirstat=files,cumulative,27.2
 
-expecting success of 4018.61 'builtin php wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 61 - builtin php wordRegex pattern compiles
+expecting success of 4047.33 '--dirstat=files,cumulative,27.09': 
+	git diff --dirstat=files,cumulative,27.09 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=files,cumulative,27.09 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=files,cumulative,27.09 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 33 - --dirstat=files,cumulative,27.09
 
-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 4047.34 '--dirstat=lines': 
+	git diff --dirstat=lines HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=lines -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=lines -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 34 - --dirstat=lines
 
-expecting success of 4018.65 'builtin python pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master ad7b0c8] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 9820662] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 65 - builtin python pattern compiles on bare repo with --attr-source
+expecting success of 4047.35 'diff.dirstat=lines': 
+	git -c diff.dirstat=lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 35 - diff.dirstat=lines
 
-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 4047.36 '--dirstat=lines,0': 
+	git diff --dirstat=lines,0 HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git diff --dirstat=lines,0 -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git diff --dirstat=lines,0 -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 4018.68 'builtin ruby pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 41412bb] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 6cd7147] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 68 - builtin ruby pattern compiles on bare repo with --attr-source
+ok 36 - --dirstat=lines,0
 
-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 4047.37 'diff.dirstat=0,lines': 
+	git -c diff.dirstat=0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	git -c diff.dirstat=0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	git -c diff.dirstat=0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC
 
-expecting success of 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
+ok 37 - diff.dirstat=0,lines
 
-expecting success of 4018.71 'builtin rust pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 26ff60e] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA d9df4e2] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 71 - builtin rust pattern compiles on bare repo with --attr-source
+expecting success of 4047.38 '--dirstat=future_param,lines,0 should fail loudly': 
+	test_must_fail git diff --dirstat=future_param,lines,0 HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_must_be_empty actual_diff_dirstat &&
+	test_grep -q "future_param" actual_error &&
+	test_grep -q "\--dirstat" actual_error
 
-expecting success of 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
+ok 38 - --dirstat=future_param,lines,0 should fail loudly
 
-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 4047.39 '--dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters': 
+	test_must_fail git diff --dirstat=dummy1,cumulative,2dummy HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_must_be_empty actual_diff_dirstat &&
+	test_grep -q "dummy1" actual_error &&
+	test_grep -q "2dummy" actual_error &&
+	test_grep -q "\--dirstat" actual_error
 
-expecting success of 4018.74 'builtin scheme pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 1b524cd] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA a0d1221] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 74 - builtin scheme pattern compiles on bare repo with --attr-source
+ok 39 - --dirstat=dummy1,cumulative,2dummy should report both unrecognized parameters
 
-expecting success of 4018.75 'builtin tex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 75 - builtin tex pattern compiles
+expecting success of 4047.40 'diff.dirstat=future_param,0,lines should warn, but still work': 
+	git -c diff.dirstat=future_param,0,lines diff --dirstat HEAD^..HEAD >actual_diff_dirstat 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_cmp expect_diff_dirstat actual_diff_dirstat &&
+	test_grep -q "future_param" actual_error &&
+	test_grep -q "diff\\.dirstat" actual_error &&
 
-expecting success of 4018.76 'builtin tex wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 76 - builtin tex wordRegex pattern compiles
+	git -c diff.dirstat=future_param,0,lines diff --dirstat -M HEAD^..HEAD >actual_diff_dirstat_M 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_cmp expect_diff_dirstat_M actual_diff_dirstat_M &&
+	test_grep -q "future_param" actual_error &&
+	test_grep -q "diff\\.dirstat" actual_error &&
 
-expecting success of 4018.77 'builtin tex pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master de4ccc4] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 6368b67] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 77 - builtin tex pattern compiles on bare repo with --attr-source
+	git -c diff.dirstat=future_param,0,lines diff --dirstat -C -C HEAD^..HEAD >actual_diff_dirstat_CC 2>actual_error &&
+	test_debug "cat actual_error" &&
+	test_cmp expect_diff_dirstat_CC actual_diff_dirstat_CC &&
+	test_grep -q "future_param" actual_error &&
+	test_grep -q "diff\\.dirstat" actual_error
 
-expecting success of 4018.78 'builtin custom1 pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 78 - builtin custom1 pattern compiles
+ok 40 - diff.dirstat=future_param,0,lines should warn, but still work
 
-expecting success of 4018.79 'builtin custom1 wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 79 - builtin custom1 wordRegex pattern compiles
+expecting success of 4047.41 '--shortstat --dirstat should output only one dirstat': 
+	git diff --shortstat --dirstat=changes HEAD^..HEAD >out &&
+	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_changes &&
+	test_line_count = 1 actual_diff_shortstat_dirstat_changes &&
 
-expecting success of 4018.80 'builtin custom1 pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 633ec55] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 5cb29de] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 80 - builtin custom1 pattern compiles on bare repo with --attr-source
+	git diff --shortstat --dirstat=lines HEAD^..HEAD >out &&
+	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_lines &&
+	test_line_count = 1 actual_diff_shortstat_dirstat_lines &&
 
-expecting success of 4018.81 'builtin custom2 pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 81 - builtin custom2 pattern compiles
+	git diff --shortstat --dirstat=files HEAD^..HEAD >out &&
+	grep " dst/copy/changed/$" out >actual_diff_shortstat_dirstat_files &&
+	test_line_count = 1 actual_diff_shortstat_dirstat_files
 
-expecting success of 4018.82 'builtin custom2 wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 82 - builtin custom2 wordRegex pattern compiles
+ok 41 - --shortstat --dirstat should output only one dirstat
 
-expecting success of 4018.83 'builtin custom2 pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 399f11a] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 3432bdd] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 83 - builtin custom2 pattern compiles on bare repo with --attr-source
+# passed all 41 test(s)
+1..41
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4053-diff-no-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-expecting success of 4018.84 'builtin custom3 pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
--A
-+B
-ok 84 - builtin custom3 pattern compiles
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4053-diff-no-index/repo/.git/
+ok 1 - setup
 
-expecting success of 4018.85 'builtin custom3 wordRegex pattern compiles': 
-		echo "*.java diff=$p" >.gitattributes &&
-		test_expect_code 1 git diff --no-index --word-diff \
-			A.java B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
-@@ -1 +1 @@
-[-A-]{+B+}
-ok 85 - builtin custom3 wordRegex pattern compiles
+expecting success of 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
 
-expecting success of 4018.86 'builtin custom3 pattern compiles on bare repo with --attr-source': 
-		test_when_finished "rm -rf bare.git" &&
-		git checkout -B master &&
-		git add . &&
-		echo "*.java diff=notexist" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git checkout -B branchA &&
-		echo "*.java diff=$p" >.gitattributes &&
-		git add .gitattributes &&
-		git commit -am "changing gitattributes" &&
-		git clone --bare --no-local . bare.git &&
-		git -C bare.git symbolic-ref HEAD refs/heads/master &&
-		test_expect_code 1 git -C bare.git --attr-source=branchA \
-			diff --exit-code HEAD:A.java HEAD:B.java 2>msg &&
-		test_grep ! fatal msg &&
-		test_grep ! error msg
-	
-Switched to and reset branch 'master'
-M	.gitattributes
-[master 2a95308] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to and reset branch 'branchA'
-[branchA 90fa73a] changing gitattributes
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'bare.git'...
-diff --git a/A.java b/B.java
-index f70f10e..223b783 100644
---- a/A.java
-+++ b/B.java
+diff --git a/a/1 b/a/2
+index d00491f..0cfbf08 100644
+--- a/a/1
++++ b/a/2
 @@ -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
+-1
++2
+ok 2 - git diff --no-index --exit-code
 
-fatal: Last expression must not be negated: !static
-ok 87 - last regexp must not be negated
+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
 
-expecting success of 4018.88 'setup hunk header tests': 
-	for i in $diffpatterns
-	do
-		echo "$i-* diff=$i" || return 1
-	done > .gitattributes &&
+ok 3 - git diff --no-index directories
 
-	# add all test files to the index
+expecting success of 4053.4 'git diff --no-index relative path outside repo': 
 	(
-		cd "$TEST_DIRECTORY"/t4018 &&
-		git --git-dir="$TRASH_DIRECTORY/.git" add .
-	) &&
-
-	# place modified files in the worktree
-	for i in $(git ls-files)
-	do
-		sed -e "s/ChangeMe/IWasChanged/" <"$TEST_DIRECTORY/t4018/$i" >"$i" || return 1
-	done
-
-ok 88 - setup hunk header tests
-
-expecting success of 4018.89 'hunk header: README': 
-		git diff -U1 README >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ How to write RIGHT test cases
-ok 89 - hunk header: README
-
-expecting success of 4018.90 'hunk header: bash-arithmetic-function': 
-		git diff -U1 bash-arithmetic-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 90 - hunk header: bash-arithmetic-function
-
-expecting success of 4018.91 'hunk header: bash-bashism-style-compact': 
-		git diff -U1 bash-bashism-style-compact >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ function RIGHT {
-ok 91 - hunk header: bash-bashism-style-compact
-
-expecting success of 4018.92 'hunk header: bash-bashism-style-function': 
-		git diff -U1 bash-bashism-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function RIGHT {
-ok 92 - hunk header: bash-bashism-style-function
-
-expecting success of 4018.93 'hunk header: bash-bashism-style-whitespace': 
-		git diff -U1 bash-bashism-style-whitespace >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function 	RIGHT 	( 	) 	{
-ok 93 - hunk header: bash-bashism-style-whitespace
+		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
+	)
 
-expecting success of 4018.94 'hunk header: bash-conditional-function': 
-		git diff -U1 bash-conditional-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 94 - hunk header: bash-conditional-function
+ok 4 - git diff --no-index relative path outside repo
 
-expecting success of 4018.95 'hunk header: bash-missing-parentheses': 
-		git diff -U1 bash-missing-parentheses >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ function RIGHT {
-ok 95 - hunk header: bash-missing-parentheses
+expecting success of 4053.5 'git diff --no-index with broken index': 
+	(
+		cd repo &&
+		echo broken >.git/index &&
+		git diff --no-index a ../non/git/a
+	)
 
-expecting success of 4018.96 'hunk header: bash-mixed-style-compact': 
-		git diff -U1 bash-mixed-style-compact >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function RIGHT(){
-ok 96 - hunk header: bash-mixed-style-compact
+ok 5 - git diff --no-index with broken index
 
-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 4053.6 'git diff outside repo with broken index': 
+	(
+		cd repo &&
+		git diff ../non/git/a ../non/git/b
+	)
 
-expecting success of 4018.98 'hunk header: bash-nested-functions': 
-		git diff -U1 bash-nested-functions >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT()
-ok 98 - hunk header: bash-nested-functions
+ok 6 - git diff outside repo with broken index
 
-expecting success of 4018.99 'hunk header: bash-other-characters': 
-		git diff -U1 bash-other-characters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ _RIGHT_0n()
-ok 99 - hunk header: bash-other-characters
+expecting success of 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
+	)
 
-expecting success of 4018.100 'hunk header: bash-posix-style-compact': 
-		git diff -U1 bash-posix-style-compact >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 100 - hunk header: bash-posix-style-compact
+usage: git diff --no-index [<options>] <path> <path>
+ok 7 - git diff --no-index executed outside repo gives correct error message
 
-expecting success of 4018.101 'hunk header: bash-posix-style-function': 
-		git diff -U1 bash-posix-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 101 - hunk header: bash-posix-style-function
+expecting success of 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 &&
 
-expecting success of 4018.102 'hunk header: bash-posix-style-whitespace': 
-		git diff -U1 bash-posix-style-whitespace >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT 	( 	)
-ok 102 - hunk header: bash-posix-style-whitespace
+		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 &&
 
-expecting success of 4018.103 'hunk header: bash-subshell-function': 
-		git diff -U1 bash-subshell-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 103 - hunk header: bash-subshell-function
+		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 &&
 
-expecting success of 4018.104 'hunk header: bash-trailing-comment': 
-		git diff -U1 bash-trailing-comment >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT()
-ok 104 - hunk header: bash-trailing-comment
+		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
+	)
 
-expecting success of 4018.105 'hunk header: cpp-c++-function': 
-		git diff -U1 cpp-c++-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ Item RIGHT::DoSomething( Args with_spaces )
-ok 105 - hunk header: cpp-c++-function
+ok 8 - diff D F and diff F D
 
-expecting success of 4018.106 'hunk header: cpp-class-constructor': 
-		git diff -U1 cpp-class-constructor >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ Item::Item(int RIGHT)
-ok 106 - hunk header: cpp-class-constructor
+expecting success of 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
+	)
 
-expecting success of 4018.107 'hunk header: cpp-class-constructor-mem-init': 
-		git diff -U1 cpp-class-constructor-mem-init >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ Item::Item(int RIGHT) :
-ok 107 - hunk header: cpp-class-constructor-mem-init
+ok 9 - turning a file into a directory
 
-expecting success of 4018.108 'hunk header: cpp-class-definition': 
-		git diff -U1 cpp-class-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ class RIGHT
-ok 108 - hunk header: cpp-class-definition
+expecting success of 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
 
-expecting success of 4018.109 'hunk header: cpp-class-definition-derived': 
-		git diff -U1 cpp-class-definition-derived >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ class RIGHT :
-ok 109 - hunk header: cpp-class-definition-derived
+ok 10 - diff from repo subdir shows real paths (explicit)
 
-expecting success of 4018.110 'hunk header: cpp-class-destructor': 
-		git diff -U1 cpp-class-destructor >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT::~RIGHT()
-ok 110 - hunk header: cpp-class-destructor
+expecting success of 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
 
-expecting success of 4018.111 'hunk header: cpp-function-returning-global-type': 
-		git diff -U1 cpp-function-returning-global-type >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ ::Item get::it::RIGHT()
-ok 111 - hunk header: cpp-function-returning-global-type
+ok 11 - diff from repo subdir shows real paths (implicit)
 
-expecting success of 4018.112 'hunk header: cpp-function-returning-nested': 
-		git diff -U1 cpp-function-returning-nested >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ get::Item get::it::RIGHT()
-ok 112 - hunk header: cpp-function-returning-nested
+expecting success of 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
 
-expecting success of 4018.113 'hunk header: cpp-function-returning-pointer': 
-		git diff -U1 cpp-function-returning-pointer >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ const char *get_it_RIGHT(char *ptr)
-ok 113 - hunk header: cpp-function-returning-pointer
+ok 12 - diff --no-index from repo subdir respects config (explicit)
 
-expecting success of 4018.114 'hunk header: cpp-function-returning-reference': 
-		git diff -U1 cpp-function-returning-reference >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ string& get::it::RIGHT(char *ptr)
-ok 114 - hunk header: cpp-function-returning-reference
+expecting success of 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
 
-expecting success of 4018.115 'hunk header: cpp-gnu-style-function': 
-		git diff -U1 cpp-gnu-style-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT(int arg)
-ok 115 - hunk header: cpp-gnu-style-function
+ok 13 - diff --no-index from repo subdir respects config (implicit)
 
-expecting success of 4018.116 'hunk header: cpp-namespace-definition': 
-		git diff -U1 cpp-namespace-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ namespace RIGHT
-ok 116 - hunk header: cpp-namespace-definition
+expecting success of 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
 
-expecting success of 4018.117 'hunk header: cpp-operator-definition': 
-		git diff -U1 cpp-operator-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ Value operator+(Value LEFT, Value RIGHT)
-ok 117 - hunk header: cpp-operator-definition
+ok 14 - diff --no-index from repo subdir with absolute paths
 
-expecting success of 4018.118 'hunk header: cpp-skip-access-specifiers': 
-		git diff -U1 cpp-skip-access-specifiers >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ class RIGHT : public Baseclass
-ok 118 - hunk header: cpp-skip-access-specifiers
+expecting success of 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
 
-expecting success of 4018.119 'hunk header: cpp-skip-comment-block': 
-		git diff -U1 cpp-skip-comment-block >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ struct item RIGHT(int i)
-ok 119 - hunk header: cpp-skip-comment-block
+ok 15 - diff --no-index allows external diff
 
-expecting success of 4018.120 'hunk header: cpp-skip-labels': 
-		git diff -U1 cpp-skip-labels >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ void RIGHT (void)
-ok 120 - hunk header: cpp-skip-labels
+expecting success of 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
 
-expecting success of 4018.121 'hunk header: cpp-struct-definition': 
-		git diff -U1 cpp-struct-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ struct RIGHT {
-ok 121 - hunk header: cpp-struct-definition
+ok 16 - diff --no-index normalizes mode: no changes
 
-expecting success of 4018.122 'hunk header: cpp-struct-single-line': 
-		git diff -U1 cpp-struct-single-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,2 +6,2 @@ struct RIGHT_iterator_tag {};
-ok 122 - hunk header: cpp-struct-single-line
+expecting success of 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
 
-expecting success of 4018.123 'hunk header: cpp-template-function-definition': 
-		git diff -U1 cpp-template-function-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ template<class T> int RIGHT(T arg)
-ok 123 - hunk header: cpp-template-function-definition
+ok 17 - diff --no-index normalizes mode: chmod +x
 
-expecting success of 4018.124 'hunk header: cpp-union-definition': 
-		git diff -U1 cpp-union-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ union RIGHT {
-ok 124 - hunk header: cpp-union-definition
+expecting success of 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
 
-expecting success of 4018.125 'hunk header: cpp-void-c-function': 
-		git diff -U1 cpp-void-c-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ void RIGHT (void)
-ok 125 - hunk header: cpp-void-c-function
+ok 18 - diff --no-index normalizes: mode not like git mode
 
-expecting success of 4018.126 'hunk header: csharp-exclude-assignments': 
-		git diff -U1 csharp-exclude-assignments >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -15,3 +15,3 @@ string Method(int RIGHT)
-ok 126 - hunk header: csharp-exclude-assignments
+checking prerequisite: SYMLINKS
 
-expecting success of 4018.127 'hunk header: csharp-exclude-control-statements': 
-		git diff -U1 csharp-exclude-control-statements >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -29,3 +29,3 @@ string Method(int RIGHT)
-ok 127 - hunk header: csharp-exclude-control-statements
+mkdir -p "$TRASH_DIRECTORY/prereq-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 4018.128 'hunk header: csharp-exclude-exceptions': 
-		git diff -U1 csharp-exclude-exceptions >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -24,3 +24,3 @@ string Method(int RIGHT)
-ok 128 - hunk header: csharp-exclude-exceptions
+)
+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
 
-expecting success of 4018.129 'hunk header: csharp-exclude-generic-method-calls': 
-		git diff -U1 csharp-exclude-generic-method-calls >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string Method(int RIGHT)
-ok 129 - hunk header: csharp-exclude-generic-method-calls
+ok 19 - diff --no-index normalizes: mode not like git mode (symlink)
 
-expecting success of 4018.130 'hunk header: csharp-exclude-init-dispose': 
-		git diff -U1 csharp-exclude-init-dispose >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -17,3 +17,3 @@ string Method(int RIGHT)
-ok 130 - hunk header: csharp-exclude-init-dispose
+expecting success of 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
 
-expecting success of 4018.131 'hunk header: csharp-exclude-iterations': 
-		git diff -U1 csharp-exclude-iterations >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -21,3 +21,3 @@ string Method(int RIGHT)
-ok 131 - hunk header: csharp-exclude-iterations
+ok 20 - external diff with mode-only change
 
-expecting success of 4018.132 'hunk header: csharp-exclude-method-calls': 
-		git diff -U1 csharp-exclude-method-calls >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -15,3 +15,3 @@ string Method(int RIGHT)
-ok 132 - hunk header: csharp-exclude-method-calls
+expecting success of 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
 
-expecting success of 4018.133 'hunk header: csharp-exclude-other': 
-		git diff -U1 csharp-exclude-other >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -15,3 +15,3 @@ string Method(int RIGHT)
-ok 133 - hunk header: csharp-exclude-other
+	test_write_lines x | test_expect_code 1 \
+		git -c core.abbrev=no diff --no-index -- - a/1 >actual &&
+	test_cmp expect actual &&
 
-expecting success of 4018.134 'hunk header: csharp-method': 
-		git diff -U1 csharp-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string Method(int RIGHT)
-ok 134 - hunk header: csharp-method
+	test_write_lines 1 | git diff --no-index -- a/1 - >actual &&
+	test_must_be_empty actual
 
-expecting success of 4018.135 'hunk header: csharp-method-array': 
-		git diff -U1 csharp-method-array >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string[] Method(int RIGHT)
-ok 135 - hunk header: csharp-method-array
+ok 21 - diff --no-index treats '-' as stdin
 
-expecting success of 4018.136 'hunk header: csharp-method-explicit': 
-		git diff -U1 csharp-method-explicit >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ void IDisposable.Dispose() // RIGHT
-ok 136 - hunk header: csharp-method-explicit
+expecting success of 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
 
-expecting success of 4018.137 'hunk header: csharp-method-generics': 
-		git diff -U1 csharp-method-generics >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ Example<int, string> Method<TA, TB>(TA RIGHT, TB b)
-ok 137 - hunk header: csharp-method-generics
+	test_write_lines x | test_expect_code 1 \
+		git -c core.abbrev=no diff --no-index -R -- - a/1 >actual &&
+	test_cmp expect actual &&
 
-expecting success of 4018.138 'hunk header: csharp-method-generics-alternate-spaces': 
-		git diff -U1 csharp-method-generics-alternate-spaces >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ Example<int,string> Method<TA ,TB>(TA RIGHT, TB b)
-ok 138 - hunk header: csharp-method-generics-alternate-spaces
+	test_write_lines 1 | git diff --no-index -R -- a/1 - >actual &&
+	test_must_be_empty actual
 
-expecting success of 4018.139 'hunk header: csharp-method-modifiers': 
-		git diff -U1 csharp-method-modifiers >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ static internal async Task Method(int RIGHT)
-ok 139 - hunk header: csharp-method-modifiers
+ok 22 - diff --no-index -R treats '-' as stdin
 
-expecting success of 4018.140 'hunk header: csharp-method-multiline': 
-		git diff -U1 csharp-method-multiline >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string Method_RIGHT(
-ok 140 - hunk header: csharp-method-multiline
+expecting success of 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
 
-expecting success of 4018.141 'hunk header: csharp-method-params': 
-		git diff -U1 csharp-method-params >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string Method(int RIGHT, int b, int c = 42)
-ok 141 - hunk header: csharp-method-params
+fatal: cannot compare stdin to a directory
+ok 23 - diff --no-index refuses to diff stdin and a directory
 
-expecting success of 4018.142 'hunk header: csharp-method-special-chars': 
-		git diff -U1 csharp-method-special-chars >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ @Some_Type @Method_With_Underscore(int RIGHT)
-ok 142 - hunk header: csharp-method-special-chars
+checking prerequisite: PIPE
 
-expecting success of 4018.143 'hunk header: csharp-method-with-spacing': 
-		git diff -U1 csharp-method-with-spacing >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ string   Method 	( int 	RIGHT )
-ok 143 - hunk header: csharp-method-with-spacing
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
 
-expecting success of 4018.144 'hunk header: csharp-property': 
-		git diff -U1 csharp-property >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ public bool RIGHT
-ok 144 - hunk header: csharp-property
+)
+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
 
-expecting success of 4018.145 'hunk header: csharp-property-braces-same-line': 
-		git diff -U1 csharp-property-braces-same-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ public bool RIGHT {
-ok 145 - hunk header: csharp-property-braces-same-line
+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 4018.146 'hunk header: css-attribute-value-selector': 
-		git diff -U1 css-attribute-value-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ [class*="RIGHT"] {
-ok 146 - hunk header: css-attribute-value-selector
+expecting success of 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 $! || :" &&
 
-expecting success of 4018.147 'hunk header: css-block-level-@-statements': 
-		git diff -U1 css-block-level-@-statements >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ @keyframes RIGHT {
-ok 147 - hunk header: css-block-level-@-statements
+	cat >expect <<-EOF &&
+	diff --git a/old b/new-link
+	--- a/old
+	+++ b/new-link
+	@@ -1,3 +1,3 @@
+	 a
+	-b
+	+x
+	 c
+	EOF
 
-expecting success of 4018.148 'hunk header: css-brace-in-col-1': 
-		git diff -U1 css-brace-in-col-1 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT label.control-label
-ok 148 - hunk header: css-brace-in-col-1
+	test_expect_code 1 git diff --no-index old new-link >actual &&
+	test_cmp expect actual
 
-expecting success of 4018.149 'hunk header: css-class-selector': 
-		git diff -U1 css-class-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ .RIGHT {
-ok 149 - hunk header: css-class-selector
+./test-lib.sh: line 1052: kill: (5755) - No such process
+./test-lib.sh: line 1053: kill: (5754) - No such process
+ok 25 - diff --no-index reads from pipes
 
-expecting success of 4018.150 'hunk header: css-colon-eol': 
-		git diff -U1 css-colon-eol >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT h1 {
-ok 150 - hunk header: css-colon-eol
+# passed all 25 test(s)
+1..25
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4055-diff-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4055-diff-context/.git/
+expecting success of 4055.1 'setup': 
+	cat >template <<-\EOF &&
+	firstline
+	b
+	c
+	d
+	e
+	f
+	preline
+	TARGET
+	postline
+	i
+	j
+	k
+	l
+	m
+	n
+	EOF
+	sed "/TARGET/d" >x <template &&
+	git update-index --add x &&
+	git commit -m initial &&
 
-expecting success of 4018.151 'hunk header: css-colon-selector': 
-		git diff -U1 css-colon-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT a:hover {
-ok 151 - hunk header: css-colon-selector
+	sed "s/TARGET/ADDED/" >x <template &&
+	git update-index --add x &&
+	git commit -m next &&
 
-expecting success of 4018.152 'hunk header: css-common': 
-		git diff -U1 css-common >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ RIGHT label.control-label {
-ok 152 - hunk header: css-common
+	sed "s/TARGET/MODIFIED/" >x <template
 
-expecting success of 4018.153 'hunk header: css-id-selector': 
-		git diff -U1 css-id-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ #RIGHT {
-ok 153 - hunk header: css-id-selector
+[master (root-commit) aee64db] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 14 insertions(+)
+ create mode 100644 x
+[master 4ef1dc5] next
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-expecting success of 4018.154 'hunk header: css-long-selector-list': 
-		git diff -U1 css-long-selector-list >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ div ul#RIGHT {
-ok 154 - hunk header: css-long-selector-list
+expecting success of 4055.2 'the default number of context lines is 3': 
+	git diff >output &&
+	! grep "^ d" output &&
+	grep "^ e" output &&
+	grep "^ j" output &&
+	! grep "^ k" output
 
-expecting success of 4018.155 'hunk header: css-prop-sans-indent': 
-		git diff -U1 css-prop-sans-indent >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT, label.control-label {
-ok 155 - hunk header: css-prop-sans-indent
+ e
+ j
+ok 2 - the default number of context lines is 3
 
-expecting success of 4018.156 'hunk header: css-root-selector': 
-		git diff -U1 css-root-selector >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ :RIGHT {
-ok 156 - hunk header: css-root-selector
+expecting success of 4055.3 'diff.context honored by "log"': 
+	git log -1 -p >output &&
+	! grep firstline output &&
+	git config diff.context 8 &&
+	git log -1 -p >output &&
+	grep "^ firstline" output
 
-expecting success of 4018.157 'hunk header: css-short-selector-list': 
-		git diff -U1 css-short-selector-list >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ label.control, div ul#RIGHT {
-ok 157 - hunk header: css-short-selector-list
+ firstline
+ok 3 - diff.context honored by "log"
 
-expecting success of 4018.158 'hunk header: css-trailing-space': 
-		git diff -U1 css-trailing-space >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ RIGHT label.control-label {
-ok 158 - hunk header: css-trailing-space
+expecting success of 4055.4 'The -U option overrides diff.context': 
+	git config diff.context 8 &&
+	git log -U4 -1 >output &&
+	! grep "^ firstline" output
 
-expecting success of 4018.159 'hunk header: custom1-pattern': 
-		git diff -U1 custom1-pattern >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ int special, RIGHT;
-ok 159 - hunk header: custom1-pattern
+ok 4 - The -U option overrides diff.context
 
-expecting success of 4018.160 'hunk header: custom2-match-to-end-of-line': 
-		git diff -U1 custom2-match-to-end-of-line >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ RIGHT_Beer
-ok 160 - hunk header: custom2-match-to-end-of-line
+expecting success of 4055.5 'diff.context honored by "diff"': 
+	git config diff.context 8 &&
+	git diff >output &&
+	grep "^ firstline" output
 
-expecting success of 4018.161 'hunk header: custom3-alternation-in-pattern': 
-		git diff -U1 custom3-alternation-in-pattern >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
-ok 161 - hunk header: custom3-alternation-in-pattern
+ firstline
+ok 5 - diff.context honored by "diff"
 
-expecting success of 4018.162 'hunk header: dts-labels': 
-		git diff -U1 dts-labels >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ label2: RIGHT {
-ok 162 - hunk header: dts-labels
+expecting success of 4055.6 'plumbing not affected': 
+	git config diff.context 8 &&
+	git diff-files -p >output &&
+	! grep "^ firstline" output
 
-expecting success of 4018.163 'hunk header: dts-node-unitless': 
-		git diff -U1 dts-node-unitless >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ RIGHT {
-ok 163 - hunk header: dts-node-unitless
+ok 6 - plumbing not affected
 
-expecting success of 4018.164 'hunk header: dts-nodes': 
-		git diff -U1 dts-nodes >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 {
-ok 164 - hunk header: dts-nodes
+expecting success of 4055.7 'non-integer config parsing': 
+	git config diff.context no &&
+	test_must_fail git diff 2>output &&
+	test_grep "bad numeric config value" output
 
-expecting success of 4018.165 'hunk header: dts-nodes-boolean-prop': 
-		git diff -U1 dts-nodes-boolean-prop >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ RIGHT@deadf00,4000 {
-ok 165 - hunk header: dts-nodes-boolean-prop
+fatal: bad numeric config value 'no' for 'diff.context' in file .git/config: invalid unit
+ok 7 - non-integer config parsing
 
-expecting success of 4018.166 'hunk header: dts-nodes-comment1': 
-		git diff -U1 dts-nodes-comment1 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 /* &a comment */ {
-ok 166 - hunk header: dts-nodes-comment1
+expecting success of 4055.8 'negative integer config parsing': 
+	git config diff.context -1 &&
+	test_must_fail git diff 2>output &&
+	test_grep "bad config variable" output
 
-expecting success of 4018.167 'hunk header: dts-nodes-comment2': 
-		git diff -U1 dts-nodes-comment2 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ RIGHT@deadf00,4000 { /* a trailing comment */
-ok 167 - hunk header: dts-nodes-comment2
+fatal: bad config variable 'diff.context' in file '.git/config' at line 7
+ok 8 - negative integer config parsing
 
-expecting success of 4018.168 'hunk header: dts-nodes-multiline-prop': 
-		git diff -U1 dts-nodes-multiline-prop >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ RIGHT@deadf00,4000 {
-ok 168 - hunk header: dts-nodes-multiline-prop
+expecting success of 4055.9 '-U0 is valid, so is diff.context=0': 
+	git config diff.context 0 &&
+	git diff >output &&
+	grep "^-ADDED" output &&
+	grep "^+MODIFIED" output
 
-expecting success of 4018.169 'hunk header: dts-reference': 
-		git diff -U1 dts-reference >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -7,3 +7,3 @@ &RIGHT {
-ok 169 - hunk header: dts-reference
+-ADDED
++MODIFIED
+ok 9 - -U0 is valid, so is diff.context=0
 
-expecting success of 4018.170 'hunk header: dts-root': 
-		git diff -U1 dts-root >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
-ok 170 - hunk header: dts-root
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4056-diff-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4056-diff-order/.git/
+expecting success of 4056.1 'setup': 
+	mkdir c &&
+	create_files 1 &&
+	create_files 2 &&
 
-expecting success of 4018.171 'hunk header: dts-root-comment': 
-		git diff -U1 dts-root-comment >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ / { RIGHT /* Technically just supposed to be a slash and brace */
-ok 171 - hunk header: dts-root-comment
+	cat >order_file_1 <<-\EOF &&
+	*Makefile
+	*.txt
+	*.h
+	EOF
 
-expecting success of 4018.172 'hunk header: elixir-do-not-pick-end': 
-		git diff -U1 elixir-do-not-pick-end >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,2 +4,2 @@ defmodule RIGHT do
-ok 172 - hunk header: elixir-do-not-pick-end
+	cat >order_file_2 <<-\EOF &&
+	*Makefile
+	*.h
+	*.c
+	EOF
 
-expecting success of 4018.173 'hunk header: elixir-ex-unit-test': 
-		git diff -U1 elixir-ex-unit-test >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ test "RIGHT" do
-ok 173 - hunk header: elixir-ex-unit-test
+	cat >expect_none <<-\EOF &&
+	a.h
+	b.c
+	c/Makefile
+	d.txt
+	EOF
 
-expecting success of 4018.174 'hunk header: elixir-function': 
-		git diff -U1 elixir-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ def function(RIGHT, arg) do
-ok 174 - hunk header: elixir-function
+	cat >expect_1 <<-\EOF &&
+	c/Makefile
+	d.txt
+	a.h
+	b.c
+	EOF
 
-expecting success of 4018.175 'hunk header: elixir-macro': 
-		git diff -U1 elixir-macro >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ defmacro foo(RIGHT) do
-ok 175 - hunk header: elixir-macro
+	cat >expect_2 <<-\EOF
+	c/Makefile
+	a.h
+	b.c
+	d.txt
+	EOF
 
-expecting success of 4018.176 'hunk header: elixir-module': 
-		git diff -U1 elixir-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ defmodule RIGHT do
-ok 176 - hunk header: elixir-module
+[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 4018.177 'hunk header: elixir-module-func': 
-		git diff -U1 elixir-module-func >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ def fun(RIGHT) do
-ok 177 - hunk header: elixir-module-func
+expecting success of 4056.2 'no order (=tree object order)': 
+	git diff --name-only HEAD^..HEAD >actual &&
+	test_cmp expect_none actual
 
-expecting success of 4018.178 'hunk header: elixir-nested-module': 
-		git diff -U1 elixir-nested-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ defmodule MyApp.RIGHT do
-ok 178 - hunk header: elixir-nested-module
+ok 2 - no order (=tree object order)
 
-expecting success of 4018.179 'hunk header: elixir-private-function': 
-		git diff -U1 elixir-private-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ defp function(RIGHT, arg) do
-ok 179 - hunk header: elixir-private-function
+expecting success of 4056.3 'missing orderfile': 
+	rm -f bogus_file &&
+	test_must_fail git diff -Obogus_file --name-only HEAD^..HEAD
 
-expecting success of 4018.180 'hunk header: elixir-protocol': 
-		git diff -U1 elixir-protocol >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ defprotocol RIGHT do
-ok 180 - hunk header: elixir-protocol
+fatal: failed to read orderfile 'bogus_file': No such file or directory
+ok 3 - missing orderfile
 
-expecting success of 4018.181 'hunk header: elixir-protocol-implementation': 
-		git diff -U1 elixir-protocol-implementation >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ defimpl RIGHT do
-ok 181 - hunk header: elixir-protocol-implementation
+checking prerequisite: SANITY
 
-expecting success of 4018.182 'hunk header: fortran-block-data': 
-		git diff -U1 fortran-block-data >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,4 +2,4 @@ BLOCK DATA RIGHT
-ok 182 - hunk header: fortran-block-data
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-expecting success of 4018.183 'hunk header: fortran-comment': 
-		git diff -U1 fortran-comment >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -8,3 +8,3 @@ subroutine RIGHT
-ok 183 - hunk header: fortran-comment
+	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 4018.184 'hunk header: fortran-comment-keyword': 
-		git diff -U1 fortran-comment-keyword >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,3 +9,3 @@ subroutine RIGHT (funcA, funcB)
-ok 184 - hunk header: fortran-comment-keyword
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-expecting success of 4018.185 'hunk header: fortran-comment-legacy': 
-		git diff -U1 fortran-comment-legacy >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -8,3 +8,3 @@ subroutine RIGHT
-ok 185 - hunk header: fortran-comment-legacy
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-expecting success of 4018.186 'hunk header: fortran-comment-legacy-star': 
-		git diff -U1 fortran-comment-legacy-star >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -8,3 +8,3 @@ subroutine RIGHT
-ok 186 - hunk header: fortran-comment-legacy-star
+)
+rm: cannot remove 'SANETESTD.1/x': Permission denied
+prerequisite SANITY ok
+expecting success of 4056.4 'unreadable orderfile': 
+	>unreadable_file &&
+	chmod -r unreadable_file &&
+	test_must_fail git diff -Ounreadable_file --name-only HEAD^..HEAD
 
-expecting success of 4018.187 'hunk header: fortran-external-function': 
-		git diff -U1 fortran-external-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function RIGHT(a, b) result(c)
-ok 187 - hunk header: fortran-external-function
+fatal: failed to read orderfile 'unreadable_file': Permission denied
+ok 4 - unreadable orderfile
 
-expecting success of 4018.188 'hunk header: fortran-external-subroutine': 
-		git diff -U1 fortran-external-subroutine >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ subroutine RIGHT
-ok 188 - hunk header: fortran-external-subroutine
+expecting success of 4056.5 'orderfile using option from subdir with --output': 
+	mkdir subdir &&
+	git -C subdir diff -O../order_file_1 --output ../actual --name-only HEAD^..HEAD &&
+	test_cmp expect_1 actual
 
-expecting success of 4018.189 'hunk header: fortran-module': 
-		git diff -U1 fortran-module >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ module RIGHT
-ok 189 - hunk header: fortran-module
+ok 5 - orderfile using option from subdir with --output
 
-expecting success of 4018.190 'hunk header: fortran-module-procedure': 
-		git diff -U1 fortran-module-procedure >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4056.6 'orderfile using option (1)': 
+		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
 	
-@@ -8,3 +8,3 @@ module RIGHT
-ok 190 - hunk header: fortran-module-procedure
+ok 6 - orderfile using option (1)
 
-expecting success of 4018.191 'hunk header: fortran-program': 
-		git diff -U1 fortran-program >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ program RIGHT
-ok 191 - hunk header: fortran-program
+checking prerequisite: PIPE
 
-expecting success of 4018.192 'hunk header: fountain-scene': 
-		git diff -U1 fountain-scene >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ EXT. STREET RIGHT OUTSIDE - DAY
-ok 192 - hunk header: fountain-scene
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PIPE" &&
+	# test whether the filesystem supports FIFOs
+	test_have_prereq !MINGW,!CYGWIN &&
+	rm -f testfifo && mkfifo testfifo
 
-expecting success of 4018.193 'hunk header: golang-complex-function': 
-		git diff -U1 golang-complex-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+)
+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
 	
-@@ -6,3 +6,3 @@ func (t *Test) RIGHT(a Type) (Type, error) {
-ok 193 - hunk header: golang-complex-function
+ok 7 - orderfile is fifo (1)
 
-expecting success of 4018.194 'hunk header: golang-func': 
-		git diff -U1 golang-func >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+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
 	
-@@ -2,3 +2,3 @@ func RIGHT() {
-ok 194 - hunk header: golang-func
+ok 8 - orderfile using config (1)
 
-expecting success of 4018.195 'hunk header: golang-interface': 
-		git diff -U1 golang-interface >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+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
 	
-@@ -2,3 +2,3 @@ type RIGHT interface {
-ok 195 - hunk header: golang-interface
+ok 9 - cancelling configured orderfile (1)
 
-expecting success of 4018.196 'hunk header: golang-long-func': 
-		git diff -U1 golang-long-func >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+expecting success of 4056.10 'orderfile using option (2)': 
+		git diff -Oorder_file_$i --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
 	
-@@ -3,3 +3,3 @@ func RIGHT(aVeryVeryVeryLongVariableName AVeryVeryVeryLongType,
-ok 196 - hunk header: golang-long-func
+ok 10 - orderfile using option (2)
 
-expecting success of 4018.197 'hunk header: golang-struct': 
-		git diff -U1 golang-struct >actual &&
-		grep '@@ .* @@.*RIGHT' actual
+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
 	
-@@ -2,3 +2,3 @@ type RIGHT struct {
-ok 197 - hunk header: golang-struct
+ok 11 - orderfile is fifo (2)
 
-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 4056.12 'orderfile using config (2)': 
+		git -c diff.orderfile=order_file_$i diff --name-only HEAD^..HEAD >actual &&
+		test_cmp expect_$i actual
 	
-@@ -4,3 +4,3 @@ class RIGHT
-ok 198 - hunk header: java-class-brace-on-separate-line
+ok 12 - orderfile using config (2)
 
-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 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
 	
-@@ -9,3 +9,3 @@ public static void main(String RIGHT[])
-ok 199 - hunk header: java-class-member-function
+ok 13 - cancelling configured orderfile (2)
 
-expecting success of 4018.200 'hunk header: java-class-space-before-type-parameters': 
-		git diff -U1 java-class-space-before-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ class RIGHT <TYPE, PARAMS, AFTER, SPACE> {
-ok 200 - hunk header: java-class-space-before-type-parameters
+expecting success of 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
 
-expecting success of 4018.201 'hunk header: java-class-type-parameters': 
-		git diff -U1 java-class-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ class RIGHT<A, B> {
-ok 201 - hunk header: java-class-type-parameters
+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 4018.202 'hunk header: java-class-type-parameters-implements': 
-		git diff -U1 java-class-type-parameters-implements >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ class RIGHT<A, B> implements List<A> {
-ok 202 - hunk header: java-class-type-parameters-implements
+expecting success of 4056.15 'combine-diff: no order (=tree object order)': 
+	git diff --name-only HEAD HEAD^ HEAD^2 >actual &&
+	test_cmp expect_none actual
 
-expecting success of 4018.203 'hunk header: java-enum-constant': 
-		git diff -U1 java-enum-constant >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ private enum RIGHT {
-ok 203 - hunk header: java-enum-constant
+ok 15 - combine-diff: no order (=tree object order)
 
-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 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
 	
-@@ -4,3 +4,3 @@ interface RIGHT<A, B> {
-ok 204 - hunk header: java-interface-type-parameters
+ok 16 - combine-diff: orderfile using option (1)
 
-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 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
 	
-@@ -4,3 +4,3 @@ interface RIGHT<A, B> extends Function<A, B> {
-ok 205 - hunk header: java-interface-type-parameters-extends
+ok 17 - combine-diff: orderfile using option (2)
 
-expecting success of 4018.206 'hunk header: java-method-return-generic-bounded': 
-		git diff -U1 java-method-return-generic-bounded >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ public <T extends Bar & Foo<T>, R> Map<T, R[]> foo(String[] RIGHT) {
-ok 206 - hunk header: java-method-return-generic-bounded
+expecting success of 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
 
-expecting success of 4018.207 'hunk header: java-method-return-generic-wildcard': 
-		git diff -U1 java-method-return-generic-wildcard >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ public List<? extends Comparable> foo(String[] RIGHT) {
-ok 207 - hunk header: java-method-return-generic-wildcard
+[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 4018.208 'hunk header: java-nested-field': 
-		git diff -U1 java-nested-field >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ private static class RIGHT {
-ok 208 - hunk header: java-nested-field
+expecting success of 4056.19 'diff --rotate-to': 
+	git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
+	test_write_lines sample2.t sample4.t sample1.t >expect &&
+	test_cmp expect actual
 
-expecting success of 4018.209 'hunk header: java-non-sealed': 
-		git diff -U1 java-non-sealed >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ public static non-sealed class RIGHT extends SealedClass {
-ok 209 - hunk header: java-non-sealed
+ok 19 - diff --rotate-to
 
-expecting success of 4018.210 'hunk header: java-record': 
-		git diff -U1 java-record >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public record RIGHT(int comp1, double comp2, String comp3) {
-ok 210 - hunk header: java-record
+expecting success of 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
 
-expecting success of 4018.211 'hunk header: java-record-space-before-components': 
-		git diff -U1 java-record-space-before-components >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public record RIGHT (String components, String after, String space) {
-ok 211 - hunk header: java-record-space-before-components
+ok 20 - diff --skip-to
 
-expecting success of 4018.212 'hunk header: java-record-type-parameters': 
-		git diff -U1 java-record-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public record RIGHT<A, N extends Number>(A comp1, N comp2, int comp3) {
-ok 212 - hunk header: java-record-type-parameters
+expecting success of 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^
 
-expecting success of 4018.213 'hunk header: java-sealed': 
-		git diff -U1 java-sealed >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class Sealed { // RIGHT
-ok 213 - hunk header: java-sealed
+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 4018.214 'hunk header: java-sealed-permits': 
-		git diff -U1 java-sealed-permits >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT permits PermittedA, PermittedB {
-ok 214 - hunk header: java-sealed-permits
+expecting success of 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 &&
 
-expecting success of 4018.215 'hunk header: java-sealed-type-parameters': 
-		git diff -U1 java-sealed-type-parameters >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> {
-ok 215 - hunk header: java-sealed-type-parameters
+	cat >expect <<-\EOF &&
+	commit
+	sample4.t
+	sample1.t
+	sample2.t
+	commit
+	sample3.t
+	sample4.t
+	sample1.t
+	sample2.t
+	EOF
 
-expecting success of 4018.216 'hunk header: java-sealed-type-parameters-implements-permits': 
-		git diff -U1 java-sealed-type-parameters-implements-permits >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> implements List<A> permits PermittedA,
-ok 216 - hunk header: java-sealed-type-parameters-implements-permits
+	test_cmp expect actual
 
-expecting success of 4018.217 'hunk header: java-sealed-type-parameters-permits': 
-		git diff -U1 java-sealed-type-parameters-permits >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ public abstract sealed class RIGHT<A, B> permits PermittedA, PermittedB {
-ok 217 - hunk header: java-sealed-type-parameters-permits
+ok 22 - log --rotate-to
 
-expecting success of 4018.218 'hunk header: kotlin-class': 
-		git diff -U1 kotlin-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ class RIGHT {
-ok 218 - hunk header: kotlin-class
+expecting success of 4056.23 'log --skip-to': 
+	git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
+	# just distill the commit header and paths
+	sed -n -e "s/^commit.*/commit/p" \
+	       -e "/^:/s/^.*	//p" raw >actual &&
 
-expecting success of 4018.219 'hunk header: kotlin-enum-class': 
-		git diff -U1 kotlin-enum-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ enum class RIGHT{
-ok 219 - hunk header: kotlin-enum-class
+	cat >expect <<-\EOF &&
+	commit
+	sample4.t
+	commit
+	sample3.t
+	sample4.t
+	EOF
 
-expecting success of 4018.220 'hunk header: kotlin-fun': 
-		git diff -U1 kotlin-fun >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ fun RIGHT(){
-ok 220 - hunk header: kotlin-fun
+	test_cmp expect actual
 
-expecting success of 4018.221 'hunk header: kotlin-inheritace-class': 
-		git diff -U1 kotlin-inheritace-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ open class RIGHT{
-ok 221 - hunk header: kotlin-inheritace-class
+ok 23 - log --skip-to
 
-expecting success of 4018.222 'hunk header: kotlin-inline-class': 
-		git diff -U1 kotlin-inline-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ value class RIGHT(Args){
-ok 222 - hunk header: kotlin-inline-class
+# passed all 23 test(s)
+1..23
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4057-diff-combined-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4057-diff-combined-paths/.git/
+expecting success of 4057.1 'trivial merge - combine-diff empty': 
+	for i in $(test_seq 1 9)
+	do
+		echo $i >$i.txt &&
+		git add $i.txt || return 1
+	done &&
+	git commit -m "init" &&
+	git checkout -b side &&
+	for i in $(test_seq 2 9)
+	do
+		echo $i/2 >>$i.txt || return 1
+	done &&
+	git commit -a -m "side 2-9" &&
+	git checkout main &&
+	echo 1/2 >1.txt &&
+	git commit -a -m "main 1" &&
+	git merge side &&
+	>diffc.expect &&
+	diffc_verify
 
-expecting success of 4018.223 'hunk header: kotlin-interface': 
-		git diff -U1 kotlin-interface >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ interface RIGHT{
-ok 223 - hunk header: kotlin-interface
+[main (root-commit) 0e4c78d] init
+ Author: A U Thor <author@example.com>
+ 9 files changed, 9 insertions(+)
+ create mode 100644 1.txt
+ create mode 100644 2.txt
+ create mode 100644 3.txt
+ create mode 100644 4.txt
+ create mode 100644 5.txt
+ create mode 100644 6.txt
+ create mode 100644 7.txt
+ create mode 100644 8.txt
+ create mode 100644 9.txt
+Switched to a new branch 'side'
+[side 18d7b5a] side 2-9
+ Author: A U Thor <author@example.com>
+ 8 files changed, 8 insertions(+)
+Switched to branch 'main'
+[main 0d0c265] main 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merge made by the 'ort' strategy.
+ 2.txt | 1 +
+ 3.txt | 1 +
+ 4.txt | 1 +
+ 5.txt | 1 +
+ 6.txt | 1 +
+ 7.txt | 1 +
+ 8.txt | 1 +
+ 9.txt | 1 +
+ 8 files changed, 8 insertions(+)
+ok 1 - trivial merge - combine-diff empty
 
-expecting success of 4018.224 'hunk header: kotlin-nested-fun': 
-		git diff -U1 kotlin-nested-fun >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,3 +5,3 @@ fun RIGHT(  a:Int){
-ok 224 - hunk header: kotlin-nested-fun
+expecting success of 4057.2 'only one truly conflicting path': 
+	git checkout side &&
+	for i in $(test_seq 2 9)
+	do
+		echo $i/3 >>$i.txt || return 1
+	done &&
+	echo "4side" >>4.txt &&
+	git commit -a -m "side 2-9 +4" &&
+	git checkout main &&
+	for i in $(test_seq 1 9)
+	do
+		echo $i/3 >>$i.txt || return 1
+	done &&
+	echo "4main" >>4.txt &&
+	git commit -a -m "main 1-9 +4" &&
+	test_must_fail git merge side &&
+	cat <<-\EOF >4.txt &&
+	4
+	4/2
+	4/3
+	4main
+	4side
+	EOF
+	git add 4.txt &&
+	git commit -m "merge side (2)" &&
+	echo 4.txt >diffc.expect &&
+	diffc_verify
 
-expecting success of 4018.225 'hunk header: kotlin-public-class': 
-		git diff -U1 kotlin-public-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ public class RIGHT{
-ok 225 - hunk header: kotlin-public-class
+Switched to branch 'side'
+[side ff32fb3] side 2-9 +4
+ Author: A U Thor <author@example.com>
+ 8 files changed, 9 insertions(+)
+Switched to branch 'main'
+[main 0b5ecd8] main 1-9 +4
+ Author: A U Thor <author@example.com>
+ 9 files changed, 10 insertions(+)
+Auto-merging 4.txt
+CONFLICT (content): Merge conflict in 4.txt
+Automatic merge failed; fix conflicts and then commit the result.
+[main 6619a01] merge side (2)
+ Author: A U Thor <author@example.com>
+ok 2 - only one truly conflicting path
 
-expecting success of 4018.226 'hunk header: kotlin-sealed-class': 
-		git diff -U1 kotlin-sealed-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ sealed class RIGHT {
-ok 226 - hunk header: kotlin-sealed-class
+expecting success of 4057.3 'merge introduces new file': 
+	git checkout side &&
+	for i in $(test_seq 5 9)
+	do
+		echo $i/4 >>$i.txt || return 1
+	done &&
+	git commit -a -m "side 5-9" &&
+	git checkout main &&
+	for i in $(test_seq 1 3)
+	do
+		echo $i/4 >>$i.txt || return 1
+	done &&
+	git commit -a -m "main 1-3 +4hello" &&
+	git merge side &&
+	echo "Hello World" >4hello.txt &&
+	git add 4hello.txt &&
+	git commit --amend &&
+	echo 4hello.txt >diffc.expect &&
+	diffc_verify
 
-expecting success of 4018.227 'hunk header: markdown-heading-indented': 
-		git diff -U1 markdown-heading-indented >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -5,2 +5,2 @@    ### RIGHT
-ok 227 - hunk header: markdown-heading-indented
+Switched to branch 'side'
+[side e8c29ca] side 5-9
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+Switched to branch 'main'
+[main 0635bd5] main 1-3 +4hello
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+Merge made by the 'ort' strategy.
+ 5.txt | 1 +
+ 6.txt | 1 +
+ 7.txt | 1 +
+ 8.txt | 1 +
+ 9.txt | 1 +
+ 5 files changed, 5 insertions(+)
+[main 7d30ccd] Merge branch 'side'
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ok 3 - merge introduces new file
 
-expecting success of 4018.228 'hunk header: markdown-heading-non-headings': 
-		git diff -U1 markdown-heading-non-headings >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -16,2 +16,2 @@ # RIGHT
-ok 228 - hunk header: markdown-heading-non-headings
+expecting success of 4057.4 'merge removed a file': 
+	git checkout side &&
+	for i in $(test_seq 5 9)
+	do
+		echo $i/5 >>$i.txt || return 1
+	done &&
+	git commit -a -m "side 5-9" &&
+	git checkout main &&
+	for i in $(test_seq 1 3)
+	do
+		echo $i/4 >>$i.txt || return 1
+	done &&
+	git commit -a -m "main 1-3" &&
+	git merge side &&
+	git rm 4.txt &&
+	git commit --amend &&
+	echo 4.txt >diffc.expect &&
+	diffc_verify
 
-expecting success of 4018.229 'hunk header: matlab-class-definition': 
-		git diff -U1 matlab-class-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ classdef RIGHT
-ok 229 - hunk header: matlab-class-definition
+Switched to branch 'side'
+[side da3ab5d] side 5-9
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+Switched to branch 'main'
+[main 61e8724] main 1-3
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+Merge made by the 'ort' strategy.
+ 5.txt | 1 +
+ 6.txt | 1 +
+ 7.txt | 1 +
+ 8.txt | 1 +
+ 9.txt | 1 +
+ 5 files changed, 5 insertions(+)
+rm '4.txt'
+[main dd9bbd5] Merge branch 'side'
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ok 4 - merge removed a file
 
-expecting success of 4018.230 'hunk header: matlab-function': 
-		git diff -U1 matlab-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function y = RIGHT()
-ok 230 - hunk header: matlab-function
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4058-diff-duplicates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4058-diff-duplicates/.git/
+expecting success of 4058.1 'create trees with duplicate entries': 
+	blob_one=$(echo one | git hash-object -w --stdin) &&
+	blob_two=$(echo two | git hash-object -w --stdin) &&
+	inner_one_a=$(make_tree \
+		100644 inner $blob_one
+	) &&
+	inner_one_b=$(make_tree \
+		100644 inner $blob_two \
+		100644 inner $blob_two \
+		100644 inner $blob_two
+	) &&
+	outer_one=$(make_tree \
+		040000 outer $inner_one_a \
+		040000 outer $inner_one_b
+	) &&
+	inner_two=$(make_tree \
+		100644 inner $blob_one \
+		100644 inner $blob_two \
+		100644 inner $blob_two \
+		100644 inner $blob_two
+	) &&
+	outer_two=$(make_tree \
+		040000 outer $inner_two
+	) &&
+	git tag one $outer_one &&
+	git tag two $outer_two
 
-expecting success of 4018.231 'hunk header: matlab-octave-section-1': 
-		git diff -U1 matlab-octave-section-1 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,2 +2,2 @@ %%% RIGHT section
-ok 231 - hunk header: matlab-octave-section-1
+ok 1 - create trees with duplicate entries
 
-expecting success of 4018.232 'hunk header: matlab-octave-section-2': 
-		git diff -U1 matlab-octave-section-2 >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,2 +2,2 @@ ## RIGHT section
-ok 232 - hunk header: matlab-octave-section-2
+expecting success of 4058.2 'create tree without duplicate entries': 
+	blob_one=$(echo one | git hash-object -w --stdin) &&
+	outer_three=$(make_tree \
+		100644 renamed $blob_one
+	) &&
+	git tag three $outer_three
 
-expecting success of 4018.233 'hunk header: matlab-section': 
-		git diff -U1 matlab-section >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,2 +2,2 @@ %% RIGHT section
-ok 233 - hunk header: matlab-section
+ok 2 - create tree without duplicate entries
 
-expecting success of 4018.234 'hunk header: perl-skip-end-of-heredoc': 
-		git diff -U1 perl-skip-end-of-heredoc >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -6,3 +6,3 @@ sub RIGHTwithheredocument {
-ok 234 - hunk header: perl-skip-end-of-heredoc
+expecting success of 4058.3 'diff-tree between duplicate trees': 
+	# See NOTICE at top of file
+	{
+		printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
+		printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
+		printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n"
+	} >expect &&
+	git diff-tree -r --no-abbrev one two >actual &&
+	test_cmp expect actual
 
-expecting success of 4018.235 'hunk header: perl-skip-forward-decl': 
-		git diff -U1 perl-skip-forward-decl >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -9,2 +9,2 @@ package RIGHT;
-ok 235 - hunk header: perl-skip-forward-decl
+ok 3 - diff-tree between duplicate trees
 
-expecting success of 4018.236 'hunk header: perl-skip-sub-in-pod': 
-		git diff -U1 perl-skip-sub-in-pod >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -15,3 +15,3 @@ =head1 SYNOPSIS_RIGHT
-ok 236 - hunk header: perl-skip-sub-in-pod
+expecting success of 4058.4 'diff-tree with renames': 
+	# See NOTICE at top of file.
+	git diff-tree -M -r --no-abbrev one two >actual &&
+	test_must_be_empty actual
 
-expecting success of 4018.237 'hunk header: perl-sub-definition': 
-		git diff -U1 perl-sub-definition >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ sub RIGHT {
-ok 237 - hunk header: perl-sub-definition
+ok 4 - diff-tree with renames
 
-expecting success of 4018.238 'hunk header: perl-sub-definition-kr-brace': 
-		git diff -U1 perl-sub-definition-kr-brace >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ sub RIGHT
-ok 238 - hunk header: perl-sub-definition-kr-brace
+expecting success of 4058.5 'diff-tree FROM duplicate tree': 
+	# See NOTICE at top of file.
+	{
+		printf ":100644 000000 $blob_one $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":000000 100644 $ZERO_OID $blob_one A\trenamed\n"
+	} >expect &&
+	git diff-tree -r --no-abbrev one three >actual &&
+	test_cmp expect actual
 
-expecting success of 4018.239 'hunk header: php-abstract-class': 
-		git diff -U1 php-abstract-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ abstract class RIGHT
-ok 239 - hunk header: php-abstract-class
+ok 5 - diff-tree FROM duplicate tree
 
-expecting success of 4018.240 'hunk header: php-abstract-method': 
-		git diff -U1 php-abstract-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ abstract public function RIGHT(): ?string
-ok 240 - hunk header: php-abstract-method
+expecting success of 4058.6 'diff-tree FROM duplicate tree, with renames': 
+	# See NOTICE at top of file.
+	{
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 100644 $blob_one $blob_one R100\touter/inner\trenamed\n"
+	} >expect &&
+	git diff-tree -M -r --no-abbrev one three >actual &&
+	test_cmp expect actual
 
-expecting success of 4018.241 'hunk header: php-class': 
-		git diff -U1 php-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ class RIGHT
-ok 241 - hunk header: php-class
+ok 6 - diff-tree FROM duplicate tree, with renames
 
-expecting success of 4018.242 'hunk header: php-enum': 
-		git diff -U1 php-enum >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ enum RIGHT: string
-ok 242 - hunk header: php-enum
+expecting success of 4058.7 'create a few commits': 
+	git commit-tree -m "Duplicate Entries" two^{tree} >commit_id &&
+	git branch base $(cat commit_id) &&
 
-expecting success of 4018.243 'hunk header: php-final-class': 
-		git diff -U1 php-final-class >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ final class RIGHT
-ok 243 - hunk header: php-final-class
+	git commit-tree -p $(cat commit_id) -m "Just one" three^{tree} >up &&
+	git branch update $(cat up) &&
 
-expecting success of 4018.244 'hunk header: php-final-method': 
-		git diff -U1 php-final-method >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -4,3 +4,3 @@ final public function RIGHT(): string
-ok 244 - hunk header: php-final-method
+	git commit-tree -p $(cat up) -m "Back to weird" two^{tree} >final &&
+	git branch final $(cat final) &&
 
-expecting success of 4018.245 'hunk header: php-function': 
-		git diff -U1 php-function >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -2,3 +2,3 @@ function RIGHT()
-ok 245 - hunk header: php-function
+	rm commit_id up final
 
-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
+ok 7 - create a few commits
 
-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
+checking known breakage of 4058.8 'git read-tree does not segfault': 
+	test_when_finished rm .git/index.lock &&
+	test_might_fail git read-tree --reset base
 
-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
+/build/reproducible-path/git-2.45.2/t/test-lib-functions.sh: line 1140:  6503 Segmentation fault      "$@" 2>&7
+test_must_fail: died by signal 11: git read-tree --reset base
+not ok 8 - git read-tree does not segfault # TODO known breakage
 
-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
+checking known breakage of 4058.9 'reset --hard does not segfault': 
+	test_when_finished rm .git/index.lock &&
+	git checkout base &&
+	test_might_fail git reset --hard
 
-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
+Switched to branch 'base'
+M	outer/inner
+D	outer/inner
+D	outer/inner
+D	outer/inner
+/build/reproducible-path/git-2.45.2/t/test-lib-functions.sh: line 1140:  6557 Segmentation fault      "$@" 2>&7
+test_must_fail: died by signal 11: git reset --hard
+not ok 9 - reset --hard does not segfault # TODO known breakage
 
-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
+checking known breakage of 4058.10 'git diff HEAD does not segfault': 
+	git checkout base &&
+	GIT_TEST_CHECK_CACHE_TREE=false &&
+	git reset --hard &&
+	test_might_fail git diff HEAD
 
-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
+Already on 'base'
+M	outer/inner
+D	outer/inner
+D	outer/inner
+D	outer/inner
+HEAD is now at 0a0d081 Duplicate Entries
+/build/reproducible-path/git-2.45.2/t/test-lib-functions.sh: line 1140:  6642 Segmentation fault      "$@" 2>&7
+test_must_fail: died by signal 11: git diff HEAD
+not ok 10 - git diff HEAD does not segfault # TODO known breakage
 
-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
+checking known breakage of 4058.11 'can switch to another branch when status is empty': 
+	git clean -ffdqx &&
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual &&
+	git checkout update
 
-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
+error: Your local changes to the following files would be overwritten by checkout:
+	outer/inner
+Please commit your changes or stash them before you switch branches.
+Aborting
+not ok 11 - can switch to another branch when status is empty # TODO known breakage
 
-expecting success of 4018.255 'hunk header: rust-fn': 
-		git diff -U1 rust-fn >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ pub(self) fn RIGHT<T>(x: &[T]) where T: Debug {
-ok 255 - hunk header: rust-fn
+expecting success of 4058.12 'forcibly switch to another branch, verify status empty': 
+	git checkout -f update &&
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual
 
-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
+Switched to branch 'update'
+ok 12 - forcibly switch to another branch, verify status empty
 
-expecting success of 4018.257 'hunk header: rust-macro-rules': 
-		git diff -U1 rust-macro-rules >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,3 +3,3 @@ macro_rules! RIGHT {
-ok 257 - hunk header: rust-macro-rules
+expecting success of 4058.13 'fast-forward from non-duplicate entries to duplicate': 
+	git merge final
 
-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
+Updating 4814dcd..c713d2c
+Fast-forward
+ renamed => outer/inner | 0
+ outer/inner            | 1 +
+ outer/inner            | 1 +
+ outer/inner            | 1 +
+ 4 files changed, 3 insertions(+)
+ rename renamed => outer/inner (100%)
+ create mode 100644 outer/inner
+ create mode 100644 outer/inner
+ create mode 100644 outer/inner
+ok 13 - fast-forward from non-duplicate entries to duplicate
 
-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
+checking known breakage of 4058.14 'clean status, switch branches, status still clean': 
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual &&
+	git checkout base &&
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual
 
-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
+'actual' is not empty, it contains:
+M  outer/inner
+not ok 14 - clean status, switch branches, status still clean # TODO known breakage
 
-expecting success of 4018.261 'hunk header: scheme-def': 
-		git diff -U1 scheme-def >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (def (some-func x y z) RIGHT
-ok 261 - hunk header: scheme-def
+expecting success of 4058.15 'switch to base branch and force status to be clean': 
+	git checkout base &&
+	GIT_TEST_CHECK_CACHE_TREE=false git reset --hard &&
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual
 
-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
+Switched to branch 'base'
+M	outer/inner
+D	outer/inner
+D	outer/inner
+D	outer/inner
+HEAD is now at 0a0d081 Duplicate Entries
+ok 15 - switch to base branch and force status to be clean
 
-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
+checking known breakage of 4058.16 'fast-forward from duplicate entries to non-duplicate': 
+	git merge update
 
-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
+./test-lib.sh: line 1053:  6794 Segmentation fault      git merge update
+not ok 16 - fast-forward from duplicate entries to non-duplicate # TODO known breakage
 
-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
+# still have 6 known breakage(s)
+# passed all remaining 10 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4062-diff-pickaxe.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4062-diff-pickaxe/.git/
+expecting success of 4062.1 'setup': 
+	test_commit initial &&
+	printf "%04096d" 0 >4096-zeroes.txt &&
+	git add 4096-zeroes.txt &&
+	test_tick &&
+	git commit -m "A 4k file"
 
-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
+[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 4018.267 'hunk header: scheme-local-define': 
-		git diff -U1 scheme-local-define >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (define local-function RIGHT
-ok 267 - hunk header: scheme-local-define
+expecting success of 4062.2 '-G matches': 
+	git diff --name-only -G "^(0{64}){64}$" HEAD^ >out &&
+	test 4096-zeroes.txt = "$(cat out)"
 
-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
+ok 2 - -G matches
 
-expecting success of 4018.269 'hunk header: scheme-top-level-define': 
-		git diff -U1 scheme-top-level-define >actual &&
-		grep '@@ .* @@.*RIGHT' actual
-	
-@@ -3,2 +3,2 @@ (define (some-func x y z) RIGHT
-ok 269 - hunk header: scheme-top-level-define
+expecting success of 4062.3 '-S --pickaxe-regex': 
+	git diff --name-only -S0 --pickaxe-regex HEAD^ >out &&
+	test 4096-zeroes.txt = "$(cat out)"
 
-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
+ok 3 - -S --pickaxe-regex
 
-# passed all 270 test(s)
-1..270
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4052-stat-output.sh ***
@@ -257256,82 +255579,1078 @@
 1..88
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4101-apply-nonl.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4101-apply-nonl/.git/
-expecting success of 4101.1 'apply diff between 0 and 1': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 1 - apply diff between 0 and 1
+*** t4059-diff-submodule-not-initialized.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4059-diff-submodule-not-initialized/sm2/.git/
+36d39d8
+1beffeb
+ok 1 - setup - submodules
 
-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 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 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
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4059-diff-submodule-not-initialized/sm1'...
+done.
+ok 2 - setup - git submodule add
 
-expecting success of 4101.5 'apply diff between 1 and 2': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 5 - apply diff between 1 and 2
+expecting success of 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 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
+ok 3 - submodule directory removed
 
-expecting success of 4101.7 'apply diff between 2 and 0': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 7 - apply diff between 2 and 0
+expecting success of 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 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
+Submodule path 'sm1': checked out '1beffeb46f4c598c329381e14c03d952fb2e60d8'
+ok 4 - setup - submodule multiple commits
 
-expecting success of 4101.9 'apply diff between 2 and 3': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 9 - apply diff between 2 and 3
+expecting success of 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 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
+ok 5 - submodule removed multiple commits
 
-expecting success of 4101.11 'apply diff between 3 and 1': 
-	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
-	test_cmp frotz.$j frotz
-    
-ok 11 - apply diff between 3 and 1
+expecting success of 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 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
+Cloning into 'sm3'...
+done.
+ok 6 - submodule not initialized in new clone
 
-# passed all 12 test(s)
-1..12
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4063-diff-blobs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4063-diff-blobs/.git/
+expecting success of 4063.1 'create some blobs': 
+	echo one >one &&
+	echo two >two &&
+	chmod +x two &&
+	git add . &&
+
+	# cover systems where modes are ignored
+	git update-index --chmod=+x two &&
+
+	git commit -m base &&
+
+	sha1_one=$(git rev-parse HEAD:one) &&
+	sha1_two=$(git rev-parse HEAD:two)
+
+[master (root-commit) e18d699] base
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100755 two
+ok 1 - create some blobs
+
+expecting success of 4063.2 'diff by sha1': 
+	run_diff $sha1_one $sha1_two
+
+ok 2 - diff by sha1
+
+expecting success of 4063.3 'index of sha1 diff': 
+	check_index $sha1_one $sha1_two
+
+index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871 100644
+ok 3 - index of sha1 diff
+
+expecting success of 4063.4 'sha1 diff uses arguments as paths': 
+	check_paths $sha1_one $sha1_two
+
+diff --git a/5626abf0f72e58d7a153368ba57db4c673c0e171 b/f719efd430d52bcfc8566a43b2eb655688d38871
+ok 4 - sha1 diff uses arguments as paths
+
+expecting success of 4063.5 'sha1 diff has no mode change': 
+	! grep mode diff
+
+ok 5 - sha1 diff has no mode change
+
+expecting success of 4063.6 'diff by tree:path (run)': 
+	run_diff HEAD:one HEAD:two
+
+ok 6 - diff by tree:path (run)
+
+expecting success of 4063.7 'index of tree:path diff': 
+	check_index $sha1_one $sha1_two
+
+index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
+ok 7 - index of tree:path diff
+
+expecting success of 4063.8 'tree:path diff uses filenames as paths': 
+	check_paths one two
+
+diff --git a/one b/two
+ok 8 - tree:path diff uses filenames as paths
+
+expecting success of 4063.9 'tree:path diff shows mode change': 
+	check_mode 100644 100755
+
+old mode 100644
+new mode 100755
+ok 9 - tree:path diff shows mode change
+
+expecting success of 4063.10 'diff by ranged tree:path': 
+	run_diff HEAD:one..HEAD:two
+
+ok 10 - diff by ranged tree:path
+
+expecting success of 4063.11 'index of ranged tree:path diff': 
+	check_index $sha1_one $sha1_two
+
+index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
+ok 11 - index of ranged tree:path diff
+
+expecting success of 4063.12 'ranged tree:path diff uses filenames as paths': 
+	check_paths one two
+
+diff --git a/one b/two
+ok 12 - ranged tree:path diff uses filenames as paths
+
+expecting success of 4063.13 'ranged tree:path diff shows mode change': 
+	check_mode 100644 100755
+
+old mode 100644
+new mode 100755
+ok 13 - ranged tree:path diff shows mode change
+
+expecting success of 4063.14 'diff blob against file': 
+	run_diff HEAD:one two
+
+ok 14 - diff blob against file
+
+expecting success of 4063.15 'index of blob-file diff': 
+	check_index $sha1_one $sha1_two
+
+index 5626abf0f72e58d7a153368ba57db4c673c0e171..f719efd430d52bcfc8566a43b2eb655688d38871
+ok 15 - index of blob-file diff
+
+expecting success of 4063.16 'blob-file diff uses filename as paths': 
+	check_paths one two
+
+diff --git a/one b/two
+ok 16 - blob-file diff uses filename as paths
+
+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 4063.17 'blob-file diff shows mode change': 
+	check_mode 100644 100755
+
+old mode 100644
+new mode 100755
+ok 17 - blob-file diff shows mode change
+
+expecting success of 4063.18 'blob-file diff prefers filename to sha1': 
+	run_diff $sha1_one two &&
+	check_paths two two
+
+diff --git a/two b/two
+ok 18 - blob-file diff prefers filename to sha1
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4061-diff-indent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4066-diff-emit-delay.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4064-diff-oidfind.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4064-diff-oidfind/.git/
+expecting success of 4064.1 'setup ': 
+	git commit --allow-empty -m "empty initial commit" &&
+
+	echo "Hello, world!" >greeting &&
+	git add greeting &&
+	git commit -m "add the greeting blob" && # borrowed from Git from the Bottom Up
+	git tag -m "the blob" greeting $(git rev-parse HEAD:greeting) &&
+
+	echo asdf >unrelated &&
+	git add unrelated &&
+	git commit -m "unrelated history" &&
+
+	git revert HEAD^ &&
+
+	git commit --allow-empty -m "another unrelated commit"
+
+[master (root-commit) 274b021] empty initial commit
+ Author: A U Thor <author@example.com>
+[master bae5752] add the greeting blob
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 greeting
+[master 87e1d9b] unrelated history
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated
+[master 395f7b3] Revert "add the greeting blob"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 greeting
+[master edd3a99] another unrelated commit
+ Author: A U Thor <author@example.com>
+ok 1 - setup 
+
+expecting success of 4064.2 'find the greeting blob': 
+	cat >expect <<-EOF &&
+	Revert "add the greeting blob"
+	add the greeting blob
+	EOF
+
+	git log --format=%s --find-object=greeting^{blob} >actual &&
+
+	test_cmp expect actual
+
+ok 2 - find the greeting blob
+
+expecting success of 4064.3 'setup a tree': 
+	mkdir a &&
+	echo asdf >a/file &&
+	git add a/file &&
+	git commit -m "add a file in a subdirectory"
+
+[master 5912b3f] add a file in a subdirectory
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/file
+ok 3 - setup a tree
+
+expecting success of 4064.4 'find a tree': 
+	cat >expect <<-EOF &&
+	add a file in a subdirectory
+	EOF
+
+	git log --format=%s -t --find-object=HEAD:a >actual &&
+
+	test_cmp expect actual
+
+ok 4 - find a tree
+
+expecting success of 4064.5 'setup a submodule': 
+	test_create_repo sub &&
+	test_commit -C sub sub &&
+	git submodule add ./sub sub &&
+	git commit -a -m "add sub"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4064-diff-oidfind/sub/.git/
+[master (root-commit) 672648c] sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 sub.t
+Adding existing repo at 'sub' to the index
+[master 9b6ab80] add sub
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 5 - setup a submodule
+
+expecting success of 4064.6 'find a submodule': 
+	cat >expect <<-EOF &&
+	add sub
+	EOF
+
+	git log --format=%s --find-object=HEAD:sub >actual &&
+
+	test_cmp expect actual
+
+ok 6 - find a submodule
+
+expecting success of 4064.7 'set up merge tests': 
+	test_commit base &&
+
+	git checkout -b boring base^ &&
+	echo boring >file &&
+	git add file &&
+	git commit -m boring &&
+
+	git checkout -b interesting base^ &&
+	echo interesting >file &&
+	git add file &&
+	git commit -m interesting &&
+
+	blob=$(git rev-parse interesting:file)
+
+[master df80aba] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Switched to a new branch 'boring'
+[boring 6e5eceb] boring
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'interesting'
+[interesting 9f8795e] interesting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 7 - set up merge tests
+
+expecting success of 4064.8 'detect merge which introduces blob': 
+	git checkout -B merge base &&
+	git merge --no-commit boring &&
+	echo interesting >file &&
+	git commit -am "introduce blob" &&
+	git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual &&
+	cat >expect <<-\EOF &&
+	introduce blob
+
+	AM	file
+	EOF
+	test_cmp expect actual
+
+Switched to a new branch 'merge'
+Automatic merge went well; stopped before committing as requested
+[merge 691f20d] introduce blob
+ Author: A U Thor <author@example.com>
+ok 8 - detect merge which introduces blob
+
+expecting success of 4064.9 'detect merge which removes blob': 
+	git checkout -B merge interesting &&
+	git merge --no-commit base &&
+	echo boring >file &&
+	git commit -am "remove blob" &&
+	git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual &&
+	cat >expect <<-\EOF &&
+	remove blob
+
+	MA	file
+	EOF
+	test_cmp expect actual
+
+Reset branch 'merge'
+Automatic merge went well; stopped before committing as requested
+[merge 5a6d6f7] remove blob
+ Author: A U Thor <author@example.com>
+ok 9 - detect merge which removes blob
+
+expecting success of 4064.10 'do not detect merge that does not touch blob': 
+	git checkout -B merge interesting &&
+	git merge -m "untouched blob" base &&
+	git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual &&
+	cat >expect <<-\EOF &&
+	untouched blob
+
+	EOF
+	test_cmp expect actual
+
+Reset branch 'merge'
+Merge made by the 'ort' strategy.
+ base.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+ok 10 - do not detect merge that does not touch blob
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4065-diff-anchored.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4065-diff-anchored/.git/
+expecting success of 4065.1 '--anchored': 
+	printf "a\nb\nc\n" >pre &&
+	printf "c\na\nb\n" >post &&
+
+	# normally, c is moved to produce the smallest diff
+	test_expect_code 1 git diff --no-index pre post >diff &&
+	grep "^+c" diff &&
+
+	# with anchor, a is moved
+	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
+	grep "^+a" diff
+
++c
++a
+ok 1 - --anchored
+
+expecting success of 4065.2 '--anchored multiple': 
+	printf "a\nb\nc\nd\ne\nf\n" >pre &&
+	printf "c\na\nb\nf\nd\ne\n" >post &&
+
+	# with 1 anchor, c is not moved, but f is moved
+	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
+	grep "^+a" diff && # a is moved instead of c
+	grep "^+f" diff &&
+
+	# with 2 anchors, c and f are not moved
+	test_expect_code 1 git diff --no-index --anchored=c --anchored=f pre post >diff &&
+	grep "^+a" diff &&
+	grep "^+d" diff # d is moved instead of f
+
++a
++f
++a
++d
+ok 2 - --anchored multiple
+
+expecting success of 4065.3 '--anchored with nonexistent line has no effect': 
+	printf "a\nb\nc\n" >pre &&
+	printf "c\na\nb\n" >post &&
+
+	test_expect_code 1 git diff --no-index --anchored=x pre post >diff &&
+	grep "^+c" diff
+
++c
+ok 3 - --anchored with nonexistent line has no effect
+
+expecting success of 4065.4 '--anchored with non-unique line has no effect': 
+	printf "a\nb\nc\nd\ne\nc\n" >pre &&
+	printf "c\na\nb\nc\nd\ne\n" >post &&
+
+	test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
+	grep "^+c" diff
+
++c
+ok 4 - --anchored with non-unique line has no effect
+
+expecting success of 4065.5 'diff still produced with impossible multiple --anchored': 
+	printf "a\nb\nc\n" >pre &&
+	printf "c\na\nb\n" >post &&
+
+	test_expect_code 1 git diff --no-index --anchored=a --anchored=c pre post >diff &&
+	mv post expected_post &&
+
+	# Ensure that the diff is correct by applying it and then
+	# comparing the result with the original
+	git apply diff &&
+	diff expected_post post
+
+ok 5 - diff still produced with impossible multiple --anchored
+
+expecting success of 4065.6 'later algorithm arguments override earlier ones': 
+	printf "a\nb\nc\n" >pre &&
+	printf "c\na\nb\n" >post &&
+
+	test_expect_code 1 git diff --no-index --patience --anchored=c pre post >diff &&
+	grep "^+a" diff &&
+
+	test_expect_code 1 git diff --no-index --anchored=c --patience pre post >diff &&
+	grep "^+c" diff &&
+
+	test_expect_code 1 git diff --no-index --histogram --anchored=c pre post >diff &&
+	grep "^+a" diff &&
+
+	test_expect_code 1 git diff --no-index --anchored=c --histogram pre post >diff &&
+	grep "^+c" diff
+
++a
++c
++a
++c
+ok 6 - later algorithm arguments override earlier ones
+
+expecting success of 4065.7 '--anchored works with other commands like "git show"': 
+	printf "a\nb\nc\n" >file &&
+	git add file &&
+	git commit -m foo &&
+	printf "c\na\nb\n" >file &&
+	git add file &&
+	git commit -m foo &&
+
+	# with anchor, a is moved
+	git show --patience --anchored=c >diff &&
+	grep "^+a" diff
+
+[master (root-commit) 59a79f0] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 file
+[master 798b1ed] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
++a
+ok 7 - --anchored works with other commands like "git show"
+
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4100-apply-stat.sh ***
@@ -257466,6 +256785,84 @@
 1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4101-apply-nonl.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4101-apply-nonl/.git/
+expecting success of 4101.1 'apply diff between 0 and 1': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 1 - apply diff between 0 and 1
+
+expecting success of 4101.2 'apply diff between 0 and 2': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 2 - apply diff between 0 and 2
+
+expecting success of 4101.3 'apply diff between 0 and 3': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 3 - apply diff between 0 and 3
+
+expecting success of 4101.4 'apply diff between 1 and 0': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 4 - apply diff between 1 and 0
+
+expecting success of 4101.5 'apply diff between 1 and 2': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 5 - apply diff between 1 and 2
+
+expecting success of 4101.6 'apply diff between 1 and 3': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 6 - apply diff between 1 and 3
+
+expecting success of 4101.7 'apply diff between 2 and 0': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 7 - apply diff between 2 and 0
+
+expecting success of 4101.8 'apply diff between 2 and 1': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 8 - apply diff between 2 and 1
+
+expecting success of 4101.9 'apply diff between 2 and 3': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 9 - apply diff between 2 and 3
+
+expecting success of 4101.10 'apply diff between 3 and 0': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 10 - apply diff between 3 and 0
+
+expecting success of 4101.11 'apply diff between 3 and 1': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 11 - apply diff between 3 and 1
+
+expecting success of 4101.12 'apply diff between 3 and 2': 
+	git apply <"$TEST_DIRECTORY"/t4101/diff.$i-$j &&
+	test_cmp frotz.$j frotz
+    
+ok 12 - apply diff between 3 and 2
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4060-diff-submodule-option-diff-format.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4060-diff-submodule-option-diff-format/.git/
 expecting success of 4060.1 'setup repository': 
@@ -258435,163 +257832,415 @@
 1..50
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4102-apply-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4102-apply-rename/.git/
-expecting success of 4102.1 'setup': git update-index --add foo
-ok 1 - setup
+*** t4069-remerge-diff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4069-remerge-diff/.git/
+expecting success of 4069.1 'setup basic merges': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m base &&
 
-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
+	git branch feature_a &&
+	git branch feature_b &&
+	git branch feature_c &&
 
-checking prerequisite: FILEMODE
+	git branch ab_resolution &&
+	git branch bc_resolution &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-	test "$(git config --bool core.filemode)" = true
+	git checkout feature_a &&
+	test_write_lines 1 2 three 4 5 6 7 eight 9 >numbers &&
+	git commit -a -m change_a &&
 
-)
-prerequisite FILEMODE ok
-expecting success of 4102.3 'validate': test -f bar && ls -l bar | grep "^-..x......"
--rwxr-xr-x 1 pbuilder1 pbuilder1 12 Dec 18 01:35 bar
-ok 3 - validate
+	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 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
+	git checkout feature_c &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
+	git commit -a -m change_c &&
 
-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 +-
+	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(-)
- copy foo => bar (47%)
-ok 5 - apply copy
+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
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4105-apply-fuzz.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4105-apply-fuzz/.git/
-expecting success of 4105.1 'setup': 
+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
 
-	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 2 - remerge-diff on a clean merge
 
-	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 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
 
-	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 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 &&
 
-ok 1 - setup
+	git show --oneline --remerge-diff ab_resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect actual
 
-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
+ok 4 - remerge-diff with both a resolved conflict and an unrelated change
 
-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 4069.5 'pickaxe still includes additional headers for relevant changes': 
+	# reuses "expect" from the previous testcase
 
-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
+	git log --oneline --remerge-diff -Sacht ab_resolution >tmp &&
+	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
+	test_cmp expect 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 5 - pickaxe still includes additional headers for relevant changes
 
-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 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 &&
 
-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
+	git show --remerge-diff -S"not present" --all >actual &&
+	test_must_be_empty actual
 
-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
+ok 6 - can filter out additional headers with pickaxe
 
-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
+expecting success of 4069.7 'setup non-content conflicts': 
+	git switch --orphan base &&
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4106-apply-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4106-apply-stdin/.git/
-expecting success of 4106.1 'setup': 
-	echo hello >text &&
-	git add text &&
-	echo goodbye >text &&
-	git diff >patch
+	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 &&
 
-ok 1 - setup
+	git branch side1 &&
+	git branch side2 &&
 
-expecting success of 4106.2 'git apply --numstat - < patch': 
-	echo "1	1	text" >expect &&
-	git apply --numstat - <patch >actual &&
+	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 7 - setup non-content conflicts
+
+expecting success of 4069.8 '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 2 - git apply --numstat - < patch
+ok 8 - remerge-diff with non-content conflicts
 
-expecting success of 4106.3 'git apply --numstat - < patch patch': 
-	cat >expect <<-\EOF &&
-	1	1	text
-	1	1	text
+expecting success of 4069.9 '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
-	git apply --numstat - < patch patch >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 &&
+
+	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 3 - git apply --numstat - < patch patch
+ok 9 - remerge-diff w/ diff-filter=U: all conflict headers, no diff content
 
-# passed all 3 test(s)
-1..3
+expecting success of 4069.10 '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 10 - submodule formatting ignores additional headers
+
+expecting success of 4069.11 '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 11 - remerge-diff w/ diff-filter=R: relevant file + conflict header
+
+expecting success of 4069.12 '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 12 - remerge-diff w/ pathspec: limits to relevant file including conflict header
+
+expecting success of 4069.13 'setup non-content conflicts': 
+	git switch --orphan newbase &&
+
+	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m base &&
+
+	git branch newside1 &&
+	git branch newside2 &&
+
+	git checkout newside1 &&
+	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m side1 &&
+
+	git checkout newside2 &&
+	test_write_lines 1 2 drei 4 5 6 7 8 9 >numbers &&
+	git add numbers &&
+	git commit -m side2 &&
+
+	git checkout -b newresolution newside1 &&
+	test_must_fail git merge newside2 &&
+	git checkout --theirs numbers &&
+	git add -u numbers &&
+	git commit -m resolved
+
+Switched to a new branch 'newbase'
+[newbase (root-commit) 0f94a91] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 numbers
+Switched to branch 'newside1'
+[newside1 96f1e45] side1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'newside2'
+[newside2 4fd522f] side2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'newresolution'
+Auto-merging numbers
+CONFLICT (content): Merge conflict in numbers
+Automatic merge failed; fix conflicts and then commit the result.
+Updated 1 path from the index
+[newresolution f8f340c] resolved
+ Author: A U Thor <author@example.com>
+ok 13 - setup non-content conflicts
+
+expecting success of 4069.14 '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 14 - remerge-diff turns off history simplification
+
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4068-diff-symmetric-merge-base.sh ***
@@ -258999,6 +258648,503 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4067-diff-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/.git/
+expecting success of 4067.1 'git show batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	echo b >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure that there is exactly 1 negotiation by checking that there is
+	# only 1 "done" line sent. ("done" marks the end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) 525c234] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Cloning into bare repository 'client'...
+commit 525c234aab2853ed2b1af6e508caf4b08300c8c7
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    x
+
+diff --git a/a b/a
+new file mode 100644
+index 0000000..7898192
+--- /dev/null
++++ b/a
+@@ -0,0 +1 @@
++a
+diff --git a/b b/b
+new file mode 100644
+index 0000000..6178079
+--- /dev/null
++++ b/b
+@@ -0,0 +1 @@
++b
+ok 1 - git show batches blobs
+
+expecting success of 4067.2 'diff batches blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	echo b >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	echo c >server/c &&
+	echo d >server/d &&
+	git -C server add c d &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure that there is exactly 1 negotiation by checking that there is
+	# only 1 "done" line sent. ("done" marks the end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) 525c234] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master f59c7b0] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 c
+ create mode 100644 d
+Cloning into bare repository 'client'...
+diff --git a/c b/c
+new file mode 100644
+index 0000000..f2ad6c7
+--- /dev/null
++++ b/c
+@@ -0,0 +1 @@
++c
+diff --git a/d b/d
+new file mode 100644
+index 0000000..4bcfe98
+--- /dev/null
++++ b/d
+@@ -0,0 +1 @@
++d
+ok 2 - diff batches blobs
+
+expecting success of 4067.3 'diff skips same-OID blobs': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	echo b >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	echo another-a >server/a &&
+	git -C server add a &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	echo a | git hash-object --stdin >hash-old-a &&
+	echo another-a | git hash-object --stdin >hash-new-a &&
+	echo b | git hash-object --stdin >hash-b &&
+
+	# Ensure that only a and another-a are fetched.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "want $(cat hash-old-a)" trace &&
+	grep "want $(cat hash-new-a)" trace &&
+	! grep "want $(cat hash-b)" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) 525c234] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 89f0cea] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into bare repository 'client'...
+diff --git a/a b/a
+index 7898192..594b61f 100644
+--- a/a
++++ b/a
+@@ -1 +1 @@
+-a
++another-a
+packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
+packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
+ok 3 - diff skips same-OID blobs
+
+expecting success of 4067.4 'when fetching missing objects, diff skips GITLINKs': 
+	test_when_finished "rm -rf sub server client trace" &&
+	test_config_global protocol.file.allow always &&
+
+	test_create_repo sub &&
+	test_commit -C sub first &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	git -C server add a &&
+	git -C server submodule add "file://$(pwd)/sub" &&
+	git -C server commit -m x &&
+
+	test_commit -C server/sub second &&
+	echo another-a >server/a &&
+	git -C server add a sub &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	echo a | git hash-object --stdin >hash-old-a &&
+	echo another-a | git hash-object --stdin >hash-new-a &&
+
+	# Ensure that a and another-a are fetched, and check (by successful
+	# execution of the diff) that no invalid OIDs are sent.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
+	grep "want $(cat hash-old-a)" trace &&
+	grep "want $(cat hash-new-a)" trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/sub/.git/
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/sub'...
+[master (root-commit) 126d236] 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 be568ab] 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.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) a6f879b] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 263bf49] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename b => c (72%)
+Cloning into bare repository 'client'...
+:100644 100644 33db23e f46cdb7 R072	b	c
+ok 5 - diff with rename detection batches blobs
+
+expecting success of 4067.6 'diff does not fetch anything if inexact rename detection is not needed': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	mv server/b server/c &&
+	git -C server add c &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	test_path_is_missing trace
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) a6f879b] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 2759f1d] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => c (100%)
+Cloning into bare repository 'client'...
+:100644 100644 33db23e 33db23e R100	b	c
+ok 6 - diff does not fetch anything if inexact rename detection is not needed
+
+expecting success of 4067.7 'diff --break-rewrites fetches only if necessary, and batches blobs if it does': 
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	printf "c\nc\nc\nc\nc\n" >server/b &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	test_path_is_missing trace &&
+
+	# But with --break-rewrites, ensure that there is exactly 1 negotiation
+	# by checking that there is only 1 "done" line sent. ("done" marks the
+	# end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --break-rewrites --raw -M HEAD^ HEAD &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
+[master (root-commit) a6f879b] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 6 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[master 3aba490] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Cloning into bare repository 'client'...
+:100644 100644 33db23e 6e7ada2 M	b
+:100644 100644 33db23e 6e7ada2 M	b
+ok 7 - diff --break-rewrites fetches only if necessary, and batches blobs if it does
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4102-apply-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4102-apply-rename/.git/
+expecting success of 4102.1 'setup': git update-index --add foo
+ok 1 - setup
+
+expecting success of 4102.2 'apply': git apply --index --stat --summary --apply test-patch
+ bar |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ rename foo => bar (47%)
+ok 2 - apply
+
+checking prerequisite: FILEMODE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
+	test "$(git config --bool core.filemode)" = true
+
+)
+prerequisite FILEMODE ok
+expecting success of 4102.3 'validate': test -f bar && ls -l bar | grep "^-..x......"
+-rwxr-xr-x 1 pbuilder2 pbuilder2 12 Nov 14 19:34 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4106-apply-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4106-apply-stdin/.git/
+expecting success of 4106.1 'setup': 
+	echo hello >text &&
+	git add text &&
+	echo goodbye >text &&
+	git diff >patch
+
+ok 1 - setup
+
+expecting success of 4106.2 'git apply --numstat - < patch': 
+	echo "1	1	text" >expect &&
+	git apply --numstat - <patch >actual &&
+	test_cmp expect actual
+
+ok 2 - git apply --numstat - < patch
+
+expecting success of 4106.3 'git apply --numstat - < patch patch': 
+	cat >expect <<-\EOF &&
+	1	1	text
+	1	1	text
+	EOF
+	git apply --numstat - < patch patch >actual &&
+	test_cmp expect actual
+
+ok 3 - git apply --numstat - < patch patch
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4105-apply-fuzz.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4105-apply-fuzz/.git/
+expecting success of 4105.1 'setup': 
+
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 11 12 >file &&
+	git update-index --add file &&
+	test_write_lines 1 2 3 4 5 6 7 a b c d e 8 9 10 11 12 >file &&
+	cat file >expect &&
+	git diff >O0.diff &&
+
+	sed -e "s/@@ -5,6 +5,11 @@/@@ -2,6 +2,11 @@/" >O1.diff O0.diff &&
+	sed -e "s/@@ -5,6 +5,11 @@/@@ -7,6 +7,11 @@/" >O2.diff O0.diff &&
+	sed -e "s/@@ -5,6 +5,11 @@/@@ -19,6 +19,11 @@/" >O3.diff O0.diff &&
+
+	sed -e "s/^ 5/ S/" >F0.diff O0.diff &&
+	sed -e "s/^ 5/ S/" >F1.diff O1.diff &&
+	sed -e "s/^ 5/ S/" >F2.diff O2.diff &&
+	sed -e "s/^ 5/ S/" >F3.diff O3.diff
+
+
+ok 1 - setup
+
+expecting success of 4105.2 'unmodified patch': 
+		git checkout-index -f -q -u file &&
+		git apply O0.diff &&
+		test_cmp expect file
+	
+ok 2 - unmodified patch
+
+expecting success of 4105.3 'minus offset': 
+		git checkout-index -f -q -u file &&
+		git apply O1.diff &&
+		test_cmp expect file
+	
+ok 3 - minus offset
+
+expecting success of 4105.4 'plus offset': 
+		git checkout-index -f -q -u file &&
+		git apply O2.diff &&
+		test_cmp expect file
+	
+ok 4 - plus offset
+
+expecting success of 4105.5 'big offset': 
+		git checkout-index -f -q -u file &&
+		git apply O3.diff &&
+		test_cmp expect file
+	
+ok 5 - big offset
+
+expecting success of 4105.6 'fuzz with no offset': 
+		git checkout-index -f -q -u file &&
+		git apply -C2 F0.diff &&
+		test_cmp expect file
+	
+Context reduced to (2/2) to apply fragment at 6
+ok 6 - fuzz with no offset
+
+expecting success of 4105.7 'fuzz with minus offset': 
+		git checkout-index -f -q -u file &&
+		git apply -C2 F1.diff &&
+		test_cmp expect file
+	
+Context reduced to (2/2) to apply fragment at 6
+ok 7 - fuzz with minus offset
+
+expecting success of 4105.8 'fuzz with plus offset': 
+		git checkout-index -f -q -u file &&
+		git apply -C2 F2.diff &&
+		test_cmp expect file
+	
+Context reduced to (2/2) to apply fragment at 6
+ok 8 - fuzz with plus offset
+
+expecting success of 4105.9 'fuzz with big offset': 
+		git checkout-index -f -q -u file &&
+		git apply -C2 F3.diff &&
+		test_cmp expect file
+	
+Context reduced to (2/2) to apply fragment at 6
+ok 9 - fuzz with big offset
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4107-apply-ignore-whitespace.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4107-apply-ignore-whitespace/.git/
 expecting success of 4107.1 'file creation': 
@@ -259082,415 +259228,255 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4069-remerge-diff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4069-remerge-diff/.git/
-expecting success of 4069.1 'setup basic merges': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git commit -m base &&
-
-	git branch feature_a &&
-	git branch feature_b &&
-	git branch feature_c &&
-
-	git branch ab_resolution &&
-	git branch bc_resolution &&
-
-	git checkout feature_a &&
-	test_write_lines 1 2 three 4 5 6 7 eight 9 >numbers &&
-	git commit -a -m change_a &&
-
-	git checkout feature_b &&
-	test_write_lines 1 2 tres 4 5 6 7 8 9 >numbers &&
-	git commit -a -m change_b &&
-
-	git checkout feature_c &&
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
-	git commit -a -m change_c &&
-
-	git checkout bc_resolution &&
-	git merge --ff-only feature_b &&
-	# no conflict
-	git merge feature_c &&
-
-	git checkout ab_resolution &&
-	git merge --ff-only feature_a &&
-	# conflicts!
-	test_must_fail git merge feature_b &&
-	# Resolve conflict...and make another change elsewhere
-	test_write_lines 1 2 drei 4 5 6 7 acht 9 >numbers &&
-	git add numbers &&
-	git merge --continue
-
-[master (root-commit) 0f94a91] base
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 numbers
-Switched to branch 'feature_a'
-[feature_a b0ed5cb] change_a
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Switched to branch 'feature_b'
-[feature_b 6cd3f82] change_b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'feature_c'
-[feature_c b325327] change_c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'bc_resolution'
-Updating 0f94a91..6cd3f82
-Fast-forward
- numbers | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging numbers
-Merge made by the 'ort' strategy.
- numbers | 1 +
- 1 file changed, 1 insertion(+)
-Switched to branch 'ab_resolution'
-Updating 0f94a91..b0ed5cb
-Fast-forward
- numbers | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Auto-merging numbers
-CONFLICT (content): Merge conflict in numbers
-Automatic merge failed; fix conflicts and then commit the result.
-[ab_resolution 4d00047] Merge branch 'feature_b' into ab_resolution
- Author: A U Thor <author@example.com>
-ok 1 - setup basic merges
-
-expecting success of 4069.2 'remerge-diff on a clean merge': 
-	git log -1 --oneline bc_resolution >expect &&
-	git show --oneline --remerge-diff bc_resolution >actual &&
-	test_cmp expect actual
-
-ok 2 - remerge-diff on a clean merge
-
-expecting success of 4069.3 'remerge-diff on a clean merge with a filter': 
-	git show --oneline --remerge-diff --diff-filter=U bc_resolution >actual &&
-	test_must_be_empty actual
-
-ok 3 - remerge-diff on a clean merge with a filter
-
-expecting success of 4069.4 'remerge-diff with both a resolved conflict and an unrelated change': 
-	git log -1 --oneline ab_resolution >tmp &&
-	cat <<-EOF >>tmp &&
-	diff --git a/numbers b/numbers
-	remerge CONFLICT (content): Merge conflict in numbers
-	index a1fb731..6875544 100644
-	--- a/numbers
-	+++ b/numbers
-	@@ -1,13 +1,9 @@
-	 1
-	 2
-	-<<<<<<< b0ed5cb (change_a)
-	-three
-	-=======
-	-tres
-	->>>>>>> 6cd3f82 (change_b)
-	+drei
-	 4
-	 5
-	 6
-	 7
-	-eight
-	+acht
-	 9
-	EOF
-	# Hashes above are sha1; rip them out so test works with sha256
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >expect &&
-
-	git show --oneline --remerge-diff ab_resolution >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 4 - remerge-diff with both a resolved conflict and an unrelated change
-
-expecting success of 4069.5 'pickaxe still includes additional headers for relevant changes': 
-	# reuses "expect" from the previous testcase
-
-	git log --oneline --remerge-diff -Sacht ab_resolution >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
-
-ok 5 - pickaxe still includes additional headers for relevant changes
-
-expecting success of 4069.6 'can filter out additional headers with pickaxe': 
-	git show --remerge-diff --submodule=log --find-object=HEAD ab_resolution >actual &&
-	test_must_be_empty actual &&
+*** t4104-apply-boundary.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 
-	git show --remerge-diff -S"not present" --all >actual &&
-	test_must_be_empty actual
+	# add to the head
+	test_write_lines a b $L y >victim &&
+	cat victim >add-a-expect &&
+	git diff victim >add-a-patch.with &&
+	git diff --unified=0 >add-a-patch.without &&
 
-ok 6 - can filter out additional headers with pickaxe
+	# insert at line two
+	test_write_lines b a $L y >victim &&
+	cat victim >insert-a-expect &&
+	git diff victim >insert-a-patch.with &&
+	git diff --unified=0 >insert-a-patch.without &&
 
-expecting success of 4069.7 'setup non-content conflicts': 
-	git switch --orphan base &&
+	# 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 &&
 
-	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 &&
+	# 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 &&
 
-	git branch side1 &&
-	git branch side2 &&
+	# add to the tail
+	test_write_lines b $L y z >victim &&
+	cat victim >add-z-expect &&
+	git diff victim >add-z-patch.with &&
+	git diff --unified=0 >add-z-patch.without &&
 
-	git 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 &&
+	# modify at the tail
+	test_write_lines b $L z >victim &&
+	cat victim >mod-z-expect &&
+	git diff victim >mod-z-patch.with &&
+	git diff --unified=0 >mod-z-patch.without &&
 
-	git checkout 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 &&
+	# remove from the tail
+	test_write_lines b $L >victim &&
+	cat victim >del-z-expect &&
+	git diff victim >del-z-patch.with &&
+	git diff --unified=0 >del-z-patch.without
 
-	git 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
+	# done
 
-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 7 - setup non-content conflicts
+ok 1 - setup
 
-expecting success of 4069.8 '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 &&
+expecting success of 4104.2 'apply add-a-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 2 - apply add-a-patch with context
 
-	git show --oneline --remerge-diff resolution >tmp &&
-	sed -e "s/[0-9a-f]\{7,\}/HASH/g" tmp >actual &&
-	test_cmp expect actual
+expecting success of 4104.3 'apply add-z-patch with context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 3 - apply add-z-patch with context
 
-ok 8 - remerge-diff with non-content conflicts
+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 4069.9 '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 &&
+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
 
-	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
+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
 
-ok 9 - remerge-diff w/ diff-filter=U: all conflict headers, no diff content
+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 4069.10 'submodule formatting ignores additional headers': 
-	# Reuses "expect" from last testcase
+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
 
-	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 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
 
-ok 10 - submodule formatting ignores additional headers
+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 4069.11 '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 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
 
-	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
+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
 
-ok 11 - remerge-diff w/ diff-filter=R: relevant file + conflict header
+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 4069.12 '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 &&
+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
 
-	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 4104.15 'apply del-z-patch without context': 
+			cat original >victim &&
+			git update-index victim &&
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
+		
+ok 15 - apply del-z-patch without context
 
-ok 12 - remerge-diff w/ pathspec: limits to relevant file including conflict header
+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 4069.13 'setup non-content conflicts': 
-	git switch --orphan newbase &&
+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
 
-	test_write_lines 1 2 3 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git commit -m base &&
+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
 
-	git branch newside1 &&
-	git branch newside2 &&
+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
 
-	git checkout newside1 &&
-	test_write_lines 1 2 three 4 5 6 7 8 9 >numbers &&
-	git add numbers &&
-	git commit -m side1 &&
+expecting success of 4104.20 'apply non-git mod-z-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 20 - apply non-git mod-z-patch without context
 
-	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 4104.21 'apply non-git del-a-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 21 - apply non-git del-a-patch without context
 
-	git checkout -b newresolution newside1 &&
-	test_must_fail git merge newside2 &&
-	git checkout --theirs numbers &&
-	git add -u numbers &&
-	git commit -m resolved
+expecting success of 4104.22 'apply non-git del-z-patch without context': 
+		cat original >victim &&
+		git update-index victim &&
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
+	
+ok 22 - apply non-git del-z-patch without context
 
-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 13 - setup non-content conflicts
+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
 
-expecting success of 4069.14 '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 &&
+error: patch failed: file:0
+error: file: patch does not apply
+ok 23 - two lines
 
-	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 4104.24 'apply patch with 3 context lines matching at end': 
+	test_write_lines a b c d >file &&
+	git add file &&
+	echo e >>file &&
+	git diff >patch &&
+	>file &&
+	test_must_fail git apply patch
 
-ok 14 - remerge-diff turns off history simplification
+error: patch failed: file:2
+error: file: patch does not apply
+ok 24 - apply patch with 3 context lines matching at end
 
-# passed all 14 test(s)
-1..14
+# passed all 24 test(s)
+1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4109-apply-multifrag.sh ***
@@ -259530,23 +259516,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4110-apply-scan.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4110-apply-scan/.git/
-expecting success of 4110.1 'git apply scan': 
-	git apply \
-		"$TEST_DIRECTORY/t4110/patch1.patch" \
-		"$TEST_DIRECTORY/t4110/patch2.patch" \
-		"$TEST_DIRECTORY/t4110/patch3.patch" \
-		"$TEST_DIRECTORY/t4110/patch4.patch" \
-		"$TEST_DIRECTORY/t4110/patch5.patch" &&
-	test_cmp new.txt "$TEST_DIRECTORY/t4110/expect"
-
-ok 1 - git apply scan
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4103-apply-binary.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4103-apply-binary/.git/
 expecting success of 4103.1 'setup': 
@@ -259829,6 +259798,23 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4110-apply-scan.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4110-apply-scan/.git/
+expecting success of 4110.1 'git apply scan': 
+	git apply \
+		"$TEST_DIRECTORY/t4110/patch1.patch" \
+		"$TEST_DIRECTORY/t4110/patch2.patch" \
+		"$TEST_DIRECTORY/t4110/patch3.patch" \
+		"$TEST_DIRECTORY/t4110/patch4.patch" \
+		"$TEST_DIRECTORY/t4110/patch5.patch" &&
+	test_cmp new.txt "$TEST_DIRECTORY/t4110/expect"
+
+ok 1 - git apply scan
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4112-apply-renames.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4112-apply-renames/.git/
 expecting success of 4112.1 'check rename/copy patch': git apply --check patch
@@ -259841,257 +259827,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4104-apply-boundary.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4104-apply-boundary/.git/
-expecting success of 4104.1 'setup': 
-	test_write_lines b $L y >victim &&
-	cat victim >original &&
-	git update-index --add victim &&
-
-	# add to the head
-	test_write_lines a b $L y >victim &&
-	cat victim >add-a-expect &&
-	git diff victim >add-a-patch.with &&
-	git diff --unified=0 >add-a-patch.without &&
-
-	# insert at line two
-	test_write_lines b a $L y >victim &&
-	cat victim >insert-a-expect &&
-	git diff victim >insert-a-patch.with &&
-	git diff --unified=0 >insert-a-patch.without &&
-
-	# modify at the head
-	test_write_lines a $L y >victim &&
-	cat victim >mod-a-expect &&
-	git diff victim >mod-a-patch.with &&
-	git diff --unified=0 >mod-a-patch.without &&
-
-	# remove from the head
-	test_write_lines $L y >victim &&
-	cat victim >del-a-expect &&
-	git diff victim >del-a-patch.with &&
-	git diff --unified=0 >del-a-patch.without &&
-
-	# add to the tail
-	test_write_lines b $L y z >victim &&
-	cat victim >add-z-expect &&
-	git diff victim >add-z-patch.with &&
-	git diff --unified=0 >add-z-patch.without &&
-
-	# modify at the tail
-	test_write_lines b $L z >victim &&
-	cat victim >mod-z-expect &&
-	git diff victim >mod-z-patch.with &&
-	git diff --unified=0 >mod-z-patch.without &&
-
-	# remove from the tail
-	test_write_lines b $L >victim &&
-	cat victim >del-z-expect &&
-	git diff victim >del-z-patch.with &&
-	git diff --unified=0 >del-z-patch.without
-
-	# done
-
-ok 1 - setup
-
-expecting success of 4104.2 'apply add-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 2 - apply add-a-patch with context
-
-expecting success of 4104.3 'apply add-z-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 3 - apply add-z-patch with context
-
-expecting success of 4104.4 'apply insert-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 4 - apply insert-a-patch with context
-
-expecting success of 4104.5 'apply mod-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 5 - apply mod-a-patch with context
-
-expecting success of 4104.6 'apply mod-z-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 6 - apply mod-z-patch with context
-
-expecting success of 4104.7 'apply del-a-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 7 - apply del-a-patch with context
-
-expecting success of 4104.8 'apply del-z-patch with context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 8 - apply del-z-patch with context
-
-expecting success of 4104.9 'apply add-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 9 - apply add-a-patch without context
-
-expecting success of 4104.10 'apply add-z-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 10 - apply add-z-patch without context
-
-expecting success of 4104.11 'apply insert-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 11 - apply insert-a-patch without context
-
-expecting success of 4104.12 'apply mod-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 12 - apply mod-a-patch without context
-
-expecting success of 4104.13 'apply mod-z-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 13 - apply mod-z-patch without context
-
-expecting success of 4104.14 'apply del-a-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 14 - apply del-a-patch without context
-
-expecting success of 4104.15 'apply del-z-patch without context': 
-			cat original >victim &&
-			git update-index victim &&
-			git apply --index $u "$kind-patch.$with" &&
-			test_cmp "$kind-expect" victim
-		
-ok 15 - apply del-z-patch without context
-
-expecting success of 4104.16 'apply non-git add-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 16 - apply non-git add-a-patch without context
-
-expecting success of 4104.17 'apply non-git add-z-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 17 - apply non-git add-z-patch without context
-
-expecting success of 4104.18 'apply non-git insert-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 18 - apply non-git insert-a-patch without context
-
-expecting success of 4104.19 'apply non-git mod-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 19 - apply non-git mod-a-patch without context
-
-expecting success of 4104.20 'apply non-git mod-z-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 20 - apply non-git mod-z-patch without context
-
-expecting success of 4104.21 'apply non-git del-a-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 21 - apply non-git del-a-patch without context
-
-expecting success of 4104.22 'apply non-git del-z-patch without context': 
-		cat original >victim &&
-		git update-index victim &&
-		git apply --unidiff-zero --index "$kind-ng.without" &&
-		test_cmp "$kind-expect" victim
-	
-ok 22 - apply non-git del-z-patch without context
-
-expecting success of 4104.23 'two lines': 
-	>file &&
-	git add file &&
-	echo aaa >file &&
-	git diff >patch &&
-	git add file &&
-	echo bbb >file &&
-	git add file &&
-	test_must_fail git apply --check patch
-
-error: patch failed: file:0
-error: file: patch does not apply
-ok 23 - two lines
-
-expecting success of 4104.24 'apply patch with 3 context lines matching at end': 
-	test_write_lines a b c d >file &&
-	git add file &&
-	echo e >>file &&
-	git diff >patch &&
-	>file &&
-	test_must_fail git apply patch
-
-error: patch failed: file:2
-error: file: patch does not apply
-ok 24 - apply patch with 3 context lines matching at end
-
-# passed all 24 test(s)
-1..24
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4113-apply-ending.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4113-apply-ending/.git/
 expecting success of 4113.1 'setup': git update-index --add file
@@ -260111,344 +259846,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4067-diff-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/.git/
-expecting success of 4067.1 'git show batches blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure that there is exactly 1 negotiation by checking that there is
-	# only 1 "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) 525c234] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Cloning into bare repository 'client'...
-commit 525c234aab2853ed2b1af6e508caf4b08300c8c7
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    x
-
-diff --git a/a b/a
-new file mode 100644
-index 0000000..7898192
---- /dev/null
-+++ b/a
-@@ -0,0 +1 @@
-+a
-diff --git a/b b/b
-new file mode 100644
-index 0000000..6178079
---- /dev/null
-+++ b/b
-@@ -0,0 +1 @@
-+b
-ok 1 - git show batches blobs
-
-expecting success of 4067.2 'diff batches blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	echo c >server/c &&
-	echo d >server/d &&
-	git -C server add c d &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure that there is exactly 1 negotiation by checking that there is
-	# only 1 "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) 525c234] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master f59c7b0] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 c
- create mode 100644 d
-Cloning into bare repository 'client'...
-diff --git a/c b/c
-new file mode 100644
-index 0000000..f2ad6c7
---- /dev/null
-+++ b/c
-@@ -0,0 +1 @@
-+c
-diff --git a/d b/d
-new file mode 100644
-index 0000000..4bcfe98
---- /dev/null
-+++ b/d
-@@ -0,0 +1 @@
-+d
-ok 2 - diff batches blobs
-
-expecting success of 4067.3 'diff skips same-OID blobs': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	echo another-a >server/a &&
-	git -C server add a &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	echo a | git hash-object --stdin >hash-old-a &&
-	echo another-a | git hash-object --stdin >hash-new-a &&
-	echo b | git hash-object --stdin >hash-b &&
-
-	# Ensure that only a and another-a are fetched.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "want $(cat hash-old-a)" trace &&
-	grep "want $(cat hash-new-a)" trace &&
-	! grep "want $(cat hash-b)" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) 525c234] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 89f0cea] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into bare repository 'client'...
-diff --git a/a b/a
-index 7898192..594b61f 100644
---- a/a
-+++ b/a
-@@ -1 +1 @@
--a
-+another-a
-packet:        fetch> want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:  upload-pack< want 78981922613b2afb6025042ff6bd878ac1994e85
-packet:        fetch> want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-packet:  upload-pack< want 594b61f56663a3c170222487bb2a7ca5cf7df2ad
-ok 3 - diff skips same-OID blobs
-
-expecting success of 4067.4 'when fetching missing objects, diff skips GITLINKs': 
-	test_when_finished "rm -rf sub server client trace" &&
-	test_config_global protocol.file.allow always &&
-
-	test_create_repo sub &&
-	test_commit -C sub first &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	git -C server add a &&
-	git -C server submodule add "file://$(pwd)/sub" &&
-	git -C server commit -m x &&
-
-	test_commit -C server/sub second &&
-	echo another-a >server/a &&
-	git -C server add a sub &&
-	git -C server commit -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	echo a | git hash-object --stdin >hash-old-a &&
-	echo another-a | git hash-object --stdin >hash-new-a &&
-
-	# Ensure that a and another-a are fetched, and check (by successful
-	# execution of the diff) that no invalid OIDs are sent.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "want $(cat hash-old-a)" trace &&
-	grep "want $(cat hash-new-a)" trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/sub/.git/
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/sub'...
-[master (root-commit) 126d236] 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 be568ab] 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.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) a6f879b] x
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 263bf49] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- rename b => c (72%)
-Cloning into bare repository 'client'...
-:100644 100644 33db23e f46cdb7 R072	b	c
-ok 5 - diff with rename detection batches blobs
-
-expecting success of 4067.6 'diff does not fetch anything if inexact rename detection is not needed': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	printf "b\nb\nb\nb\nb\n" >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	mv server/b server/c &&
-	git -C server add c &&
-	git -C server commit -a -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure no fetches.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
-	test_path_is_missing trace
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) a6f879b] x
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 2759f1d] x
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => c (100%)
-Cloning into bare repository 'client'...
-:100644 100644 33db23e 33db23e R100	b	c
-ok 6 - diff does not fetch anything if inexact rename detection is not needed
-
-expecting success of 4067.7 'diff --break-rewrites fetches only if necessary, and batches blobs if it does': 
-	test_when_finished "rm -rf server client trace" &&
-
-	test_create_repo server &&
-	echo a >server/a &&
-	printf "b\nb\nb\nb\nb\n" >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
-	printf "c\nc\nc\nc\nc\n" >server/b &&
-	git -C server commit -a -m x &&
-
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
-
-	# Ensure no fetches.
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
-	test_path_is_missing trace &&
-
-	# But with --break-rewrites, ensure that there is exactly 1 negotiation
-	# by checking that there is only 1 "done" line sent. ("done" marks the
-	# end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --break-rewrites --raw -M HEAD^ HEAD &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4067-diff-partial-clone/server/.git/
-[master (root-commit) a6f879b] x
- Author: A U Thor <author@example.com>
- 2 files changed, 6 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[master 3aba490] x
- Author: A U Thor <author@example.com>
- 1 file changed, 5 insertions(+), 5 deletions(-)
-Cloning into bare repository 'client'...
-:100644 100644 33db23e 6e7ada2 M	b
-:100644 100644 33db23e 6e7ada2 M	b
-ok 7 - diff --break-rewrites fetches only if necessary, and batches blobs if it does
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4116-apply-reverse.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4116-apply-reverse/.git/
 expecting success of 4116.1 'setup': 
@@ -260940,6 +260337,218 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4114-apply-typechange.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4114-apply-typechange/.git/
+expecting success of 4114.1 'setup repository and commits': 
+	echo "hello world" > foo &&
+	echo "hi planet" > bar &&
+	git update-index --add foo bar &&
+	git commit -m initial &&
+	git branch initial &&
+	rm -f foo &&
+	test_ln_s_add bar foo &&
+	git commit -m "foo symlinked to bar" &&
+	git branch foo-symlinked-to-bar &&
+	git rm -f foo &&
+	echo "how far is the sun?" > foo &&
+	git update-index --add foo &&
+	git commit -m "foo back to file" &&
+	git branch foo-back-to-file &&
+	printf "\0" > foo &&
+	git update-index foo &&
+	git commit -m "foo becomes binary" &&
+	git branch foo-becomes-binary &&
+	rm -f foo &&
+	git update-index --remove foo &&
+	mkdir foo &&
+	echo "if only I knew" > foo/baz &&
+	git update-index --add foo/baz &&
+	git commit -m "foo becomes a directory" &&
+	git branch "foo-becomes-a-directory" &&
+	echo "hello world" > foo/baz &&
+	git update-index foo/baz &&
+	git commit -m "foo/baz is the original foo" &&
+	git branch foo-baz-renamed-from-foo
+	
+[master (root-commit) 8d5a53c] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master 2b1a969] foo symlinked to bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 100644 => 120000 foo
+rm 'foo'
+[master 41a0307] foo back to file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ mode change 120000 => 100644 foo
+[master bd76368] foo becomes binary
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+[master 918d519] foo becomes a directory
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ delete mode 100644 foo
+ create mode 100644 foo/baz
+[master 5d696d0] foo/baz is the original foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup repository and commits
+
+expecting success of 4114.2 'file renamed from foo to foo/baz': 
+	git checkout -f initial &&
+	git diff-tree -M -p HEAD foo-baz-renamed-from-foo > patch &&
+	git apply --index < patch
+	
+Switched to branch 'initial'
+ok 2 - file renamed from foo to foo/baz
+
+expecting success of 4114.3 'file renamed from foo/baz to foo': 
+	git checkout -f foo-baz-renamed-from-foo &&
+	git diff-tree -M -p HEAD initial > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-baz-renamed-from-foo'
+ok 3 - file renamed from foo/baz to foo
+
+expecting success of 4114.4 'directory becomes file': 
+	git checkout -f foo-becomes-a-directory &&
+	git diff-tree -p HEAD initial > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-becomes-a-directory'
+ok 4 - directory becomes file
+
+expecting success of 4114.5 'file becomes directory': 
+	git checkout -f initial &&
+	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
+	git apply --index < patch
+	
+Switched to branch 'initial'
+ok 5 - file becomes directory
+
+expecting success of 4114.6 'file becomes symlink': 
+	git checkout -f initial &&
+	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
+	git apply --index < patch
+	
+Already on 'initial'
+ok 6 - file becomes symlink
+
+expecting success of 4114.7 'symlink becomes file': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-back-to-file > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-symlinked-to-bar'
+ok 7 - symlink becomes file
+
+expecting success of 4114.8 'symlink becomes file, in reverse': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-back-to-file > patch &&
+	git checkout foo-back-to-file &&
+	git apply -R --index < patch
+	
+Already on 'foo-symlinked-to-bar'
+Switched to branch 'foo-back-to-file'
+ok 8 - symlink becomes file, in reverse
+
+expecting success of 4114.9 'binary file becomes symlink': 
+	git checkout -f foo-becomes-binary &&
+	git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-becomes-binary'
+ok 9 - binary file becomes symlink
+
+expecting success of 4114.10 'symlink becomes binary file': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p --binary HEAD foo-becomes-binary > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-symlinked-to-bar'
+ok 10 - symlink becomes binary file
+
+expecting success of 4114.11 'symlink becomes directory': 
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
+	git apply --index < patch
+	
+Already on 'foo-symlinked-to-bar'
+ok 11 - symlink becomes directory
+
+expecting success of 4114.12 'directory becomes symlink': 
+	git checkout -f foo-becomes-a-directory &&
+	git diff-tree -p HEAD foo-symlinked-to-bar > patch &&
+	git apply --index < patch
+	
+Switched to branch 'foo-becomes-a-directory'
+ok 12 - directory becomes symlink
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4118-apply-empty-context.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4118-apply-empty-context/.git/
+expecting success of 4118.1 'setup': 
+	test_write_lines "" "" A B C "" >file1 &&
+	cat file1 >file1.orig &&
+	{
+		cat file1 &&
+		echo Q | tr -d "\\012"
+	} >file2 &&
+	cat file2 >file2.orig &&
+	git add file1 file2 &&
+	sed -e "/^B/d" <file1.orig >file1 &&
+	cat file1 > file2 &&
+	echo Q | tr -d "\\012" >>file2 &&
+	cat file1 >file1.mods &&
+	cat file2 >file2.mods &&
+	git diff |
+	sed -e "s/^ \$//" >diff.output
+
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4117-apply-reject.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4117-apply-reject/.git/
 expecting success of 4117.1 'setup': 
@@ -261133,323 +260742,504 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4118-apply-empty-context.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4118-apply-empty-context/.git/
-expecting success of 4118.1 'setup': 
-	test_write_lines "" "" A B C "" >file1 &&
-	cat file1 >file1.orig &&
-	{
-		cat file1 &&
-		echo Q | tr -d "\\012"
-	} >file2 &&
-	cat file2 >file2.orig &&
-	git add file1 file2 &&
-	sed -e "/^B/d" <file1.orig >file1 &&
-	cat file1 > file2 &&
-	echo Q | tr -d "\\012" >>file2 &&
-	cat file1 >file1.mods &&
-	cat file2 >file2.mods &&
-	git diff |
-	sed -e "s/^ \$//" >diff.output
+*** t4108-apply-threeway.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 4118.2 'apply --numstat': 
+expecting success of 4108.2 'apply without --3way': 
+	git diff side^ side >P.diff &&
 
-	git apply --numstat diff.output >actual &&
-	{
-		echo "0	1	file1" &&
-		echo "0	1	file2"
-	} >expect &&
-	test_cmp expect actual
+	# 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'.
 
-ok 2 - apply --numstat
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 4118.3 'apply --apply': 
+If you want to 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 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
+  git switch -c <new-branch-name>
 
-ok 3 - apply --apply
+Or undo this operation with:
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4114-apply-typechange.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+  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
-[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
+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 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 5 - apply with --3way with rerere enabled
+
+expecting success of 4108.6 '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>
- 1 file changed, 1 insertion(+), 1 deletion(-)
- mode change 120000 => 100644 foo
-[master bd76368] foo becomes binary
+ 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>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-[master 918d519] foo becomes a directory
+ 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 6 - apply -3 with add/add conflict setup
+
+expecting success of 4108.7 '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 7 - apply -3 with add/add conflict
+
+expecting success of 4108.8 '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 8 - apply -3 with add/add conflict (dirty working tree)
+
+expecting success of 4108.9 '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>
- 2 files changed, 1 insertion(+)
- delete mode 100644 foo
- create mode 100644 foo/baz
-[master 5d696d0] foo/baz is the original foo
+ 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(-)
-ok 1 - setup repository and commits
+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 9 - apply -3 with ambiguous repeating file
 
-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 4108.10 'apply with --3way --cached clean apply': 
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.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
+	# The corresponding cleanly applied merge
+	git reset --hard &&
+	git checkout main~ &&
+	git merge --no-commit side &&
+	git ls-files -s >expect.ls &&
 
-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
+	# 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 &&
 
-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
+	# 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
 
-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
+HEAD is now at 5364b93 change surrounding one
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-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
+  5364b93 change surrounding one
+  4fe2a89 init one
 
-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
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-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
+ git branch <new-branch-name> 5364b93
 
-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 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 10 - apply with --3way --cached clean apply
 
-expecting success of 4114.11 'symlink becomes directory': 
-	git checkout -f foo-symlinked-to-bar &&
-	git diff-tree -p HEAD foo-becomes-a-directory > patch &&
-	git apply --index < patch
-	
-Already on 'foo-symlinked-to-bar'
-ok 11 - symlink becomes directory
+expecting success of 4108.11 'apply with --3way --cached and conflicts': 
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.diff &&
 
-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
+	# 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 &&
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4120-apply-popt.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4120-apply-popt/.git/
-expecting success of 4120.1 'setup': 
-	mkdir sub &&
-	echo A >sub/file1 &&
-	cp sub/file1 file1.saved &&
-	git add sub/file1 &&
-	echo B >sub/file1 &&
-	git diff >patch.file &&
-	git checkout -- sub/file1 &&
-	git mv sub süb &&
-	echo B >süb/file1 &&
-	git diff >patch.escaped &&
-	grep "[\]" patch.escaped &&
-	rm süb/file1 &&
-	rmdir süb
+	# 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 &&
 
-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
+	# 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
 
-expecting success of 4120.2 'apply git diff with -p2': 
-	cp file1.saved file1 &&
-	git apply -p2 patch.file
+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 11 - apply with --3way --cached and conflicts
 
-ok 2 - apply git diff with -p2
+expecting success of 4108.12 '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" &&
 
-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
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
 
-error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
-ok 3 - apply with too large -p
+	git diff --binary >bin.diff &&
+	git reset --hard &&
 
-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 &&
+	# Apply must succeed.
+	git apply bin.diff
 
-	cp file1.saved file1 &&
-	git apply -p2 patch.quotes &&
-	test_cmp expected file1
+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 12 - apply binary file patch
 
-ok 4 - apply (-p2) traditional diff with funny filenames
+expecting success of 4108.13 '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" &&
 
-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
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
 
-error: git diff header lacks filename information when removing 3 leading pathname components (line 5)
-ok 5 - apply with too large -p and fancy filename
+	git diff --binary >bin.diff &&
+	git reset --hard &&
 
-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
+	# Apply must succeed.
+	git apply --3way --index bin.diff
 
-ok 6 - apply (-p2) diff, mode change only
+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 13 - apply binary file patch with 3way
 
-checking prerequisite: FILEMODE
+expecting success of 4108.14 '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" &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-	test "$(git config --bool core.filemode)" = true
+	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
 
-)
-prerequisite FILEMODE ok
-expecting success of 4120.7 'file mode was changed': 
-	test -x file1
+	git diff --full-index >bin.diff &&
+	git reset --hard &&
 
-ok 7 - file mode was changed
+	# Apply must succeed.
+	git apply --3way --index bin.diff
 
-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 &&
+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 14 - apply full-index patch with 3way
 
-	cp file1.saved file1 &&
-	rm -f file2 &&
-	git apply -p2 patch.rename &&
-	test_cmp expected file2
+expecting success of 4108.15 '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 &&
 
-ok 8 - apply (-p2) diff, rename
+	git checkout -- . &&
+	# Apply must succeed.
+	git apply --3way delete-then-new.patch
 
-# passed all 8 test(s)
-1..8
+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 15 - apply delete then new patch with 3way
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4121-apply-diffs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4119-apply-config.sh ***
@@ -261650,28 +261440,111 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4121-apply-diffs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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'
+*** t4120-apply-popt.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4120-apply-popt/.git/
+expecting success of 4120.1 'setup': 
+	mkdir sub &&
+	echo A >sub/file1 &&
+	cp sub/file1 file1.saved &&
+	git add sub/file1 &&
+	echo B >sub/file1 &&
+	git diff >patch.file &&
+	git checkout -- sub/file1 &&
+	git mv sub süb &&
+	echo B >süb/file1 &&
+	git diff >patch.escaped &&
+	grep "[\]" patch.escaped &&
+	rm süb/file1 &&
+	rmdir süb
+
+diff --git "a/s\303\274b/file1" "b/s\303\274b/file1"
+--- "a/s\303\274b/file1"
++++ "b/s\303\274b/file1"
 ok 1 - setup
 
-expecting success of 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
+expecting success of 4120.2 'apply git diff with -p2': 
+	cp file1.saved file1 &&
+	git apply -p2 patch.file
 
-# passed all 2 test(s)
-1..2
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4123-apply-shrink.sh ***
@@ -261700,138 +261573,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4125-apply-ws-fuzz.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4125-apply-ws-fuzz/.git/
-expecting success of 4125.1 'setup': 
-
-	>file &&
-	git add file &&
-
-	# file-0 is full of whitespace breakages
-	printf "%s \n" a bb c d eeee f ggg h >file-0 &&
-
-	# patch-0 creates a whitespace broken file
-	cat file-0 >file &&
-	git diff >patch-0 &&
-	git add file &&
-
-	# file-1 is still full of whitespace breakages,
-	# but has one line updated, without fixing any
-	# whitespaces.
-	# patch-1 records that change.
-	sed -e "s/d/D/" file-0 >file-1 &&
-	cat file-1 >file &&
-	git diff >patch-1 &&
-
-	# patch-all is the effect of both patch-0 and patch-1
-	>file &&
-	git add file &&
-	cat file-1 >file &&
-	git diff >patch-all &&
-
-	# patch-2 is the same as patch-1 but is based
-	# on a version that already has whitespace fixed,
-	# and does not introduce whitespace breakages.
-	sed -e "s/ \$//" patch-1 >patch-2 &&
-
-	# If all whitespace breakages are fixed the contents
-	# should look like file-fixed
-	sed -e "s/ \$//" file-1 >file-fixed
-
-
-ok 1 - setup
-
-expecting success of 4125.2 'nofix': 
-
-	>file &&
-	git add file &&
-
-	# Baseline.  Applying without fixing any whitespace
-	# breakages.
-	git apply --whitespace=nowarn patch-0 &&
-	git apply --whitespace=nowarn patch-1 &&
-
-	# The result should obviously match.
-	test_cmp file-1 file
-
-ok 2 - nofix
-
-expecting success of 4125.3 'withfix (forward)': 
-
-	>file &&
-	git add file &&
-
-	# The first application will munge the context lines
-	# the second patch depends on.  We should be able to
-	# adjust and still apply.
-	git apply --whitespace=fix patch-0 &&
-	git apply --whitespace=fix patch-1 &&
-
-	test_cmp file-fixed file
-
-patch-0:6: trailing whitespace.
-a 
-patch-0:7: trailing whitespace.
-bb 
-patch-0:8: trailing whitespace.
-c 
-patch-0:9: trailing whitespace.
-d 
-patch-0:10: trailing whitespace.
-eeee 
-warning: squelched 3 whitespace errors
-warning: 8 lines applied after fixing whitespace errors.
-patch-1:6: trailing whitespace.
-a 
-patch-1:7: trailing whitespace.
-bb 
-patch-1:8: trailing whitespace.
-c 
-patch-1:10: trailing whitespace.
-D 
-patch-1:11: trailing whitespace.
-eeee 
-warning: squelched 2 whitespace errors
-warning: 1 line applied after fixing whitespace errors.
-ok 3 - withfix (forward)
-
-expecting success of 4125.4 'withfix (backward)': 
-
-	>file &&
-	git add file &&
-
-	# Now we have a whitespace breakages on our side.
-	git apply --whitespace=nowarn patch-0 &&
-
-	# And somebody sends in a patch based on image
-	# with whitespace already fixed.
-	git apply --whitespace=fix patch-2 &&
-
-	# The result should accept the whitespace fixed
-	# postimage.  But the line with "h" is beyond context
-	# horizon and left unfixed.
-
-	sed -e /h/d file-fixed >fixed-head &&
-	sed -e /h/d file >file-head &&
-	test_cmp fixed-head file-head &&
-
-	sed -n -e /h/p file-fixed >fixed-tail &&
-	sed -n -e /h/p file >file-tail &&
-
-	! test_cmp fixed-tail file-tail
-
-
---- fixed-tail	2025-12-18 01:35:43.202773267 +0000
-+++ file-tail	2025-12-18 01:35:43.202773267 +0000
-@@ -1 +1 @@
--h
-+h 
-ok 4 - withfix (backward)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4122-apply-symlink-inside.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4122-apply-symlink-inside/.git/
 expecting success of 4122.1 'setup': 
@@ -262056,480 +261797,136 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4108-apply-threeway.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 5 - apply with --3way with rerere enabled
-
-expecting success of 4108.6 '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 6 - apply -3 with add/add conflict setup
-
-expecting success of 4108.7 '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 7 - apply -3 with add/add conflict
-
-expecting success of 4108.8 '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 8 - apply -3 with add/add conflict (dirty working tree)
-
-expecting success of 4108.9 '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 9 - apply -3 with ambiguous repeating file
-
-expecting success of 4108.10 '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 &&
+*** t4125-apply-ws-fuzz.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4125-apply-ws-fuzz/.git/
+expecting success of 4125.1 'setup': 
 
-	# 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
+	>file &&
+	git add file &&
 
-HEAD is now at 5364b93 change surrounding one
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+	# file-0 is full of whitespace breakages
+	printf "%s \n" a bb c d eeee f ggg h >file-0 &&
 
-  5364b93 change surrounding one
-  4fe2a89 init one
+	# patch-0 creates a whitespace broken file
+	cat file-0 >file &&
+	git diff >patch-0 &&
+	git add file &&
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+	# 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 &&
 
- git branch <new-branch-name> 5364b93
+	# patch-all is the effect of both patch-0 and patch-1
+	>file &&
+	git add file &&
+	cat file-1 >file &&
+	git diff >patch-all &&
 
-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 10 - apply with --3way --cached clean apply
+	# 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 4108.11 'apply with --3way --cached and conflicts': 
-	# Merging side should be similar to applying this patch
-	git diff ...side >P.diff &&
+	# If all whitespace breakages are fixed the contents
+	# should look like file-fixed
+	sed -e "s/ \$//" file-1 >file-fixed
 
-	# 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 &&
+ok 1 - setup
 
-	# 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
+expecting success of 4125.2 'nofix': 
 
-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 11 - apply with --3way --cached and conflicts
+	>file &&
+	git add file &&
 
-expecting success of 4108.12 '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" &&
+	# Baseline.  Applying without fixing any whitespace
+	# breakages.
+	git apply --whitespace=nowarn patch-0 &&
+	git apply --whitespace=nowarn patch-1 &&
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+	# The result should obviously match.
+	test_cmp file-1 file
 
-	git diff --binary >bin.diff &&
-	git reset --hard &&
+ok 2 - nofix
 
-	# Apply must succeed.
-	git apply bin.diff
+expecting success of 4125.3 'withfix (forward)': 
 
-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 12 - apply binary file patch
+	>file &&
+	git add file &&
 
-expecting success of 4108.13 '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" &&
+	# 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 &&
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+	test_cmp file-fixed file
 
-	git diff --binary >bin.diff &&
-	git reset --hard &&
+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)
 
-	# Apply must succeed.
-	git apply --3way --index bin.diff
+expecting success of 4125.4 'withfix (backward)': 
 
-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 13 - apply binary file patch with 3way
+	>file &&
+	git add file &&
 
-expecting success of 4108.14 '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" &&
+	# Now we have a whitespace breakages on our side.
+	git apply --whitespace=nowarn patch-0 &&
 
-	cp "$TEST_DIRECTORY/test-binary-2.png" bin.png &&
+	# And somebody sends in a patch based on image
+	# with whitespace already fixed.
+	git apply --whitespace=fix patch-2 &&
 
-	git diff --full-index >bin.diff &&
-	git reset --hard &&
+	# The result should accept the whitespace fixed
+	# postimage.  But the line with "h" is beyond context
+	# horizon and left unfixed.
 
-	# Apply must succeed.
-	git apply --3way --index bin.diff
+	sed -e /h/d file-fixed >fixed-head &&
+	sed -e /h/d file >file-head &&
+	test_cmp fixed-head file-head &&
 
-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 14 - apply full-index patch with 3way
+	sed -n -e /h/p file-fixed >fixed-tail &&
+	sed -n -e /h/p file >file-tail &&
 
-expecting success of 4108.15 '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 &&
+	! test_cmp fixed-tail file-tail
 
-	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 15 - apply delete then new patch with 3way
+--- fixed-tail	2024-11-14 19:34:18.616611484 +0000
++++ file-tail	2024-11-14 19:34:18.616611484 +0000
+@@ -1 +1 @@
+-h
++h 
+ok 4 - withfix (backward)
 
-# passed all 15 test(s)
-1..15
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4126-apply-empty.sh ***
@@ -262743,83 +262140,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4130-apply-criss-cross-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4130-apply-criss-cross-rename/.git/
-expecting success of 4130.1 'setup': 
-	# Ensure that file sizes are different, because on Windows
-	# lstat() does not discover inode numbers, and we need
-	# other properties to discover swapped files
-	# (mtime is not always different, either).
-	create_file file1 "some content" &&
-	create_file file2 "some other content" &&
-	create_file file3 "again something else" &&
-	git add file1 file2 file3 &&
-	git commit -m 1
-
-[master (root-commit) 5cfe986] 1
- Author: A U Thor <author@example.com>
- 3 files changed, 303 insertions(+)
- create mode 100644 file1
- create mode 100644 file2
- create mode 100644 file3
-ok 1 - setup
-
-expecting success of 4130.2 'criss-cross rename': 
-	mv file1 tmp &&
-	mv file2 file1 &&
-	mv tmp file2 &&
-	cp file1 file1-swapped &&
-	cp file2 file2-swapped
-
-ok 2 - criss-cross rename
-
-expecting success of 4130.3 'diff -M -B': 
-	git diff -M -B > diff &&
-	git reset --hard
-
-
-HEAD is now at 5cfe986 1
-ok 3 - diff -M -B
-
-expecting success of 4130.4 'apply': 
-	git apply diff &&
-	test_cmp file1 file1-swapped &&
-	test_cmp file2 file2-swapped
-
-ok 4 - apply
-
-expecting success of 4130.5 'criss-cross rename': 
-	git reset --hard &&
-	mv file1 tmp &&
-	mv file2 file1 &&
-	mv file3 file2 &&
-	mv tmp file3 &&
-	cp file1 file1-swapped &&
-	cp file2 file2-swapped &&
-	cp file3 file3-swapped
-
-HEAD is now at 5cfe986 1
-ok 5 - criss-cross rename
-
-expecting success of 4130.6 'diff -M -B': 
-	git diff -M -B > diff &&
-	git reset --hard
-
-HEAD is now at 5cfe986 1
-ok 6 - diff -M -B
-
-expecting success of 4130.7 'apply': 
-	git apply diff &&
-	test_cmp file1 file1-swapped &&
-	test_cmp file2 file2-swapped &&
-	test_cmp file3 file3-swapped
-
-ok 7 - apply
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4127-apply-same-fn.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4127-apply-same-fn/.git/
 expecting success of 4127.1 'setup': 
@@ -262937,6 +262257,83 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4130-apply-criss-cross-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4130-apply-criss-cross-rename/.git/
+expecting success of 4130.1 'setup': 
+	# Ensure that file sizes are different, because on Windows
+	# lstat() does not discover inode numbers, and we need
+	# other properties to discover swapped files
+	# (mtime is not always different, either).
+	create_file file1 "some content" &&
+	create_file file2 "some other content" &&
+	create_file file3 "again something else" &&
+	git add file1 file2 file3 &&
+	git commit -m 1
+
+[master (root-commit) 5cfe986] 1
+ Author: A U Thor <author@example.com>
+ 3 files changed, 303 insertions(+)
+ create mode 100644 file1
+ create mode 100644 file2
+ create mode 100644 file3
+ok 1 - setup
+
+expecting success of 4130.2 'criss-cross rename': 
+	mv file1 tmp &&
+	mv file2 file1 &&
+	mv tmp file2 &&
+	cp file1 file1-swapped &&
+	cp file2 file2-swapped
+
+ok 2 - criss-cross rename
+
+expecting success of 4130.3 'diff -M -B': 
+	git diff -M -B > diff &&
+	git reset --hard
+
+
+HEAD is now at 5cfe986 1
+ok 3 - diff -M -B
+
+expecting success of 4130.4 'apply': 
+	git apply diff &&
+	test_cmp file1 file1-swapped &&
+	test_cmp file2 file2-swapped
+
+ok 4 - apply
+
+expecting success of 4130.5 'criss-cross rename': 
+	git reset --hard &&
+	mv file1 tmp &&
+	mv file2 file1 &&
+	mv file3 file2 &&
+	mv tmp file3 &&
+	cp file1 file1-swapped &&
+	cp file2 file2-swapped &&
+	cp file3 file3-swapped
+
+HEAD is now at 5cfe986 1
+ok 5 - criss-cross rename
+
+expecting success of 4130.6 'diff -M -B': 
+	git diff -M -B > diff &&
+	git reset --hard
+
+HEAD is now at 5cfe986 1
+ok 6 - diff -M -B
+
+expecting success of 4130.7 'apply': 
+	git apply diff &&
+	test_cmp file1 file1-swapped &&
+	test_cmp file2 file2-swapped &&
+	test_cmp file3 file3-swapped
+
+ok 7 - apply
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4131-apply-fake-ancestor.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4131-apply-fake-ancestor/.git/
 expecting success of 4131.1 'setup': 
@@ -263020,108 +262417,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4133-apply-filenames.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4133-apply-filenames/.git/
-expecting success of 4133.1 'setup': 
-	cat > bad1.patch <<EOF &&
-diff --git a/f b/f
-new file mode 100644
-index 0000000..d00491f
---- /dev/null
-+++ b/f-blah
-@@ -0,0 +1 @@
-+1
-EOF
-	cat > bad2.patch <<EOF
-diff --git a/f b/f
-deleted file mode 100644
-index d00491f..0000000
---- b/f-blah
-+++ /dev/null
-@@ -1 +0,0 @@
--1
-EOF
-
-ok 1 - setup
-
-expecting success of 4133.2 'apply diff with inconsistent filenames in headers': 
-	test_must_fail git apply bad1.patch 2>err &&
-	test_grep "inconsistent new filename" err &&
-	test_must_fail git apply bad2.patch 2>err &&
-	test_grep "inconsistent old filename" err
-
-error: git apply: bad git-diff - inconsistent new filename on line 2
-error: git apply: bad git-diff - inconsistent old filename on line 2
-ok 2 - apply diff with inconsistent filenames in headers
-
-expecting success of 4133.3 'apply diff with new filename missing from headers': 
-	cat >missing_new_filename.diff <<-\EOF &&
-	diff --git a/f b/f
-	index 0000000..d00491f
-	--- a/f
-	@@ -0,0 +1 @@
-	+1
-	EOF
-	test_must_fail git apply missing_new_filename.diff 2>err &&
-	test_grep "lacks filename information" err
-
-error: git diff header lacks filename information (line 4)
-ok 3 - apply diff with new filename missing from headers
-
-expecting success of 4133.4 'apply diff with old filename missing from headers': 
-	cat >missing_old_filename.diff <<-\EOF &&
-	diff --git a/f b/f
-	index d00491f..0000000
-	+++ b/f
-	@@ -1 +0,0 @@
-	-1
-	EOF
-	test_must_fail git apply missing_old_filename.diff 2>err &&
-	test_grep "lacks filename information" err
-
-error: git diff header lacks filename information (line 4)
-ok 4 - apply diff with old filename missing from headers
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4134-apply-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4134-apply-submodule/.git/
-expecting success of 4134.1 'setup': 
-	cat > create-sm.patch <<EOF &&
-diff --git a/dir/sm b/dir/sm
-new file mode 160000
-index 0000000..0123456
---- /dev/null
-+++ b/dir/sm
-@@ -0,0 +1 @@
-+Subproject commit $(test_oid numeric)
-EOF
-	cat > remove-sm.patch <<EOF
-diff --git a/dir/sm b/dir/sm
-deleted file mode 160000
-index 0123456..0000000
---- a/dir/sm
-+++ /dev/null
-@@ -1 +0,0 @@
--Subproject commit $(test_oid numeric)
-EOF
-
-ok 1 - setup
-
-expecting success of 4134.2 'removing a submodule also removes all leading subdirectories': 
-	git apply --index create-sm.patch &&
-	test -d dir/sm &&
-	git apply --index remove-sm.patch &&
-	test \! -d dir
-
-ok 2 - removing a submodule also removes all leading subdirectories
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4129-apply-samemode.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4129-apply-samemode/.git/
 expecting success of 4129.1 'setup': 
@@ -263869,6 +263164,108 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4134-apply-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4134-apply-submodule/.git/
+expecting success of 4134.1 'setup': 
+	cat > create-sm.patch <<EOF &&
+diff --git a/dir/sm b/dir/sm
+new file mode 160000
+index 0000000..0123456
+--- /dev/null
++++ b/dir/sm
+@@ -0,0 +1 @@
++Subproject commit $(test_oid numeric)
+EOF
+	cat > remove-sm.patch <<EOF
+diff --git a/dir/sm b/dir/sm
+deleted file mode 160000
+index 0123456..0000000
+--- a/dir/sm
++++ /dev/null
+@@ -1 +0,0 @@
+-Subproject commit $(test_oid numeric)
+EOF
+
+ok 1 - setup
+
+expecting success of 4134.2 'removing a submodule also removes all leading subdirectories': 
+	git apply --index create-sm.patch &&
+	test -d dir/sm &&
+	git apply --index remove-sm.patch &&
+	test \! -d dir
+
+ok 2 - removing a submodule also removes all leading subdirectories
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4133-apply-filenames.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4133-apply-filenames/.git/
+expecting success of 4133.1 'setup': 
+	cat > bad1.patch <<EOF &&
+diff --git a/f b/f
+new file mode 100644
+index 0000000..d00491f
+--- /dev/null
++++ b/f-blah
+@@ -0,0 +1 @@
++1
+EOF
+	cat > bad2.patch <<EOF
+diff --git a/f b/f
+deleted file mode 100644
+index d00491f..0000000
+--- b/f-blah
++++ /dev/null
+@@ -1 +0,0 @@
+-1
+EOF
+
+ok 1 - setup
+
+expecting success of 4133.2 'apply diff with inconsistent filenames in headers': 
+	test_must_fail git apply bad1.patch 2>err &&
+	test_grep "inconsistent new filename" err &&
+	test_must_fail git apply bad2.patch 2>err &&
+	test_grep "inconsistent old filename" err
+
+error: git apply: bad git-diff - inconsistent new filename on line 2
+error: git apply: bad git-diff - inconsistent old filename on line 2
+ok 2 - apply diff with inconsistent filenames in headers
+
+expecting success of 4133.3 'apply diff with new filename missing from headers': 
+	cat >missing_new_filename.diff <<-\EOF &&
+	diff --git a/f b/f
+	index 0000000..d00491f
+	--- a/f
+	@@ -0,0 +1 @@
+	+1
+	EOF
+	test_must_fail git apply missing_new_filename.diff 2>err &&
+	test_grep "lacks filename information" err
+
+error: git diff header lacks filename information (line 4)
+ok 3 - apply diff with new filename missing from headers
+
+expecting success of 4133.4 'apply diff with old filename missing from headers': 
+	cat >missing_old_filename.diff <<-\EOF &&
+	diff --git a/f b/f
+	index d00491f..0000000
+	+++ b/f
+	@@ -1 +0,0 @@
+	-1
+	EOF
+	test_must_fail git apply missing_old_filename.diff 2>err &&
+	test_grep "lacks filename information" err
+
+error: git diff header lacks filename information (line 4)
+ok 4 - apply diff with old filename missing from headers
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4136-apply-check.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4136-apply-check/.git/
 expecting success of 4136.1 'setup': 
@@ -264124,218 +263521,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4141-apply-too-large.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4141-apply-too-large/.git/
-checking prerequisite: EXPENSIVE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
-
-)
-prerequisite EXPENSIVE not satisfied
-ok 1 # skip git apply rejects patches that are too large (missing EXPENSIVE)
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4140-apply-ita.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4140-apply-ita/.git/
-expecting success of 4140.1 'setup': 
-	test_write_lines 1 2 3 4 5 >blueprint &&
-
-	cat blueprint >test-file &&
-	git add -N test-file &&
-	git diff >creation-patch &&
-	grep "new file mode 100644" creation-patch &&
-
-	rm -f test-file &&
-	git diff >deletion-patch &&
-	grep "deleted file mode 100644" deletion-patch
-
-new file mode 100644
-deleted file mode 100644
-ok 1 - setup
-
-expecting success of 4140.2 'apply creation patch to ita path (--cached)': 
-	git rm -f test-file &&
-	cat blueprint >test-file &&
-	git add -N test-file &&
-
-	git apply --cached creation-patch &&
-	git cat-file blob :test-file >actual &&
-	test_cmp blueprint actual
-
-rm 'test-file'
-ok 2 - apply creation patch to ita path (--cached)
-
-expecting success of 4140.3 'apply creation patch to ita path (--index)': 
-	git rm -f test-file &&
-	cat blueprint >test-file &&
-	git add -N test-file &&
-	rm -f test-file &&
-
-	test_must_fail git apply --index creation-patch
-
-rm 'test-file'
-error: test-file: does not match index
-ok 3 - apply creation patch to ita path (--index)
-
-expecting success of 4140.4 'apply deletion patch to ita path (--cached)': 
-	git rm -f test-file &&
-	cat blueprint >test-file &&
-	git add -N test-file &&
-
-	git apply --cached deletion-patch &&
-	test_must_fail git ls-files --stage --error-unmatch test-file
-
-rm 'test-file'
-error: pathspec 'test-file' did not match any file(s) known to git
-Did you forget to 'git add'?
-ok 4 - apply deletion patch to ita path (--cached)
-
-expecting success of 4140.5 'apply deletion patch to ita path (--index)': 
-	cat blueprint >test-file &&
-	git add -N test-file &&
-
-	test_must_fail git apply --index deletion-patch &&
-	git ls-files --stage --error-unmatch test-file
-
-error: test-file: does not match index
-100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	test-file
-ok 5 - apply deletion patch to ita path (--index)
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4139-apply-escape.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4139-apply-escape/.git/
-expecting success of 4139.1 'bump git repo one level down': 
-	mkdir inside &&
-	mv .git inside/ &&
-	cd inside
-
-ok 1 - bump git repo one level down
-
-expecting success of 4139.2 'cannot create file containing ..': 
-	mkpatch_add ../foo >patch &&
-	test_must_fail git apply patch &&
-	test_path_is_missing ../foo
-
-error: invalid path '../foo'
-ok 2 - cannot create file containing ..
-
-expecting success of 4139.3 'can create file containing .. with --unsafe-paths': 
-	mkpatch_add ../foo >patch &&
-	git apply --unsafe-paths patch &&
-	test_path_is_file ../foo
-
-ok 3 - can create file containing .. with --unsafe-paths
-
-expecting success of 4139.4 'cannot create file containing .. (index)': 
-	mkpatch_add ../foo >patch &&
-	test_must_fail git apply --index patch &&
-	test_path_is_missing ../foo
-
-error: invalid path '../foo'
-ok 4 - cannot create file containing .. (index)
-
-expecting success of 4139.5 'cannot create file containing .. with --unsafe-paths (index)': 
-	mkpatch_add ../foo >patch &&
-	test_must_fail git apply --index --unsafe-paths patch &&
-	test_path_is_missing ../foo
-
-error: invalid path '../foo'
-ok 5 - cannot create file containing .. with --unsafe-paths (index)
-
-expecting success of 4139.6 'cannot delete file containing ..': 
-	mkpatch_del ../foo >patch &&
-	test_must_fail git apply patch &&
-	test_path_is_file ../foo
-
-error: invalid path '../foo'
-ok 6 - cannot delete file containing ..
-
-expecting success of 4139.7 'can delete file containing .. with --unsafe-paths': 
-	mkpatch_del ../foo >patch &&
-	git apply --unsafe-paths patch &&
-	test_path_is_missing ../foo
-
-ok 7 - can delete file containing .. with --unsafe-paths
-
-expecting success of 4139.8 'cannot delete file containing .. (index)': 
-	mkpatch_del ../foo >patch &&
-	test_must_fail git apply --index patch &&
-	test_path_is_file ../foo
-
-error: ../foo: does not exist in index
-ok 8 - cannot delete file containing .. (index)
-
-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 4139.9 'symlink escape via ..': 
-	{
-		mkpatch_symlink tmp .. &&
-		mkpatch_add tmp/foo ../foo
-	} >patch &&
-	test_must_fail git apply patch &&
-	test_path_is_missing tmp &&
-	test_path_is_missing ../foo
-
-error: affected file 'tmp/foo' is beyond a symbolic link
-ok 9 - symlink escape via ..
-
-expecting success of 4139.10 'symlink escape via .. (index)': 
-	{
-		mkpatch_symlink tmp .. &&
-		mkpatch_add tmp/foo ../foo
-	} >patch &&
-	test_must_fail git apply --index patch &&
-	test_path_is_missing tmp &&
-	test_path_is_missing ../foo
-
-error: affected file 'tmp/foo' is beyond a symbolic link
-ok 10 - symlink escape via .. (index)
-
-expecting success of 4139.11 'symlink escape via absolute path': 
-	{
-		mkpatch_symlink tmp "$(pwd)" &&
-		mkpatch_add tmp/foo ../foo
-	} >patch &&
-	test_must_fail git apply patch &&
-	test_path_is_missing tmp &&
-	test_path_is_missing ../foo
-
-error: affected file 'tmp/foo' is beyond a symbolic link
-ok 11 - symlink escape via absolute path
-
-expecting success of 4139.12 'symlink escape via absolute path (index)': 
-	{
-		mkpatch_symlink tmp "$(pwd)" &&
-		mkpatch_add tmp/foo ../foo
-	} >patch &&
-	test_must_fail git apply --index patch &&
-	test_path_is_missing tmp &&
-	test_path_is_missing ../foo
-
-error: affected file 'tmp/foo' is beyond a symbolic link
-ok 12 - symlink escape via absolute path (index)
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4135-apply-weird-filenames.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4135-apply-weird-filenames/.git/
 expecting success of 4135.1 'setup': 
@@ -264615,295 +263800,216 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4153-am-resume-override-opts.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4153-am-resume-override-opts/.git/
-expecting success of 4153.1 'setup': 
-	test_commit initial file &&
-	test_commit first file &&
-
-	git checkout initial &&
-	git mv file file2 &&
-	test_tick &&
-	git commit -m renamed-file &&
-	git tag renamed-file &&
-
-	git checkout -b side initial &&
-	test_commit side1 file &&
-	test_commit side2 file &&
-
-	format_patch side1 &&
-	format_patch side2
-
-[master (root-commit) b6d2089] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 3aaf771] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 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:
+*** t4139-apply-escape.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4139-apply-escape/.git/
+expecting success of 4139.1 'bump git repo one level down': 
+	mkdir inside &&
+	mv .git inside/ &&
+	cd inside
 
-  git switch -
+ok 1 - bump git repo one level down
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 4139.2 'cannot create file containing ..': 
+	mkpatch_add ../foo >patch &&
+	test_must_fail git apply patch &&
+	test_path_is_missing ../foo
 
-HEAD is now at b6d2089 initial
-[detached HEAD 5e7fd8e] renamed-file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => file2 (100%)
-Previous HEAD position was 5e7fd8e renamed-file
-Switched to a new branch 'side'
-[side ccf21da] side1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[side 58bd40e] side2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+error: invalid path '../foo'
+ok 2 - cannot create file containing ..
 
-checking prerequisite: TTY
+expecting success of 4139.3 'can create file containing .. with --unsafe-paths': 
+	mkpatch_add ../foo >patch &&
+	git apply --unsafe-paths patch &&
+	test_path_is_file ../foo
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
+ok 3 - can create file containing .. with --unsafe-paths
 
-	# 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 4139.4 'cannot create file containing .. (index)': 
+	mkpatch_add ../foo >patch &&
+	test_must_fail git apply --index patch &&
+	test_path_is_missing ../foo
 
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
+error: invalid path '../foo'
+ok 4 - cannot create file containing .. (index)
 
-)
-prerequisite TTY ok
-expecting success of 4153.2 '--3way overrides --no-3way': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout renamed-file &&
+expecting success of 4139.5 'cannot create file containing .. with --unsafe-paths (index)': 
+	mkpatch_add ../foo >patch &&
+	test_must_fail git apply --index --unsafe-paths patch &&
+	test_path_is_missing ../foo
 
-	# Applying side1 will fail as the file has been renamed.
-	test_must_fail git am --no-3way side[12].eml &&
-	test_path_is_dir .git/rebase-apply &&
-	test_cmp_rev renamed-file HEAD &&
-	test -z "$(git ls-files -u)" &&
+error: invalid path '../foo'
+ok 5 - cannot create file containing .. with --unsafe-paths (index)
 
-	# Applying side1 with am --3way will succeed due to the threeway-merge.
-	# Applying side2 will fail as --3way does not apply to it.
-	test_must_fail test_terminal git am --3way </dev/zero &&
-	test_path_is_dir .git/rebase-apply &&
-	test side1 = "$(cat file2)"
+expecting success of 4139.6 'cannot delete file containing ..': 
+	mkpatch_del ../foo >patch &&
+	test_must_fail git apply patch &&
+	test_path_is_file ../foo
 
-HEAD is now at 58bd40e side2
-Note: switching to 'renamed-file'.
+error: invalid path '../foo'
+ok 6 - cannot delete file containing ..
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 4139.7 'can delete file containing .. with --unsafe-paths': 
+	mkpatch_del ../foo >patch &&
+	git apply --unsafe-paths patch &&
+	test_path_is_missing ../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:
+ok 7 - can delete file containing .. with --unsafe-paths
 
-  git switch -c <new-branch-name>
+expecting success of 4139.8 'cannot delete file containing .. (index)': 
+	mkpatch_del ../foo >patch &&
+	test_must_fail git apply --index patch &&
+	test_path_is_file ../foo
 
-Or undo this operation with:
+error: ../foo: does not exist in index
+ok 8 - cannot delete file containing .. (index)
 
-  git switch -
+checking prerequisite: SYMLINKS
 
-Turn off this advice by setting config variable advice.detachedHead to false
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
 
-HEAD is now at 5e7fd8e renamed-file
-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 advice.mergeConflict false"
-Applying: side1
-Patch failed at 0001 side1
-Applying: side1
-Using index info to reconstruct a base tree...
-A	file
-Falling back to patching base and 3-way merge...
-Merging:
-5e7fd8e renamed-file
-virtual side1
-found 1 common ancestor:
-virtual 99f2e3e1cb15f9b52fa29f66d380dda061d917ab
-Applying: side2
-error: file: does not exist in index
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-Patch failed at 0002 side2
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
-ok 2 - --3way overrides --no-3way
+)
+prerequisite SYMLINKS ok
+expecting success of 4139.9 'symlink escape via ..': 
+	{
+		mkpatch_symlink tmp .. &&
+		mkpatch_add tmp/foo ../foo
+	} >patch &&
+	test_must_fail git apply patch &&
+	test_path_is_missing tmp &&
+	test_path_is_missing ../foo
 
-expecting success of 4153.3 '--no-quiet overrides --quiet': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
+error: affected file 'tmp/foo' is beyond a symbolic link
+ok 9 - symlink escape via ..
 
-	# Applying side1 will be quiet.
-	test_must_fail git am --quiet side[123].eml >out &&
-	test_path_is_dir .git/rebase-apply &&
-	test_grep ! "^Applying: " out &&
-	echo side1 >file &&
-	git add file &&
+expecting success of 4139.10 'symlink escape via .. (index)': 
+	{
+		mkpatch_symlink tmp .. &&
+		mkpatch_add tmp/foo ../foo
+	} >patch &&
+	test_must_fail git apply --index patch &&
+	test_path_is_missing tmp &&
+	test_path_is_missing ../foo
 
-	# Applying side1 will not be quiet.
-	# Applying side2 will be quiet.
-	git am --no-quiet --continue >out &&
-	echo "Applying: side1" >expected &&
-	test_cmp expected out
+error: affected file 'tmp/foo' is beyond a symbolic link
+ok 10 - symlink escape via .. (index)
 
-HEAD is now at 8e08c98 side1
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 4139.11 'symlink escape via absolute path': 
+	{
+		mkpatch_symlink tmp "$(pwd)" &&
+		mkpatch_add tmp/foo ../foo
+	} >patch &&
+	test_must_fail git apply patch &&
+	test_path_is_missing tmp &&
+	test_path_is_missing ../foo
 
-  8e08c98 side1
+error: affected file 'tmp/foo' is beyond a symbolic link
+ok 11 - symlink escape via absolute path
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 4139.12 'symlink escape via absolute path (index)': 
+	{
+		mkpatch_symlink tmp "$(pwd)" &&
+		mkpatch_add tmp/foo ../foo
+	} >patch &&
+	test_must_fail git apply --index patch &&
+	test_path_is_missing tmp &&
+	test_path_is_missing ../foo
 
- git branch <new-branch-name> 8e08c98
+error: affected file 'tmp/foo' is beyond a symbolic link
+ok 12 - symlink escape via absolute path (index)
 
-HEAD is now at 3aaf771 first
-error: patch failed: file:1
-error: file: 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 advice.mergeConflict false"
-ok 3 - --no-quiet overrides --quiet
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4140-apply-ita.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4140-apply-ita/.git/
+expecting success of 4140.1 'setup': 
+	test_write_lines 1 2 3 4 5 >blueprint &&
 
-expecting success of 4153.4 '--signoff overrides --no-signoff': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
+	cat blueprint >test-file &&
+	git add -N test-file &&
+	git diff >creation-patch &&
+	grep "new file mode 100644" creation-patch &&
 
-	test_must_fail git am --no-signoff side[12].eml &&
-	test_path_is_dir .git/rebase-apply &&
-	echo side1 >file &&
-	git add file &&
-	git am --signoff --continue &&
+	rm -f test-file &&
+	git diff >deletion-patch &&
+	grep "deleted file mode 100644" deletion-patch
 
-	# Applied side1 will be signed off
-	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
-	git cat-file commit HEAD^ | grep "Signed-off-by:" >actual &&
-	test_cmp expected actual &&
+new file mode 100644
+deleted file mode 100644
+ok 1 - setup
 
-	# Applied side2 will not be signed off
-	test $(git cat-file commit HEAD | grep -c "Signed-off-by:") -eq 0
+expecting success of 4140.2 'apply creation patch to ita path (--cached)': 
+	git rm -f test-file &&
+	cat blueprint >test-file &&
+	git add -N test-file &&
 
-HEAD is now at 1d25943 side2
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+	git apply --cached creation-patch &&
+	git cat-file blob :test-file >actual &&
+	test_cmp blueprint actual
 
-  1d25943 side2
-  0400be0 side1
+rm 'test-file'
+ok 2 - apply creation patch to ita path (--cached)
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+expecting success of 4140.3 'apply creation patch to ita path (--index)': 
+	git rm -f test-file &&
+	cat blueprint >test-file &&
+	git add -N test-file &&
+	rm -f test-file &&
 
- git branch <new-branch-name> 1d25943
+	test_must_fail git apply --index creation-patch
 
-HEAD is now at 3aaf771 first
-error: patch failed: file:1
-error: file: 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 advice.mergeConflict false"
-Applying: side1
-Patch failed at 0001 side1
-Applying: side1
-Applying: side2
-ok 4 - --signoff overrides --no-signoff
+rm 'test-file'
+error: test-file: does not match index
+ok 3 - apply creation patch to ita path (--index)
 
-expecting success of 4153.5 '--reject overrides --no-reject': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	rm -f file.rej &&
+expecting success of 4140.4 'apply deletion patch to ita path (--cached)': 
+	git rm -f test-file &&
+	cat blueprint >test-file &&
+	git add -N test-file &&
 
-	test_must_fail git am --no-reject side1.eml &&
-	test_path_is_dir .git/rebase-apply &&
-	test_path_is_missing file.rej &&
+	git apply --cached deletion-patch &&
+	test_must_fail git ls-files --stage --error-unmatch test-file
 
-	test_must_fail test_terminal git am --reject </dev/zero &&
-	test_path_is_dir .git/rebase-apply &&
-	test_path_is_file file.rej
+rm 'test-file'
+error: pathspec 'test-file' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 4 - apply deletion patch to ita path (--cached)
 
-HEAD is now at 4f3810f side2
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+expecting success of 4140.5 'apply deletion patch to ita path (--index)': 
+	cat blueprint >test-file &&
+	git add -N test-file &&
 
-  4f3810f side2
-  deca85c side1
+	test_must_fail git apply --index deletion-patch &&
+	git ls-files --stage --error-unmatch test-file
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+error: test-file: does not match index
+100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0	test-file
+ok 5 - apply deletion patch to ita path (--index)
 
- git branch <new-branch-name> 4f3810f
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4141-apply-too-large.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4141-apply-too-large/.git/
+checking prerequisite: EXPENSIVE
 
-HEAD is now at 3aaf771 first
-error: patch failed: file:1
-error: file: 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 advice.mergeConflict false"
-Applying: side1
-Patch failed at 0001 side1
-Applying: side1
-Checking patch file...
-error: while searching for:
-initial
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
 
-error: patch failed: file:1
-Applying patch file with 1 reject...
-Rejected hunk #1.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 side1
-died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
-ok 5 - --reject overrides --no-reject
+)
+prerequisite EXPENSIVE not satisfied
+ok 1 # skip git apply rejects patches that are too large (missing EXPENSIVE)
 
-# passed all 5 test(s)
-1..5
+# passed all 1 test(s)
+1..1
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4152-am-subjects.sh ***
@@ -265989,844 +265095,359 @@
 	cp expect one &&
 	git diff -- one >patch &&
 
-	git checkout one &&
-	git apply --whitespace=fix patch &&
-	test_cmp expect one
-
-Updated 1 path from the index
-ok 60 - blank at end of hunk, not at EOF with --whitespace=fix
-
-expecting success of 4124.61 'blank at EOF with --whitespace=warn': 
-	test_write_lines a b c >one &&
-	git add one &&
-	echo >>one &&
-	cat one >expect &&
-	git diff -- one >patch &&
-
-	git checkout one &&
-	git apply --whitespace=warn patch 2>error &&
-	test_cmp expect one &&
-	grep "new blank line at EOF" error
-
-Updated 1 path from the index
-patch:9: new blank line at EOF.
-ok 61 - blank at EOF with --whitespace=warn
-
-expecting success of 4124.62 'blank at EOF with --whitespace=error': 
-	test_write_lines a b c >one &&
-	git add one &&
-	cat one >expect &&
-	echo >>one &&
-	git diff -- one >patch &&
-
-	git checkout one &&
-	test_must_fail git apply --whitespace=error patch 2>error &&
-	test_cmp expect one &&
-	grep "new blank line at EOF" error
-
-Updated 1 path from the index
-patch:9: new blank line at EOF.
-ok 62 - blank at EOF with --whitespace=error
-
-expecting success of 4124.63 'blank but not empty at EOF': 
-	test_write_lines a b c >one &&
-	git add one &&
-	echo "   " >>one &&
-	cat one >expect &&
-	git diff -- one >patch &&
-
-	git checkout one &&
-	git apply --whitespace=warn patch 2>error &&
-	test_cmp expect one &&
-	grep "new blank line at EOF" error
-
-Updated 1 path from the index
-patch:9: new blank line at EOF.
-ok 63 - blank but not empty at EOF
-
-expecting success of 4124.64 'applying beyond EOF requires one non-blank context line': 
-	test_write_lines "" "" "" "" >one &&
-	git add one &&
-	echo b >>one &&
-	git diff -- one >patch &&
-
-	git checkout one &&
-	test_write_lines a "" >one &&
-	cp one expect &&
-	test_must_fail git apply --whitespace=fix patch &&
-	test_cmp expect one &&
-	test_must_fail git apply --ignore-space-change --whitespace=fix patch &&
-	test_cmp expect one
-
-Updated 1 path from the index
-error: patch failed: one:2
-error: one: patch does not apply
-error: patch failed: one:2
-error: one: patch does not apply
-ok 64 - applying beyond EOF requires one non-blank context line
-
-expecting success of 4124.65 'tons of blanks at EOF should not apply': 
-	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
-		test_write_lines "" "" "" "" || return 1
-	done >one &&
-	git add one &&
-	echo a >>one &&
-	git diff -- one >patch &&
-
-	>one &&
-	test_must_fail git apply --whitespace=fix patch &&
-	test_must_fail git apply --ignore-space-change --whitespace=fix patch
-
-error: patch failed: one:62
-error: one: patch does not apply
-error: patch failed: one:62
-error: one: patch does not apply
-ok 65 - tons of blanks at EOF should not apply
-
-expecting success of 4124.66 'missing blank line at end with --whitespace=fix': 
-	echo a >one &&
-	echo >>one &&
-	git add one &&
-	echo b >>one &&
-	cp one expect &&
-	git diff -- one >patch &&
-	echo a >one &&
-	cp one saved-one &&
-	test_must_fail git apply patch &&
-	git apply --whitespace=fix patch &&
-	test_cmp expect one &&
-	mv saved-one one &&
-	git apply --ignore-space-change --whitespace=fix patch &&
-	test_cmp expect one
-
-error: patch failed: one:1
-error: one: patch does not apply
-ok 66 - missing blank line at end with --whitespace=fix
-
-expecting success of 4124.67 'two missing blank lines at end with --whitespace=fix': 
-	test_write_lines a "" b c >one &&
-	cp one no-blank-lines &&
-	test_write_lines "" "" >>one &&
-	git add one &&
-	echo d >>one &&
-	cp one expect &&
-	echo >>one &&
-	git diff -- one >patch &&
-	cp no-blank-lines one &&
-	test_must_fail git apply patch &&
-	git apply --whitespace=fix patch &&
-	test_cmp expect one &&
-	mv no-blank-lines one &&
-	test_must_fail git apply patch &&
-	git apply --ignore-space-change --whitespace=fix patch &&
-	test_cmp expect one
-
-error: patch failed: one:4
-error: one: patch does not apply
-patch:10: new blank line at EOF.
-+
-warning: 1 line adds whitespace errors.
-error: patch failed: one:4
-error: one: patch does not apply
-patch:10: new blank line at EOF.
-+
-warning: 1 line adds whitespace errors.
-ok 67 - two missing blank lines at end with --whitespace=fix
-
-expecting success of 4124.68 'missing blank line at end, insert before end, --whitespace=fix': 
-	test_write_lines a "" >one &&
-	git add one &&
-	test_write_lines b a "" >one &&
-	cp one expect &&
-	git diff -- one >patch &&
-	echo a >one &&
-	test_must_fail git apply patch &&
-	git apply --whitespace=fix patch &&
-	test_cmp expect one
-
-error: patch failed: one:1
-error: one: patch does not apply
-ok 68 - missing blank line at end, insert before end, --whitespace=fix
-
-expecting success of 4124.69 'shrink file with tons of missing blanks at end of file': 
-	test_write_lines a b c >one &&
-	cp one no-blank-lines &&
-	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
-		test_write_lines "" "" "" "" || return 1
-	done >>one &&
-	git add one &&
-	echo a >one &&
-	cp one expect &&
-	git diff -- one >patch &&
-	cp no-blank-lines one &&
-	test_must_fail git apply patch &&
-	git apply --whitespace=fix patch &&
-	test_cmp expect one &&
-	mv no-blank-lines one &&
-	git apply --ignore-space-change --whitespace=fix patch &&
-	test_cmp expect one
-
-error: patch failed: one:1
-error: one: patch does not apply
-ok 69 - shrink file with tons of missing blanks at end of file
-
-expecting success of 4124.70 'missing blanks at EOF must only match blank lines': 
-	test_write_lines a b >one &&
-	git add one &&
-	test_write_lines c d >>one &&
-	git diff -- one >patch &&
-
-	echo a >one &&
-	test_must_fail git apply patch &&
-	test_must_fail git apply --whitespace=fix patch &&
-	test_must_fail git apply --ignore-space-change --whitespace=fix patch
-
-error: patch failed: one:1
-error: one: patch does not apply
-error: patch failed: one:1
-error: one: patch does not apply
-error: patch failed: one:1
-error: one: patch does not apply
-ok 70 - missing blanks at EOF must only match blank lines
-
-expecting success of 4124.71 'missing blank line should match context line with spaces': 
-	git add one &&
-	echo d >>one &&
-	git diff -- one >patch &&
-	test_write_lines a b c >one &&
-	cp one expect &&
-	test_write_lines "" d >>expect &&
-	git add one &&
-
-	git apply --whitespace=fix patch &&
-	test_cmp expect one
-
-patch:8: trailing whitespace.
-		      
-warning: 1 line adds whitespace errors.
-ok 71 - missing blank line should match context line with spaces
-
-expecting success of 4124.72 'same, but with the --ignore-space-option': 
-	git add one &&
-	echo d >>one &&
-	cp one expect &&
-	git diff -- one >patch &&
-	test_write_lines a b c >one &&
-	git add one &&
-
-	git checkout-index -f one &&
-	git apply --ignore-space-change --whitespace=fix patch &&
-	test_cmp expect one
-
-patch:8: trailing whitespace.
-		      
-warning: 1 line adds whitespace errors.
-ok 72 - same, but with the --ignore-space-option
-
-expecting success of 4124.73 'same, but with CR-LF line endings && cr-at-eol set': 
-	git config core.whitespace cr-at-eol &&
-	printf "a\r\n" >one &&
-	printf "b\r\n" >>one &&
-	printf "c\r\n" >>one &&
-	cp one save-one &&
-	printf "                 \r\n" >>one &&
-	git add one &&
-	printf "d\r\n" >>one &&
-	cp one expect &&
-	git diff -- one >patch &&
-	mv save-one one &&
-
-	git apply --ignore-space-change --whitespace=fix patch &&
-	test_cmp expect one
-
-patch:8: trailing whitespace.
-                 
-warning: 1 line adds whitespace errors.
-ok 73 - same, but with CR-LF line endings && cr-at-eol set
-
-expecting success of 4124.74 'CR-LF line endings && add line && text=auto': 
-	git config --unset core.whitespace &&
-	printf "a\r\n" >one &&
-	cp one save-one &&
-	git add one &&
-	printf "b\r\n" >>one &&
-	cp one expect &&
-	git diff -- one >patch &&
-	mv save-one one &&
-	echo "one text=auto" >.gitattributes &&
-	git apply patch &&
-	test_cmp expect one
-
-ok 74 - CR-LF line endings && add line && text=auto
-
-expecting success of 4124.75 'CR-LF line endings && change line && text=auto': 
-	printf "a\r\n" >one &&
-	cp one save-one &&
-	git add one &&
-	printf "b\r\n" >one &&
-	cp one expect &&
-	git diff -- one >patch &&
-	mv save-one one &&
-	echo "one text=auto" >.gitattributes &&
-	git apply patch &&
-	test_cmp expect one
-
-ok 75 - CR-LF line endings && change line && text=auto
-
-expecting success of 4124.76 'LF in repo, CRLF in worktree && change line && text=auto': 
-	printf "a\n" >one &&
-	git add one &&
-	printf "b\r\n" >one &&
-	git diff -- one >patch &&
-	printf "a\r\n" >one &&
-	echo "one text=auto" >.gitattributes &&
-	git -c core.eol=CRLF apply patch &&
-	printf "b\r\n" >expect &&
-	test_cmp expect one
-
-warning: in the working copy of 'one', CRLF will be replaced by LF the next time Git touches it
-ok 76 - LF in repo, CRLF in worktree && change line && text=auto
-
-expecting success of 4124.77 'whitespace=fix to expand': 
-	qz_to_tab_space >preimage <<-\EOF &&
-	QQa
-	QQb
-	QQc
-	ZZZZZZZZZZZZZZZZd
-	QQe
-	QQf
-	QQg
-	EOF
-	qz_to_tab_space >patch <<-\EOF &&
-	diff --git a/preimage b/preimage
-	--- a/preimage
-	+++ b/preimage
-	@@ -1,7 +1,6 @@
-	 QQa
-	 QQb
-	 QQc
-	-QQd
-	 QQe
-	 QQf
-	 QQg
-	EOF
-	git -c core.whitespace=tab-in-indent apply --whitespace=fix patch
-
-patch:5: tab in indent.
-		a
-patch:6: tab in indent.
-		b
-patch:7: tab in indent.
-		c
-patch:9: tab in indent.
-		e
-patch:10: tab in indent.
-		f
-warning: squelched 1 whitespace error
-warning: 6 lines add whitespace errors.
-ok 77 - whitespace=fix to expand
-
-expecting success of 4124.78 'whitespace check skipped for excluded paths': 
-	git config core.whitespace blank-at-eol &&
-	>used &&
-	>unused &&
-	git add used unused &&
-	echo "used" >used &&
-	echo "unused " >unused &&
-	git diff-files -p used unused >patch &&
-	git apply --include=used --stat --whitespace=error <patch
-
- used |    1 +
- 1 file changed, 1 insertion(+)
-ok 78 - whitespace check skipped for excluded paths
-
-# passed all 78 test(s)
-1..78
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4201-shortlog.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4201-shortlog/.git/
-expecting success of 4201.1 'setup': 
-	test_tick &&
-	echo 1 >a1 &&
-	git add a1 &&
-	tree=$(git write-tree) &&
-	commit=$(printf "%s\n" "Test" "" | git commit-tree "$tree") &&
-	git update-ref HEAD "$commit" &&
-
-	echo 2 >a1 &&
-	git commit --quiet -m "This is a very, very long first line for the commit message to see if it is wrapped correctly" a1 &&
-
-	# test if the wrapping is still valid
-	# when replacing all is by treble clefs.
-	echo 3 >a1 &&
-	git commit --quiet -m "$(
-		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
-		sed "s/i/1234/g" |
-		tr 1234 "\360\235\204\236")" a1 &&
-
-	# now fsck up the utf8
-	git config i18n.commitencoding non-utf-8 &&
-	echo 4 >a1 &&
-	git commit --quiet -m "$(
-		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
-		sed "s/i/1234/g" |
-		tr 1234 "\370\235\204\236")" a1 &&
-
-	echo 5 >a1 &&
-	git commit --quiet -m "a								12	34	56	78" a1 &&
-
-	echo 6 >a1 &&
-	git commit --quiet -m "Commit by someone else" \
-		--author="Someone else <not!me>" a1 &&
-
-	cat >expect.template <<-\EOF
-	A U Thor (5):
-	      SUBJECT
-	      SUBJECT
-	      SUBJECT
-	      SUBJECT
-	      SUBJECT
-
-	Someone else (1):
-	      SUBJECT
-
-	EOF
-
-ok 1 - setup
-
-expecting success of 4201.2 'default output format': 
-	git shortlog HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect.template log.predictable
-
-ok 2 - default output format
-
-expecting success of 4201.3 'pretty format': 
-	sed s/SUBJECT/OBJECT_NAME/ expect.template >expect &&
-	git shortlog --format="%H" HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
-
-ok 3 - pretty format
-
-expecting success of 4201.4 'pretty format (with --date)': 
-	sed "s/SUBJECT/2005-04-07 OBJECT_NAME/" expect.template >expect &&
-	git shortlog --format="%ad %H" --date=short HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
-
-ok 4 - pretty format (with --date)
-
-expecting success of 4201.5 '--abbrev': 
-	sed s/SUBJECT/OBJID/ expect.template >expect &&
-	git shortlog --format="%h" --abbrev=35 HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
-
-ok 5 - --abbrev
-
-expecting success of 4201.6 'output from user-defined format is re-wrapped': 
-	sed "s/SUBJECT/two lines/" expect.template >expect &&
-	git shortlog --format="two%nlines" HEAD >log &&
-	fuzz log >log.predictable &&
-	test_cmp expect log.predictable
-
-ok 6 - output from user-defined format is re-wrapped
-
-expecting success of 4201.7 'shortlog wrapping': 
-	cat >expect <<\EOF &&
-A U Thor (5):
-      Test
-      This is a very, very long first line for the commit message to see if
-         it is wrapped correctly
-      Th�s �s a very, very long f�rst l�ne for the comm�t message to see �f
-         �t �s wrapped correctly
-      Thø�„žs ø�„žs a very, very long fø�„žrst lø�„žne for the commø�„žt
-         message to see ø�„žf ø�„žt ø�„žs wrapped correctly
-      a								12	34
-         56	78
-
-Someone else (1):
-      Commit by someone else
-
-EOF
-	git shortlog -w HEAD >out &&
-	test_cmp expect out
-
-ok 7 - shortlog wrapping
-
-expecting success of 4201.8 'shortlog from non-git directory': 
-	git log --no-expand-tabs HEAD >log &&
-	GIT_DIR=non-existing git shortlog -w <log >out &&
-	test_cmp expect out
-
-ok 8 - shortlog from non-git directory
-
-expecting success of 4201.9 'shortlog can read --format=raw output': 
-	git log --format=raw HEAD >log &&
-	GIT_DIR=non-existing git shortlog -w <log >out &&
-	test_cmp expect out
-
-ok 9 - shortlog can read --format=raw output
-
-expecting success of 4201.10 'shortlog from non-git directory refuses extra arguments': 
-	test_must_fail env GIT_DIR=non-existing git shortlog foo 2>out &&
-	test_grep "too many arguments" out
-
-error: too many arguments given outside repository
-ok 10 - shortlog from non-git directory refuses extra arguments
-
-expecting success of 4201.11 'shortlog should add newline when input line matches wraplen': 
-	cat >expect <<\EOF &&
-A U Thor (2):
-      bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
-      aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
-
-EOF
-	git shortlog -w >out <<\EOF &&
-commit 0000000000000000000000000000000000000001
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
-
-commit 0000000000000000000000000000000000000002
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
-
-EOF
-	test_cmp expect out
-
-ok 11 - shortlog should add newline when input line matches wraplen
-
-expecting success of 4201.12 'shortlog encoding': 
-	git reset --hard "$commit" &&
-	git config --unset i18n.commitencoding &&
-	echo 2 > a1 &&
-	git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 &&
-	git config i18n.commitencoding "ISO8859-1" &&
-	echo 3 > a1 &&
-	git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \
-		--author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 &&
-	git config --unset i18n.commitencoding &&
-	git shortlog HEAD~2.. > out &&
-test_cmp expect out
-HEAD is now at aa97132 Test
-ok 12 - shortlog encoding
-
-expecting success of 4201.13 'shortlog with revision pseudo options': 
-	git shortlog --all &&
-	git shortlog --branches &&
-	git shortlog --exclude=refs/heads/m* --all
-
-A U Thor (1):
-      Test
-
-Jöhännës "Dschö" Schindëlin (2):
-      set a1 to 2 and some non-ASCII chars: Äßø
-      set a1 to 3 and some non-ASCII chars: áæï
-
-A U Thor (1):
-      Test
-
-Jöhännës "Dschö" Schindëlin (2):
-      set a1 to 2 and some non-ASCII chars: Äßø
-      set a1 to 3 and some non-ASCII chars: áæï
-
-A U Thor (1):
-      Test
-
-Jöhännës "Dschö" Schindëlin (2):
-      set a1 to 2 and some non-ASCII chars: Äßø
-      set a1 to 3 and some non-ASCII chars: áæï
-
-ok 13 - shortlog with revision pseudo options
-
-expecting success of 4201.14 'shortlog with --output=<file>': 
-	git shortlog --output=shortlog -1 main >output &&
-	test_must_be_empty output &&
-	test_line_count = 3 shortlog
-
-ok 14 - shortlog with --output=<file>
-
-expecting success of 4201.15 'shortlog --committer (internal)': 
-	git checkout --orphan side &&
-	git commit --allow-empty -m one &&
-	git commit --allow-empty -m two &&
-	GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m three &&
-
-	cat >expect <<-\EOF &&
-	     2	C O Mitter
-	     1	Sin Nombre
-	EOF
-	git shortlog -nsc HEAD >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'side'
-[side (root-commit) 9ed1028] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a1
-[side 4046e48] two
- Author: A U Thor <author@example.com>
-[side 1c4141a] three
- Author: A U Thor <author@example.com>
-ok 15 - shortlog --committer (internal)
-
-expecting success of 4201.16 'shortlog --committer (external)': 
-	git log --format=full | git shortlog -nsc >actual &&
-	test_cmp expect actual
-
-ok 16 - shortlog --committer (external)
-
-expecting success of 4201.17 '--group=committer is the same as --committer': 
-	git shortlog -ns --group=committer HEAD >actual &&
-	test_cmp expect actual
-
-ok 17 - --group=committer is the same as --committer
-
-expecting success of 4201.18 'shortlog --group=trailer:signed-off-by': 
-	git commit --allow-empty -m foo -s &&
-	GIT_COMMITTER_NAME="SOB One" \
-	GIT_COMMITTER_EMAIL=sob@example.com \
-		git commit --allow-empty -m foo -s &&
-	git commit --allow-empty --amend --no-edit -s &&
-	cat >expect <<-\EOF &&
-	     2	C O Mitter <committer@example.com>
-	     1	SOB One <sob@example.com>
-	EOF
-	git shortlog -nse --group=trailer:signed-off-by HEAD >actual &&
-	test_cmp expect actual
-
-[side d645125] foo
- Author: A U Thor <author@example.com>
-[side 4ea5894] foo
- Author: A U Thor <author@example.com>
-[side 4d83f03] foo
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
-ok 18 - shortlog --group=trailer:signed-off-by
-
-expecting success of 4201.19 'shortlog --group=format': 
-	git shortlog -s --date="format:%Y" --group="format:%cN (%cd)" \
-		HEAD >actual &&
-	cat >expect <<-\EOF &&
-	     4	C O Mitter (2005)
-	     1	Sin Nombre (2005)
-	EOF
-	test_cmp expect actual
-
-ok 19 - shortlog --group=format
+	git checkout one &&
+	git apply --whitespace=fix patch &&
+	test_cmp expect one
 
-expecting success of 4201.20 'shortlog --group=<format> DWIM': 
-	git shortlog -s --date="format:%Y" --group="%cN (%cd)" HEAD >actual &&
-	test_cmp expect actual
+Updated 1 path from the index
+ok 60 - blank at end of hunk, not at EOF with --whitespace=fix
 
-ok 20 - shortlog --group=<format> DWIM
+expecting success of 4124.61 'blank at EOF with --whitespace=warn': 
+	test_write_lines a b c >one &&
+	git add one &&
+	echo >>one &&
+	cat one >expect &&
+	git diff -- one >patch &&
 
-expecting success of 4201.21 'shortlog bogus --group': 
-	test_must_fail git shortlog --group=bogus HEAD 2>err &&
-	grep "unknown group type" err
+	git checkout one &&
+	git apply --whitespace=warn patch 2>error &&
+	test_cmp expect one &&
+	grep "new blank line at EOF" error
 
-error: unknown group type: bogus
-ok 21 - shortlog bogus --group
+Updated 1 path from the index
+patch:9: new blank line at EOF.
+ok 61 - blank at EOF with --whitespace=warn
 
-expecting success of 4201.22 'trailer idents are split': 
-	cat >expect <<-\EOF &&
-	     2	C O Mitter
-	     1	SOB One
-	EOF
-	git shortlog -ns --group=trailer:signed-off-by HEAD >actual &&
-	test_cmp expect actual
+expecting success of 4124.62 'blank at EOF with --whitespace=error': 
+	test_write_lines a b c >one &&
+	git add one &&
+	cat one >expect &&
+	echo >>one &&
+	git diff -- one >patch &&
 
-ok 22 - trailer idents are split
+	git checkout one &&
+	test_must_fail git apply --whitespace=error patch 2>error &&
+	test_cmp expect one &&
+	grep "new blank line at EOF" error
 
-expecting success of 4201.23 'trailer idents are mailmapped': 
-	cat >expect <<-\EOF &&
-	     2	C O Mitter
-	     1	Another Name
-	EOF
-	echo "Another Name <sob@example.com>" >mail.map &&
-	git -c mailmap.file=mail.map shortlog -ns \
-		--group=trailer:signed-off-by HEAD >actual &&
-	test_cmp expect actual
+Updated 1 path from the index
+patch:9: new blank line at EOF.
+ok 62 - blank at EOF with --whitespace=error
 
-ok 23 - trailer idents are mailmapped
+expecting success of 4124.63 'blank but not empty at EOF': 
+	test_write_lines a b c >one &&
+	git add one &&
+	echo "   " >>one &&
+	cat one >expect &&
+	git diff -- one >patch &&
 
-expecting success of 4201.24 'shortlog de-duplicates trailers in a single commit': 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject one
+	git checkout one &&
+	git apply --whitespace=warn patch 2>error &&
+	test_cmp expect one &&
+	grep "new blank line at EOF" error
 
-	this message has two distinct values, plus a repeat
+Updated 1 path from the index
+patch:9: new blank line at EOF.
+ok 63 - blank but not empty at EOF
 
-	Repeated-trailer: Foo
-	Repeated-trailer: Bar
-	Repeated-trailer: Foo
-	EOF
+expecting success of 4124.64 'applying beyond EOF requires one non-blank context line': 
+	test_write_lines "" "" "" "" >one &&
+	git add one &&
+	echo b >>one &&
+	git diff -- one >patch &&
 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject two
+	git checkout one &&
+	test_write_lines a "" >one &&
+	cp one expect &&
+	test_must_fail git apply --whitespace=fix patch &&
+	test_cmp expect one &&
+	test_must_fail git apply --ignore-space-change --whitespace=fix patch &&
+	test_cmp expect one
 
-	similar to the previous, but without the second distinct value
+Updated 1 path from the index
+error: patch failed: one:2
+error: one: patch does not apply
+error: patch failed: one:2
+error: one: patch does not apply
+ok 64 - applying beyond EOF requires one non-blank context line
 
-	Repeated-trailer: Foo
-	Repeated-trailer: Foo
-	EOF
+expecting success of 4124.65 'tons of blanks at EOF should not apply': 
+	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
+		test_write_lines "" "" "" "" || return 1
+	done >one &&
+	git add one &&
+	echo a >>one &&
+	git diff -- one >patch &&
 
-	cat >expect <<-\EOF &&
-	     2	Foo
-	     1	Bar
-	EOF
-	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
-	test_cmp expect actual
+	>one &&
+	test_must_fail git apply --whitespace=fix patch &&
+	test_must_fail git apply --ignore-space-change --whitespace=fix patch
 
-[side 0a2c930] subject one
- Author: A U Thor <author@example.com>
-[side 45f2a27] subject two
- Author: A U Thor <author@example.com>
-ok 24 - shortlog de-duplicates trailers in a single commit
+error: patch failed: one:62
+error: one: patch does not apply
+error: patch failed: one:62
+error: one: patch does not apply
+ok 65 - tons of blanks at EOF should not apply
 
-expecting success of 4201.25 'shortlog de-duplicates trailers in a single commit (folded/unfolded values)': 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject one
+expecting success of 4124.66 'missing blank line at end with --whitespace=fix': 
+	echo a >one &&
+	echo >>one &&
+	git add one &&
+	echo b >>one &&
+	cp one expect &&
+	git diff -- one >patch &&
+	echo a >one &&
+	cp one saved-one &&
+	test_must_fail git apply patch &&
+	git apply --whitespace=fix patch &&
+	test_cmp expect one &&
+	mv saved-one one &&
+	git apply --ignore-space-change --whitespace=fix patch &&
+	test_cmp expect one
 
-	this message has two distinct values, plus a repeat (folded)
+error: patch failed: one:1
+error: one: patch does not apply
+ok 66 - missing blank line at end with --whitespace=fix
 
-	Repeated-trailer: Foo foo foo
-	Repeated-trailer: Bar
-	Repeated-trailer: Foo
-	  foo foo
-	EOF
+expecting success of 4124.67 'two missing blank lines at end with --whitespace=fix': 
+	test_write_lines a "" b c >one &&
+	cp one no-blank-lines &&
+	test_write_lines "" "" >>one &&
+	git add one &&
+	echo d >>one &&
+	cp one expect &&
+	echo >>one &&
+	git diff -- one >patch &&
+	cp no-blank-lines one &&
+	test_must_fail git apply patch &&
+	git apply --whitespace=fix patch &&
+	test_cmp expect one &&
+	mv no-blank-lines one &&
+	test_must_fail git apply patch &&
+	git apply --ignore-space-change --whitespace=fix patch &&
+	test_cmp expect one
 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject two
+error: patch failed: one:4
+error: one: patch does not apply
+patch:10: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+error: patch failed: one:4
+error: one: patch does not apply
+patch:10: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+ok 67 - two missing blank lines at end with --whitespace=fix
 
-	similar to the previous, but without the second distinct value
+expecting success of 4124.68 'missing blank line at end, insert before end, --whitespace=fix': 
+	test_write_lines a "" >one &&
+	git add one &&
+	test_write_lines b a "" >one &&
+	cp one expect &&
+	git diff -- one >patch &&
+	echo a >one &&
+	test_must_fail git apply patch &&
+	git apply --whitespace=fix patch &&
+	test_cmp expect one
 
-	Repeated-trailer: Foo foo foo
-	Repeated-trailer: Foo
-	  foo foo
-	EOF
+error: patch failed: one:1
+error: one: patch does not apply
+ok 68 - missing blank line at end, insert before end, --whitespace=fix
 
-	cat >expect <<-\EOF &&
-	     2	Foo foo foo
-	     1	Bar
-	EOF
-	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
-	test_cmp expect actual
+expecting success of 4124.69 'shrink file with tons of missing blanks at end of file': 
+	test_write_lines a b c >one &&
+	cp one no-blank-lines &&
+	for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
+		test_write_lines "" "" "" "" || return 1
+	done >>one &&
+	git add one &&
+	echo a >one &&
+	cp one expect &&
+	git diff -- one >patch &&
+	cp no-blank-lines one &&
+	test_must_fail git apply patch &&
+	git apply --whitespace=fix patch &&
+	test_cmp expect one &&
+	mv no-blank-lines one &&
+	git apply --ignore-space-change --whitespace=fix patch &&
+	test_cmp expect one
 
-[side f22298e] subject one
- Author: A U Thor <author@example.com>
-[side b178ed0] subject two
- Author: A U Thor <author@example.com>
-ok 25 - shortlog de-duplicates trailers in a single commit (folded/unfolded values)
+error: patch failed: one:1
+error: one: patch does not apply
+ok 69 - shrink file with tons of missing blanks at end of file
 
-expecting success of 4201.26 'shortlog can match multiple groups': 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject one
+expecting success of 4124.70 'missing blanks at EOF must only match blank lines': 
+	test_write_lines a b >one &&
+	git add one &&
+	test_write_lines c d >>one &&
+	git diff -- one >patch &&
 
-	this has two trailers that are distinct from the author; it will count
-	3 times in the output
+	echo a >one &&
+	test_must_fail git apply patch &&
+	test_must_fail git apply --whitespace=fix patch &&
+	test_must_fail git apply --ignore-space-change --whitespace=fix patch
 
-	Some-trailer: User A <a@example.com>
-	Another-trailer: User B <b@example.com>
-	EOF
+error: patch failed: one:1
+error: one: patch does not apply
+error: patch failed: one:1
+error: one: patch does not apply
+error: patch failed: one:1
+error: one: patch does not apply
+ok 70 - missing blanks at EOF must only match blank lines
 
-	git commit --allow-empty -F - <<-\EOF &&
-	subject two
+expecting success of 4124.71 'missing blank line should match context line with spaces': 
+	git add one &&
+	echo d >>one &&
+	git diff -- one >patch &&
+	test_write_lines a b c >one &&
+	cp one expect &&
+	test_write_lines "" d >>expect &&
+	git add one &&
 
-	this one has two trailers, one of which is a duplicate with the author;
-	it will only be counted once for them
+	git apply --whitespace=fix patch &&
+	test_cmp expect one
 
-	Another-trailer: A U Thor <author@example.com>
-	Some-trailer: User B <b@example.com>
-	EOF
+patch:8: trailing whitespace.
+		      
+warning: 1 line adds whitespace errors.
+ok 71 - missing blank line should match context line with spaces
 
-	cat >expect <<-\EOF &&
-	     2	A U Thor
-	     2	User B
-	     1	User A
-	EOF
-	git shortlog -ns \
-		--group=author \
-		--group=trailer:some-trailer \
-		--group=trailer:another-trailer \
-		-2 HEAD >actual &&
-	test_cmp expect actual
+expecting success of 4124.72 'same, but with the --ignore-space-option': 
+	git add one &&
+	echo d >>one &&
+	cp one expect &&
+	git diff -- one >patch &&
+	test_write_lines a b c >one &&
+	git add one &&
 
-[side d95d79b] subject one
- Author: A U Thor <author@example.com>
-[side 01085b4] subject two
- Author: A U Thor <author@example.com>
-ok 26 - shortlog can match multiple groups
+	git checkout-index -f one &&
+	git apply --ignore-space-change --whitespace=fix patch &&
+	test_cmp expect one
 
-expecting success of 4201.27 'shortlog can match multiple format groups': 
-	GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" \
-		git commit --allow-empty -m "identical names" &&
-	test_tick &&
-	cat >expect <<-\EOF &&
-	     2	A U Thor
-	     1	C O Mitter
-	EOF
-	git shortlog -ns --group="%cn" --group="%an" -2 HEAD >actual &&
-	test_cmp expect actual
+patch:8: trailing whitespace.
+		      
+warning: 1 line adds whitespace errors.
+ok 72 - same, but with the --ignore-space-option
 
-[side 409752b] identical names
- Author: A U Thor <author@example.com>
-ok 27 - shortlog can match multiple format groups
+expecting success of 4124.73 'same, but with CR-LF line endings && cr-at-eol set': 
+	git config core.whitespace cr-at-eol &&
+	printf "a\r\n" >one &&
+	printf "b\r\n" >>one &&
+	printf "c\r\n" >>one &&
+	cp one save-one &&
+	printf "                 \r\n" >>one &&
+	git add one &&
+	printf "d\r\n" >>one &&
+	cp one expect &&
+	git diff -- one >patch &&
+	mv save-one one &&
 
-expecting success of 4201.28 'set up option selection tests': 
-	git commit --allow-empty -F - <<-\EOF
-	subject
+	git apply --ignore-space-change --whitespace=fix patch &&
+	test_cmp expect one
 
-	body
+patch:8: trailing whitespace.
+                 
+warning: 1 line adds whitespace errors.
+ok 73 - same, but with CR-LF line endings && cr-at-eol set
 
-	Trailer-one: value-one
-	Trailer-two: value-two
-	EOF
+expecting success of 4124.74 'CR-LF line endings && add line && text=auto': 
+	git config --unset core.whitespace &&
+	printf "a\r\n" >one &&
+	cp one save-one &&
+	git add one &&
+	printf "b\r\n" >>one &&
+	cp one expect &&
+	git diff -- one >patch &&
+	mv save-one one &&
+	echo "one text=auto" >.gitattributes &&
+	git apply patch &&
+	test_cmp expect one
 
-[side 581ede9] subject
- Author: A U Thor <author@example.com>
-ok 28 - set up option selection tests
+ok 74 - CR-LF line endings && add line && text=auto
 
-expecting success of 4201.29 '--no-group resets group list to author': 
-	cat >expect <<-\EOF &&
-	     1	A U Thor
-	EOF
-	git shortlog -ns \
-		--group=committer \
-		--group=trailer:trailer-one \
-		--no-group \
-		-1 HEAD >actual &&
-	test_cmp expect actual
+expecting success of 4124.75 'CR-LF line endings && change line && text=auto': 
+	printf "a\r\n" >one &&
+	cp one save-one &&
+	git add one &&
+	printf "b\r\n" >one &&
+	cp one expect &&
+	git diff -- one >patch &&
+	mv save-one one &&
+	echo "one text=auto" >.gitattributes &&
+	git apply patch &&
+	test_cmp expect one
 
-ok 29 - --no-group resets group list to author
+ok 75 - CR-LF line endings && change line && text=auto
 
-expecting success of 4201.30 '--no-group resets trailer list': 
-	cat >expect <<-\EOF &&
-	     1	value-two
+expecting success of 4124.76 'LF in repo, CRLF in worktree && change line && text=auto': 
+	printf "a\n" >one &&
+	git add one &&
+	printf "b\r\n" >one &&
+	git diff -- one >patch &&
+	printf "a\r\n" >one &&
+	echo "one text=auto" >.gitattributes &&
+	git -c core.eol=CRLF apply patch &&
+	printf "b\r\n" >expect &&
+	test_cmp expect one
+
+warning: in the working copy of 'one', CRLF will be replaced by LF the next time Git touches it
+ok 76 - LF in repo, CRLF in worktree && change line && text=auto
+
+expecting success of 4124.77 'whitespace=fix to expand': 
+	qz_to_tab_space >preimage <<-\EOF &&
+	QQa
+	QQb
+	QQc
+	ZZZZZZZZZZZZZZZZd
+	QQe
+	QQf
+	QQg
 	EOF
-	git shortlog -ns \
-		--group=trailer:trailer-one \
-		--no-group \
-		--group=trailer:trailer-two \
-		-1 HEAD >actual &&
-	test_cmp expect actual
+	qz_to_tab_space >patch <<-\EOF &&
+	diff --git a/preimage b/preimage
+	--- a/preimage
+	+++ b/preimage
+	@@ -1,7 +1,6 @@
+	 QQa
+	 QQb
+	 QQc
+	-QQd
+	 QQe
+	 QQf
+	 QQg
+	EOF
+	git -c core.whitespace=tab-in-indent apply --whitespace=fix patch
 
-ok 30 - --no-group resets trailer list
+patch:5: tab in indent.
+		a
+patch:6: tab in indent.
+		b
+patch:7: tab in indent.
+		c
+patch:9: tab in indent.
+		e
+patch:10: tab in indent.
+		f
+warning: squelched 1 whitespace error
+warning: 6 lines add whitespace errors.
+ok 77 - whitespace=fix to expand
 
-expecting success of 4201.31 'stdin with multiple groups reports error': 
-	git log >log &&
-	test_must_fail git shortlog --group=author --group=committer <log
+expecting success of 4124.78 'whitespace check skipped for excluded paths': 
+	git config core.whitespace blank-at-eol &&
+	>used &&
+	>unused &&
+	git add used unused &&
+	echo "used" >used &&
+	echo "unused " >unused &&
+	git diff-files -p used unused >patch &&
+	git apply --include=used --stat --whitespace=error <patch
 
-fatal: using multiple --group options with stdin is not supported
-ok 31 - stdin with multiple groups reports error
+ used |    1 +
+ 1 file changed, 1 insertion(+)
+ok 78 - whitespace check skipped for excluded paths
 
-# passed all 31 test(s)
-1..31
+# passed all 78 test(s)
+1..78
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4151-am-abort.sh ***
@@ -267378,371 +265999,781 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4204-patch-id.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t4153-am-resume-override-opts.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4153-am-resume-override-opts/.git/
+expecting success of 4153.1 'setup': 
+	test_commit initial file &&
+	test_commit first file &&
+
+	git checkout initial &&
+	git mv file file2 &&
+	test_tick &&
+	git commit -m renamed-file &&
+	git tag renamed-file &&
+
+	git checkout -b side initial &&
+	test_commit side1 file &&
+	test_commit side2 file &&
 
+	format_patch side1 &&
+	format_patch side2
 
-[main (root-commit) f34ad56] initial
+[master (root-commit) b6d2089] initial
  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 file
+[master 3aaf771] first
  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(+), 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 b6d2089 initial
+[detached HEAD 5e7fd8e] renamed-file
  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, 0 insertions(+), 0 deletions(-)
+ rename file => file2 (100%)
+Previous HEAD position was 5e7fd8e renamed-file
+Switched to a new branch 'side'
+[side ccf21da] side1
  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(+), 1 deletion(-)
+[side 58bd40e] side2
  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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 4204.2 'patch-id output is well-formed': 
-	git log -p -1 >log.output &&
-	git patch-id <log.output >output &&
-	grep "^$OID_REGEX $(git rev-parse HEAD)$" output
+checking prerequisite: TTY
 
-f2e75ee7c01deac4f2c51488f8e1cc6c0ff2719f 983116d734eae4c6993305600c31050ff5dea7f1
-ok 2 - patch-id output is well-formed
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
 
-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
+	# 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 3 - patch-id detects equality
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-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
+)
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
+prerequisite TTY ok
+expecting success of 4153.2 '--3way overrides --no-3way': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout renamed-file &&
 
---- patch-id_main	2025-12-18 01:35:47.710773267 +0000
-+++ patch-id_notsame	2025-12-18 01:35:47.742773267 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+6276aec15da664e9f9ce6dde29c2e2c71607e017
-ok 4 - patch-id detects inequality
+	# Applying side1 will fail as the file has been renamed.
+	test_must_fail git am --no-3way side[12].eml &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev renamed-file HEAD &&
+	test -z "$(git ls-files -u)" &&
+
+	# Applying side1 with am --3way will succeed due to the threeway-merge.
+	# Applying side2 will fail as --3way does not apply to it.
+	test_must_fail test_terminal git am --3way </dev/zero &&
+	test_path_is_dir .git/rebase-apply &&
+	test side1 = "$(cat file2)"
+
+HEAD is now at 58bd40e side2
+Note: switching to 'renamed-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.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 5e7fd8e renamed-file
+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 advice.mergeConflict false"
+Applying: side1
+Patch failed at 0001 side1
+Applying: side1
+Using index info to reconstruct a base tree...
+A	file
+Falling back to patching base and 3-way merge...
+Merging:
+5e7fd8e renamed-file
+virtual side1
+found 1 common ancestor:
+virtual 99f2e3e1cb15f9b52fa29f66d380dda061d917ab
+Applying: side2
+Patch failed at 0002 side2
+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 advice.mergeConflict false"
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
+ok 2 - --3way overrides --no-3way
+
+expecting success of 4153.3 '--no-quiet overrides --quiet': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+
+	# Applying side1 will be quiet.
+	test_must_fail git am --quiet side[123].eml >out &&
+	test_path_is_dir .git/rebase-apply &&
+	test_grep ! "^Applying: " out &&
+	echo side1 >file &&
+	git add file &&
+
+	# Applying side1 will not be quiet.
+	# Applying side2 will be quiet.
+	git am --no-quiet --continue >out &&
+	echo "Applying: side1" >expected &&
+	test_cmp expected out
+
+HEAD is now at 8e08c98 side1
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  8e08c98 side1
+
+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> 8e08c98
+
+HEAD is now at 3aaf771 first
+error: patch failed: file:1
+error: file: 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 advice.mergeConflict false"
+ok 3 - --no-quiet overrides --quiet
+
+expecting success of 4153.4 '--signoff overrides --no-signoff': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+
+	test_must_fail git am --no-signoff side[12].eml &&
+	test_path_is_dir .git/rebase-apply &&
+	echo side1 >file &&
+	git add file &&
+	git am --signoff --continue &&
+
+	# Applied side1 will be signed off
+	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
+	git cat-file commit HEAD^ | grep "Signed-off-by:" >actual &&
+	test_cmp expected actual &&
+
+	# Applied side2 will not be signed off
+	test $(git cat-file commit HEAD | grep -c "Signed-off-by:") -eq 0
+
+HEAD is now at 1d25943 side2
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  1d25943 side2
+  0400be0 side1
+
+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> 1d25943
+
+HEAD is now at 3aaf771 first
+error: patch failed: file:1
+error: file: 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 advice.mergeConflict false"
+Applying: side1
+Patch failed at 0001 side1
+Applying: side1
+Applying: side2
+ok 4 - --signoff overrides --no-signoff
+
+expecting success of 4153.5 '--reject overrides --no-reject': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	rm -f file.rej &&
+
+	test_must_fail git am --no-reject side1.eml &&
+	test_path_is_dir .git/rebase-apply &&
+	test_path_is_missing file.rej &&
+
+	test_must_fail test_terminal git am --reject </dev/zero &&
+	test_path_is_dir .git/rebase-apply &&
+	test_path_is_file file.rej
+
+HEAD is now at 4f3810f side2
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  4f3810f side2
+  deca85c side1
+
+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> 4f3810f
+
+HEAD is now at 3aaf771 first
+error: patch failed: file:1
+error: file: 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 advice.mergeConflict false"
+Applying: side1
+Patch failed at 0001 side1
+Applying: side1
+Patch failed at 0001 side1
+Checking patch file...
+error: while searching for:
+initial
+
+error: patch failed: file:1
+Applying patch file with 1 reject...
+Rejected hunk #1.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
+ok 5 - --reject overrides --no-reject
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4201-shortlog.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4201-shortlog/.git/
+expecting success of 4201.1 'setup': 
+	test_tick &&
+	echo 1 >a1 &&
+	git add a1 &&
+	tree=$(git write-tree) &&
+	commit=$(printf "%s\n" "Test" "" | git commit-tree "$tree") &&
+	git update-ref HEAD "$commit" &&
+
+	echo 2 >a1 &&
+	git commit --quiet -m "This is a very, very long first line for the commit message to see if it is wrapped correctly" a1 &&
+
+	# test if the wrapping is still valid
+	# when replacing all is by treble clefs.
+	echo 3 >a1 &&
+	git commit --quiet -m "$(
+		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
+		sed "s/i/1234/g" |
+		tr 1234 "\360\235\204\236")" a1 &&
+
+	# now fsck up the utf8
+	git config i18n.commitencoding non-utf-8 &&
+	echo 4 >a1 &&
+	git commit --quiet -m "$(
+		echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" |
+		sed "s/i/1234/g" |
+		tr 1234 "\370\235\204\236")" a1 &&
+
+	echo 5 >a1 &&
+	git commit --quiet -m "a								12	34	56	78" a1 &&
+
+	echo 6 >a1 &&
+	git commit --quiet -m "Commit by someone else" \
+		--author="Someone else <not!me>" a1 &&
+
+	cat >expect.template <<-\EOF
+	A U Thor (5):
+	      SUBJECT
+	      SUBJECT
+	      SUBJECT
+	      SUBJECT
+	      SUBJECT
+
+	Someone else (1):
+	      SUBJECT
 
-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"
 
-ok 5 - patch-id detects equality binary
+ok 1 - setup
 
-expecting success of 4204.6 'patch-id detects inequality binary': 
-	cat >.gitattributes <<-\EOF &&
-	foo binary
-	bar binary
+expecting success of 4201.2 'default output format': 
+	git shortlog HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect.template log.predictable
+
+ok 2 - default output format
+
+expecting success of 4201.3 'pretty format': 
+	sed s/SUBJECT/OBJECT_NAME/ expect.template >expect &&
+	git shortlog --format="%H" HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 3 - pretty format
+
+expecting success of 4201.4 'pretty format (with --date)': 
+	sed "s/SUBJECT/2005-04-07 OBJECT_NAME/" expect.template >expect &&
+	git shortlog --format="%ad %H" --date=short HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 4 - pretty format (with --date)
+
+expecting success of 4201.5 '--abbrev': 
+	sed s/SUBJECT/OBJID/ expect.template >expect &&
+	git shortlog --format="%h" --abbrev=35 HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 5 - --abbrev
+
+expecting success of 4201.6 'output from user-defined format is re-wrapped': 
+	sed "s/SUBJECT/two lines/" expect.template >expect &&
+	git shortlog --format="two%nlines" HEAD >log &&
+	fuzz log >log.predictable &&
+	test_cmp expect log.predictable
+
+ok 6 - output from user-defined format is re-wrapped
+
+expecting success of 4201.7 'shortlog wrapping': 
+	cat >expect <<\EOF &&
+A U Thor (5):
+      Test
+      This is a very, very long first line for the commit message to see if
+         it is wrapped correctly
+      Th�s �s a very, very long f�rst l�ne for the comm�t message to see �f
+         �t �s wrapped correctly
+      Thø�„žs ø�„žs a very, very long fø�„žrst lø�„žne for the commø�„žt
+         message to see ø�„žf ø�„žt ø�„žs wrapped correctly
+      a								12	34
+         56	78
+
+Someone else (1):
+      Commit by someone else
+
+EOF
+	git shortlog -w HEAD >out &&
+	test_cmp expect out
+
+ok 7 - shortlog wrapping
+
+expecting success of 4201.8 'shortlog from non-git directory': 
+	git log --no-expand-tabs HEAD >log &&
+	GIT_DIR=non-existing git shortlog -w <log >out &&
+	test_cmp expect out
+
+ok 8 - shortlog from non-git directory
+
+expecting success of 4201.9 'shortlog can read --format=raw output': 
+	git log --format=raw HEAD >log &&
+	GIT_DIR=non-existing git shortlog -w <log >out &&
+	test_cmp expect out
+
+ok 9 - shortlog can read --format=raw output
+
+expecting success of 4201.10 'shortlog from non-git directory refuses extra arguments': 
+	test_must_fail env GIT_DIR=non-existing git shortlog foo 2>out &&
+	test_grep "too many arguments" out
+
+error: too many arguments given outside repository
+ok 10 - shortlog from non-git directory refuses extra arguments
+
+expecting success of 4201.11 'shortlog should add newline when input line matches wraplen': 
+	cat >expect <<\EOF &&
+A U Thor (2):
+      bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
+      aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
+
+EOF
+	git shortlog -w >out <<\EOF &&
+commit 0000000000000000000000000000000000000001
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    aaaaaaaaaaaaaaaaaaaaaa: aaaaaa aaaaaaaaaa aaaa aaaaaaaa aa aaaa aa aaa
+
+commit 0000000000000000000000000000000000000002
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    bbbbbbbbbbbbbbbbbb: bbbbbbbb bbb bbbb bbbbbbb bb bbbb bbb bbbbb bbbbbb
+
+EOF
+	test_cmp expect out
+
+ok 11 - shortlog should add newline when input line matches wraplen
+
+expecting success of 4201.12 'shortlog encoding': 
+	git reset --hard "$commit" &&
+	git config --unset i18n.commitencoding &&
+	echo 2 > a1 &&
+	git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 &&
+	git config i18n.commitencoding "ISO8859-1" &&
+	echo 3 > a1 &&
+	git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \
+		--author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 &&
+	git config --unset i18n.commitencoding &&
+	git shortlog HEAD~2.. > out &&
+test_cmp expect out
+HEAD is now at aa97132 Test
+ok 12 - shortlog encoding
+
+expecting success of 4201.13 'shortlog with revision pseudo options': 
+	git shortlog --all &&
+	git shortlog --branches &&
+	git shortlog --exclude=refs/heads/m* --all
+
+A U Thor (1):
+      Test
+
+Jöhännës "Dschö" Schindëlin (2):
+      set a1 to 2 and some non-ASCII chars: Äßø
+      set a1 to 3 and some non-ASCII chars: áæï
+
+A U Thor (1):
+      Test
+
+Jöhännës "Dschö" Schindëlin (2):
+      set a1 to 2 and some non-ASCII chars: Äßø
+      set a1 to 3 and some non-ASCII chars: áæï
+
+A U Thor (1):
+      Test
+
+Jöhännës "Dschö" Schindëlin (2):
+      set a1 to 2 and some non-ASCII chars: Äßø
+      set a1 to 3 and some non-ASCII chars: áæï
+
+ok 13 - shortlog with revision pseudo options
+
+expecting success of 4201.14 'shortlog with --output=<file>': 
+	git shortlog --output=shortlog -1 main >output &&
+	test_must_be_empty output &&
+	test_line_count = 3 shortlog
+
+ok 14 - shortlog with --output=<file>
+
+expecting success of 4201.15 'shortlog --committer (internal)': 
+	git checkout --orphan side &&
+	git commit --allow-empty -m one &&
+	git commit --allow-empty -m two &&
+	GIT_COMMITTER_NAME="Sin Nombre" git commit --allow-empty -m three &&
+
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	Sin Nombre
 	EOF
-	get_patch_id main &&
-	get_patch_id notsame &&
-	! test_cmp patch-id_main patch-id_notsame &&
-	test_when_finished "rm .gitattributes"
+	git shortlog -nsc HEAD >actual &&
+	test_cmp expect actual
 
---- patch-id_main	2025-12-18 01:35:47.918773267 +0000
-+++ patch-id_notsame	2025-12-18 01:35:47.958773267 +0000
-@@ -1 +1 @@
--6c46c4bc49d6541a5d8bcadf7808959c9520ae8b
-+f92e710b91f98a3598e43f302e80d3e4a9bfe874
-ok 6 - patch-id detects inequality binary
+Switched to a new branch 'side'
+[side (root-commit) 9ed1028] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a1
+[side 4046e48] two
+ Author: A U Thor <author@example.com>
+[side 1c4141a] three
+ Author: A U Thor <author@example.com>
+ok 15 - shortlog --committer (internal)
 
-expecting success of 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 4201.16 'shortlog --committer (external)': 
+	git log --format=full | git shortlog -nsc >actual &&
+	test_cmp expect actual
 
-Switched to branch 'same'
-ok 7 - patch-id supports git-format-patch output
+ok 16 - shortlog --committer (external)
 
-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 4201.17 '--group=committer is the same as --committer': 
+	git shortlog -ns --group=committer HEAD >actual &&
+	test_cmp expect actual
 
-Already on 'same'
-ok 8 - whitespace is irrelevant in footer
+ok 17 - --group=committer is the same as --committer
 
-expecting success of 4204.9 'file order is irrelevant with --stable': 
-	test_patch_id_file_order irrelevant --stable --stable
+expecting success of 4201.18 'shortlog --group=trailer:signed-off-by': 
+	git commit --allow-empty -m foo -s &&
+	GIT_COMMITTER_NAME="SOB One" \
+	GIT_COMMITTER_EMAIL=sob@example.com \
+		git commit --allow-empty -m foo -s &&
+	git commit --allow-empty --amend --no-edit -s &&
+	cat >expect <<-\EOF &&
+	     2	C O Mitter <committer@example.com>
+	     1	SOB One <sob@example.com>
+	EOF
+	git shortlog -nse --group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
 
-Already on 'same'
-ok 9 - file order is irrelevant with --stable
+[side d645125] foo
+ Author: A U Thor <author@example.com>
+[side 4ea5894] foo
+ Author: A U Thor <author@example.com>
+[side 4d83f03] foo
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ok 18 - shortlog --group=trailer:signed-off-by
 
-expecting success of 4204.10 'file order is relevant with --unstable': 
-	test_patch_id_file_order relevant --unstable --unstable
+expecting success of 4201.19 'shortlog --group=format': 
+	git shortlog -s --date="format:%Y" --group="format:%cN (%cd)" \
+		HEAD >actual &&
+	cat >expect <<-\EOF &&
+	     4	C O Mitter (2005)
+	     1	Sin Nombre (2005)
+	EOF
+	test_cmp expect actual
 
-Already on 'same'
---- patch-id_order---unstable-relevant	2025-12-18 01:35:48.218773267 +0000
-+++ patch-id_ordered-order---unstable-relevant	2025-12-18 01:35:48.242773267 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 10 - file order is relevant with --unstable
+ok 19 - shortlog --group=format
 
-expecting success of 4204.11 'whitespace is relevant with --verbatim': 
-	test_patch_id_whitespace relevant --verbatim --verbatim
+expecting success of 4201.20 'shortlog --group=<format> DWIM': 
+	git shortlog -s --date="format:%Y" --group="%cN (%cd)" HEAD >actual &&
+	test_cmp expect actual
 
---- patch-id_ws---verbatim-relevant	2025-12-18 01:35:48.294773267 +0000
-+++ patch-id_ws-ws---verbatim-relevant	2025-12-18 01:35:48.322773267 +0000
-@@ -1 +1 @@
--bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
-+ec56d730a19f56a178db031386e5bcaabfea5677
-ok 11 - whitespace is relevant with --verbatim
+ok 20 - shortlog --group=<format> DWIM
 
-expecting success of 4204.12 'whitespace is irrelevant without --verbatim': 
-	test_patch_id_whitespace irrelevant --stable --stable
+expecting success of 4201.21 'shortlog bogus --group': 
+	test_must_fail git shortlog --group=bogus HEAD 2>err &&
+	grep "unknown group type" err
 
-ok 12 - whitespace is irrelevant without --verbatim
+error: unknown group type: bogus
+ok 21 - shortlog bogus --group
 
-expecting success of 4204.13 'default is unstable': 
-	test_patch_id relevant default
+expecting success of 4201.22 'trailer idents are split': 
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	SOB One
+	EOF
+	git shortlog -ns --group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
 
-Already on 'same'
---- patch-id_order-default-relevant	2025-12-18 01:35:48.410773267 +0000
-+++ patch-id_ordered-order-default-relevant	2025-12-18 01:35:48.442773267 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 13 - default is unstable
+ok 22 - trailer idents are split
 
-expecting success of 4204.14 'patchid.stable = true is stable': 
-	test_config patchid.stable true &&
-	test_patch_id irrelevant patchid.stable=true
+expecting success of 4201.23 'trailer idents are mailmapped': 
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	Another Name
+	EOF
+	echo "Another Name <sob@example.com>" >mail.map &&
+	git -c mailmap.file=mail.map shortlog -ns \
+		--group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
 
-Already on 'same'
-ok 14 - patchid.stable = true is stable
+ok 23 - trailer idents are mailmapped
 
-expecting success of 4204.15 'patchid.stable = false is unstable': 
-	test_config patchid.stable false &&
-	test_patch_id relevant patchid.stable=false
+expecting success of 4201.24 'shortlog de-duplicates trailers in a single commit': 
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
 
-Already on 'same'
---- patch-id_order-patchid.stable=false-relevant	2025-12-18 01:35:48.558773267 +0000
-+++ patch-id_ordered-order-patchid.stable=false-relevant	2025-12-18 01:35:48.598773267 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 15 - patchid.stable = false is unstable
+	this message has two distinct values, plus a repeat
 
-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
+	Repeated-trailer: Foo
+	Repeated-trailer: Bar
+	Repeated-trailer: Foo
+	EOF
 
---- patch-id_ws-patchid.verbatim=true-relevant	2025-12-18 01:35:48.642773267 +0000
-+++ patch-id_ws-ws-patchid.verbatim=true-relevant	2025-12-18 01:35:48.686773267 +0000
-@@ -1 +1 @@
--bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
-+ec56d730a19f56a178db031386e5bcaabfea5677
-Already on 'same'
-ok 16 - patchid.verbatim = true is correct and stable
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
 
-expecting success of 4204.17 'patchid.verbatim = false is unstable': 
-	test_config patchid.verbatim false &&
-	test_patch_id relevant patchid.verbatim=false
+	similar to the previous, but without the second distinct value
 
-Already on 'same'
---- patch-id_order-patchid.verbatim=false-relevant	2025-12-18 01:35:48.818773267 +0000
-+++ patch-id_ordered-order-patchid.verbatim=false-relevant	2025-12-18 01:35:48.862773267 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 17 - patchid.verbatim = false is unstable
+	Repeated-trailer: Foo
+	Repeated-trailer: Foo
+	EOF
 
-expecting success of 4204.18 '--unstable overrides patchid.stable = true': 
-	test_config patchid.stable true &&
-	test_patch_id relevant patchid.stable=true--unstable --unstable
+	cat >expect <<-\EOF &&
+	     2	Foo
+	     1	Bar
+	EOF
+	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
+	test_cmp expect actual
 
-Already on 'same'
---- patch-id_order-patchid.stable=true--unstable-relevant	2025-12-18 01:35:48.918773267 +0000
-+++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2025-12-18 01:35:48.962773267 +0000
-@@ -1 +1 @@
--c58fad5dc58fa3f768f4c9a1809f1bf824870825
-+892d1d3b08f44511b1fdc7cab43c0ad907ac772b
-ok 18 - --unstable overrides patchid.stable = true
+[side 0a2c930] subject one
+ Author: A U Thor <author@example.com>
+[side 45f2a27] subject two
+ Author: A U Thor <author@example.com>
+ok 24 - shortlog de-duplicates trailers in a single commit
 
-expecting success of 4204.19 '--stable overrides patchid.stable = false': 
-	test_config patchid.stable false &&
-	test_patch_id irrelevant patchid.stable=false--stable --stable
+expecting success of 4201.25 'shortlog de-duplicates trailers in a single commit (folded/unfolded values)': 
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
 
-Already on 'same'
-ok 19 - --stable overrides patchid.stable = false
+	this message has two distinct values, plus a repeat (folded)
 
-expecting success of 4204.20 '--verbatim overrides patchid.stable = false': 
-	test_config patchid.stable false &&
-	test_patch_id_whitespace relevant stable=false--verbatim --verbatim
+	Repeated-trailer: Foo foo foo
+	Repeated-trailer: Bar
+	Repeated-trailer: Foo
+	  foo foo
+	EOF
 
---- patch-id_ws-stable=false--verbatim-relevant	2025-12-18 01:35:49.090773267 +0000
-+++ patch-id_ws-ws-stable=false--verbatim-relevant	2025-12-18 01:35:49.130773267 +0000
-@@ -1 +1 @@
--bd0ab1dc8a63de799337fc1a1b4e7c00ce6f7caf
-+ec56d730a19f56a178db031386e5bcaabfea5677
-ok 20 - --verbatim overrides patchid.stable = false
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
 
-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
+	similar to the previous, but without the second distinct value
 
-Already on 'same'
-ok 21 - patch-id supports git-format-patch MIME output
+	Repeated-trailer: Foo foo foo
+	Repeated-trailer: Foo
+	  foo foo
+	EOF
 
-expecting success of 4204.22 'patch-id respects config from subdir': 
-	test_config patchid.stable true &&
-	mkdir subdir &&
+	cat >expect <<-\EOF &&
+	     2	Foo foo foo
+	     1	Bar
+	EOF
+	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
+	test_cmp expect actual
 
-	# copy these because test_patch_id() looks for them in
-	# the current directory
-	cp bar-then-foo foo-then-bar subdir &&
+[side f22298e] subject one
+ Author: A U Thor <author@example.com>
+[side b178ed0] subject two
+ Author: A U Thor <author@example.com>
+ok 25 - shortlog de-duplicates trailers in a single commit (folded/unfolded values)
 
-	(
-		cd subdir &&
-		test_patch_id irrelevant patchid.stable=true
-	)
+expecting success of 4201.26 'shortlog can match multiple groups': 
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
 
-Already on 'same'
-ok 22 - patch-id respects config from subdir
+	this has two trailers that are distinct from the author; it will count
+	3 times in the output
 
-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
+	Some-trailer: User A <a@example.com>
+	Another-trailer: User B <b@example.com>
 	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
+
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
+
+	this one has two trailers, one of which is a duplicate with the author;
+	it will only be counted once for them
+
+	Another-trailer: A U Thor <author@example.com>
+	Some-trailer: User B <b@example.com>
 	EOF
-	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	2025-12-18 01:35:49.358773267 +0000
-+++ patch-id_withnl-inc-ws	2025-12-18 01:35:49.394773267 +0000
-@@ -1 +1 @@
--7ff2bcb9c001e010d881f0fccddc20be3af94012
-+897be18d6338cd2e68bf17f3848b1c48bbc17459
-ok 23 - patch-id handles no-nl-at-eof markers
+	cat >expect <<-\EOF &&
+	     2	A U Thor
+	     2	User B
+	     1	User A
+	EOF
+	git shortlog -ns \
+		--group=author \
+		--group=trailer:some-trailer \
+		--group=trailer:another-trailer \
+		-2 HEAD >actual &&
+	test_cmp expect actual
 
-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
+[side d95d79b] subject one
+ Author: A U Thor <author@example.com>
+[side 01085b4] subject two
+ Author: A U Thor <author@example.com>
+ok 26 - shortlog can match multiple groups
+
+expecting success of 4201.27 'shortlog can match multiple format groups': 
+	GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME" \
+		git commit --allow-empty -m "identical names" &&
+	test_tick &&
+	cat >expect <<-\EOF &&
+	     2	A U Thor
+	     1	C O Mitter
 	EOF
-	calc_patch_id diffu1 <diffu1 &&
-	test_config patchid.stable true &&
-	calc_patch_id diffu1stable <diffu1
+	git shortlog -ns --group="%cn" --group="%an" -2 HEAD >actual &&
+	test_cmp expect actual
 
-ok 24 - patch-id handles diffs with one line of before/after
+[side 409752b] identical names
+ Author: A U Thor <author@example.com>
+ok 27 - shortlog can match multiple format groups
 
-# passed all 24 test(s)
-1..24
+expecting success of 4201.28 'set up option selection tests': 
+	git commit --allow-empty -F - <<-\EOF
+	subject
+
+	body
+
+	Trailer-one: value-one
+	Trailer-two: value-two
+	EOF
+
+[side 581ede9] subject
+ Author: A U Thor <author@example.com>
+ok 28 - set up option selection tests
+
+expecting success of 4201.29 '--no-group resets group list to author': 
+	cat >expect <<-\EOF &&
+	     1	A U Thor
+	EOF
+	git shortlog -ns \
+		--group=committer \
+		--group=trailer:trailer-one \
+		--no-group \
+		-1 HEAD >actual &&
+	test_cmp expect actual
+
+ok 29 - --no-group resets group list to author
+
+expecting success of 4201.30 '--no-group resets trailer list': 
+	cat >expect <<-\EOF &&
+	     1	value-two
+	EOF
+	git shortlog -ns \
+		--group=trailer:trailer-one \
+		--no-group \
+		--group=trailer:trailer-two \
+		-1 HEAD >actual &&
+	test_cmp expect actual
+
+ok 30 - --no-group resets trailer list
+
+expecting success of 4201.31 'stdin with multiple groups reports error': 
+	git log >log &&
+	test_must_fail git shortlog --group=author --group=committer <log
+
+fatal: using multiple --group options with stdin is not supported
+ok 31 - stdin with multiple groups reports error
+
+# passed all 31 test(s)
+1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4200-rerere.sh ***
@@ -268828,49 +267859,371 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4206-log-follow-harder-copies.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4206-log-follow-harder-copies/.git/
-expecting success of 4206.1 'add a file path0 and commit.': 
-	git add path0 &&
-	git commit -m "Add path0"
+*** t4204-patch-id.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-[master (root-commit) 70f443e] Add path0
+
+[main (root-commit) f34ad56] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- create mode 100644 path0
-ok 1 - add a file path0 and commit.
+ 2 files changed, 16 insertions(+)
+ create mode 100644 bar
+ create mode 100644 foo
+[main 637c384] first
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'same'
+[same bdbb3b3] same-msg
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 2 insertions(+)
+Switched to a new branch 'notsame'
+[notsame e083d83] notsame-msg
+ 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 4206.2 'Change path0.': 
-	git add path0 &&
-	git commit -m "Change path0"
+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
 
-[master 64b1451] Change path0
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+), 3 deletions(-)
-ok 2 - Change path0.
+f2e75ee7c01deac4f2c51488f8e1cc6c0ff2719f 983116d734eae4c6993305600c31050ff5dea7f1
+ok 2 - patch-id output is well-formed
 
-expecting success of 4206.3 'copy path0 to path1.': 
-	git add path1 &&
-	git commit -m "Copy path1 from path0"
+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
 
-[master 3227a3d] Copy path1 from path0
- Author: A U Thor <author@example.com>
- 1 file changed, 4 insertions(+)
- create mode 100644 path1
-ok 3 - copy path0 to path1.
+ok 3 - patch-id detects equality
 
-expecting success of 4206.4 'find the copy path0 -> path1 harder': 
-	git log --follow --name-status --pretty="format:%s"  path1 > current
+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
 
-ok 4 - find the copy path0 -> path1 harder
+--- patch-id_main	2024-11-14 19:34:40.924838653 +0000
++++ patch-id_notsame	2024-11-14 19:34:41.032839752 +0000
+@@ -1 +1 @@
+-c58fad5dc58fa3f768f4c9a1809f1bf824870825
++6276aec15da664e9f9ce6dde29c2e2c71607e017
+ok 4 - patch-id detects inequality
 
-expecting success of 4206.5 'validate the output.': 
-	compare_diff_patch current expected
+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"
 
-ok 5 - validate the output.
+ok 5 - patch-id detects equality binary
 
-# passed all 5 test(s)
-1..5
+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	2024-11-14 19:34:42.096850588 +0000
++++ patch-id_notsame	2024-11-14 19:34:42.396853643 +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	2024-11-14 19:34:44.500875068 +0000
++++ patch-id_ordered-order---unstable-relevant	2024-11-14 19:34:44.636876453 +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	2024-11-14 19:34:44.656876656 +0000
++++ patch-id_ws-ws---verbatim-relevant	2024-11-14 19:34:44.684876941 +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	2024-11-14 19:34:44.808878204 +0000
++++ patch-id_ordered-order-default-relevant	2024-11-14 19:34:44.840878530 +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	2024-11-14 19:34:45.020880363 +0000
++++ patch-id_ordered-order-patchid.stable=false-relevant	2024-11-14 19:34:45.096881137 +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	2024-11-14 19:34:45.164881830 +0000
++++ patch-id_ws-ws-patchid.verbatim=true-relevant	2024-11-14 19:34:45.196882155 +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	2024-11-14 19:34:45.620886473 +0000
++++ patch-id_ordered-order-patchid.verbatim=false-relevant	2024-11-14 19:34:45.740887695 +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	2024-11-14 19:34:45.884889161 +0000
++++ patch-id_ordered-order-patchid.stable=true--unstable-relevant	2024-11-14 19:34:46.016890506 +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	2024-11-14 19:34:46.372894131 +0000
++++ patch-id_ws-ws-stable=false--verbatim-relevant	2024-11-14 19:34:46.432894742 +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	2024-11-14 19:34:46.952900037 +0000
++++ patch-id_withnl-inc-ws	2024-11-14 19:34:47.004900567 +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
+
+# passed all 24 test(s)
+1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4203-mailmap.sh ***
@@ -270188,660 +269541,2386 @@
 1..69
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4207-log-decoration-colors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4207-log-decoration-colors/.git/
-expecting success of 4207.1 'setup': 
-	git config diff.color.commit yellow &&
-	git config color.decorate.branch green &&
-	git config color.decorate.remoteBranch red &&
-	git config color.decorate.tag "reverse bold yellow" &&
-	git config color.decorate.stash magenta &&
-	git config color.decorate.grafted black &&
-	git config color.decorate.HEAD cyan &&
+*** t4150-am.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4150-am/.git/
+expecting success of 4150.1 'setup: messages': 
+	cat >msg <<-\EOF &&
+	second
 
-	c_reset="<RESET>" &&
+	Lorem ipsum dolor sit amet, consectetuer sadipscing elitr, sed diam nonumy
+	eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
+	voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita
+	kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem
+	ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
+	tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
+	vero eos et accusam et justo duo dolores et ea rebum.
 
-	c_commit="<YELLOW>" &&
-	c_branch="<GREEN>" &&
-	c_remoteBranch="<RED>" &&
-	c_tag="<BOLD;REVERSE;YELLOW>" &&
-	c_stash="<MAGENTA>" &&
-	c_HEAD="<CYAN>" &&
-	c_grafted="<BLACK>" &&
+	EOF
+	qz_to_tab_space <<-\EOF >>msg &&
+	QDuis autem vel eum iriure dolor in hendrerit in vulputate velit
+	Qesse molestie consequat, vel illum dolore eu feugiat nulla facilisis
+	Qat vero eros et accumsan et iusto odio dignissim qui blandit
+	Qpraesent luptatum zzril delenit augue duis dolore te feugait nulla
+	Qfacilisi.
+	EOF
+	cat >>msg <<-\EOF &&
 
-	test_commit A &&
-	git clone . other &&
-	(
-		cd other &&
-		test_commit A1
-	) &&
+	Lorem ipsum dolor sit amet,
+	consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut
+	laoreet dolore magna aliquam erat volutpat.
 
-	git remote add -f other ./other &&
-	test_commit B &&
-	git tag v1.0 &&
-	echo >>A.t &&
-	git stash save Changes to A.t
+	  git
+	  ---
+	  +++
 
-[main (root-commit) 0ddfaf1] A
+	Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit
+	lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure
+	dolor in hendrerit in vulputate velit esse molestie consequat, vel illum
+	dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio
+	dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te
+	feugait nulla facilisi.
+
+	Reported-by: A N Other <a.n.other@example.com>
+	EOF
+
+	cat >failmail <<-\EOF &&
+	From foo@example.com Fri May 23 10:43:49 2008
+	From:	foo@example.com
+	To:	bar@example.com
+	Subject: Re: [RFC/PATCH] git-foo.sh
+	Date:	Fri, 23 May 2008 05:23:42 +0200
+
+	Sometimes we have to find out that there's nothing left.
+
+	EOF
+
+	cat >pine <<-\EOF &&
+	From MAILER-DAEMON Fri May 23 10:43:49 2008
+	Date: 23 May 2008 05:23:42 +0200
+	From: Mail System Internal Data <MAILER-DAEMON@example.com>
+	Subject: DON'T DELETE THIS MESSAGE -- FOLDER INTERNAL DATA
+	Message-ID: <foo-0001@example.com>
+
+	This text is part of the internal format of your mail folder, and is not
+	a real message.  It is created automatically by the mail system software.
+	If deleted, important folder data will be lost, and it will be re-created
+	with the data reset to initial values.
+
+	EOF
+
+	cat >msg-without-scissors-line <<-\EOF &&
+	Test that git-am --scissors cuts at the scissors line
+
+	This line should be included in the commit message.
+	EOF
+
+	printf "Subject: " >subject-prefix &&
+
+	cat - subject-prefix msg-without-scissors-line >msg-with-scissors-line <<-\EOF
+	This line should not be included in the commit message with --scissors enabled.
+
+	 - - >8 - - remove everything above this line - - >8 - -
+
+	EOF
+
+ok 1 - setup: messages
+
+expecting success of 4150.2 'setup': 
+	echo hello >file &&
+	git add file &&
+	test_tick &&
+	git commit -m first &&
+	git tag first &&
+
+	echo world >>file &&
+	git add file &&
+	test_tick &&
+	git commit -F msg &&
+	git tag second &&
+
+	git format-patch --stdout first >patch1 &&
+	{
+		echo "Message-ID: <1226501681-24923-1-git-send-email-bda@mnsspb.ru>" &&
+		echo "X-Fake-Field: Line One" &&
+		echo "X-Fake-Field: Line Two" &&
+		echo "X-Fake-Field: Line Three" &&
+		git format-patch --stdout first | sed -e "1d"
+	} > patch1.eml &&
+	{
+		echo "X-Fake-Field: Line One" &&
+		echo "X-Fake-Field: Line Two" &&
+		echo "X-Fake-Field: Line Three" &&
+		git format-patch --stdout first | sed -e "1d"
+	} | append_cr >patch1-crlf.eml &&
+	{
+		printf "%255s\\n" "" &&
+		echo "X-Fake-Field: Line One" &&
+		echo "X-Fake-Field: Line Two" &&
+		echo "X-Fake-Field: Line Three" &&
+		git format-patch --stdout first | sed -e "1d"
+	} > patch1-ws.eml &&
+	{
+		sed -ne "1p" msg &&
+		echo &&
+		echo "From: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" &&
+		echo "Date: $GIT_AUTHOR_DATE" &&
+		echo &&
+		sed -e "1,2d" msg &&
+		echo "---" &&
+		git diff-tree --no-commit-id --stat -p second
+	} >patch1-stgit.eml &&
+	mkdir stgit-series &&
+	cp patch1-stgit.eml stgit-series/patch &&
+	{
+		echo "# This series applies on GIT commit $(git rev-parse first)" &&
+		echo "patch"
+	} >stgit-series/series &&
+	{
+		echo "# HG changeset patch" &&
+		echo "# User $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" &&
+		echo "# Date $test_tick 25200" &&
+		echo "#      $(git show --pretty="%aD" -s second)" &&
+		echo "# Node ID $ZERO_OID" &&
+		echo "# Parent  $ZERO_OID" &&
+		cat msg &&
+		echo &&
+		git diff-tree --no-commit-id -p second
+	} >patch1-hg.eml &&
+
+
+	echo file >file &&
+	git add file &&
+	git commit -F msg-without-scissors-line &&
+	git tag expected-for-scissors &&
+	git reset --hard HEAD^ &&
+
+	echo file >file &&
+	git add file &&
+	git commit -F msg-with-scissors-line &&
+	git tag expected-for-no-scissors &&
+	git format-patch --stdout expected-for-no-scissors^ >patch-with-scissors-line.eml &&
+	git reset --hard HEAD^ &&
+
+	sed -n -e "3,\$p" msg >file &&
+	git add file &&
+	test_tick &&
+	git commit -m third &&
+
+	git format-patch --stdout first >patch2 &&
+
+	git checkout -b lorem &&
+	sed -n -e "11,\$p" msg >file &&
+	head -n 9 msg >>file &&
+	test_tick &&
+	git commit -a -m "moved stuff" &&
+
+	echo goodbye >another &&
+	git add another &&
+	test_tick &&
+	git commit -m "added another file" &&
+
+	git format-patch --stdout main >lorem-move.patch &&
+	git format-patch --no-prefix --stdout main >lorem-zero.patch &&
+
+	git checkout -b rename &&
+	git mv file renamed &&
+	git commit -m "renamed a file" &&
+
+	git format-patch -M --stdout lorem >rename.patch &&
+
+	git reset --soft lorem^ &&
+	git commit -m "renamed a file and added another" &&
+
+	git format-patch -M --stdout lorem^ >rename-add.patch &&
+
+	git checkout -b empty-commit &&
+	git commit -m "empty commit" --allow-empty &&
+
+	: >empty.patch &&
+	git format-patch --always --stdout empty-commit^ >empty-commit.patch &&
+
+	# reset time
+	sane_unset test_tick &&
+	test_tick
+
+[main (root-commit) 6b2d93f] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Cloning into 'other'...
-done.
-[main ca6ed14] A1
+ create mode 100644 file
+[main 88f8893] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-Updating other
-From ./other
- * [new branch]      main       -> other/main
- * [new tag]         A1         -> A1
-[main d9df450] B
+[main 27dee8a] Test that git-am --scissors cuts at the scissors line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+HEAD is now at 88f8893 second
+[main 9f99c7e] This line should not be included in the commit message with --scissors enabled.
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+HEAD is now at 88f8893 second
+[main 7179449] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 30 insertions(+), 2 deletions(-)
+Switched to a new branch 'lorem'
+[lorem 4670218] moved stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+[lorem 1048ce6] added another file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Saved working directory and index state On main: Changes to A.t
-ok 1 - setup
+ create mode 100644 another
+Switched to a new branch 'rename'
+[rename fc8826b] renamed a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file => renamed (100%)
+[rename 756adf8] renamed a file and added another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 another
+ rename file => renamed (100%)
+Switched to a new branch 'empty-commit'
+[empty-commit c6b90e6] empty commit
+ Author: A U Thor <author@example.com>
+ok 2 - setup
 
-expecting success of 4207.2 'commit decorations colored correctly': 
-	cat >expect <<-EOF &&
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
-${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
-${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A1${c_reset}${c_commit}, \
-${c_reset}${c_remoteBranch}other/main${c_reset}${c_commit})${c_reset} A1
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_stash}refs/stash${c_reset}${c_commit})${c_reset} On main: Changes to A.t
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
+expecting success of 4150.3 'am applies patch correctly': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_tick &&
+	git am <patch1 &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
+
+HEAD is now at c6b90e6 empty commit
+Note: switching to 'first'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6b2d93f first
+Applying: second
+ok 3 - am applies patch correctly
+
+expecting success of 4150.4 'am fails if index is dirty': 
+	test_when_finished "rm -f dirtyfile" &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	echo dirtyfile >dirtyfile &&
+	git add dirtyfile &&
+	test_must_fail git am patch1 &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev first HEAD
+
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+fatal: Dirty index: cannot apply patches (dirty: dirtyfile)
+ok 4 - am fails if index is dirty
+
+expecting success of 4150.5 'am applies patch e-mail not in a mbox': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	git am patch1.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
+
+HEAD is now at 6b2d93f first
+HEAD is now at 6b2d93f first
+Applying: second
+ok 5 - am applies patch e-mail not in a mbox
+
+expecting success of 4150.6 'am applies patch e-mail not in a mbox with CRLF': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	git am patch1-crlf.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
+
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 6 - am applies patch e-mail not in a mbox with CRLF
+
+expecting success of 4150.7 'am applies patch e-mail with preceding whitespace': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	git am patch1-ws.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
+
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 7 - am applies patch e-mail with preceding whitespace
+
+expecting success of 4150.8 'am applies stgit patch': 
+	rm -fr .git/rebase-apply &&
+	git checkout -f first &&
+	git am patch1-stgit.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test_cmp_rev second HEAD &&
+	test_cmp_rev second^ HEAD^
+
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 8 - am applies stgit patch
+
+expecting success of 4150.9 'am --patch-format=stgit applies stgit patch': 
+	rm -fr .git/rebase-apply &&
+	git checkout -f first &&
+	git am --patch-format=stgit <patch1-stgit.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test_cmp_rev second HEAD &&
+	test_cmp_rev second^ HEAD^
+
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 9 - am --patch-format=stgit applies stgit patch
+
+expecting success of 4150.10 'am applies stgit series': 
+	rm -fr .git/rebase-apply &&
+	git checkout -f first &&
+	git am stgit-series/series &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test_cmp_rev second HEAD &&
+	test_cmp_rev second^ HEAD^
+
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 10 - am applies stgit series
+
+expecting success of 4150.11 'am applies hg patch': 
+	rm -fr .git/rebase-apply &&
+	git checkout -f first &&
+	git am patch1-hg.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test_cmp_rev second HEAD &&
+	test_cmp_rev second^ HEAD^
+
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 11 - am applies hg patch
+
+expecting success of 4150.12 'am --patch-format=hg applies hg patch': 
+	rm -fr .git/rebase-apply &&
+	git checkout -f first &&
+	git am --patch-format=hg <patch1-hg.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test_cmp_rev second HEAD &&
+	test_cmp_rev second^ HEAD^
+
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 12 - am --patch-format=hg applies hg patch
+
+expecting success of 4150.13 'am with applypatch-msg hook': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_hook applypatch-msg <<-\EOF &&
+	cat "$1" >actual-msg &&
+	echo hook-message >"$1"
 	EOF
+	git am patch1 &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	echo hook-message >expected &&
+	git log -1 --format=format:%B >actual &&
+	test_cmp expected actual &&
+	git log -1 --format=format:%B second >expected &&
+	test_cmp expected actual-msg
 
-	git log --first-parent --no-abbrev --decorate --oneline --color=always --all >actual &&
-	cmp_filtered_decorations
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: hook-message
+ok 13 - am with applypatch-msg hook
 
-ok 2 - commit decorations colored correctly
+expecting success of 4150.14 'am with failing applypatch-msg hook': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_hook applypatch-msg <<-\EOF &&
+	exit 1
+	EOF
+	test_must_fail git am patch1 &&
+	test_path_is_dir .git/rebase-apply &&
+	git diff --exit-code first &&
+	test_cmp_rev first HEAD
 
-expecting success of 4207.3 'test coloring with replace-objects': 
-	test_when_finished remove_replace_refs &&
-	test_commit C &&
-	test_commit D &&
+HEAD is now at fa25691 hook-message
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-	git replace HEAD~1 HEAD~2 &&
+  fa25691 hook-message
 
-	cat >expect <<-EOF &&
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
-${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit})${c_reset} D
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}C${c_reset}${c_commit}, \
-${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} B
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
-EOF
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
-	cmp_filtered_decorations &&
-	git replace -d HEAD~1 &&
+ git branch <new-branch-name> fa25691
 
-	GIT_REPLACE_REF_BASE=refs/replace2/ git replace HEAD~1 HEAD~2 &&
-	GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
-		--no-abbrev --decorate --oneline --color=always HEAD >actual &&
-	cmp_filtered_decorations
+HEAD is now at 6b2d93f first
+ok 14 - am with failing applypatch-msg hook
 
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main be8f64f] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Deleted replace ref '35a8500a6c116c9ddf35e140fa3277a7fe0b4196'
-ok 3 - test coloring with replace-objects
+expecting success of 4150.15 'am with failing applypatch-msg hook (no verify)': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_hook applypatch-msg <<-\EOF &&
+	echo hook-message >"$1"
+	exit 1
+	EOF
+	git am --no-verify patch1 &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	git log -1 --format=format:%B >actual &&
+	test_cmp msg actual
 
-expecting success of 4207.4 'test coloring with grafted commit': 
-	test_when_finished remove_replace_refs &&
+HEAD is now at 6b2d93f first
+HEAD is now at 6b2d93f first
+Applying: second
+ok 15 - am with failing applypatch-msg hook (no verify)
 
-	git replace --graft HEAD HEAD~2 &&
+expecting success of 4150.16 'am with pre-applypatch hook': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_hook pre-applypatch <<-\EOF &&
+	git diff first >diff.actual
+	exit 0
+	EOF
+	git am patch1 &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test_cmp_rev second HEAD &&
+	git diff first..second >diff.expected &&
+	test_cmp diff.expected diff.actual
 
-	cat >expect <<-EOF &&
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
-${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit}, \
-${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} D
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
-${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
-	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
-${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 16 - am with pre-applypatch hook
+
+expecting success of 4150.17 'am with failing pre-applypatch hook': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_hook pre-applypatch <<-\EOF &&
+	exit 1
 	EOF
+	test_must_fail git am patch1 &&
+	test_path_is_dir .git/rebase-apply &&
+	git diff --exit-code second &&
+	test_cmp_rev first HEAD
 
-	git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
-	cmp_filtered_decorations &&
-	git replace -d HEAD &&
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 17 - am with failing pre-applypatch hook
 
-	GIT_REPLACE_REF_BASE=refs/replace2/ git replace --graft HEAD HEAD~2 &&
-	GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
-		--no-abbrev --decorate --oneline --color=always HEAD >actual &&
-	cmp_filtered_decorations
+expecting success of 4150.18 'am with failing pre-applypatch hook (no verify)': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	touch empty-file &&
+	test_hook pre-applypatch <<-\EOF &&
+	rm empty-file
+	exit 1
+	EOF
+	git am --no-verify patch1 &&
+	test_path_is_missing .git/rebase-apply &&
+	test_path_is_file empty-file &&
+	git diff --exit-code second &&
+	git log -1 --format=format:%B >actual &&
+	test_cmp msg actual
 
-Deleted replace ref 'be8f64ffad20e1c23faacd732a7ba726ee6f156d'
-ok 4 - test coloring with grafted commit
+HEAD is now at 6b2d93f first
+HEAD is now at 6b2d93f first
+Applying: second
+ok 18 - am with failing pre-applypatch hook (no verify)
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4208-log-magic-pathspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4208-log-magic-pathspec/.git/
-expecting success of 4208.1 'setup': 
-	test_commit initial &&
+expecting success of 4150.19 'am with post-applypatch hook': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_hook post-applypatch <<-\EOF &&
+	git rev-parse HEAD >head.actual
+	git diff second >diff.actual
+	exit 0
+	EOF
+	git am patch1 &&
+	test_path_is_missing .git/rebase-apply &&
+	test_cmp_rev second HEAD &&
+	git rev-parse second >head.expected &&
+	test_cmp head.expected head.actual &&
+	git diff second >diff.expected &&
+	test_cmp diff.expected diff.actual
+
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 19 - am with post-applypatch hook
+
+expecting success of 4150.20 'am with failing post-applypatch hook': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_hook post-applypatch <<-\EOF &&
+	git rev-parse HEAD >head.actual
+	exit 1
+	EOF
+	git am patch1 &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code second &&
+	test_cmp_rev second HEAD &&
+	git rev-parse second >head.expected &&
+	test_cmp head.expected head.actual
+
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 20 - am with failing post-applypatch hook
+
+expecting success of 4150.21 'am --scissors cuts the message at the scissors line': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout second &&
+	git am --scissors patch-with-scissors-line.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code expected-for-scissors &&
+	test_cmp_rev expected-for-scissors HEAD
+
+HEAD is now at 88f8893 second
+HEAD is now at 88f8893 second
+Applying: Test that git-am --scissors cuts at the scissors line
+ok 21 - am --scissors cuts the message at the scissors line
+
+expecting success of 4150.22 'am --no-scissors overrides mailinfo.scissors': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout second &&
+	test_config mailinfo.scissors true &&
+	git am --no-scissors patch-with-scissors-line.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code expected-for-no-scissors &&
+	test_cmp_rev expected-for-no-scissors HEAD
+
+HEAD is now at 27dee8a Test that git-am --scissors cuts at the scissors line
+Previous HEAD position was 27dee8a Test that git-am --scissors cuts at the scissors line
+HEAD is now at 88f8893 second
+Applying: This line should not be included in the commit message with --scissors enabled.
+ok 22 - am --no-scissors overrides mailinfo.scissors
+
+expecting success of 4150.23 'setup: new author and committer': 
+	GIT_AUTHOR_NAME="Another Thor" &&
+	GIT_AUTHOR_EMAIL="a.thor@example.com" &&
+	GIT_COMMITTER_NAME="Co M Miter" &&
+	GIT_COMMITTER_EMAIL="c.miter@example.com" &&
+	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
+
+ok 23 - setup: new author and committer
+
+expecting success of 4150.24 'am changes committer and keeps author': 
 	test_tick &&
-	git commit --allow-empty -m empty &&
-	mkdir sub
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	git am patch2 &&
+	test_path_is_missing .git/rebase-apply &&
+	test "$(git rev-parse main^^)" = "$(git rev-parse HEAD^^)" &&
+	git diff --exit-code main..HEAD &&
+	git diff --exit-code main^..HEAD^ &&
+	compare author main HEAD &&
+	compare author main^ HEAD^ &&
+	test "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" = \
+	     "$(git log -1 --pretty=format:"%cn <%ce>" HEAD)"
 
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 41d179c] empty
- Author: A U Thor <author@example.com>
-ok 1 - setup
+HEAD is now at 9f99c7e This line should not be included in the commit message with --scissors enabled.
+Previous HEAD position was 9f99c7e This line should not be included in the commit message with --scissors enabled.
+HEAD is now at 6b2d93f first
+Applying: second
+Applying: third
+ok 24 - am changes committer and keeps author
 
-expecting success of 4208.2 '"git log :/" should not be ambiguous': 
-	git log :/
+expecting success of 4150.25 'am --signoff adds Signed-off-by: line': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout -b topic_2 first &&
+	git am --signoff <patch2 &&
+	{
+		printf "third\n\nSigned-off-by: %s <%s>\n\n" \
+			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" &&
+		cat msg &&
+		printf "Signed-off-by: %s <%s>\n\n" \
+			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL"
+	} >expected-log &&
+	git log --pretty=%B -2 HEAD >actual &&
+	test_cmp expected-log actual
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+HEAD is now at ae63ba7 third
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-    initial
-ok 2 - "git log :/" should not be ambiguous
+  ae63ba7 third
+  480301e second
 
-expecting success of 4208.3 '"git log :/a" should be ambiguous (applied both rev and worktree)': 
-	: >a &&
-	test_must_fail git log :/a 2>error &&
-	test_grep ambiguous error
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-fatal: ambiguous argument ':/a': both revision and filename
-ok 3 - "git log :/a" should be ambiguous (applied both rev and worktree)
+ git branch <new-branch-name> ae63ba7
 
-expecting success of 4208.4 '"git log :/a -- " should not be ambiguous': 
-	git log :/a --
+Switched to a new branch 'topic_2'
+Applying: second
+Applying: third
+ok 25 - am --signoff adds Signed-off-by: line
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 4150.26 'am stays in branch': 
+	echo refs/heads/topic_2 >expected &&
+	git symbolic-ref HEAD >actual &&
+	test_cmp expected actual
 
-    initial
-ok 4 - "git log :/a -- " should not be ambiguous
+ok 26 - am stays in branch
 
-expecting success of 4208.5 '"git log :/detached -- " should find a commit only in HEAD': 
-	test_when_finished "git checkout main" &&
-	git checkout --detach &&
-	test_commit --no-tag detached &&
-	test_commit --no-tag something-else &&
-	git log :/detached --
+expecting success of 4150.27 'am --signoff does not add Signed-off-by: line if already there': 
+	git format-patch --stdout first >patch3 &&
+	git reset --hard first &&
+	git am --signoff <patch3 &&
+	git log --pretty=%B -2 HEAD >actual &&
+	test_cmp expected-log actual
 
-HEAD is now at 41d179c empty
-[detached HEAD 793f74f] detached
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 detached.t
-[detached HEAD 53d04ef] something-else
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 something-else.t
-commit 793f74f97a75d7fa26e06aea1eb13c6322d00e67
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
+HEAD is now at 6b2d93f first
+Applying: second
+Applying: third
+ok 27 - am --signoff does not add Signed-off-by: line if already there
 
-    detached
+expecting success of 4150.28 'am --signoff adds Signed-off-by: if another author is preset': 
+	NAME="A N Other" &&
+	EMAIL="a.n.other@example.com" &&
+	{
+		printf "third\n\nSigned-off-by: %s <%s>\nSigned-off-by: %s <%s>\n\n" \
+			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" \
+			"$NAME" "$EMAIL" &&
+		cat msg &&
+		printf "Signed-off-by: %s <%s>\nSigned-off-by: %s <%s>\n\n" \
+			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" \
+			"$NAME" "$EMAIL"
+	} >expected-log &&
+	git reset --hard first &&
+	GIT_COMMITTER_NAME="$NAME" GIT_COMMITTER_EMAIL="$EMAIL" \
+		git am --signoff <patch3 &&
+	git log --pretty=%B -2 HEAD >actual &&
+	test_cmp expected-log actual
 
-commit 41d179cf92d6e064ff558d58ffa668d1ed939109
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
+HEAD is now at 6b2d93f first
+Applying: second
+Applying: third
+ok 28 - am --signoff adds Signed-off-by: if another author is preset
 
-    empty
+expecting success of 4150.29 'am --signoff duplicates Signed-off-by: if it is not the last one': 
+	NAME="A N Other" &&
+	EMAIL="a.n.other@example.com" &&
+	{
+		printf "third\n\nSigned-off-by: %s <%s>\n\
+Signed-off-by: %s <%s>\nSigned-off-by: %s <%s>\n\n" \
+			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" \
+			"$NAME" "$EMAIL" \
+			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" &&
+		cat msg &&
+		printf "Signed-off-by: %s <%s>\nSigned-off-by: %s <%s>\n\
+Signed-off-by: %s <%s>\n\n" \
+			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" \
+			"$NAME" "$EMAIL" \
+			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL"
+	} >expected-log &&
+	git format-patch --stdout first >patch3 &&
+	git reset --hard first &&
+	git am --signoff <patch3 &&
+	git log --pretty=%B -2 HEAD >actual &&
+	test_cmp expected-log actual
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+HEAD is now at 6b2d93f first
+Applying: second
+Applying: third
+ok 29 - am --signoff duplicates Signed-off-by: if it is not the last one
 
-    initial
+expecting success of 4150.30 'am without --keep removes Re: and [PATCH] stuff': 
+	git format-patch --stdout HEAD^ >tmp &&
+	sed -e "/^Subject/ s,\[PATCH,Re: Re: Re: & 1/5 v2] [foo," tmp >patch4 &&
+	git reset --hard HEAD^ &&
+	git am <patch4 &&
+	git rev-parse HEAD >expected &&
+	git rev-parse topic_2 >actual &&
+	test_cmp expected actual
+
+HEAD is now at b55fe7d second
+Applying: third
+ok 30 - am without --keep removes Re: and [PATCH] stuff
+
+expecting success of 4150.31 'am --keep really keeps the subject': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout HEAD^ &&
+	git am --keep patch4 &&
+	test_path_is_missing .git/rebase-apply &&
+	git cat-file commit HEAD >actual &&
+	grep "Re: Re: Re: \[PATCH 1/5 v2\] \[foo\] third" actual
+
+HEAD is now at e3375b9 third
+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 b55fe7d second
+Applying: Re: Re: Re: [PATCH 1/5 v2] [foo] third
+Re: Re: Re: [PATCH 1/5 v2] [foo] third
+ok 31 - am --keep really keeps the subject
+
+expecting success of 4150.32 'am --keep-non-patch really keeps the non-patch part': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout HEAD^ &&
+	git am --keep-non-patch patch4 &&
+	test_path_is_missing .git/rebase-apply &&
+	git cat-file commit HEAD >actual &&
+	grep "^\[foo\] third" actual
+
+HEAD is now at f45669a Re: Re: Re: [PATCH 1/5 v2] [foo] third
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  f45669a Re: Re: Re: [PATCH 1/5 v2] [foo] third
+
+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> f45669a
+
+HEAD is now at b55fe7d second
+Applying: [foo] third
+[foo] third
+ok 32 - am --keep-non-patch really keeps the non-patch part
+
+expecting success of 4150.33 'setup am -3': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout -b base3way topic_2 &&
+	sed -n -e "3,\$p" msg >file &&
+	head -n 9 msg >>file &&
+	git add file &&
+	test_tick &&
+	git commit -m "copied stuff"
+
+HEAD is now at 44e89ee [foo] third
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  44e89ee [foo] third
+
+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> 44e89ee
+
+Switched to a new branch 'base3way'
+[base3way 899ba97] copied stuff
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 9 insertions(+)
+ok 33 - setup am -3
+
+expecting success of 4150.34 'am -3 falls back to 3-way merge': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout -b lorem2 base3way &&
+	git am -3 lorem-move.patch &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code lorem
+
+HEAD is now at 899ba97 copied stuff
+Switched to a new branch 'lorem2'
+Applying: moved stuff
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+899ba97 copied stuff
+virtual moved stuff
+found 1 common ancestor:
+virtual f192f7dcb36af1757e1a66463400563fdcef521e
+Auto-merging file
+Applying: added another file
+ok 34 - am -3 falls back to 3-way merge
+
+expecting success of 4150.35 'am -3 -p0 can read --no-prefix patch': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout -b lorem3 base3way &&
+	git am -3 -p0 lorem-zero.patch &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code lorem
+
+HEAD is now at be86ef0 added another file
+Switched to a new branch 'lorem3'
+Applying: moved stuff
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+899ba97 copied stuff
+virtual moved stuff
+found 1 common ancestor:
+virtual f192f7dcb36af1757e1a66463400563fdcef521e
+Auto-merging file
+Applying: added another file
+ok 35 - am -3 -p0 can read --no-prefix patch
+
+expecting success of 4150.36 'am with config am.threeWay falls back to 3-way merge': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout -b lorem4 base3way &&
+	test_config am.threeWay 1 &&
+	git am lorem-move.patch &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code lorem
+
+HEAD is now at be86ef0 added another file
+Switched to a new branch 'lorem4'
+Applying: moved stuff
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+899ba97 copied stuff
+virtual moved stuff
+found 1 common ancestor:
+virtual f192f7dcb36af1757e1a66463400563fdcef521e
+Auto-merging file
+Applying: added another file
+ok 36 - am with config am.threeWay falls back to 3-way merge
+
+expecting success of 4150.37 'am with config am.threeWay overridden by --no-3way': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout -b lorem5 base3way &&
+	test_config am.threeWay 1 &&
+	test_must_fail git am --no-3way lorem-move.patch &&
+	test_path_is_dir .git/rebase-apply
+
+HEAD is now at be86ef0 added another file
+Switched to a new branch 'lorem5'
+error: patch failed: file:28
+error: file: 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 advice.mergeConflict false"
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+ok 37 - am with config am.threeWay overridden by --no-3way
+
+expecting success of 4150.38 'am can rename a file': 
+	grep "^rename from" rename.patch &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout lorem^0 &&
+	git am rename.patch &&
+	test_path_is_missing .git/rebase-apply &&
+	git update-index --refresh &&
+	git diff --exit-code rename
+
+rename from file
+HEAD is now at 899ba97 copied stuff
+Note: switching to 'lorem^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 1048ce6 added another file
+Applying: renamed a file
+ok 38 - am can rename a file
+
+expecting success of 4150.39 'am -3 can rename a file': 
+	grep "^rename from" rename.patch &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout lorem^0 &&
+	git am -3 rename.patch &&
+	test_path_is_missing .git/rebase-apply &&
+	git update-index --refresh &&
+	git diff --exit-code rename
+
+rename from file
+HEAD is now at 366127b renamed a file
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  366127b renamed a file
+
+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> 366127b
+
+HEAD is now at 1048ce6 added another file
+Applying: renamed a file
+ok 39 - am -3 can rename a file
+
+expecting success of 4150.40 'am -3 can rename a file after falling back to 3-way merge': 
+	grep "^rename from" rename-add.patch &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout lorem^0 &&
+	git am -3 rename-add.patch &&
+	test_path_is_missing .git/rebase-apply &&
+	git update-index --refresh &&
+	git diff --exit-code rename
+
+rename from file
+HEAD is now at 366127b renamed a file
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  366127b renamed a file
+
+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> 366127b
+
+HEAD is now at 1048ce6 added another file
+Applying: renamed a file and added another
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+1048ce6 added another file
+virtual renamed a file and added another
+found 1 common ancestor:
+virtual d0e8bd27a52a44dc341376225b2fa62e456df51e
+ok 40 - am -3 can rename a file after falling back to 3-way merge
+
+expecting success of 4150.41 'am -3 -q is quiet': 
+	rm -fr .git/rebase-apply &&
+	git checkout -f lorem2 &&
+	git reset base3way --hard &&
+	git am -3 -q lorem-move.patch >output.out 2>&1 &&
+	test_must_be_empty output.out
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  732bd79 renamed a file and added another
+
+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> 732bd79
+
+Switched to branch 'lorem2'
+HEAD is now at 899ba97 copied stuff
+ok 41 - am -3 -q is quiet
+
+expecting success of 4150.42 'am pauses on conflict': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout lorem2^^ &&
+	test_must_fail git am lorem-move.patch &&
+	test -d .git/rebase-apply
+
+HEAD is now at be86ef0 added another file
+Note: switching to 'lorem2^^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 899ba97 copied stuff
+error: patch failed: file:28
+error: file: 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 advice.mergeConflict false"
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+ok 42 - am pauses on conflict
+
+expecting success of 4150.43 'am --show-current-patch': 
+	git am --show-current-patch >actual.patch &&
+	test_cmp .git/rebase-apply/0001 actual.patch
+
+ok 43 - am --show-current-patch
+
+expecting success of 4150.44 'am --show-current-patch=raw': 
+	git am --show-current-patch=raw >actual.patch &&
+	test_cmp .git/rebase-apply/0001 actual.patch
+
+ok 44 - am --show-current-patch=raw
+
+expecting success of 4150.45 'am --show-current-patch=diff': 
+	git am --show-current-patch=diff >actual.patch &&
+	test_cmp .git/rebase-apply/patch actual.patch
+
+ok 45 - am --show-current-patch=diff
+
+expecting success of 4150.46 'am accepts repeated --show-current-patch': 
+	git am --show-current-patch --show-current-patch=raw >actual.patch &&
+	test_cmp .git/rebase-apply/0001 actual.patch
+
+ok 46 - am accepts repeated --show-current-patch
+
+expecting success of 4150.47 'am detects incompatible --show-current-patch': 
+	test_must_fail git am --show-current-patch=raw --show-current-patch=diff &&
+	test_must_fail git am --show-current-patch --show-current-patch=diff
+
+error: options '--show-current-patch=diff' and '--show-current-patch=raw' cannot be used together
+error: options '--show-current-patch=diff' and '--show-current-patch' cannot be used together
+ok 47 - am detects incompatible --show-current-patch
+
+expecting success of 4150.48 'am --skip works': 
+	echo goodbye >expected &&
+	git am --skip &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code lorem2^^ -- file &&
+	test_cmp expected another
+
+Applying: added another file
+ok 48 - am --skip works
+
+expecting success of 4150.49 'am --abort removes a stray directory': 
+	mkdir .git/rebase-apply &&
+	git am --abort &&
+	test_path_is_missing .git/rebase-apply
+
+ok 49 - am --abort removes a stray directory
+
+expecting success of 4150.50 'am refuses patches when paused': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout lorem2^^ &&
+
+	test_must_fail git am lorem-move.patch &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev lorem2^^ HEAD &&
+
+	test_must_fail git am <lorem-move.patch &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev lorem2^^ HEAD
+
+HEAD is now at e608aee added another file
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  e608aee added another file
+
+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> e608aee
+
+HEAD is now at 899ba97 copied stuff
+error: patch failed: file:28
+error: file: 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 advice.mergeConflict false"
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
+ok 50 - am refuses patches when paused
+
+expecting success of 4150.51 'am --resolved works': 
+	echo goodbye >expected &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout lorem2^^ &&
+	test_must_fail git am lorem-move.patch &&
+	test -d .git/rebase-apply &&
+	echo resolved >>file &&
+	git add file &&
+	git am --resolved &&
+	test_path_is_missing .git/rebase-apply &&
+	test_cmp expected another
+
+HEAD is now at 899ba97 copied stuff
+HEAD is now at 899ba97 copied stuff
+error: patch failed: file:28
+error: file: 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 advice.mergeConflict false"
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+Applying: moved stuff
+Applying: added another file
+ok 51 - am --resolved works
+
+expecting success of 4150.52 'am --resolved fails if index has no changes': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout lorem2^^ &&
+	test_must_fail git am lorem-move.patch &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev lorem2^^ HEAD &&
+	test_must_fail git am --resolved &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev lorem2^^ HEAD
+
+HEAD is now at 25c657e added another file
 Warning: you are leaving 2 commits behind, not connected to
 any of your branches:
 
-  53d04ef something-else
-  793f74f detached
+  25c657e added another file
+  d8fd27b moved stuff
 
 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> 53d04ef
+ git branch <new-branch-name> 25c657e
 
-Switched to branch 'main'
-ok 5 - "git log :/detached -- " should find a commit only in HEAD
+HEAD is now at 899ba97 copied stuff
+error: patch failed: file:28
+error: file: 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 advice.mergeConflict false"
+Applying: moved stuff
+Patch failed at 0001 moved stuff
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Applying: moved stuff
+No changes - did you forget to use 'git add'?
+If there is nothing left to stage, chances are that something else
+already introduced the same changes; you might want to skip this patch.
+ok 52 - am --resolved fails if index has no changes
 
-expecting success of 4208.6 '"git log :/detached -- " should not find an orphaned commit': 
-	test_must_fail git log :/detached --
+expecting success of 4150.53 'am --resolved fails if index has unmerged entries': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout second &&
+	test_must_fail git am -3 lorem-move.patch &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev second HEAD &&
+	test_must_fail git am --resolved >err &&
+	test_path_is_dir .git/rebase-apply &&
+	test_cmp_rev second HEAD &&
+	test_grep "still have unmerged paths" err
 
-fatal: bad revision ':/detached'
-ok 6 - "git log :/detached -- " should not find an orphaned commit
+HEAD is now at 899ba97 copied stuff
+Previous HEAD position was 899ba97 copied stuff
+HEAD is now at 88f8893 second
+Applying: moved stuff
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+88f8893 second
+virtual moved stuff
+found 1 common ancestor:
+virtual f192f7dcb36af1757e1a66463400563fdcef521e
+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: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 moved stuff
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+You still have unmerged paths in your index.
+ok 53 - am --resolved fails if index has unmerged entries
 
-expecting success of 4208.7 '"git log :/detached -- " should find HEAD only of own worktree': 
-	git worktree add other-tree HEAD &&
-	git -C other-tree checkout --detach &&
+expecting success of 4150.54 'am takes patches from a Pine mailbox': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	cat pine patch1 | git am &&
+	test_path_is_missing .git/rebase-apply &&
+	git diff --exit-code main^..HEAD
+
+HEAD is now at 88f8893 second
+Previous HEAD position was 88f8893 second
+HEAD is now at 6b2d93f first
+Applying: second
+ok 54 - am takes patches from a Pine mailbox
+
+expecting success of 4150.55 'am fails on mail without patch': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	test_must_fail git am <failmail &&
+	git am --abort &&
+	test_path_is_missing .git/rebase-apply
+
+HEAD is now at 7ce6dd8 second
+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 advice.mergeConflict false"
+Patch is empty.
+ok 55 - am fails on mail without patch
+
+expecting success of 4150.56 'am fails on empty patch': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	echo "---" >>failmail &&
+	test_must_fail git am <failmail &&
+	git am --skip &&
+	test_path_is_missing .git/rebase-apply
+
+HEAD is now at 7ce6dd8 second
+error: No valid patches in input (allow with "--allow-empty")
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Applying: git-foo.sh
+Patch failed at 0001 git-foo.sh
+ok 56 - am fails on empty patch
+
+expecting success of 4150.57 'am works from stdin in subdirectory': 
+	rm -fr subdir &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	(
+		mkdir -p subdir &&
+		cd subdir &&
+		git am <../patch1
+	) &&
+	git diff --exit-code second
+
+HEAD is now at 7ce6dd8 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7ce6dd8 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> 7ce6dd8
+
+HEAD is now at 6b2d93f first
+Applying: second
+ok 57 - am works from stdin in subdirectory
+
+expecting success of 4150.58 'am works from file (relative path given) in subdirectory': 
+	rm -fr subdir &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	(
+		mkdir -p subdir &&
+		cd subdir &&
+		git am ../patch1
+	) &&
+	git diff --exit-code second
+
+HEAD is now at 7ce6dd8 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7ce6dd8 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> 7ce6dd8
+
+HEAD is now at 6b2d93f first
+Applying: second
+ok 58 - am works from file (relative path given) in subdirectory
+
+expecting success of 4150.59 'am works from file (absolute path given) in subdirectory': 
+	rm -fr subdir &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	P=$(pwd) &&
+	(
+		mkdir -p subdir &&
+		cd subdir &&
+		git am "$P/patch1"
+	) &&
+	git diff --exit-code second
+
+HEAD is now at 7ce6dd8 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  7ce6dd8 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> 7ce6dd8
+
+HEAD is now at 6b2d93f first
+Applying: second
+ok 59 - am works from file (absolute path given) in subdirectory
+
+expecting success of 4150.60 'am --committer-date-is-author-date': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
 	test_tick &&
-	git -C other-tree commit --allow-empty -m other-detached &&
-	git -C other-tree log :/other-detached -- &&
-	test_must_fail git log :/other-detached --
+	git am --committer-date-is-author-date patch1 &&
+	git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
+	sed -ne "/^author /s/.*> //p" head1 >at &&
+	sed -ne "/^committer /s/.*> //p" head1 >ct &&
+	test_cmp at ct
 
-Preparing worktree (detached HEAD 41d179c)
-HEAD is now at 41d179c empty
-HEAD is now at 41d179c empty
-[detached HEAD 690db08] other-detached
- Author: A U Thor <author@example.com>
-commit 690db086fe427145ef8254ddd95f5a291f5ad2dd
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:17:13 2005 -0700
+HEAD is now at 7ce6dd8 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-    other-detached
+  7ce6dd8 second
 
-commit 41d179cf92d6e064ff558d58ffa668d1ed939109
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-    empty
+ git branch <new-branch-name> 7ce6dd8
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+HEAD is now at 6b2d93f first
+Applying: second
+ok 60 - am --committer-date-is-author-date
 
-    initial
-fatal: bad revision ':/other-detached'
-ok 7 - "git log :/detached -- " should find HEAD only of own worktree
+expecting success of 4150.61 'am without --committer-date-is-author-date': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_tick &&
+	git am patch1 &&
+	git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
+	sed -ne "/^author /s/.*> //p" head1 >at &&
+	sed -ne "/^committer /s/.*> //p" head1 >ct &&
+	! test_cmp at ct
 
-expecting success of 4208.8 '"git log -- :/a" should not be ambiguous': 
-	git log -- :/a
+HEAD is now at 5709bd2 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-ok 8 - "git log -- :/a" should not be ambiguous
+  5709bd2 second
 
-expecting success of 4208.9 '"git log :/any/path/" should not segfault': 
-	test_must_fail git log :/any/path/
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-fatal: ambiguous argument ':/any/path/': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 9 - "git log :/any/path/" should not segfault
+ git branch <new-branch-name> 5709bd2
 
-expecting success of 4208.10 '"git log :/in" should not be ambiguous': 
-	git log :/in
+HEAD is now at 6b2d93f first
+Applying: second
+--- at	2024-11-14 19:34:39.036819427 +0000
++++ ct	2024-11-14 19:34:39.052819590 +0000
+@@ -1 +1 @@
+-1112912053 -0700
++1112912293 -0700
+ok 61 - am without --committer-date-is-author-date
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+expecting success of 4150.62 'am --ignore-date': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_tick &&
+	git am --ignore-date patch1 &&
+	git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
+	sed -ne "/^author /s/.*> //p" head1 >at &&
+	grep "+0000" at
 
-    initial
-ok 10 - "git log :/in" should not be ambiguous
+HEAD is now at 9fa39e1 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-expecting success of 4208.11 '"git log :" should be ambiguous': 
-	test_must_fail git log : 2>error &&
-	test_grep ambiguous error
+  9fa39e1 second
 
-fatal: ambiguous argument ':': unknown revision or path not in the working tree.
-ok 11 - "git log :" should be ambiguous
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-expecting success of 4208.12 'git log -- :': 
-	git log -- :
+ git branch <new-branch-name> 9fa39e1
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+HEAD is now at 6b2d93f first
+Applying: second
+1731612879 +0000
+ok 62 - am --ignore-date
 
-    initial
-ok 12 - git log -- :
+expecting success of 4150.63 'am into an unborn branch': 
+	git rev-parse first^{tree} >expected &&
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	rm -fr subdir &&
+	mkdir subdir &&
+	git format-patch --numbered-files -o subdir -1 first &&
+	(
+		cd subdir &&
+		git init &&
+		git am 1
+	) &&
+	(
+		cd subdir &&
+		git rev-parse HEAD^{tree} >../actual
+	) &&
+	test_cmp expected actual
 
-expecting success of 4208.13 'git log HEAD -- :/': 
-	initial=$(git rev-parse --short HEAD^) &&
-	cat >expected <<-EOF &&
-	$initial initial
+HEAD is now at 1d7e734 second
+subdir/1
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4150-am/subdir/.git/
+applying to an empty history
+Applying: first
+ok 63 - am into an unborn branch
+
+expecting success of 4150.64 'am newline in subject': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_tick &&
+	sed -e "s/second/second \\\n foo/" patch1 >patchnl &&
+	git am <patchnl >output.out 2>&1 &&
+	test_grep "^Applying: second \\\n foo$" output.out
+
+HEAD is now at 1d7e734 second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  1d7e734 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> 1d7e734
+
+HEAD is now at 6b2d93f first
+Applying: second \n foo
+ok 64 - am newline in subject
+
+expecting success of 4150.65 'am -q is quiet': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout first &&
+	test_tick &&
+	git am -q <patch1 >output.out 2>&1 &&
+	test_must_be_empty output.out
+
+HEAD is now at bee6b96 second \n foo
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  bee6b96 second \n foo
+
+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> bee6b96
+
+HEAD is now at 6b2d93f first
+ok 65 - am -q is quiet
+
+expecting success of 4150.66 'am empty-file does not infloop': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	touch empty-file &&
+	test_tick &&
+	test_must_fail git am empty-file 2>actual &&
+	echo Patch format detection failed. >expected &&
+	test_cmp expected actual
+
+HEAD is now at 0b3df7d second
+ok 66 - am empty-file does not infloop
+
+expecting success of 4150.67 'am --message-id really adds the message id': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout HEAD^ &&
+	git am --message-id patch1.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git cat-file commit HEAD | tail -n1 >actual &&
+	grep Message-ID patch1.eml >expected &&
+	test_cmp expected actual
+
+HEAD is now at 0b3df7d second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  0b3df7d 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> 0b3df7d
+
+HEAD is now at 6b2d93f first
+Applying: second
+ok 67 - am --message-id really adds the message id
+
+expecting success of 4150.68 'am.messageid really adds the message id': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout HEAD^ &&
+	test_config am.messageid true &&
+	git am patch1.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git cat-file commit HEAD | tail -n1 >actual &&
+	grep Message-ID patch1.eml >expected &&
+	test_cmp expected actual
+
+HEAD is now at 560abfc second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  560abfc 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> 560abfc
+
+HEAD is now at 6b2d93f first
+Applying: second
+ok 68 - am.messageid really adds the message id
+
+expecting success of 4150.69 'am --message-id -s signs off after the message id': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	git checkout HEAD^ &&
+	git am -s --message-id patch1.eml &&
+	test_path_is_missing .git/rebase-apply &&
+	git cat-file commit HEAD | tail -n2 | head -n1 >actual &&
+	grep Message-ID patch1.eml >expected &&
+	test_cmp expected actual
+
+HEAD is now at 560abfc second
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  560abfc 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> 560abfc
+
+HEAD is now at 6b2d93f first
+Applying: second
+ok 69 - am --message-id -s signs off after the message id
+
+expecting success of 4150.70 'am -3 works with rerere': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+
+	# make patches one->two and two->three...
+	test_commit one file &&
+	test_commit two file &&
+	test_commit three file &&
+	git format-patch -2 --stdout >seq.patch &&
+
+	# and create a situation that conflicts...
+	git reset --hard one &&
+	test_commit other file &&
+
+	# enable rerere...
+	test_config rerere.enabled true &&
+	test_when_finished "rm -rf .git/rr-cache" &&
+
+	# ...and apply. Our resolution is to skip the first
+	# patch, and the rerere the second one.
+	test_must_fail git am -3 seq.patch &&
+	test_must_fail git am --skip &&
+	echo resolved >file &&
+	git add file &&
+	git am --resolved &&
+
+	# now apply again, and confirm that rerere engaged (we still
+	# expect failure from am because rerere does not auto-commit
+	# for us).
+	git reset --hard other &&
+	test_must_fail git am -3 seq.patch &&
+	test_must_fail git am --skip &&
+	echo resolved >expect &&
+	test_cmp expect file
+
+HEAD is now at 7f081b2 second
+[detached HEAD 377a3f5] one
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+[detached HEAD 2231600] two
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD e5ab1df] three
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 377a3f5 one
+[detached HEAD 67f3de4] other
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Applying: two
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+67f3de4 other
+virtual two
+found 1 common ancestor:
+virtual 693a3de402bb23897ed5c931273e53c78eff0495
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Recorded preimage for 'file'
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 two
+Applying: three
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+67f3de4 other
+virtual three
+found 1 common ancestor:
+virtual aad8d5cef3915ab78b3227abaaac99b62db9eb54
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Recorded preimage for 'file'
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0002 three
+Recorded resolution for 'file'.
+Applying: three
+HEAD is now at 67f3de4 other
+Applying: two
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+67f3de4 other
+virtual two
+found 1 common ancestor:
+virtual 693a3de402bb23897ed5c931273e53c78eff0495
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Recorded preimage for 'file'
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 two
+Applying: three
+Using index info to reconstruct a base tree...
+M	file
+Falling back to patching base and 3-way merge...
+Merging:
+67f3de4 other
+virtual three
+found 1 common ancestor:
+virtual aad8d5cef3915ab78b3227abaaac99b62db9eb54
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Resolved 'file' using previous resolution.
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0002 three
+ok 70 - am -3 works with rerere
+
+expecting success of 4150.71 'am -s unexpected trailer block': 
+	rm -fr .git/rebase-apply &&
+	git reset --hard &&
+	echo signed >file &&
+	git add file &&
+	cat >msg <<-EOF &&
+	subject here
+
+	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
+	[jc: tweaked log message]
+	Signed-off-by: J C H <j@c.h>
 	EOF
-	(cd sub && git log --oneline HEAD -- :/ >../actual) &&
+	git commit -F msg &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
+	git format-patch --stdout -1 >patch &&
+
+	git reset --hard HEAD^ &&
+	git am -s patch &&
+	(
+		cat original &&
+		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
+	) >expect &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+	test_cmp expect actual &&
+
+	cat >msg <<-\EOF &&
+	subject here
+
+	We make sure that there is a blank line between the log
+	message proper and Signed-off-by: line added.
+	EOF
+	git reset HEAD^ &&
+	git commit -F msg file &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
+	git format-patch --stdout -1 >patch &&
+
+	git reset --hard HEAD^ &&
+	git am -s patch &&
+
+	(
+		cat original &&
+		echo &&
+		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
+	) >expect &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+	test_cmp expect actual
+
+HEAD is now at 67f3de4 other
+[detached HEAD c30e654] subject here
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 67f3de4 other
+Applying: subject here
+Unstaged changes after reset:
+M	file
+[detached HEAD 40f0ff1] subject here
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 67f3de4 other
+Applying: subject here
+ok 71 - am -s unexpected trailer block
+
+expecting success of 4150.72 'am --patch-format=mboxrd handles mboxrd': 
+	rm -fr .git/rebase-apply &&
+	git checkout -f first &&
+	echo mboxrd >>file &&
+	git add file &&
+	cat >msg <<-\INPUT_END &&
+	mboxrd should escape the body
+
+	From could trip up a loose mbox parser
+	>From extra escape for reversibility
+	INPUT_END
+	git commit -F msg &&
+	git -c format.mboxrd format-patch --stdout -1 >mboxrd1 &&
+	grep "^>From could trip up a loose mbox parser" mboxrd1 &&
+	git checkout -f first &&
+	git am --patch-format=mboxrd mboxrd1 &&
+	git cat-file commit HEAD | tail -n4 >out &&
+	test_cmp msg out
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  d98fa42 subject here
+
+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> d98fa42
+
+HEAD is now at 6b2d93f first
+[detached HEAD dc8a2ae] mboxrd should escape the body
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+)
+>From could trip up a loose mbox parser
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  dc8a2ae mboxrd should escape the body
+
+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> dc8a2ae
+
+HEAD is now at 6b2d93f first
+Applying: mboxrd should escape the body
+ok 72 - am --patch-format=mboxrd handles mboxrd
+
+expecting success of 4150.73 'am works with multi-line in-body headers': 
+	FORTY="String that has a length of more than forty characters" &&
+	LONG="$FORTY $FORTY" &&
+	rm -fr .git/rebase-apply &&
+	git checkout -f first &&
+	echo one >> file &&
+	git commit -am "$LONG
+
+    Body test" --author="$LONG <long@example.com>" &&
+	git format-patch --stdout -1 >patch &&
+	# bump from, date, and subject down to in-body header
+	perl -lpe "
+		if (/^From:/) {
+			print \"From: x <x\@example.com>\";
+			print \"Date: Sat, 1 Jan 2000 00:00:00 +0000\";
+			print \"Subject: x\n\";
+		}
+	" patch >msg &&
+	git checkout HEAD^ &&
+	git am msg &&
+	# Ensure that the author and full message are present
+	git cat-file commit HEAD | grep "^author.*long@example.com" &&
+	git cat-file commit HEAD | grep "^$LONG$"
+
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  dc8a2ae mboxrd should escape the body
+
+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> dc8a2ae
+
+HEAD is now at 6b2d93f first
+[detached HEAD c97171e] String that has a length of more than forty characters String that has a length of more than forty characters
+ Author: String that has a length of more than forty characters String that has a length of more than forty characters <long@example.com>
+ 1 file changed, 1 insertion(+)
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  c97171e String that has a length of more than forty characters String that has a length of more than forty characters
+
+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> c97171e
+
+HEAD is now at 6b2d93f first
+Applying: String that has a length of more than forty characters String that has a length of more than forty characters
+author long@example.com <long@example.com> 1112912773 -0700
+String that has a length of more than forty characters String that has a length of more than forty characters
+ok 73 - am works with multi-line in-body headers
+
+expecting success of 4150.74 'am --quit keeps HEAD where it is': 
+	mkdir .git/rebase-apply &&
+	>.git/rebase-apply/last &&
+	>.git/rebase-apply/next &&
+	git rev-parse HEAD^ >.git/ORIG_HEAD &&
+	git rev-parse HEAD >expected &&
+	git am --quit &&
+	test_path_is_missing .git/rebase-apply &&
+	git rev-parse HEAD >actual &&
 	test_cmp expected actual
 
-ok 13 - git log HEAD -- :/
+ok 74 - am --quit keeps HEAD where it is
 
-expecting success of 4208.14 '"git log :^sub" is not ambiguous': 
-	git log :^sub
+expecting success of 4150.75 'am and .gitattibutes': 
+	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'" &&
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+		test_commit second &&
+		git checkout -b test HEAD^ &&
 
-    initial
-ok 14 - "git log :^sub" is not ambiguous
+		echo "*.txt filter=test conflict-marker-size=10" >.gitattributes &&
+		git add .gitattributes &&
+		test_commit third &&
 
-expecting success of 4208.15 '"git log :^does-not-exist" does not match anything': 
-	test_must_fail git log :^does-not-exist
+		echo "This text is smudged." >a.txt &&
+		git add a.txt &&
+		test_commit fourth &&
 
-fatal: ambiguous argument ':^does-not-exist': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 15 - "git log :^does-not-exist" does not match anything
+		git checkout -b removal HEAD^ &&
+		git rm .gitattributes &&
+		git add -u &&
+		test_commit fifth &&
+		git cherry-pick test &&
 
-expecting success of 4208.16 '"git log :!" behaves the same as :^': 
-	git log :!sub &&
-	test_must_fail git log :!does-not-exist
+		git checkout -b conflict third &&
+		echo "This text is different." >a.txt &&
+		git add a.txt &&
+		test_commit sixth &&
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+		git checkout test &&
+		git format-patch --stdout main..HEAD >patches &&
+		git reset --hard main &&
+		git am patches &&
+		grep "smudged" a.txt &&
 
-    initial
-fatal: ambiguous argument ':!does-not-exist': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 16 - "git log :!" behaves the same as :^
+		git checkout removal &&
+		git reset --hard &&
+		git format-patch --stdout main..HEAD >patches &&
+		git reset --hard main &&
+		git am patches &&
+		grep "clean" a.txt &&
 
-expecting success of 4208.17 '"git log :(exclude)sub" is not ambiguous': 
-	git log ":(exclude)sub"
+		git checkout conflict &&
+		git reset --hard &&
+		git format-patch --stdout main..HEAD >patches &&
+		git reset --hard fourth &&
+		test_must_fail git am -3 patches &&
+		grep "<<<<<<<<<<" a.txt
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4150-am/attributes/.git/
+[main (root-commit) b1affd7] init
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+[main 078d104] second
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 second.t
+Switched to a new branch 'test'
+[test e6fa290] third
+ Author: Another Thor <a.thor@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 .gitattributes
+ create mode 100644 third.t
+[test ca53213] fourth
+ Author: Another Thor <a.thor@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a.txt
+ create mode 100644 fourth.t
+Switched to a new branch 'removal'
+rm '.gitattributes'
+[removal 126fc1c] fifth
+ Author: Another Thor <a.thor@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ delete mode 100644 .gitattributes
+ create mode 100644 fifth.t
+[removal 0bb88c2] fourth
+ Author: Another Thor <a.thor@example.com>
+ Date: Thu Apr 7 15:30:13 2005 -0700
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a.txt
+ create mode 100644 fourth.t
+Switched to a new branch 'conflict'
+[conflict e6420d6] sixth
+ Author: Another Thor <a.thor@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a.txt
+ create mode 100644 sixth.t
+Switched to branch 'test'
+HEAD is now at 078d104 second
+Applying: third
+Applying: fourth
+This text is smudged.
+Switched to branch 'removal'
+HEAD is now at 0bb88c2 fourth
+HEAD is now at 078d104 second
+Applying: third
+Applying: fifth
+Applying: fourth
+This text is clean.
+Switched to branch 'conflict'
+HEAD is now at e6420d6 sixth
+HEAD is now at ca53213 fourth
+Applying: third
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+ca53213 fourth
+virtual third
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+No changes -- Patch already applied.
+Applying: sixth
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+ca53213 fourth
+virtual sixth
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+CONFLICT (add/add): Merge conflict in a.txt
+Auto-merging a.txt
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0002 sixth
+<<<<<<<<<< HEAD
+ok 75 - am and .gitattibutes
+
+expecting success of 4150.76 'apply binary blob in partial clone': 
+	printf "\\000" >binary &&
+	git add binary &&
+	git commit -m "binary blob" &&
+	git format-patch --stdout -m HEAD^ >patch &&
 
-commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+	test_create_repo server &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	test_when_finished "rm -rf client" &&
 
-    initial
-ok 17 - "git log :(exclude)sub" is not ambiguous
+	# Exercise to make sure that it works
+	git -C client am ../patch
 
-expecting success of 4208.18 '"git log :(exclude)sub --" must resolve as an object': 
-	test_must_fail git log ":(exclude)sub" --
+[detached HEAD 0dd6bd5] binary blob
+ Author: Another Thor <a.thor@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 binary
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4150-am/server/.git/
+Cloning into 'client'...
+warning: You appear to have cloned an empty repository.
+Applying: binary blob
+applying to an empty history
+ok 76 - apply binary blob in partial clone
 
-fatal: bad revision ':(exclude)sub'
-ok 18 - "git log :(exclude)sub --" must resolve as an object
+expecting success of 4150.77 'an empty input file is error regardless of --empty option': 
+	test_when_finished "git am --abort || :" &&
+	test_must_fail git am --empty=drop empty.patch 2>actual &&
+	echo "Patch format detection failed." >expected &&
+	test_cmp expected actual
 
-expecting success of 4208.19 '"git log :(unknown-magic) complains of bogus magic': 
-	test_must_fail git log ":(unknown-magic)" 2>error &&
-	test_grep pathspec.magic error
+fatal: Resolve operation not in progress, we are not resuming.
+ok 77 - an empty input file is error regardless of --empty option
 
-fatal: Invalid pathspec magic 'unknown-magic' in ':(unknown-magic)'
-ok 19 - "git log :(unknown-magic) complains of bogus magic
+expecting success of 4150.78 'invalid when passing the --empty option alone': 
+	test_when_finished "git am --abort || :" &&
+	git checkout empty-commit^ &&
+	test_must_fail git am --empty empty-commit.patch 2>err &&
+	echo "error: invalid value for '--empty': 'empty-commit.patch'" >expected &&
+	test_cmp expected err
 
-expecting success of 4208.20 'command line pathspec parsing for "git log"': 
-	git reset --hard &&
-	>a &&
-	git add a &&
-	git commit -m "add an empty a" --allow-empty &&
-	echo 1 >a &&
-	git commit -a -m "update a to 1" &&
-	git checkout HEAD^ &&
-	echo 2 >a &&
-	git commit -a -m "update a to 2" &&
-	test_must_fail git merge main &&
-	git add a &&
-	git log --merge -- a
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
 
-HEAD is now at 41d179c empty
-[main 520c03e] add an empty a
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-[main 35b719c] update a to 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'HEAD^'.
+  0dd6bd5 binary blob
+  f2ac200 String that has a length of more than forty characters String that has a length of more than forty characters
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and 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 them 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> 0dd6bd5
 
-  git switch -c <new-branch-name>
+HEAD is now at 756adf8 renamed a file and added another
+fatal: Resolve operation not in progress, we are not resuming.
+ok 78 - invalid when passing the --empty option alone
 
-Or undo this operation with:
+expecting success of 4150.79 'a message without a patch is an error (default)': 
+	test_when_finished "git am --abort || :" &&
+	test_must_fail git am empty-commit.patch >err &&
+	grep "Patch is empty" err
 
-  git switch -
+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 advice.mergeConflict false"
+Patch is empty.
+ok 79 - a message without a patch is an error (default)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 4150.80 'a message without a patch is an error where an explicit "--empty=stop" is given': 
+	test_when_finished "git am --abort || :" &&
+	test_must_fail git am --empty=stop empty-commit.patch >err &&
+	grep "Patch is empty." err
 
-HEAD is now at 520c03e add an empty a
-[detached HEAD 61d8fe9] update a to 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Auto-merging a
-CONFLICT (content): Merge conflict in a
-Automatic merge failed; fix conflicts and then commit the result.
-commit 61d8fe935ee13c992ada18f68c7d4b175f28ae77
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:17:13 2005 -0700
+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 advice.mergeConflict false"
+Patch is empty.
+ok 80 - a message without a patch is an error where an explicit "--empty=stop" is given
 
-    update a to 2
+expecting success of 4150.81 'a message without a patch will be skipped when "--empty=drop" is given': 
+	git am --empty=drop empty-commit.patch >output &&
+	git rev-parse empty-commit^ >expected &&
+	git rev-parse HEAD >actual &&
+	test_cmp expected actual &&
+	grep "Skipping: empty commit" output
 
-commit 35b719c5373bb94b370829ac90035e2cd80daaba
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:17:13 2005 -0700
+Skipping: empty commit
+ok 81 - a message without a patch will be skipped when "--empty=drop" is given
 
-    update a to 1
-ok 20 - command line pathspec parsing for "git log"
+expecting success of 4150.82 'record as an empty commit when meeting e-mail message that lacks a patch': 
+	git am --empty=keep empty-commit.patch >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 &&
+	grep "Creating an empty commit: empty commit" output
 
-expecting success of 4208.21 'tree_entry_interesting does not match past submodule boundaries': 
-	test_when_finished "rm -rf repo submodule" &&
-	test_config_global protocol.file.allow always &&
-	git init submodule &&
-	test_commit -C submodule initial &&
-	git init repo &&
-	>"repo/[bracket]" &&
-	git -C repo add "[bracket]" &&
-	test_tick &&
-	git -C repo commit -m bracket &&
-	git -C repo rev-list HEAD -- "[bracket]" >expect &&
+empty commit
 
-	git -C repo submodule add ../submodule &&
-	test_tick &&
-	git -C repo commit -m submodule &&
+Creating an empty commit: empty commit
+ok 82 - record as an empty commit when meeting e-mail message that lacks a patch
 
-	git -C repo rev-list HEAD -- "[bracket]" >actual &&
-	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4208-log-magic-pathspec/submodule/.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.45.2/t/trash directory.t4208-log-magic-pathspec/repo/.git/
-[main (root-commit) fcad989] bracket
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 [bracket]
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4208-log-magic-pathspec/repo/submodule'...
-done.
-[main 2614379] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-ok 21 - tree_entry_interesting does not match past submodule boundaries
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-# passed all 21 test(s)
-1..21
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4210-log-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4210-log-i18n/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-expecting success of 4210.1 'create commits in different encodings': 
-	test_tick &&
-	cat >msg <<-EOF &&
-	utf8
+  11d1604 empty commit
 
-	t${utf8_e}st
-	EOF
-	git add msg &&
-	git -c i18n.commitencoding=utf8 commit -F msg &&
-	cat >msg <<-EOF &&
-	latin1
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-	t${latin1_e}st
-	EOF
-	git add msg &&
-	git -c i18n.commitencoding=ISO-8859-1 commit -F msg
+ git branch <new-branch-name> 11d1604
 
-[master (root-commit) cbf2796] utf8
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 msg
-[master b077cf9] latin1
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+), 2 deletions(-)
-ok 1 - create commits in different encodings
+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 4210.2 'log --grep searches in log output encoding (utf8)': 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
-	EOF
-	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
-	test_cmp expect actual
+expecting success of 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
 
-ok 2 - log --grep searches in log output encoding (utf8)
+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
 
-expecting success of 4210.3 'log --grep searches in log output encoding (latin1)': 
-	cat >expect <<-\EOF &&
-	latin1
-	utf8
-	EOF
-	git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
-	test_cmp expect actual
+ok 84 - record an empty patch as an empty commit in the middle of an am session
 
-ok 3 - log --grep searches in log output encoding (latin1)
+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 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
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
 
-ok 4 - log --grep does not find non-reencoded values (utf8)
+  11d1604 empty commit
 
-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
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-ok 5 - log --grep does not find non-reencoded values (latin1)
+ git branch <new-branch-name> 11d1604
 
-expecting success of 4210.6 'config grep.patternType=fixed': 
-		git config grep.patternType fixed
-	
-ok 6 - config grep.patternType=fixed
+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 advice.mergeConflict false"
+Applying: empty commit
+empty commit
 
-expecting success of 4210.7 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log 'é' >actual &&
-		test_must_be_empty actual
-	
-ok 7 - log --grep does not find non-reencoded values (latin1 + locale)
+empty-file
+ok 85 - create an non-empty commit when the index IS changed though "--allow-empty" is given
 
-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 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
 
-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)
+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 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 advice.mergeConflict false"
+ok 86 - cannot create empty commits when there is a clean index due to merge conflicts
 
-expecting success of 4210.10 'config grep.patternType=basic': 
-		git config grep.patternType basic
-	
-ok 10 - config grep.patternType=basic
+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
 
-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)
+Applying: two
+Using index info to reconstruct a base tree...
+A	file
+Falling back to patching base and 3-way merge...
+Merging:
+9f4f2d0 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 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 advice.mergeConflict false"
+ok 87 - cannot create empty commits when there is unmerged index due to merge conflicts
 
-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)
+# passed all 87 test(s)
+1..87
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4206-log-follow-harder-copies.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4206-log-follow-harder-copies/.git/
+expecting success of 4206.1 'add a file path0 and commit.': 
+	git add path0 &&
+	git commit -m "Add path0"
 
-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)
+[master (root-commit) 70f443e] Add path0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 path0
+ok 1 - add a file path0 and commit.
 
-expecting success of 4210.14 'config grep.patternType=extended': 
-		git config grep.patternType extended
-	
-ok 14 - config grep.patternType=extended
+expecting success of 4206.2 'Change path0.': 
+	git add path0 &&
+	git commit -m "Change path0"
 
-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)
+[master 64b1451] Change path0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+ok 2 - Change path0.
 
-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 4206.3 'copy path0 to path1.': 
+	git add path1 &&
+	git commit -m "Copy path1 from path0"
 
-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)
+[master 3227a3d] Copy path1 from path0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 path1
+ok 3 - copy path0 to path1.
 
-expecting success of 4210.18 'config grep.patternType=perl': 
-		git config grep.patternType perl
-	
-ok 18 - config grep.patternType=perl
+expecting success of 4206.4 'find the copy path0 -> path1 harder': 
+	git log --follow --name-status --pretty="format:%s"  path1 > current
 
-expecting success of 4210.19 'log --grep does not find non-reencoded values (latin1 + locale)': 
-		mismatched_git_log '.*é' >actual &&
-		test_must_be_empty actual
-	
-ok 19 - log --grep does not find non-reencoded values (latin1 + locale)
+ok 4 - find the copy path0 -> path1 harder
 
-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 4206.5 'validate the output.': 
+	compare_diff_patch current expected
 
-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)
+ok 5 - validate the output.
 
-# passed all 21 test(s)
-1..21
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4202-log.sh ***
@@ -272297,7 +273376,6 @@
 		sh -c "test -t 1 && test -t 2"
 
 )
-died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 prerequisite TTY ok
 expecting success of 4202.80 'log output on a TTY': 
 	git log --color --oneline --decorate >expect.short &&
@@ -273010,6 +274088,662 @@
 1..144
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4207-log-decoration-colors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4207-log-decoration-colors/.git/
+expecting success of 4207.1 'setup': 
+	git config diff.color.commit yellow &&
+	git config color.decorate.branch green &&
+	git config color.decorate.remoteBranch red &&
+	git config color.decorate.tag "reverse bold yellow" &&
+	git config color.decorate.stash magenta &&
+	git config color.decorate.grafted black &&
+	git config color.decorate.HEAD cyan &&
+
+	c_reset="<RESET>" &&
+
+	c_commit="<YELLOW>" &&
+	c_branch="<GREEN>" &&
+	c_remoteBranch="<RED>" &&
+	c_tag="<BOLD;REVERSE;YELLOW>" &&
+	c_stash="<MAGENTA>" &&
+	c_HEAD="<CYAN>" &&
+	c_grafted="<BLACK>" &&
+
+	test_commit A &&
+	git clone . other &&
+	(
+		cd other &&
+		test_commit A1
+	) &&
+
+	git remote add -f other ./other &&
+	test_commit B &&
+	git tag v1.0 &&
+	echo >>A.t &&
+	git stash save Changes to A.t
+
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Cloning into 'other'...
+done.
+[main ca6ed14] A1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A1.t
+Updating other
+From ./other
+ * [new branch]      main       -> other/main
+ * [new tag]         A1         -> A1
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Saved working directory and index state On main: Changes to A.t
+ok 1 - setup
+
+expecting success of 4207.2 'commit decorations colored correctly': 
+	cat >expect <<-EOF &&
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
+${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
+${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A1${c_reset}${c_commit}, \
+${c_reset}${c_remoteBranch}other/main${c_reset}${c_commit})${c_reset} A1
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_stash}refs/stash${c_reset}${c_commit})${c_reset} On main: Changes to A.t
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
+	EOF
+
+	git log --first-parent --no-abbrev --decorate --oneline --color=always --all >actual &&
+	cmp_filtered_decorations
+
+ok 2 - commit decorations colored correctly
+
+expecting success of 4207.3 'test coloring with replace-objects': 
+	test_when_finished remove_replace_refs &&
+	test_commit C &&
+	test_commit D &&
+
+	git replace HEAD~1 HEAD~2 &&
+
+	cat >expect <<-EOF &&
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
+${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit})${c_reset} D
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}C${c_reset}${c_commit}, \
+${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} B
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
+EOF
+
+	git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
+	cmp_filtered_decorations &&
+	git replace -d HEAD~1 &&
+
+	GIT_REPLACE_REF_BASE=refs/replace2/ git replace HEAD~1 HEAD~2 &&
+	GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
+		--no-abbrev --decorate --oneline --color=always HEAD >actual &&
+	cmp_filtered_decorations
+
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[main be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Deleted replace ref '35a8500a6c116c9ddf35e140fa3277a7fe0b4196'
+ok 3 - test coloring with replace-objects
+
+expecting success of 4207.4 'test coloring with grafted commit': 
+	test_when_finished remove_replace_refs &&
+
+	git replace --graft HEAD HEAD~2 &&
+
+	cat >expect <<-EOF &&
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}\
+${c_commit} -> ${c_reset}${c_branch}main${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}D${c_reset}${c_commit}, \
+${c_reset}${c_grafted}replaced${c_reset}${c_commit})${c_reset} D
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}v1.0${c_reset}${c_commit}, \
+${c_reset}${c_tag}tag: ${c_reset}${c_tag}B${c_reset}${c_commit})${c_reset} B
+	${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}\
+${c_tag}tag: ${c_reset}${c_tag}A${c_reset}${c_commit})${c_reset} A
+	EOF
+
+	git log --first-parent --no-abbrev --decorate --oneline --color=always HEAD >actual &&
+	cmp_filtered_decorations &&
+	git replace -d HEAD &&
+
+	GIT_REPLACE_REF_BASE=refs/replace2/ git replace --graft HEAD HEAD~2 &&
+	GIT_REPLACE_REF_BASE=refs/replace2/ git log --first-parent \
+		--no-abbrev --decorate --oneline --color=always HEAD >actual &&
+	cmp_filtered_decorations
+
+Deleted replace ref 'be8f64ffad20e1c23faacd732a7ba726ee6f156d'
+ok 4 - test coloring with grafted commit
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4208-log-magic-pathspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4208-log-magic-pathspec/.git/
+expecting success of 4208.1 'setup': 
+	test_commit initial &&
+	test_tick &&
+	git commit --allow-empty -m empty &&
+	mkdir sub
+
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main 41d179c] empty
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 4208.2 '"git log :/" should not be ambiguous': 
+	git log :/
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 2 - "git log :/" should not be ambiguous
+
+expecting success of 4208.3 '"git log :/a" should be ambiguous (applied both rev and worktree)': 
+	: >a &&
+	test_must_fail git log :/a 2>error &&
+	test_grep ambiguous error
+
+fatal: ambiguous argument ':/a': both revision and filename
+ok 3 - "git log :/a" should be ambiguous (applied both rev and worktree)
+
+expecting success of 4208.4 '"git log :/a -- " should not be ambiguous': 
+	git log :/a --
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 4 - "git log :/a -- " should not be ambiguous
+
+expecting success of 4208.5 '"git log :/detached -- " should find a commit only in HEAD': 
+	test_when_finished "git checkout main" &&
+	git checkout --detach &&
+	test_commit --no-tag detached &&
+	test_commit --no-tag something-else &&
+	git log :/detached --
+
+HEAD is now at 41d179c empty
+[detached HEAD 793f74f] detached
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 detached.t
+[detached HEAD 53d04ef] something-else
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 something-else.t
+commit 793f74f97a75d7fa26e06aea1eb13c6322d00e67
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    detached
+
+commit 41d179cf92d6e064ff558d58ffa668d1ed939109
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    empty
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+Warning: you are leaving 2 commits behind, not connected to
+any of your branches:
+
+  53d04ef something-else
+  793f74f detached
+
+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> 53d04ef
+
+Switched to branch 'main'
+ok 5 - "git log :/detached -- " should find a commit only in HEAD
+
+expecting success of 4208.6 '"git log :/detached -- " should not find an orphaned commit': 
+	test_must_fail git log :/detached --
+
+fatal: bad revision ':/detached'
+ok 6 - "git log :/detached -- " should not find an orphaned commit
+
+expecting success of 4208.7 '"git log :/detached -- " should find HEAD only of own worktree': 
+	git worktree add other-tree HEAD &&
+	git -C other-tree checkout --detach &&
+	test_tick &&
+	git -C other-tree commit --allow-empty -m other-detached &&
+	git -C other-tree log :/other-detached -- &&
+	test_must_fail git log :/other-detached --
+
+Preparing worktree (detached HEAD 41d179c)
+HEAD is now at 41d179c empty
+HEAD is now at 41d179c empty
+[detached HEAD 690db08] other-detached
+ Author: A U Thor <author@example.com>
+commit 690db086fe427145ef8254ddd95f5a291f5ad2dd
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:17:13 2005 -0700
+
+    other-detached
+
+commit 41d179cf92d6e064ff558d58ffa668d1ed939109
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    empty
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+fatal: bad revision ':/other-detached'
+ok 7 - "git log :/detached -- " should find HEAD only of own worktree
+
+expecting success of 4208.8 '"git log -- :/a" should not be ambiguous': 
+	git log -- :/a
+
+ok 8 - "git log -- :/a" should not be ambiguous
+
+expecting success of 4208.9 '"git log :/any/path/" should not segfault': 
+	test_must_fail git log :/any/path/
+
+fatal: ambiguous argument ':/any/path/': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 9 - "git log :/any/path/" should not segfault
+
+expecting success of 4208.10 '"git log :/in" should not be ambiguous': 
+	git log :/in
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 10 - "git log :/in" should not be ambiguous
+
+expecting success of 4208.11 '"git log :" should be ambiguous': 
+	test_must_fail git log : 2>error &&
+	test_grep ambiguous error
+
+fatal: ambiguous argument ':': unknown revision or path not in the working tree.
+ok 11 - "git log :" should be ambiguous
+
+expecting success of 4208.12 'git log -- :': 
+	git log -- :
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 12 - git log -- :
+
+expecting success of 4208.13 'git log HEAD -- :/': 
+	initial=$(git rev-parse --short HEAD^) &&
+	cat >expected <<-EOF &&
+	$initial initial
+	EOF
+	(cd sub && git log --oneline HEAD -- :/ >../actual) &&
+	test_cmp expected actual
+
+ok 13 - git log HEAD -- :/
+
+expecting success of 4208.14 '"git log :^sub" is not ambiguous': 
+	git log :^sub
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 14 - "git log :^sub" is not ambiguous
+
+expecting success of 4208.15 '"git log :^does-not-exist" does not match anything': 
+	test_must_fail git log :^does-not-exist
+
+fatal: ambiguous argument ':^does-not-exist': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 15 - "git log :^does-not-exist" does not match anything
+
+expecting success of 4208.16 '"git log :!" behaves the same as :^': 
+	git log :!sub &&
+	test_must_fail git log :!does-not-exist
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+fatal: ambiguous argument ':!does-not-exist': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 16 - "git log :!" behaves the same as :^
+
+expecting success of 4208.17 '"git log :(exclude)sub" is not ambiguous': 
+	git log ":(exclude)sub"
+
+commit 24b24cf8a829f5b8c30dfc018b0a459a2ccaf380
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    initial
+ok 17 - "git log :(exclude)sub" is not ambiguous
+
+expecting success of 4208.18 '"git log :(exclude)sub --" must resolve as an object': 
+	test_must_fail git log ":(exclude)sub" --
+
+fatal: bad revision ':(exclude)sub'
+ok 18 - "git log :(exclude)sub --" must resolve as an object
+
+expecting success of 4208.19 '"git log :(unknown-magic) complains of bogus magic': 
+	test_must_fail git log ":(unknown-magic)" 2>error &&
+	test_grep pathspec.magic error
+
+fatal: Invalid pathspec magic 'unknown-magic' in ':(unknown-magic)'
+ok 19 - "git log :(unknown-magic) complains of bogus magic
+
+expecting success of 4208.20 'command line pathspec parsing for "git log"': 
+	git reset --hard &&
+	>a &&
+	git add a &&
+	git commit -m "add an empty a" --allow-empty &&
+	echo 1 >a &&
+	git commit -a -m "update a to 1" &&
+	git checkout HEAD^ &&
+	echo 2 >a &&
+	git commit -a -m "update a to 2" &&
+	test_must_fail git merge main &&
+	git add a &&
+	git log --merge -- a
+
+HEAD is now at 41d179c empty
+[main 520c03e] add an empty a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 a
+[main 35b719c] update a to 1
+ 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 520c03e add an empty a
+[detached HEAD 61d8fe9] update a to 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Auto-merging a
+CONFLICT (content): Merge conflict in a
+Automatic merge failed; fix conflicts and then commit the result.
+commit 61d8fe935ee13c992ada18f68c7d4b175f28ae77
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:17:13 2005 -0700
+
+    update a to 2
+
+commit 35b719c5373bb94b370829ac90035e2cd80daaba
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:17:13 2005 -0700
+
+    update a to 1
+ok 20 - command line pathspec parsing for "git log"
+
+expecting success of 4208.21 'tree_entry_interesting does not match past submodule boundaries': 
+	test_when_finished "rm -rf repo submodule" &&
+	test_config_global protocol.file.allow always &&
+	git init submodule &&
+	test_commit -C submodule initial &&
+	git init repo &&
+	>"repo/[bracket]" &&
+	git -C repo add "[bracket]" &&
+	test_tick &&
+	git -C repo commit -m bracket &&
+	git -C repo rev-list HEAD -- "[bracket]" >expect &&
+
+	git -C repo submodule add ../submodule &&
+	test_tick &&
+	git -C repo commit -m submodule &&
+
+	git -C repo rev-list HEAD -- "[bracket]" >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4208-log-magic-pathspec/submodule/.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.45.2/t/trash directory.t4208-log-magic-pathspec/repo/.git/
+[main (root-commit) fcad989] bracket
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 [bracket]
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4208-log-magic-pathspec/repo/submodule'...
+done.
+[main 2614379] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+ok 21 - tree_entry_interesting does not match past submodule boundaries
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4210-log-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4210-log-i18n/.git/
+# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
+# lib-gettext: No is_IS ISO-8859-1 locale available
+expecting success of 4210.1 'create commits in different encodings': 
+	test_tick &&
+	cat >msg <<-EOF &&
+	utf8
+
+	t${utf8_e}st
+	EOF
+	git add msg &&
+	git -c i18n.commitencoding=utf8 commit -F msg &&
+	cat >msg <<-EOF &&
+	latin1
+
+	t${latin1_e}st
+	EOF
+	git add msg &&
+	git -c i18n.commitencoding=ISO-8859-1 commit -F msg
+
+[master (root-commit) cbf2796] utf8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 msg
+[master b077cf9] latin1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ok 1 - create commits in different encodings
+
+expecting success of 4210.2 'log --grep searches in log output encoding (utf8)': 
+	cat >expect <<-\EOF &&
+	latin1
+	utf8
+	EOF
+	git log --encoding=utf8 --format=%s --grep=$utf8_e >actual &&
+	test_cmp expect actual
+
+ok 2 - log --grep searches in log output encoding (utf8)
+
+expecting success of 4210.3 'log --grep searches in log output encoding (latin1)': 
+	cat >expect <<-\EOF &&
+	latin1
+	utf8
+	EOF
+	git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual &&
+	test_cmp expect actual
+
+ok 3 - log --grep searches in log output encoding (latin1)
+
+expecting success of 4210.4 'log --grep does not find non-reencoded values (utf8)': 
+	git log --encoding=utf8 --format=%s --grep=$latin1_e >actual &&
+	test_must_be_empty actual
+
+ok 4 - log --grep does not find non-reencoded values (utf8)
+
+expecting success of 4210.5 'log --grep does not find non-reencoded values (latin1)': 
+	git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
+	test_must_be_empty actual
+
+ok 5 - log --grep does not find non-reencoded values (latin1)
+
+expecting success of 4210.6 'config grep.patternType=fixed': 
+		git config grep.patternType fixed
+	
+ok 6 - config grep.patternType=fixed
+
+expecting success of 4210.7 'log --grep does not find non-reencoded values (latin1 + locale)': 
+		mismatched_git_log 'é' >actual &&
+		test_must_be_empty actual
+	
+ok 7 - log --grep does not find non-reencoded values (latin1 + locale)
+
+expecting success of 4210.8 'log --grep searches in log output encoding (latin1 + locale)': 
+			cat >expect <<-\EOF &&
+			latin1
+			utf8
+			EOF
+			mismatched_git_log 'é' >actual &&
+			test_cmp expect actual
+		
+ok 8 - log --grep searches in log output encoding (latin1 + locale)
+
+expecting success of 4210.9 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
+			mismatched_git_log 'Ã()' >actual &&
+			test_must_be_empty actual
+		
+ok 9 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
+
+expecting success of 4210.10 'config grep.patternType=basic': 
+		git config grep.patternType basic
+	
+ok 10 - config grep.patternType=basic
+
+expecting success of 4210.11 'log --grep does not find non-reencoded values (latin1 + locale)': 
+		mismatched_git_log '.*é' >actual &&
+		test_must_be_empty actual
+	
+ok 11 - log --grep does not find non-reencoded values (latin1 + locale)
+
+expecting success of 4210.12 'log --grep searches in log output encoding (latin1 + locale)': 
+			cat >expect <<-\EOF &&
+			latin1
+			utf8
+			EOF
+			mismatched_git_log '.*é' >actual &&
+			test_cmp expect actual
+		
+ok 12 - log --grep searches in log output encoding (latin1 + locale)
+
+expecting success of 4210.13 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
+			mismatched_git_log '.*Ã()' >actual &&
+			test_must_be_empty actual
+		
+ok 13 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
+
+expecting success of 4210.14 'config grep.patternType=extended': 
+		git config grep.patternType extended
+	
+ok 14 - config grep.patternType=extended
+
+expecting success of 4210.15 'log --grep does not find non-reencoded values (latin1 + locale)': 
+		mismatched_git_log '.*é' >actual &&
+		test_must_be_empty actual
+	
+ok 15 - log --grep does not find non-reencoded values (latin1 + locale)
+
+expecting success of 4210.16 'log --grep searches in log output encoding (latin1 + locale)': 
+			cat >expect <<-\EOF &&
+			latin1
+			utf8
+			EOF
+			mismatched_git_log '.*é' >actual &&
+			test_cmp expect actual
+		
+ok 16 - log --grep searches in log output encoding (latin1 + locale)
+
+expecting success of 4210.17 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
+			mismatched_git_log '.*Ã()' >actual &&
+			test_must_be_empty actual
+		
+ok 17 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
+
+expecting success of 4210.18 'config grep.patternType=perl': 
+		git config grep.patternType perl
+	
+ok 18 - config grep.patternType=perl
+
+expecting success of 4210.19 'log --grep does not find non-reencoded values (latin1 + locale)': 
+		mismatched_git_log '.*é' >actual &&
+		test_must_be_empty actual
+	
+ok 19 - log --grep does not find non-reencoded values (latin1 + locale)
+
+expecting success of 4210.20 'log --grep searches in log output encoding (latin1 + locale)': 
+			cat >expect <<-\EOF &&
+			latin1
+			utf8
+			EOF
+			mismatched_git_log '.*é' >actual &&
+			test_cmp expect actual
+		
+ok 20 - log --grep searches in log output encoding (latin1 + locale)
+
+expecting success of 4210.21 'log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)': 
+			mismatched_git_log '.*Ã()' >actual &&
+			test_must_be_empty actual
+		
+ok 21 - log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4209-log-pickaxe.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4209-log-pickaxe/.git/
 expecting success of 4209.1 'setup': 
@@ -275007,8 +276741,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-12-18 01:35:53.942773267 +0000
-+++ actual	2025-12-18 01:35:53.942773267 +0000
+--- expected	2024-11-14 19:34:55.872990870 +0000
++++ actual	2024-11-14 19:34:55.888991033 +0000
 @@ -1,4 +1,4 @@
 -👨..👨⋮
 -e�..e�e�
@@ -275401,3975 +277135,1581 @@
 \ No newline at end of file
 +}
 +
-+/* incomplete lines are bad! */
-
-commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:10 2013 +0100
-
-    change to an incomplete line at end
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,22 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-+}
-\ No newline at end of file
-
-commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:47:40 2013 +0100
-
-    change at very beginning
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,22 @@
-+#include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:41 2013 +0100
-
-    touch comment
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-- * A comment.
-+ * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:16 2013 +0100
-
-    touch both functions
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
--int f(int x)
-+long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
--	printf("%d\n", f(15));
-+	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit f04fb20f2c77850996cba739709acc6faecc58f7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:55 2013 +0100
-
-    change f()
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,20 +1,21 @@
- #include <stdio.h>
- 
- int f(int x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
-+	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
- 	printf("%d\n", f(15));
- 	return 0;
- }
-
-commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:48 2013 +0100
-
-    initial
-
-diff --git a/a.c b/a.c
---- /dev/null
-+++ b/a.c
-@@ -0,0 +1,20 @@
-+#include <stdio.h>
-+
-+int f(int x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x >>= 1;
-+		s++;
-+	}
-+}
-+
-+/*
-+ * A comment.
-+ */
-+
-+int main ()
-+{
-+	printf("%d\n", f(15));
-+	return 0;
-+}
-ok 32 - -L ,Y (Y == nlines)
-
-expecting success of 4211.33 '-L ,Y (Y == nlines + 1)': 
-	n=$(expr $(wc -l <b.c) + 1) &&
-	git log -L ,$n:b.c
-
-commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:50:24 2013 +0100
-
-    move within the file
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,26 @@
- #include <unistd.h>
- #include <stdio.h>
- 
--long f(long x)
--{
--	int s = 0;
--	while (x) {
--		x /= 2;
--		s++;
--	}
--	return s;
--}
-+long f(long x);
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-+
-+long f(long x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x /= 2;
-+		s++;
-+	}
-+	return s;
-+}
-
-commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:49:50 2013 +0100
-
-    another simple change
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
--		x >>= 1;
-+		x /= 2;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-
-commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:43 2013 +0100
-
-    change back to complete line
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-\ No newline at end of file
-+}
-+
-+/* incomplete lines are bad! */
-
-commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:10 2013 +0100
-
-    change to an incomplete line at end
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,22 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-+}
-\ No newline at end of file
-
-commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:47:40 2013 +0100
-
-    change at very beginning
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,22 @@
-+#include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:41 2013 +0100
-
-    touch comment
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-- * A comment.
-+ * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:16 2013 +0100
-
-    touch both functions
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
--int f(int x)
-+long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
--	printf("%d\n", f(15));
-+	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit f04fb20f2c77850996cba739709acc6faecc58f7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:55 2013 +0100
-
-    change f()
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,20 +1,21 @@
- #include <stdio.h>
- 
- int f(int x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
-+	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
- 	printf("%d\n", f(15));
- 	return 0;
- }
-
-commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:48 2013 +0100
-
-    initial
-
-diff --git a/a.c b/a.c
---- /dev/null
-+++ b/a.c
-@@ -0,0 +1,20 @@
-+#include <stdio.h>
-+
-+int f(int x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x >>= 1;
-+		s++;
-+	}
-+}
-+
-+/*
-+ * A comment.
-+ */
-+
-+int main ()
-+{
-+	printf("%d\n", f(15));
-+	return 0;
-+}
-ok 33 - -L ,Y (Y == nlines + 1)
-
-expecting success of 4211.34 '-L ,Y (Y == nlines + 2)': 
-	n=$(expr $(wc -l <b.c) + 2) &&
-	git log -L ,$n:b.c
-
-commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:50:24 2013 +0100
-
-    move within the file
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,26 @@
- #include <unistd.h>
- #include <stdio.h>
- 
--long f(long x)
--{
--	int s = 0;
--	while (x) {
--		x /= 2;
--		s++;
--	}
--	return s;
--}
-+long f(long x);
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-+
-+long f(long x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x /= 2;
-+		s++;
-+	}
-+	return s;
-+}
-
-commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:49:50 2013 +0100
-
-    another simple change
-
-diff --git a/b.c b/b.c
---- a/b.c
-+++ b/b.c
-@@ -1,24 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
--		x >>= 1;
-+		x /= 2;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
- 
- /* incomplete lines are bad! */
-
-commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:43 2013 +0100
-
-    change back to complete line
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,24 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-\ No newline at end of file
-+}
-+
-+/* incomplete lines are bad! */
-
-commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:48:10 2013 +0100
-
-    change to an incomplete line at end
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,22 +1,22 @@
- #include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
--}
-+}
-\ No newline at end of file
-
-commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:47:40 2013 +0100
-
-    change at very beginning
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,22 @@
-+#include <unistd.h>
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:41 2013 +0100
-
-    touch comment
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
- long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-- * A comment.
-+ * This is only an example!
-  */
- 
- int main ()
- {
- 	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:45:16 2013 +0100
-
-    touch both functions
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,21 +1,21 @@
- #include <stdio.h>
- 
--int f(int x)
-+long f(long x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
- 	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
--	printf("%d\n", f(15));
-+	printf("%ld\n", f(15));
- 	return 0;
- }
-
-commit f04fb20f2c77850996cba739709acc6faecc58f7
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:55 2013 +0100
-
-    change f()
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -1,20 +1,21 @@
- #include <stdio.h>
- 
- int f(int x)
- {
- 	int s = 0;
- 	while (x) {
- 		x >>= 1;
- 		s++;
- 	}
-+	return s;
- }
- 
- /*
-  * A comment.
-  */
- 
- int main ()
- {
- 	printf("%d\n", f(15));
- 	return 0;
- }
-
-commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:44:48 2013 +0100
-
-    initial
-
-diff --git a/a.c b/a.c
---- /dev/null
-+++ b/a.c
-@@ -0,0 +1,20 @@
-+#include <stdio.h>
-+
-+int f(int x)
-+{
-+	int s = 0;
-+	while (x) {
-+		x >>= 1;
-+		s++;
-+	}
-+}
-+
-+/*
-+ * A comment.
-+ */
-+
-+int main ()
-+{
-+	printf("%d\n", f(15));
-+	return 0;
-+}
-ok 34 - -L ,Y (Y == nlines + 2)
-
-expecting success of 4211.35 '-L with --first-parent and a merge': 
-	git checkout parallel-change &&
-	git log --first-parent -L 1,1:b.c
-
-Switched to branch 'parallel-change'
-commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
-Author: Thomas Rast <trast@student.ethz.ch>
-Date:   Thu Feb 28 10:47:40 2013 +0100
-
-    change at very beginning
-
-diff --git a/a.c b/a.c
---- a/a.c
-+++ b/a.c
-@@ -0,0 +1,1 @@
-+#include <unistd.h>
-ok 35 - -L with --first-parent and a merge
-
-expecting success of 4211.36 '-L with --output': 
-	git checkout parallel-change &&
-	git log --output=log -L :main:b.c >output &&
-	test_must_be_empty output &&
-	test_line_count = 70 log
-
-Already on 'parallel-change'
-ok 36 - -L with --output
-
-expecting success of 4211.37 'range_set_union': 
-	test_seq 500 > c.c &&
-	git add c.c &&
-	git commit -m "many lines" &&
-	test_seq 1000 > c.c &&
-	git add c.c &&
-	git commit -m "modify many lines" &&
-	git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c || return 1; done)
-
-[parallel-change d6e4eb5] many lines
- Author: A U Thor <author@example.com>
- 1 file changed, 500 insertions(+)
- create mode 100644 c.c
-[parallel-change 23d0144] modify many lines
- Author: A U Thor <author@example.com>
- 1 file changed, 500 insertions(+)
-commit d6e4eb5bea25e60e2079aaeae319e9fff12659aa
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    many lines
-
-diff --git a/c.c b/c.c
---- /dev/null
-+++ b/c.c
-@@ -0,0 +2,1 @@
-+2
-ok 37 - range_set_union
-
-expecting success of 4211.38 '-s shows only line-log commits': 
-	git log --format="commit %s" -L1,24:b.c >expect.raw &&
-	grep ^commit expect.raw >expect &&
-	git log --format="commit %s" -L1,24:b.c -s >actual &&
-	test_cmp expect actual
-
-ok 38 - -s shows only line-log commits
-
-expecting success of 4211.39 '-p shows the default patch output': 
-	git log -L1,24:b.c >expect &&
-	git log -L1,24:b.c -p >actual &&
-	test_cmp expect actual
-
-ok 39 - -p shows the default patch output
-
-expecting success of 4211.40 '--raw is forbidden': 
-	test_must_fail git log -L1,24:b.c --raw
-
-fatal: -L does not yet support diff formats besides -p and -s
-ok 40 - --raw is forbidden
-
-expecting success of 4211.41 'setup for checking fancy rename following': 
-	git checkout --orphan moves-start &&
-	git reset --hard &&
-
-	printf "%s\n"    12 13 14 15      b c d e   >file-1 &&
-	printf "%s\n"    22 23 24 25      B C D E   >file-2 &&
-	git add file-1 file-2 &&
-	test_tick &&
-	git commit -m "Add file-1 and file-2" &&
-	oid_add_f1_f2=$(git rev-parse --short HEAD) &&
-
-	git checkout -b moves-main &&
-	printf "%s\n" 11 12 13 14 15      b c d e   >file-1 &&
-	git commit -a -m "Modify file-1 on main" &&
-	oid_mod_f1_main=$(git rev-parse --short HEAD) &&
-
-	printf "%s\n" 21 22 23 24 25      B C D E   >file-2 &&
-	git commit -a -m "Modify file-2 on main #1" &&
-	oid_mod_f2_main_1=$(git rev-parse --short HEAD) &&
-
-	git mv file-1 renamed-1 &&
-	git commit -m "Rename file-1 to renamed-1 on main" &&
-
-	printf "%s\n" 11 12 13 14 15      b c d e f >renamed-1 &&
-	git commit -a -m "Modify renamed-1 on main" &&
-	oid_mod_r1_main=$(git rev-parse --short HEAD) &&
-
-	printf "%s\n" 21 22 23 24 25      B C D E F >file-2 &&
-	git commit -a -m "Modify file-2 on main #2" &&
-	oid_mod_f2_main_2=$(git rev-parse --short HEAD) &&
-
-	git checkout -b moves-side moves-start &&
-	printf "%s\n"    12 13 14 15 16   b c d e   >file-1 &&
-	git commit -a -m "Modify file-1 on side #1" &&
-	oid_mod_f1_side_1=$(git rev-parse --short HEAD) &&
-
-	printf "%s\n"    22 23 24 25 26   B C D E   >file-2 &&
-	git commit -a -m "Modify file-2 on side" &&
-	oid_mod_f2_side=$(git rev-parse --short HEAD) &&
-
-	git mv file-2 renamed-2 &&
-	git commit -m "Rename file-2 to renamed-2 on side" &&
-
-	printf "%s\n"    12 13 14 15 16 a b c d e   >file-1 &&
-	git commit -a -m "Modify file-1 on side #2" &&
-	oid_mod_f1_side_2=$(git rev-parse --short HEAD) &&
-
-	printf "%s\n"    22 23 24 25 26 A B C D E   >renamed-2 &&
-	git commit -a -m "Modify renamed-2 on side" &&
-	oid_mod_r2_side=$(git rev-parse --short HEAD) &&
-
-	git checkout moves-main &&
-	git merge moves-side &&
-	oid_merge=$(git rev-parse --short HEAD)
-
-Switched to a new branch 'moves-start'
-[moves-start (root-commit) 306d665] Add file-1 and file-2
- Author: A U Thor <author@example.com>
- 2 files changed, 16 insertions(+)
- create mode 100644 file-1
- create mode 100644 file-2
-Switched to a new branch 'moves-main'
-[moves-main d42d674] Modify file-1 on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-main 30ac750] Modify file-2 on main #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-main 0bb858c] Rename file-1 to renamed-1 on main
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file-1 => renamed-1 (100%)
-[moves-main 85f9f03] Modify renamed-1 on main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-main da62335] Modify file-2 on main #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'moves-side'
-[moves-side aced016] Modify file-1 on side #1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-side f423e86] Modify file-2 on side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-side 87b3e53] Rename file-2 to renamed-2 on side
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file-2 => renamed-2 (100%)
-[moves-side 6073daf] Modify file-1 on side #2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[moves-side 43e9b43] Modify renamed-2 on side
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'moves-main'
-Auto-merging renamed-1
-Auto-merging renamed-2
-Merge made by the 'ort' strategy.
- renamed-1           | 2 ++
- file-2 => renamed-2 | 2 ++
- 2 files changed, 4 insertions(+)
- rename file-2 => renamed-2 (83%)
-ok 41 - setup for checking fancy rename following
-
-expecting success of 4211.42 'fancy rename following #1': 
-	cat >expect <<-EOF &&
-	$oid_merge Merge branch 'moves-side' into moves-main
-	$oid_mod_f1_side_2 Modify file-1 on side #2
-	$oid_mod_f1_side_1 Modify file-1 on side #1
-	$oid_mod_r1_main Modify renamed-1 on main
-	$oid_mod_f1_main Modify file-1 on main
-	$oid_add_f1_f2 Add file-1 and file-2
-	EOF
-	git log -L1:renamed-1 --oneline --no-patch >actual &&
-	test_cmp expect actual
-
-ok 42 - fancy rename following #1
-
-expecting success of 4211.43 'fancy rename following #2': 
-	cat >expect <<-EOF &&
-	$oid_merge Merge branch 'moves-side' into moves-main
-	$oid_mod_r2_side Modify renamed-2 on side
-	$oid_mod_f2_side Modify file-2 on side
-	$oid_mod_f2_main_2 Modify file-2 on main #2
-	$oid_mod_f2_main_1 Modify file-2 on main #1
-	$oid_add_f1_f2 Add file-1 and file-2
-	EOF
-	git log -L1:renamed-2 --oneline --no-patch >actual &&
-	test_cmp expect actual
-
-ok 43 - fancy rename following #2
-
-expecting success of 4211.44 'setup for checking line-log and parent oids': 
-	git checkout --orphan parent-oids &&
-	git reset --hard &&
-
-	cat >file.c <<-\EOF &&
-	int func1()
-	{
-	    return F1;
-	}
-
-	int func2()
-	{
-	    return F2;
-	}
-	EOF
-	git add file.c &&
-	test_tick &&
-	first_tick=$test_tick &&
-	git commit -m "Add func1() and func2() in file.c" &&
-
-	echo 1 >other-file &&
-	git add other-file &&
-	test_tick &&
-	git commit -m "Add other-file" &&
-
-	sed -e "s/F1/F1 + 1/" file.c >tmp &&
-	mv tmp file.c &&
-	git commit -a -m "Modify func1() in file.c" &&
-
-	echo 2 >other-file &&
-	git commit -a -m "Modify other-file" &&
-
-	sed -e "s/F2/F2 + 2/" file.c >tmp &&
-	mv tmp file.c &&
-	git commit -a -m "Modify func2() in file.c" &&
-
-	head_oid=$(git rev-parse --short HEAD) &&
-	prev_oid=$(git rev-parse --short HEAD^) &&
-	root_oid=$(git rev-parse --short HEAD~4)
-
-Switched to a new branch 'parent-oids'
-[parent-oids (root-commit) df67db9] Add func1() and func2() in file.c
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file.c
-[parent-oids ee91250] Add other-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 other-file
-[parent-oids 431262f] Modify func1() in file.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[parent-oids e3bd121] Modify other-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[parent-oids 0202e75] Modify func2() in file.c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 44 - setup for checking line-log and parent oids
-
-expecting success of 4211.45 'parent oids without parent rewriting': 
-	cat >expect <<-EOF &&
-	$head_oid $prev_oid Modify func2() in file.c
-	$root_oid  Add func1() and func2() in file.c
-	EOF
-	git log --format="%h %p %s" --no-patch -L:func2:file.c >actual &&
-	test_cmp expect actual
-
-ok 45 - parent oids without parent rewriting
-
-expecting success of 4211.46 'parent oids with parent rewriting': 
-	cat >expect <<-EOF &&
-	$head_oid $root_oid Modify func2() in file.c
-	$root_oid  Add func1() and func2() in file.c
-	EOF
-	git log --format="%h %p %s" --no-patch -L:func2:file.c --parents >actual &&
-	test_cmp expect actual
-
-ok 46 - parent oids with parent rewriting
-
-expecting success of 4211.47 'line-log with --before': 
-	echo $root_oid >expect &&
-	git log --format=%h --no-patch -L:func2:file.c --before=$first_tick >actual &&
-	test_cmp expect actual
-
-ok 47 - line-log with --before
-
-expecting success of 4211.48 'setup tests for zero-width regular expressions': 
-	cat >expect <<-EOF
-	Modify func1() in file.c
-	Add func1() and func2() in file.c
-	EOF
-
-ok 48 - setup tests for zero-width regular expressions
-
-expecting success of 4211.49 'zero-width regex $ matches any function name': 
-	git log --format="%s" --no-patch "-L:$:file.c" >actual &&
-	test_cmp expect actual
-
-ok 49 - zero-width regex $ matches any function name
-
-expecting success of 4211.50 'zero-width regex ^ matches any function name': 
-	git log --format="%s" --no-patch "-L:^:file.c" >actual &&
-	test_cmp expect actual
-
-ok 50 - zero-width regex ^ matches any function name
-
-expecting success of 4211.51 'zero-width regex .* matches any function name': 
-	git log --format="%s" --no-patch "-L:.*:file.c" >actual &&
-	test_cmp expect actual
-
-ok 51 - zero-width regex .* matches any function name
-
-# passed all 51 test(s)
-1..51
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4214-log-graph-octopus.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4214-log-graph-octopus/.git/
-expecting success of 4214.1 'set up merge history': 
-	test_commit initial &&
-	for i in 1 2 3 4 ; do
-		git checkout main -b $i || return $?
-		# Make tag name different from branch name, to avoid
-		# ambiguity error when calling checkout.
-		test_commit $i $i $i tag$i || return $?
-	done &&
-	git checkout 1 -b merge &&
-	test_merge octopus-merge 1 2 3 4 &&
-	test_commit after-merge &&
-	git checkout 1 -b L &&
-	test_commit left &&
-	git checkout 4 -b crossover &&
-	test_commit after-4 &&
-	git checkout initial -b more-L &&
-	test_commit after-initial
-
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch '1'
-[1 0152a24] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1
-Switched to a new branch '2'
-[2 bca45ad] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2
-Switched to a new branch '3'
-[3 ec94035] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3
-Switched to a new branch '4'
-[4 132f27d] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4
-Switched to a new branch 'merge'
-Trying simple merge with 2
-Trying simple merge with 3
-Trying simple merge with 4
-Merge made by the 'octopus' strategy.
- 2 | 1 +
- 3 | 1 +
- 4 | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 2
- create mode 100644 3
- create mode 100644 4
-[merge ce2ad1c] after-merge
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-merge.t
-Switched to a new branch 'L'
-[L d607189] left
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 left.t
-Switched to a new branch 'crossover'
-[crossover 7a146e9] after-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-4.t
-Switched to a new branch 'more-L'
-[more-L a2d7eba] after-initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 after-initial.t
-ok 1 - set up merge history
-
-expecting success of 4214.2 'log --graph with tricky octopus merge, no color': 
-	test_cmp_graph left octopus-merge <<-\EOF
-	* left
-	| *-.   octopus-merge
-	|/|\ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 2 - log --graph with tricky octopus merge, no color
-
-expecting success of 4214.3 'log --graph with tricky octopus merge with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* left
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
-	<RED>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
-	<RED>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	<RED>|<RESET> * <MAGENTA>/<RESET> 2
-	<RED>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* <MAGENTA>/<RESET> 1
-	<MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph left octopus-merge
-
-ok 3 - log --graph with tricky octopus merge with colors
-
-expecting success of 4214.4 'log --graph with normal octopus merge, no color': 
-	test_cmp_graph octopus-merge <<-\EOF
-	*---.   octopus-merge
-	|\ \ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 4 - log --graph with normal octopus merge, no color
-
-expecting success of 4214.5 'log --graph with normal octopus merge with colors': 
-	cat >expect.colors <<-\EOF &&
-	*<YELLOW>-<RESET><YELLOW>-<RESET><BLUE>-<RESET><BLUE>.<RESET>   octopus-merge
-	<RED>|<RESET><GREEN>\<RESET> <YELLOW>\<RESET> <BLUE>\<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 4
-	<RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 3
-	<RED>|<RESET> <GREEN>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	<RED>|<RESET> * <BLUE>/<RESET> 2
-	<RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	* <BLUE>/<RESET> 1
-	<BLUE>|<RESET><BLUE>/<RESET>
-	* initial
-	EOF
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	test_cmp_colored_graph octopus-merge
-
-ok 5 - log --graph with normal octopus merge with colors
-
-expecting success of 4214.6 'log --graph with normal octopus merge and child, no color': 
-	test_cmp_graph after-merge <<-\EOF
-	* after-merge
-	*---.   octopus-merge
-	|\ \ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 6 - log --graph with normal octopus merge and child, no color
-
-expecting success of 4214.7 'log --graph with normal octopus and child merge with colors': 
-	cat >expect.colors <<-\EOF &&
-	* after-merge
-	*<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
-	<GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
-	<GREEN>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
-	<GREEN>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	<GREEN>|<RESET> * <MAGENTA>/<RESET> 2
-	<GREEN>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* <MAGENTA>/<RESET> 1
-	<MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* initial
-	EOF
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	test_cmp_colored_graph after-merge
-
-ok 7 - log --graph with normal octopus and child merge with colors
-
-expecting success of 4214.8 'log --graph with tricky octopus merge and its child, no color': 
-	test_cmp_graph left after-merge <<-\EOF
-	* left
-	| * after-merge
-	| *-.   octopus-merge
-	|/|\ \
-	| | | * 4
-	| | * | 3
-	| | |/
-	| * / 2
-	| |/
-	* / 1
-	|/
-	* initial
-	EOF
-
-ok 8 - log --graph with tricky octopus merge and its child, no color
-
-expecting success of 4214.9 'log --graph with tricky octopus merge and its child with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* left
-	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
-	<RED>|<RESET><RED>/<RESET><BLUE>|<RESET><MAGENTA>\<RESET> <CYAN>\<RESET>
-	<RED>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
-	<RED>|<RESET> <BLUE>|<RESET> * <CYAN>|<RESET> 3
-	<RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-	<RED>|<RESET> * <CYAN>/<RESET> 2
-	<RED>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-	* <CYAN>/<RESET> 1
-	<CYAN>|<RESET><CYAN>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph left after-merge
-
-ok 9 - log --graph with tricky octopus merge and its child with colors
-
-expecting success of 4214.10 'log --graph with crossover in octopus merge, no color': 
-	test_cmp_graph after-4 octopus-merge <<-\EOF
-	* after-4
-	| *---.   octopus-merge
-	| |\ \ \
-	| |_|_|/
-	|/| | |
-	* | | | 4
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
-
-ok 10 - log --graph with crossover in octopus merge, no color
-
-expecting success of 4214.11 'log --graph with crossover in octopus merge with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-4
-	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
-	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <RED>\<RESET>
-	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
-	* <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> 4
-	<MAGENTA>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
-	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>_<RESET><YELLOW>|<RESET><MAGENTA>/<RESET>
-	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
-	<MAGENTA>|<RESET> <GREEN>|<RESET> * 2
-	<MAGENTA>|<RESET> <GREEN>|<RESET><MAGENTA>/<RESET>
-	<MAGENTA>|<RESET><MAGENTA>/<RESET><GREEN>|<RESET>
-	<MAGENTA>|<RESET> * 1
-	<MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-4 octopus-merge
-
-ok 11 - log --graph with crossover in octopus merge with colors
-
-expecting success of 4214.12 'log --graph with crossover in octopus merge and its child, no color': 
-	test_cmp_graph after-4 after-merge <<-\EOF
-	* after-4
-	| * after-merge
-	| *---.   octopus-merge
-	| |\ \ \
-	| |_|_|/
-	|/| | |
-	* | | | 4
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
-
-ok 12 - log --graph with crossover in octopus merge and its child, no color
-
-expecting success of 4214.13 'log --graph with crossover in octopus merge and its child with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-4
-	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><RED>-<RESET><RED>.<RESET>   octopus-merge
-	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <RED>\<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
-	* <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> 4
-	<CYAN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
-	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>_<RESET><BLUE>|<RESET><CYAN>/<RESET>
-	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
-	<CYAN>|<RESET> <YELLOW>|<RESET> * 2
-	<CYAN>|<RESET> <YELLOW>|<RESET><CYAN>/<RESET>
-	<CYAN>|<RESET><CYAN>/<RESET><YELLOW>|<RESET>
-	<CYAN>|<RESET> * 1
-	<CYAN>|<RESET><CYAN>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-4 after-merge
-
-ok 13 - log --graph with crossover in octopus merge and its child with colors
-
-expecting success of 4214.14 'log --graph with unrelated commit and octopus tip, no color': 
-	test_cmp_graph after-initial octopus-merge <<-\EOF
-	* after-initial
-	| *---.   octopus-merge
-	| |\ \ \
-	| | | | * 4
-	| |_|_|/
-	|/| | |
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
-
-ok 14 - log --graph with unrelated commit and octopus tip, no color
-
-expecting success of 4214.15 'log --graph with unrelated commit and octopus tip with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-initial
-	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<RED>|<RESET> <GREEN>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
-	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 3
-	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET>
-	<RED>|<RESET> <GREEN>|<RESET> * 2
-	<RED>|<RESET> <GREEN>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET>
-	<RED>|<RESET> * 1
-	<RED>|<RESET><RED>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-initial octopus-merge
-
-ok 15 - log --graph with unrelated commit and octopus tip with colors
-
-expecting success of 4214.16 'log --graph with unrelated commit and octopus child, no color': 
-	test_cmp_graph after-initial after-merge <<-\EOF
-	* after-initial
-	| * after-merge
-	| *---.   octopus-merge
-	| |\ \ \
-	| | | | * 4
-	| |_|_|/
-	|/| | |
-	| | | * 3
-	| |_|/
-	|/| |
-	| | * 2
-	| |/
-	|/|
-	| * 1
-	|/
-	* initial
-	EOF
-
-ok 16 - log --graph with unrelated commit and octopus child, no color
-
-expecting success of 4214.17 'log --graph with unrelated commit and octopus child with colors': 
-	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	cat >expect.colors <<-\EOF &&
-	* after-initial
-	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
-	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <CYAN>\<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
-	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
-	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
-	<RED>|<RESET> <YELLOW>|<RESET> * 2
-	<RED>|<RESET> <YELLOW>|<RESET><RED>/<RESET>
-	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET>
-	<RED>|<RESET> * 1
-	<RED>|<RESET><RED>/<RESET>
-	* initial
-	EOF
-	test_cmp_colored_graph after-initial after-merge
-
-ok 17 - log --graph with unrelated commit and octopus child with colors
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4217-log-limit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-
-Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/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 file
-[master b839c03] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 5dd5cf2] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master fd219fd] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup test
-
-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_cmp expect actual
-
-ok 2 - git log --since-as-filter=...
-
-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
-	test_cmp expect actual
-
-ok 3 - git log --children --since-as-filter=...
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4150-am.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4150-am/.git/
-expecting success of 4150.1 'setup: messages': 
-	cat >msg <<-\EOF &&
-	second
-
-	Lorem ipsum dolor sit amet, consectetuer sadipscing elitr, sed diam nonumy
-	eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
-	voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita
-	kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem
-	ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
-	tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
-	vero eos et accusam et justo duo dolores et ea rebum.
-
-	EOF
-	qz_to_tab_space <<-\EOF >>msg &&
-	QDuis autem vel eum iriure dolor in hendrerit in vulputate velit
-	Qesse molestie consequat, vel illum dolore eu feugiat nulla facilisis
-	Qat vero eros et accumsan et iusto odio dignissim qui blandit
-	Qpraesent luptatum zzril delenit augue duis dolore te feugait nulla
-	Qfacilisi.
-	EOF
-	cat >>msg <<-\EOF &&
-
-	Lorem ipsum dolor sit amet,
-	consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut
-	laoreet dolore magna aliquam erat volutpat.
-
-	  git
-	  ---
-	  +++
-
-	Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit
-	lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure
-	dolor in hendrerit in vulputate velit esse molestie consequat, vel illum
-	dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio
-	dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te
-	feugait nulla facilisi.
-
-	Reported-by: A N Other <a.n.other@example.com>
-	EOF
-
-	cat >failmail <<-\EOF &&
-	From foo@example.com Fri May 23 10:43:49 2008
-	From:	foo@example.com
-	To:	bar@example.com
-	Subject: Re: [RFC/PATCH] git-foo.sh
-	Date:	Fri, 23 May 2008 05:23:42 +0200
-
-	Sometimes we have to find out that there's nothing left.
-
-	EOF
-
-	cat >pine <<-\EOF &&
-	From MAILER-DAEMON Fri May 23 10:43:49 2008
-	Date: 23 May 2008 05:23:42 +0200
-	From: Mail System Internal Data <MAILER-DAEMON@example.com>
-	Subject: DON'T DELETE THIS MESSAGE -- FOLDER INTERNAL DATA
-	Message-ID: <foo-0001@example.com>
-
-	This text is part of the internal format of your mail folder, and is not
-	a real message.  It is created automatically by the mail system software.
-	If deleted, important folder data will be lost, and it will be re-created
-	with the data reset to initial values.
-
-	EOF
-
-	cat >msg-without-scissors-line <<-\EOF &&
-	Test that git-am --scissors cuts at the scissors line
-
-	This line should be included in the commit message.
-	EOF
-
-	printf "Subject: " >subject-prefix &&
-
-	cat - subject-prefix msg-without-scissors-line >msg-with-scissors-line <<-\EOF
-	This line should not be included in the commit message with --scissors enabled.
-
-	 - - >8 - - remove everything above this line - - >8 - -
-
-	EOF
-
-ok 1 - setup: messages
-
-expecting success of 4150.2 'setup': 
-	echo hello >file &&
-	git add file &&
-	test_tick &&
-	git commit -m first &&
-	git tag first &&
-
-	echo world >>file &&
-	git add file &&
-	test_tick &&
-	git commit -F msg &&
-	git tag second &&
-
-	git format-patch --stdout first >patch1 &&
-	{
-		echo "Message-ID: <1226501681-24923-1-git-send-email-bda@mnsspb.ru>" &&
-		echo "X-Fake-Field: Line One" &&
-		echo "X-Fake-Field: Line Two" &&
-		echo "X-Fake-Field: Line Three" &&
-		git format-patch --stdout first | sed -e "1d"
-	} > patch1.eml &&
-	{
-		echo "X-Fake-Field: Line One" &&
-		echo "X-Fake-Field: Line Two" &&
-		echo "X-Fake-Field: Line Three" &&
-		git format-patch --stdout first | sed -e "1d"
-	} | append_cr >patch1-crlf.eml &&
-	{
-		printf "%255s\\n" "" &&
-		echo "X-Fake-Field: Line One" &&
-		echo "X-Fake-Field: Line Two" &&
-		echo "X-Fake-Field: Line Three" &&
-		git format-patch --stdout first | sed -e "1d"
-	} > patch1-ws.eml &&
-	{
-		sed -ne "1p" msg &&
-		echo &&
-		echo "From: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" &&
-		echo "Date: $GIT_AUTHOR_DATE" &&
-		echo &&
-		sed -e "1,2d" msg &&
-		echo "---" &&
-		git diff-tree --no-commit-id --stat -p second
-	} >patch1-stgit.eml &&
-	mkdir stgit-series &&
-	cp patch1-stgit.eml stgit-series/patch &&
-	{
-		echo "# This series applies on GIT commit $(git rev-parse first)" &&
-		echo "patch"
-	} >stgit-series/series &&
-	{
-		echo "# HG changeset patch" &&
-		echo "# User $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" &&
-		echo "# Date $test_tick 25200" &&
-		echo "#      $(git show --pretty="%aD" -s second)" &&
-		echo "# Node ID $ZERO_OID" &&
-		echo "# Parent  $ZERO_OID" &&
-		cat msg &&
-		echo &&
-		git diff-tree --no-commit-id -p second
-	} >patch1-hg.eml &&
-
-
-	echo file >file &&
-	git add file &&
-	git commit -F msg-without-scissors-line &&
-	git tag expected-for-scissors &&
-	git reset --hard HEAD^ &&
-
-	echo file >file &&
-	git add file &&
-	git commit -F msg-with-scissors-line &&
-	git tag expected-for-no-scissors &&
-	git format-patch --stdout expected-for-no-scissors^ >patch-with-scissors-line.eml &&
-	git reset --hard HEAD^ &&
-
-	sed -n -e "3,\$p" msg >file &&
-	git add file &&
-	test_tick &&
-	git commit -m third &&
-
-	git format-patch --stdout first >patch2 &&
-
-	git checkout -b lorem &&
-	sed -n -e "11,\$p" msg >file &&
-	head -n 9 msg >>file &&
-	test_tick &&
-	git commit -a -m "moved stuff" &&
-
-	echo goodbye >another &&
-	git add another &&
-	test_tick &&
-	git commit -m "added another file" &&
-
-	git format-patch --stdout main >lorem-move.patch &&
-	git format-patch --no-prefix --stdout main >lorem-zero.patch &&
-
-	git checkout -b rename &&
-	git mv file renamed &&
-	git commit -m "renamed a file" &&
-
-	git format-patch -M --stdout lorem >rename.patch &&
-
-	git reset --soft lorem^ &&
-	git commit -m "renamed a file and added another" &&
-
-	git format-patch -M --stdout lorem^ >rename-add.patch &&
-
-	git checkout -b empty-commit &&
-	git commit -m "empty commit" --allow-empty &&
-
-	: >empty.patch &&
-	git format-patch --always --stdout empty-commit^ >empty-commit.patch &&
-
-	# reset time
-	sane_unset test_tick &&
-	test_tick
-
-[main (root-commit) 6b2d93f] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 88f8893] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 27dee8a] Test that git-am --scissors cuts at the scissors line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-HEAD is now at 88f8893 second
-[main 9f99c7e] This line should not be included in the commit message with --scissors enabled.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-HEAD is now at 88f8893 second
-[main 7179449] third
- Author: A U Thor <author@example.com>
- 1 file changed, 30 insertions(+), 2 deletions(-)
-Switched to a new branch 'lorem'
-[lorem 4670218] moved stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+), 8 deletions(-)
-[lorem 1048ce6] added another file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 another
-Switched to a new branch 'rename'
-[rename fc8826b] renamed a file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename file => renamed (100%)
-[rename 756adf8] renamed a file and added another
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 another
- rename file => renamed (100%)
-Switched to a new branch 'empty-commit'
-[empty-commit c6b90e6] empty commit
- Author: A U Thor <author@example.com>
-ok 2 - setup
-
-expecting success of 4150.3 'am applies patch correctly': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_tick &&
-	git am <patch1 &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
-
-HEAD is now at c6b90e6 empty commit
-Note: switching to 'first'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6b2d93f first
-Applying: second
-ok 3 - am applies patch correctly
-
-expecting success of 4150.4 'am fails if index is dirty': 
-	test_when_finished "rm -f dirtyfile" &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	echo dirtyfile >dirtyfile &&
-	git add dirtyfile &&
-	test_must_fail git am patch1 &&
-	test_path_is_dir .git/rebase-apply &&
-	test_cmp_rev first HEAD
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-fatal: Dirty index: cannot apply patches (dirty: dirtyfile)
-ok 4 - am fails if index is dirty
-
-expecting success of 4150.5 'am applies patch e-mail not in a mbox': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	git am patch1.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
-
-HEAD is now at 6b2d93f first
-HEAD is now at 6b2d93f first
-Applying: second
-ok 5 - am applies patch e-mail not in a mbox
-
-expecting success of 4150.6 'am applies patch e-mail not in a mbox with CRLF': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	git am patch1-crlf.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 6 - am applies patch e-mail not in a mbox with CRLF
-
-expecting success of 4150.7 'am applies patch e-mail with preceding whitespace': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	git am patch1-ws.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 7 - am applies patch e-mail with preceding whitespace
-
-expecting success of 4150.8 'am applies stgit patch': 
-	rm -fr .git/rebase-apply &&
-	git checkout -f first &&
-	git am patch1-stgit.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test_cmp_rev second HEAD &&
-	test_cmp_rev second^ HEAD^
-
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 8 - am applies stgit patch
-
-expecting success of 4150.9 'am --patch-format=stgit applies stgit patch': 
-	rm -fr .git/rebase-apply &&
-	git checkout -f first &&
-	git am --patch-format=stgit <patch1-stgit.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test_cmp_rev second HEAD &&
-	test_cmp_rev second^ HEAD^
-
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 9 - am --patch-format=stgit applies stgit patch
-
-expecting success of 4150.10 'am applies stgit series': 
-	rm -fr .git/rebase-apply &&
-	git checkout -f first &&
-	git am stgit-series/series &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test_cmp_rev second HEAD &&
-	test_cmp_rev second^ HEAD^
-
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 10 - am applies stgit series
-
-expecting success of 4150.11 'am applies hg patch': 
-	rm -fr .git/rebase-apply &&
-	git checkout -f first &&
-	git am patch1-hg.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test_cmp_rev second HEAD &&
-	test_cmp_rev second^ HEAD^
-
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 11 - am applies hg patch
-
-expecting success of 4150.12 'am --patch-format=hg applies hg patch': 
-	rm -fr .git/rebase-apply &&
-	git checkout -f first &&
-	git am --patch-format=hg <patch1-hg.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test_cmp_rev second HEAD &&
-	test_cmp_rev second^ HEAD^
-
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 12 - am --patch-format=hg applies hg patch
-
-expecting success of 4150.13 'am with applypatch-msg hook': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_hook applypatch-msg <<-\EOF &&
-	cat "$1" >actual-msg &&
-	echo hook-message >"$1"
-	EOF
-	git am patch1 &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	echo hook-message >expected &&
-	git log -1 --format=format:%B >actual &&
-	test_cmp expected actual &&
-	git log -1 --format=format:%B second >expected &&
-	test_cmp expected actual-msg
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: hook-message
-ok 13 - am with applypatch-msg hook
-
-expecting success of 4150.14 'am with failing applypatch-msg hook': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_hook applypatch-msg <<-\EOF &&
-	exit 1
-	EOF
-	test_must_fail git am patch1 &&
-	test_path_is_dir .git/rebase-apply &&
-	git diff --exit-code first &&
-	test_cmp_rev first HEAD
-
-HEAD is now at fa25691 hook-message
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  fa25691 hook-message
-
-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> fa25691
-
-HEAD is now at 6b2d93f first
-ok 14 - am with failing applypatch-msg hook
-
-expecting success of 4150.15 'am with failing applypatch-msg hook (no verify)': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_hook applypatch-msg <<-\EOF &&
-	echo hook-message >"$1"
-	exit 1
-	EOF
-	git am --no-verify patch1 &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	git log -1 --format=format:%B >actual &&
-	test_cmp msg actual
-
-HEAD is now at 6b2d93f first
-HEAD is now at 6b2d93f first
-Applying: second
-ok 15 - am with failing applypatch-msg hook (no verify)
-
-expecting success of 4150.16 'am with pre-applypatch hook': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_hook pre-applypatch <<-\EOF &&
-	git diff first >diff.actual
-	exit 0
-	EOF
-	git am patch1 &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test_cmp_rev second HEAD &&
-	git diff first..second >diff.expected &&
-	test_cmp diff.expected diff.actual
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 16 - am with pre-applypatch hook
-
-expecting success of 4150.17 'am with failing pre-applypatch hook': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_hook pre-applypatch <<-\EOF &&
-	exit 1
-	EOF
-	test_must_fail git am patch1 &&
-	test_path_is_dir .git/rebase-apply &&
-	git diff --exit-code second &&
-	test_cmp_rev first HEAD
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 17 - am with failing pre-applypatch hook
-
-expecting success of 4150.18 'am with failing pre-applypatch hook (no verify)': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	touch empty-file &&
-	test_hook pre-applypatch <<-\EOF &&
-	rm empty-file
-	exit 1
-	EOF
-	git am --no-verify patch1 &&
-	test_path_is_missing .git/rebase-apply &&
-	test_path_is_file empty-file &&
-	git diff --exit-code second &&
-	git log -1 --format=format:%B >actual &&
-	test_cmp msg actual
-
-HEAD is now at 6b2d93f first
-HEAD is now at 6b2d93f first
-Applying: second
-ok 18 - am with failing pre-applypatch hook (no verify)
-
-expecting success of 4150.19 'am with post-applypatch hook': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_hook post-applypatch <<-\EOF &&
-	git rev-parse HEAD >head.actual
-	git diff second >diff.actual
-	exit 0
-	EOF
-	git am patch1 &&
-	test_path_is_missing .git/rebase-apply &&
-	test_cmp_rev second HEAD &&
-	git rev-parse second >head.expected &&
-	test_cmp head.expected head.actual &&
-	git diff second >diff.expected &&
-	test_cmp diff.expected diff.actual
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 19 - am with post-applypatch hook
-
-expecting success of 4150.20 'am with failing post-applypatch hook': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_hook post-applypatch <<-\EOF &&
-	git rev-parse HEAD >head.actual
-	exit 1
-	EOF
-	git am patch1 &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code second &&
-	test_cmp_rev second HEAD &&
-	git rev-parse second >head.expected &&
-	test_cmp head.expected head.actual
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 20 - am with failing post-applypatch hook
-
-expecting success of 4150.21 'am --scissors cuts the message at the scissors line': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout second &&
-	git am --scissors patch-with-scissors-line.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code expected-for-scissors &&
-	test_cmp_rev expected-for-scissors HEAD
-
-HEAD is now at 88f8893 second
-HEAD is now at 88f8893 second
-Applying: Test that git-am --scissors cuts at the scissors line
-ok 21 - am --scissors cuts the message at the scissors line
-
-expecting success of 4150.22 'am --no-scissors overrides mailinfo.scissors': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout second &&
-	test_config mailinfo.scissors true &&
-	git am --no-scissors patch-with-scissors-line.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code expected-for-no-scissors &&
-	test_cmp_rev expected-for-no-scissors HEAD
-
-HEAD is now at 27dee8a Test that git-am --scissors cuts at the scissors line
-Previous HEAD position was 27dee8a Test that git-am --scissors cuts at the scissors line
-HEAD is now at 88f8893 second
-Applying: This line should not be included in the commit message with --scissors enabled.
-ok 22 - am --no-scissors overrides mailinfo.scissors
-
-expecting success of 4150.23 'setup: new author and committer': 
-	GIT_AUTHOR_NAME="Another Thor" &&
-	GIT_AUTHOR_EMAIL="a.thor@example.com" &&
-	GIT_COMMITTER_NAME="Co M Miter" &&
-	GIT_COMMITTER_EMAIL="c.miter@example.com" &&
-	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
-
-ok 23 - setup: new author and committer
-
-expecting success of 4150.24 'am changes committer and keeps author': 
-	test_tick &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	git am patch2 &&
-	test_path_is_missing .git/rebase-apply &&
-	test "$(git rev-parse main^^)" = "$(git rev-parse HEAD^^)" &&
-	git diff --exit-code main..HEAD &&
-	git diff --exit-code main^..HEAD^ &&
-	compare author main HEAD &&
-	compare author main^ HEAD^ &&
-	test "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" = \
-	     "$(git log -1 --pretty=format:"%cn <%ce>" HEAD)"
-
-HEAD is now at 9f99c7e This line should not be included in the commit message with --scissors enabled.
-Previous HEAD position was 9f99c7e This line should not be included in the commit message with --scissors enabled.
-HEAD is now at 6b2d93f first
-Applying: second
-Applying: third
-ok 24 - am changes committer and keeps author
-
-expecting success of 4150.25 'am --signoff adds Signed-off-by: line': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout -b topic_2 first &&
-	git am --signoff <patch2 &&
-	{
-		printf "third\n\nSigned-off-by: %s <%s>\n\n" \
-			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" &&
-		cat msg &&
-		printf "Signed-off-by: %s <%s>\n\n" \
-			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL"
-	} >expected-log &&
-	git log --pretty=%B -2 HEAD >actual &&
-	test_cmp expected-log actual
-
-HEAD is now at ae63ba7 third
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  ae63ba7 third
-  480301e second
-
-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> ae63ba7
-
-Switched to a new branch 'topic_2'
-Applying: second
-Applying: third
-ok 25 - am --signoff adds Signed-off-by: line
-
-expecting success of 4150.26 'am stays in branch': 
-	echo refs/heads/topic_2 >expected &&
-	git symbolic-ref HEAD >actual &&
-	test_cmp expected actual
-
-ok 26 - am stays in branch
-
-expecting success of 4150.27 'am --signoff does not add Signed-off-by: line if already there': 
-	git format-patch --stdout first >patch3 &&
-	git reset --hard first &&
-	git am --signoff <patch3 &&
-	git log --pretty=%B -2 HEAD >actual &&
-	test_cmp expected-log actual
-
-HEAD is now at 6b2d93f first
-Applying: second
-Applying: third
-ok 27 - am --signoff does not add Signed-off-by: line if already there
-
-expecting success of 4150.28 'am --signoff adds Signed-off-by: if another author is preset': 
-	NAME="A N Other" &&
-	EMAIL="a.n.other@example.com" &&
-	{
-		printf "third\n\nSigned-off-by: %s <%s>\nSigned-off-by: %s <%s>\n\n" \
-			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" \
-			"$NAME" "$EMAIL" &&
-		cat msg &&
-		printf "Signed-off-by: %s <%s>\nSigned-off-by: %s <%s>\n\n" \
-			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" \
-			"$NAME" "$EMAIL"
-	} >expected-log &&
-	git reset --hard first &&
-	GIT_COMMITTER_NAME="$NAME" GIT_COMMITTER_EMAIL="$EMAIL" \
-		git am --signoff <patch3 &&
-	git log --pretty=%B -2 HEAD >actual &&
-	test_cmp expected-log actual
-
-HEAD is now at 6b2d93f first
-Applying: second
-Applying: third
-ok 28 - am --signoff adds Signed-off-by: if another author is preset
-
-expecting success of 4150.29 'am --signoff duplicates Signed-off-by: if it is not the last one': 
-	NAME="A N Other" &&
-	EMAIL="a.n.other@example.com" &&
-	{
-		printf "third\n\nSigned-off-by: %s <%s>\n\
-Signed-off-by: %s <%s>\nSigned-off-by: %s <%s>\n\n" \
-			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" \
-			"$NAME" "$EMAIL" \
-			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" &&
-		cat msg &&
-		printf "Signed-off-by: %s <%s>\nSigned-off-by: %s <%s>\n\
-Signed-off-by: %s <%s>\n\n" \
-			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL" \
-			"$NAME" "$EMAIL" \
-			"$GIT_COMMITTER_NAME" "$GIT_COMMITTER_EMAIL"
-	} >expected-log &&
-	git format-patch --stdout first >patch3 &&
-	git reset --hard first &&
-	git am --signoff <patch3 &&
-	git log --pretty=%B -2 HEAD >actual &&
-	test_cmp expected-log actual
-
-HEAD is now at 6b2d93f first
-Applying: second
-Applying: third
-ok 29 - am --signoff duplicates Signed-off-by: if it is not the last one
-
-expecting success of 4150.30 'am without --keep removes Re: and [PATCH] stuff': 
-	git format-patch --stdout HEAD^ >tmp &&
-	sed -e "/^Subject/ s,\[PATCH,Re: Re: Re: & 1/5 v2] [foo," tmp >patch4 &&
-	git reset --hard HEAD^ &&
-	git am <patch4 &&
-	git rev-parse HEAD >expected &&
-	git rev-parse topic_2 >actual &&
-	test_cmp expected actual
-
-HEAD is now at b55fe7d second
-Applying: third
-ok 30 - am without --keep removes Re: and [PATCH] stuff
-
-expecting success of 4150.31 'am --keep really keeps the subject': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout HEAD^ &&
-	git am --keep patch4 &&
-	test_path_is_missing .git/rebase-apply &&
-	git cat-file commit HEAD >actual &&
-	grep "Re: Re: Re: \[PATCH 1/5 v2\] \[foo\] third" actual
-
-HEAD is now at e3375b9 third
-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 b55fe7d second
-Applying: Re: Re: Re: [PATCH 1/5 v2] [foo] third
-Re: Re: Re: [PATCH 1/5 v2] [foo] third
-ok 31 - am --keep really keeps the subject
-
-expecting success of 4150.32 'am --keep-non-patch really keeps the non-patch part': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout HEAD^ &&
-	git am --keep-non-patch patch4 &&
-	test_path_is_missing .git/rebase-apply &&
-	git cat-file commit HEAD >actual &&
-	grep "^\[foo\] third" actual
-
-HEAD is now at f45669a Re: Re: Re: [PATCH 1/5 v2] [foo] third
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  f45669a Re: Re: Re: [PATCH 1/5 v2] [foo] third
-
-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> f45669a
-
-HEAD is now at b55fe7d second
-Applying: [foo] third
-[foo] third
-ok 32 - am --keep-non-patch really keeps the non-patch part
-
-expecting success of 4150.33 'setup am -3': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout -b base3way topic_2 &&
-	sed -n -e "3,\$p" msg >file &&
-	head -n 9 msg >>file &&
-	git add file &&
-	test_tick &&
-	git commit -m "copied stuff"
-
-HEAD is now at 44e89ee [foo] third
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  44e89ee [foo] third
-
-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> 44e89ee
-
-Switched to a new branch 'base3way'
-[base3way 899ba97] copied stuff
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 9 insertions(+)
-ok 33 - setup am -3
-
-expecting success of 4150.34 'am -3 falls back to 3-way merge': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout -b lorem2 base3way &&
-	git am -3 lorem-move.patch &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code lorem
-
-HEAD is now at 899ba97 copied stuff
-Switched to a new branch 'lorem2'
-Applying: moved stuff
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-899ba97 copied stuff
-virtual moved stuff
-found 1 common ancestor:
-virtual f192f7dcb36af1757e1a66463400563fdcef521e
-Auto-merging file
-Applying: added another file
-ok 34 - am -3 falls back to 3-way merge
-
-expecting success of 4150.35 'am -3 -p0 can read --no-prefix patch': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout -b lorem3 base3way &&
-	git am -3 -p0 lorem-zero.patch &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code lorem
-
-HEAD is now at be86ef0 added another file
-Switched to a new branch 'lorem3'
-Applying: moved stuff
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-899ba97 copied stuff
-virtual moved stuff
-found 1 common ancestor:
-virtual f192f7dcb36af1757e1a66463400563fdcef521e
-Auto-merging file
-Applying: added another file
-ok 35 - am -3 -p0 can read --no-prefix patch
-
-expecting success of 4150.36 'am with config am.threeWay falls back to 3-way merge': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout -b lorem4 base3way &&
-	test_config am.threeWay 1 &&
-	git am lorem-move.patch &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code lorem
-
-HEAD is now at be86ef0 added another file
-Switched to a new branch 'lorem4'
-Applying: moved stuff
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-899ba97 copied stuff
-virtual moved stuff
-found 1 common ancestor:
-virtual f192f7dcb36af1757e1a66463400563fdcef521e
-Auto-merging file
-Applying: added another file
-ok 36 - am with config am.threeWay falls back to 3-way merge
-
-expecting success of 4150.37 'am with config am.threeWay overridden by --no-3way': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout -b lorem5 base3way &&
-	test_config am.threeWay 1 &&
-	test_must_fail git am --no-3way lorem-move.patch &&
-	test_path_is_dir .git/rebase-apply
-
-HEAD is now at be86ef0 added another file
-Switched to a new branch 'lorem5'
-error: patch failed: file:28
-error: file: 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 advice.mergeConflict false"
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-ok 37 - am with config am.threeWay overridden by --no-3way
-
-expecting success of 4150.38 'am can rename a file': 
-	grep "^rename from" rename.patch &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout lorem^0 &&
-	git am rename.patch &&
-	test_path_is_missing .git/rebase-apply &&
-	git update-index --refresh &&
-	git diff --exit-code rename
-
-rename from file
-HEAD is now at 899ba97 copied stuff
-Note: switching to 'lorem^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 1048ce6 added another file
-Applying: renamed a file
-ok 38 - am can rename a file
-
-expecting success of 4150.39 'am -3 can rename a file': 
-	grep "^rename from" rename.patch &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout lorem^0 &&
-	git am -3 rename.patch &&
-	test_path_is_missing .git/rebase-apply &&
-	git update-index --refresh &&
-	git diff --exit-code rename
-
-rename from file
-HEAD is now at 366127b renamed a file
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  366127b renamed a file
-
-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> 366127b
-
-HEAD is now at 1048ce6 added another file
-Applying: renamed a file
-ok 39 - am -3 can rename a file
-
-expecting success of 4150.40 'am -3 can rename a file after falling back to 3-way merge': 
-	grep "^rename from" rename-add.patch &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout lorem^0 &&
-	git am -3 rename-add.patch &&
-	test_path_is_missing .git/rebase-apply &&
-	git update-index --refresh &&
-	git diff --exit-code rename
-
-rename from file
-HEAD is now at 366127b renamed a file
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  366127b renamed a file
-
-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> 366127b
-
-HEAD is now at 1048ce6 added another file
-Applying: renamed a file and added another
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-1048ce6 added another file
-virtual renamed a file and added another
-found 1 common ancestor:
-virtual d0e8bd27a52a44dc341376225b2fa62e456df51e
-ok 40 - am -3 can rename a file after falling back to 3-way merge
-
-expecting success of 4150.41 'am -3 -q is quiet': 
-	rm -fr .git/rebase-apply &&
-	git checkout -f lorem2 &&
-	git reset base3way --hard &&
-	git am -3 -q lorem-move.patch >output.out 2>&1 &&
-	test_must_be_empty output.out
-
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  732bd79 renamed a file and added another
-
-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> 732bd79
-
-Switched to branch 'lorem2'
-HEAD is now at 899ba97 copied stuff
-ok 41 - am -3 -q is quiet
-
-expecting success of 4150.42 'am pauses on conflict': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout lorem2^^ &&
-	test_must_fail git am lorem-move.patch &&
-	test -d .git/rebase-apply
-
-HEAD is now at be86ef0 added another file
-Note: switching to 'lorem2^^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 899ba97 copied stuff
-error: patch failed: file:28
-error: file: 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 advice.mergeConflict false"
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-ok 42 - am pauses on conflict
-
-expecting success of 4150.43 'am --show-current-patch': 
-	git am --show-current-patch >actual.patch &&
-	test_cmp .git/rebase-apply/0001 actual.patch
-
-ok 43 - am --show-current-patch
-
-expecting success of 4150.44 'am --show-current-patch=raw': 
-	git am --show-current-patch=raw >actual.patch &&
-	test_cmp .git/rebase-apply/0001 actual.patch
-
-ok 44 - am --show-current-patch=raw
-
-expecting success of 4150.45 'am --show-current-patch=diff': 
-	git am --show-current-patch=diff >actual.patch &&
-	test_cmp .git/rebase-apply/patch actual.patch
-
-ok 45 - am --show-current-patch=diff
-
-expecting success of 4150.46 'am accepts repeated --show-current-patch': 
-	git am --show-current-patch --show-current-patch=raw >actual.patch &&
-	test_cmp .git/rebase-apply/0001 actual.patch
-
-ok 46 - am accepts repeated --show-current-patch
-
-expecting success of 4150.47 'am detects incompatible --show-current-patch': 
-	test_must_fail git am --show-current-patch=raw --show-current-patch=diff &&
-	test_must_fail git am --show-current-patch --show-current-patch=diff
-
-error: options '--show-current-patch=diff' and '--show-current-patch=raw' cannot be used together
-error: options '--show-current-patch=diff' and '--show-current-patch' cannot be used together
-ok 47 - am detects incompatible --show-current-patch
-
-expecting success of 4150.48 'am --skip works': 
-	echo goodbye >expected &&
-	git am --skip &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code lorem2^^ -- file &&
-	test_cmp expected another
-
-Applying: added another file
-ok 48 - am --skip works
-
-expecting success of 4150.49 'am --abort removes a stray directory': 
-	mkdir .git/rebase-apply &&
-	git am --abort &&
-	test_path_is_missing .git/rebase-apply
-
-ok 49 - am --abort removes a stray directory
-
-expecting success of 4150.50 'am refuses patches when paused': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout lorem2^^ &&
-
-	test_must_fail git am lorem-move.patch &&
-	test_path_is_dir .git/rebase-apply &&
-	test_cmp_rev lorem2^^ HEAD &&
-
-	test_must_fail git am <lorem-move.patch &&
-	test_path_is_dir .git/rebase-apply &&
-	test_cmp_rev lorem2^^ HEAD
-
-HEAD is now at e608aee added another file
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  e608aee added another file
-
-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> e608aee
-
-HEAD is now at 899ba97 copied stuff
-error: patch failed: file:28
-error: file: 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 advice.mergeConflict false"
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-fatal: previous rebase directory .git/rebase-apply still exists but mbox given.
-ok 50 - am refuses patches when paused
-
-expecting success of 4150.51 'am --resolved works': 
-	echo goodbye >expected &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout lorem2^^ &&
-	test_must_fail git am lorem-move.patch &&
-	test -d .git/rebase-apply &&
-	echo resolved >>file &&
-	git add file &&
-	git am --resolved &&
-	test_path_is_missing .git/rebase-apply &&
-	test_cmp expected another
-
-HEAD is now at 899ba97 copied stuff
-HEAD is now at 899ba97 copied stuff
-error: patch failed: file:28
-error: file: 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 advice.mergeConflict false"
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-Applying: moved stuff
-Applying: added another file
-ok 51 - am --resolved works
-
-expecting success of 4150.52 'am --resolved fails if index has no changes': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout lorem2^^ &&
-	test_must_fail git am lorem-move.patch &&
-	test_path_is_dir .git/rebase-apply &&
-	test_cmp_rev lorem2^^ HEAD &&
-	test_must_fail git am --resolved &&
-	test_path_is_dir .git/rebase-apply &&
-	test_cmp_rev lorem2^^ HEAD
-
-HEAD is now at 25c657e added another file
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
-
-  25c657e added another file
-  d8fd27b moved stuff
-
-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> 25c657e
-
-HEAD is now at 899ba97 copied stuff
-error: patch failed: file:28
-error: file: 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 advice.mergeConflict false"
-Applying: moved stuff
-Patch failed at 0001 moved stuff
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Applying: moved stuff
-No changes - did you forget to use 'git add'?
-If there is nothing left to stage, chances are that something else
-already introduced the same changes; you might want to skip this patch.
-ok 52 - am --resolved fails if index has no changes
-
-expecting success of 4150.53 'am --resolved fails if index has unmerged entries': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout second &&
-	test_must_fail git am -3 lorem-move.patch &&
-	test_path_is_dir .git/rebase-apply &&
-	test_cmp_rev second HEAD &&
-	test_must_fail git am --resolved >err &&
-	test_path_is_dir .git/rebase-apply &&
-	test_cmp_rev second HEAD &&
-	test_grep "still have unmerged paths" err
-
-HEAD is now at 899ba97 copied stuff
-Previous HEAD position was 899ba97 copied stuff
-HEAD is now at 88f8893 second
-Applying: moved stuff
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-88f8893 second
-virtual moved stuff
-found 1 common ancestor:
-virtual f192f7dcb36af1757e1a66463400563fdcef521e
-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: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 moved stuff
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-You still have unmerged paths in your index.
-ok 53 - am --resolved fails if index has unmerged entries
-
-expecting success of 4150.54 'am takes patches from a Pine mailbox': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	cat pine patch1 | git am &&
-	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code main^..HEAD
-
-HEAD is now at 88f8893 second
-Previous HEAD position was 88f8893 second
-HEAD is now at 6b2d93f first
-Applying: second
-ok 54 - am takes patches from a Pine mailbox
-
-expecting success of 4150.55 'am fails on mail without patch': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	test_must_fail git am <failmail &&
-	git am --abort &&
-	test_path_is_missing .git/rebase-apply
-
-HEAD is now at 7ce6dd8 second
-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 advice.mergeConflict false"
-Patch is empty.
-ok 55 - am fails on mail without patch
-
-expecting success of 4150.56 'am fails on empty patch': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	echo "---" >>failmail &&
-	test_must_fail git am <failmail &&
-	git am --skip &&
-	test_path_is_missing .git/rebase-apply
-
-HEAD is now at 7ce6dd8 second
-error: No valid patches in input (allow with "--allow-empty")
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Applying: git-foo.sh
-Patch failed at 0001 git-foo.sh
-ok 56 - am fails on empty patch
++/* incomplete lines are bad! */
 
-expecting success of 4150.57 'am works from stdin in subdirectory': 
-	rm -fr subdir &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	(
-		mkdir -p subdir &&
-		cd subdir &&
-		git am <../patch1
-	) &&
-	git diff --exit-code second
+commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
 
-HEAD is now at 7ce6dd8 second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+    change to an incomplete line at end
 
-  7ce6dd8 second
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,22 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
 
- git branch <new-branch-name> 7ce6dd8
+    change at very beginning
 
-HEAD is now at 6b2d93f first
-Applying: second
-ok 57 - am works from stdin in subdirectory
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,22 @@
++#include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
 
-expecting success of 4150.58 'am works from file (relative path given) in subdirectory': 
-	rm -fr subdir &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	(
-		mkdir -p subdir &&
-		cd subdir &&
-		git am ../patch1
-	) &&
-	git diff --exit-code second
+commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
 
-HEAD is now at 7ce6dd8 second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+    touch comment
 
-  7ce6dd8 second
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
 
- git branch <new-branch-name> 7ce6dd8
+    touch both functions
 
-HEAD is now at 6b2d93f first
-Applying: second
-ok 58 - am works from file (relative path given) in subdirectory
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
 
-expecting success of 4150.59 'am works from file (absolute path given) in subdirectory': 
-	rm -fr subdir &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	P=$(pwd) &&
-	(
-		mkdir -p subdir &&
-		cd subdir &&
-		git am "$P/patch1"
-	) &&
-	git diff --exit-code second
+commit f04fb20f2c77850996cba739709acc6faecc58f7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
 
-HEAD is now at 7ce6dd8 second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+    change f()
 
-  7ce6dd8 second
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,20 +1,21 @@
+ #include <stdio.h>
+ 
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
 
- git branch <new-branch-name> 7ce6dd8
+    initial
 
-HEAD is now at 6b2d93f first
-Applying: second
-ok 59 - am works from file (absolute path given) in subdirectory
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
+ok 32 - -L ,Y (Y == nlines)
 
-expecting success of 4150.60 'am --committer-date-is-author-date': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_tick &&
-	git am --committer-date-is-author-date patch1 &&
-	git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
-	sed -ne "/^author /s/.*> //p" head1 >at &&
-	sed -ne "/^committer /s/.*> //p" head1 >ct &&
-	test_cmp at ct
+expecting success of 4211.33 '-L ,Y (Y == nlines + 1)': 
+	n=$(expr $(wc -l <b.c) + 1) &&
+	git log -L ,$n:b.c
 
-HEAD is now at 7ce6dd8 second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:50:24 2013 +0100
 
-  7ce6dd8 second
+    move within the file
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,26 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+-long f(long x)
+-{
+-	int s = 0;
+-	while (x) {
+-		x /= 2;
+-		s++;
+-	}
+-	return s;
+-}
++long f(long x);
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
++
++long f(long x)
++{
++	int s = 0;
++	while (x) {
++		x /= 2;
++		s++;
++	}
++	return s;
++}
 
- git branch <new-branch-name> 7ce6dd8
+commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:49:50 2013 +0100
 
-HEAD is now at 6b2d93f first
-Applying: second
-ok 60 - am --committer-date-is-author-date
+    another simple change
 
-expecting success of 4150.61 'am without --committer-date-is-author-date': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_tick &&
-	git am patch1 &&
-	git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
-	sed -ne "/^author /s/.*> //p" head1 >at &&
-	sed -ne "/^committer /s/.*> //p" head1 >ct &&
-	! test_cmp at ct
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+-		x >>= 1;
++		x /= 2;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
 
-HEAD is now at 5709bd2 second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
 
-  5709bd2 second
+    change back to complete line
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
 
- git branch <new-branch-name> 5709bd2
+commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
 
-HEAD is now at 6b2d93f first
-Applying: second
---- at	2025-12-18 01:35:51.754773267 +0000
-+++ ct	2025-12-18 01:35:51.754773267 +0000
-@@ -1 +1 @@
--1112912053 -0700
-+1112912293 -0700
-ok 61 - am without --committer-date-is-author-date
+    change to an incomplete line at end
 
-expecting success of 4150.62 'am --ignore-date': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_tick &&
-	git am --ignore-date patch1 &&
-	git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
-	sed -ne "/^author /s/.*> //p" head1 >at &&
-	grep "+0000" at
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,22 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
 
-HEAD is now at 9fa39e1 second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
 
-  9fa39e1 second
+    change at very beginning
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,22 @@
++#include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
 
- git branch <new-branch-name> 9fa39e1
+commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
 
-HEAD is now at 6b2d93f first
-Applying: second
-1766021751 +0000
-ok 62 - am --ignore-date
+    touch comment
 
-expecting success of 4150.63 'am into an unborn branch': 
-	git rev-parse first^{tree} >expected &&
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	rm -fr subdir &&
-	mkdir subdir &&
-	git format-patch --numbered-files -o subdir -1 first &&
-	(
-		cd subdir &&
-		git init &&
-		git am 1
-	) &&
-	(
-		cd subdir &&
-		git rev-parse HEAD^{tree} >../actual
-	) &&
-	test_cmp expected actual
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
 
-HEAD is now at 6ed281e second
-subdir/1
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4150-am/subdir/.git/
-applying to an empty history
-Applying: first
-ok 63 - am into an unborn branch
+commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
 
-expecting success of 4150.64 'am newline in subject': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_tick &&
-	sed -e "s/second/second \\\n foo/" patch1 >patchnl &&
-	git am <patchnl >output.out 2>&1 &&
-	test_grep "^Applying: second \\\n foo$" output.out
+    touch both functions
 
-HEAD is now at 6ed281e second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
 
-  6ed281e second
+commit f04fb20f2c77850996cba739709acc6faecc58f7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+    change f()
 
- git branch <new-branch-name> 6ed281e
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,20 +1,21 @@
+ #include <stdio.h>
+ 
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
 
-HEAD is now at 6b2d93f first
-Applying: second \n foo
-ok 64 - am newline in subject
+commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
 
-expecting success of 4150.65 'am -q is quiet': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout first &&
-	test_tick &&
-	git am -q <patch1 >output.out 2>&1 &&
-	test_must_be_empty output.out
+    initial
 
-HEAD is now at bee6b96 second \n foo
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
+ok 33 - -L ,Y (Y == nlines + 1)
 
-  bee6b96 second \n foo
+expecting success of 4211.34 '-L ,Y (Y == nlines + 2)': 
+	n=$(expr $(wc -l <b.c) + 2) &&
+	git log -L ,$n:b.c
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+commit 0d8dcfc6b968e06a27d5215bad1fdde3de9d6235
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:50:24 2013 +0100
 
- git branch <new-branch-name> bee6b96
+    move within the file
 
-HEAD is now at 6b2d93f first
-ok 65 - am -q is quiet
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,26 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+-long f(long x)
+-{
+-	int s = 0;
+-	while (x) {
+-		x /= 2;
+-		s++;
+-	}
+-	return s;
+-}
++long f(long x);
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
++
++long f(long x)
++{
++	int s = 0;
++	while (x) {
++		x /= 2;
++		s++;
++	}
++	return s;
++}
 
-expecting success of 4150.66 'am empty-file does not infloop': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	touch empty-file &&
-	test_tick &&
-	test_must_fail git am empty-file 2>actual &&
-	echo Patch format detection failed. >expected &&
-	test_cmp expected actual
+commit 6ce3c4ff690136099bb17e1a8766b75764726ea7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:49:50 2013 +0100
 
-HEAD is now at 0b3df7d second
-ok 66 - am empty-file does not infloop
+    another simple change
 
-expecting success of 4150.67 'am --message-id really adds the message id': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout HEAD^ &&
-	git am --message-id patch1.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git cat-file commit HEAD | tail -n1 >actual &&
-	grep Message-ID patch1.eml >expected &&
-	test_cmp expected actual
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -1,24 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+-		x >>= 1;
++		x /= 2;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+ 
+ /* incomplete lines are bad! */
 
-HEAD is now at 0b3df7d second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+commit 4659538844daa2849b1a9e7d6fadb96fcd26fc83
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
 
-  0b3df7d second
+    change back to complete line
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,24 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
 
- git branch <new-branch-name> 0b3df7d
+commit 100b61a6f2f720f812620a9d10afb3a960ccb73c
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
 
-HEAD is now at 6b2d93f first
-Applying: second
-ok 67 - am --message-id really adds the message id
+    change to an incomplete line at end
 
-expecting success of 4150.68 'am.messageid really adds the message id': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout HEAD^ &&
-	test_config am.messageid true &&
-	git am patch1.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git cat-file commit HEAD | tail -n1 >actual &&
-	grep Message-ID patch1.eml >expected &&
-	test_cmp expected actual
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,22 +1,22 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
 
-HEAD is now at 560abfc second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
 
-  560abfc second
+    change at very beginning
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,22 @@
++#include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
 
- git branch <new-branch-name> 560abfc
+commit 39b6eb2d5b706d3322184a169f666f25ed3fbd00
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
 
-HEAD is now at 6b2d93f first
-Applying: second
-ok 68 - am.messageid really adds the message id
+    touch comment
 
-expecting success of 4150.69 'am --message-id -s signs off after the message id': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	git checkout HEAD^ &&
-	git am -s --message-id patch1.eml &&
-	test_path_is_missing .git/rebase-apply &&
-	git cat-file commit HEAD | tail -n2 | head -n1 >actual &&
-	grep Message-ID patch1.eml >expected &&
-	test_cmp expected actual
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
 
-HEAD is now at 560abfc second
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
 
-  560abfc second
+    touch both functions
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,21 +1,21 @@
+ #include <stdio.h>
+ 
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
 
- git branch <new-branch-name> 560abfc
+commit f04fb20f2c77850996cba739709acc6faecc58f7
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
 
-HEAD is now at 6b2d93f first
-Applying: second
-ok 69 - am --message-id -s signs off after the message id
+    change f()
 
-expecting success of 4150.70 'am -3 works with rerere': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,20 +1,21 @@
+ #include <stdio.h>
+ 
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
 
-	# make patches one->two and two->three...
-	test_commit one file &&
-	test_commit two file &&
-	test_commit three file &&
-	git format-patch -2 --stdout >seq.patch &&
+commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
 
-	# and create a situation that conflicts...
-	git reset --hard one &&
-	test_commit other file &&
+    initial
 
-	# enable rerere...
-	test_config rerere.enabled true &&
-	test_when_finished "rm -rf .git/rr-cache" &&
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
+ok 34 - -L ,Y (Y == nlines + 2)
 
-	# ...and apply. Our resolution is to skip the first
-	# patch, and the rerere the second one.
-	test_must_fail git am -3 seq.patch &&
-	test_must_fail git am --skip &&
-	echo resolved >file &&
-	git add file &&
-	git am --resolved &&
+expecting success of 4211.35 '-L with --first-parent and a merge': 
+	git checkout parallel-change &&
+	git log --first-parent -L 1,1:b.c
 
-	# now apply again, and confirm that rerere engaged (we still
-	# expect failure from am because rerere does not auto-commit
-	# for us).
-	git reset --hard other &&
-	test_must_fail git am -3 seq.patch &&
-	test_must_fail git am --skip &&
-	echo resolved >expect &&
-	test_cmp expect file
+Switched to branch 'parallel-change'
+commit 4a23ae5c98d59a58c6da036156959f2dc9f472ad
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
 
-HEAD is now at 7f081b2 second
-[detached HEAD 377a3f5] one
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 2 deletions(-)
-[detached HEAD 2231600] two
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD e5ab1df] three
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 377a3f5 one
-[detached HEAD 67f3de4] other
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Applying: two
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-67f3de4 other
-virtual two
-found 1 common ancestor:
-virtual 693a3de402bb23897ed5c931273e53c78eff0495
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Recorded preimage for 'file'
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 two
-Applying: three
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-67f3de4 other
-virtual three
-found 1 common ancestor:
-virtual aad8d5cef3915ab78b3227abaaac99b62db9eb54
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Recorded preimage for 'file'
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0002 three
-Recorded resolution for 'file'.
-Applying: three
-HEAD is now at 67f3de4 other
-Applying: two
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-67f3de4 other
-virtual two
-found 1 common ancestor:
-virtual 693a3de402bb23897ed5c931273e53c78eff0495
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Recorded preimage for 'file'
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 two
-Applying: three
-Using index info to reconstruct a base tree...
-M	file
-Falling back to patching base and 3-way merge...
-Merging:
-67f3de4 other
-virtual three
-found 1 common ancestor:
-virtual aad8d5cef3915ab78b3227abaaac99b62db9eb54
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Resolved 'file' using previous resolution.
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0002 three
-ok 70 - am -3 works with rerere
+    change at very beginning
 
-expecting success of 4150.71 'am -s unexpected trailer block': 
-	rm -fr .git/rebase-apply &&
-	git reset --hard &&
-	echo signed >file &&
-	git add file &&
-	cat >msg <<-EOF &&
-	subject here
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -0,0 +1,1 @@
++#include <unistd.h>
+ok 35 - -L with --first-parent and a merge
 
-	Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>
-	[jc: tweaked log message]
-	Signed-off-by: J C H <j@c.h>
-	EOF
-	git commit -F msg &&
-	git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
-	git format-patch --stdout -1 >patch &&
+expecting success of 4211.36 '-L with --output': 
+	git checkout parallel-change &&
+	git log --output=log -L :main:b.c >output &&
+	test_must_be_empty output &&
+	test_line_count = 70 log
 
-	git reset --hard HEAD^ &&
-	git am -s patch &&
-	(
-		cat original &&
-		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
-	) >expect &&
-	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
-	test_cmp expect actual &&
+Already on 'parallel-change'
+ok 36 - -L with --output
 
-	cat >msg <<-\EOF &&
-	subject here
+expecting success of 4211.37 'range_set_union': 
+	test_seq 500 > c.c &&
+	git add c.c &&
+	git commit -m "many lines" &&
+	test_seq 1000 > c.c &&
+	git add c.c &&
+	git commit -m "modify many lines" &&
+	git log $(for x in $(test_seq 200); do echo -L $((2*x)),+1:c.c || return 1; done)
 
-	We make sure that there is a blank line between the log
-	message proper and Signed-off-by: line added.
-	EOF
-	git reset HEAD^ &&
-	git commit -F msg file &&
-	git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
-	git format-patch --stdout -1 >patch &&
+[parallel-change d6e4eb5] many lines
+ Author: A U Thor <author@example.com>
+ 1 file changed, 500 insertions(+)
+ create mode 100644 c.c
+[parallel-change 23d0144] modify many lines
+ Author: A U Thor <author@example.com>
+ 1 file changed, 500 insertions(+)
+commit d6e4eb5bea25e60e2079aaeae319e9fff12659aa
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
 
-	git reset --hard HEAD^ &&
-	git am -s patch &&
+    many lines
 
-	(
-		cat original &&
-		echo &&
-		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
-	) >expect &&
-	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+diff --git a/c.c b/c.c
+--- /dev/null
++++ b/c.c
+@@ -0,0 +2,1 @@
++2
+ok 37 - range_set_union
+
+expecting success of 4211.38 '-s shows only line-log commits': 
+	git log --format="commit %s" -L1,24:b.c >expect.raw &&
+	grep ^commit expect.raw >expect &&
+	git log --format="commit %s" -L1,24:b.c -s >actual &&
 	test_cmp expect actual
 
-HEAD is now at 67f3de4 other
-[detached HEAD c30e654] subject here
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 67f3de4 other
-Applying: subject here
-Unstaged changes after reset:
-M	file
-[detached HEAD 40f0ff1] subject here
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 67f3de4 other
-Applying: subject here
-ok 71 - am -s unexpected trailer block
+ok 38 - -s shows only line-log commits
 
-expecting success of 4150.72 'am --patch-format=mboxrd handles mboxrd': 
-	rm -fr .git/rebase-apply &&
-	git checkout -f first &&
-	echo mboxrd >>file &&
-	git add file &&
-	cat >msg <<-\INPUT_END &&
-	mboxrd should escape the body
+expecting success of 4211.39 '-p shows the default patch output': 
+	git log -L1,24:b.c >expect &&
+	git log -L1,24:b.c -p >actual &&
+	test_cmp expect actual
 
-	From could trip up a loose mbox parser
-	>From extra escape for reversibility
-	INPUT_END
-	git commit -F msg &&
-	git -c format.mboxrd format-patch --stdout -1 >mboxrd1 &&
-	grep "^>From could trip up a loose mbox parser" mboxrd1 &&
-	git checkout -f first &&
-	git am --patch-format=mboxrd mboxrd1 &&
-	git cat-file commit HEAD | tail -n4 >out &&
-	test_cmp msg out
+ok 39 - -p shows the default patch output
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 4211.40 '--raw is forbidden': 
+	test_must_fail git log -L1,24:b.c --raw
 
-  d98fa42 subject here
+fatal: -L does not yet support diff formats besides -p and -s
+ok 40 - --raw is forbidden
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 4211.41 'setup for checking fancy rename following': 
+	git checkout --orphan moves-start &&
+	git reset --hard &&
 
- git branch <new-branch-name> d98fa42
+	printf "%s\n"    12 13 14 15      b c d e   >file-1 &&
+	printf "%s\n"    22 23 24 25      B C D E   >file-2 &&
+	git add file-1 file-2 &&
+	test_tick &&
+	git commit -m "Add file-1 and file-2" &&
+	oid_add_f1_f2=$(git rev-parse --short HEAD) &&
 
-HEAD is now at 6b2d93f first
-[detached HEAD dc8a2ae] mboxrd should escape the body
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+)
->From could trip up a loose mbox parser
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	git checkout -b moves-main &&
+	printf "%s\n" 11 12 13 14 15      b c d e   >file-1 &&
+	git commit -a -m "Modify file-1 on main" &&
+	oid_mod_f1_main=$(git rev-parse --short HEAD) &&
 
-  dc8a2ae mboxrd should escape the body
+	printf "%s\n" 21 22 23 24 25      B C D E   >file-2 &&
+	git commit -a -m "Modify file-2 on main #1" &&
+	oid_mod_f2_main_1=$(git rev-parse --short HEAD) &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+	git mv file-1 renamed-1 &&
+	git commit -m "Rename file-1 to renamed-1 on main" &&
 
- git branch <new-branch-name> dc8a2ae
+	printf "%s\n" 11 12 13 14 15      b c d e f >renamed-1 &&
+	git commit -a -m "Modify renamed-1 on main" &&
+	oid_mod_r1_main=$(git rev-parse --short HEAD) &&
 
-HEAD is now at 6b2d93f first
-Applying: mboxrd should escape the body
-ok 72 - am --patch-format=mboxrd handles mboxrd
+	printf "%s\n" 21 22 23 24 25      B C D E F >file-2 &&
+	git commit -a -m "Modify file-2 on main #2" &&
+	oid_mod_f2_main_2=$(git rev-parse --short HEAD) &&
 
-expecting success of 4150.73 'am works with multi-line in-body headers': 
-	FORTY="String that has a length of more than forty characters" &&
-	LONG="$FORTY $FORTY" &&
-	rm -fr .git/rebase-apply &&
-	git checkout -f first &&
-	echo one >> file &&
-	git commit -am "$LONG
+	git checkout -b moves-side moves-start &&
+	printf "%s\n"    12 13 14 15 16   b c d e   >file-1 &&
+	git commit -a -m "Modify file-1 on side #1" &&
+	oid_mod_f1_side_1=$(git rev-parse --short HEAD) &&
 
-    Body test" --author="$LONG <long@example.com>" &&
-	git format-patch --stdout -1 >patch &&
-	# bump from, date, and subject down to in-body header
-	perl -lpe "
-		if (/^From:/) {
-			print \"From: x <x\@example.com>\";
-			print \"Date: Sat, 1 Jan 2000 00:00:00 +0000\";
-			print \"Subject: x\n\";
-		}
-	" patch >msg &&
-	git checkout HEAD^ &&
-	git am msg &&
-	# Ensure that the author and full message are present
-	git cat-file commit HEAD | grep "^author.*long@example.com" &&
-	git cat-file commit HEAD | grep "^$LONG$"
+	printf "%s\n"    22 23 24 25 26   B C D E   >file-2 &&
+	git commit -a -m "Modify file-2 on side" &&
+	oid_mod_f2_side=$(git rev-parse --short HEAD) &&
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+	git mv file-2 renamed-2 &&
+	git commit -m "Rename file-2 to renamed-2 on side" &&
 
-  dc8a2ae mboxrd should escape the body
+	printf "%s\n"    12 13 14 15 16 a b c d e   >file-1 &&
+	git commit -a -m "Modify file-1 on side #2" &&
+	oid_mod_f1_side_2=$(git rev-parse --short HEAD) &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+	printf "%s\n"    22 23 24 25 26 A B C D E   >renamed-2 &&
+	git commit -a -m "Modify renamed-2 on side" &&
+	oid_mod_r2_side=$(git rev-parse --short HEAD) &&
 
- git branch <new-branch-name> dc8a2ae
+	git checkout moves-main &&
+	git merge moves-side &&
+	oid_merge=$(git rev-parse --short HEAD)
 
-HEAD is now at 6b2d93f first
-[detached HEAD c97171e] String that has a length of more than forty characters String that has a length of more than forty characters
- Author: String that has a length of more than forty characters String that has a length of more than forty characters <long@example.com>
+Switched to a new branch 'moves-start'
+[moves-start (root-commit) 306d665] Add file-1 and file-2
+ Author: A U Thor <author@example.com>
+ 2 files changed, 16 insertions(+)
+ create mode 100644 file-1
+ create mode 100644 file-2
+Switched to a new branch 'moves-main'
+[moves-main d42d674] Modify file-1 on main
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+[moves-main 30ac750] Modify file-2 on main #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-main 0bb858c] Rename file-1 to renamed-1 on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file-1 => renamed-1 (100%)
+[moves-main 85f9f03] Modify renamed-1 on main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-main da62335] Modify file-2 on main #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'moves-side'
+[moves-side aced016] Modify file-1 on side #1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-side f423e86] Modify file-2 on side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-side 87b3e53] Rename file-2 to renamed-2 on side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename file-2 => renamed-2 (100%)
+[moves-side 6073daf] Modify file-1 on side #2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[moves-side 43e9b43] Modify renamed-2 on side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'moves-main'
+Auto-merging renamed-1
+Auto-merging renamed-2
+Merge made by the 'ort' strategy.
+ renamed-1           | 2 ++
+ file-2 => renamed-2 | 2 ++
+ 2 files changed, 4 insertions(+)
+ rename file-2 => renamed-2 (83%)
+ok 41 - setup for checking fancy rename following
 
-  c97171e String that has a length of more than forty characters String that has a length of more than forty characters
+expecting success of 4211.42 'fancy rename following #1': 
+	cat >expect <<-EOF &&
+	$oid_merge Merge branch 'moves-side' into moves-main
+	$oid_mod_f1_side_2 Modify file-1 on side #2
+	$oid_mod_f1_side_1 Modify file-1 on side #1
+	$oid_mod_r1_main Modify renamed-1 on main
+	$oid_mod_f1_main Modify file-1 on main
+	$oid_add_f1_f2 Add file-1 and file-2
+	EOF
+	git log -L1:renamed-1 --oneline --no-patch >actual &&
+	test_cmp expect actual
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+ok 42 - fancy rename following #1
 
- git branch <new-branch-name> c97171e
+expecting success of 4211.43 'fancy rename following #2': 
+	cat >expect <<-EOF &&
+	$oid_merge Merge branch 'moves-side' into moves-main
+	$oid_mod_r2_side Modify renamed-2 on side
+	$oid_mod_f2_side Modify file-2 on side
+	$oid_mod_f2_main_2 Modify file-2 on main #2
+	$oid_mod_f2_main_1 Modify file-2 on main #1
+	$oid_add_f1_f2 Add file-1 and file-2
+	EOF
+	git log -L1:renamed-2 --oneline --no-patch >actual &&
+	test_cmp expect actual
 
-HEAD is now at 6b2d93f first
-Applying: String that has a length of more than forty characters String that has a length of more than forty characters
-author long@example.com <long@example.com> 1112912773 -0700
-String that has a length of more than forty characters String that has a length of more than forty characters
-ok 73 - am works with multi-line in-body headers
+ok 43 - fancy rename following #2
 
-expecting success of 4150.74 'am --quit keeps HEAD where it is': 
-	mkdir .git/rebase-apply &&
-	>.git/rebase-apply/last &&
-	>.git/rebase-apply/next &&
-	git rev-parse HEAD^ >.git/ORIG_HEAD &&
-	git rev-parse HEAD >expected &&
-	git am --quit &&
-	test_path_is_missing .git/rebase-apply &&
-	git rev-parse HEAD >actual &&
-	test_cmp expected actual
+expecting success of 4211.44 'setup for checking line-log and parent oids': 
+	git checkout --orphan parent-oids &&
+	git reset --hard &&
 
-ok 74 - am --quit keeps HEAD where it is
+	cat >file.c <<-\EOF &&
+	int func1()
+	{
+	    return F1;
+	}
 
-expecting success of 4150.75 'am and .gitattibutes': 
-	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'" &&
+	int func2()
+	{
+	    return F2;
+	}
+	EOF
+	git add file.c &&
+	test_tick &&
+	first_tick=$test_tick &&
+	git commit -m "Add func1() and func2() in file.c" &&
 
-		test_commit second &&
-		git checkout -b test HEAD^ &&
+	echo 1 >other-file &&
+	git add other-file &&
+	test_tick &&
+	git commit -m "Add other-file" &&
 
-		echo "*.txt filter=test conflict-marker-size=10" >.gitattributes &&
-		git add .gitattributes &&
-		test_commit third &&
+	sed -e "s/F1/F1 + 1/" file.c >tmp &&
+	mv tmp file.c &&
+	git commit -a -m "Modify func1() in file.c" &&
 
-		echo "This text is smudged." >a.txt &&
-		git add a.txt &&
-		test_commit fourth &&
+	echo 2 >other-file &&
+	git commit -a -m "Modify other-file" &&
 
-		git checkout -b removal HEAD^ &&
-		git rm .gitattributes &&
-		git add -u &&
-		test_commit fifth &&
-		git cherry-pick test &&
+	sed -e "s/F2/F2 + 2/" file.c >tmp &&
+	mv tmp file.c &&
+	git commit -a -m "Modify func2() in file.c" &&
 
-		git checkout -b conflict third &&
-		echo "This text is different." >a.txt &&
-		git add a.txt &&
-		test_commit sixth &&
+	head_oid=$(git rev-parse --short HEAD) &&
+	prev_oid=$(git rev-parse --short HEAD^) &&
+	root_oid=$(git rev-parse --short HEAD~4)
 
-		git checkout test &&
-		git format-patch --stdout main..HEAD >patches &&
-		git reset --hard main &&
-		git am patches &&
-		grep "smudged" a.txt &&
+Switched to a new branch 'parent-oids'
+[parent-oids (root-commit) df67db9] Add func1() and func2() in file.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file.c
+[parent-oids ee91250] Add other-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other-file
+[parent-oids 431262f] Modify func1() in file.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[parent-oids e3bd121] Modify other-file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[parent-oids 0202e75] Modify func2() in file.c
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 44 - setup for checking line-log and parent oids
 
-		git checkout removal &&
-		git reset --hard &&
-		git format-patch --stdout main..HEAD >patches &&
-		git reset --hard main &&
-		git am patches &&
-		grep "clean" a.txt &&
+expecting success of 4211.45 'parent oids without parent rewriting': 
+	cat >expect <<-EOF &&
+	$head_oid $prev_oid Modify func2() in file.c
+	$root_oid  Add func1() and func2() in file.c
+	EOF
+	git log --format="%h %p %s" --no-patch -L:func2:file.c >actual &&
+	test_cmp expect actual
 
-		git checkout conflict &&
-		git reset --hard &&
-		git format-patch --stdout main..HEAD >patches &&
-		git reset --hard fourth &&
-		test_must_fail git am -3 patches &&
-		grep "<<<<<<<<<<" a.txt
-	)
+ok 45 - parent oids without parent rewriting
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4150-am/attributes/.git/
-[main (root-commit) b1affd7] init
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[main 078d104] second
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 second.t
-Switched to a new branch 'test'
-[test e6fa290] third
- Author: Another Thor <a.thor@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 .gitattributes
- create mode 100644 third.t
-[test ca53213] fourth
- Author: Another Thor <a.thor@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a.txt
- create mode 100644 fourth.t
-Switched to a new branch 'removal'
-rm '.gitattributes'
-[removal 126fc1c] fifth
- Author: Another Thor <a.thor@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- delete mode 100644 .gitattributes
- create mode 100644 fifth.t
-[removal 0bb88c2] fourth
- Author: Another Thor <a.thor@example.com>
- Date: Thu Apr 7 15:30:13 2005 -0700
- 2 files changed, 2 insertions(+)
- create mode 100644 a.txt
- create mode 100644 fourth.t
-Switched to a new branch 'conflict'
-[conflict e6420d6] sixth
- Author: Another Thor <a.thor@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a.txt
- create mode 100644 sixth.t
-Switched to branch 'test'
-HEAD is now at 078d104 second
-Applying: third
-Applying: fourth
-This text is smudged.
-Switched to branch 'removal'
-HEAD is now at 0bb88c2 fourth
-HEAD is now at 078d104 second
-Applying: third
-Applying: fifth
-Applying: fourth
-This text is clean.
-Switched to branch 'conflict'
-HEAD is now at e6420d6 sixth
-HEAD is now at ca53213 fourth
-Applying: third
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-ca53213 fourth
-virtual third
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-No changes -- Patch already applied.
-Applying: sixth
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-ca53213 fourth
-virtual sixth
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-CONFLICT (add/add): Merge conflict in a.txt
-Auto-merging a.txt
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0002 sixth
-<<<<<<<<<< HEAD
-ok 75 - am and .gitattibutes
+expecting success of 4211.46 'parent oids with parent rewriting': 
+	cat >expect <<-EOF &&
+	$head_oid $root_oid Modify func2() in file.c
+	$root_oid  Add func1() and func2() in file.c
+	EOF
+	git log --format="%h %p %s" --no-patch -L:func2:file.c --parents >actual &&
+	test_cmp expect actual
 
-expecting success of 4150.76 'apply binary blob in partial clone': 
-	printf "\\000" >binary &&
-	git add binary &&
-	git commit -m "binary blob" &&
-	git format-patch --stdout -m HEAD^ >patch &&
+ok 46 - parent oids with parent rewriting
 
-	test_create_repo server &&
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	git clone --filter=blob:none "file://$(pwd)/server" client &&
-	test_when_finished "rm -rf client" &&
+expecting success of 4211.47 'line-log with --before': 
+	echo $root_oid >expect &&
+	git log --format=%h --no-patch -L:func2:file.c --before=$first_tick >actual &&
+	test_cmp expect actual
 
-	# Exercise to make sure that it works
-	git -C client am ../patch
+ok 47 - line-log with --before
 
-[detached HEAD 0dd6bd5] binary blob
- Author: Another Thor <a.thor@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binary
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4150-am/server/.git/
-Cloning into 'client'...
-warning: You appear to have cloned an empty repository.
-Applying: binary blob
-applying to an empty history
-ok 76 - apply binary blob in partial clone
+expecting success of 4211.48 'setup tests for zero-width regular expressions': 
+	cat >expect <<-EOF
+	Modify func1() in file.c
+	Add func1() and func2() in file.c
+	EOF
 
-expecting success of 4150.77 'an empty input file is error regardless of --empty option': 
-	test_when_finished "git am --abort || :" &&
-	test_must_fail git am --empty=drop empty.patch 2>actual &&
-	echo "Patch format detection failed." >expected &&
-	test_cmp expected actual
+ok 48 - setup tests for zero-width regular expressions
 
-fatal: Resolve operation not in progress, we are not resuming.
-ok 77 - an empty input file is error regardless of --empty option
+expecting success of 4211.49 'zero-width regex $ matches any function name': 
+	git log --format="%s" --no-patch "-L:$:file.c" >actual &&
+	test_cmp expect actual
 
-expecting success of 4150.78 'invalid when passing the --empty option alone': 
-	test_when_finished "git am --abort || :" &&
-	git checkout empty-commit^ &&
-	test_must_fail git am --empty empty-commit.patch 2>err &&
-	echo "error: invalid value for '--empty': 'empty-commit.patch'" >expected &&
-	test_cmp expected err
+ok 49 - zero-width regex $ matches any function name
 
-Warning: you are leaving 2 commits behind, not connected to
-any of your branches:
+expecting success of 4211.50 'zero-width regex ^ matches any function name': 
+	git log --format="%s" --no-patch "-L:^:file.c" >actual &&
+	test_cmp expect actual
 
-  0dd6bd5 binary blob
-  f2ac200 String that has a length of more than forty characters String that has a length of more than forty characters
+ok 50 - zero-width regex ^ matches any function name
 
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
+expecting success of 4211.51 'zero-width regex .* matches any function name': 
+	git log --format="%s" --no-patch "-L:.*:file.c" >actual &&
+	test_cmp expect actual
 
- git branch <new-branch-name> 0dd6bd5
+ok 51 - zero-width regex .* matches any function name
 
-HEAD is now at 756adf8 renamed a file and added another
-fatal: Resolve operation not in progress, we are not resuming.
-ok 78 - invalid when passing the --empty option alone
+# passed all 51 test(s)
+1..51
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4214-log-graph-octopus.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-expecting success of 4150.79 'a message without a patch is an error (default)': 
-	test_when_finished "git am --abort || :" &&
-	test_must_fail git am empty-commit.patch >err &&
-	grep "Patch is empty" err
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch '1'
+[1 0152a24] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1
+Switched to a new branch '2'
+[2 bca45ad] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2
+Switched to a new branch '3'
+[3 ec94035] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3
+Switched to a new branch '4'
+[4 132f27d] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4
+Switched to a new branch 'merge'
+Trying simple merge with 2
+Trying simple merge with 3
+Trying simple merge with 4
+Merge made by the 'octopus' strategy.
+ 2 | 1 +
+ 3 | 1 +
+ 4 | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 2
+ create mode 100644 3
+ create mode 100644 4
+[merge ce2ad1c] after-merge
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-merge.t
+Switched to a new branch 'L'
+[L d607189] left
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 left.t
+Switched to a new branch 'crossover'
+[crossover 7a146e9] after-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-4.t
+Switched to a new branch 'more-L'
+[more-L a2d7eba] after-initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 after-initial.t
+ok 1 - set up merge history
 
-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 advice.mergeConflict false"
-Patch is empty.
-ok 79 - a message without a patch is an error (default)
+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
 
-expecting success of 4150.80 'a message without a patch is an error where an explicit "--empty=stop" is given': 
-	test_when_finished "git am --abort || :" &&
-	test_must_fail git am --empty=stop empty-commit.patch >err &&
-	grep "Patch is empty." err
+ok 2 - log --graph with tricky octopus merge, no color
 
-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 advice.mergeConflict false"
-Patch is empty.
-ok 80 - a message without a patch is an error where an explicit "--empty=stop" is given
+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
 
-expecting success of 4150.81 'a message without a patch will be skipped when "--empty=drop" is given': 
-	git am --empty=drop empty-commit.patch >output &&
-	git rev-parse empty-commit^ >expected &&
-	git rev-parse HEAD >actual &&
-	test_cmp expected actual &&
-	grep "Skipping: empty commit" output
+ok 3 - log --graph with tricky octopus merge with colors
 
-Skipping: empty commit
-ok 81 - a message without a patch will be skipped when "--empty=drop" is given
+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
 
-expecting success of 4150.82 'record as an empty commit when meeting e-mail message that lacks a patch': 
-	git am --empty=keep empty-commit.patch >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 &&
-	grep "Creating an empty commit: empty commit" output
+ok 4 - log --graph with normal octopus merge, no color
 
-empty commit
+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
 
-Creating an empty commit: empty commit
-ok 82 - record as an empty commit when meeting e-mail message that lacks a patch
+ok 5 - log --graph with normal octopus merge with colors
 
-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
+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
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+ok 6 - log --graph with normal octopus merge and child, no color
 
-  11d1604 empty commit
+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
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+ok 7 - log --graph with normal octopus and child merge with colors
 
- git branch <new-branch-name> 11d1604
+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
 
-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
+ok 8 - log --graph with tricky octopus merge and its child, no color
 
-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
+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
 
-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 9 - log --graph with tricky octopus merge and its child with colors
 
-ok 84 - record an empty patch as an empty commit in the middle of an am session
+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
 
-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
+ok 10 - log --graph with crossover in octopus merge, no color
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+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
 
-  11d1604 empty commit
+ok 11 - log --graph with crossover in octopus merge with colors
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+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
 
- git branch <new-branch-name> 11d1604
+ok 12 - log --graph with crossover in octopus merge and its child, no color
 
-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 advice.mergeConflict false"
-Applying: empty commit
-empty commit
+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
 
-empty-file
-ok 85 - create an non-empty commit when the index IS changed though "--allow-empty" is given
+ok 13 - log --graph with crossover in octopus merge and its child with colors
 
-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
+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
 
-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 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 advice.mergeConflict false"
-ok 86 - cannot create empty commits when there is a clean index due to merge conflicts
+ok 14 - log --graph with unrelated commit and octopus tip, no color
 
-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
+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
 
-Applying: two
-Using index info to reconstruct a base tree...
-A	file
-Falling back to patching base and 3-way merge...
-Merging:
-9f4f2d0 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 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 advice.mergeConflict false"
-ok 87 - cannot create empty commits when there is unmerged index due to merge conflicts
+ok 15 - log --graph with unrelated commit and octopus tip with colors
 
-# passed all 87 test(s)
-1..87
+expecting success of 4214.16 'log --graph with unrelated commit and octopus child, no color': 
+	test_cmp_graph after-initial after-merge <<-\EOF
+	* after-initial
+	| * after-merge
+	| *---.   octopus-merge
+	| |\ \ \
+	| | | | * 4
+	| |_|_|/
+	|/| | |
+	| | | * 3
+	| |_|/
+	|/| |
+	| | * 2
+	| |/
+	|/|
+	| * 1
+	|/
+	* initial
+	EOF
+
+ok 16 - log --graph with unrelated commit and octopus child, no color
+
+expecting success of 4214.17 'log --graph with unrelated commit and octopus child with colors': 
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	* after-initial
+	<RED>|<RESET> * after-merge
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
+	<RED>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <CYAN>\<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>_<RESET><MAGENTA>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 3
+	<RED>|<RESET> <YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
+	<RED>|<RESET> <YELLOW>|<RESET> * 2
+	<RED>|<RESET> <YELLOW>|<RESET><RED>/<RESET>
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET>
+	<RED>|<RESET> * 1
+	<RED>|<RESET><RED>/<RESET>
+	* initial
+	EOF
+	test_cmp_colored_graph after-initial after-merge
+
+ok 17 - log --graph with unrelated commit and octopus child with colors
+
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4213-log-tabexpand.sh ***
@@ -279511,6 +278851,980 @@
 1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4217-log-limit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/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 file
+[master b839c03] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 5dd5cf2] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master fd219fd] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup test
+
+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_cmp expect actual
+
+ok 2 - git log --since-as-filter=...
+
+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
+	test_cmp expect actual
+
+ok 3 - git log --children --since-as-filter=...
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4137-apply-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/.git/
+expecting success of 4137.1 'apply_index: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - apply_index: added submodule creates empty directory
+
+expecting success of 4137.2 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - apply_index: added submodule leaves existing empty directory alone
+
+expecting success of 4137.3 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - apply_index: replace tracked file with submodule creates empty directory
+
+expecting success of 4137.4 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - apply_index: replace directory with submodule
+
+expecting success of 4137.5 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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 5 - apply_index: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 4137.6 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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 6 - apply_index: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 4137.7 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: sub1/file1: already exists in working directory
+error: sub1/file2: already exists in working directory
+ok 7 - apply_index: replace submodule with a directory must fail
+
+expecting success of 4137.8 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: sub1/file1: already exists in working directory
+error: sub1/file2: already exists in working directory
+ok 8 - apply_index: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 4137.9 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 9 - apply_index: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 4137.10 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 10 - apply_index: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 4137.11 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - apply_index: modified submodule does not update submodule work tree
+
+expecting success of 4137.12 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+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 - apply_index: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 4137.13 'apply_index: modified submodule does not update submodule work tree from invalid commit': 
+		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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - apply_index: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 4137.14 'apply_index: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: sub1: already exists in working directory
+ok 14 - apply_index: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 4137.15 'apply_3way: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Falling back to direct application...
+Falling back to direct application...
+Falling back to direct application...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 15 - apply_3way: added submodule creates empty directory
+
+expecting success of 4137.16 'apply_3way: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Falling back to direct application...
+Falling back to direct application...
+Falling back to direct application...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 16 - apply_3way: added submodule leaves existing empty directory alone
+
+expecting success of 4137.17 'apply_3way: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Applied patch to '.gitmodules' cleanly.
+Falling back to direct application...
+Falling back to direct application...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 17 - apply_3way: replace tracked file with submodule creates empty directory
+
+expecting success of 4137.18 'apply_3way: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Applied patch to '.gitmodules' cleanly.
+Falling back to direct application...
+Falling back to direct application...
+Falling back to direct application...
+Falling back to direct application...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 18 - apply_3way: replace directory with submodule
+
+expecting success of 4137.19 'apply_3way: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Falling back to direct application...
+Falling back to direct application...
+Falling back to direct application...
+warning: unable to rmdir 'sub1': Directory not empty
+ok 19 - apply_3way: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 4137.20 'apply_3way: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Falling back to direct application...
+Falling back to direct application...
+Falling back to direct application...
+warning: unable to rmdir 'sub1': Directory not empty
+ok 20 - apply_3way: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 4137.21 'apply_3way: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
+Applied patch to '.gitmodules' cleanly.
+Falling back to direct application...
+Performing three-way merge...
+error: sub1/file1: does not exist in index
+error: cannot read the current contents of 'sub1/file1'
+error: sub1/file1: patch does not apply
+Performing three-way merge...
+error: sub1/file2: does not exist in index
+error: cannot read the current contents of 'sub1/file2'
+error: sub1/file2: patch does not apply
+Falling back to direct application...
+ok 21 - apply_3way: replace submodule with a directory must fail
+
+expecting success of 4137.22 'apply_3way: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
+Applied patch to '.gitmodules' cleanly.
+Falling back to direct application...
+Performing three-way merge...
+error: sub1/file1: does not exist in index
+error: cannot read the current contents of 'sub1/file1'
+error: sub1/file1: patch does not apply
+Performing three-way merge...
+error: sub1/file2: does not exist in index
+error: cannot read the current contents of 'sub1/file2'
+error: sub1/file2: patch does not apply
+Falling back to direct application...
+ok 22 - apply_3way: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 4137.23 'apply_3way: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
+Applied patch to '.gitmodules' cleanly.
+Falling back to direct application...
+Falling back to direct application...
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 23 - apply_3way: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 4137.24 'apply_3way: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
+Applied patch to '.gitmodules' cleanly.
+Falling back to direct application...
+Falling back to direct application...
+warning: unable to rmdir 'sub1': Directory not empty
+error: unable to write file 'sub1' mode 100644: Directory not empty
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 24 - apply_3way: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 4137.25 'apply_3way: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Falling back to direct application...
+warning: unable to rmdir 'sub1': Directory not empty
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 25 - apply_3way: modified submodule does not update submodule work tree
+
+expecting success of 4137.26 'apply_3way: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Falling back to direct application...
+warning: unable to rmdir 'sub1': Directory not empty
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 26 - apply_3way: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 4137.27 'apply_3way: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Falling back to direct application...
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 27 - apply_3way: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 4137.28 'apply_3way: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Falling back to direct application...
+error: sub1: patch does not apply
+Falling back to direct application...
+ok 28 - apply_3way: added submodule doesn't remove untracked unignored file with same name
+
+# still have 4 known breakage(s)
+# passed all remaining 24 test(s)
+1..28
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4252-am-options.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4252-am-options/.git/
 expecting success of 4252.1 'setup': 
@@ -279765,32 +280079,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4256-am-format-flowed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4253-am-keep-cr-dos.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4253-am-keep-cr-dos/.git/
 expecting success of 4253.1 'setup repository with dos files': 
@@ -279955,6 +280243,32 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4256-am-format-flowed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4257-am-interactive.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4257-am-interactive/.git/
 expecting success of 4257.1 'set up patches to apply': 
@@ -281233,614 +281547,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4300-merge-tree.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5000-tar-tree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5000-tar-tree/.git/
 expecting success of 5000.1 'setup': 
@@ -281856,9 +281562,9 @@
 	test_must_fail git archive --remote=. --list blah
 
 fatal: extra command line parameter 'blah'
+fatal: sent error to the client: git upload-archive: archiver died with error
 remote: fatal: extra command line parameter 'blah'        
 remote: git upload-archive: archiver died with error
-fatal: sent error to the client: git upload-archive: archiver died with error
 ok 2 - --list notices extra parameters
 
 expecting success of 5000.3 'end-of-options is correctly eaten': 
@@ -282326,8 +282032,8 @@
 	git archive --remote=. --format=bar >remote.bar HEAD &&
 	test_cmp_bin remote.bar config.bar
 
-remote: fatal: Unknown archive format 'tar.foo'        
 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
 
@@ -282379,8 +282085,8 @@
 	test_must_fail git archive --remote=. --format=tar.gz HEAD \
 		>remote.tar.gz
 
-remote: fatal: Unknown archive format '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
 
@@ -282478,180 +282184,663 @@
 	GIT_COMMITTER_DATE="@17179869183 +0000" \
 		git commit -m "tempori parendum"
 
-[master fa9ffb0] tempori parendum
+[master fa9ffb0] tempori parendum
+ Author: A U Thor <author@example.com>
+ 9 files changed, 1 insertion(+), 7 deletions(-)
+ 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 file
+ok 84 - set up repository with far-future (2^34 - 1) commit
+
+expecting success of 5000.85 'generate tar with far-future mtime': 
+	git archive HEAD >future.tar
+
+ok 85 - 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 not satisfied
+ok 86 # skip system tar can read our future mtime (missing TIME_T_IS_64BIT of TAR_HUGE,TIME_IS_64BIT,TIME_T_IS_64BIT)
+
+expecting success of 5000.87 '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 2781d1f] tempori parendum
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 87 - set up repository with far-far-future (2^36 + 1) commit
+
+expecting success of 5000.88 'generate tar with far-far-future mtime': 
+	git archive HEAD >future.tar
+
+ok 88 - generate tar with far-far-future mtime
+
+ok 89 # skip system tar can read our future mtime (missing TIME_T_IS_64BIT of TAR_HUGE,TIME_IS_64BIT,TIME_T_IS_64BIT)
+
+# passed all 89 test(s)
+1..89
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t4300-merge-tree.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t4300-merge-tree/3-way/.git/
+[master (root-commit) fd74319] initial
  Author: A U Thor <author@example.com>
- 9 files changed, 1 insertion(+), 7 deletions(-)
- 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 file
-ok 84 - set up repository with far-future (2^34 - 1) commit
-
-expecting success of 5000.85 'generate tar with far-future mtime': 
-	git archive HEAD >future.tar
+ 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
 
-ok 85 - generate tar with far-future mtime
+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
 
-checking prerequisite: TIME_T_IS_64BIT
+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)
 
-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 not satisfied
-ok 86 # skip system tar can read our future mtime (missing TIME_T_IS_64BIT of TAR_HUGE,TIME_IS_64BIT,TIME_T_IS_64BIT)
+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
 
-expecting success of 5000.87 '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"
+	test_cmp expected actual
 
-[master 2781d1f] tempori parendum
+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(-)
-ok 87 - set up repository with far-far-future (2^36 + 1) commit
+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 5000.88 'generate tar with far-far-future mtime': 
-	git archive HEAD >future.tar
+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 &&
 
-ok 88 - generate tar with far-far-future mtime
+	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
 
-ok 89 # skip system tar can read our future mtime (missing TIME_T_IS_64BIT of TAR_HUGE,TIME_IS_64BIT,TIME_T_IS_64BIT)
+	test_cmp expected actual
 
-# passed all 89 test(s)
-1..89
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5002-archive-attr-pattern.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5002-archive-attr-pattern/.git/
-expecting success of 5002.1 'setup': 
-	echo ignored >ignored &&
-	mkdir .git/info &&
-	echo ignored export-ignore >>.git/info/attributes &&
-	git add ignored &&
+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)
 
-	mkdir not-ignored-dir &&
-	echo ignored-in-tree >not-ignored-dir/ignored &&
-	echo not-ignored-in-tree >not-ignored-dir/ignored-only-if-dir &&
-	git add not-ignored-dir &&
+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
 
-	mkdir ignored-only-if-dir &&
-	echo ignored by ignored dir >ignored-only-if-dir/ignored-by-ignored-dir &&
-	echo ignored-only-if-dir/ export-ignore >>.git/info/attributes &&
-	git add ignored-only-if-dir &&
+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
 
-	mkdir -p ignored-without-slash &&
-	echo "ignored without slash" >ignored-without-slash/foo &&
-	git add ignored-without-slash/foo &&
-	echo "ignored-without-slash export-ignore" >>.git/info/attributes &&
+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
 
-	mkdir -p wildcard-without-slash &&
-	echo "ignored without slash" >wildcard-without-slash/foo &&
-	git add wildcard-without-slash/foo &&
-	echo "wild*-without-slash export-ignore" >>.git/info/attributes &&
+	test_cmp expected actual
 
-	mkdir -p deep/and/slashless &&
-	echo "ignored without slash" >deep/and/slashless/foo &&
-	git add deep/and/slashless/foo &&
-	echo "deep/and/slashless export-ignore" >>.git/info/attributes &&
+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
 
-	mkdir -p deep/with/wildcard &&
-	echo "ignored without slash" >deep/with/wildcard/foo &&
-	git add deep/with/wildcard/foo &&
-	echo "deep/*t*/wildcard export-ignore" >>.git/info/attributes &&
+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
 
-	mkdir -p one-level-lower/two-levels-lower/ignored-only-if-dir &&
-	echo ignored by ignored dir >one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir &&
-	git add one-level-lower &&
+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)
 
-	git commit -m. &&
+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
 
-	git clone --template= --bare . bare &&
-	mkdir bare/info &&
-	cp .git/info/attributes bare/info/attributes
+	test_cmp expected actual
 
-[master (root-commit) 47c5c5b] .
+HEAD is now at c1d16d8 initial
+[master 425fe11] change-a-rm-b-base
  Author: A U Thor <author@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 deep/and/slashless/foo
- create mode 100644 deep/with/wildcard/foo
- create mode 100644 ignored
- create mode 100644 ignored-only-if-dir/ignored-by-ignored-dir
- create mode 100644 ignored-without-slash/foo
- create mode 100644 not-ignored-dir/ignored
- create mode 100644 not-ignored-dir/ignored-only-if-dir
- create mode 100644 one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir
- create mode 100644 wildcard-without-slash/foo
-Cloning into bare repository 'bare'...
-done.
-ok 1 - setup
-
-expecting success of 5002.2 'git archive': 
-	git archive HEAD >archive.tar &&
-	(mkdir archive && cd archive && "$TAR" xf -) <archive.tar
+ 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
 
-ok 2 - git archive
+expecting success of 4300.16 'file remove A, change B': 
+	git reset --hard initial &&
+	test_commit "rm-a-change-b-base" "ONE" "AAA" &&
 
-expecting success of 5002.3 ' archive/ignored does not exist': test ! -e archive/ignored
-ok 3 -  archive/ignored does not exist
+	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
 
-expecting success of 5002.4 ' archive/not-ignored-dir/ignored does not exist': test ! -e archive/not-ignored-dir/ignored
-ok 4 -  archive/not-ignored-dir/ignored does not exist
+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 5002.5 ' archive/not-ignored-dir/ignored-only-if-dir exists': test -e archive/not-ignored-dir/ignored-only-if-dir
-ok 5 -  archive/not-ignored-dir/ignored-only-if-dir exists
+expecting success of 4300.17 'tree add A, B (same)': 
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "file" add-tree-A &&
+	git merge-tree initial add-tree-A add-tree-A >actual &&
+	test_must_be_empty actual
 
-expecting success of 5002.6 ' archive/not-ignored-dir/ exists': test -e archive/not-ignored-dir/
-ok 6 -  archive/not-ignored-dir/ exists
+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 5002.7 ' archive/ignored-only-if-dir/ does not exist': test ! -e archive/ignored-only-if-dir/
-ok 7 -  archive/ignored-only-if-dir/ does not exist
+expecting success of 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
 
-expecting success of 5002.8 ' archive/ignored-ony-if-dir/ignored-by-ignored-dir does not exist': test ! -e archive/ignored-ony-if-dir/ignored-by-ignored-dir
-ok 8 -  archive/ignored-ony-if-dir/ignored-by-ignored-dir does not exist
+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 5002.9 ' archive/ignored-without-slash/ does not exist': test ! -e archive/ignored-without-slash/
-ok 9 -  archive/ignored-without-slash/ does not exist
+expecting success of 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
 
-expecting success of 5002.10 ' archive/ignored-without-slash/foo does not exist': test ! -e archive/ignored-without-slash/foo
-ok 10 -  archive/ignored-without-slash/foo does not exist
+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 5002.11 ' archive/wildcard-without-slash/ does not exist': test ! -e archive/wildcard-without-slash/
-ok 11 -  archive/wildcard-without-slash/ does not exist
+expecting success of 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 5002.12 ' archive/wildcard-without-slash/foo does not exist': test ! -e archive/wildcard-without-slash/foo
-ok 12 -  archive/wildcard-without-slash/foo does not exist
+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 5002.13 ' archive/deep/and/slashless/ does not exist': test ! -e archive/deep/and/slashless/
-ok 13 -  archive/deep/and/slashless/ does not exist
+expecting success of 4300.21 'turn tree to file': 
+	git reset --hard initial &&
+	mkdir dir &&
+	test_commit "add-tree" "dir/path" "AAA" &&
+	test_commit "add-another-tree" "dir/another" "BBB" &&
+	rm -fr dir &&
+	test_commit "make-file" "dir" "CCC" &&
+	git merge-tree add-tree add-another-tree make-file >actual &&
+	cat >expect <<-EOF &&
+	removed in remote
+	  base   100644 $(git rev-parse add-tree:dir/path) dir/path
+	  our    100644 $(git rev-parse add-tree:dir/path) dir/path
+	@@ -1 +0,0 @@
+	-AAA
+	added in remote
+	  their  100644 $(git rev-parse make-file:dir) dir
+	@@ -0,0 +1 @@
+	+CCC
+	EOF
+	test_cmp expect actual
 
-expecting success of 5002.14 ' archive/deep/and/slashless/foo does not exist': test ! -e archive/deep/and/slashless/foo
-ok 14 -  archive/deep/and/slashless/foo does not exist
+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 5002.15 ' archive/deep/with/wildcard/ does not exist': test ! -e archive/deep/with/wildcard/
-ok 15 -  archive/deep/with/wildcard/ does not exist
+expecting success of 4300.22 'merge-tree respects core.useReplaceRefs=false': 
+	test_commit merge-to &&
+	test_commit valid base &&
+	git reset --hard HEAD^ &&
+	test_commit malicious base &&
 
-expecting success of 5002.16 ' archive/deep/with/wildcard/foo does not exist': test ! -e archive/deep/with/wildcard/foo
-ok 16 -  archive/deep/with/wildcard/foo does not exist
+	test_when_finished "git replace -d $(git rev-parse valid^0)" &&
+	git replace valid^0 malicious^0 &&
 
-expecting success of 5002.17 ' archive/one-level-lower/ does not exist': test ! -e archive/one-level-lower/
-ok 17 -  archive/one-level-lower/ does not exist
+	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 5002.18 ' archive/one-level-lower/two-levels-lower/ignored-only-if-dir/ does not exist': test ! -e archive/one-level-lower/two-levels-lower/ignored-only-if-dir/
-ok 18 -  archive/one-level-lower/two-levels-lower/ignored-only-if-dir/ does not exist
+	tree=$(git -c core.useReplaceRefs=false merge-tree --write-tree merge-to valid) &&
+	merged=$(git cat-file -p $tree:base) &&
+	test valid = $merged
 
-expecting success of 5002.19 ' archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir does not exist': test ! -e archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir
-ok 19 -  archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir does not exist
+[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 19 test(s)
-1..19
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5001-archive-attr.sh ***
@@ -282895,6 +283084,131 @@
 1..44
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5002-archive-attr-pattern.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5002-archive-attr-pattern/.git/
+expecting success of 5002.1 'setup': 
+	echo ignored >ignored &&
+	mkdir .git/info &&
+	echo ignored export-ignore >>.git/info/attributes &&
+	git add ignored &&
+
+	mkdir not-ignored-dir &&
+	echo ignored-in-tree >not-ignored-dir/ignored &&
+	echo not-ignored-in-tree >not-ignored-dir/ignored-only-if-dir &&
+	git add not-ignored-dir &&
+
+	mkdir ignored-only-if-dir &&
+	echo ignored by ignored dir >ignored-only-if-dir/ignored-by-ignored-dir &&
+	echo ignored-only-if-dir/ export-ignore >>.git/info/attributes &&
+	git add ignored-only-if-dir &&
+
+	mkdir -p ignored-without-slash &&
+	echo "ignored without slash" >ignored-without-slash/foo &&
+	git add ignored-without-slash/foo &&
+	echo "ignored-without-slash export-ignore" >>.git/info/attributes &&
+
+	mkdir -p wildcard-without-slash &&
+	echo "ignored without slash" >wildcard-without-slash/foo &&
+	git add wildcard-without-slash/foo &&
+	echo "wild*-without-slash export-ignore" >>.git/info/attributes &&
+
+	mkdir -p deep/and/slashless &&
+	echo "ignored without slash" >deep/and/slashless/foo &&
+	git add deep/and/slashless/foo &&
+	echo "deep/and/slashless export-ignore" >>.git/info/attributes &&
+
+	mkdir -p deep/with/wildcard &&
+	echo "ignored without slash" >deep/with/wildcard/foo &&
+	git add deep/with/wildcard/foo &&
+	echo "deep/*t*/wildcard export-ignore" >>.git/info/attributes &&
+
+	mkdir -p one-level-lower/two-levels-lower/ignored-only-if-dir &&
+	echo ignored by ignored dir >one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir &&
+	git add one-level-lower &&
+
+	git commit -m. &&
+
+	git clone --template= --bare . bare &&
+	mkdir bare/info &&
+	cp .git/info/attributes bare/info/attributes
+
+[master (root-commit) 47c5c5b] .
+ Author: A U Thor <author@example.com>
+ 9 files changed, 9 insertions(+)
+ create mode 100644 deep/and/slashless/foo
+ create mode 100644 deep/with/wildcard/foo
+ create mode 100644 ignored
+ create mode 100644 ignored-only-if-dir/ignored-by-ignored-dir
+ create mode 100644 ignored-without-slash/foo
+ create mode 100644 not-ignored-dir/ignored
+ create mode 100644 not-ignored-dir/ignored-only-if-dir
+ create mode 100644 one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir
+ create mode 100644 wildcard-without-slash/foo
+Cloning into bare repository 'bare'...
+done.
+ok 1 - setup
+
+expecting success of 5002.2 'git archive': 
+	git archive HEAD >archive.tar &&
+	(mkdir archive && cd archive && "$TAR" xf -) <archive.tar
+
+ok 2 - git archive
+
+expecting success of 5002.3 ' archive/ignored does not exist': test ! -e archive/ignored
+ok 3 -  archive/ignored does not exist
+
+expecting success of 5002.4 ' archive/not-ignored-dir/ignored does not exist': test ! -e archive/not-ignored-dir/ignored
+ok 4 -  archive/not-ignored-dir/ignored does not exist
+
+expecting success of 5002.5 ' archive/not-ignored-dir/ignored-only-if-dir exists': test -e archive/not-ignored-dir/ignored-only-if-dir
+ok 5 -  archive/not-ignored-dir/ignored-only-if-dir exists
+
+expecting success of 5002.6 ' archive/not-ignored-dir/ exists': test -e archive/not-ignored-dir/
+ok 6 -  archive/not-ignored-dir/ exists
+
+expecting success of 5002.7 ' archive/ignored-only-if-dir/ does not exist': test ! -e archive/ignored-only-if-dir/
+ok 7 -  archive/ignored-only-if-dir/ does not exist
+
+expecting success of 5002.8 ' archive/ignored-ony-if-dir/ignored-by-ignored-dir does not exist': test ! -e archive/ignored-ony-if-dir/ignored-by-ignored-dir
+ok 8 -  archive/ignored-ony-if-dir/ignored-by-ignored-dir does not exist
+
+expecting success of 5002.9 ' archive/ignored-without-slash/ does not exist': test ! -e archive/ignored-without-slash/
+ok 9 -  archive/ignored-without-slash/ does not exist
+
+expecting success of 5002.10 ' archive/ignored-without-slash/foo does not exist': test ! -e archive/ignored-without-slash/foo
+ok 10 -  archive/ignored-without-slash/foo does not exist
+
+expecting success of 5002.11 ' archive/wildcard-without-slash/ does not exist': test ! -e archive/wildcard-without-slash/
+ok 11 -  archive/wildcard-without-slash/ does not exist
+
+expecting success of 5002.12 ' archive/wildcard-without-slash/foo does not exist': test ! -e archive/wildcard-without-slash/foo
+ok 12 -  archive/wildcard-without-slash/foo does not exist
+
+expecting success of 5002.13 ' archive/deep/and/slashless/ does not exist': test ! -e archive/deep/and/slashless/
+ok 13 -  archive/deep/and/slashless/ does not exist
+
+expecting success of 5002.14 ' archive/deep/and/slashless/foo does not exist': test ! -e archive/deep/and/slashless/foo
+ok 14 -  archive/deep/and/slashless/foo does not exist
+
+expecting success of 5002.15 ' archive/deep/with/wildcard/ does not exist': test ! -e archive/deep/with/wildcard/
+ok 15 -  archive/deep/with/wildcard/ does not exist
+
+expecting success of 5002.16 ' archive/deep/with/wildcard/foo does not exist': test ! -e archive/deep/with/wildcard/foo
+ok 16 -  archive/deep/with/wildcard/foo does not exist
+
+expecting success of 5002.17 ' archive/one-level-lower/ does not exist': test ! -e archive/one-level-lower/
+ok 17 -  archive/one-level-lower/ does not exist
+
+expecting success of 5002.18 ' archive/one-level-lower/two-levels-lower/ignored-only-if-dir/ does not exist': test ! -e archive/one-level-lower/two-levels-lower/ignored-only-if-dir/
+ok 18 -  archive/one-level-lower/two-levels-lower/ignored-only-if-dir/ does not exist
+
+expecting success of 5002.19 ' archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir does not exist': test ! -e archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir
+ok 19 -  archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir does not exist
+
+# passed all 19 test(s)
+1..19
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4301-merge-tree-write-tree.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4301-merge-tree-write-tree/.git/
 expecting success of 4301.1 'setup': 
@@ -284251,134 +284565,37 @@
 1..40
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5003-archive-zip.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5003-archive-zip/.git/
-expecting success of 5003.1 'populate workdir': mkdir a &&
-     echo simple textfile >a/a &&
-     mkdir a/bin &&
-     cp /bin/sh a/bin &&
-     printf "text\r"	>a/text.cr &&
-     printf "text\r\n"	>a/text.crlf &&
-     printf "text\n"	>a/text.lf &&
-     printf "text\r"	>a/nodiff.cr &&
-     printf "text\r\n"	>a/nodiff.crlf &&
-     printf "text\n"	>a/nodiff.lf &&
-     printf "text\r"	>a/custom.cr &&
-     printf "text\r\n"	>a/custom.crlf &&
-     printf "text\n"	>a/custom.lf &&
-     printf "\0\r"	>a/binary.cr &&
-     printf "\0\r\n"	>a/binary.crlf &&
-     printf "\0\n"	>a/binary.lf &&
-     printf "\0\r"	>a/diff.cr &&
-     printf "\0\r\n"	>a/diff.crlf &&
-     printf "\0\n"	>a/diff.lf &&
-     printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
-     printf "A not substituted O" >a/substfile2 &&
-     (p=long_path_to_a_file && cd a &&
-      for depth in 1 2 3 4 5; do mkdir $p && cd $p || exit 1; done &&
-      echo text >file_with_long_path)
-
-ok 1 - populate workdir
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-checking prerequisite: UNZIP_SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_SYMLINKS" &&
-	"$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
-	test -h symlink
-
-)
-Archive:  /build/reproducible-path/git-2.45.2/t/t5003/infozip-symlinks.zip
- extracting: textfile                
-    linking: symlink                 -> textfile 
-finishing deferred symbolic links:
-  symlink                -> textfile
-prerequisite UNZIP_SYMLINKS ok
-expecting success of 5003.2 'add symlink': 
-	ln -s a a/symlink_to_a
-
-ok 2 - add symlink
-
-expecting success of 5003.3 'prepare file list': 
-	(cd a && find .) | sort >a.lst
-
-ok 3 - prepare file list
-
-expecting success of 5003.4 'add ignored file': echo ignore me >a/ignored &&
-     mkdir .git/info &&
-     echo ignored export-ignore >.git/info/attributes
-ok 4 - add ignored file
-
-expecting success of 5003.5 'add files to repository': 
-	git add a &&
-	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
+*** t5004-archive-corner-cases.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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) 85027bd] initial
+[master (root-commit) 2093db0] foo
  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
+ok 1 - create commit with empty tree and fake empty tar
 
-expecting success of 5003.6 'setup export-subst and diff attributes': 
-	echo "a/nodiff.* -diff" >>.git/info/attributes &&
-	echo "a/diff.* diff" >>.git/info/attributes &&
-	echo "a/custom.* diff=custom" >>.git/info/attributes &&
-	git config diff.custom.binary true &&
-	echo "substfile?" export-subst >>.git/info/attributes &&
-	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
-		>a/substfile1
+expecting success of 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 6 - setup export-subst and diff attributes
+ok 2 - tar archive of commit with empty tree
 
-expecting success of 5003.7 'create bare clone': 
-	git clone --template= --bare . bare.git &&
-	mkdir bare.git/info &&
-	cp .git/info/attributes bare.git/info/attributes &&
-	# Recreate our changes to .git/config rather than just copying it, as
-	# we do not want to clobber core.bare or other settings.
-	git -C bare.git config diff.custom.binary true
+expecting success of 5004.3 'tar archive of empty tree is empty': 
+	git archive --format=tar HEAD: >empty.tar &&
+	test_cmp_bin 10knuls.tar empty.tar
 
-Cloning into bare repository 'bare.git'...
-done.
-ok 7 - create bare clone
+ok 3 - tar archive of empty tree is empty
 
-expecting success of 5003.8 'remove ignored file': rm a/ignored
-ok 8 - remove ignored file
+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
 
-expecting success of 5003.9 'git archive --format=zip': git archive --format=zip HEAD >d.zip
-ok 9 - git archive --format=zip
+ok 4 - tar archive of empty tree with prefix
 
 checking prerequisite: UNZIP
 
@@ -284420,858 +284637,423 @@
          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
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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.45.2/t/t5003/infozip-symlinks.zip
- extracting: textfile                [text]  
-    linking: symlink                 -> textfile 
-finishing deferred symbolic links:
-  symlink                -> textfile
-prerequisite UNZIP_CONVERT ok
-expecting success of 5003.13 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../d.zip
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
+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=$?
+	} &&
 
-ok 54 - git archive --format=zip --add-file
+	git archive --format=zip HEAD >empty.zip &&
+	make_dir extract &&
+	(
+		cd extract &&
+		test_expect_code $expect_code "$GIT_UNZIP" ../empty.zip
+	) &&
+	check_dir extract
 
-expecting success of 5003.55 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../with_untracked.zip
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
+Archive:  /build/reproducible-path/git-2.45.2/t/t5004/empty.zip
+fc8e0d59c1cc5c14b6919fb2006b27fe337e7d0e
+warning [/build/reproducible-path/git-2.45.2/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 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 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
 
-expecting success of 5003.57 ' validate file contents': 
-		diff -r a with_untracked/a
-	
-ok 57 -  validate file contents
+Archive:  ../prefix.zip
+2093db06f424f426e05da2ca90f40d2663e89387
+   creating: foo/
+ok 6 - zip archive of empty tree with prefix
 
-expecting success of 5003.58 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../with_untracked.zip
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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 5004.7 'archive complains about pathspec on empty tree': 
+	test_must_fail git archive --format=tar HEAD -- foo >/dev/null
 
-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
+fatal: pathspec 'foo' did not match any files
+ok 7 - archive complains about pathspec on empty tree
 
-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 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)
 
-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
+ok 8 - create a commit with an empty subtree
 
-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 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
 
-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 
+ok 9 - archive empty subtree with no pathspec
 
-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 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
 
-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)
-	)
+ok 10 - archive empty subtree by direct pathspec
 
-checking prerequisite: FUNNYNAMES
+checking prerequisite: ZIPINFO
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FUNNYNAMES" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
 (
-	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
+	cd "$TRASH_DIRECTORY/prereq-test-dir-ZIPINFO" &&
+	n=$("$ZIPINFO" "$TEST_DIRECTORY"/t5004/empty.zip | sed -n "2s/.* //p")
+	test "x$n" = "x0"
 
 )
-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
+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" &&
 
-ok 66 - git archive --format=zip --add-file twice
+	# 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) &&
 
-expecting success of 5003.67 ' extract ZIP archive': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
-	
-Archive:  ../with_untracked2.zip
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
+	# zip them
+	git archive -o many.zip $tree &&
 
-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
+	# 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
 
-expecting success of 5003.69 ' validate file contents': 
-		diff -r a with_untracked2/a
-	
-ok 69 -  validate file contents
+[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
 
-expecting success of 5003.70 ' extract ZIP archive with EOL conversion': 
-		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
-	
-Archive:  ../with_untracked2.zip
-85027bdcacfa05e42a05747c6b4c61a83dc2b41c
-   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
+checking prerequisite: EXPENSIVE
 
-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
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
 
-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
+)
+prerequisite EXPENSIVE not satisfied
+checking prerequisite: UNZIP_ZIP64_SUPPORT
 
-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
+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 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
+)
+        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 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 
+checking prerequisite: LONG_IS_64BIT
 
-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
+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 5003.77 ' validate extra file two/untracked': 
-		diff -r $path_in_fs $dir/$path_in_archive
-	
-ok 77 -  validate extra file two/untracked
+)
+prerequisite LONG_IS_64BIT not satisfied
+ok 13 # skip zip archive with files bigger than 4GB (missing LONG_IS_64BIT,EXPENSIVE of EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO)
 
-checking prerequisite: NOT_ROOT
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+ok 14 - tar archive with long paths
 
-)
-prerequisite NOT_ROOT ok
-# passed all 77 test(s)
-# SKIP no web server found at ''
-1..77
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5100-mailinfo.sh ***
@@ -286007,1572 +285789,1187 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5200-update-server-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t5003-archive-zip.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5003-archive-zip/.git/
+expecting success of 5003.1 'populate workdir': mkdir a &&
+     echo simple textfile >a/a &&
+     mkdir a/bin &&
+     cp /bin/sh a/bin &&
+     printf "text\r"	>a/text.cr &&
+     printf "text\r\n"	>a/text.crlf &&
+     printf "text\n"	>a/text.lf &&
+     printf "text\r"	>a/nodiff.cr &&
+     printf "text\r\n"	>a/nodiff.crlf &&
+     printf "text\n"	>a/nodiff.lf &&
+     printf "text\r"	>a/custom.cr &&
+     printf "text\r\n"	>a/custom.crlf &&
+     printf "text\n"	>a/custom.lf &&
+     printf "\0\r"	>a/binary.cr &&
+     printf "\0\r\n"	>a/binary.crlf &&
+     printf "\0\n"	>a/binary.lf &&
+     printf "\0\r"	>a/diff.cr &&
+     printf "\0\r\n"	>a/diff.crlf &&
+     printf "\0\n"	>a/diff.lf &&
+     printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
+     printf "A not substituted O" >a/substfile2 &&
+     (p=long_path_to_a_file && cd a &&
+      for depth in 1 2 3 4 5; do mkdir $p && cd $p || exit 1; done &&
+      echo text >file_with_long_path)
 
-ok 3 - modify and store mtime
+ok 1 - populate workdir
 
-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
+checking prerequisite: SYMLINKS
 
-ok 4 - info/refs is not needlessly overwritten
+mkdir -p "$TRASH_DIRECTORY/prereq-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 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
+)
+prerequisite SYMLINKS ok
+checking prerequisite: UNZIP_SYMLINKS
 
---- a	2025-12-18 01:36:02.630773267 +0000
-+++ b	2025-12-18 01:36:02.642773267 +0000
-@@ -1 +1 @@
--0
-+1766021762
-ok 5 - info/refs can be forced to update
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_SYMLINKS" &&
+	"$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
+	test -h symlink
 
-expecting success of 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
+)
+Archive:  /build/reproducible-path/git-2.45.2/t/t5003/infozip-symlinks.zip
+ extracting: textfile                
+    linking: symlink                 -> textfile 
+finishing deferred symbolic links:
+  symlink                -> textfile
+prerequisite UNZIP_SYMLINKS ok
+expecting success of 5003.2 'add symlink': 
+	ln -s a a/symlink_to_a
 
---- a	2025-12-18 01:36:02.630773267 +0000
-+++ b	2025-12-18 01:36:02.678773267 +0000
-@@ -1 +1 @@
--0
-+1766021762
-ok 6 - info/refs updates when changes are made
+ok 2 - add symlink
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t4137-apply-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/.git/
-expecting success of 4137.1 'apply_index: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - apply_index: added submodule creates empty directory
+expecting success of 5003.3 'prepare file list': 
+	(cd a && find .) | sort >a.lst
 
-expecting success of 4137.2 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - apply_index: added submodule leaves existing empty directory alone
+ok 3 - prepare file list
 
-expecting success of 4137.3 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - apply_index: replace tracked file with submodule creates empty directory
+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 4137.4 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - apply_index: replace directory with submodule
+expecting success of 5003.5 'add files to repository': 
+	git add a &&
+	GIT_COMMITTER_DATE="2005-05-27 22:00" git commit -m initial
 
-expecting success of 4137.5 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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 5 - apply_index: removed submodule leaves submodule directory and its contents in place
+[master (root-commit) 12a519f] 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 4137.6 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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 6 - apply_index: removed submodule leaves submodule containing a .git directory alone
+expecting success of 5003.6 'setup export-subst and diff attributes': 
+	echo "a/nodiff.* -diff" >>.git/info/attributes &&
+	echo "a/diff.* diff" >>.git/info/attributes &&
+	echo "a/custom.* diff=custom" >>.git/info/attributes &&
+	git config diff.custom.binary true &&
+	echo "substfile?" export-subst >>.git/info/attributes &&
+	git log --max-count=1 "--pretty=format:A${SUBSTFORMAT}O" HEAD \
+		>a/substfile1
 
-expecting success of 4137.7 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: sub1/file1: already exists in working directory
-error: sub1/file2: already exists in working directory
-ok 7 - apply_index: replace submodule with a directory must fail
+ok 6 - setup export-subst and diff attributes
 
-expecting success of 4137.8 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: sub1/file1: already exists in working directory
-error: sub1/file2: already exists in working directory
-ok 8 - apply_index: replace submodule containing a .git directory with a directory must fail
+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
 
-checking known breakage of 4137.9 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
+Cloning into bare repository 'bare.git'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 9 - apply_index: replace submodule with a file must fail # TODO known breakage
+ok 7 - create bare clone
 
-checking known breakage of 4137.10 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 10 - apply_index: replace submodule containing a .git directory with a file must fail # TODO known breakage
+expecting success of 5003.8 'remove ignored file': rm a/ignored
+ok 8 - remove ignored file
 
-expecting success of 4137.11 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - apply_index: modified submodule does not update submodule work tree
+expecting success of 5003.9 'git archive --format=zip': git archive --format=zip HEAD >d.zip
+ok 9 - git archive --format=zip
 
-expecting success of 4137.12 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-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 - apply_index: modified submodule does not update submodule work tree to invalid commit
+checking prerequisite: UNZIP
 
-expecting success of 4137.13 'apply_index: 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.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - apply_index: modified submodule does not update submodule work tree from invalid commit
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
+	"$GIT_UNZIP" -v
+	test $? -ne 127
 
-expecting success of 4137.14 'apply_index: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: sub1: already exists in working directory
-ok 14 - apply_index: added submodule doesn't remove untracked unignored file with same name
+)
+UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
 
-expecting success of 4137.15 'apply_3way: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Falling back to direct application...
-Falling back to direct application...
-Falling back to direct application...
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 15 - apply_3way: added submodule creates empty directory
+Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
+see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
 
-expecting success of 4137.16 'apply_3way: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Falling back to direct application...
-Falling back to direct application...
-Falling back to direct application...
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 16 - apply_3way: added submodule leaves existing empty directory alone
+Compiled with gcc 12.2.0 for Unix (Linux ELF).
 
-expecting success of 4137.17 'apply_3way: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Applied patch to '.gitmodules' cleanly.
-Falling back to direct application...
-Falling back to direct application...
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 17 - apply_3way: replace tracked file with submodule creates empty directory
+UnZip special compilation options:
+        ACORN_FTYPE_NFS
+        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
+        SET_DIR_ATTRIB
+        SYMLINKS (symbolic links supported, if RTL and file system permit)
+        TIMESTAMP
+        UNIXBACKUP
+        USE_EF_UT_TIME
+        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
+        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
+        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
+        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
+        ZIP64_SUPPORT (archives using Zip64 for large files supported)
+        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
+        VMS_TEXT_CONV
+        WILD_STOP_AT_DIR
+        [decryption, version 2.11 of 05 Jan 2007]
 
-expecting success of 4137.18 'apply_3way: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
+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)
 	
-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'.
-Applied patch to '.gitmodules' cleanly.
-Falling back to direct application...
-Falling back to direct application...
-Falling back to direct application...
-Falling back to direct application...
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 18 - apply_3way: replace directory with submodule
+Archive:  ../d.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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 4137.19 'apply_3way: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 5003.11 ' validate filenames': 
+		(cd d/a && find .) | sort >d.lst &&
+		test_cmp a.lst d.lst
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Falling back to direct application...
-Falling back to direct application...
-Falling back to direct application...
-warning: unable to rmdir 'sub1': Directory not empty
-ok 19 - apply_3way: removed submodule leaves submodule directory and its contents in place
+ok 11 -  validate filenames
 
-expecting success of 4137.20 'apply_3way: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 5003.12 ' validate file contents': 
+		diff -r a d/a
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Falling back to direct application...
-Falling back to direct application...
-Falling back to direct application...
-warning: unable to rmdir 'sub1': Directory not empty
-ok 20 - apply_3way: removed submodule leaves submodule containing a .git directory alone
+ok 12 -  validate file contents
 
-expecting success of 4137.21 'apply_3way: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
-Applied patch to '.gitmodules' cleanly.
-Falling back to direct application...
-Performing three-way merge...
-error: sub1/file1: does not exist in index
-error: cannot read the current contents of 'sub1/file1'
-error: sub1/file1: patch does not apply
-Performing three-way merge...
-error: sub1/file2: does not exist in index
-error: cannot read the current contents of 'sub1/file2'
-error: sub1/file2: patch does not apply
-Falling back to direct application...
-ok 21 - apply_3way: replace submodule with a directory must fail
+checking prerequisite: UNZIP_CONVERT
 
-expecting success of 4137.22 'apply_3way: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
-Applied patch to '.gitmodules' cleanly.
-Falling back to direct application...
-Performing three-way merge...
-error: sub1/file1: does not exist in index
-error: cannot read the current contents of 'sub1/file1'
-error: sub1/file1: patch does not apply
-Performing three-way merge...
-error: sub1/file2: does not exist in index
-error: cannot read the current contents of 'sub1/file2'
-error: sub1/file2: patch does not apply
-Falling back to direct application...
-ok 22 - apply_3way: replace submodule containing a .git directory with a directory must fail
+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
 
-checking known breakage of 4137.23 'apply_3way: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+)
+Archive:  /build/reproducible-path/git-2.45.2/t/t5003/infozip-symlinks.zip
+ extracting: textfile                [text]  
+    linking: symlink                 -> textfile 
+finishing deferred symbolic links:
+  symlink                -> textfile
+prerequisite UNZIP_CONVERT ok
+expecting success of 5003.13 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
-Applied patch to '.gitmodules' cleanly.
-Falling back to direct application...
-Falling back to direct application...
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 23 - apply_3way: replace submodule with a file must fail # TODO known breakage
+Archive:  ../d.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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
 
-checking known breakage of 4137.24 'apply_3way: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+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
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-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'.
-Applied patch to '.gitmodules' cleanly.
-Falling back to direct application...
-Falling back to direct application...
-warning: unable to rmdir 'sub1': Directory not empty
-error: unable to write file 'sub1' mode 100644: Directory not empty
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 24 - apply_3way: replace submodule containing a .git directory with a file must fail # TODO known breakage
+ok 14 -  validate that text files are converted
 
-expecting success of 4137.25 'apply_3way: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
+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
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Falling back to direct application...
-warning: unable to rmdir 'sub1': Directory not empty
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 25 - apply_3way: modified submodule does not update submodule work tree
+ok 15 -  validate that binary files are unchanged
 
-expecting success of 4137.26 'apply_3way: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+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
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Falling back to direct application...
-warning: unable to rmdir 'sub1': Directory not empty
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 26 - apply_3way: modified submodule does not update submodule work tree to invalid commit
+ok 16 -  validate that diff files are converted
 
-expecting success of 4137.27 'apply_3way: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
+expecting success of 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
 	
-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'.
-Falling back to direct application...
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4137-apply-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 27 - apply_3way: modified submodule does not update submodule work tree from invalid commit
+ok 17 -  validate that -diff files are unchanged
 
-expecting success of 4137.28 'apply_3way: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
+expecting success of 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
 	
-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'.
-Falling back to direct application...
-error: sub1: patch does not apply
-Falling back to direct application...
-ok 28 - apply_3way: added submodule doesn't remove untracked unignored file with same name
-
-# still have 4 known breakage(s)
-# passed all remaining 24 test(s)
-1..28
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5301-sliding-window.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5301-sliding-window/.git/
-expecting success of 5301.1 'setup': 
-	rm -f .git/index* &&
-	for i in a b c
-	do
-	echo $i >$i &&
-	test-tool genrandom "$i" 32768 >>$i &&
-	git update-index --add $i || return 1
-	done &&
-	echo d >d && cat c >>d && git update-index --add d &&
-	tree=$(git write-tree) &&
-	commit1=$(git commit-tree $tree </dev/null) &&
-	git update-ref HEAD $commit1 &&
-	git repack -a -d &&
-	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
-	pack1=$(ls .git/objects/pack/*.pack) &&
-	test -f "$pack1"
+ok 18 -  validate that custom diff is unchanged 
 
-ok 1 - setup
+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 5301.2 'verify-pack -v, defaults': 
-	git verify-pack -v "$pack1"
+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
 
-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 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 5301.3 'verify-pack -v, packedGitWindowSize == 1 page': 
-	git config core.packedGitWindowSize 512 &&
-	git verify-pack -v "$pack1"
+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
 
-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
+ok 22 - git archive with --output, inferring format (local)
 
-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"
+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
 
-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
+ok 23 - git archive with --output, inferring format (remote)
 
-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"
+expecting success of 5003.24 'git archive --format=zip with prefix': git archive --format=zip --prefix=prefix/ HEAD >e.zip
+ok 24 - git archive --format=zip with prefix
 
-ok 5 - repack -a -d, packedGit{WindowSize,Limit} == 1 page
+expecting success of 5003.25 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../e.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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 5301.6 'verify-pack -v, defaults': 
-	git config --unset core.packedGitWindowSize &&
-	git config --unset core.packedGitLimit &&
-	git verify-pack -v "$pack2"
+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
 
-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
+expecting success of 5003.27 ' validate file contents': 
+		diff -r a e/prefix/a
+	
+ok 27 -  validate file contents
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5004-archive-corner-cases.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+expecting success of 5003.28 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../e.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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
 
-[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 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 5004.2 'tar archive of commit with empty tree': 
-	git archive --format=tar HEAD >empty-with-pax-header.tar &&
-	make_dir extract &&
-	"$TAR" xf empty-with-pax-header.tar -C extract &&
-	check_dir extract
+expecting success of 5003.30 ' validate that binary files are unchanged': 
+		test_cmp_bin a/binary.cr   eol_e/prefix/a/binary.cr &&
+		test_cmp_bin a/binary.crlf eol_e/prefix/a/binary.crlf &&
+		test_cmp_bin a/binary.lf   eol_e/prefix/a/binary.lf
+	
+ok 30 -  validate that binary files are unchanged
 
-ok 2 - tar archive of commit with empty tree
+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 5004.3 'tar archive of empty tree is empty': 
-	git archive --format=tar HEAD: >empty.tar &&
-	test_cmp_bin 10knuls.tar empty.tar
+expecting success of 5003.32 ' validate that -diff files are unchanged': 
+		test_cmp_bin a/nodiff.cr   eol_e/prefix/a/nodiff.cr &&
+		test_cmp_bin a/nodiff.crlf eol_e/prefix/a/nodiff.crlf &&
+		test_cmp_bin a/nodiff.lf   eol_e/prefix/a/nodiff.lf
+	
+ok 32 -  validate that -diff files are unchanged
 
-ok 3 - tar archive of empty tree is empty
+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 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
+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 4 - tar archive of empty tree with prefix
+ok 34 - git archive -0 --format=zip on large files
 
-checking prerequisite: UNZIP
+expecting success of 5003.35 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../large.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNZIP" &&
-	"$GIT_UNZIP" -v
-	test $? -ne 127
+expecting success of 5003.36 ' validate filenames': 
+		(cd large/a && find .) | sort >large.lst &&
+		test_cmp a.lst large.lst
+	
+ok 36 -  validate filenames
 
-)
-UnZip 6.00 of 20 April 2009, by Debian. Original by Info-ZIP.
+expecting success of 5003.37 ' validate file contents': 
+		diff -r a large/a
+	
+ok 37 -  validate file contents
 
-Latest sources and executables are at ftp://ftp.info-zip.org/pub/infozip/ ;
-see ftp://ftp.info-zip.org/pub/infozip/UnZip.html for other sites.
+expecting success of 5003.38 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../large.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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
 
-Compiled with gcc 12.2.0 for Unix (Linux ELF).
+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
 
-UnZip special compilation options:
-        ACORN_FTYPE_NFS
-        COPYRIGHT_CLEAN (PKZIP 0.9x unreducing method not supported)
-        SET_DIR_ATTRIB
-        SYMLINKS (symbolic links supported, if RTL and file system permit)
-        TIMESTAMP
-        UNIXBACKUP
-        USE_EF_UT_TIME
-        USE_UNSHRINK (PKZIP/Zip 1.x unshrinking method supported)
-        USE_DEFLATE64 (PKZIP 4.x Deflate64(tm) supported)
-        UNICODE_SUPPORT [wide-chars, char coding: other] (handle UTF-8 paths)
-        LARGE_FILE_SUPPORT (large files over 2 GiB supported)
-        ZIP64_SUPPORT (archives using Zip64 for large files supported)
-        USE_BZIP2 (PKZIP 4.6+, using bzip2 lib version 1.0.8, 13-Jul-2019)
-        VMS_TEXT_CONV
-        WILD_STOP_AT_DIR
-        [decryption, version 2.11 of 05 Jan 2007]
+expecting success of 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
 
-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=$?
-	} &&
+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
 
-	git archive --format=zip HEAD >empty.zip &&
-	make_dir extract &&
-	(
-		cd extract &&
-		test_expect_code $expect_code "$GIT_UNZIP" ../empty.zip
-	) &&
-	check_dir extract
+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
 
-Archive:  /build/reproducible-path/git-2.45.2/t/t5004/empty.zip
-fc8e0d59c1cc5c14b6919fb2006b27fe337e7d0e
-warning [/build/reproducible-path/git-2.45.2/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 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 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
+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
 
-Archive:  ../prefix.zip
-2093db06f424f426e05da2ca90f40d2663e89387
-   creating: foo/
-ok 6 - zip archive of empty tree with prefix
+ok 44 - git archive --format=zip on large files
 
-expecting success of 5004.7 'archive complains about pathspec on empty tree': 
-	test_must_fail git archive --format=tar HEAD -- foo >/dev/null
+expecting success of 5003.45 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../large-compressed.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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
 
-fatal: pathspec 'foo' did not match any files
-ok 7 - archive complains about pathspec on empty tree
+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 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)
+expecting success of 5003.47 ' validate file contents': 
+		diff -r a large-compressed/a
+	
+ok 47 -  validate file contents
 
-ok 8 - create a commit with an empty subtree
+expecting success of 5003.48 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../large-compressed.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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 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
+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
 
-ok 9 - archive empty subtree with no pathspec
+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 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
+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
 
-ok 10 - archive empty subtree by direct pathspec
+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
 
-checking prerequisite: ZIPINFO
+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 
 
-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"
+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
 
-)
-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" &&
+ok 54 - git archive --format=zip --add-file
 
-	# 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) &&
+expecting success of 5003.55 ' extract ZIP archive': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" ../$zipfile)
+	
+Archive:  ../with_untracked.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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
 
-	# zip them
-	git archive -o many.zip $tree &&
+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
 
-	# 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
+expecting success of 5003.57 ' validate file contents': 
+		diff -r a with_untracked/a
+	
+ok 57 -  validate file contents
 
-[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
+expecting success of 5003.58 ' extract ZIP archive with EOL conversion': 
+		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
+	
+Archive:  ../with_untracked.zip
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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
 
-checking prerequisite: EXPENSIVE
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
+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
 
-)
-prerequisite EXPENSIVE not satisfied
-checking prerequisite: UNZIP_ZIP64_SUPPORT
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNZIP_ZIP64_SUPPORT" &&
+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-UNZIP_ZIP64_SUPPORT" &&
-	"$GIT_UNZIP" -v | grep ZIP64_SUPPORT
+	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
 
 )
-        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)
+prerequisite FUNNYNAMES ok
+Archive:  ../with_file_with_content.zip
+ extracting: pathname with : colon   
+ extracting: hello                   
+ok 65 - git archive --format=zip --add-virtual-file
 
-checking prerequisite: LONG_IS_64BIT
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-LONG_IS_64BIT" &&
+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
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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
+12a519fc3c4c5d893d3a9a1dcb0ee0c286ef4c98
+   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-LONG_IS_64BIT" &&
-	test 8 -le "$(build_option sizeof-long)"
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
 )
-prerequisite LONG_IS_64BIT not satisfied
-ok 13 # skip zip archive with files bigger than 4GB (missing LONG_IS_64BIT,EXPENSIVE of EXPENSIVE,LONG_IS_64BIT,UNZIP,UNZIP_ZIP64_SUPPORT,ZIPINFO)
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5200-update-server-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 5200.2 'create info/refs': 
+	git update-server-info &&
+	test_path_is_file .git/info/refs
 
-ok 14 - tar archive with long paths
+ok 2 - create info/refs
 
-# passed all 14 test(s)
-1..14
+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	2024-11-14 19:35:25.445291999 +0000
++++ b	2024-11-14 19:35:25.517292731 +0000
+@@ -1 +1 @@
+-0
++1731612925
+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	2024-11-14 19:35:25.445291999 +0000
++++ b	2024-11-14 19:35:25.581293383 +0000
+@@ -1 +1 @@
+-0
++1731612925
+ok 6 - info/refs updates when changes are made
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5301-sliding-window.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5301-sliding-window/.git/
+expecting success of 5301.1 'setup': 
+	rm -f .git/index* &&
+	for i in a b c
+	do
+	echo $i >$i &&
+	test-tool genrandom "$i" 32768 >>$i &&
+	git update-index --add $i || return 1
+	done &&
+	echo d >d && cat c >>d && git update-index --add d &&
+	tree=$(git write-tree) &&
+	commit1=$(git commit-tree $tree </dev/null) &&
+	git update-ref HEAD $commit1 &&
+	git repack -a -d &&
+	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
+	pack1=$(ls .git/objects/pack/*.pack) &&
+	test -f "$pack1"
+
+ok 1 - setup
+
+expecting success of 5301.2 'verify-pack -v, defaults': 
+	git verify-pack -v "$pack1"
+
+3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
+ok 2 - verify-pack -v, defaults
+
+expecting success of 5301.3 'verify-pack -v, packedGitWindowSize == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git verify-pack -v "$pack1"
+
+3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
+ok 3 - verify-pack -v, packedGitWindowSize == 1 page
+
+expecting success of 5301.4 'verify-pack -v, packedGit{WindowSize,Limit} == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git config core.packedGitLimit 512 &&
+	git verify-pack -v "$pack1"
+
+3b60f63a6ae089462c1536850930bc628b471412 commit 163 123 12
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 135
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32924
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65713
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98504 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98526
+non delta: 5 objects
+chain length = 1: 1 object
+.git/objects/pack/pack-c862960b478b09c10c646708a768add215077ffb.pack: ok
+ok 4 - verify-pack -v, packedGit{WindowSize,Limit} == 1 page
+
+expecting success of 5301.5 'repack -a -d, packedGit{WindowSize,Limit} == 1 page': 
+	git config core.packedGitWindowSize 512 &&
+	git config core.packedGitLimit 512 &&
+	commit2=$(git commit-tree $tree -p $commit1 </dev/null) &&
+	git update-ref HEAD $commit2 &&
+	git repack -a -d &&
+	test "$(git count-objects)" = "0 objects, 0 kilobytes" &&
+	pack2=$(ls .git/objects/pack/*.pack) &&
+	test -f "$pack2" &&
+	test "$pack1" \!= "$pack2"
+
+ok 5 - repack -a -d, packedGit{WindowSize,Limit} == 1 page
+
+expecting success of 5301.6 'verify-pack -v, defaults': 
+	git config --unset core.packedGitWindowSize &&
+	git config --unset core.packedGitLimit &&
+	git verify-pack -v "$pack2"
+
+18387a63ae69bf35f4c71d97190d0ac78c135dbc commit 211 153 12
+3b60f63a6ae089462c1536850930bc628b471412 commit 9 20 165 1 18387a63ae69bf35f4c71d97190d0ac78c135dbc
+d67b2ae81f0bd18212d239b6a965711041f73739 blob   32770 32789 185
+7c0c57f15aee3c4cbe243c44d3c01ecfa949bb25 blob   32770 32789 32974
+f76f6b9f6aed8209a40d300bf7dcb4fcf9863531 blob   32772 32791 65763
+556c804eac998cc8fa89f225a29870c3d873477b blob   10 22 98554 1 f76f6b9f6aed8209a40d300bf7dcb4fcf9863531
+b7fabea4d93049ea90d45d8252b9a4f8ee7c9c2c tree   116 115 98576
+non delta: 5 objects
+chain length = 1: 2 objects
+.git/objects/pack/pack-2f02d879c6fc547b007694422ca84c5228e10f68.pack: ok
+ok 6 - verify-pack -v, defaults
+
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5150-request-pull.sh ***
@@ -288121,739 +287518,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5303-pack-corruption-resilience.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-expecting success of 5303.1 'initial setup validation': 
-	create_test_files &&
-	create_new_pack &&
-	git prune-packed &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
-30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
-non delta: 1 object
-chain length = 1: 1 object
-chain length = 2: 1 object
-.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
-ok 1 - initial setup validation
-
-expecting success of 5303.2 'create corruption in header of first object': 
-	do_corrupt_object $blob_1 0 < zero &&
-	test_must_fail git cat-file blob $blob_1 > /dev/null &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	test_must_fail git cat-file blob $blob_3 > /dev/null
-
-1+0 records in
-1+0 records out
-1 byte copied, 3.338e-05 s, 30.0 kB/s
-fatal: pack has bad object at offset 12: unknown object type 0
-error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-fatal: packed object 06686a2094b7518d92cd6e26efaab209b398ebd3 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-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
-ok 2 - create corruption in header of first object
-
-expecting success of 5303.3 '... but having a loose copy allows for full recovery': 
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_1 &&
-	mv tmp ${pack}.idx &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-06686a2094b7518d92cd6e26efaab209b398ebd3
-error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-ok 3 - ... but having a loose copy allows for full recovery
-
-expecting success of 5303.4 '... and loose copy of first delta allows for partial recovery': 
-	git prune-packed &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_2 &&
-	mv tmp ${pack}.idx &&
-	test_must_fail git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-30fd6590c6df999b5a77622491bee8cb1b96d807
-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
-error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-ok 4 - ... and loose copy of first delta allows for partial recovery
-
-expecting success of 5303.5 'create corruption in data of first object': 
-	create_new_pack &&
-	git prune-packed &&
-	chmod +w ${pack}.pack &&
-	perl -i.bak -pe "s/ base /abcdef/" ${pack}.pack &&
-	test_must_fail git cat-file blob $blob_1 > /dev/null &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	test_must_fail git cat-file blob $blob_3 > /dev/null
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
-30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
-non delta: 1 object
-chain length = 1: 1 object
-chain length = 2: 1 object
-.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
-error: inflate: data stream error (incorrect data check)
-fatal: packed object 06686a2094b7518d92cd6e26efaab209b398ebd3 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-error: inflate: data stream error (incorrect data check)
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-error: inflate: data stream error (incorrect data check)
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-ok 5 - create corruption in data of first object
-
-expecting success of 5303.6 '... but having a loose copy allows for full recovery': 
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_1 &&
-	mv tmp ${pack}.idx &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-06686a2094b7518d92cd6e26efaab209b398ebd3
-error: inflate: data stream error (incorrect data check)
-error: inflate: data stream error (incorrect data check)
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: inflate: data stream error (incorrect data check)
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-ok 6 - ... but having a loose copy allows for full recovery
-
-expecting success of 5303.7 '... and loose copy of second object allows for partial recovery': 
-	git prune-packed &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_2 &&
-	mv tmp ${pack}.idx &&
-	test_must_fail git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-error: inflate: data stream error (incorrect data check)
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-30fd6590c6df999b5a77622491bee8cb1b96d807
-error: inflate: data stream error (incorrect data check)
-fatal: packed object 06686a2094b7518d92cd6e26efaab209b398ebd3 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-error: inflate: data stream error (incorrect data check)
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: inflate: data stream error (incorrect data check)
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-ok 7 - ... and loose copy of second object allows for partial recovery
-
-expecting success of 5303.8 'create corruption in header of first delta': 
-	create_new_pack &&
-	git prune-packed &&
-	do_corrupt_object $blob_2 0 < zero &&
-	git cat-file blob $blob_1 > /dev/null &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	test_must_fail git cat-file blob $blob_3 > /dev/null
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
-30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
-non delta: 1 object
-chain length = 1: 1 object
-chain length = 2: 1 object
-.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
-1+0 records in
-1+0 records out
-1 byte copied, 3.0776e-05 s, 32.5 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
-fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-ok 8 - create corruption in header of first delta
-
-expecting success of 5303.9 '... but having a loose copy allows for full recovery': 
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_2 &&
-	mv tmp ${pack}.idx &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-30fd6590c6df999b5a77622491bee8cb1b96d807
-error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-ok 9 - ... but having a loose copy allows for full recovery
-
-expecting success of 5303.10 '... and then a repack "clears" the corruption': 
-	do_repack &&
-	git prune-packed &&
-	git verify-pack ${pack}.pack &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-ok 10 - ... and then a repack "clears" the corruption
-
-expecting success of 5303.11 'create corruption in data of first delta': 
-	create_new_pack &&
-	git prune-packed &&
-	chmod +w ${pack}.pack &&
-	perl -i.bak -pe "s/ delta1 /abcdefgh/" ${pack}.pack &&
-	git cat-file blob $blob_1 > /dev/null &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	test_must_fail git cat-file blob $blob_3 > /dev/null
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
-30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
-non delta: 1 object
-chain length = 1: 1 object
-chain length = 2: 1 object
-.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
-error: inflate: data stream error (incorrect data check)
-error: failed to unpack compressed delta at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-error: inflate: data stream error (incorrect data check)
-error: failed to unpack compressed delta at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-ok 11 - create corruption in data of first delta
-
-expecting success of 5303.12 '... but having a loose copy allows for full recovery': 
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_2 &&
-	mv tmp ${pack}.idx &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-30fd6590c6df999b5a77622491bee8cb1b96d807
-error: inflate: data stream error (incorrect data check)
-error: failed to unpack compressed delta at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: inflate: data stream error (incorrect data check)
-error: failed to unpack compressed delta at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-ok 12 - ... but having a loose copy allows for full recovery
-
-expecting success of 5303.13 '... and then a repack "clears" the corruption': 
-	do_repack &&
-	git prune-packed &&
-	git verify-pack ${pack}.pack &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-error: bad packed object CRC for 30fd6590c6df999b5a77622491bee8cb1b96d807
-error: bad packed object CRC for 30fd6590c6df999b5a77622491bee8cb1b96d807
-ok 13 - ... and then a repack "clears" the corruption
-
-expecting success of 5303.14 'corruption in delta base reference of first delta (OBJ_REF_DELTA)': 
-	create_new_pack &&
-	git prune-packed &&
-	do_corrupt_object $blob_2 2 < zero &&
-	git cat-file blob $blob_1 > /dev/null &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	test_must_fail git cat-file blob $blob_3 > /dev/null
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
-30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
-non delta: 1 object
-chain length = 1: 1 object
-chain length = 2: 1 object
-.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
-1+0 records in
-1+0 records out
-1 byte copied, 4.02e-05 s, 24.9 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
-ok 14 - corruption in delta base reference of first delta (OBJ_REF_DELTA)
-
-expecting success of 5303.15 '... but having a loose copy allows for full recovery': 
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_2 &&
-	mv tmp ${pack}.idx &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-30fd6590c6df999b5a77622491bee8cb1b96d807
-error: failed to validate delta base reference at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-ok 15 - ... but having a loose copy allows for full recovery
-
-expecting success of 5303.16 '... and then a repack "clears" the corruption': 
-	do_repack &&
-	git prune-packed &&
-	git verify-pack ${pack}.pack &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-ok 16 - ... and then a repack "clears" the corruption
-
-expecting success of 5303.17 'corruption #0 in delta base reference of first delta (OBJ_OFS_DELTA)': 
-	create_new_pack --delta-base-offset &&
-	git prune-packed &&
-	do_corrupt_object $blob_2 2 < zero &&
-	git cat-file blob $blob_1 > /dev/null &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	test_must_fail git cat-file blob $blob_3 > /dev/null
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
-30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 183 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 132 2215 2 30fd6590c6df999b5a77622491bee8cb1b96d807
-non delta: 1 object
-chain length = 1: 1 object
-chain length = 2: 1 object
-.git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
-1+0 records in
-1+0 records out
-1 byte copied, 3.0075e-05 s, 33.3 kB/s
-fatal: pack has bad object at offset 2032: delta base offset is out of bound
-fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
-fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
-ok 17 - corruption #0 in delta base reference of first delta (OBJ_OFS_DELTA)
-
-expecting success of 5303.18 '... but having a loose copy allows for full recovery': 
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_2 &&
-	mv tmp ${pack}.idx &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-30fd6590c6df999b5a77622491bee8cb1b96d807
-error: failed to validate delta base reference at offset 2034 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
-ok 18 - ... but having a loose copy allows for full recovery
-
-expecting success of 5303.19 '... and then a repack "clears" the corruption': 
-	do_repack --delta-base-offset &&
-	git prune-packed &&
-	git verify-pack ${pack}.pack &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-error: delta base offset out of bound for 30fd6590c6df999b5a77622491bee8cb1b96d807
-ok 19 - ... and then a repack "clears" the corruption
-
-expecting success of 5303.20 'corruption #1 in delta base reference of first delta (OBJ_OFS_DELTA)': 
-	create_new_pack --delta-base-offset &&
-	git prune-packed &&
-	printf "\001" | do_corrupt_object $blob_2 2 &&
-	git cat-file blob $blob_1 > /dev/null &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	test_must_fail git cat-file blob $blob_3 > /dev/null
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
-30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 183 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 132 2215 2 30fd6590c6df999b5a77622491bee8cb1b96d807
-non delta: 1 object
-chain length = 1: 1 object
-chain length = 2: 1 object
-.git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
-1+0 records in
-1+0 records out
-1 byte copied, 4.1141e-05 s, 24.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
-fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
-error: bad offset for revindex
-fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
-ok 20 - corruption #1 in delta base reference of first delta (OBJ_OFS_DELTA)
-
-expecting success of 5303.21 '... but having a loose copy allows for full recovery': 
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_2 &&
-	mv tmp ${pack}.idx &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-30fd6590c6df999b5a77622491bee8cb1b96d807
-error: bad offset for revindex
-error: bad offset for revindex
-error: bad offset for revindex
-error: bad offset for revindex
-error: failed to validate delta base reference at offset 2054 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
-error: bad offset for revindex
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
-ok 21 - ... but having a loose copy allows for full recovery
-
-expecting success of 5303.22 '... and then a repack "clears" the corruption': 
-	do_repack --delta-base-offset &&
-	git prune-packed &&
-	git verify-pack ${pack}.pack &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-error: bad offset for revindex
-error: inflate: data stream error (incorrect header check)
-error: delta data unpack-initial failed
-ok 22 - ... and then a repack "clears" the corruption
-
-expecting success of 5303.23 '... and a redundant pack allows for full recovery too': 
-	do_corrupt_object $blob_2 2 < zero &&
-	git cat-file blob $blob_1 > /dev/null &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	test_must_fail git cat-file blob $blob_3 > /dev/null &&
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_1 &&
-	git hash-object -t blob -w file_2 &&
-	printf "$blob_1\n$blob_2\n" | git pack-objects .git/objects/pack/pack &&
-	git prune-packed &&
-	mv tmp ${pack}.idx &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-1+0 records in
-1+0 records out
-1 byte copied, 3.3861e-05 s, 29.5 kB/s
-fatal: pack has bad object at offset 2032: delta base offset is out of bound
-fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
-fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
-06686a2094b7518d92cd6e26efaab209b398ebd3
-30fd6590c6df999b5a77622491bee8cb1b96d807
-8e27963e1e80900149c7ca3ea5eeb0cf53e9cb23
-error: failed to validate delta base reference at offset 2034 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
-ok 23 - ... and a redundant pack allows for full recovery too
-
-expecting success of 5303.24 'corruption of delta base reference pointing to wrong object': 
-	create_new_pack --delta-base-offset &&
-	git prune-packed &&
-	printf "\220\033" | do_corrupt_object $blob_3 2 &&
-	git cat-file blob $blob_1 >/dev/null &&
-	git cat-file blob $blob_2 >/dev/null &&
-	test_must_fail git cat-file blob $blob_3 >/dev/null
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
-30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 183 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 132 2215 2 30fd6590c6df999b5a77622491bee8cb1b96d807
-non delta: 1 object
-chain length = 1: 1 object
-chain length = 2: 1 object
-.git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
-2+0 records in
-2+0 records out
-2 bytes copied, 3.0415e-05 s, 65.8 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
-ok 24 - corruption of delta base reference pointing to wrong object
-
-expecting success of 5303.25 '... but having a loose copy allows for full recovery': 
-	mv ${pack}.idx tmp &&
-	git hash-object -t blob -w file_3 &&
-	mv tmp ${pack}.idx &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4
-error: failed to apply delta
-ok 25 - ... but having a loose copy allows for full recovery
-
-expecting success of 5303.26 '... and then a repack "clears" the corruption': 
-	do_repack --delta-base-offset --no-reuse-delta &&
-	git prune-packed &&
-	git verify-pack ${pack}.pack &&
-	git cat-file blob $blob_1 > /dev/null &&
-	git cat-file blob $blob_2 > /dev/null &&
-	git cat-file blob $blob_3 > /dev/null
-
-error: bad packed object CRC for 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4
-ok 26 - ... and then a repack "clears" the corruption
-
-expecting success of 5303.27 'corrupting header to have too small output buffer fails unpack': 
-	create_new_pack &&
-	git prune-packed &&
-	printf "\262\001" | do_corrupt_object $blob_1 0 &&
-	test_must_fail git cat-file blob $blob_1 > /dev/null &&
-	test_must_fail git cat-file blob $blob_2 > /dev/null &&
-	test_must_fail git cat-file blob $blob_3 > /dev/null
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
-06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
-30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
-44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
-non delta: 1 object
-chain length = 1: 1 object
-chain length = 2: 1 object
-.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
-2+0 records in
-2+0 records out
-2 bytes copied, 3.1828e-05 s, 62.8 kB/s
-fatal: pack has bad object at offset 12: inflate returned -5
-fatal: packed object 06686a2094b7518d92cd6e26efaab209b398ebd3 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (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
-error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
-fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
-ok 27 - corrupting header to have too small output buffer fails unpack
-
-expecting success of 5303.28 'apply good minimal delta': 
-	printf "\0\1\1X" > minimal_delta &&
-	test-tool delta -p /dev/null minimal_delta /dev/null
-
-ok 28 - apply good minimal delta
-
-expecting success of 5303.29 'apply delta with too many literal bytes': 
-	printf "\0\1\2XX" > too_big_literal &&
-	test_must_fail test-tool delta -p /dev/null too_big_literal /dev/null
-
-error: delta replay has gone wild
-delta operation failed (returned NULL)
-ok 29 - apply delta with too many literal bytes
-
-expecting success of 5303.30 'apply delta with too many copied bytes': 
-	printf "\4\1\221\0\2" > too_big_copy &&
-	printf base >base &&
-	test_must_fail test-tool delta -p base too_big_copy /dev/null
-
-error: delta replay has gone wild
-delta operation failed (returned NULL)
-ok 30 - apply delta with too many copied bytes
-
-expecting success of 5303.31 'apply delta with too few literal bytes': 
-	printf "\0\2\2X" > truncated_delta &&
-	test_must_fail test-tool delta -p /dev/null truncated_delta /dev/null
-
-error: delta replay has gone wild
-delta operation failed (returned NULL)
-ok 31 - apply delta with too few literal bytes
-
-expecting success of 5303.32 'apply delta with too few bytes in base': 
-	printf "\0\1\221\0\1" > truncated_base &&
-	test_must_fail test-tool delta -p /dev/null truncated_base /dev/null
-
-error: delta replay has gone wild
-delta operation failed (returned NULL)
-ok 32 - apply delta with too few bytes in base
-
-expecting success of 5303.33 'apply delta with truncated copy parameters': 
-	printf "\4\2\1X\221" > truncated_copy_delta &&
-	printf base >base &&
-	test_must_fail test-tool delta -p base truncated_copy_delta /dev/null
-
-error: delta replay has gone wild
-delta operation failed (returned NULL)
-ok 33 - apply delta with truncated copy parameters
-
-expecting success of 5303.34 'apply delta with trailing garbage literal': 
-	printf "\0\1\1X\1" > tail_garbage_literal &&
-	test_must_fail test-tool delta -p /dev/null tail_garbage_literal /dev/null
-
-error: delta replay has gone wild
-delta operation failed (returned NULL)
-ok 34 - apply delta with trailing garbage literal
-
-expecting success of 5303.35 'apply delta with trailing garbage copy': 
-	printf "\4\1\1X\221\0\1" > tail_garbage_copy &&
-	printf base >base &&
-	test_must_fail test-tool delta -p /dev/null tail_garbage_copy /dev/null
-
-delta operation failed (returned NULL)
-ok 35 - apply delta with trailing garbage copy
-
-expecting success of 5303.36 'apply delta with trailing garbage opcode': 
-	printf "\0\1\1X\0" > tail_garbage_opcode &&
-	test_must_fail test-tool delta -p /dev/null tail_garbage_opcode /dev/null
-
-error: unexpected delta opcode 0
-delta operation failed (returned NULL)
-ok 36 - apply delta with trailing garbage opcode
-
-# passed all 36 test(s)
-1..36
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5305-include-tag.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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 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.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4216-log-bloom.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4216-log-bloom/.git/
 expecting success of 4216.1 'setup test - repo, commits, commit graph, log outputs': 
@@ -289890,8 +288554,8 @@
 		git commit-graph write --reachable --changed-paths &&
 	grep "{\"hash_version\":1,\"num_hashes\":9,\"bits_per_entry\":15,\"max_changed_paths\":512" trace2-auto.txt
 
-{"event":"data_json","sid":"20251218T013603.384247Z-Hfbad846e-P0000589a","thread":"main","time":"2025-12-18T01:36:03.392438Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.008373,"t_rel":0.000017,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":9,"bits_per_entry":15,"max_changed_paths":512}}
-{"event":"data_json","sid":"20251218T013603.398920Z-Hfbad846e-P000058a8","thread":"main","time":"2025-12-18T01:36:03.402121Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.003400,"t_rel":0.000017,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":9,"bits_per_entry":15,"max_changed_paths":512}}
+{"event":"data_json","sid":"20241114T193528.327849Z-H5c947e1c-P00003811","thread":"main","time":"2024-11-14T19:35:28.336179Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.008557,"t_rel":0.000023,"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":"20241114T193528.382334Z-H5c947e1c-P00003824","thread":"main","time":"2024-11-14T19:35:28.384661Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.002581,"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}}
 ok 134 - persist filter settings
 
 expecting success of 4216.135 'correctly report changes over limit': 
@@ -289994,9 +288658,9 @@
  create mode 100644 foo.txt
  create mode 100644 foo/bar
  create mode 100644 mode/script.sh
-{"event":"data_json","sid":"20251218T013603.464753Z-Hfbad846e-P00005902","thread":"main","time":"2025-12-18T01:36:03.466972Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.002404,"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":"20251218T013603.464753Z-Hfbad846e-P00005902","thread":"main","time":"2025-12-18T01:36:03.466809Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.002240,"t_rel":0.002240,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20251218T013603.464753Z-Hfbad846e-P00005902","thread":"main","time":"2025-12-18T01:36:03.466840Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.002272,"t_rel":0.002272,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"1"}
+{"event":"data_json","sid":"20241114T193528.659328Z-H5c947e1c-P000038b3","thread":"main","time":"2024-11-14T19:35:28.660881Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.001675,"t_rel":0.000014,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
+{"event":"data","sid":"20241114T193528.659328Z-H5c947e1c-P000038b3","thread":"main","time":"2024-11-14T19:35:28.660752Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.001545,"t_rel":0.001545,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20241114T193528.659328Z-H5c947e1c-P000038b3","thread":"main","time":"2024-11-14T19:35:28.660779Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.001574,"t_rel":0.001574,"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(-)
@@ -290005,12 +288669,12 @@
  create mode 100644 foo
  delete mode 100644 foo/bar
  mode change 100644 => 100755 mode/script.sh
-{"event":"data_json","sid":"20251218T013604.001831Z-Hfbad846e-P00005a88","thread":"main","time":"2025-12-18T01:36:04.004998Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.003357,"t_rel":0.000019,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
-{"event":"data","sid":"20251218T013604.001831Z-Hfbad846e-P00005a88","thread":"main","time":"2025-12-18T01:36:04.004660Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.003017,"t_rel":0.003017,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20251218T013604.001831Z-Hfbad846e-P00005a88","thread":"main","time":"2025-12-18T01:36:04.004700Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.003059,"t_rel":0.003059,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
-{"event":"data_json","sid":"20251218T013604.638938Z-Hfbad846e-P00005cac","thread":"main","time":"2025-12-18T01:36:04.641320Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.002577,"t_rel":0.000013,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":11}}
-{"event":"data","sid":"20251218T013604.638938Z-Hfbad846e-P00005cac","thread":"main","time":"2025-12-18T01:36:04.641154Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.002411,"t_rel":0.002411,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20251218T013604.638938Z-Hfbad846e-P00005cac","thread":"main","time":"2025-12-18T01:36:04.641179Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.002437,"t_rel":0.002437,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data_json","sid":"20241114T193529.187563Z-H5c947e1c-P00003998","thread":"main","time":"2024-11-14T19:35:29.197780Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.010431,"t_rel":0.000016,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":10}}
+{"event":"data","sid":"20241114T193529.187563Z-H5c947e1c-P00003998","thread":"main","time":"2024-11-14T19:35:29.197623Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.010272,"t_rel":0.010272,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20241114T193529.187563Z-H5c947e1c-P00003998","thread":"main","time":"2024-11-14T19:35:29.197660Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.010312,"t_rel":0.010312,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"2"}
+{"event":"data_json","sid":"20241114T193529.703455Z-H5c947e1c-P00003a49","thread":"main","time":"2024-11-14T19:35:29.706819Z","file":"commit-graph.c","line":1431,"repo":1,"t_abs":0.003548,"t_rel":0.000018,"nesting":2,"category":"bloom","key":"settings","value":{"hash_version":1,"num_hashes":7,"bits_per_entry":10,"max_changed_paths":11}}
+{"event":"data","sid":"20241114T193529.703455Z-H5c947e1c-P00003a49","thread":"main","time":"2024-11-14T19:35:29.706647Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.003374,"t_rel":0.003374,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20241114T193529.703455Z-H5c947e1c-P00003a49","thread":"main","time":"2024-11-14T19:35:29.706683Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.003413,"t_rel":0.003413,"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': 
@@ -290032,10 +288696,10 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4216-log-bloom/empty/.git/
 [main (root-commit) 9c26810] initial commit
  Author: A U Thor <author@example.com>
-{"event":"data","sid":"20251218T013605.370211Z-Hfbad846e-P00005f08","thread":"main","time":"2025-12-18T01:36:05.373648Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.003715,"t_rel":0.003715,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20251218T013605.370211Z-Hfbad846e-P00005f08","thread":"main","time":"2025-12-18T01:36:05.373668Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.003739,"t_rel":0.003739,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
-{"event":"data","sid":"20251218T013605.370211Z-Hfbad846e-P00005f08","thread":"main","time":"2025-12-18T01:36:05.373675Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.003746,"t_rel":0.003746,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
-{"event":"data","sid":"20251218T013605.370211Z-Hfbad846e-P00005f08","thread":"main","time":"2025-12-18T01:36:05.373681Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.003752,"t_rel":0.003752,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20241114T193529.963692Z-H5c947e1c-P00003adf","thread":"main","time":"2024-11-14T19:35:29.965275Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.001774,"t_rel":0.001774,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20241114T193529.963692Z-H5c947e1c-P00003adf","thread":"main","time":"2024-11-14T19:35:29.965293Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.001794,"t_rel":0.001794,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"0"}
+{"event":"data","sid":"20241114T193529.963692Z-H5c947e1c-P00003adf","thread":"main","time":"2024-11-14T19:35:29.965301Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.001802,"t_rel":0.001802,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"1"}
+{"event":"data","sid":"20241114T193529.963692Z-H5c947e1c-P00003adf","thread":"main","time":"2024-11-14T19:35:29.965308Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.001809,"t_rel":0.001809,"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': 
@@ -290067,10 +288731,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 no-filter
-{"event":"data","sid":"20251218T013605.883697Z-Hfbad846e-P000060a2","thread":"main","time":"2025-12-18T01:36:05.886217Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.002732,"t_rel":0.002732,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20251218T013605.883697Z-Hfbad846e-P000060a2","thread":"main","time":"2025-12-18T01:36:05.886232Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.002749,"t_rel":0.002749,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
-{"event":"data","sid":"20251218T013605.883697Z-Hfbad846e-P000060a2","thread":"main","time":"2025-12-18T01:36:05.886240Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.002756,"t_rel":0.002756,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20251218T013605.883697Z-Hfbad846e-P000060a2","thread":"main","time":"2025-12-18T01:36:05.886246Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.002763,"t_rel":0.002763,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20241114T193530.250025Z-H5c947e1c-P00003b33","thread":"main","time":"2024-11-14T19:35:30.251737Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.001863,"t_rel":0.001863,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20241114T193530.250025Z-H5c947e1c-P00003b33","thread":"main","time":"2024-11-14T19:35:30.251753Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.001879,"t_rel":0.001879,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"3"}
+{"event":"data","sid":"20241114T193530.250025Z-H5c947e1c-P00003b33","thread":"main","time":"2024-11-14T19:35:30.251760Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.001887,"t_rel":0.001887,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20241114T193530.250025Z-H5c947e1c-P00003b33","thread":"main","time":"2024-11-14T19:35:30.251766Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.001893,"t_rel":0.001893,"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': 
@@ -290089,10 +288753,10 @@
 		test_filter_trunc_large 0 trace.event
 	)
 
-{"event":"data","sid":"20251218T013605.971644Z-Hfbad846e-P000060cd","thread":"main","time":"2025-12-18T01:36:05.974207Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.002845,"t_rel":0.002845,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20251218T013605.971644Z-Hfbad846e-P000060cd","thread":"main","time":"2025-12-18T01:36:05.974223Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.002863,"t_rel":0.002863,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20251218T013605.971644Z-Hfbad846e-P000060cd","thread":"main","time":"2025-12-18T01:36:05.974230Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.002870,"t_rel":0.002870,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20251218T013605.971644Z-Hfbad846e-P000060cd","thread":"main","time":"2025-12-18T01:36:05.974236Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.002877,"t_rel":0.002877,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20241114T193530.529761Z-H5c947e1c-P00003b69","thread":"main","time":"2024-11-14T19:35:30.531227Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.001607,"t_rel":0.001607,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20241114T193530.529761Z-H5c947e1c-P00003b69","thread":"main","time":"2024-11-14T19:35:30.531243Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.001624,"t_rel":0.001624,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20241114T193530.529761Z-H5c947e1c-P00003b69","thread":"main","time":"2024-11-14T19:35:30.531249Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.001631,"t_rel":0.001631,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20241114T193530.529761Z-H5c947e1c-P00003b69","thread":"main","time":"2024-11-14T19:35:30.531256Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.001637,"t_rel":0.001637,"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': 
@@ -290123,10 +288787,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-{"event":"data","sid":"20251218T013606.508054Z-Hfbad846e-P00006283","thread":"main","time":"2025-12-18T01:36:06.510204Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.002340,"t_rel":0.002340,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
-{"event":"data","sid":"20251218T013606.508054Z-Hfbad846e-P00006283","thread":"main","time":"2025-12-18T01:36:06.510217Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.002354,"t_rel":0.002354,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
-{"event":"data","sid":"20251218T013606.508054Z-Hfbad846e-P00006283","thread":"main","time":"2025-12-18T01:36:06.510224Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.002361,"t_rel":0.002361,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20251218T013606.508054Z-Hfbad846e-P00006283","thread":"main","time":"2025-12-18T01:36:06.510231Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.002367,"t_rel":0.002367,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20241114T193531.279598Z-H5c947e1c-P00003c3b","thread":"main","time":"2024-11-14T19:35:31.289356Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.009980,"t_rel":0.009980,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"1"}
+{"event":"data","sid":"20241114T193531.279598Z-H5c947e1c-P00003c3b","thread":"main","time":"2024-11-14T19:35:31.289377Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.010002,"t_rel":0.010002,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"1"}
+{"event":"data","sid":"20241114T193531.279598Z-H5c947e1c-P00003c3b","thread":"main","time":"2024-11-14T19:35:31.289385Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.010010,"t_rel":0.010010,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20241114T193531.279598Z-H5c947e1c-P00003c3b","thread":"main","time":"2024-11-14T19:35:31.289392Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.010017,"t_rel":0.010017,"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': 
@@ -290177,22 +288841,22 @@
  Author: A U Thor <author@example.com>
 [main 55bcad0] 6
  Author: A U Thor <author@example.com>
-{"event":"data","sid":"20251218T013607.225792Z-Hfbad846e-P00006460","thread":"main","time":"2025-12-18T01:36:07.227914Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.002326,"t_rel":0.002326,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20251218T013607.225792Z-Hfbad846e-P00006460","thread":"main","time":"2025-12-18T01:36:07.227930Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.002344,"t_rel":0.002344,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20251218T013607.225792Z-Hfbad846e-P00006460","thread":"main","time":"2025-12-18T01:36:07.227937Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.002351,"t_rel":0.002351,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20251218T013607.225792Z-Hfbad846e-P00006460","thread":"main","time":"2025-12-18T01:36:07.227943Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.002357,"t_rel":0.002357,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20251218T013607.235777Z-Hfbad846e-P0000647f","thread":"main","time":"2025-12-18T01:36:07.237808Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.002203,"t_rel":0.002203,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20251218T013607.235777Z-Hfbad846e-P0000647f","thread":"main","time":"2025-12-18T01:36:07.237822Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.002218,"t_rel":0.002218,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20251218T013607.235777Z-Hfbad846e-P0000647f","thread":"main","time":"2025-12-18T01:36:07.237829Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.002225,"t_rel":0.002225,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20251218T013607.235777Z-Hfbad846e-P0000647f","thread":"main","time":"2025-12-18T01:36:07.237835Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.002231,"t_rel":0.002231,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20251218T013607.322092Z-Hfbad846e-P000064a4","thread":"main","time":"2025-12-18T01:36:07.324286Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.002392,"t_rel":0.002392,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
-{"event":"data","sid":"20251218T013607.322092Z-Hfbad846e-P000064a4","thread":"main","time":"2025-12-18T01:36:07.324300Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.002407,"t_rel":0.002407,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
-{"event":"data","sid":"20251218T013607.322092Z-Hfbad846e-P000064a4","thread":"main","time":"2025-12-18T01:36:07.324306Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.002414,"t_rel":0.002414,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
-{"event":"data","sid":"20251218T013607.322092Z-Hfbad846e-P000064a4","thread":"main","time":"2025-12-18T01:36:07.324313Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.002420,"t_rel":0.002420,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
-{"event":"data","sid":"20251218T013607.334152Z-Hfbad846e-P000064c9","thread":"main","time":"2025-12-18T01:36:07.336186Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.002244,"t_rel":0.002244,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
-{"event":"data","sid":"20251218T013607.334152Z-Hfbad846e-P000064c9","thread":"main","time":"2025-12-18T01:36:07.336202Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.002262,"t_rel":0.002262,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
-{"event":"data","sid":"20251218T013607.334152Z-Hfbad846e-P000064c9","thread":"main","time":"2025-12-18T01:36:07.336210Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.002270,"t_rel":0.002270,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
-{"event":"data","sid":"20251218T013607.334152Z-Hfbad846e-P000064c9","thread":"main","time":"2025-12-18T01:36:07.336216Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.002276,"t_rel":0.002276,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20241114T193532.296315Z-H5c947e1c-P00003d04","thread":"main","time":"2024-11-14T19:35:32.302246Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.006177,"t_rel":0.006177,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20241114T193532.296315Z-H5c947e1c-P00003d04","thread":"main","time":"2024-11-14T19:35:32.302269Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.006204,"t_rel":0.006204,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20241114T193532.296315Z-H5c947e1c-P00003d04","thread":"main","time":"2024-11-14T19:35:32.302278Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.006213,"t_rel":0.006213,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20241114T193532.296315Z-H5c947e1c-P00003d04","thread":"main","time":"2024-11-14T19:35:32.302288Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.006223,"t_rel":0.006223,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20241114T193532.343732Z-H5c947e1c-P00003d26","thread":"main","time":"2024-11-14T19:35:32.352605Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.009072,"t_rel":0.009072,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20241114T193532.343732Z-H5c947e1c-P00003d26","thread":"main","time":"2024-11-14T19:35:32.352627Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.009097,"t_rel":0.009097,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20241114T193532.343732Z-H5c947e1c-P00003d26","thread":"main","time":"2024-11-14T19:35:32.352634Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.009105,"t_rel":0.009105,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20241114T193532.343732Z-H5c947e1c-P00003d26","thread":"main","time":"2024-11-14T19:35:32.352641Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.009112,"t_rel":0.009112,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20241114T193532.509191Z-H5c947e1c-P00003d55","thread":"main","time":"2024-11-14T19:35:32.510948Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.001966,"t_rel":0.001966,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"2"}
+{"event":"data","sid":"20241114T193532.509191Z-H5c947e1c-P00003d55","thread":"main","time":"2024-11-14T19:35:32.510964Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.001983,"t_rel":0.001983,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"4"}
+{"event":"data","sid":"20241114T193532.509191Z-H5c947e1c-P00003d55","thread":"main","time":"2024-11-14T19:35:32.510972Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.001991,"t_rel":0.001991,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"2"}
+{"event":"data","sid":"20241114T193532.509191Z-H5c947e1c-P00003d55","thread":"main","time":"2024-11-14T19:35:32.510980Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.001999,"t_rel":0.001999,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
+{"event":"data","sid":"20241114T193532.642394Z-H5c947e1c-P00003d71","thread":"main","time":"2024-11-14T19:35:32.643927Z","file":"commit-graph.c","line":1749,"repo":1,"t_abs":0.001723,"t_rel":0.001723,"nesting":1,"category":"commit-graph","key":"filter-computed","value":"0"}
+{"event":"data","sid":"20241114T193532.642394Z-H5c947e1c-P00003d71","thread":"main","time":"2024-11-14T19:35:32.643944Z","file":"commit-graph.c","line":1751,"repo":1,"t_abs":0.001741,"t_rel":0.001741,"nesting":1,"category":"commit-graph","key":"filter-not-computed","value":"6"}
+{"event":"data","sid":"20241114T193532.642394Z-H5c947e1c-P00003d71","thread":"main","time":"2024-11-14T19:35:32.644012Z","file":"commit-graph.c","line":1753,"repo":1,"t_abs":0.001809,"t_rel":0.001809,"nesting":1,"category":"commit-graph","key":"filter-trunc-empty","value":"0"}
+{"event":"data","sid":"20241114T193532.642394Z-H5c947e1c-P00003d71","thread":"main","time":"2024-11-14T19:35:32.644020Z","file":"commit-graph.c","line":1755,"repo":1,"t_abs":0.001817,"t_rel":0.001817,"nesting":1,"category":"commit-graph","key":"filter-trunc-large","value":"0"}
 ok 140 - Bloom generation backfills empty commits
 
 expecting success of 4216.141 'Bloom reader notices too-small data chunk': 
@@ -290239,315 +288903,737 @@
 1..144
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5306-pack-nobase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5306-pack-nobase/.git/
-expecting success of 5306.1 'setup base': 
-	test_write_lines a b c d e f g h i >text &&
-	echo side >side &&
-	git update-index --add text side &&
-	A=$(echo A | git commit-tree $(git write-tree)) &&
+*** t5303-pack-corruption-resilience.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+expecting success of 5303.1 'initial setup validation': 
+	create_test_files &&
+	create_new_pack &&
+	git prune-packed &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-	echo m >>text &&
-	git update-index text &&
-	B=$(echo B | git commit-tree $(git write-tree) -p $A) &&
-	git update-ref HEAD $B
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
+30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
+non delta: 1 object
+chain length = 1: 1 object
+chain length = 2: 1 object
+.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
+ok 1 - initial setup validation
 
-ok 1 - setup base
+expecting success of 5303.2 'create corruption in header of first object': 
+	do_corrupt_object $blob_1 0 < zero &&
+	test_must_fail git cat-file blob $blob_1 > /dev/null &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	test_must_fail git cat-file blob $blob_3 > /dev/null
 
-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 &&
+1+0 records in
+1+0 records out
+1 byte copied, 3.3704e-05 s, 29.7 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
+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
+ok 2 - create corruption in header of first object
 
-	git --git-dir=../.git cat-file commit $B |
-	git hash-object -t commit -w --stdin &&
+expecting success of 5303.3 '... but having a loose copy allows for full recovery': 
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_1 &&
+	mv tmp ${pack}.idx &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-	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)
+06686a2094b7518d92cd6e26efaab209b398ebd3
+error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+ok 3 - ... but having a loose copy allows for full recovery
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5306-pack-nobase/patch_clone/.git/
-b9ed80ffce4d29008783a547cd99709480fe6c9f
-f9037bf6e8d95d31af48907ab2c93c2d6c2c7fcd
-ok 2 - setup patch_clone
+expecting success of 5303.4 '... and loose copy of first delta allows for partial recovery': 
+	git prune-packed &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_2 &&
+	mv tmp ${pack}.idx &&
+	test_must_fail git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-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 &&
+fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+30fd6590c6df999b5a77622491bee8cb1b96d807
+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
+error: unknown object type 0 at offset 12 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+ok 4 - ... and loose copy of first delta allows for partial recovery
 
-	 git pull ../patch_clone/.git &&
-	 test $(git rev-parse HEAD) = $C
-	)
+expecting success of 5303.5 'create corruption in data of first object': 
+	create_new_pack &&
+	git prune-packed &&
+	chmod +w ${pack}.pack &&
+	perl -i.bak -pe "s/ base /abcdef/" ${pack}.pack &&
+	test_must_fail git cat-file blob $blob_1 > /dev/null &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	test_must_fail git cat-file blob $blob_3 > /dev/null
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5306-pack-nobase/user_clone/.git/
-From ../
- * branch            HEAD       -> FETCH_HEAD
-From ../patch_clone/
- * branch            HEAD       -> FETCH_HEAD
-Updating b9ed80f..12634d7
-Fast-forward
- text | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
-ok 3 - indirectly clone patch_clone
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
+30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
+non delta: 1 object
+chain length = 1: 1 object
+chain length = 2: 1 object
+.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
+error: inflate: data stream error (incorrect data check)
+fatal: packed object 06686a2094b7518d92cd6e26efaab209b398ebd3 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+error: inflate: data stream error (incorrect data check)
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+error: inflate: data stream error (incorrect data check)
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+ok 5 - create corruption in data of first object
 
-expecting success of 5306.4 'clone of patch_clone is incomplete': 
-	(mkdir user_direct &&
-	 cd user_direct &&
-	 git init &&
-	 test_must_fail git fetch ../patch_clone/.git
-	)
+expecting success of 5303.6 '... but having a loose copy allows for full recovery': 
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_1 &&
+	mv tmp ${pack}.idx &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5306-pack-nobase/user_direct/.git/
-error: git upload-pack: git-pack-objects died with error.
-remote: error: Could not read 53030622b7a745eeb28ab02e2e8d26d5e3d5cab4        
-remote: fatal: Failed to traverse parents of commit b9ed80ffce4d29008783a547cd99709480fe6c9f        
-fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
-remote: aborting due to possible repository corruption on the remote side.
-fatal: protocol error: bad pack header
-ok 4 - clone of patch_clone is incomplete
+06686a2094b7518d92cd6e26efaab209b398ebd3
+error: inflate: data stream error (incorrect data check)
+error: inflate: data stream error (incorrect data check)
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: inflate: data stream error (incorrect data check)
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+ok 6 - ... but having a loose copy allows for full recovery
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5307-pack-missing-commit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5307-pack-missing-commit/.git/
-expecting success of 5307.1 'setup': 
-	for i in 1 2 3 4 5
-	do
-		echo "$i" >"file$i" &&
-		git add "file$i" &&
-		test_tick &&
-		git commit -m "$i" &&
-		git tag "tag$i" || return 1
-	done &&
-	obj=$(git rev-parse --verify tag3) &&
-	fanout=$(expr "$obj" : "\(..\)") &&
-	remainder=$(expr "$obj" : "..\(.*\)") &&
-	rm -f ".git/objects/$fanout/$remainder"
+expecting success of 5303.7 '... and loose copy of second object allows for partial recovery': 
+	git prune-packed &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_2 &&
+	mv tmp ${pack}.idx &&
+	test_must_fail git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-[master (root-commit) f1e5f64] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-[master 464ac64] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-[master 4b3f9fe] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[master 4387cd0] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-[master 18dfde5] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file5
-ok 1 - setup
+error: inflate: data stream error (incorrect data check)
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+30fd6590c6df999b5a77622491bee8cb1b96d807
+error: inflate: data stream error (incorrect data check)
+fatal: packed object 06686a2094b7518d92cd6e26efaab209b398ebd3 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+error: inflate: data stream error (incorrect data check)
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: inflate: data stream error (incorrect data check)
+error: failed to read delta base object 06686a2094b7518d92cd6e26efaab209b398ebd3 at offset 12 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+ok 7 - ... and loose copy of second object allows for partial recovery
 
-expecting success of 5307.2 'check corruption': 
-	test_must_fail git fsck
+expecting success of 5303.8 'create corruption in header of first delta': 
+	create_new_pack &&
+	git prune-packed &&
+	do_corrupt_object $blob_2 0 < zero &&
+	git cat-file blob $blob_1 > /dev/null &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	test_must_fail git cat-file blob $blob_3 > /dev/null
 
-error: refs/tags/tag3: invalid sha1 pointer 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-error: HEAD: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-error: HEAD: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-error: refs/heads/master: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-error: refs/heads/master: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-broken link from  commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
-              to  commit 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-missing commit 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-dangling tree 5907482de36080ec355b7811e41e23276d5799ba
-ok 2 - check corruption
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
+30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
+non delta: 1 object
+chain length = 1: 1 object
+chain length = 2: 1 object
+.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
+1+0 records in
+1+0 records out
+1 byte copied, 4.4063e-05 s, 22.7 kB/s
+fatal: pack has bad object at offset 2032: unknown object type 0
+error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+ok 8 - create corruption in header of first delta
 
-expecting success of 5307.3 'rev-list notices corruption (1)': 
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list HEAD
+expecting success of 5303.9 '... but having a loose copy allows for full recovery': 
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_2 &&
+	mv tmp ${pack}.idx &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
-18dfde5380f75061a4c4e203210947d874f34b14
-ok 3 - rev-list notices corruption (1)
+30fd6590c6df999b5a77622491bee8cb1b96d807
+error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+ok 9 - ... but having a loose copy allows for full recovery
 
-expecting success of 5307.4 'rev-list notices corruption (2)': 
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --objects HEAD
+expecting success of 5303.10 '... and then a repack "clears" the corruption': 
+	do_repack &&
+	git prune-packed &&
+	git verify-pack ${pack}.pack &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
-18dfde5380f75061a4c4e203210947d874f34b14
-ok 4 - rev-list notices corruption (2)
+error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: unknown object type 0 at offset 2032 in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+ok 10 - ... and then a repack "clears" the corruption
 
-expecting success of 5307.5 'pack-objects notices corruption': 
-	echo HEAD |
-	test_must_fail git pack-objects --revs pack
+expecting success of 5303.11 'create corruption in data of first delta': 
+	create_new_pack &&
+	git prune-packed &&
+	chmod +w ${pack}.pack &&
+	perl -i.bak -pe "s/ delta1 /abcdefgh/" ${pack}.pack &&
+	git cat-file blob $blob_1 > /dev/null &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	test_must_fail git cat-file blob $blob_3 > /dev/null
 
-error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
-fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
-ok 5 - pack-objects notices corruption
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
+30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
+non delta: 1 object
+chain length = 1: 1 object
+chain length = 2: 1 object
+.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
+error: inflate: data stream error (incorrect data check)
+error: failed to unpack compressed delta at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+error: inflate: data stream error (incorrect data check)
+error: failed to unpack compressed delta at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+ok 11 - create corruption in data of first delta
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5308-pack-detect-duplicates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5308-pack-detect-duplicates/.git/
-expecting success of 5308.1 'setup': 
-	test_oid_cache <<-EOF
-	lo_oid sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18
-	lo_oid sha256:471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe
+expecting success of 5303.12 '... but having a loose copy allows for full recovery': 
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_2 &&
+	mv tmp ${pack}.idx &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-	missing_oid sha1:e69d000000000000000000000000000000000000
-	missing_oid sha256:4720000000000000000000000000000000000000000000000000000000000000
-	EOF
+30fd6590c6df999b5a77622491bee8cb1b96d807
+error: inflate: data stream error (incorrect data check)
+error: failed to unpack compressed delta at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: inflate: data stream error (incorrect data check)
+error: failed to unpack compressed delta at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+ok 12 - ... but having a loose copy allows for full recovery
 
-ok 1 - setup
+expecting success of 5303.13 '... and then a repack "clears" the corruption': 
+	do_repack &&
+	git prune-packed &&
+	git verify-pack ${pack}.pack &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-expecting success of 5308.2 'pack with no duplicates': 
-	create_pack no-dups.pack 1 &&
-	git index-pack --stdin <no-dups.pack
+error: bad packed object CRC for 30fd6590c6df999b5a77622491bee8cb1b96d807
+error: bad packed object CRC for 30fd6590c6df999b5a77622491bee8cb1b96d807
+ok 13 - ... and then a repack "clears" the corruption
 
-pack	2b6334c837f829fc85b8483b099737d46872fcf1
-ok 2 - pack with no duplicates
+expecting success of 5303.14 'corruption in delta base reference of first delta (OBJ_REF_DELTA)': 
+	create_new_pack &&
+	git prune-packed &&
+	do_corrupt_object $blob_2 2 < zero &&
+	git cat-file blob $blob_1 > /dev/null &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	test_must_fail git cat-file blob $blob_3 > /dev/null
 
-expecting success of 5308.3 'index-pack will allow duplicate objects by default': 
-	clear_packs &&
-	create_pack dups.pack 100 &&
-	git index-pack --stdin <dups.pack
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
+30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
+non delta: 1 object
+chain length = 1: 1 object
+chain length = 2: 1 object
+.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
+1+0 records in
+1+0 records out
+1 byte copied, 4.6969e-05 s, 21.3 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
+ok 14 - corruption in delta base reference of first delta (OBJ_REF_DELTA)
 
-pack	9452d1779e83b02a99c82f7dd97a9ed27464a46e
-ok 3 - index-pack will allow duplicate objects by default
+expecting success of 5303.15 '... but having a loose copy allows for full recovery': 
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_2 &&
+	mv tmp ${pack}.idx &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-expecting success of 5308.4 'create batch-check test vectors': 
-	cat >input <<-EOF &&
-	$LO_SHA1
-	$HI_SHA1
-	$MISSING_SHA1
-	EOF
-	cat >expect <<-EOF
-	$LO_SHA1 blob 2
-	$HI_SHA1 blob 0
-	$MISSING_SHA1 missing
-	EOF
+30fd6590c6df999b5a77622491bee8cb1b96d807
+error: failed to validate delta base reference at offset 2054 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+ok 15 - ... but having a loose copy allows for full recovery
 
-ok 4 - create batch-check test vectors
+expecting success of 5303.16 '... and then a repack "clears" the corruption': 
+	do_repack &&
+	git prune-packed &&
+	git verify-pack ${pack}.pack &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-expecting success of 5308.5 'lookup in duplicated pack': 
-	git cat-file --batch-check <input >actual &&
-	test_cmp expect actual
+ok 16 - ... and then a repack "clears" the corruption
 
-ok 5 - lookup in duplicated pack
+expecting success of 5303.17 'corruption #0 in delta base reference of first delta (OBJ_OFS_DELTA)': 
+	create_new_pack --delta-base-offset &&
+	git prune-packed &&
+	do_corrupt_object $blob_2 2 < zero &&
+	git cat-file blob $blob_1 > /dev/null &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	test_must_fail git cat-file blob $blob_3 > /dev/null
 
-expecting success of 5308.6 'index-pack can reject packs with duplicates': 
-	clear_packs &&
-	create_pack dups.pack 2 &&
-	test_must_fail git index-pack --strict --stdin <dups.pack &&
-	test_expect_code 1 git cat-file -e $LO_SHA1
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
+30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 183 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 132 2215 2 30fd6590c6df999b5a77622491bee8cb1b96d807
+non delta: 1 object
+chain length = 1: 1 object
+chain length = 2: 1 object
+.git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
+1+0 records in
+1+0 records out
+1 byte copied, 2.2143e-05 s, 45.2 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
+ok 17 - corruption #0 in delta base reference of first delta (OBJ_OFS_DELTA)
 
-fatal: The same object e68fe8129b546b101aee9510c5328e7f21ca1d18 appears twice in the pack
-ok 6 - index-pack can reject packs with duplicates
+expecting success of 5303.18 '... but having a loose copy allows for full recovery': 
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_2 &&
+	mv tmp ${pack}.idx &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
 
-# passed all 6 test(s)
-1..6
+30fd6590c6df999b5a77622491bee8cb1b96d807
+error: failed to validate delta base reference at offset 2034 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
+ok 18 - ... but having a loose copy allows for full recovery
+
+expecting success of 5303.19 '... and then a repack "clears" the corruption': 
+	do_repack --delta-base-offset &&
+	git prune-packed &&
+	git verify-pack ${pack}.pack &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
+
+error: delta base offset out of bound for 30fd6590c6df999b5a77622491bee8cb1b96d807
+ok 19 - ... and then a repack "clears" the corruption
+
+expecting success of 5303.20 'corruption #1 in delta base reference of first delta (OBJ_OFS_DELTA)': 
+	create_new_pack --delta-base-offset &&
+	git prune-packed &&
+	printf "\001" | do_corrupt_object $blob_2 2 &&
+	git cat-file blob $blob_1 > /dev/null &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	test_must_fail git cat-file blob $blob_3 > /dev/null
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
+30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 183 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 132 2215 2 30fd6590c6df999b5a77622491bee8cb1b96d807
+non delta: 1 object
+chain length = 1: 1 object
+chain length = 2: 1 object
+.git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
+1+0 records in
+1+0 records out
+1 byte copied, 3.4074e-05 s, 29.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
+fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
+error: bad offset for revindex
+fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
+ok 20 - corruption #1 in delta base reference of first delta (OBJ_OFS_DELTA)
+
+expecting success of 5303.21 '... but having a loose copy allows for full recovery': 
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_2 &&
+	mv tmp ${pack}.idx &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
+
+30fd6590c6df999b5a77622491bee8cb1b96d807
+error: bad offset for revindex
+error: bad offset for revindex
+error: bad offset for revindex
+error: bad offset for revindex
+error: failed to validate delta base reference at offset 2054 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
+error: bad offset for revindex
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
+ok 21 - ... but having a loose copy allows for full recovery
+
+expecting success of 5303.22 '... and then a repack "clears" the corruption': 
+	do_repack --delta-base-offset &&
+	git prune-packed &&
+	git verify-pack ${pack}.pack &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
+
+error: bad offset for revindex
+error: inflate: data stream error (incorrect header check)
+error: delta data unpack-initial failed
+ok 22 - ... and then a repack "clears" the corruption
+
+expecting success of 5303.23 '... and a redundant pack allows for full recovery too': 
+	do_corrupt_object $blob_2 2 < zero &&
+	git cat-file blob $blob_1 > /dev/null &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	test_must_fail git cat-file blob $blob_3 > /dev/null &&
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_1 &&
+	git hash-object -t blob -w file_2 &&
+	printf "$blob_1\n$blob_2\n" | git pack-objects .git/objects/pack/pack &&
+	git prune-packed &&
+	mv tmp ${pack}.idx &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
+
+1+0 records in
+1+0 records out
+1 byte copied, 3.3533e-05 s, 29.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
+06686a2094b7518d92cd6e26efaab209b398ebd3
+30fd6590c6df999b5a77622491bee8cb1b96d807
+8e27963e1e80900149c7ca3ea5eeb0cf53e9cb23
+error: failed to validate delta base reference at offset 2034 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack
+ok 23 - ... and a redundant pack allows for full recovery too
+
+expecting success of 5303.24 'corruption of delta base reference pointing to wrong object': 
+	create_new_pack --delta-base-offset &&
+	git prune-packed &&
+	printf "\220\033" | do_corrupt_object $blob_3 2 &&
+	git cat-file blob $blob_1 >/dev/null &&
+	git cat-file blob $blob_2 >/dev/null &&
+	test_must_fail git cat-file blob $blob_3 >/dev/null
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
+30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 183 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 132 2215 2 30fd6590c6df999b5a77622491bee8cb1b96d807
+non delta: 1 object
+chain length = 1: 1 object
+chain length = 2: 1 object
+.git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack: ok
+2+0 records in
+2+0 records out
+2 bytes copied, 3.667e-05 s, 54.5 kB/s
+fatal: pack is corrupted (SHA1 mismatch)
+error: failed to apply delta
+fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-417bd5d650269e28ec8026312b966d0bf1dab469.pack) is corrupt
+ok 24 - corruption of delta base reference pointing to wrong object
+
+expecting success of 5303.25 '... but having a loose copy allows for full recovery': 
+	mv ${pack}.idx tmp &&
+	git hash-object -t blob -w file_3 &&
+	mv tmp ${pack}.idx &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
+
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4
+error: failed to apply delta
+ok 25 - ... but having a loose copy allows for full recovery
+
+expecting success of 5303.26 '... and then a repack "clears" the corruption': 
+	do_repack --delta-base-offset --no-reuse-delta &&
+	git prune-packed &&
+	git verify-pack ${pack}.pack &&
+	git cat-file blob $blob_1 > /dev/null &&
+	git cat-file blob $blob_2 > /dev/null &&
+	git cat-file blob $blob_3 > /dev/null
+
+error: bad packed object CRC for 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4
+ok 26 - ... and then a repack "clears" the corruption
+
+expecting success of 5303.27 'corrupting header to have too small output buffer fails unpack': 
+	create_new_pack &&
+	git prune-packed &&
+	printf "\262\001" | do_corrupt_object $blob_1 0 &&
+	test_must_fail git cat-file blob $blob_1 > /dev/null &&
+	test_must_fail git cat-file blob $blob_2 > /dev/null &&
+	test_must_fail git cat-file blob $blob_3 > /dev/null
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5303-pack-corruption-resilience/.git/
+06686a2094b7518d92cd6e26efaab209b398ebd3 blob   2007 2020 12
+30fd6590c6df999b5a77622491bee8cb1b96d807 blob   168 201 2032 1 06686a2094b7518d92cd6e26efaab209b398ebd3
+44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 blob   117 150 2233 2 30fd6590c6df999b5a77622491bee8cb1b96d807
+non delta: 1 object
+chain length = 1: 1 object
+chain length = 2: 1 object
+.git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack: ok
+2+0 records in
+2+0 records out
+2 bytes copied, 4.1948e-05 s, 47.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
+fatal: packed object 30fd6590c6df999b5a77622491bee8cb1b96d807 (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
+error: failed to read delta base object 30fd6590c6df999b5a77622491bee8cb1b96d807 at offset 2032 from .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack
+fatal: packed object 44cc0b565eca87cf836116abe0f9e2ff4fd0b0a4 (stored in .git/objects/pack/pack-bbfb7489c21eaac49a086215e1c3699ef989f595.pack) is corrupt
+ok 27 - corrupting header to have too small output buffer fails unpack
+
+expecting success of 5303.28 'apply good minimal delta': 
+	printf "\0\1\1X" > minimal_delta &&
+	test-tool delta -p /dev/null minimal_delta /dev/null
+
+ok 28 - apply good minimal delta
+
+expecting success of 5303.29 'apply delta with too many literal bytes': 
+	printf "\0\1\2XX" > too_big_literal &&
+	test_must_fail test-tool delta -p /dev/null too_big_literal /dev/null
+
+error: delta replay has gone wild
+delta operation failed (returned NULL)
+ok 29 - apply delta with too many literal bytes
+
+expecting success of 5303.30 'apply delta with too many copied bytes': 
+	printf "\4\1\221\0\2" > too_big_copy &&
+	printf base >base &&
+	test_must_fail test-tool delta -p base too_big_copy /dev/null
+
+error: delta replay has gone wild
+delta operation failed (returned NULL)
+ok 30 - apply delta with too many copied bytes
+
+expecting success of 5303.31 'apply delta with too few literal bytes': 
+	printf "\0\2\2X" > truncated_delta &&
+	test_must_fail test-tool delta -p /dev/null truncated_delta /dev/null
+
+error: delta replay has gone wild
+delta operation failed (returned NULL)
+ok 31 - apply delta with too few literal bytes
+
+expecting success of 5303.32 'apply delta with too few bytes in base': 
+	printf "\0\1\221\0\1" > truncated_base &&
+	test_must_fail test-tool delta -p /dev/null truncated_base /dev/null
+
+error: delta replay has gone wild
+delta operation failed (returned NULL)
+ok 32 - apply delta with too few bytes in base
+
+expecting success of 5303.33 'apply delta with truncated copy parameters': 
+	printf "\4\2\1X\221" > truncated_copy_delta &&
+	printf base >base &&
+	test_must_fail test-tool delta -p base truncated_copy_delta /dev/null
+
+error: delta replay has gone wild
+delta operation failed (returned NULL)
+ok 33 - apply delta with truncated copy parameters
+
+expecting success of 5303.34 'apply delta with trailing garbage literal': 
+	printf "\0\1\1X\1" > tail_garbage_literal &&
+	test_must_fail test-tool delta -p /dev/null tail_garbage_literal /dev/null
+
+error: delta replay has gone wild
+delta operation failed (returned NULL)
+ok 34 - apply delta with trailing garbage literal
+
+expecting success of 5303.35 'apply delta with trailing garbage copy': 
+	printf "\4\1\1X\221\0\1" > tail_garbage_copy &&
+	printf base >base &&
+	test_must_fail test-tool delta -p /dev/null tail_garbage_copy /dev/null
+
+delta operation failed (returned NULL)
+ok 35 - apply delta with trailing garbage copy
+
+expecting success of 5303.36 'apply delta with trailing garbage opcode': 
+	printf "\0\1\1X\0" > tail_garbage_opcode &&
+	test_must_fail test-tool delta -p /dev/null tail_garbage_opcode /dev/null
+
+error: unexpected delta opcode 0
+delta operation failed (returned NULL)
+ok 36 - apply delta with trailing garbage opcode
+
+# passed all 36 test(s)
+1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5309-pack-delta-cycles.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t5305-include-tag.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-pack	8af524300e46c11647862073e882d467bc0dd22d
-blob
-blob
-ok 1 - index-pack works with a single delta (A->B)
+ok 1 - setup
 
-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
+expecting success of 5305.2 'pack without --include-tag': 
+	packname=$(git pack-objects \
+		--window=0 \
+		test-no-include <obj-list)
 
-pack	80442ca09df79dab1a7b2ac6fc4928bfbeeddc20
-blob
-blob
-ok 2 - index-pack works with a single delta (B->A)
+ok 2 - pack without --include-tag
 
-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
+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
 
-fatal: pack has 1 unresolved delta
-ok 3 - index-pack detects missing base objects
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5305-include-tag/clone.git/.git/
+ok 3 - unpack 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
+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
 
-fatal: pack has 2 unresolved deltas
-ok 4 - index-pack detects REF_DELTA cycles
+ok 4 - check unpacked result (have commit, no tag)
 
-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
+expecting success of 5305.5 'pack with --include-tag': 
+	packname=$(git pack-objects \
+		--window=0 \
+		--include-tag \
+		test-include <obj-list)
 
-pack	8af524300e46c11647862073e882d467bc0dd22d
-fatal: REF_DELTA at offset 12 already resolved (duplicate base e68fe8129b546b101aee9510c5328e7f21ca1d18?)
-ok 5 - failover to an object in another pack
+ok 5 - pack with --include-tag
 
-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
+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
 
-fatal: REF_DELTA at offset 46 already resolved (duplicate base 01d7713666f4de822776c7622c10f1b07de280dc?)
-ok 6 - failover to a duplicate object in the same pack
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5305-include-tag/clone.git/.git/
+ok 6 - unpack objects
 
-# passed all 6 test(s)
-1..6
+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 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.45.2/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.45.2/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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5304-prune.sh ***
@@ -291021,6 +290107,317 @@
 1..31
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5306-pack-nobase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5306-pack-nobase/.git/
+expecting success of 5306.1 'setup base': 
+	test_write_lines a b c d e f g h i >text &&
+	echo side >side &&
+	git update-index --add text side &&
+	A=$(echo A | git commit-tree $(git write-tree)) &&
+
+	echo m >>text &&
+	git update-index text &&
+	B=$(echo B | git commit-tree $(git write-tree) -p $A) &&
+	git update-ref HEAD $B
+
+ok 1 - setup base
+
+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.45.2/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.45.2/t/trash directory.t5306-pack-nobase/user_clone/.git/
+From ../
+ * branch            HEAD       -> FETCH_HEAD
+From ../patch_clone/
+ * branch            HEAD       -> FETCH_HEAD
+Updating b9ed80f..12634d7
+Fast-forward
+ text | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+ok 3 - indirectly clone patch_clone
+
+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.45.2/t/trash directory.t5306-pack-nobase/user_direct/.git/
+error: git upload-pack: git-pack-objects died with error.
+fatal: git upload-pack: aborting due to possible repository corruption on the remote side.
+remote: error: Could not read 53030622b7a745eeb28ab02e2e8d26d5e3d5cab4        
+remote: fatal: Failed to traverse parents of commit b9ed80ffce4d29008783a547cd99709480fe6c9f        
+remote: aborting due to possible repository corruption on the remote side.
+fatal: protocol error: bad pack header
+ok 4 - clone of patch_clone is incomplete
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5307-pack-missing-commit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5307-pack-missing-commit/.git/
+expecting success of 5307.1 'setup': 
+	for i in 1 2 3 4 5
+	do
+		echo "$i" >"file$i" &&
+		git add "file$i" &&
+		test_tick &&
+		git commit -m "$i" &&
+		git tag "tag$i" || return 1
+	done &&
+	obj=$(git rev-parse --verify tag3) &&
+	fanout=$(expr "$obj" : "\(..\)") &&
+	remainder=$(expr "$obj" : "..\(.*\)") &&
+	rm -f ".git/objects/$fanout/$remainder"
+
+[master (root-commit) f1e5f64] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+[master 464ac64] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+[master 4b3f9fe] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[master 4387cd0] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file4
+[master 18dfde5] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file5
+ok 1 - setup
+
+expecting success of 5307.2 'check corruption': 
+	test_must_fail git fsck
+
+error: refs/tags/tag3: invalid sha1 pointer 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+error: HEAD: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+error: HEAD: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+error: refs/heads/master: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+error: refs/heads/master: invalid reflog entry 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+broken link from  commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
+              to  commit 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+missing commit 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+dangling tree 5907482de36080ec355b7811e41e23276d5799ba
+ok 2 - check corruption
+
+expecting success of 5307.3 'rev-list notices corruption (1)': 
+	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list HEAD
+
+error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
+18dfde5380f75061a4c4e203210947d874f34b14
+ok 3 - rev-list notices corruption (1)
+
+expecting success of 5307.4 'rev-list notices corruption (2)': 
+	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git -c core.commitGraph=false rev-list --objects HEAD
+
+error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
+18dfde5380f75061a4c4e203210947d874f34b14
+ok 4 - rev-list notices corruption (2)
+
+expecting success of 5307.5 'pack-objects notices corruption': 
+	echo HEAD |
+	test_must_fail git pack-objects --revs pack
+
+error: Could not read 4b3f9fe85f6c3449091baf9783e2641f38efdd8e
+fatal: Failed to traverse parents of commit 4387cd029ff9d3e6d049717fc055ca04b972bfb8
+ok 5 - pack-objects notices corruption
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5308-pack-detect-duplicates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5308-pack-detect-duplicates/.git/
+expecting success of 5308.1 'setup': 
+	test_oid_cache <<-EOF
+	lo_oid sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18
+	lo_oid sha256:471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe
+
+	missing_oid sha1:e69d000000000000000000000000000000000000
+	missing_oid sha256:4720000000000000000000000000000000000000000000000000000000000000
+	EOF
+
+ok 1 - setup
+
+expecting success of 5308.2 'pack with no duplicates': 
+	create_pack no-dups.pack 1 &&
+	git index-pack --stdin <no-dups.pack
+
+pack	2b6334c837f829fc85b8483b099737d46872fcf1
+ok 2 - pack with no duplicates
+
+expecting success of 5308.3 'index-pack will allow duplicate objects by default': 
+	clear_packs &&
+	create_pack dups.pack 100 &&
+	git index-pack --stdin <dups.pack
+
+pack	9452d1779e83b02a99c82f7dd97a9ed27464a46e
+ok 3 - index-pack will allow duplicate objects by default
+
+expecting success of 5308.4 'create batch-check test vectors': 
+	cat >input <<-EOF &&
+	$LO_SHA1
+	$HI_SHA1
+	$MISSING_SHA1
+	EOF
+	cat >expect <<-EOF
+	$LO_SHA1 blob 2
+	$HI_SHA1 blob 0
+	$MISSING_SHA1 missing
+	EOF
+
+ok 4 - create batch-check test vectors
+
+expecting success of 5308.5 'lookup in duplicated pack': 
+	git cat-file --batch-check <input >actual &&
+	test_cmp expect actual
+
+ok 5 - lookup in duplicated pack
+
+expecting success of 5308.6 'index-pack can reject packs with duplicates': 
+	clear_packs &&
+	create_pack dups.pack 2 &&
+	test_must_fail git index-pack --strict --stdin <dups.pack &&
+	test_expect_code 1 git cat-file -e $LO_SHA1
+
+fatal: The same object e68fe8129b546b101aee9510c5328e7f21ca1d18 appears twice in the pack
+ok 6 - index-pack can reject packs with duplicates
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5309-pack-delta-cycles.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5311-pack-bitmaps-shallow.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5311-pack-bitmaps-shallow/.git/
 expecting success of 5311.1 'setup shallow repo': 
@@ -291105,1189 +290502,985 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5312-prune-corruption.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5312-prune-corruption/.git/
-expecting success of 5312.1 'disable reflogs': 
-	git config core.logallrefupdates false &&
-	git reflog expire --expire=all --all
-
-ok 1 - disable reflogs
-
-expecting success of 5312.2 'create history reachable only from a bogus-named ref': 
-	test_tick && git commit --allow-empty -m main &&
-	base=$(git rev-parse HEAD) &&
-	test_tick && git commit --allow-empty -m bogus &&
-	bogus=$(git rev-parse HEAD) &&
-	git cat-file commit $bogus >saved &&
-	git reset --hard HEAD^
-
-[main (root-commit) 3b20b2b] main
- Author: A U Thor <author@example.com>
-[main dff741f] bogus
- Author: A U Thor <author@example.com>
-HEAD is now at 3b20b2b main
-ok 2 - create history reachable only from a bogus-named ref
-
-expecting success of 5312.3 'pruning does not drop bogus object': 
-	test_when_finished "git hash-object -w -t commit saved" &&
-	create_bogus_ref &&
-	test_must_fail git prune --expire=now &&
-	git cat-file -e $bogus
-
-fatal: unable to parse object: refs/heads/bogus..name
-dff741f7b096cb9d52311824f871001de7742579
-ok 3 - pruning does not drop bogus object
-
-expecting success of 5312.4 'put bogus object into pack': 
-	git tag reachable $bogus &&
-	git repack -ad &&
-	git tag -d reachable &&
-	git cat-file -e $bogus
-
-Deleted tag 'reachable' (was dff741f)
-ok 4 - put bogus object into pack
-
-expecting success of 5312.5 'non-destructive repack bails on bogus ref': 
-	create_bogus_ref &&
-	test_must_fail git repack -adk
-
-fatal: bad object refs/heads/bogus..name
-ok 5 - non-destructive repack bails on bogus ref
-
-expecting success of 5312.6 'GIT_REF_PARANOIA=0 overrides safety': 
-	create_bogus_ref &&
-	GIT_REF_PARANOIA=0 git repack -adk
-
-ok 6 - GIT_REF_PARANOIA=0 overrides safety
-
-expecting success of 5312.7 'destructive repack keeps packed object': 
-	create_bogus_ref &&
-	test_must_fail git repack -Ad --unpack-unreachable=now &&
-	git cat-file -e $bogus &&
-	test_must_fail git repack -ad &&
-	git cat-file -e $bogus
-
-fatal: bad object refs/heads/bogus..name
-fatal: bad object refs/heads/bogus..name
-ok 7 - destructive repack keeps packed object
-
-expecting success of 5312.8 'destructive repack not confused by dangling symref': 
-	test_when_finished "git symbolic-ref -d refs/heads/dangling" &&
-	git symbolic-ref refs/heads/dangling refs/heads/does-not-exist &&
-	git repack -ad &&
-	test_must_fail git cat-file -e $bogus
-
-ok 8 - destructive repack not confused by dangling symref
-
-expecting success of 5312.9 'create history with missing tip commit': 
-	test_tick && git commit --allow-empty -m one &&
-	recoverable=$(git rev-parse HEAD) &&
-	git cat-file commit $recoverable >saved &&
-	test_tick && git commit --allow-empty -m two &&
-	missing=$(git rev-parse HEAD) &&
-	git checkout --detach $base &&
-	rm .git/objects/$(echo $missing | sed "s,..,&/,") &&
-	test_must_fail git cat-file -e $missing
-
-[main 15af5e6] one
- Author: A U Thor <author@example.com>
-[main 8c5ee6a] two
- Author: A U Thor <author@example.com>
-HEAD is now at 3b20b2b main
-ok 9 - create history with missing tip commit
-
-expecting success of 5312.10 'pruning with a corrupted tip does not drop history': 
-	test_when_finished "git hash-object -w -t commit saved" &&
-	test_must_fail git prune --expire=now &&
-	git cat-file -e $recoverable
-
-fatal: unable to parse object: refs/heads/main
-15af5e642cdab3c95868cf2b3d372994b5296daa
-ok 10 - pruning with a corrupted tip does not drop history
-
-expecting success of 5312.11 'pack-refs does not silently delete broken loose ref': 
-	git pack-refs --all --prune &&
-	echo $missing >expect &&
-	git rev-parse refs/heads/main >actual &&
-	test_cmp expect actual
-
-error: refs/heads/main does not point to a valid object!
-ok 11 - pack-refs does not silently delete broken loose ref
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5314-pack-cycle-detection.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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^
+*** t5300-pack-object.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-[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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5313-pack-bounds-checks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5313-pack-bounds-checks/.git/
-expecting success of 5313.1 'setup': 
-	test_oid_cache <<-EOF
-	oid000 sha1:1485
-	oid000 sha256:4222
-
-	oidfff sha1:74
-	oidfff sha256:1350
-	EOF
-
-ok 1 - setup
+expecting success of 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
 
-expecting success of 5313.2 'set up base packfile and variables': 
-	# the hash of this content starts with ff, which
-	# makes some later computations much simpler
-	test_oid oidfff >file &&
-	git add file &&
-	git commit -m base &&
-	git repack -ad &&
-	base=$(echo .git/objects/pack/*) &&
-	chmod +w $base &&
-	mkdir base-backup &&
-	cp $base base-backup/ &&
-	object=$(git rev-parse HEAD:file)
 
-[master (root-commit) 6c5620f] base
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 file
-ok 2 - set up base packfile and variables
-
-expecting success of 5313.3 'pack/index object count mismatch': 
-	do_pack $object &&
-	munge $pack 8 "\377\0\0\0" &&
-	clear_base &&
-
-	# We enumerate the objects from the completely-fine
-	# .idx, but notice later that the .pack is bogus
-	# and fail to show any data.
-	echo "$object missing" >expect &&
-	git cat-file --batch-all-objects --batch-check >actual &&
-	test_cmp expect actual &&
-
-	# ...and here fail to load the object (without segfaulting),
-	# but fallback to a good copy if available.
-	test_must_fail git cat-file blob $object &&
-	restore_base &&
-	git cat-file blob $object >actual &&
-	test_cmp file actual &&
-
-	# ...and make sure that index-pack --verify, which has its
-	# own reading routines, does not segfault.
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 3.4712e-05 s, 115 kB/s
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-fatal: git cat-file fff0a2476aa5c8e60a3ef21cfc66e0cc670920be: bad file
-error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
-fatal: data too large to fit into virtual memory space
-ok 3 - pack/index object count mismatch
-
-expecting success of 5313.4 'matched bogus object count': 
-	do_pack $object &&
-	munge $pack 8 "\377\0\0\0" &&
-	munge $idx $((255 * 4)) "\377\0\0\0" &&
-	clear_base &&
-
-	# Unlike above, we should notice early that the .idx is totally
-	# bogus, and not even enumerate its contents.
-	git cat-file --batch-all-objects --batch-check >actual &&
-	test_must_be_empty actual &&
-
-	# But as before, we can do the same object-access checks.
-	test_must_fail git cat-file blob $object &&
-	restore_base &&
-	git cat-file blob $object >actual &&
-	test_cmp file actual &&
-
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 4.2794e-05 s, 93.5 kB/s
-4+0 records in
-4+0 records out
-4 bytes copied, 4.5748e-05 s, 87.4 kB/s
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-fatal: git cat-file fff0a2476aa5c8e60a3ef21cfc66e0cc670920be: bad file
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
-fatal: Cannot open existing pack idx file for '.git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx'
-ok 4 - matched bogus object count
-
-expecting success of 5313.5 'bogus object offset (v1)': 
-	do_pack $object --index-version=1 &&
-	munge $idx $((4 * 256)) "\377\0\0\0" &&
-	clear_base &&
-	test_must_fail git cat-file blob $object &&
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 3.4803e-05 s, 115 kB/s
-fatal: offset beyond end of packfile (truncated pack?)
-fatal: offset beyond end of packfile (truncated pack?)
-ok 5 - bogus object offset (v1)
-
-expecting success of 5313.6 'bogus object offset (v2, no msb)': 
-	do_pack $object --index-version=2 &&
-	munge $idx $(ofs_table 1) "\0\377\0\0" &&
-	clear_base &&
-	test_must_fail git cat-file blob $object &&
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 4.2875e-05 s, 93.3 kB/s
-fatal: offset beyond end of packfile (truncated pack?)
-fatal: offset beyond end of packfile (truncated pack?)
-ok 6 - bogus object offset (v2, no msb)
-
-expecting success of 5313.7 'bogus offset into v2 extended table': 
-	do_pack $object --index-version=2 &&
-	munge $idx $(ofs_table 1) "\377\0\0\0" &&
-	clear_base &&
-	test_must_fail git cat-file blob $object &&
-	test_must_fail git index-pack --verify $pack
-
-4+0 records in
-4+0 records out
-4 bytes copied, 3.8358e-05 s, 104 kB/s
-fatal: size_t overflow: 2130706432 * 8
-fatal: offset before start of pack index for .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack (corrupt index?)
-ok 7 - bogus offset into v2 extended table
-
-expecting success of 5313.8 'bogus offset inside v2 extended table': 
-	# We need two objects here, so we can plausibly require
-	# an extended table (if the first object were larger than 2^31).
-	#
-	# Note that the value is important here. We want $object as
-	# the second entry in sorted-hash order. The hash of this object starts
-	# with "000", which sorts before that of $object (which starts
-	# with "fff").
-	second=$(test_oid oid000 | git hash-object -w --stdin) &&
-	do_pack "$object $second" --index-version=2 &&
-
-	# We have to make extra room for the table, so we cannot
-	# just munge in place as usual.
-	{
-		dd if=$idx bs=1 count=$(($(ofs_table 2) + 4)) &&
-		printf "\200\0\0\0" &&
-		printf "\377\0\0\0\0\0\0\0" &&
-		dd if=$idx bs=1 skip=$(extended_table 2)
-	} >tmp &&
-	mv tmp "$idx" &&
-	clear_base &&
-	test_must_fail git cat-file blob $object &&
-	test_must_fail git index-pack --verify $pack
-
-1084+0 records in
-1084+0 records out
-1084 bytes (1.1 kB, 1.1 KiB) copied, 0.00167608 s, 647 kB/s
-40+0 records in
-40+0 records out
-40 bytes copied, 8.4587e-05 s, 473 kB/s
-fatal: offset before end of packfile (broken .idx?)
-fatal: offset before end of packfile (broken .idx?)
-ok 8 - bogus offset inside v2 extended table
-
-expecting success of 5313.9 'bogus OFS_DELTA in packfile': 
-	# Generate a pack with a delta in it.
-	base=$(test-tool genrandom foo 3000 | git hash-object --stdin -w) &&
-	delta=$(test-tool genrandom foo 2000 | git hash-object --stdin -w) &&
-	do_pack "$base $delta" --delta-base-offset &&
-	rm -f .git/objects/??/* &&
-
-	# Double check that we have the delta we expect.
-	echo $base >expect &&
-	echo $delta | git cat-file --batch-check="%(deltabase)" >actual &&
-	test_cmp expect actual &&
-
-	# Now corrupt it. We assume the varint size for the delta is small
-	# enough to fit in the first byte (which it should be, since it
-	# is a pure deletion from the base), and that original ofs_delta
-	# takes 2 bytes (which it should, as it should be ~3000).
-	ofs=$(git show-index <$idx | grep $delta | cut -d" " -f1) &&
-	munge $pack $(($ofs + 1)) "\177\377" &&
-	test_must_fail git cat-file blob $delta >/dev/null
-
-2+0 records in
-2+0 records out
-2 bytes copied, 3.8017e-05 s, 52.6 kB/s
-error: bad offset for revindex
-fatal: packed object 49fca29a258fafab9eb7e08a4325c335fa999cb6 (stored in .git/objects/pack/pack-8b2bcfe25ac8b931c950b271f97a8d767c427364.pack) is corrupt
-ok 9 - bogus OFS_DELTA in packfile
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5315-pack-objects-compression.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+ create mode 100644 one.t
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 2 - setup pack-object <stdin
 
-expecting success of 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 5300.3 'pack-object <stdin parsing: basic [|--revs]': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	EOF
 
-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
+	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 &&
 
-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
+	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
 
-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
+260a913b65cbec25b7e224d8d3c7360245c0367a
+91db7b4b856b00c3e675824c5bc5389b6810037a
+ok 3 - pack-object <stdin parsing: basic [|--revs]
 
-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 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
 
-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
+	sed "s/^> //g" >err.expect <<-EOF &&
+	fatal: expected object ID, got garbage:
+	>  garbage
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5316-pack-delta-depth.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5316-pack-delta-depth/.git/
-expecting success of 5316.1 'create series of packs': 
-	test-tool genrandom foo 4096 >content &&
-	prev= &&
-	for i in $(test_seq 1 10)
-	do
-		cat content >file &&
-		echo $i >>file &&
-		git add file &&
-		git commit -m $i &&
-		cur=$(git rev-parse HEAD^{tree}) &&
-		{
-			if test -n "$prev"
-			then
-				echo "-$prev"
-			fi &&
-			echo $cur &&
-			echo "$(git rev-parse :file) file"
-		} | git pack-objects --stdout >tmp &&
-		GIT_TRACE2_EVENT=$PWD/trace \
-		git index-pack -v --stdin --fix-thin <tmp || return 1 &&
-		grep -c region_enter.*progress trace >enter &&
-		grep -c region_leave.*progress trace >leave &&
-		test_cmp enter leave &&
-		prev=$cur
-	done
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects bad-line-stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
 
-[master (root-commit) adcc457] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), 4.09 KiB | 4.09 MiB/s, done.
-pack	88638646d0a7f1051038ae78ad0195c19aa7c5c8
-[master a2de7f9] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
-Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
-pack	711435b7279aca4d33efb91db771f9cf7725ff05
-[master 39a8dd7] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
-Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
-pack	46e7d03099b67170a542956fe351ceef9e70ff92
-[master 42be96b] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
-Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
-pack	30ce91502db16f0438633eccad0bf358e5ade542
-[master a2e6759] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
-Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
-pack	8cab6f2a4762ee6565a978b114f2cc3b20dbb987
-[master eb02d62] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
-Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
-pack	36e62c0a922f9fdd0eaa885dbbd08ea34de4ecc9
-[master 954149f] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
-Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
-pack	07f2e882a14adf7568f1e390177bbf8f9731ef78
-[master 13c477a] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
-Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
-pack	9514d2d071de63aee58c0b845108590565255b15
-[master 34341f7] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
-Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
-pack	b604d4190b1d2a96d6304eb045f3fbc6f2f9ab97
-[master baec731] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
-Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
-pack	83f4c28b023cb2892e2574bcca33931b75bc600a
-ok 1 - create series of packs
+	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
 
-expecting success of 5316.2 'packing produces a long delta': 
-	# Use --window=0 to make sure we are seeing reused deltas,
-	# not computing a new long chain.
-	pack=$(git pack-objects --all --window=0 </dev/null pack) &&
-	echo 9 >expect &&
-	max_chain pack-$pack.pack >actual &&
-	test_cmp expect actual
+ok 4 - pack-object <stdin parsing: [|--revs] bad line
 
-ok 2 - packing produces a long delta
+expecting success of 5300.5 'pack-object <stdin parsing: [|--revs] empty line': 
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
 
-expecting success of 5316.3 '--depth limits depth': 
-	pack=$(git pack-objects --all --depth=5 </dev/null pack) &&
-	echo 5 >expect &&
-	max_chain pack-$pack.pack >actual &&
-	test_cmp expect actual
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
 
-ok 3 - --depth limits depth
+	sed -e "s/^> //g" -e "s/Z$//g" >err.expect <<-EOF &&
+	fatal: expected object ID, got garbage:
+	>  Z
 
-expecting success of 5316.4 '--depth=0 disables deltas': 
-	pack=$(git pack-objects --all --depth=0 </dev/null pack) &&
-	echo 0 >expect &&
-	max_chain pack-$pack.pack >actual &&
-	test_cmp expect actual
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects empty-line-stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
 
-ok 4 - --depth=0 disables deltas
+	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 5316.5 'negative depth disables deltas': 
-	pack=$(git pack-objects --all --depth=-1 </dev/null pack) &&
-	echo 0 >expect &&
-	max_chain pack-$pack.pack >actual &&
-	test_cmp expect actual
+91db7b4b856b00c3e675824c5bc5389b6810037a
+ok 5 - pack-object <stdin parsing: [|--revs] empty line
 
-ok 5 - negative depth disables deltas
+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
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5317-pack-objects-filter-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/.git/
-expecting success of 5317.1 'setup r1': 
-	git init r1 &&
-	for n in 1 2 3 4 5
-	do
-		echo "This is file: $n" > r1/file.$n &&
-		git -C r1 add file.$n &&
-		git -C r1 commit -m "$n" || return 1
-	done
+	# 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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r1/.git/
-[main (root-commit) a56c7ae] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.1
-[main 7d743f2] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.2
-[main fcc1d33] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.3
-[main e1d918e] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.4
-[main 90f11b5] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.5
-ok 1 - setup r1
+	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 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 &&
+ok 6 - pack-object <stdin parsing: [|--revs] with --stdin
 
-	git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
+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
-	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
+	# 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
 
-f8dba5b5a8cb3bf6f89b1b7a911fa01dfdb554ba
-ok 2 - verify blob count in normal packfile
+ok 7 - pack-object <stdin parsing: --stdin-packs handles garbage
 
-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 5300.8 'pack without delta': 
+	packname_1=$(git pack-objects --progress --window=0 test-1 \
+			<obj-list 2>stderr) &&
+	check_deltas stderr = 0
 
-	git -C r1 verify-pack -v ../filter.pack >verify_result &&
-	! grep blob verify_result
+ok 8 - pack without delta
 
-74f9b05b95a30d347d8fdd7d07c62dd3cb5bc506
-ok 3 - verify blob:none packfile has no blobs
+expecting success of 5300.9 'pack-objects with bogus arguments': 
+	test_must_fail git pack-objects --window=0 test-1 blah blah <obj-list
 
-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
+usage: git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]
+   or: git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]
 
-ok 4 - verify blob:none packfile without --stdout
+    -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-]delta-islands  respect islands during delta compression
+    --[no-]uri-protocol <protocol>
+                          exclude any configured uploadpack.blobpackfileuri with this protocol
 
-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 &&
+ok 9 - pack-objects with bogus arguments
 
-	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 5300.10 'unpack without delta': 
+	check_unpack test-1-${packname_1} obj-list
 
-	test_cmp expected observed
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
+ok 10 - unpack without delta
 
-ok 5 - verify normal and blob:none packfiles have same commits/trees
+expecting success of 5300.11 'unpack without delta (core.fsyncmethod=batch)': 
+	check_unpack test-1-${packname_1} obj-list "$BATCH_CONFIGURATION"
 
-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.45.2/t/trash directory.t5300-pack-object/git2/
+ok 11 - unpack without delta (core.fsyncmethod=batch)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r5/.git/
-[main (root-commit) fbd86ca] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-fatal: bad tree object 205f6b799e7d5c2524468ca006a0131aa57ecce7
-ok 6 - get an error for missing tree object
+expecting success of 5300.12 'pack with REF_DELTA': 
+	packname_2=$(git pack-objects --progress test-2 <obj-list 2>stderr) &&
+	check_deltas stderr -gt 0
 
-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
+ok 12 - pack with REF_DELTA
 
-[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 5300.13 'unpack with REF_DELTA': 
+	check_unpack test-2-${packname_2} obj-list
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
+ok 13 - unpack with REF_DELTA
 
-a6f7596938aae585d3cefef3aa3c06c5b75da36b
-ok 8 - verify tree:0 packfile has no blobs or trees
+expecting success of 5300.14 'unpack with REF_DELTA (core.fsyncmethod=batch)': 
+       check_unpack test-2-${packname_2} obj-list "$BATCH_CONFIGURATION"
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
+ok 14 - unpack with REF_DELTA (core.fsyncmethod=batch)
 
-2abcb6db3990fe53c59fd41f9590643ae34427f0
-ok 9 - grab tree directly when using tree:0
+expecting success of 5300.15 'pack with OFS_DELTA': 
+	packname_3=$(git pack-objects --progress --delta-base-offset test-3 \
+			<obj-list 2>stderr) &&
+	check_deltas stderr -gt 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
+ok 15 - pack with OFS_DELTA
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r2/.git/
-[main (root-commit) 0c54972] 1000
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 large.1000
-[main fdc71e4] 10000
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 large.10000
-ok 10 - setup r2
+expecting success of 5300.16 'unpack with OFS_DELTA': 
+	check_unpack test-3-${packname_3} obj-list
 
-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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
+ok 16 - unpack with OFS_DELTA
 
-	git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../all.pack &&
+expecting success of 5300.17 'unpack with OFS_DELTA (core.fsyncmethod=batch)': 
+	check_unpack test-3-${packname_3} obj-list "$BATCH_CONFIGURATION"
 
-	git -C r2 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
+ok 17 - unpack with OFS_DELTA (core.fsyncmethod=batch)
 
-	test_cmp expected observed
+expecting success of 5300.18 '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
 
-2a8bc18f1802fcc19e573eb38f1963ba344c580b
-ok 11 - verify blob count in normal packfile
+ok 18 - compare delta flavors
 
-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 &&
+expecting success of 5300.19 'use packed objects': 
+	check_use_objects test-1-${packname_1}
 
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	! grep blob verify_result
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
+ok 19 - use packed objects
 
-d9abed358fce3ac0869120aa06e2664d45a80459
-ok 12 - verify blob:limit=500 omits all blobs
+expecting success of 5300.20 'use packed deltified (REF_DELTA) objects': 
+	check_use_objects test-2-${packname_2}
 
-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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
+ok 20 - use packed deltified (REF_DELTA) objects
 
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	! grep blob verify_result
+expecting success of 5300.21 'use packed deltified (OFS_DELTA) objects': 
+	check_use_objects test-3-${packname_3}
 
-d9abed358fce3ac0869120aa06e2664d45a80459
-ok 13 - verify blob:limit=1000
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
+ok 21 - use packed deltified (OFS_DELTA) objects
 
-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 &&
+expecting success of 5300.22 '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
+	)
 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/missing-pack/.git/
+keep	ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
+ok 22 - survive missing objects/pack directory
 
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+expecting success of 5300.23 'verify pack': 
+	git verify-pack test-1-${packname_1}.idx \
+		test-2-${packname_2}.idx \
+		test-3-${packname_3}.idx
 
-	test_cmp expected observed
+ok 23 - verify pack
 
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 14 - verify blob:limit=1001
+expecting success of 5300.24 'verify pack -v': 
+	git verify-pack -v test-1-${packname_1}.idx \
+		test-2-${packname_2}.idx \
+		test-3-${packname_3}.idx
 
-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 &&
+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 24 - verify pack -v
 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
+expecting success of 5300.25 '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
 
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+fatal: sha1 file 'test-3.idx' validation error
+ok 25 - verify-pack catches mismatched .idx and .pack files
 
-	test_cmp expected observed
+expecting success of 5300.26 '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
 
-2a8bc18f1802fcc19e573eb38f1963ba344c580b
-ok 15 - verify blob:limit=10001
+1+0 records in
+1+0 records out
+1 byte copied, 3.4816e-05 s, 28.7 kB/s
+fatal: pack signature mismatch
+ok 26 - verify-pack catches a corrupted pack signature
 
-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 &&
+expecting success of 5300.27 '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
 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
+1+0 records in
+1+0 records out
+1 byte copied, 0.0188919 s, 0.1 kB/s
+fatal: pack version 10 unsupported
+ok 27 - verify-pack catches a corrupted pack version
 
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+expecting success of 5300.28 '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
 
-	test_cmp expected observed
+1+0 records in
+1+0 records out
+1 byte copied, 3.5116e-05 s, 28.5 kB/s
+fatal: pack has bad object at offset 12: unknown object type 0
+ok 28 - verify-pack catches a corrupted type/size of the 1st packed object data
 
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 16 - verify blob:limit=1k
+expecting success of 5300.29 '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
 
-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 &&
+20+0 records in
+20+0 records out
+20 bytes copied, 0.0109324 s, 1.8 kB/s
+fatal: sha1 file 'test-3.idx' validation error
+ok 29 - verify-pack catches a corrupted sum of the index file itself
 
-	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 &&
+expecting success of 5300.30 '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 -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+	git index-pack --promisor=message test-3.pack &&
+	cmp test-3.idx test-1-${packname_1}.idx &&
+	echo message >expect &&
+	test_cmp expect test-3.promisor &&
 
-	test_cmp expected observed
+	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 &&
 
-caafb8a9cc92845f6f65afdea7e6fac6add3e5df
-ok 17 - verify explicitly specifying oversized blob in input
+	git index-pack test-3.pack &&
+	cmp test-3.idx test-2-${packname_2}.idx &&
 
-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 &&
+	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 -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r2 index-pack ../filter.pack &&
+	git index-pack test-3.pack &&
+	cmp test-3.idx test-3-${packname_3}.idx &&
 
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+	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 &&
 
-	test_cmp expected observed
+	:
 
-2a8bc18f1802fcc19e573eb38f1963ba344c580b
-ok 18 - verify blob:limit=1m
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
+3aa241e415f2f03a6a2e7845c75d8ac80cdad5c5
+ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
+ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 30 - build pack index for an existing pack
 
-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 &&
+expecting success of 5300.31 'unpacking with --strict': 
 
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep -E "commit|tree" verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+	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
+	)
 
-	test_cmp expected observed
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5300-pack-object/test-6/.git/
+fatal: object of unexpected type
+ok 31 - unpacking with --strict
 
-ok 19 - verify normal and blob:limit packfiles have same commits/trees
+expecting success of 5300.32 'index-pack with --strict': 
 
-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 &&
+	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
+	)
 
-	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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5300-pack-object/test-8/.git/
+fatal: did not receive expected object 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02
+pack	499fed00672b4ac4e35132711ee1664a089f355e
+ok 32 - index-pack with --strict
 
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+expecting success of 5300.33 '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_cmp expected observed
+		commit: this is a commit with bad emails
 
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 20 - verify small limit and big limit results in small limit
+		EOF
+		git hash-object --literally -t commit -w --stdin <commit >commit_list &&
+		git pack-objects test <commit_list >pack-name
+	)
 
-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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 33 - setup for --strict and --fsck-objects downgrading fsck msgs
 
-	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 5300.34 'index-pack with --strict downgrading fsck msgs': 
+	test_with_bad_commit --strict --strict="missingEmail=ignore"
 
-	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
+ok 34 - index-pack with --strict downgrading fsck msgs
 
-	test_cmp expected observed
+expecting success of 5300.35 'index-pack with --fsck-objects downgrading fsck msgs': 
+	test_with_bad_commit --fsck-objects --fsck-objects="missingEmail=ignore"
 
-045779e5722283ca4bbec3b5a9285c0e10027033
-ok 21 - verify big limit and small limit results in small limit
+error: object 754157ff66855f3f8d7afaa92a2c052776b99a16: missingEmail: invalid author/committer line - missing email
+fatal: fsck error in packed object
+e4e1649155bf444fbd9cd85e376628d6eaf3d3bd
+ok 35 - index-pack with --fsck-objects downgrading fsck msgs
 
-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 5300.36 'cleanup for --strict and --fsck-objects downgrading fsck msgs': 
+	rm -rf strict
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r3/.git/
-[main (root-commit) b18fcc1] sparse
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 dir1/sparse1
- create mode 100644 dir1/sparse2
- create mode 100644 sparse1
- create mode 100644 sparse2
-ok 22 - setup r3
+ok 36 - cleanup for --strict and --fsck-objects downgrading fsck msgs
 
-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 5300.37 '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)
 
-	git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r3 index-pack ../all.pack &&
+ok 37 - honor pack.packSizeLimit
 
-	git -C r3 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+expecting success of 5300.38 'verify resulting packs': 
+	git verify-pack test-10-*.pack
 
-	test_cmp expected observed
+ok 38 - verify resulting packs
 
-c032f005b6a497478f1daa2fb324aa5c51224039
-ok 23 - verify blob count in normal packfile
+expecting success of 5300.39 '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)
 
-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
+warning: minimum pack size limit is 1 MiB
+ok 39 - tolerate packsizelimit smaller than biggest object
 
-fatal: sparse:path filters support has been dropped
-ok 24 - verify sparse:path=pattern1 fails
+expecting success of 5300.40 'verify resulting packs': 
+	git verify-pack test-11-*.pack
 
-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
+ok 40 - verify resulting packs
 
-fatal: sparse:path filters support has been dropped
-ok 25 - verify sparse:path=pattern2 fails
+expecting success of 5300.41 '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 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"
+ok 41 - set up pack for non-repo tests
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r4/.git/
-[main (root-commit) 94c5152] pattern
- Author: A U Thor <author@example.com>
- 5 files changed, 5 insertions(+)
- create mode 100644 dir1/sparse1
- create mode 100644 dir1/sparse2
- create mode 100644 pattern
- create mode 100644 sparse1
- create mode 100644 sparse2
-ok 26 - setup r4
+expecting success of 5300.42 '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
 
-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 &&
+fatal: --stdin requires a git repository
+ok 42 - index-pack --stdin complains of non-repo
 
-	git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r4 index-pack ../all.pack &&
+expecting success of 5300.43 'index-pack <pack> works in non-repo': 
+	nongit git index-pack --object-format=$(test_oid algo) ../foo.pack &&
+	test_path_is_file foo.idx
 
-	git -C r4 verify-pack -v ../all.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 43 - index-pack <pack> works in non-repo
 
-	test_cmp expected observed
+expecting success of 5300.44 '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
 
-1eda0c5015c4170144f9c7ac96c56690163e1d85
-ok 27 - verify blob count in normal packfile
+0fe7826218e9201ffa2c785aa64f009dc5a98043
+ok 44 - index-pack --strict <pack> works in non-repo
 
-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 &&
+checking prerequisite: FAIL_PREREQS
 
-	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 &&
+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 45 # skip index-pack --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
 
-	git -C r4 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+ok 46 # skip pack-objects --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
 
-	test_cmp expected observed
+expecting success of 5300.47 'pack-objects in too-many-packs mode': 
+	GIT_TEST_FULL_IN_PACK_ARRAY=1 git repack -ad &&
+	git fsck
 
-095eef2cc427768a7687a30f2566b8e72ac0e449
-ok 28 - verify sparse:oid=OID
+warning: minimum pack size limit is 1 MiB
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+dangling tree eb486020614a4c764f9df37263317ed4ea372ef8
+dangling tree ebe633107a37152edb13864b30d6878084f68c92
+dangling commit ee88dc8f46b17a7cf0af1141d84677fff4ba1cfe
+ok 47 - pack-objects in too-many-packs mode
 
-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 5300.48 '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
+	)
 
-	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
-	HEAD
-	EOF
-	git -C r4 index-pack ../filter.pack &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/corrupt/.git/
+ok 48 - setup: fake a SHA1 hash collision
 
-	git -C r4 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	parse_verify_pack_blob_oid |
-	sort >observed &&
+expecting success of 5300.49 '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
+	)
 
-	test_cmp expected observed
+fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
+ok 49 - make sure index-pack detects the SHA1 collision
 
-095eef2cc427768a7687a30f2566b8e72ac0e449
-ok 29 - verify sparse:oid=oid-ish
+expecting success of 5300.50 '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
+	)
 
-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 &&
+fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
+ok 50 - make sure index-pack detects the SHA1 collision (large blobs)
 
-	for id in `sed "s|..|&/|" expected`
-	do
-		rm r1/.git/objects/$id || return 1
-	done
+expecting success of 5300.51 'prefetch objects': 
+	rm -rf server client &&
 
-ok 30 - setup r1 - delete loose blobs
+	git init server &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server protocol.version 2 &&
 
-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
+	echo one >server/one &&
+	git -C server add one &&
+	git -C server commit -m one &&
+	git -C server branch one_branch &&
 
-fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
-ok 31 - verify pack-objects fails w/ missing objects
+	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 &&
 
-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
+	echo three >server/three &&
+	git -C server add three &&
+	git -C server commit -m three &&
+	git -C server branch three_branch &&
 
-fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
-ok 32 - verify pack-objects fails w/ --missing=error
+	# 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
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/server/.git/
+[master (root-commit) d0e3d68] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one
+[master 01c4da4] two
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 two_a
+ create mode 100644 two_b
+[master 0cb4025] 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.45.2/t/trash directory.t5300-pack-object/server
+ * branch            01c4da49da3cfbee5b7b322a31b5aef76b8e6395 -> FETCH_HEAD
+To file:///build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/server
+ * [new branch]      01c4da49da3cfbee5b7b322a31b5aef76b8e6395 -> two_branch
+ok 51 - prefetch objects
 
-ok 33 - verify pack-objects w/ --missing=allow-any
+expecting success of 5300.52 'negative window clamps to 0': 
+	git pack-objects --progress --window=-1 neg-window <obj-list 2>stderr &&
+	check_deltas stderr = 0
 
-# passed all 33 test(s)
-1..33
+bd6610fc09cad3217690e0b0ed211717154cbab6
+ce6c688f0ed13fad051afc4337095ed6889a4dd9
+9db5fb1b42d26aca5e45415869b68da359335f04
+6e9c356a7d05ea0b18377db4cc0f590976fd46c6
+b0ae1309a64a4e49109da6e3a7e87c668c29e9c5
+ok 52 - negative window clamps to 0
+
+# passed all 52 test(s)
+1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5302-pack-index.sh ***
@@ -293385,7 +292578,7 @@
 
 20+0 records in
 20+0 records out
-20 bytes copied, 6.643e-05 s, 301 kB/s
+20 bytes copied, 4.3332e-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': 
@@ -293753,7 +292946,7 @@
 
 20+0 records in
 20+0 records out
-20 bytes copied, 5.7376e-05 s, 349 kB/s
+20 bytes copied, 4.3062e-05 s, 464 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': 
@@ -293798,7 +292991,7 @@
 pack	1c54d893dd9bf6645ecee2886ea72f2c2030bea1
 4+0 records in
 4+0 records out
-4 bytes copied, 4.8933e-05 s, 81.7 kB/s
+4 bytes copied, 0.00144752 s, 2.8 kB/s
 fatal: sha1 file '.git/objects/pack/pack-1c54d893dd9bf6645ecee2886ea72f2c2030bea1.idx' validation error
 ok 30 - [index v2] 6) verify-pack detects CRC mismatch
 
@@ -293852,7 +293045,7 @@
 	test_grep "Resolving deltas" err
 
 pack	37e69ad54edf78401749c7eaf0410858eb6a64ba
-Receiving objects:   0% (1/303)
Receiving objects:   1% (4/303)
Receiving objects:   2% (7/303)
Receiving objects:   3% (10/303)
Receiving objects:   4% (13/303)
Receiving objects:   5% (16/303)
Receiving objects:   6% (19/303)
Receiving objects:   7% (22/303)
Receiving objects:   8% (25/303)
Receiving objects:   9% (28/303)
Receiving objects:  10% (31/303)
Receiving objects:  11% (34/303)
Receiving objects:  12% (37/303)
Receiving objects:  13% (40/303)
Receiving objects:  14% (43/303)
Receiving objects:  15% (46/303)
Receiving objects:  16% (49/303)
Receiving objects:  17% (52/303)
Receiving objects:  18% (55/303)
Receiving objects:  19% (58/303)
Receiving objects:  20% (61/303)
Receiving objects:  21% (64/303)
Receiving objects:  22% (67/303)
Receiving objects:  23% (70/303)
Receiving objects:  24% (73/303)
Receiving objects:  25% (76/303)
Receiving objects:  26% (79/303)
Receiving objects:  27% (82/303)
Receiving objects:  28% (85/303)
Receiving objects:  29% (88/303)
Receiving objects:  30% (91/303)
Receiving objects:  31% (94/303)
Receiving objects:  32% (97/303)
Receiving objects:  33% (100/303)
Receiving objects:  34% (104/303)
Receiving objects:  35% (107/303)
Receiving objects:  36% (110/303)
Receiving objects:  37% (113/303)
Receiving objects:  38% (116/303)
Receiving objects:  39% (119/303)
Receiving objects:  40% (122/303)
Receiving objects:  41% (125/303)
Receiving objects:  42% (128/303)
Receiving objects:  43% (131/303)
Receiving objects:  44% (134/303)
Receiving objects:  45% (137/303)
Receiving objects:  46% (140/303)
Receiving objects:  47% (143/303)
Receiving objects:  48% (146/303)
Receiving objects:  49% (149/303)
Receiving objects:  50% (152/303)
Receiving objects:  51% (155/303)
Receiving objects:  52% (158/303)
Receiving objects:  53% (161/303)
Receiving objects:  54% (164/303)
Receiving objects:  55% (167/303)
Receiving objects:  56% (170/303)
Receiving objects:  57% (173/303)
Receiving objects:  58% (176/303)
Receiving objects:  59% (179/303)
Receiving objects:  60% (182/303)
Receiving objects:  61% (185/303)
Receiving objects:  62% (188/303)
Receiving objects:  63% (191/303)
Receiving objects:  64% (194/303)
Receiving objects:  65% (197/303)
Receiving objects:  66% (200/303)
Receiving objects:  67% (204/303)
Receiving objects:  68% (207/303)
Receiving objects:  69% (210/303)
Receiving objects:  70% (213/303)
Receiving objects:  71% (216/303)
Receiving objects:  72% (219/303)
Receiving objects:  73% (222/303)
Receiving objects:  74% (225/303)
Receiving objects:  75% (228/303)
Receiving objects:  76% (231/303)
Receiving objects:  77% (234/303)
Receiving objects:  78% (237/303)
Receiving objects:  79% (240/303)
Receiving objects:  80% (243/303)
Receiving objects:  81% (246/303)
Receiving objects:  82% (249/303)
Receiving objects:  83% (252/303)
Receiving objects:  84% (255/303)
Receiving objects:  85% (258/303)
Receiving objects:  86% (261/303)
Receiving objects:  87% (264/303)
Receiving objects:  88% (267/303)
Receiving objects:  89% (270/303)
Receiving objects:  90% (273/303)
Receiving objects:  91% (276/303)
Receiving objects:  92% (279/303)
Receiving objects:  93% (282/303)
Receiving objects:  94% (285/303)
Receiving objects:  95% (288/303)
Receiving objects:  96% (291/303)
Receiving objects:  97% (294/303)
Receiving objects:  98% (297/303)
Receiving objects:  99% (300/303)
Receiving objects: 100% (303/303)
Receiving objects: 100% (303/303), 833.39 KiB | 52.09 MiB/s, done.
+Receiving objects:   0% (1/303)
Receiving objects:   1% (4/303)
Receiving objects:   2% (7/303)
Receiving objects:   3% (10/303)
Receiving objects:   4% (13/303)
Receiving objects:   5% (16/303)
Receiving objects:   6% (19/303)
Receiving objects:   7% (22/303)
Receiving objects:   8% (25/303)
Receiving objects:   9% (28/303)
Receiving objects:  10% (31/303)
Receiving objects:  11% (34/303)
Receiving objects:  12% (37/303)
Receiving objects:  13% (40/303)
Receiving objects:  14% (43/303)
Receiving objects:  15% (46/303)
Receiving objects:  16% (49/303)
Receiving objects:  17% (52/303)
Receiving objects:  18% (55/303)
Receiving objects:  19% (58/303)
Receiving objects:  20% (61/303)
Receiving objects:  21% (64/303)
Receiving objects:  22% (67/303)
Receiving objects:  23% (70/303)
Receiving objects:  24% (73/303)
Receiving objects:  25% (76/303)
Receiving objects:  26% (79/303)
Receiving objects:  27% (82/303)
Receiving objects:  28% (85/303)
Receiving objects:  29% (88/303)
Receiving objects:  30% (91/303)
Receiving objects:  31% (94/303)
Receiving objects:  32% (97/303)
Receiving objects:  33% (100/303)
Receiving objects:  34% (104/303)
Receiving objects:  35% (107/303)
Receiving objects:  36% (110/303)
Receiving objects:  37% (113/303)
Receiving objects:  38% (116/303)
Receiving objects:  39% (119/303)
Receiving objects:  40% (122/303)
Receiving objects:  41% (125/303)
Receiving objects:  42% (128/303)
Receiving objects:  43% (131/303)
Receiving objects:  44% (134/303)
Receiving objects:  45% (137/303)
Receiving objects:  46% (140/303)
Receiving objects:  47% (143/303)
Receiving objects:  48% (146/303)
Receiving objects:  49% (149/303)
Receiving objects:  50% (152/303)
Receiving objects:  51% (155/303)
Receiving objects:  52% (158/303)
Receiving objects:  53% (161/303)
Receiving objects:  54% (164/303)
Receiving objects:  55% (167/303)
Receiving objects:  56% (170/303)
Receiving objects:  57% (173/303)
Receiving objects:  58% (176/303)
Receiving objects:  59% (179/303)
Receiving objects:  60% (182/303)
Receiving objects:  61% (185/303)
Receiving objects:  62% (188/303)
Receiving objects:  63% (191/303)
Receiving objects:  64% (194/303)
Receiving objects:  65% (197/303)
Receiving objects:  66% (200/303)
Receiving objects:  67% (204/303)
Receiving objects:  68% (207/303)
Receiving objects:  69% (210/303)
Receiving objects:  70% (213/303)
Receiving objects:  71% (216/303)
Receiving objects:  72% (219/303)
Receiving objects:  73% (222/303)
Receiving objects:  74% (225/303)
Receiving objects:  75% (228/303)
Receiving objects:  76% (231/303)
Receiving objects:  77% (234/303)
Receiving objects:  78% (237/303)
Receiving objects:  79% (240/303)
Receiving objects:  80% (243/303)
Receiving objects:  81% (246/303)
Receiving objects:  82% (249/303)
Receiving objects:  83% (252/303)
Receiving objects:  84% (255/303)
Receiving objects:  85% (258/303)
Receiving objects:  86% (261/303)
Receiving objects:  87% (264/303)
Receiving objects:  88% (267/303)
Receiving objects:  89% (270/303)
Receiving objects:  90% (273/303)
Receiving objects:  91% (276/303)
Receiving objects:  92% (279/303)
Receiving objects:  93% (282/303)
Receiving objects:  94% (285/303)
Receiving objects:  95% (288/303)
Receiving objects:  96% (291/303)
Receiving objects:  97% (294/303)
Receiving objects:  98% (297/303)
Receiving objects:  99% (300/303)
Receiving objects: 100% (303/303)
Receiving objects: 100% (303/303), 833.39 KiB | 46.30 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
 
@@ -293870,1858 +293063,500 @@
 1..35
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5300-pack-object.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t5312-prune-corruption.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5312-prune-corruption/.git/
+expecting success of 5312.1 'disable reflogs': 
+	git config core.logallrefupdates false &&
+	git reflog expire --expire=all --all
 
-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
+ok 1 - disable reflogs
 
+expecting success of 5312.2 'create history reachable only from a bogus-named ref': 
+	test_tick && git commit --allow-empty -m main &&
+	base=$(git rev-parse HEAD) &&
+	test_tick && git commit --allow-empty -m bogus &&
+	bogus=$(git rev-parse HEAD) &&
+	git cat-file commit $bogus >saved &&
+	git reset --hard HEAD^
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+[main (root-commit) 3b20b2b] main
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 2 - setup pack-object <stdin
-
-expecting success of 5300.3 'pack-object <stdin parsing: basic [|--revs]': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	EOF
-
-	git -C pack-object-stdin pack-objects basic-stdin <in &&
-	idx=$(echo pack-object-stdin/basic-stdin-*.idx) &&
-	git show-index <"$idx" >actual &&
-	test_line_count = 1 actual &&
-
-	git -C pack-object-stdin pack-objects --revs basic-stdin-revs <in &&
-	idx=$(echo pack-object-stdin/basic-stdin-revs-*.idx) &&
-	git show-index <"$idx" >actual &&
-	test_line_count = 3 actual
-
-260a913b65cbec25b7e224d8d3c7360245c0367a
-91db7b4b856b00c3e675824c5bc5389b6810037a
-ok 3 - pack-object <stdin parsing: basic [|--revs]
-
-expecting success of 5300.4 'pack-object <stdin parsing: [|--revs] bad line': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	garbage
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	sed "s/^> //g" >err.expect <<-EOF &&
-	fatal: expected object ID, got garbage:
-	>  garbage
-
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects bad-line-stdin <in 2>err.actual &&
-	test_cmp err.expect err.actual &&
-
-	cat >err.expect <<-EOF &&
-	fatal: bad revision 'garbage'
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects --revs bad-line-stdin-revs <in 2>err.actual &&
-	test_cmp err.expect err.actual
-
-ok 4 - pack-object <stdin parsing: [|--revs] bad line
-
-expecting success of 5300.5 'pack-object <stdin parsing: [|--revs] empty line': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	sed -e "s/^> //g" -e "s/Z$//g" >err.expect <<-EOF &&
-	fatal: expected object ID, got garbage:
-	>  Z
-
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects empty-line-stdin <in 2>err.actual &&
-	test_cmp err.expect err.actual &&
-
-	git -C pack-object-stdin pack-objects --revs empty-line-stdin-revs <in &&
-	idx=$(echo pack-object-stdin/empty-line-stdin-revs-*.idx) &&
-	git show-index <"$idx" >actual &&
-	test_line_count = 3 actual
-
-91db7b4b856b00c3e675824c5bc5389b6810037a
-ok 5 - pack-object <stdin parsing: [|--revs] empty line
-
-expecting success of 5300.6 'pack-object <stdin parsing: [|--revs] with --stdin': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	# There is the "--stdin-packs is incompatible with --revs"
-	# test below, but we should make sure that the revision.c
-	# --stdin is not picked up
-	cat >err.expect <<-EOF &&
-	fatal: disallowed abbreviated or ambiguous option 'stdin'
-	EOF
-	test_must_fail git -C pack-object-stdin pack-objects stdin-with-stdin-option --stdin <in 2>err.actual &&
-	test_cmp err.expect err.actual &&
-
-	test_must_fail git -C pack-object-stdin pack-objects --stdin --revs stdin-with-stdin-option-revs 2>err.actual <in &&
-	test_cmp err.expect err.actual
-
-ok 6 - pack-object <stdin parsing: [|--revs] with --stdin
-
-expecting success of 5300.7 'pack-object <stdin parsing: --stdin-packs handles garbage': 
-	cat >in <<-EOF &&
-	$(git -C pack-object-stdin rev-parse one)
-	$(git -C pack-object-stdin rev-parse two)
-	EOF
-
-	# That we get "two" and not "one" has to do with OID
-	# ordering. It happens to be the same here under SHA-1 and
-	# SHA-256. See commentary in pack-objects.c
-	cat >err.expect <<-EOF &&
-	fatal: could not find pack '$(git -C pack-object-stdin rev-parse two)'
-	EOF
-	test_must_fail git \
-		-C pack-object-stdin \
-		pack-objects stdin-with-stdin-option --stdin-packs \
-		<in 2>err.actual &&
-	test_cmp err.expect err.actual
-
-ok 7 - pack-object <stdin parsing: --stdin-packs handles garbage
-
-expecting success of 5300.8 'pack without delta': 
-	packname_1=$(git pack-objects --progress --window=0 test-1 \
-			<obj-list 2>stderr) &&
-	check_deltas stderr = 0
-
-ok 8 - pack without delta
-
-expecting success of 5300.9 '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-]delta-islands  respect islands during delta compression
-    --[no-]uri-protocol <protocol>
-                          exclude any configured uploadpack.blobpackfileuri with this protocol
-
-ok 9 - pack-objects with bogus arguments
-
-expecting success of 5300.10 'unpack without delta': 
-	check_unpack test-1-${packname_1} obj-list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
-ok 10 - unpack without delta
-
-expecting success of 5300.11 '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.45.2/t/trash directory.t5300-pack-object/git2/
-ok 11 - unpack without delta (core.fsyncmethod=batch)
-
-expecting success of 5300.12 'pack with REF_DELTA': 
-	packname_2=$(git pack-objects --progress test-2 <obj-list 2>stderr) &&
-	check_deltas stderr -gt 0
-
-ok 12 - pack with REF_DELTA
-
-expecting success of 5300.13 'unpack with REF_DELTA': 
-	check_unpack test-2-${packname_2} obj-list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
-ok 13 - unpack with REF_DELTA
-
-expecting success of 5300.14 '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.45.2/t/trash directory.t5300-pack-object/git2/
-ok 14 - unpack with REF_DELTA (core.fsyncmethod=batch)
-
-expecting success of 5300.15 '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 15 - pack with OFS_DELTA
-
-expecting success of 5300.16 'unpack with OFS_DELTA': 
-	check_unpack test-3-${packname_3} obj-list
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
-ok 16 - unpack with OFS_DELTA
-
-expecting success of 5300.17 '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.45.2/t/trash directory.t5300-pack-object/git2/
-ok 17 - unpack with OFS_DELTA (core.fsyncmethod=batch)
-
-expecting success of 5300.18 '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 18 - compare delta flavors
-
-expecting success of 5300.19 'use packed objects': 
-	check_use_objects test-1-${packname_1}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
-ok 19 - use packed objects
-
-expecting success of 5300.20 'use packed deltified (REF_DELTA) objects': 
-	check_use_objects test-2-${packname_2}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
-ok 20 - use packed deltified (REF_DELTA) objects
-
-expecting success of 5300.21 'use packed deltified (OFS_DELTA) objects': 
-	check_use_objects test-3-${packname_3}
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/git2/
-ok 21 - use packed deltified (OFS_DELTA) objects
-
-expecting success of 5300.22 '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.45.2/t/trash directory.t5300-pack-object/missing-pack/.git/
-keep	ed7d7d439f2b0cbe9b94e803744e331d0b842cd7
-ok 22 - survive missing objects/pack directory
-
-expecting success of 5300.23 'verify pack': 
-	git verify-pack test-1-${packname_1}.idx \
-		test-2-${packname_2}.idx \
-		test-3-${packname_3}.idx
-
-ok 23 - verify pack
-
-expecting success of 5300.24 '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 24 - verify pack -v
-
-expecting success of 5300.25 '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 25 - verify-pack catches mismatched .idx and .pack files
-
-expecting success of 5300.26 '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, 4.3375e-05 s, 23.1 kB/s
-fatal: pack signature mismatch
-ok 26 - verify-pack catches a corrupted pack signature
-
-expecting success of 5300.27 '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, 2.9574e-05 s, 33.8 kB/s
-fatal: pack version 10 unsupported
-ok 27 - verify-pack catches a corrupted pack version
-
-expecting success of 5300.28 '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, 4.0682e-05 s, 24.6 kB/s
-fatal: pack has bad object at offset 12: unknown object type 0
-ok 28 - verify-pack catches a corrupted type/size of the 1st packed object data
-
-expecting success of 5300.29 '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, 5.9779e-05 s, 335 kB/s
-fatal: sha1 file 'test-3.idx' validation error
-ok 29 - verify-pack catches a corrupted sum of the index file itself
-
-expecting success of 5300.30 '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 --promisor=message test-3.pack &&
-	cmp test-3.idx test-1-${packname_1}.idx &&
-	echo message >expect &&
-	test_cmp expect test-3.promisor &&
-
-	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 30 - build pack index for an existing pack
-
-expecting success of 5300.31 '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.45.2/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.45.2/t/trash directory.t5300-pack-object/test-6/.git/
-fatal: object of unexpected type
-ok 31 - unpacking with --strict
-
-expecting success of 5300.32 '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.45.2/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.45.2/t/trash directory.t5300-pack-object/test-8/.git/
-fatal: did not receive expected object 0042f6c56d8fc1896f3efc2cdc5060e5b5e44e02
-pack	499fed00672b4ac4e35132711ee1664a089f355e
-ok 32 - index-pack with --strict
-
-expecting success of 5300.33 '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.45.2/t/trash directory.t5300-pack-object/strict/.git/
-[master (root-commit) 84f9e61] first
+[main dff741f] bogus
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 hello
-ok 33 - setup for --strict and --fsck-objects downgrading fsck msgs
-
-expecting success of 5300.34 '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 34 - index-pack with --strict downgrading fsck msgs
-
-expecting success of 5300.35 '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 35 - index-pack with --fsck-objects downgrading fsck msgs
-
-expecting success of 5300.36 'cleanup for --strict and --fsck-objects downgrading fsck msgs': 
-	rm -rf strict
-
-ok 36 - cleanup for --strict and --fsck-objects downgrading fsck msgs
-
-expecting success of 5300.37 '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 37 - honor pack.packSizeLimit
-
-expecting success of 5300.38 'verify resulting packs': 
-	git verify-pack test-10-*.pack
-
-ok 38 - verify resulting packs
-
-expecting success of 5300.39 '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 39 - tolerate packsizelimit smaller than biggest object
-
-expecting success of 5300.40 'verify resulting packs': 
-	git verify-pack test-11-*.pack
-
-ok 40 - verify resulting packs
-
-expecting success of 5300.41 '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 41 - set up pack for non-repo tests
-
-expecting success of 5300.42 '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 42 - index-pack --stdin complains of non-repo
-
-expecting success of 5300.43 '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 43 - index-pack <pack> works in non-repo
-
-expecting success of 5300.44 '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 44 - index-pack --strict <pack> works in non-repo
-
-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 45 # skip index-pack --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
-
-ok 46 # skip pack-objects --threads=N or pack.threads=N warns when no pthreads (missing !PTHREADS of !PTHREADS,!FAIL_PREREQS)
-
-expecting success of 5300.47 'pack-objects in too-many-packs mode': 
-	GIT_TEST_FULL_IN_PACK_ARRAY=1 git repack -ad &&
-	git fsck
+HEAD is now at 3b20b2b main
+ok 2 - create history reachable only from a bogus-named ref
 
-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 47 - pack-objects in too-many-packs mode
+expecting success of 5312.3 'pruning does not drop bogus object': 
+	test_when_finished "git hash-object -w -t commit saved" &&
+	create_bogus_ref &&
+	test_must_fail git prune --expire=now &&
+	git cat-file -e $bogus
 
-expecting success of 5300.48 '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
-	)
+fatal: unable to parse object: refs/heads/bogus..name
+dff741f7b096cb9d52311824f871001de7742579
+ok 3 - pruning does not drop bogus object
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/corrupt/.git/
-ok 48 - setup: fake a SHA1 hash collision
+expecting success of 5312.4 'put bogus object into pack': 
+	git tag reachable $bogus &&
+	git repack -ad &&
+	git tag -d reachable &&
+	git cat-file -e $bogus
 
-expecting success of 5300.49 '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
-	)
+Deleted tag 'reachable' (was dff741f)
+ok 4 - put bogus object into pack
 
-fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
-ok 49 - make sure index-pack detects the SHA1 collision
+expecting success of 5312.5 'non-destructive repack bails on bogus ref': 
+	create_bogus_ref &&
+	test_must_fail git repack -adk
 
-expecting success of 5300.50 '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: bad object refs/heads/bogus..name
+ok 5 - non-destructive repack bails on bogus ref
 
-fatal: SHA1 COLLISION FOUND WITH c82de19312b6c3695c0c18f70709a6c535682a67 !
-ok 50 - make sure index-pack detects the SHA1 collision (large blobs)
+expecting success of 5312.6 'GIT_REF_PARANOIA=0 overrides safety': 
+	create_bogus_ref &&
+	GIT_REF_PARANOIA=0 git repack -adk
 
-expecting success of 5300.51 'prefetch objects': 
-	rm -rf server client &&
+ok 6 - GIT_REF_PARANOIA=0 overrides safety
 
-	git init server &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server protocol.version 2 &&
+expecting success of 5312.7 'destructive repack keeps packed object': 
+	create_bogus_ref &&
+	test_must_fail git repack -Ad --unpack-unreachable=now &&
+	git cat-file -e $bogus &&
+	test_must_fail git repack -ad &&
+	git cat-file -e $bogus
 
-	echo one >server/one &&
-	git -C server add one &&
-	git -C server commit -m one &&
-	git -C server branch one_branch &&
+fatal: bad object refs/heads/bogus..name
+fatal: bad object refs/heads/bogus..name
+ok 7 - destructive repack keeps packed object
 
-	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 &&
+expecting success of 5312.8 'destructive repack not confused by dangling symref': 
+	test_when_finished "git symbolic-ref -d refs/heads/dangling" &&
+	git symbolic-ref refs/heads/dangling refs/heads/does-not-exist &&
+	git repack -ad &&
+	test_must_fail git cat-file -e $bogus
 
-	echo three >server/three &&
-	git -C server add three &&
-	git -C server commit -m three &&
-	git -C server branch three_branch &&
+ok 8 - destructive repack not confused by dangling symref
 
-	# 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
+expecting success of 5312.9 'create history with missing tip commit': 
+	test_tick && git commit --allow-empty -m one &&
+	recoverable=$(git rev-parse HEAD) &&
+	git cat-file commit $recoverable >saved &&
+	test_tick && git commit --allow-empty -m two &&
+	missing=$(git rev-parse HEAD) &&
+	git checkout --detach $base &&
+	rm .git/objects/$(echo $missing | sed "s,..,&/,") &&
+	test_must_fail git cat-file -e $missing
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/server/.git/
-[master (root-commit) d0e3d68] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one
-[master 01c4da4] two
+[main 15af5e6] one
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 two_a
- create mode 100644 two_b
-[master 0cb4025] three
+[main 8c5ee6a] two
  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.45.2/t/trash directory.t5300-pack-object/server
- * branch            01c4da49da3cfbee5b7b322a31b5aef76b8e6395 -> FETCH_HEAD
-To file:///build/reproducible-path/git-2.45.2/t/trash directory.t5300-pack-object/server
- * [new branch]      01c4da49da3cfbee5b7b322a31b5aef76b8e6395 -> two_branch
-ok 51 - prefetch objects
-
-expecting success of 5300.52 'negative window clamps to 0': 
-	git pack-objects --progress --window=-1 neg-window <obj-list 2>stderr &&
-	check_deltas stderr = 0
-
-bd6610fc09cad3217690e0b0ed211717154cbab6
-ce6c688f0ed13fad051afc4337095ed6889a4dd9
-9db5fb1b42d26aca5e45415869b68da359335f04
-6e9c356a7d05ea0b18377db4cc0f590976fd46c6
-b0ae1309a64a4e49109da6e3a7e87c668c29e9c5
-ok 52 - negative window clamps to 0
-
-# passed all 52 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5320-delta-islands.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5320-delta-islands/.git/
-expecting success of 5320.1 'setup commits': 
-	commit one seed 1 &&
-	commit two seed 12
-
-one=babc1f87e2baa9f6ad764af981fccdd2da48016e
-two=ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 1 - setup commits
-
-expecting success of 5320.2 'vanilla repack deltas one against two': 
-	git repack -adf &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 2 - vanilla repack deltas one against two
-
-expecting success of 5320.3 'island repack with no island definition is vanilla': 
-	git repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 3 - island repack with no island definition is vanilla
-
-expecting success of 5320.4 'island repack with no matches is vanilla': 
-	git -c "pack.island=refs/foo" repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 4 - island repack with no matches is vanilla
-
-expecting success of 5320.5 'separate islands disallows delta': 
-	git -c "pack.island=refs/heads/(.*)" repack -adfi &&
-	! is_delta_base $one $two &&
-	! is_delta_base $two $one
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base 0000000000000000000000000000000000000000
-ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e has base 0000000000000000000000000000000000000000
-ok 5 - separate islands disallows delta
-
-expecting success of 5320.6 'same island allows delta': 
-	git -c "pack.island=refs/heads" repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 6 - same island allows delta
-
-expecting success of 5320.7 'coalesce same-named islands': 
-	git \
-		-c "pack.island=refs/(.*)/one" \
-		-c "pack.island=refs/(.*)/two" \
-		repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 7 - coalesce same-named islands
-
-expecting success of 5320.8 'island restrictions drop reused deltas': 
-	git repack -adfi &&
-	is_delta_base $one $two &&
-	git -c "pack.island=refs/heads/(.*)" repack -adi &&
-	! is_delta_base $one $two &&
-	! is_delta_base $two $one
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base 0000000000000000000000000000000000000000
-ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e has base 0000000000000000000000000000000000000000
-ok 8 - island restrictions drop reused deltas
-
-expecting success of 5320.9 'island regexes are left-anchored': 
-	git -c "pack.island=heads/(.*)" repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 9 - island regexes are left-anchored
-
-expecting success of 5320.10 'island regexes follow last-one-wins scheme': 
-	git \
-		-c "pack.island=refs/heads/(.*)" \
-		-c "pack.island=refs/heads/" \
-		repack -adfi &&
-	is_delta_base $one $two
-
-babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
-ok 10 - island regexes follow last-one-wins scheme
-
-expecting success of 5320.11 'setup shared history': 
-	commit root shared root &&
-	commit one shared 1 root &&
-	commit two shared 12-long root
-
-root=2399f35d1d9acc612cefa2f7983f510fbd6b24e9
-one=1db8b3605f452b4a89b403abb2ae905f0a7ffaf6
-two=c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
-ok 11 - setup shared history
-
-expecting success of 5320.12 'vanilla delta goes between branches': 
-	git repack -adf &&
-	is_delta_base $one $two &&
-	is_delta_base $root $two
-
-1db8b3605f452b4a89b403abb2ae905f0a7ffaf6 has base c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
-2399f35d1d9acc612cefa2f7983f510fbd6b24e9 has base c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
-ok 12 - vanilla delta goes between branches
+HEAD is now at 3b20b2b main
+ok 9 - create history with missing tip commit
 
-expecting success of 5320.13 'deltas allowed against superset islands': 
-	git -c "pack.island=refs/heads/(.*)" repack -adfi &&
-	is_delta_base $one $root &&
-	is_delta_base $two $root
+expecting success of 5312.10 'pruning with a corrupted tip does not drop history': 
+	test_when_finished "git hash-object -w -t commit saved" &&
+	test_must_fail git prune --expire=now &&
+	git cat-file -e $recoverable
 
-1db8b3605f452b4a89b403abb2ae905f0a7ffaf6 has base 2399f35d1d9acc612cefa2f7983f510fbd6b24e9
-c160aaeae55c91b198ce651c8fc1d4e09dd97b4b has base 2399f35d1d9acc612cefa2f7983f510fbd6b24e9
-ok 13 - deltas allowed against superset islands
+fatal: unable to parse object: refs/heads/main
+15af5e642cdab3c95868cf2b3d372994b5296daa
+ok 10 - pruning with a corrupted tip does not drop history
 
-expecting success of 5320.14 'island core places core objects first': 
-	cat >expect <<-EOF &&
-	$root
-	$two
-	EOF
-	git -c "pack.island=refs/heads/(.*)" \
-	    -c "pack.islandcore=one" \
-	    repack -adfi &&
-	git verify-pack -v .git/objects/pack/*.pack |
-	cut -d" " -f1 |
-	grep -E "$root|$two" >actual &&
+expecting success of 5312.11 'pack-refs does not silently delete broken loose ref': 
+	git pack-refs --all --prune &&
+	echo $missing >expect &&
+	git rev-parse refs/heads/main >actual &&
 	test_cmp expect actual
 
-ok 14 - island core places core objects first
-
-expecting success of 5320.15 'unmatched island core is not fatal': 
-	git -c "pack.islandcore=one" repack -adfi
-
-ok 15 - unmatched island core is not fatal
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5321-pack-large-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5321-pack-large-objects/.git/
-expecting success of 5321.1 'setup': 
-	clear_packs &&
-	{
-		pack_header 2 &&
-		pack_obj $A $B &&
-		pack_obj $B
-	} >ab.pack &&
-	pack_trailer ab.pack &&
-	git index-pack --stdin <ab.pack
-
-pack	8af524300e46c11647862073e882d467bc0dd22d
-ok 1 - setup
-
-expecting success of 5321.2 'repack large deltas': 
-	printf "%s\\n" $A $B |
-	GIT_TEST_OE_DELTA_SIZE=2 git pack-objects tmp-pack
-
-aee080dc5b8a48f951541c0ad63f65af48847a6f
-ok 2 - repack large deltas
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5322-pack-objects-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5322-pack-objects-sparse/.git/
-expecting success of 5322.1 'setup repo': 
-	test_commit initial &&
-	for i in $(test_seq 1 3)
-	do
-		mkdir f$i &&
-		for j in $(test_seq 1 3)
-		do
-			mkdir f$i/f$j &&
-			echo $j >f$i/f$j/data.txt || return 1
-		done
-	done &&
-	git add . &&
-	git commit -m "Initialized trees" &&
-	for i in $(test_seq 1 3)
-	do
-		git checkout -b topic$i main &&
-		echo change-$i >f$i/f$i/data.txt &&
-		git commit -a -m "Changed f$i/f$i/data.txt" || return 1
-	done &&
-	cat >packinput.txt <<-EOF &&
-	topic1
-	^topic2
-	^topic3
-	EOF
-	git rev-parse			\
-		topic1			\
-		topic1^{tree}		\
-		topic1:f1		\
-		topic1:f1/f1		\
-		topic1:f1/f1/data.txt | sort >expect_objects.txt
-
-[main (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 8ccf85b] Initialized trees
- Author: A U Thor <author@example.com>
- 9 files changed, 9 insertions(+)
- create mode 100644 f1/f1/data.txt
- create mode 100644 f1/f2/data.txt
- create mode 100644 f1/f3/data.txt
- create mode 100644 f2/f1/data.txt
- create mode 100644 f2/f2/data.txt
- create mode 100644 f2/f3/data.txt
- create mode 100644 f3/f1/data.txt
- create mode 100644 f3/f2/data.txt
- create mode 100644 f3/f3/data.txt
-Switched to a new branch 'topic1'
-[topic1 32cf0ab] Changed f1/f1/data.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic2'
-[topic2 2b44896] Changed f2/f2/data.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'topic3'
-[topic3 48a532e] Changed f3/f3/data.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup repo
-
-expecting success of 5322.2 'non-sparse pack-objects': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
-	git index-pack -o nonsparse.idx nonsparse.pack &&
-	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
-	test_cmp expect_objects.txt nonsparse_objects.txt
-
-d614884b9b2195861f9f3410ae24b1c2fdc0c831
-ok 2 - non-sparse pack-objects
-
-expecting success of 5322.3 'sparse pack-objects': 
-	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp expect_objects.txt sparse_objects.txt
-
-d614884b9b2195861f9f3410ae24b1c2fdc0c831
-ok 3 - sparse pack-objects
-
-expecting success of 5322.4 'duplicate a folder from f3 and commit to topic1': 
-	git checkout topic1 &&
-	echo change-3 >f3/f3/data.txt &&
-	git commit -a -m "Changed f3/f3/data.txt" &&
-	git rev-parse			\
-		topic1~1		\
-		topic1~1^{tree}		\
-		topic1^{tree}		\
-		topic1			\
-		topic1:f1		\
-		topic1:f1/f1		\
-		topic1:f1/f1/data.txt | sort >required_objects.txt
-
-Switched to branch 'topic1'
-[topic1 200bcc4] Changed f3/f3/data.txt
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - duplicate a folder from f3 and commit to topic1
-
-expecting success of 5322.5 'non-sparse pack-objects': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
-	git index-pack -o nonsparse.idx nonsparse.pack &&
-	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
-	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
-	test_cmp required_objects.txt nonsparse_required_objects.txt
-
-46a30e027f51c2ad758015d56bda1ee6d4c8c84c
-ok 5 - non-sparse pack-objects
-
-expecting success of 5322.6 'sparse pack-objects': 
-	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	comm -1 -2 required_objects.txt sparse_objects.txt >sparse_required_objects.txt &&
-	test_cmp required_objects.txt sparse_required_objects.txt
-
-46a30e027f51c2ad758015d56bda1ee6d4c8c84c
-ok 6 - sparse pack-objects
-
-expecting success of 5322.7 'duplicate a folder from f1 into f3': 
-	mkdir f3/f4 &&
-	cp -r f1/f1/* f3/f4 &&
-	git add f3/f4 &&
-	git commit -m "Copied f1/f1 to f3/f4" &&
-	cat >packinput.txt <<-EOF &&
-	topic1
-	^topic1~1
-	EOF
-	git rev-parse		\
-		topic1		\
-		topic1^{tree}   \
-		topic1:f3 | sort >required_objects.txt
-
-[topic1 b9b902e] Copied f1/f1 to f3/f4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f3/f4/data.txt
-ok 7 - duplicate a folder from f1 into f3
-
-expecting success of 5322.8 'non-sparse pack-objects': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
-	git index-pack -o nonsparse.idx nonsparse.pack &&
-	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
-	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
-	test_cmp required_objects.txt nonsparse_required_objects.txt
-
-3b547739f421b9a4f5fc24410679e4e1f7de71cf
-ok 8 - non-sparse pack-objects
-
-expecting success of 5322.9 'sparse pack-objects': 
-	GIT_TEST_PACK_SPARSE=-1 &&
-	git rev-parse			\
-		topic1			\
-		topic1^{tree}		\
-		topic1:f3		\
-		topic1:f3/f4		\
-		topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt &&
-	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp expect_sparse_objects.txt sparse_objects.txt
-
-9f747802011a9f66e260a2ddb27f222338b37741
-ok 9 - sparse pack-objects
-
-expecting success of 5322.10 'pack.useSparse enables algorithm': 
-	git config pack.useSparse true &&
-	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp expect_sparse_objects.txt sparse_objects.txt
-
-9f747802011a9f66e260a2ddb27f222338b37741
-ok 10 - pack.useSparse enables algorithm
-
-expecting success of 5322.11 'pack.useSparse overridden': 
-	git pack-objects --stdout --revs --no-sparse <packinput.txt >sparse.pack &&
-	git index-pack -o sparse.idx sparse.pack &&
-	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
-	test_cmp required_objects.txt sparse_objects.txt
-
-3b547739f421b9a4f5fc24410679e4e1f7de71cf
-ok 11 - pack.useSparse overridden
+error: refs/heads/main does not point to a valid object!
+ok 11 - pack-refs does not silently delete broken loose ref
 
 # passed all 11 test(s)
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5323-pack-redundant.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5323-pack-redundant/.git/
-expecting success of 5323.1 'setup main repo': 
-	git init --bare "$main_repo" &&
-	create_commits_in "$main_repo" A B C D E F G H I J K L M N O P Q R
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5323-pack-redundant/main.git/
-ok 1 - setup main repo
-
-expecting success of 5323.2 'main: pack-redundant works with no packfile': 
-	(
-		cd "$main_repo" &&
-		cat >expect <<-EOF &&
-			fatal: Zero packs found!
-			EOF
-		test_must_fail $git_pack_redundant --all >actual 2>&1 &&
-		test_cmp expect actual
-	)
-
-ok 2 - main: pack-redundant works with no packfile
-
-expecting success of 5323.3 'main: pack-redundant works with one packfile': 
-	create_pack_in "$main_repo" P1 <<-EOF &&
-		$T
-		$A
-		$B
-		$C
-		$D
-		$E
-		$F
-		$R
-		EOF
-	(
-		cd "$main_repo" &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
-
-ok 3 - main: pack-redundant works with one packfile
-
-expecting success of 5323.4 'main: no redundant for pack 1, 2, 3': 
-	create_pack_in "$main_repo" P2 <<-EOF &&
-		$B
-		$C
-		$D
-		$E
-		$G
-		$H
-		$I
-		EOF
-	create_pack_in "$main_repo" P3 <<-EOF &&
-		$F
-		$I
-		$J
-		$K
-		$L
-		$M
-		EOF
-	(
-		cd "$main_repo" &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
-
-ok 4 - main: no redundant for pack 1, 2, 3
-
-expecting success of 5323.5 'main: one of pack-2/pack-3 is redundant': 
-	create_pack_in "$main_repo" P4 <<-EOF &&
-		$J
-		$K
-		$L
-		$M
-		$P
-		EOF
-	create_pack_in "$main_repo" P5 <<-EOF &&
-		$G
-		$H
-		$N
-		$O
-		EOF
-	(
-		cd "$main_repo" &&
-		cat >expect <<-EOF &&
-			P3:$P3
-			EOF
-		$git_pack_redundant --all >out &&
-		format_packfiles <out >actual &&
-		test_cmp expect actual
-	)
-
-ok 5 - main: one of pack-2/pack-3 is redundant
-
-expecting success of 5323.6 'main: pack 2, 4, and 6 are redundant': 
-	create_pack_in "$main_repo" P6 <<-EOF &&
-		$N
-		$O
-		$Q
-		EOF
-	create_pack_in "$main_repo" P7 <<-EOF &&
-		$P
-		$Q
-		EOF
-	(
-		cd "$main_repo" &&
-		cat >expect <<-EOF &&
-			P2:$P2
-			P4:$P4
-			P6:$P6
-			EOF
-		$git_pack_redundant --all >out &&
-		format_packfiles <out >actual &&
-		test_cmp expect actual
-	)
-
-ok 6 - main: pack 2, 4, and 6 are redundant
-
-expecting success of 5323.7 'main: pack-8 (subset of pack-1) is also redundant': 
-	create_pack_in "$main_repo" P8 <<-EOF &&
-		$A
-		EOF
-	(
-		cd "$main_repo" &&
-		cat >expect <<-EOF &&
-			P2:$P2
-			P4:$P4
-			P6:$P6
-			P8:$P8
-			EOF
-		$git_pack_redundant --all >out &&
-		format_packfiles <out >actual &&
-		test_cmp expect actual
-	)
-
-ok 7 - main: pack-8 (subset of pack-1) is also redundant
-
-expecting success of 5323.8 'main: clean loose objects': 
-	(
-		cd "$main_repo" &&
-		git prune-packed &&
-		find objects -type f | sed -e "/objects\/pack\//d" >out &&
-		test_must_be_empty out
-	)
-
-ok 8 - main: clean loose objects
-
-expecting success of 5323.9 'main: remove redundant packs and pass fsck': 
-	(
-		cd "$main_repo" &&
-		$git_pack_redundant --all | xargs rm &&
-		git fsck &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
-
-notice: HEAD points to an unborn branch (master)
-ok 9 - main: remove redundant packs and pass fsck
-
-expecting success of 5323.10 'setup shared.git': 
-	git clone --mirror "$main_repo" "$shared_repo" &&
-	(
-		cd "$shared_repo" &&
-		printf "../../$main_repo/objects\n" >objects/info/alternates
-	)
-
-Cloning into bare repository 'shared.git'...
-done.
-ok 10 - setup shared.git
-
-expecting success of 5323.11 'shared: all packs are redundant, but no output without --alt-odb': 
-	(
-		cd "$shared_repo" &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
-
-ok 11 - shared: all packs are redundant, but no output without --alt-odb
-
-expecting success of 5323.12 'shared: show redundant packs in stderr for verbose mode': 
-	(
-		cd "$shared_repo" &&
-		cat >expect <<-EOF &&
-			P1:$P1
-			P3:$P3
-			P5:$P5
-			P7:$P7
-			EOF
-		$git_pack_redundant --all --verbose >out 2>out.err &&
-		test_must_be_empty out &&
-		grep "pack$" out.err | format_packfiles >actual &&
-		test_cmp expect actual
-	)
-
-ok 12 - shared: show redundant packs in stderr for verbose mode
-
-expecting success of 5323.13 'shared: remove redundant packs, no packs left': 
-	(
-		cd "$shared_repo" &&
-		cat >expect <<-EOF &&
-			fatal: Zero packs found!
-			EOF
-		$git_pack_redundant --all --alt-odb | xargs rm &&
-		git fsck &&
-		test_must_fail $git_pack_redundant --all --alt-odb >actual 2>&1 &&
-		test_cmp expect actual
-	)
-
-notice: HEAD points to an unborn branch (master)
-ok 13 - shared: remove redundant packs, no packs left
-
-expecting success of 5323.14 'shared: create new objects and packs': 
-	create_commits_in "$shared_repo" X Y Z &&
-	create_pack_in "$shared_repo" Px1 <<-EOF &&
-		$X
-		$Y
-		$Z
-		$A
-		$B
-		$C
-		EOF
-	create_pack_in "$shared_repo" Px2 <<-EOF
-		$X
-		$Y
-		$Z
-		$D
-		$E
-		$F
-		EOF
-
-ok 14 - shared: create new objects and packs
-
-expecting success of 5323.15 'shared: no redundant without --alt-odb': 
-	(
-		cd "$shared_repo" &&
-		$git_pack_redundant --all >out &&
-		test_must_be_empty out
-	)
-
-ok 15 - shared: no redundant without --alt-odb
-
-expecting success of 5323.16 'shared: one pack is redundant with --alt-odb': 
-	(
-		cd "$shared_repo" &&
-		$git_pack_redundant --all --alt-odb >out &&
-		format_packfiles <out >actual &&
-		test_line_count = 1 actual
-	)
-
-ok 16 - shared: one pack is redundant with --alt-odb
-
-expecting success of 5323.17 'shared: ignore unique objects and all two packs are redundant': 
-	(
-		cd "$shared_repo" &&
-		cat >expect <<-EOF &&
-			Px1:$Px1
-			Px2:$Px2
-			EOF
-		$git_pack_redundant --all --alt-odb >out <<-EOF &&
-			$X
-			$Y
-			$Z
-			EOF
-		format_packfiles <out >actual &&
-		test_cmp expect actual
-	)
-
-ok 17 - shared: ignore unique objects and all two packs are redundant
+*** t5313-pack-bounds-checks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5313-pack-bounds-checks/.git/
+expecting success of 5313.1 'setup': 
+	test_oid_cache <<-EOF
+	oid000 sha1:1485
+	oid000 sha256:4222
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5325-reverse-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5325-reverse-index/.git/
-expecting success of 5325.1 'setup': 
-	test_commit base &&
+	oidfff sha1:74
+	oidfff sha256:1350
+	EOF
 
-	test_config pack.writeReverseIndex false &&
-	pack=$(git pack-objects --all $packdir/pack) &&
-	rev=$packdir/pack-$pack.rev &&
+ok 1 - setup
 
-	test_path_is_missing $rev
+expecting success of 5313.2 'set up base packfile and variables': 
+	# the hash of this content starts with ff, which
+	# makes some later computations much simpler
+	test_oid oidfff >file &&
+	git add file &&
+	git commit -m base &&
+	git repack -ad &&
+	base=$(echo .git/objects/pack/*) &&
+	chmod +w $base &&
+	mkdir base-backup &&
+	cp $base base-backup/ &&
+	object=$(git rev-parse HEAD:file)
 
-[master (root-commit) d1ff1c9] base
+[master (root-commit) 6c5620f] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-ok 1 - setup
-
-expecting success of 5325.2 'index-pack with pack.writeReverseIndex': 
-	test_index_pack "" &&
-	test_path_is_missing $rev &&
-
-	test_index_pack false &&
-	test_path_is_missing $rev &&
+ create mode 100644 file
+ok 2 - set up base packfile and variables
 
-	test_index_pack true &&
-	test_path_is_file $rev
+expecting success of 5313.3 'pack/index object count mismatch': 
+	do_pack $object &&
+	munge $pack 8 "\377\0\0\0" &&
+	clear_base &&
 
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-ok 2 - index-pack with pack.writeReverseIndex
+	# We enumerate the objects from the completely-fine
+	# .idx, but notice later that the .pack is bogus
+	# and fail to show any data.
+	echo "$object missing" >expect &&
+	git cat-file --batch-all-objects --batch-check >actual &&
+	test_cmp expect actual &&
 
-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 &&
+	# ...and here fail to load the object (without segfaulting),
+	# but fallback to a good copy if available.
+	test_must_fail git cat-file blob $object &&
+	restore_base &&
+	git cat-file blob $object >actual &&
+	test_cmp file actual &&
 
-		test_index_pack "$conf" --no-rev-index &&
-		test_path_is_missing $rev || return 1
-	done
+	# ...and make sure that index-pack --verify, which has its
+	# own reading routines, does not segfault.
+	test_must_fail git index-pack --verify $pack
 
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-ok 3 - index-pack with --[no-]rev-index
+4+0 records in
+4+0 records out
+4 bytes copied, 0.000295517 s, 13.5 kB/s
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+fatal: git cat-file fff0a2476aa5c8e60a3ef21cfc66e0cc670920be: bad file
+error: packfile .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack claims to have 4278190080 objects while index indicates 1 objects
+fatal: data too large to fit into virtual memory space
+ok 3 - pack/index object count mismatch
 
-expecting success of 5325.4 'index-pack can verify reverse indexes': 
-	test_when_finished "rm -f $rev" &&
-	test_index_pack true &&
+expecting success of 5313.4 'matched bogus object count': 
+	do_pack $object &&
+	munge $pack 8 "\377\0\0\0" &&
+	munge $idx $((255 * 4)) "\377\0\0\0" &&
+	clear_base &&
 
-	test_path_is_file $rev &&
-	git index-pack --rev-index --verify $packdir/pack-$pack.pack &&
+	# Unlike above, we should notice early that the .idx is totally
+	# bogus, and not even enumerate its contents.
+	git cat-file --batch-all-objects --batch-check >actual &&
+	test_must_be_empty actual &&
 
-	# Intentionally corrupt the reverse index.
-	chmod u+w $rev &&
-	printf "xxxx" | dd of=$rev bs=1 count=4 conv=notrunc &&
+	# But as before, we can do the same object-access checks.
+	test_must_fail git cat-file blob $object &&
+	restore_base &&
+	git cat-file blob $object >actual &&
+	test_cmp file actual &&
 
-	test_must_fail git index-pack --rev-index --verify \
-		$packdir/pack-$pack.pack 2>err &&
-	grep "validation error" err
+	test_must_fail git index-pack --verify $pack
 
-68c6c8c8538900694c32380ac1484201c8b60d8d
 4+0 records in
 4+0 records out
-4 bytes copied, 2.9624e-05 s, 135 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-*" &&
+4 bytes copied, 5.1708e-05 s, 77.4 kB/s
+4+0 records in
+4+0 records out
+4 bytes copied, 4.6066e-05 s, 86.8 kB/s
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+fatal: git cat-file fff0a2476aa5c8e60a3ef21cfc66e0cc670920be: bad file
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+error: non-monotonic index .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx
+fatal: Cannot open existing pack idx file for '.git/objects/pack/pack-67be769e2843d598c78218852612520795998892.idx'
+ok 4 - matched bogus object count
 
-	git -c pack.writeReverseIndex= pack-objects --all pack-1 &&
-	test_path_is_missing pack-1-*.rev &&
+expecting success of 5313.5 'bogus object offset (v1)': 
+	do_pack $object --index-version=1 &&
+	munge $idx $((4 * 256)) "\377\0\0\0" &&
+	clear_base &&
+	test_must_fail git cat-file blob $object &&
+	test_must_fail git index-pack --verify $pack
 
-	git -c pack.writeReverseIndex=false pack-objects --all pack-1 &&
-	test_path_is_missing pack-1-*.rev &&
+4+0 records in
+4+0 records out
+4 bytes copied, 4.0918e-05 s, 97.8 kB/s
+fatal: offset beyond end of packfile (truncated pack?)
+fatal: offset beyond end of packfile (truncated pack?)
+ok 5 - bogus object offset (v1)
 
-	git -c pack.writeReverseIndex=true pack-objects --all pack-1 &&
-	test_path_is_file pack-1-*.rev
+expecting success of 5313.6 'bogus object offset (v2, no msb)': 
+	do_pack $object --index-version=2 &&
+	munge $idx $(ofs_table 1) "\0\377\0\0" &&
+	clear_base &&
+	test_must_fail git cat-file blob $object &&
+	test_must_fail git index-pack --verify $pack
 
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-68c6c8c8538900694c32380ac1484201c8b60d8d
-ok 6 - pack-objects respects pack.writeReverseIndex
+4+0 records in
+4+0 records out
+4 bytes copied, 0.00747516 s, 0.5 kB/s
+fatal: offset beyond end of packfile (truncated pack?)
+fatal: offset beyond end of packfile (truncated pack?)
+ok 6 - bogus object offset (v2, no msb)
 
-expecting success of 5325.7 'reverse index is not generated when available on disk': 
-	test_index_pack true &&
-	test_path_is_file $rev &&
+expecting success of 5313.7 'bogus offset into v2 extended table': 
+	do_pack $object --index-version=2 &&
+	munge $idx $(ofs_table 1) "\377\0\0\0" &&
+	clear_base &&
+	test_must_fail git cat-file blob $object &&
+	test_must_fail git index-pack --verify $pack
 
-	git rev-parse HEAD >tip &&
-	GIT_TEST_REV_INDEX_DIE_IN_MEMORY=1 git cat-file \
-		--batch-check="%(objectsize:disk)" <tip
+4+0 records in
+4+0 records out
+4 bytes copied, 0.000300637 s, 13.3 kB/s
+fatal: size_t overflow: 2130706432 * 8
+fatal: offset before start of pack index for .git/objects/pack/pack-67be769e2843d598c78218852612520795998892.pack (corrupt index?)
+ok 7 - bogus offset into v2 extended table
 
-68c6c8c8538900694c32380ac1484201c8b60d8d
-126
-ok 7 - reverse index is not generated when available on disk
+expecting success of 5313.8 'bogus offset inside v2 extended table': 
+	# We need two objects here, so we can plausibly require
+	# an extended table (if the first object were larger than 2^31).
+	#
+	# Note that the value is important here. We want $object as
+	# the second entry in sorted-hash order. The hash of this object starts
+	# with "000", which sorts before that of $object (which starts
+	# with "fff").
+	second=$(test_oid oid000 | git hash-object -w --stdin) &&
+	do_pack "$object $second" --index-version=2 &&
 
-expecting success of 5325.8 'reverse index is ignored when pack.readReverseIndex is false': 
-	test_index_pack true &&
-	test_path_is_file $rev &&
+	# We have to make extra room for the table, so we cannot
+	# just munge in place as usual.
+	{
+		dd if=$idx bs=1 count=$(($(ofs_table 2) + 4)) &&
+		printf "\200\0\0\0" &&
+		printf "\377\0\0\0\0\0\0\0" &&
+		dd if=$idx bs=1 skip=$(extended_table 2)
+	} >tmp &&
+	mv tmp "$idx" &&
+	clear_base &&
+	test_must_fail git cat-file blob $object &&
+	test_must_fail git index-pack --verify $pack
 
-	test_config pack.readReverseIndex false &&
+1084+0 records in
+1084+0 records out
+1084 bytes (1.1 kB, 1.1 KiB) copied, 0.00195728 s, 554 kB/s
+40+0 records in
+40+0 records out
+40 bytes copied, 0.000118012 s, 339 kB/s
+fatal: offset before end of packfile (broken .idx?)
+fatal: offset before end of packfile (broken .idx?)
+ok 8 - bogus offset inside v2 extended table
 
-	git rev-parse HEAD >tip &&
-	GIT_TEST_REV_INDEX_DIE_ON_DISK=1 git cat-file \
-		--batch-check="%(objectsize:disk)" <tip
+expecting success of 5313.9 'bogus OFS_DELTA in packfile': 
+	# Generate a pack with a delta in it.
+	base=$(test-tool genrandom foo 3000 | git hash-object --stdin -w) &&
+	delta=$(test-tool genrandom foo 2000 | git hash-object --stdin -w) &&
+	do_pack "$base $delta" --delta-base-offset &&
+	rm -f .git/objects/??/* &&
 
-68c6c8c8538900694c32380ac1484201c8b60d8d
-126
-ok 8 - reverse index is ignored when pack.readReverseIndex is false
+	# Double check that we have the delta we expect.
+	echo $base >expect &&
+	echo $delta | git cat-file --batch-check="%(deltabase)" >actual &&
+	test_cmp expect actual &&
 
-expecting success of 5325.9 'revindex in-memory vs on-disk': 
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+	# Now corrupt it. We assume the varint size for the delta is small
+	# enough to fit in the first byte (which it should be, since it
+	# is a pure deletion from the base), and that original ofs_delta
+	# takes 2 bytes (which it should, as it should be ~3000).
+	ofs=$(git show-index <$idx | grep $delta | cut -d" " -f1) &&
+	munge $pack $(($ofs + 1)) "\177\377" &&
+	test_must_fail git cat-file blob $delta >/dev/null
 
-		test_commit commit &&
+2+0 records in
+2+0 records out
+2 bytes copied, 0.000283974 s, 7.0 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
 
-		git rev-list --objects --no-object-names --all >objects &&
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5314-pack-cycle-detection.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 
-		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 &&
+		# ...whereas dummy should be short, because we do not want
+		# deltas that would create duplicates when we --fix-thin
+		echo $i >dummy &&
 
-		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 &&
+		git add file dummy &&
+		test_tick &&
+		git commit -m $i ||
+		return 1
+	done &&
 
-		test_cmp on-disk in-core
-	)
+	make_pack HEAD^ HEAD &&
+	make_pack HEAD HEAD^
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5325-reverse-index/repo/.git/
-[master (root-commit) aa0ac59] commit
+[master (root-commit) e98f41e] one
  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 &&
-
-		test_commit commit &&
-		git -c pack.writeReverseIndex=true repack -ad &&
-		git fsck 2>err &&
-		test_must_be_empty err
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5325-reverse-index/repo/.git/
-[master (root-commit) aa0ac59] commit
+ 2 files changed, 1 insertion(+)
+ create mode 100644 dummy
+ create mode 100644 file
+[master 1d543a7] two
  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 5325.11 'set up rev-index corruption tests': 
-	git init corrupt &&
-	(
-		cd corrupt &&
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+pack	86885ae86429a2983f8a2824647f8b7773ff8e16
+pack	8a63be3313e6a04258b6d166a5abfb3005aac8f8
+ok 1 - setup
 
-		test_commit commit &&
-		git -c pack.writeReverseIndex=true repack -ad &&
+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 &&
 
-		revfile=$(ls .git/objects/pack/pack-*.rev) &&
-		chmod a+w $revfile &&
-		cp $revfile $revfile.bak
-	)
+	# 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 2 - repack
 
-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"
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5315-pack-objects-compression.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-5+0 records in
-5+0 records out
-5 bytes copied, 4.5659e-05 s, 110 kB/s
-error: invalid checksum
-ok 12 - fsck catches invalid checksum
+ok 1 - setup
 
-expecting success of 5325.13 'fsck catches invalid row position': 
-	corrupt_rev_and_verify 14 "\07" \
-		"invalid rev-index position"
+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
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.1598e-05 s, 31.6 kB/s
-error: invalid rev-index position at 0: 1 != 1793
-ok 13 - fsck catches invalid row position
+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 5325.14 'fsck catches invalid header: magic number': 
-	corrupt_rev_and_verify 1 "\07" \
-		"reverse-index file .* has unknown signature"
+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
 
-1+0 records in
-1+0 records out
-1 byte copied, 5.299e-05 s, 18.9 kB/s
-error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unknown signature
-ok 14 - fsck catches invalid header: magic number
+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 5325.15 'fsck catches invalid header: version': 
-	corrupt_rev_and_verify 7 "\02" \
-		"reverse-index file .* has unsupported version"
+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
 
-1+0 records in
-1+0 records out
-1 byte copied, 3.5884e-05 s, 27.9 kB/s
-error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported version 2
-ok 15 - fsck catches invalid header: version
+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 5325.16 'fsck catches invalid header: hash function': 
-	corrupt_rev_and_verify 11 "\03" \
-		"reverse-index file .* has unsupported hash id"
+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
 
-1+0 records in
-1+0 records out
-1 byte copied, 2.8342e-05 s, 35.3 kB/s
-error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported hash id 3
-ok 16 - fsck catches invalid header: hash function
+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 16 test(s)
-1..16
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t4255-am-submodule.sh ***
@@ -296261,602 +294096,2164 @@
 Patch failed at 0001 Add sub1
 ok 14 - am: added submodule doesn't remove untracked unignored file with same name
 
-expecting success of 4255.15 'am_3way: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 15 - am_3way: added submodule creates empty directory
+expecting success of 4255.15 'am_3way: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 15 - am_3way: added submodule creates empty directory
+
+expecting success of 4255.16 'am_3way: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 16 - am_3way: added submodule leaves existing empty directory alone
+
+expecting success of 4255.17 'am_3way: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Applying: Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 17 - am_3way: replace tracked file with submodule creates empty directory
+
+expecting success of 4255.18 'am_3way: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Applying: Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 18 - am_3way: replace directory with submodule
+
+expecting success of 4255.19 'am_3way: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Applying: Revert "Add sub1"
+ok 19 - am_3way: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 4255.20 'am_3way: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Applying: Revert "Add sub1"
+ok 20 - am_3way: removed submodule leaves submodule containing a .git directory alone
+
+checking known breakage of 4255.21 'am_3way: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Applying: Replace sub1 with directory
+error: refusing to lose untracked file at 'sub1/file2'
+error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with directory
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+Adding sub1/file3
+Adding sub1/file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with directory
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 21 - am_3way: replace submodule with a directory must fail # TODO known breakage
+
+checking known breakage of 4255.22 'am_3way: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Applying: Replace sub1 with directory
+error: refusing to lose untracked file at 'sub1/file2'
+error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with directory
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+Adding sub1/file3
+Adding sub1/file2
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with directory
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 22 - am_3way: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+
+checking known breakage of 4255.23 'am_3way: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Applying: Replace sub1 with file
+error: Your local changes to the following files would be overwritten by merge:
+	.gitmodules
+Please commit your changes or stash them before you merge.
+Aborting
+error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with file
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 23 - am_3way: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 4255.24 'am_3way: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Applying: Replace sub1 with file
+error: Your local changes to the following files would be overwritten by merge:
+	.gitmodules
+Please commit your changes or stash them before you merge.
+Aborting
+error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+09bcf53 Add sub1
+virtual Replace sub1 with file
+found 1 common ancestor:
+virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Replace sub1 with file
+'actual' is not empty, it contains:
+:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
+not ok 24 - am_3way: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 4255.25 'am_3way: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Applying: Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 25 - am_3way: modified submodule does not update submodule work tree
+
+expecting success of 4255.26 'am_3way: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Applying: Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 26 - am_3way: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 4255.27 'am_3way: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Applying: Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 27 - am_3way: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 4255.28 'am_3way: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Applying: Add sub1
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+error: merging of trees ec38489b3f8eda08fda17055ad272abc24bdf929 and 82fc70d33d0f376c5a25b599423c89e5452a2bf1 failed
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Merging:
+27611a5 Base
+virtual Add sub1
+found 1 common ancestor:
+virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: When you have resolved this problem, run "git am --continue".
+hint: If you prefer to skip this patch, run "git am --skip" instead.
+hint: To restore the original branch and stop patching, run "git am --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 Add sub1
+ok 28 - am_3way: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 4255.29 'setup diff.submodule': 
+	test_commit one &&
+	INITIAL=$(git rev-parse HEAD) &&
+
+	git init submodule &&
+	(
+		cd submodule &&
+		test_commit two &&
+		git rev-parse HEAD >../initial-submodule
+	) &&
+	git submodule add ./submodule &&
+	git commit -m first &&
+
+	(
+		cd submodule &&
+		test_commit three &&
+		git rev-parse HEAD >../first-submodule
+	) &&
+	git add submodule &&
+	git commit -m second &&
+	SECOND=$(git rev-parse HEAD) &&
+
+	(
+		cd submodule &&
+		git mv two.t four.t &&
+		git commit -m "second submodule" &&
+		git rev-parse HEAD >../second-submodule
+	) &&
+	test_commit four &&
+	git add submodule &&
+	git commit --amend --no-edit &&
+	THIRD=$(git rev-parse HEAD) &&
+	git submodule update --init
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule/.git/
+[master (root-commit) 274aeeb] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Adding existing repo at 'submodule' to the index
+[master 8fb6b7a] first
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+[master 2b16875] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[master 7cdc426] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master a623af5] second submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename two.t => four.t (100%)
+[master d6b9f1d] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+[master be614db] four
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:14:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 four.t
+ok 29 - setup diff.submodule
+
+expecting success of 4255.30 'diff.submodule unset': 
+	test_unconfig diff.submodule &&
+	run_test $SECOND first-submodule
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at 7cdc426 second
+0001-second.patch
+HEAD is now at 8fb6b7a first
+Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: second
+Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
+ok 30 - diff.submodule unset
+
+expecting success of 4255.31 'diff.submodule unset with extra file': 
+	test_unconfig diff.submodule &&
+	run_test $THIRD second-submodule
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at be614db four
+0001-four.patch
+HEAD is now at 7cdc426 second
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: four
+Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
+ok 31 - diff.submodule unset with extra file
+
+expecting success of 4255.32 'diff.submodule=log': 
+	test_config diff.submodule log &&
+	run_test $SECOND first-submodule
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at 7cdc426 second
+0001-second.patch
+HEAD is now at 8fb6b7a first
+Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: second
+Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
+ok 32 - diff.submodule=log
+
+expecting success of 4255.33 'diff.submodule=log with extra file': 
+	test_config diff.submodule log &&
+	run_test $THIRD second-submodule
+
+fatal: Resolve operation not in progress, we are not resuming.
+HEAD is now at be614db four
+0001-four.patch
+HEAD is now at 7cdc426 second
+warning: unable to rmdir 'submodule': Directory not empty
+Applying: four
+Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
+ok 33 - diff.submodule=log with extra file
+
+# still have 6 known breakage(s)
+# passed all remaining 27 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5316-pack-delta-depth.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5316-pack-delta-depth/.git/
+expecting success of 5316.1 'create series of packs': 
+	test-tool genrandom foo 4096 >content &&
+	prev= &&
+	for i in $(test_seq 1 10)
+	do
+		cat content >file &&
+		echo $i >>file &&
+		git add file &&
+		git commit -m $i &&
+		cur=$(git rev-parse HEAD^{tree}) &&
+		{
+			if test -n "$prev"
+			then
+				echo "-$prev"
+			fi &&
+			echo $cur &&
+			echo "$(git rev-parse :file) file"
+		} | git pack-objects --stdout >tmp &&
+		GIT_TRACE2_EVENT=$PWD/trace \
+		git index-pack -v --stdin --fix-thin <tmp || return 1 &&
+		grep -c region_enter.*progress trace >enter &&
+		grep -c region_leave.*progress trace >leave &&
+		test_cmp enter leave &&
+		prev=$cur
+	done
+
+[master (root-commit) adcc457] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), 4.09 KiB | 837.00 KiB/s, done.
+pack	88638646d0a7f1051038ae78ad0195c19aa7c5c8
+[master a2de7f9] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
+Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
+pack	711435b7279aca4d33efb91db771f9cf7725ff05
+[master 39a8dd7] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
+Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
+pack	46e7d03099b67170a542956fe351ceef9e70ff92
+[master 42be96b] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
+Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
+pack	30ce91502db16f0438633eccad0bf358e5ade542
+[master a2e6759] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
+Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
+pack	8cab6f2a4762ee6565a978b114f2cc3b20dbb987
+[master eb02d62] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
+Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
+pack	36e62c0a922f9fdd0eaa885dbbd08ea34de4ecc9
+[master 954149f] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
+Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
+pack	07f2e882a14adf7568f1e390177bbf8f9731ef78
+[master 13c477a] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
+Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
+pack	9514d2d071de63aee58c0b845108590565255b15
+[master 34341f7] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
+Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
+pack	b604d4190b1d2a96d6304eb045f3fbc6f2f9ab97
+[master baec731] 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Receiving objects:  50% (1/2)
Receiving objects: 100% (2/2)
Receiving objects: 100% (2/2), done.
+Resolving deltas:   0% (0/1)
Resolving deltas: 100% (1/1)
Resolving deltas: 100% (1/1), completed with 1 local object.
+pack	83f4c28b023cb2892e2574bcca33931b75bc600a
+ok 1 - create series of packs
+
+expecting success of 5316.2 'packing produces a long delta': 
+	# Use --window=0 to make sure we are seeing reused deltas,
+	# not computing a new long chain.
+	pack=$(git pack-objects --all --window=0 </dev/null pack) &&
+	echo 9 >expect &&
+	max_chain pack-$pack.pack >actual &&
+	test_cmp expect actual
+
+ok 2 - packing produces a long delta
+
+expecting success of 5316.3 '--depth limits depth': 
+	pack=$(git pack-objects --all --depth=5 </dev/null pack) &&
+	echo 5 >expect &&
+	max_chain pack-$pack.pack >actual &&
+	test_cmp expect actual
+
+ok 3 - --depth limits depth
+
+expecting success of 5316.4 '--depth=0 disables deltas': 
+	pack=$(git pack-objects --all --depth=0 </dev/null pack) &&
+	echo 0 >expect &&
+	max_chain pack-$pack.pack >actual &&
+	test_cmp expect actual
+
+ok 4 - --depth=0 disables deltas
+
+expecting success of 5316.5 'negative depth disables deltas': 
+	pack=$(git pack-objects --all --depth=-1 </dev/null pack) &&
+	echo 0 >expect &&
+	max_chain pack-$pack.pack >actual &&
+	test_cmp expect actual
+
+ok 5 - negative depth disables deltas
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5320-delta-islands.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5320-delta-islands/.git/
+expecting success of 5320.1 'setup commits': 
+	commit one seed 1 &&
+	commit two seed 12
+
+one=babc1f87e2baa9f6ad764af981fccdd2da48016e
+two=ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 1 - setup commits
+
+expecting success of 5320.2 'vanilla repack deltas one against two': 
+	git repack -adf &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 2 - vanilla repack deltas one against two
+
+expecting success of 5320.3 'island repack with no island definition is vanilla': 
+	git repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 3 - island repack with no island definition is vanilla
+
+expecting success of 5320.4 'island repack with no matches is vanilla': 
+	git -c "pack.island=refs/foo" repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 4 - island repack with no matches is vanilla
+
+expecting success of 5320.5 'separate islands disallows delta': 
+	git -c "pack.island=refs/heads/(.*)" repack -adfi &&
+	! is_delta_base $one $two &&
+	! is_delta_base $two $one
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base 0000000000000000000000000000000000000000
+ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e has base 0000000000000000000000000000000000000000
+ok 5 - separate islands disallows delta
+
+expecting success of 5320.6 'same island allows delta': 
+	git -c "pack.island=refs/heads" repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 6 - same island allows delta
+
+expecting success of 5320.7 'coalesce same-named islands': 
+	git \
+		-c "pack.island=refs/(.*)/one" \
+		-c "pack.island=refs/(.*)/two" \
+		repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 7 - coalesce same-named islands
+
+expecting success of 5320.8 'island restrictions drop reused deltas': 
+	git repack -adfi &&
+	is_delta_base $one $two &&
+	git -c "pack.island=refs/heads/(.*)" repack -adi &&
+	! is_delta_base $one $two &&
+	! is_delta_base $two $one
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base 0000000000000000000000000000000000000000
+ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e has base 0000000000000000000000000000000000000000
+ok 8 - island restrictions drop reused deltas
+
+expecting success of 5320.9 'island regexes are left-anchored': 
+	git -c "pack.island=heads/(.*)" repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 9 - island regexes are left-anchored
+
+expecting success of 5320.10 'island regexes follow last-one-wins scheme': 
+	git \
+		-c "pack.island=refs/heads/(.*)" \
+		-c "pack.island=refs/heads/" \
+		repack -adfi &&
+	is_delta_base $one $two
+
+babc1f87e2baa9f6ad764af981fccdd2da48016e has base ce1aaaff2e8846bd2f36b1a0317cacaec6fc257e
+ok 10 - island regexes follow last-one-wins scheme
+
+expecting success of 5320.11 'setup shared history': 
+	commit root shared root &&
+	commit one shared 1 root &&
+	commit two shared 12-long root
+
+root=2399f35d1d9acc612cefa2f7983f510fbd6b24e9
+one=1db8b3605f452b4a89b403abb2ae905f0a7ffaf6
+two=c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
+ok 11 - setup shared history
+
+expecting success of 5320.12 'vanilla delta goes between branches': 
+	git repack -adf &&
+	is_delta_base $one $two &&
+	is_delta_base $root $two
+
+1db8b3605f452b4a89b403abb2ae905f0a7ffaf6 has base c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
+2399f35d1d9acc612cefa2f7983f510fbd6b24e9 has base c160aaeae55c91b198ce651c8fc1d4e09dd97b4b
+ok 12 - vanilla delta goes between branches
+
+expecting success of 5320.13 'deltas allowed against superset islands': 
+	git -c "pack.island=refs/heads/(.*)" repack -adfi &&
+	is_delta_base $one $root &&
+	is_delta_base $two $root
+
+1db8b3605f452b4a89b403abb2ae905f0a7ffaf6 has base 2399f35d1d9acc612cefa2f7983f510fbd6b24e9
+c160aaeae55c91b198ce651c8fc1d4e09dd97b4b has base 2399f35d1d9acc612cefa2f7983f510fbd6b24e9
+ok 13 - deltas allowed against superset islands
+
+expecting success of 5320.14 'island core places core objects first': 
+	cat >expect <<-EOF &&
+	$root
+	$two
+	EOF
+	git -c "pack.island=refs/heads/(.*)" \
+	    -c "pack.islandcore=one" \
+	    repack -adfi &&
+	git verify-pack -v .git/objects/pack/*.pack |
+	cut -d" " -f1 |
+	grep -E "$root|$two" >actual &&
+	test_cmp expect actual
+
+ok 14 - island core places core objects first
+
+expecting success of 5320.15 'unmatched island core is not fatal': 
+	git -c "pack.islandcore=one" repack -adfi
+
+ok 15 - unmatched island core is not fatal
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5317-pack-objects-filter-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/.git/
+expecting success of 5317.1 'setup r1': 
+	git init r1 &&
+	for n in 1 2 3 4 5
+	do
+		echo "This is file: $n" > r1/file.$n &&
+		git -C r1 add file.$n &&
+		git -C r1 commit -m "$n" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r1/.git/
+[main (root-commit) a56c7ae] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.1
+[main 7d743f2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.2
+[main fcc1d33] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.3
+[main e1d918e] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.4
+[main 90f11b5] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.5
+ok 1 - setup r1
+
+expecting success of 5317.2 'verify blob count in normal packfile': 
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r1 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../all.pack &&
+
+	git -C r1 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+f8dba5b5a8cb3bf6f89b1b7a911fa01dfdb554ba
+ok 2 - verify blob count in normal packfile
+
+expecting success of 5317.3 'verify blob:none packfile has no blobs': 
+	git -C r1 pack-objects --revs --stdout --filter=blob:none >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../filter.pack &&
+
+	git -C r1 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
+
+74f9b05b95a30d347d8fdd7d07c62dd3cb5bc506
+ok 3 - verify blob:none packfile has no blobs
+
+expecting success of 5317.4 'verify blob:none packfile without --stdout': 
+	git -C r1 pack-objects --revs --filter=blob:none mypackname >packhash <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 verify-pack -v "mypackname-$(cat packhash).pack" >verify_result &&
+	! grep blob verify_result
+
+ok 4 - verify blob:none packfile without --stdout
+
+expecting success of 5317.5 'verify normal and blob:none packfiles have same commits/trees': 
+	git -C r1 verify-pack -v ../all.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >expected &&
+
+	git -C r1 verify-pack -v ../filter.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 5 - verify normal and blob:none packfiles have same commits/trees
+
+expecting success of 5317.6 'get an error for missing tree object': 
+	git init r5 &&
+	echo foo >r5/foo &&
+	git -C r5 add foo &&
+	git -C r5 commit -m "foo" &&
+	git -C r5 rev-parse HEAD^{tree} >tree &&
+	del=$(sed "s|..|&/|" tree) &&
+	rm r5/.git/objects/$del &&
+	test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
+	HEAD
+	EOF
+	grep "bad tree object" bad_tree
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r5/.git/
+[main (root-commit) fbd86ca] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+fatal: bad tree object 205f6b799e7d5c2524468ca006a0131aa57ecce7
+ok 6 - get an error for missing tree object
+
+expecting success of 5317.7 'setup for tests of tree:0': 
+	mkdir r1/subtree &&
+	echo "This is a file in a subtree" >r1/subtree/file &&
+	git -C r1 add subtree/file &&
+	git -C r1 commit -m subtree
+
+[main 4b273c5] subtree
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subtree/file
+ok 7 - setup for tests of tree:0
+
+expecting success of 5317.8 'verify tree:0 packfile has no blobs or trees': 
+	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r1 index-pack ../commitsonly.pack &&
+	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
+	! grep -E "tree|blob" objs
+
+a6f7596938aae585d3cefef3aa3c06c5b75da36b
+ok 8 - verify tree:0 packfile has no blobs or trees
+
+expecting success of 5317.9 'grab tree directly when using tree:0': 
+	# We should get the tree specified directly but not its blobs or subtrees.
+	git -C r1 pack-objects --revs --stdout --filter=tree:0 >commitsonly.pack <<-EOF &&
+	HEAD:
+	EOF
+	git -C r1 index-pack ../commitsonly.pack &&
+	git -C r1 verify-pack -v ../commitsonly.pack >objs &&
+	awk "/tree|blob/{print \$1}" objs >trees_and_blobs &&
+	git -C r1 rev-parse HEAD: >expected &&
+	test_cmp expected trees_and_blobs
+
+2abcb6db3990fe53c59fd41f9590643ae34427f0
+ok 9 - grab tree directly when using tree:0
+
+expecting success of 5317.10 'setup r2': 
+	git init r2 &&
+	for n in 1000 10000
+	do
+		printf "%"$n"s" X > r2/large.$n &&
+		git -C r2 add large.$n &&
+		git -C r2 commit -m "$n" || return 1
+	done
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r2/.git/
+[main (root-commit) 0c54972] 1000
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 large.1000
+[main fdc71e4] 10000
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 large.10000
+ok 10 - setup r2
+
+expecting success of 5317.11 'verify blob count in normal packfile': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../all.pack &&
+
+	git -C r2 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 11 - verify blob count in normal packfile
+
+expecting success of 5317.12 'verify blob:limit=500 omits all blobs': 
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
+
+d9abed358fce3ac0869120aa06e2664d45a80459
+ok 12 - verify blob:limit=500 omits all blobs
+
+expecting success of 5317.13 'verify blob:limit=1000': 
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	! grep blob verify_result
+
+d9abed358fce3ac0869120aa06e2664d45a80459
+ok 13 - verify blob:limit=1000
+
+expecting success of 5317.14 'verify blob:limit=1001': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 14 - verify blob:limit=1001
+
+expecting success of 5317.15 'verify blob:limit=10001': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 15 - verify blob:limit=10001
+
+expecting success of 5317.16 'verify blob:limit=1k': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 16 - verify blob:limit=1k
+
+expecting success of 5317.17 'verify explicitly specifying oversized blob in input': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	echo HEAD >objects &&
+	git -C r2 rev-parse HEAD:large.10000 >>objects &&
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack &&
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+caafb8a9cc92845f6f65afdea7e6fac6add3e5df
+ok 17 - verify explicitly specifying oversized blob in input
+
+expecting success of 5317.18 'verify blob:limit=1m': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+2a8bc18f1802fcc19e573eb38f1963ba344c580b
+ok 18 - verify blob:limit=1m
+
+expecting success of 5317.19 'verify normal and blob:limit packfiles have same commits/trees': 
+	git -C r2 verify-pack -v ../all.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >expected &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep -E "commit|tree" verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 19 - verify normal and blob:limit packfiles have same commits/trees
+
+expecting success of 5317.20 'verify small limit and big limit results in small limit': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1001 \
+		--filter=blob:limit=10001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 20 - verify small limit and big limit results in small limit
+
+expecting success of 5317.21 'verify big limit and small limit results in small limit': 
+	git -C r2 ls-files -s large.1000 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=10001 \
+		--filter=blob:limit=1001 >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r2 index-pack ../filter.pack &&
+
+	git -C r2 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+045779e5722283ca4bbec3b5a9285c0e10027033
+ok 21 - verify big limit and small limit results in small limit
+
+expecting success of 5317.22 'setup r3': 
+	git init r3 &&
+	mkdir r3/dir1 &&
+	for n in sparse1 sparse2
+	do
+		echo "This is file: $n" > r3/$n &&
+		git -C r3 add $n &&
+		echo "This is file: dir1/$n" > r3/dir1/$n &&
+		git -C r3 add dir1/$n || return 1
+	done &&
+	git -C r3 commit -m "sparse" &&
+	echo dir1/ >pattern1 &&
+	echo sparse1 >pattern2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r3/.git/
+[main (root-commit) b18fcc1] sparse
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 dir1/sparse1
+ create mode 100644 dir1/sparse2
+ create mode 100644 sparse1
+ create mode 100644 sparse2
+ok 22 - setup r3
+
+expecting success of 5317.23 'verify blob count in normal packfile': 
+	git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r3 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r3 index-pack ../all.pack &&
+
+	git -C r3 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+c032f005b6a497478f1daa2fb324aa5c51224039
+ok 23 - verify blob count in normal packfile
+
+expecting success of 5317.24 'verify sparse:path=pattern1 fails': 
+	test_must_fail git -C r3 pack-objects --revs --stdout \
+		--filter=sparse:path=../pattern1 <<-EOF
+	HEAD
+	EOF
+
+fatal: sparse:path filters support has been dropped
+ok 24 - verify sparse:path=pattern1 fails
+
+expecting success of 5317.25 'verify sparse:path=pattern2 fails': 
+	test_must_fail git -C r3 pack-objects --revs --stdout \
+		--filter=sparse:path=../pattern2 <<-EOF
+	HEAD
+	EOF
+
+fatal: sparse:path filters support has been dropped
+ok 25 - verify sparse:path=pattern2 fails
+
+expecting success of 5317.26 'setup r4': 
+	git init r4 &&
+	mkdir r4/dir1 &&
+	for n in sparse1 sparse2
+	do
+		echo "This is file: $n" > r4/$n &&
+		git -C r4 add $n &&
+		echo "This is file: dir1/$n" > r4/dir1/$n &&
+		git -C r4 add dir1/$n || return 1
+	done &&
+	echo dir1/ >r4/pattern &&
+	git -C r4 add pattern &&
+	git -C r4 commit -m "pattern"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5317-pack-objects-filter-objects/r4/.git/
+[main (root-commit) 94c5152] pattern
+ Author: A U Thor <author@example.com>
+ 5 files changed, 5 insertions(+)
+ create mode 100644 dir1/sparse1
+ create mode 100644 dir1/sparse2
+ create mode 100644 pattern
+ create mode 100644 sparse1
+ create mode 100644 sparse2
+ok 26 - setup r4
+
+expecting success of 5317.27 'verify blob count in normal packfile': 
+	git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r4 pack-objects --revs --stdout >all.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../all.pack &&
+
+	git -C r4 verify-pack -v ../all.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+1eda0c5015c4170144f9c7ac96c56690163e1d85
+ok 27 - verify blob count in normal packfile
+
+expecting success of 5317.28 'verify sparse:oid=OID': 
+	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r4 ls-files -s pattern >staged &&
+	oid=$(test_parse_ls_files_stage_oids <staged) &&
+	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../filter.pack &&
+
+	git -C r4 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+095eef2cc427768a7687a30f2566b8e72ac0e449
+ok 28 - verify sparse:oid=OID
+
+expecting success of 5317.29 'verify sparse:oid=oid-ish': 
+	git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
+	HEAD
+	EOF
+	git -C r4 index-pack ../filter.pack &&
+
+	git -C r4 verify-pack -v ../filter.pack >verify_result &&
+	grep blob verify_result |
+	parse_verify_pack_blob_oid |
+	sort >observed &&
+
+	test_cmp expected observed
+
+095eef2cc427768a7687a30f2566b8e72ac0e449
+ok 29 - verify sparse:oid=oid-ish
+
+expecting success of 5317.30 'setup r1 - delete loose blobs': 
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+		>ls_files_result &&
+	test_parse_ls_files_stage_oids <ls_files_result |
+	sort >expected &&
+
+	for id in `sed "s|..|&/|" expected`
+	do
+		rm r1/.git/objects/$id || return 1
+	done
+
+ok 30 - setup r1 - delete loose blobs
+
+expecting success of 5317.31 'verify pack-objects fails w/ missing objects': 
+	test_must_fail git -C r1 pack-objects --revs --stdout >miss.pack <<-EOF
+	HEAD
+	EOF
+
+fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
+ok 31 - verify pack-objects fails w/ missing objects
+
+expecting success of 5317.32 'verify pack-objects fails w/ --missing=error': 
+	test_must_fail git -C r1 pack-objects --revs --stdout --missing=error >miss.pack <<-EOF
+	HEAD
+	EOF
+
+fatal: unable to read 54ff69bde100bd29db945c2fc62010675d3b5b14
+ok 32 - verify pack-objects fails w/ --missing=error
+
+expecting success of 5317.33 'verify pack-objects w/ --missing=allow-any': 
+	git -C r1 pack-objects --revs --stdout --missing=allow-any >miss.pack <<-EOF
+	HEAD
+	EOF
+
+ok 33 - verify pack-objects w/ --missing=allow-any
+
+# passed all 33 test(s)
+1..33
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5321-pack-large-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5321-pack-large-objects/.git/
+expecting success of 5321.1 'setup': 
+	clear_packs &&
+	{
+		pack_header 2 &&
+		pack_obj $A $B &&
+		pack_obj $B
+	} >ab.pack &&
+	pack_trailer ab.pack &&
+	git index-pack --stdin <ab.pack
+
+pack	8af524300e46c11647862073e882d467bc0dd22d
+ok 1 - setup
+
+expecting success of 5321.2 'repack large deltas': 
+	printf "%s\\n" $A $B |
+	GIT_TEST_OE_DELTA_SIZE=2 git pack-objects tmp-pack
+
+aee080dc5b8a48f951541c0ad63f65af48847a6f
+ok 2 - repack large deltas
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5322-pack-objects-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5322-pack-objects-sparse/.git/
+expecting success of 5322.1 'setup repo': 
+	test_commit initial &&
+	for i in $(test_seq 1 3)
+	do
+		mkdir f$i &&
+		for j in $(test_seq 1 3)
+		do
+			mkdir f$i/f$j &&
+			echo $j >f$i/f$j/data.txt || return 1
+		done
+	done &&
+	git add . &&
+	git commit -m "Initialized trees" &&
+	for i in $(test_seq 1 3)
+	do
+		git checkout -b topic$i main &&
+		echo change-$i >f$i/f$i/data.txt &&
+		git commit -a -m "Changed f$i/f$i/data.txt" || return 1
+	done &&
+	cat >packinput.txt <<-EOF &&
+	topic1
+	^topic2
+	^topic3
+	EOF
+	git rev-parse			\
+		topic1			\
+		topic1^{tree}		\
+		topic1:f1		\
+		topic1:f1/f1		\
+		topic1:f1/f1/data.txt | sort >expect_objects.txt
+
+[main (root-commit) 24b24cf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main 8ccf85b] Initialized trees
+ Author: A U Thor <author@example.com>
+ 9 files changed, 9 insertions(+)
+ create mode 100644 f1/f1/data.txt
+ create mode 100644 f1/f2/data.txt
+ create mode 100644 f1/f3/data.txt
+ create mode 100644 f2/f1/data.txt
+ create mode 100644 f2/f2/data.txt
+ create mode 100644 f2/f3/data.txt
+ create mode 100644 f3/f1/data.txt
+ create mode 100644 f3/f2/data.txt
+ create mode 100644 f3/f3/data.txt
+Switched to a new branch 'topic1'
+[topic1 32cf0ab] Changed f1/f1/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'topic2'
+[topic2 2b44896] Changed f2/f2/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'topic3'
+[topic3 48a532e] Changed f3/f3/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup repo
+
+expecting success of 5322.2 'non-sparse pack-objects': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
+	git index-pack -o nonsparse.idx nonsparse.pack &&
+	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
+	test_cmp expect_objects.txt nonsparse_objects.txt
+
+d614884b9b2195861f9f3410ae24b1c2fdc0c831
+ok 2 - non-sparse pack-objects
+
+expecting success of 5322.3 'sparse pack-objects': 
+	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp expect_objects.txt sparse_objects.txt
+
+d614884b9b2195861f9f3410ae24b1c2fdc0c831
+ok 3 - sparse pack-objects
+
+expecting success of 5322.4 'duplicate a folder from f3 and commit to topic1': 
+	git checkout topic1 &&
+	echo change-3 >f3/f3/data.txt &&
+	git commit -a -m "Changed f3/f3/data.txt" &&
+	git rev-parse			\
+		topic1~1		\
+		topic1~1^{tree}		\
+		topic1^{tree}		\
+		topic1			\
+		topic1:f1		\
+		topic1:f1/f1		\
+		topic1:f1/f1/data.txt | sort >required_objects.txt
+
+Switched to branch 'topic1'
+[topic1 200bcc4] Changed f3/f3/data.txt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - duplicate a folder from f3 and commit to topic1
+
+expecting success of 5322.5 'non-sparse pack-objects': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
+	git index-pack -o nonsparse.idx nonsparse.pack &&
+	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
+	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
+	test_cmp required_objects.txt nonsparse_required_objects.txt
+
+46a30e027f51c2ad758015d56bda1ee6d4c8c84c
+ok 5 - non-sparse pack-objects
+
+expecting success of 5322.6 'sparse pack-objects': 
+	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	comm -1 -2 required_objects.txt sparse_objects.txt >sparse_required_objects.txt &&
+	test_cmp required_objects.txt sparse_required_objects.txt
+
+46a30e027f51c2ad758015d56bda1ee6d4c8c84c
+ok 6 - sparse pack-objects
+
+expecting success of 5322.7 'duplicate a folder from f1 into f3': 
+	mkdir f3/f4 &&
+	cp -r f1/f1/* f3/f4 &&
+	git add f3/f4 &&
+	git commit -m "Copied f1/f1 to f3/f4" &&
+	cat >packinput.txt <<-EOF &&
+	topic1
+	^topic1~1
+	EOF
+	git rev-parse		\
+		topic1		\
+		topic1^{tree}   \
+		topic1:f3 | sort >required_objects.txt
+
+[topic1 b9b902e] Copied f1/f1 to f3/f4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f3/f4/data.txt
+ok 7 - duplicate a folder from f1 into f3
+
+expecting success of 5322.8 'non-sparse pack-objects': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >nonsparse.pack &&
+	git index-pack -o nonsparse.idx nonsparse.pack &&
+	git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt &&
+	comm -1 -2 required_objects.txt nonsparse_objects.txt >nonsparse_required_objects.txt &&
+	test_cmp required_objects.txt nonsparse_required_objects.txt
+
+3b547739f421b9a4f5fc24410679e4e1f7de71cf
+ok 8 - non-sparse pack-objects
+
+expecting success of 5322.9 'sparse pack-objects': 
+	GIT_TEST_PACK_SPARSE=-1 &&
+	git rev-parse			\
+		topic1			\
+		topic1^{tree}		\
+		topic1:f3		\
+		topic1:f3/f4		\
+		topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt &&
+	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp expect_sparse_objects.txt sparse_objects.txt
+
+9f747802011a9f66e260a2ddb27f222338b37741
+ok 9 - sparse pack-objects
+
+expecting success of 5322.10 'pack.useSparse enables algorithm': 
+	git config pack.useSparse true &&
+	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp expect_sparse_objects.txt sparse_objects.txt
+
+9f747802011a9f66e260a2ddb27f222338b37741
+ok 10 - pack.useSparse enables algorithm
+
+expecting success of 5322.11 'pack.useSparse overridden': 
+	git pack-objects --stdout --revs --no-sparse <packinput.txt >sparse.pack &&
+	git index-pack -o sparse.idx sparse.pack &&
+	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
+	test_cmp required_objects.txt sparse_objects.txt
+
+3b547739f421b9a4f5fc24410679e4e1f7de71cf
+ok 11 - pack.useSparse overridden
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5323-pack-redundant.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5323-pack-redundant/.git/
+expecting success of 5323.1 'setup main repo': 
+	git init --bare "$main_repo" &&
+	create_commits_in "$main_repo" A B C D E F G H I J K L M N O P Q R
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5323-pack-redundant/main.git/
+ok 1 - setup main repo
+
+expecting success of 5323.2 'main: pack-redundant works with no packfile': 
+	(
+		cd "$main_repo" &&
+		cat >expect <<-EOF &&
+			fatal: Zero packs found!
+			EOF
+		test_must_fail $git_pack_redundant --all >actual 2>&1 &&
+		test_cmp expect actual
+	)
+
+ok 2 - main: pack-redundant works with no packfile
+
+expecting success of 5323.3 'main: pack-redundant works with one packfile': 
+	create_pack_in "$main_repo" P1 <<-EOF &&
+		$T
+		$A
+		$B
+		$C
+		$D
+		$E
+		$F
+		$R
+		EOF
+	(
+		cd "$main_repo" &&
+		$git_pack_redundant --all >out &&
+		test_must_be_empty out
+	)
+
+ok 3 - main: pack-redundant works with one packfile
+
+expecting success of 5323.4 'main: no redundant for pack 1, 2, 3': 
+	create_pack_in "$main_repo" P2 <<-EOF &&
+		$B
+		$C
+		$D
+		$E
+		$G
+		$H
+		$I
+		EOF
+	create_pack_in "$main_repo" P3 <<-EOF &&
+		$F
+		$I
+		$J
+		$K
+		$L
+		$M
+		EOF
+	(
+		cd "$main_repo" &&
+		$git_pack_redundant --all >out &&
+		test_must_be_empty out
+	)
+
+ok 4 - main: no redundant for pack 1, 2, 3
+
+expecting success of 5323.5 'main: one of pack-2/pack-3 is redundant': 
+	create_pack_in "$main_repo" P4 <<-EOF &&
+		$J
+		$K
+		$L
+		$M
+		$P
+		EOF
+	create_pack_in "$main_repo" P5 <<-EOF &&
+		$G
+		$H
+		$N
+		$O
+		EOF
+	(
+		cd "$main_repo" &&
+		cat >expect <<-EOF &&
+			P3:$P3
+			EOF
+		$git_pack_redundant --all >out &&
+		format_packfiles <out >actual &&
+		test_cmp expect actual
+	)
+
+ok 5 - main: one of pack-2/pack-3 is redundant
+
+expecting success of 5323.6 'main: pack 2, 4, and 6 are redundant': 
+	create_pack_in "$main_repo" P6 <<-EOF &&
+		$N
+		$O
+		$Q
+		EOF
+	create_pack_in "$main_repo" P7 <<-EOF &&
+		$P
+		$Q
+		EOF
+	(
+		cd "$main_repo" &&
+		cat >expect <<-EOF &&
+			P2:$P2
+			P4:$P4
+			P6:$P6
+			EOF
+		$git_pack_redundant --all >out &&
+		format_packfiles <out >actual &&
+		test_cmp expect actual
+	)
+
+ok 6 - main: pack 2, 4, and 6 are redundant
+
+expecting success of 5323.7 'main: pack-8 (subset of pack-1) is also redundant': 
+	create_pack_in "$main_repo" P8 <<-EOF &&
+		$A
+		EOF
+	(
+		cd "$main_repo" &&
+		cat >expect <<-EOF &&
+			P2:$P2
+			P4:$P4
+			P6:$P6
+			P8:$P8
+			EOF
+		$git_pack_redundant --all >out &&
+		format_packfiles <out >actual &&
+		test_cmp expect actual
+	)
+
+ok 7 - main: pack-8 (subset of pack-1) is also redundant
 
-expecting success of 4255.16 'am_3way: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 16 - am_3way: added submodule leaves existing empty directory alone
+expecting success of 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 4255.17 'am_3way: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Applying: Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 17 - am_3way: replace tracked file with submodule creates empty directory
+ok 8 - main: clean loose objects
 
-expecting success of 4255.18 'am_3way: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Applying: Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 18 - am_3way: replace directory with submodule
+expecting success of 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 4255.19 'am_3way: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Applying: Revert "Add sub1"
-ok 19 - am_3way: removed submodule leaves submodule directory and its contents in place
+notice: HEAD points to an unborn branch (master)
+ok 9 - main: remove redundant packs and pass fsck
 
-expecting success of 4255.20 'am_3way: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Applying: Revert "Add sub1"
-ok 20 - am_3way: removed submodule leaves submodule containing a .git directory alone
+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
+	)
 
-checking known breakage of 4255.21 'am_3way: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
+Cloning into bare repository 'shared.git'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Applying: Replace sub1 with directory
-error: refusing to lose untracked file at 'sub1/file2'
-error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with directory
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-Adding sub1/file3
-Adding sub1/file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with directory
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 21 - am_3way: replace submodule with a directory must fail # TODO known breakage
+ok 10 - setup shared.git
 
-checking known breakage of 4255.22 'am_3way: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Applying: Replace sub1 with directory
-error: refusing to lose untracked file at 'sub1/file2'
-error: add_cacheinfo failed to refresh for path 'sub1/file2'; merge aborting.
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with directory
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-Adding sub1/file3
-Adding sub1/file2
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with directory
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 22 - am_3way: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+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
+	)
 
-checking known breakage of 4255.23 'am_3way: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Applying: Replace sub1 with file
-error: Your local changes to the following files would be overwritten by merge:
-	.gitmodules
-Please commit your changes or stash them before you merge.
-Aborting
-error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with file
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 23 - am_3way: replace submodule with a file must fail # TODO known breakage
+ok 11 - shared: all packs are redundant, but no output without --alt-odb
 
-checking known breakage of 4255.24 'am_3way: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Applying: Replace sub1 with file
-error: Your local changes to the following files would be overwritten by merge:
-	.gitmodules
-Please commit your changes or stash them before you merge.
-Aborting
-error: merging of trees 78e68a0ec4ef4e6a1d1e7a07e6ad2cf028704e1e and 0c5fb3d7a7f38842873e1ae04f0d84f622ff7d20 failed
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-09bcf53 Add sub1
-virtual Replace sub1 with file
-found 1 common ancestor:
-virtual 79da5ac42bf0336dfffb2f8e0c8fe7ba750b4b82
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Replace sub1 with file
-'actual' is not empty, it contains:
-:100644 100644 af3a0c56edfba1a28f50ada5ec2832a7f2f9b907 0000000000000000000000000000000000000000 M	.gitmodules
-not ok 24 - am_3way: replace submodule containing a .git directory with a file must fail # TODO known breakage
+expecting success of 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 4255.25 'am_3way: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Applying: Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 25 - am_3way: modified submodule does not update submodule work tree
+ok 12 - shared: show redundant packs in stderr for verbose mode
 
-expecting success of 4255.26 'am_3way: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Applying: Invalid sub1 commit
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 26 - am_3way: modified submodule does not update submodule work tree to invalid commit
+expecting success of 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 4255.27 'am_3way: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Applying: Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 27 - am_3way: modified submodule does not update submodule work tree from invalid commit
+notice: HEAD points to an unborn branch (master)
+ok 13 - shared: remove redundant packs, no packs left
 
-expecting success of 4255.28 'am_3way: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Applying: Add sub1
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-error: merging of trees ec38489b3f8eda08fda17055ad272abc24bdf929 and 82fc70d33d0f376c5a25b599423c89e5452a2bf1 failed
-Using index info to reconstruct a base tree...
-Falling back to patching base and 3-way merge...
-Merging:
-27611a5 Base
-virtual Add sub1
-found 1 common ancestor:
-virtual 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: When you have resolved this problem, run "git am --continue".
-hint: If you prefer to skip this patch, run "git am --skip" instead.
-hint: To restore the original branch and stop patching, run "git am --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 Add sub1
-ok 28 - am_3way: added submodule doesn't remove untracked unignored file with same name
+expecting success of 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 4255.29 'setup diff.submodule': 
-	test_commit one &&
-	INITIAL=$(git rev-parse HEAD) &&
+ok 14 - shared: create new objects and packs
 
-	git init submodule &&
+expecting success of 5323.15 'shared: no redundant without --alt-odb': 
 	(
-		cd submodule &&
-		test_commit two &&
-		git rev-parse HEAD >../initial-submodule
-	) &&
-	git submodule add ./submodule &&
-	git commit -m first &&
+		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 submodule &&
-		test_commit three &&
-		git rev-parse HEAD >../first-submodule
-	) &&
-	git add submodule &&
-	git commit -m second &&
-	SECOND=$(git rev-parse HEAD) &&
+		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 submodule &&
-		git mv two.t four.t &&
-		git commit -m "second submodule" &&
-		git rev-parse HEAD >../second-submodule
-	) &&
-	test_commit four &&
-	git add submodule &&
-	git commit --amend --no-edit &&
-	THIRD=$(git rev-parse HEAD) &&
-	git submodule update --init
+		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
+	)
 
-[master (root-commit) d79ce16] one
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5325-reverse-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5325-reverse-index/.git/
+expecting success of 5325.1 'setup': 
+	test_commit base &&
+
+	test_config pack.writeReverseIndex false &&
+	pack=$(git pack-objects --all $packdir/pack) &&
+	rev=$packdir/pack-$pack.rev &&
+
+	test_path_is_missing $rev
+
+[master (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t4255-am-submodule/submodule/.git/
-[master (root-commit) 274aeeb] two
+ 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, 5.2439e-05 s, 76.3 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 &&
+
+		test_commit commit &&
+
+		git rev-list --objects --no-object-names --all >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 &&
+
+		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 &&
+
+		test_cmp on-disk in-core
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 two.t
-Adding existing repo at 'submodule' to the index
-[master 8fb6b7a] first
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-[master 2b16875] three
+ 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 &&
+
+		test_commit commit &&
+		git -c pack.writeReverseIndex=true repack -ad &&
+		git fsck 2>err &&
+		test_must_be_empty err
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 three.t
-[master 7cdc426] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master a623af5] second submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename two.t => four.t (100%)
-[master d6b9f1d] four
+ create mode 100644 commit.t
+ok 10 - fsck succeeds on good rev-index
+
+expecting success of 5325.11 'set up rev-index corruption tests': 
+	git init corrupt &&
+	(
+		cd corrupt &&
+
+		test_commit commit &&
+		git -c pack.writeReverseIndex=true repack -ad &&
+
+		revfile=$(ls .git/objects/pack/pack-*.rev) &&
+		chmod a+w $revfile &&
+		cp $revfile $revfile.bak
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 four.t
-[master be614db] four
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:14:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 four.t
-ok 29 - setup diff.submodule
+ create mode 100644 commit.t
+ok 11 - set up rev-index corruption tests
 
-expecting success of 4255.30 'diff.submodule unset': 
-	test_unconfig diff.submodule &&
-	run_test $SECOND first-submodule
+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"
 
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at 7cdc426 second
-0001-second.patch
-HEAD is now at 8fb6b7a first
-Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: second
-Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
-ok 30 - diff.submodule unset
+5+0 records in
+5+0 records out
+5 bytes copied, 0.000276051 s, 18.1 kB/s
+error: invalid checksum
+ok 12 - fsck catches invalid checksum
 
-expecting success of 4255.31 'diff.submodule unset with extra file': 
-	test_unconfig diff.submodule &&
-	run_test $THIRD second-submodule
+expecting success of 5325.13 'fsck catches invalid row position': 
+	corrupt_rev_and_verify 14 "\07" \
+		"invalid rev-index position"
 
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at be614db four
-0001-four.patch
-HEAD is now at 7cdc426 second
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: four
-Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
-ok 31 - diff.submodule unset with extra file
+1+0 records in
+1+0 records out
+1 byte copied, 0.00794744 s, 0.1 kB/s
+error: invalid rev-index position at 0: 1 != 1793
+ok 13 - fsck catches invalid row position
 
-expecting success of 4255.32 'diff.submodule=log': 
-	test_config diff.submodule log &&
-	run_test $SECOND first-submodule
+expecting success of 5325.14 'fsck catches invalid header: magic number': 
+	corrupt_rev_and_verify 1 "\07" \
+		"reverse-index file .* has unknown signature"
 
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at 7cdc426 second
-0001-second.patch
-HEAD is now at 8fb6b7a first
-Submodule path 'submodule': checked out '274aeebc83e7f26e680862996e9bd5ecc327019b'
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: second
-Submodule path 'submodule': checked out '2b16875140fdb3b4aae24b2015fe1bcc27aafb37'
-ok 32 - diff.submodule=log
+1+0 records in
+1+0 records out
+1 byte copied, 0.00760724 s, 0.1 kB/s
+error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unknown signature
+ok 14 - fsck catches invalid header: magic number
 
-expecting success of 4255.33 'diff.submodule=log with extra file': 
-	test_config diff.submodule log &&
-	run_test $THIRD second-submodule
+expecting success of 5325.15 'fsck catches invalid header: version': 
+	corrupt_rev_and_verify 7 "\02" \
+		"reverse-index file .* has unsupported version"
 
-fatal: Resolve operation not in progress, we are not resuming.
-HEAD is now at be614db four
-0001-four.patch
-HEAD is now at 7cdc426 second
-warning: unable to rmdir 'submodule': Directory not empty
-Applying: four
-Submodule path 'submodule': checked out 'a623af53832974aedda72512f4fa27b05b513dee'
-ok 33 - diff.submodule=log with extra file
+1+0 records in
+1+0 records out
+1 byte copied, 4.8812e-05 s, 20.5 kB/s
+error: reverse-index file .git/objects/pack/pack-781c8ebe3a20791a874d3d2a4bbd4d9bed4f1120.rev has unsupported version 2
+ok 15 - fsck catches invalid header: version
 
-# still have 6 known breakage(s)
-# passed all remaining 27 test(s)
-1..33
+expecting success of 5325.16 'fsck catches invalid header: hash function': 
+	corrupt_rev_and_verify 11 "\03" \
+		"reverse-index file .* has unsupported hash id"
+
+1+0 records in
+1+0 records out
+1 byte copied, 3.731e-05 s, 26.8 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
+
+# passed all 16 test(s)
+1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5318-commit-graph.sh ***
@@ -297704,10 +297101,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.2379e-05 s, 30.9 kB/s
+1 byte copied, 0.000335843 s, 3.0 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.9354e-05 s, 0.0 kB/s
+0 bytes copied, 2.1481e-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
@@ -297721,10 +297118,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4041e-05 s, 29.4 kB/s
+1 byte copied, 0.000328599 s, 3.0 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.1302e-05 s, 0.0 kB/s
+0 bytes copied, 2.3193e-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
@@ -297738,10 +297135,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.7567e-05 s, 26.6 kB/s
+1 byte copied, 4.2681e-05 s, 23.4 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.0561e-05 s, 0.0 kB/s
+0 bytes copied, 2.5208e-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
@@ -297755,10 +297152,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.7997e-05 s, 26.3 kB/s
+1 byte copied, 0.00644632 s, 0.2 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 3.0846e-05 s, 0.0 kB/s
+0 bytes copied, 2.112e-05 s, 0.0 kB/s
 error: final chunk has non-zero id 4f49444c
 error: final chunk has non-zero id 4f49444c
 ?? expect
@@ -297772,10 +297169,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.1427e-05 s, 31.8 kB/s
+1 byte copied, 4.4233e-05 s, 22.6 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.6685e-05 s, 0.0 kB/s
+0 bytes copied, 3.4725e-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
@@ -297789,10 +297186,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.5984e-05 s, 27.8 kB/s
+1 byte copied, 3.5346e-05 s, 28.3 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.2424e-05 s, 0.0 kB/s
+0 bytes copied, 2.1141e-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
@@ -297806,10 +297203,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.967e-05 s, 25.2 kB/s
+1 byte copied, 4.2199e-05 s, 23.7 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.5062e-05 s, 0.0 kB/s
+0 bytes copied, 2.58e-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
@@ -297823,10 +297220,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.0857e-05 s, 32.4 kB/s
+1 byte copied, 3.7091e-05 s, 27.0 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.9229e-05 s, 0.0 kB/s
+0 bytes copied, 2.0909e-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
@@ -297842,10 +297239,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.2799e-05 s, 18.9 kB/s
+1 byte copied, 0.00724836 s, 0.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.014e-05 s, 0.0 kB/s
+0 bytes copied, 1.7995e-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
@@ -297861,10 +297258,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.6135e-05 s, 27.7 kB/s
+1 byte copied, 0.0028785 s, 0.3 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.1031e-05 s, 0.0 kB/s
+0 bytes copied, 1.4497e-05 s, 0.0 kB/s
 commit-graph has incorrect OID order: d0dcf978085b712ac89a73020e40fb8b7e540ec4 then 01c8575ed6fc205127629848895ac35ba7529ace
 ?? expect
 ?? output
@@ -297876,10 +297273,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.347e-05 s, 29.9 kB/s
+1 byte copied, 0.000277053 s, 3.6 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.4462e-05 s, 0.0 kB/s
+0 bytes copied, 2.0098e-05 s, 0.0 kB/s
 failed to parse commit 76c4cb0cede3ceaca44a01b27edce46ba498dfad from object database for commit-graph
 ?? expect
 ?? output
@@ -297891,10 +297288,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.1823e-05 s, 23.9 kB/s
+1 byte copied, 3.5868e-05 s, 27.9 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.4802e-05 s, 0.0 kB/s
+0 bytes copied, 1.9136e-05 s, 0.0 kB/s
 root tree OID for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 016f0284c84f93b3e8df8c402054b760afac7e76 != 566f0284c84f93b3e8df8c402054b760afac7e76
 ?? expect
 ?? output
@@ -297906,10 +297303,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.0756e-05 s, 19.7 kB/s
+1 byte copied, 0.00352145 s, 0.3 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.2033e-05 s, 0.0 kB/s
+0 bytes copied, 3.1539e-05 s, 0.0 kB/s
 fatal: invalid parent position 16777220
 ?? expect
 ?? output
@@ -297921,10 +297318,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.015e-05 s, 24.9 kB/s
+1 byte copied, 3.1319e-05 s, 31.9 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.054e-05 s, 0.0 kB/s
+0 bytes copied, 1.7694e-05 s, 0.0 kB/s
 commit-graph parent list for commit 12a06f3a2c235980d878903e940b0570ddda4359 is too long
 ?? expect
 ?? output
@@ -297936,10 +297333,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.1027e-05 s, 32.2 kB/s
+1 byte copied, 3.9214e-05 s, 25.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.9379e-05 s, 0.0 kB/s
+0 bytes copied, 2.9356e-05 s, 0.0 kB/s
 commit-graph parent for 12a06f3a2c235980d878903e940b0570ddda4359 is 2c45687afab8ea0442fe2feb61881deac6f37339 != 76c4cb0cede3ceaca44a1bb27edce46ba498dfad
 ?? expect
 ?? output
@@ -297951,10 +297348,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.3054e-05 s, 23.2 kB/s
+1 byte copied, 5.2448e-05 s, 19.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.97e-05 s, 0.0 kB/s
+0 bytes copied, 2.8183e-05 s, 0.0 kB/s
 commit-graph generation for commit 2ff07863aadb0941159dda60d980783f6b7c6213 is 5 < 15
 ?? expect
 ?? output
@@ -297966,10 +297363,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.0535e-05 s, 19.8 kB/s
+1 byte copied, 0.000311807 s, 3.2 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.5889e-05 s, 0.0 kB/s
+0 bytes copied, 2.2103e-05 s, 0.0 kB/s
 commit date for commit 12a06f3a2c235980d878903e940b0570ddda4359 in commit-graph is 22393313 != 1112912353
 ?? expect
 ?? output
@@ -297981,10 +297378,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4893e-05 s, 28.7 kB/s
+1 byte copied, 0.00185638 s, 0.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.8808e-05 s, 0.0 kB/s
+0 bytes copied, 2.2143e-05 s, 0.0 kB/s
 fatal: invalid parent position 16777216
 ?? expect
 ?? output
@@ -297996,10 +297393,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.2709e-05 s, 30.6 kB/s
+1 byte copied, 0.000402519 s, 2.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.5218e-05 s, 0.0 kB/s
+0 bytes copied, 3.3594e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -298012,10 +297409,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.0461e-05 s, 24.7 kB/s
+1 byte copied, 0.000284547 s, 3.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.9499e-05 s, 0.0 kB/s
+0 bytes copied, 2.143e-05 s, 0.0 kB/s
 error: commit-graph file is too small to hold 255 chunks
 error: commit-graph file is too small to hold 255 chunks
 ?? expect
@@ -298029,10 +297426,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 4.2594e-05 s, 93.9 kB/s
+4 bytes copied, 0.000320414 s, 12.5 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.9634e-05 s, 0.0 kB/s
+0 bytes copied, 2.0429e-05 s, 0.0 kB/s
 commit-graph has both zero and non-zero generations (e.g., commits 'ddc8575ed6fc205127629848895ac35ba7529ace' and 'd0dcf978085b712ac89a73020e40fb8b7e540ec4')
 ?? expect
 ?? output
@@ -298044,10 +297441,10 @@
 
 4+0 records in
 4+0 records out
-4 bytes copied, 4.9624e-05 s, 80.6 kB/s
+4 bytes copied, 0.000358786 s, 11.1 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 3.293e-05 s, 0.0 kB/s
+0 bytes copied, 2.5568e-05 s, 0.0 kB/s
 commit-graph has both zero and non-zero generations (e.g., commits '12a06f3a2c235980d878903e940b0570ddda4359' and 'ddc8575ed6fc205127629848895ac35ba7529ace')
 ?? expect
 ?? output
@@ -298064,10 +297461,10 @@
 dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
 1+0 records in
 1+0 records out
-1 byte copied, 2.9043e-05 s, 34.4 kB/s
+1 byte copied, 0.00592816 s, 0.2 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.967e-05 s, 0.0 kB/s
+0 bytes copied, 2.3624e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -298087,10 +297484,10 @@
 dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
 1+0 records in
 1+0 records out
-1 byte copied, 4.6469e-05 s, 21.5 kB/s
+1 byte copied, 0.000314382 s, 3.2 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 2.4947e-05 s, 0.0 kB/s
+0 bytes copied, 2.118e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -298112,10 +297509,10 @@
 dangling tree 40771367e5b0a0c62eafabaac4494d311c5834b7
 1+0 records in
 1+0 records out
-1 byte copied, 3.8628e-05 s, 25.9 kB/s
+1 byte copied, 0.000295598 s, 3.4 kB/s
 0+0 records in
 0+0 records out
-0 bytes copied, 1.6154e-05 s, 0.0 kB/s
+0 bytes copied, 3.1549e-05 s, 0.0 kB/s
 the commit-graph file has incorrect checksum and is likely corrupt
 ?? expect
 ?? output
@@ -298528,25 +297925,6 @@
 1..108
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5328-commit-graph-64bit-time.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 not satisfied
-1..0 # SKIP skipping 64-bit timestamp tests
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5319-multi-pack-index.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5319-multi-pack-index/.git/
 expecting success of 5319.1 'setup': 
@@ -299015,7 +298393,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 2.9665e-05 s, 33.7 kB/s
+1 byte copied, 0.0048253 s, 0.2 kB/s
 fatal: multi-pack-index signature 0x00494458 does not match signature 0x4d494458
 ok 30 - verify bad signature
 
@@ -299025,7 +298403,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.5533e-05 s, 28.1 kB/s
+1 byte copied, 0.000393832 s, 2.5 kB/s
 fatal: multi-pack-index version 0 not recognized
 ok 31 - verify bad version
 
@@ -299035,7 +298413,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.6986e-05 s, 27.0 kB/s
+1 byte copied, 4.4023e-05 s, 22.7 kB/s
 error: multi-pack-index hash version 3 does not match version 1
 ok 32 - verify bad OID version
 
@@ -299045,7 +298423,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4242e-05 s, 29.2 kB/s
+1 byte copied, 5.314e-05 s, 18.8 kB/s
 error: final chunk has non-zero id 4f494446
 ok 33 - verify truncated chunk count
 
@@ -299055,7 +298433,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.7447e-05 s, 26.7 kB/s
+1 byte copied, 4.9183e-05 s, 20.3 kB/s
 error: terminating chunk id appears earlier than expected
 ok 34 - verify extended chunk count
 
@@ -299065,7 +298443,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.5914e-05 s, 27.8 kB/s
+1 byte copied, 0.0069604 s, 0.1 kB/s
 fatal: multi-pack-index required pack-name chunk missing or corrupted
 ok 35 - verify missing required chunk
 
@@ -299075,7 +298453,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.3891e-05 s, 29.5 kB/s
+1 byte copied, 0.000346895 s, 2.9 kB/s
 error: improper chunk offset(s) 100000000000048 and 2d4
 ok 36 - verify invalid chunk offset
 
@@ -299085,7 +298463,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.9019e-05 s, 25.6 kB/s
+1 byte copied, 0.0113853 s, 0.1 kB/s
 fatal: multi-pack-index pack names out of order: 'tezt-2-0994129a102d56705c119b91822cbd6ef1599f8f.idx' before 'test-a10c8cef352773b1f1b38ecc868f417f3d6029c9.idx'
 ok 37 - verify packnames out of order
 
@@ -299095,7 +298473,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.7586e-05 s, 26.6 kB/s
+1 byte copied, 0.00389647 s, 0.3 kB/s
 failed to load pack in position 0
 failed to load pack entry for oid[41] = 8f94df605db2ec0d0bb7962abbc87d8d1b2f6f00
 ok 38 - verify packnames out of order
@@ -299106,7 +298484,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.5753e-05 s, 28.0 kB/s
+1 byte copied, 4.2381e-05 s, 23.6 kB/s
 error: oid fanout out of order: fanout[250] = 1004a > 4a = fanout[251]
 ok 39 - verify oid fanout out of order
 
@@ -299116,7 +298494,7 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 5.0476e-05 s, 19.8 kB/s
+1 byte copied, 4.0427e-05 s, 24.7 kB/s
 oid lookup out of order: oid[15] = 2f695f39a9ae90106abc3a1efc22b6cfe2522e89 >= 005f923c2d2e1fff9ec067b42443fff88aeebc67 = oid[16]
 ok 40 - verify oid lookup out of order
 
@@ -299126,8 +298504,8 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.0265e-05 s, 33.0 kB/s
-fatal: bad pack-int-id: 1797 (12 total packs)
+1 byte copied, 0.0150537 s, 0.1 kB/s
+fatal: bad pack-int-id: 1795 (12 total packs)
 ok 41 - verify incorrect pack-int-id
 
 expecting success of 5319.42 'verify incorrect offset': 
@@ -299136,8 +298514,8 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4542e-05 s, 29.0 kB/s
-incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
+1 byte copied, 3.8332e-05 s, 26.1 kB/s
+incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff44 != 1344
 ok 42 - verify incorrect offset
 
 expecting success of 5319.43 'git-fsck incorrect offset': 
@@ -299150,10 +298528,10 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 4.0601e-05 s, 24.6 kB/s
-incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
+1 byte copied, 0.00777954 s, 0.1 kB/s
+incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff44 != 1344
 incorrect checksum
-incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
+incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff44 != 1344
 ok 43 - git-fsck incorrect offset
 
 expecting success of 5319.44 'git fsck shows MIDX output with --progress': 
@@ -299181,8 +298559,8 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.2458e-05 s, 30.8 kB/s
-incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff8f != 138f
+1 byte copied, 0.00709831 s, 0.1 kB/s
+incorrect object offset for oid[16] = 305f923c2d2e1fff9ec067b42443fff88aeebc67: ff44 != 1344
 warning: ignoring existing multi-pack-index; checksum mismatch
 ok 46 - corrupt MIDX is not reused
 
@@ -299194,7 +298572,7 @@
 
 10+0 records in
 10+0 records out
-10 bytes copied, 4.7351e-05 s, 211 kB/s
+10 bytes copied, 0.000268014 s, 37.3 kB/s
 incorrect checksum
 ok 47 - verify incorrect checksum
 
@@ -299280,21 +298658,21 @@
  1 file changed, 1 insertion(+)
  create mode 100644 4.t
 total 52
-drwxr-xr-x 2 pbuilder1 pbuilder1 4096 Dec 18 01:36 .
-drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Dec 18 01:36 ..
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Dec 18 01:36 multi-pack-index
--rw-r--r-- 1 pbuilder1 pbuilder1 1300 Dec 18 01:36 multi-pack-index.bak
--r--r--r-- 1 pbuilder1 pbuilder1 1072 Dec 18 01:36 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Dec 18 01:36 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
--r--r--r-- 1 pbuilder1 pbuilder1   32 Dec 18 01:36 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
--r--r--r-- 1 pbuilder1 pbuilder1   52 Dec 18 01:36 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1156 Dec 18 01:36 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
--rw-r--r-- 1 pbuilder1 pbuilder1    0 Dec 18 01:36 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
--r--r--r-- 1 pbuilder1 pbuilder1  211 Dec 18 01:36 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
--r--r--r-- 1 pbuilder1 pbuilder1   64 Dec 18 01:36 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Dec 18 01:36 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
--r--r--r-- 1 pbuilder1 pbuilder1  676 Dec 18 01:36 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Dec 18 01:36 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
+drwxr-xr-x 2 pbuilder2 pbuilder2 4096 Nov 14 19:36 .
+drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Nov 14 19:36 ..
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Nov 14 19:36 multi-pack-index
+-rw-r--r-- 1 pbuilder2 pbuilder2 1300 Nov 14 19:36 multi-pack-index.bak
+-r--r--r-- 1 pbuilder2 pbuilder2 1072 Nov 14 19:36 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Nov 14 19:36 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.keep
+-r--r--r-- 1 pbuilder2 pbuilder2   32 Nov 14 19:36 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   52 Nov 14 19:36 pack-029d08823bd8a8eab510ad6ac75c823cfd3ed31e.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1156 Nov 14 19:36 pack-759d6abd76f238b50cff99be39e99979d3691e8c.idx
+-rw-r--r-- 1 pbuilder2 pbuilder2    0 Nov 14 19:36 pack-759d6abd76f238b50cff99be39e99979d3691e8c.keep
+-r--r--r-- 1 pbuilder2 pbuilder2  211 Nov 14 19:36 pack-759d6abd76f238b50cff99be39e99979d3691e8c.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   64 Nov 14 19:36 pack-759d6abd76f238b50cff99be39e99979d3691e8c.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Nov 14 19:36 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  676 Nov 14 19:36 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Nov 14 19:36 pack-f3bd8538a7920fa218713e1ba855f020af9ef053.rev
 ok 52 - repack preserves multi-pack-index when creating packs
 
 expecting success of 5319.53 'check normal git operations: after repack': 
@@ -299403,7 +298781,7 @@
 HEAD is now at 287f5d9
 1+0 records in
 1+0 records out
-1 byte copied, 3.7767e-05 s, 26.5 kB/s
+1 byte copied, 3.9805e-05 s, 25.1 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5319-multi-pack-index/repo/.git/
 ok 59 - force some 64-bit offsets with pack-objects
 
@@ -299418,8 +298796,8 @@
 
 1+0 records in
 1+0 records out
-1 byte copied, 3.4722e-05 s, 28.8 kB/s
-incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70be4 != be4
+1 byte copied, 0.00668741 s, 0.1 kB/s
+incorrect object offset for oid[61] = f2377b316d0d92e3c29a2d6dba598ca02fb80e9c: 70b79 != b79
 ok 61 - verify incorrect 64-bit offset
 
 expecting success of 5319.62 'setup expire tests': 
@@ -299794,12 +299172,12 @@
 		test_line_count = 4 midx-list
 	)
 
--r--r--r-- 1 pbuilder1 pbuilder1 1173 Dec 18 01:36 .git/objects/pack/pack-269f4a448ea80fce0d08c50e4af59cdbbed73705.pack
--r--r--r-- 1 pbuilder1 pbuilder1 2239 Dec 18 01:36 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
--r--r--r-- 1 pbuilder1 pbuilder1 1385 Dec 18 01:36 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
--r--r--r-- 1 pbuilder1 pbuilder1  838 Dec 18 01:36 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
--r--r--r-- 1 pbuilder1 pbuilder1  560 Dec 18 01:36 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
--r--r--r-- 1 pbuilder1 pbuilder1 4587 Dec 18 01:36 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1173 Nov 14 19:36 .git/objects/pack/pack-269f4a448ea80fce0d08c50e4af59cdbbed73705.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 2239 Nov 14 19:36 .git/objects/pack/pack-A-40289997979ee9f2d7198a5b4ac9fe14e27cbe4b.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 1385 Nov 14 19:36 .git/objects/pack/pack-B-926e20b0e641003b2f6bcddd6ccf53e7741c8642.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  838 Nov 14 19:36 .git/objects/pack/pack-C-b33c048d7202659249bb0cea7bbc997ce448c75d.pack
+-r--r--r-- 1 pbuilder2 pbuilder2  560 Nov 14 19:36 .git/objects/pack/pack-D-49ca36507a52bbba6d1768e28666eb0f4e5f7d95.pack
+-r--r--r-- 1 pbuilder2 pbuilder2 4587 Nov 14 19:36 .git/objects/pack/pack-E-31ea0966bb15206fbfd1b4c2f5be4b24a03050f5.pack
 ok 73 - expire removes repacked packs
 
 expecting success of 5319.74 'expire works when adding new packs': 
@@ -300230,630 +299608,23 @@
 1..91
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5330-no-lazy-fetch-with-commit-graph.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-
-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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-
-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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/without-commit/
-ok 3 - setup: change the alternates to what without the commit
-
-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) &&
-	GIT_TRACE="$(pwd)/trace.txt" \
-		git -C with-commit-graph fetch origin $anycommit 2>err &&
-	! grep "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
-	grep "git fetch origin" trace.txt >actual &&
-	test_line_count = 1 actual
-
-[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
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5331-pack-objects-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/.git/
-expecting success of 5331.1 'setup for --stdin-packs tests': 
-	git init stdin-packs &&
-	(
-		cd stdin-packs &&
-
-		test_commit A &&
-		test_commit B &&
-		test_commit C &&
-
-		for id in A B C
-		do
-			git pack-objects .git/objects/pack/pack-$id \
-				--incremental --revs <<-EOF || exit 1
-			refs/tags/$id
-			EOF
-		done &&
-
-		ls -la .git/objects/pack
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/stdin-packs/.git/
-[main (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main d9df450] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 35a8500] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-794781495799da912f5473db27abed9641406f96
-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc
-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0
-total 44
-drwxr-xr-x  2 pbuilder1 pbuilder1 4096 Dec 18 01:36 .
-drwxr-xr-x 13 pbuilder1 pbuilder1 4096 Dec 18 01:36 ..
--r--r--r--  1 pbuilder1 pbuilder1 1156 Dec 18 01:36 pack-A-794781495799da912f5473db27abed9641406f96.idx
--r--r--r--  1 pbuilder1 pbuilder1  210 Dec 18 01:36 pack-A-794781495799da912f5473db27abed9641406f96.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Dec 18 01:36 pack-A-794781495799da912f5473db27abed9641406f96.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Dec 18 01:36 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
--r--r--r--  1 pbuilder1 pbuilder1  267 Dec 18 01:36 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Dec 18 01:36 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
--r--r--r--  1 pbuilder1 pbuilder1 1156 Dec 18 01:36 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
--r--r--r--  1 pbuilder1 pbuilder1  292 Dec 18 01:36 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
--r--r--r--  1 pbuilder1 pbuilder1   64 Dec 18 01:36 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
-ok 1 - setup for --stdin-packs tests
-
-expecting success of 5331.2 '--stdin-packs with excluded packs': 
-	(
-		cd stdin-packs &&
-
-		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
-		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
-		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
-
-		git pack-objects test --stdin-packs <<-EOF &&
-		$PACK_A
-		^$PACK_B
-		$PACK_C
-		EOF
-
-		(
-			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-C-*.idx)
-		) >expect.raw &&
-		git show-index <$(ls test-*.idx) >actual.raw &&
-
-		cut -d" " -f2 <expect.raw | sort >expect &&
-		cut -d" " -f2 <actual.raw | sort >actual &&
-		test_cmp expect actual
-	)
-
-d79f0a91fe88b889c156c95980949119173ad813
-ok 2 - --stdin-packs with excluded packs
-
-expecting success of 5331.3 '--stdin-packs is incompatible with --filter': 
-	(
-		cd stdin-packs &&
-		test_must_fail git pack-objects --stdin-packs --stdout \
-			--filter=blob:none </dev/null 2>err &&
-		test_grep "cannot use --filter with --stdin-packs" err
-	)
-
-fatal: cannot use --filter with --stdin-packs
-ok 3 - --stdin-packs is incompatible with --filter
-
-expecting success of 5331.4 '--stdin-packs is incompatible with --revs': 
-	(
-		cd stdin-packs &&
-		test_must_fail git pack-objects --stdin-packs --revs out \
-			</dev/null 2>err &&
-		test_grep "cannot use internal rev list with --stdin-packs" err
-	)
-
-fatal: cannot use internal rev list with --stdin-packs
-ok 4 - --stdin-packs is incompatible with --revs
-
-expecting success of 5331.5 '--stdin-packs with loose objects': 
-	(
-		cd stdin-packs &&
-
-		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
-		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
-		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
-
-		test_commit D && # loose
-
-		git pack-objects test2 --stdin-packs --unpacked <<-EOF &&
-		$PACK_A
-		^$PACK_B
-		$PACK_C
-		EOF
-
-		(
-			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
-			git rev-list --objects --no-object-names \
-				refs/tags/C..refs/tags/D
-
-		) >expect.raw &&
-		ls -la . &&
-		git show-index <$(ls test2-*.idx) >actual.raw &&
-
-		cut -d" " -f2 <expect.raw | sort >expect &&
-		cut -d" " -f2 <actual.raw | sort >actual &&
-		test_cmp expect actual
-	)
-
-[main 71a49b9] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9
-total 72
-drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Dec 18 01:36 .
-drwxr-xr-x 4 pbuilder1 pbuilder1 4096 Dec 18 01:36 ..
-drwxr-xr-x 8 pbuilder1 pbuilder1 4096 Dec 18 01:36 .git
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Dec 18 01:36 A.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Dec 18 01:36 B.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Dec 18 01:36 C.t
--rw-r--r-- 1 pbuilder1 pbuilder1    2 Dec 18 01:36 D.t
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Dec 18 01:36 actual
--rw-r--r-- 1 pbuilder1 pbuilder1  335 Dec 18 01:36 actual.raw
--rw-r--r-- 1 pbuilder1 pbuilder1   55 Dec 18 01:36 err
--rw-r--r-- 1 pbuilder1 pbuilder1  246 Dec 18 01:36 expect
--rw-r--r-- 1 pbuilder1 pbuilder1  457 Dec 18 01:36 expect.raw
--r--r--r-- 1 pbuilder1 pbuilder1 1240 Dec 18 01:36 test-d79f0a91fe88b889c156c95980949119173ad813.idx
--r--r--r-- 1 pbuilder1 pbuilder1  470 Dec 18 01:36 test-d79f0a91fe88b889c156c95980949119173ad813.pack
--r--r--r-- 1 pbuilder1 pbuilder1   76 Dec 18 01:36 test-d79f0a91fe88b889c156c95980949119173ad813.rev
--r--r--r-- 1 pbuilder1 pbuilder1 1324 Dec 18 01:36 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
--r--r--r-- 1 pbuilder1 pbuilder1  693 Dec 18 01:36 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
--r--r--r-- 1 pbuilder1 pbuilder1   88 Dec 18 01:36 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
-ok 5 - --stdin-packs with loose objects
-
-expecting success of 5331.6 '--stdin-packs with broken links': 
-	(
-		cd stdin-packs &&
-
-		# make an unreachable object with a bogus parent
-		git cat-file -p HEAD >commit &&
-		sed "s/$(git rev-parse HEAD^)/$(test_oid zero)/" <commit |
-		git hash-object -w -t commit --stdin >in &&
-
-		git pack-objects .git/objects/pack/pack-D <in &&
-
-		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
-		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
-		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
-		PACK_D="$(basename .git/objects/pack/pack-D-*.pack)" &&
-
-		git pack-objects test3 --stdin-packs --unpacked <<-EOF &&
-		$PACK_A
-		^$PACK_B
-		$PACK_C
-		$PACK_D
-		EOF
-
-		(
-			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
-			git show-index <$(ls .git/objects/pack/pack-D-*.idx) &&
-			git rev-list --objects --no-object-names \
-				refs/tags/C..refs/tags/D
-		) >expect.raw &&
-		git show-index <$(ls test3-*.idx) >actual.raw &&
-
-		cut -d" " -f2 <expect.raw | sort >expect &&
-		cut -d" " -f2 <actual.raw | sort >actual &&
-		test_cmp expect actual
-	)
-
-1c529235d2f84e54e1f186c4d2b6c65a26299d38
-ff80c980d491fa53537f36ea3206e7a9c12cf89b
-ok 6 - --stdin-packs with broken links
-
-expecting success of 5331.7 'pack-objects --stdin with duplicate packfile': 
-	test_when_finished "rm -fr repo" &&
-
-	git init repo &&
-	(
-		cd repo &&
-		test_commit "commit" &&
-		git repack -ad &&
-
-		{
-			basename .git/objects/pack/pack-*.pack &&
-			basename .git/objects/pack/pack-*.pack
-		} >packfiles &&
-
-		git pack-objects --stdin-packs generated-pack <packfiles &&
-		packed_objects .git/objects/pack/pack-*.idx >expect &&
-		packed_objects generated-pack-*.idx >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/repo/.git/
-[main (root-commit) 499d3ae] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-bb8f6d9d0f08840ee5644ac2998ee938e9ca5b57
-ok 7 - pack-objects --stdin with duplicate packfile
-
-expecting success of 5331.8 'pack-objects --stdin with same packfile excluded and included': 
-	test_when_finished "rm -fr repo" &&
-
-	git init repo &&
-	(
-		cd repo &&
-		test_commit "commit" &&
-		git repack -ad &&
-
-		{
-			basename .git/objects/pack/pack-*.pack &&
-			printf "^%s\n" "$(basename .git/objects/pack/pack-*.pack)"
-		} >packfiles &&
-
-		git pack-objects --stdin-packs generated-pack <packfiles &&
-		packed_objects generated-pack-*.idx >packed-objects &&
-		test_must_be_empty packed-objects
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/repo/.git/
-[main (root-commit) 499d3ae] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit.t
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-ok 8 - pack-objects --stdin with same packfile excluded and included
-
-expecting success of 5331.9 'pack-objects --stdin with packfiles from alternate object database': 
-	test_when_finished "rm -fr shared member" &&
-
-	# Set up a shared repository with a single packfile.
-	git init shared &&
-	test_commit -C shared "shared-objects" &&
-	git -C shared repack -ad &&
-	basename shared/.git/objects/pack/pack-*.pack >packfile &&
-
-	# Set up a repository that is connected to the shared repository. This
-	# repository has no objects on its own, but we still expect to be able
-	# to pack objects from its alternate.
-	git clone --shared shared member &&
-	git -C member pack-objects --stdin-packs generated-pack <packfile &&
-	test_cmp shared/.git/objects/pack/pack-*.pack member/generated-pack-*.pack
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/shared/.git/
-[main (root-commit) 145e1e6] shared-objects
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-objects.t
-Cloning into 'member'...
-done.
-33d7aff4e675ff5bc1d48bcdab29cb013e53965b
-ok 9 - pack-objects --stdin with packfiles from alternate object database
-
-expecting success of 5331.10 'pack-objects --stdin with packfiles from main and alternate object database': 
-	test_when_finished "rm -fr shared member" &&
-
-	# Set up a shared repository with a single packfile.
-	git init shared &&
-	test_commit -C shared "shared-commit" &&
-	git -C shared repack -ad &&
-
-	# Set up a repository that is connected to the shared repository. This
-	# repository has a second packfile so that we can verify that it is
-	# possible to write packs that include packfiles from different object
-	# databases.
-	git clone --shared shared member &&
-	test_commit -C member "local-commit" &&
-	git -C member repack -dl &&
-
-	{
-		basename shared/.git/objects/pack/pack-*.pack &&
-		basename member/.git/objects/pack/pack-*.pack
-	} >packfiles &&
-
-	{
-		packed_objects shared/.git/objects/pack/pack-*.idx &&
-		packed_objects member/.git/objects/pack/pack-*.idx
-	} | sort >expected-objects &&
-
-	git -C member pack-objects --stdin-packs generated-pack <packfiles &&
-	packed_objects member/generated-pack-*.idx >actual-objects &&
-	test_cmp expected-objects actual-objects
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/shared/.git/
-[main (root-commit) 4c151b8] shared-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 shared-commit.t
-Cloning into 'member'...
-done.
-[main 7c14a26] local-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 local-commit.t
-d3e539037cb74e50eb4452759efc2fac0ae5e17a
-ok 10 - pack-objects --stdin with packfiles from main and alternate object database
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5332-multi-pack-reuse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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":"20251218T013623.309214Z-Hfbad846e-P00003a55","thread":"main","time":"2025-12-18T01:36:23.310619Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001579,"t_rel":0.001579,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20251218T013623.309214Z-Hfbad846e-P00003a55","thread":"main","time":"2025-12-18T01:36:23.310624Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001584,"t_rel":0.001584,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-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":"20251218T013623.331027Z-Hfbad846e-P00003a6e","thread":"main","time":"2025-12-18T01:36:23.332585Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001776,"t_rel":0.001776,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20251218T013623.331027Z-Hfbad846e-P00003a6e","thread":"main","time":"2025-12-18T01:36:23.332590Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001781,"t_rel":0.001781,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-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":"20251218T013623.354403Z-Hfbad846e-P00003a8c","thread":"main","time":"2025-12-18T01:36:23.355698Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001470,"t_rel":0.001470,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20251218T013623.354403Z-Hfbad846e-P00003a8c","thread":"main","time":"2025-12-18T01:36:23.355704Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001475,"t_rel":0.001475,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
-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":"20251218T013623.398152Z-Hfbad846e-P00003ab5","thread":"main","time":"2025-12-18T01:36:23.399537Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001529,"t_rel":0.001529,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20251218T013623.398152Z-Hfbad846e-P00003ab5","thread":"main","time":"2025-12-18T01:36:23.399542Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001534,"t_rel":0.001534,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-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":"20251218T013623.525844Z-Hfbad846e-P00003b3d","thread":"main","time":"2025-12-18T01:36:23.527267Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001600,"t_rel":0.001600,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
-{"event":"data","sid":"20251218T013623.525844Z-Hfbad846e-P00003b3d","thread":"main","time":"2025-12-18T01:36:23.527272Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001606,"t_rel":0.001606,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
-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":"20251218T013623.532661Z-Hfbad846e-P00003b46","thread":"main","time":"2025-12-18T01:36:23.534013Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001486,"t_rel":0.001486,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
-{"event":"data","sid":"20251218T013623.532661Z-Hfbad846e-P00003b46","thread":"main","time":"2025-12-18T01:36:23.534019Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001492,"t_rel":0.001492,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
-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":"20251218T013623.740510Z-Hfbad846e-P00003c3d","thread":"main","time":"2025-12-18T01:36:23.743382Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.003043,"t_rel":0.003043,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20251218T013623.740510Z-Hfbad846e-P00003c3d","thread":"main","time":"2025-12-18T01:36:23.743388Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.003049,"t_rel":0.003049,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-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":"20251218T013623.781544Z-Hfbad846e-P00003c8d","thread":"main","time":"2025-12-18T01:36:23.782873Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001462,"t_rel":0.001462,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20251218T013623.781544Z-Hfbad846e-P00003c8d","thread":"main","time":"2025-12-18T01:36:23.782878Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001467,"t_rel":0.001467,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-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":"20251218T013623.922246Z-Hfbad846e-P00003d2a","thread":"main","time":"2025-12-18T01:36:23.923518Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001408,"t_rel":0.001408,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
-{"event":"data","sid":"20251218T013623.922246Z-Hfbad846e-P00003d2a","thread":"main","time":"2025-12-18T01:36:23.923524Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001413,"t_rel":0.001413,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
-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
+*** t5328-commit-graph-64bit-time.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5328-commit-graph-64bit-time/.git/
+checking prerequisite: TIME_IS_64BIT
 
-{"event":"data","sid":"20251218T013623.972097Z-Hfbad846e-P00003d5d","thread":"main","time":"2025-12-18T01:36:23.973939Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.002044,"t_rel":0.002044,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
-{"event":"data","sid":"20251218T013623.972097Z-Hfbad846e-P00003d5d","thread":"main","time":"2025-12-18T01:36:23.973945Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.002050,"t_rel":0.002050,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
-ok 11 - omit delta from uninteresting base (cross pack)
+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
 
-# passed all 11 test(s)
-1..11
+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 not satisfied
+1..0 # SKIP skipping 64-bit timestamp tests
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5310-pack-bitmaps.sh ***
@@ -301132,8 +299903,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20251218T013609.675850Z-Hfbad846e-P0000747e/20251218T013609.678939Z-Hfbad846e-P00007488","thread":"main","time":"2025-12-18T01:36:09.692825Z","file":"pack-bitmap-write.c","line":335,"repo":1,"t_abs":0.014071,"t_rel":0.000736,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20251218T013609.675850Z-Hfbad846e-P0000747e/20251218T013609.678939Z-Hfbad846e-P00007488","thread":"main","time":"2025-12-18T01:36:09.692843Z","file":"pack-bitmap-write.c","line":337,"repo":1,"t_abs":0.014091,"t_rel":0.000756,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20241114T193551.679904Z-H5c947e1c-P00005a99/20241114T193551.691266Z-H5c947e1c-P00005aa2","thread":"main","time":"2024-11-14T19:35:51.760940Z","file":"pack-bitmap-write.c","line":335,"repo":1,"t_abs":0.069861,"t_rel":0.000539,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20241114T193551.679904Z-H5c947e1c-P00005a99/20241114T193551.691266Z-H5c947e1c-P00005aa2","thread":"main","time":"2024-11-14T19:35:51.760954Z","file":"pack-bitmap-write.c","line":337,"repo":1,"t_abs":0.069877,"t_rel":0.000555,"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': 
@@ -301670,7 +300441,7 @@
 	jgit --version
 
 )
-t5310-pack-bitmaps.sh: 7: eval: jgit: not found
+./test-lib.sh: line 1056: jgit: command not found
 prerequisite JGIT not satisfied
 checking prerequisite: SHA1
 
@@ -301939,8 +300710,8 @@
 pack_report: pack_mapped              =      26915 /      26915
 ---------------------------------------------------------------------
 
---- before	2025-12-18 01:36:12.314773267 +0000
-+++ after	2025-12-18 01:36:12.342773267 +0000
+--- before	2024-11-14 19:36:06.517710209 +0000
++++ after	2024-11-14 19:36:06.697712042 +0000
 @@ -1 +1 @@
 -5856eb049fa881263aa3ba7ed2e5edbf7e1fbcac
 +6a6543fc00ae3e5f9847cf9ca452037bed353779
@@ -302030,10 +300801,10 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
-e7044c3d0754f94d7cb91400d11711b5667d7a56
 5925c4e1ec8bac94f428d0e74df0e946acb72c2f
-{"event":"data","sid":"20251218T013612.566534Z-Hfbad846e-P00000b99","thread":"main","time":"2025-12-18T01:36:12.567822Z","file":"pack-bitmap.c","line":462,"repo":1,"t_abs":0.001461,"t_rel":0.001461,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-43cc18f2eec2f5958d1bddd67d64d18c30f4850b.pack"}
-{"event":"data","sid":"20251218T013612.566534Z-Hfbad846e-P00000b99","thread":"main","time":"2025-12-18T01:36:12.567839Z","file":"pack-bitmap.c","line":436,"repo":1,"t_abs":0.001480,"t_rel":0.001480,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
+e7044c3d0754f94d7cb91400d11711b5667d7a56
+{"event":"data","sid":"20241114T193607.382290Z-H5c947e1c-P00007435","thread":"main","time":"2024-11-14T19:36:07.383252Z","file":"pack-bitmap.c","line":462,"repo":1,"t_abs":0.001131,"t_rel":0.001131,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-90860c48cd6b78bb32a9b104cd5b49799ab8c8ac.pack"}
+{"event":"data","sid":"20241114T193607.382290Z-H5c947e1c-P00007435","thread":"main","time":"2024-11-14T19:36:07.383270Z","file":"pack-bitmap.c","line":436,"repo":1,"t_abs":0.001149,"t_rel":0.001149,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-43cc18f2eec2f5958d1bddd67d64d18c30f4850b.pack"}
 ok 74 - complains about multiple pack bitmaps
 
 expecting success of 5310.75 'setup test repository': 
@@ -302310,8 +301081,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20251218T013613.326586Z-Hfbad846e-P00001053/20251218T013613.329842Z-Hfbad846e-P00001055","thread":"main","time":"2025-12-18T01:36:13.343994Z","file":"pack-bitmap-write.c","line":335,"repo":1,"t_abs":0.014308,"t_rel":0.000778,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20251218T013613.326586Z-Hfbad846e-P00001053/20251218T013613.329842Z-Hfbad846e-P00001055","thread":"main","time":"2025-12-18T01:36:13.344007Z","file":"pack-bitmap-write.c","line":337,"repo":1,"t_abs":0.014323,"t_rel":0.000793,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20241114T193609.055662Z-H5c947e1c-P0000786e/20241114T193609.074160Z-H5c947e1c-P00007875","thread":"main","time":"2024-11-14T19:36:09.124109Z","file":"pack-bitmap-write.c","line":335,"repo":1,"t_abs":0.050100,"t_rel":0.000613,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20241114T193609.055662Z-H5c947e1c-P0000786e/20241114T193609.074160Z-H5c947e1c-P00007875","thread":"main","time":"2024-11-14T19:36:09.124121Z","file":"pack-bitmap-write.c","line":337,"repo":1,"t_abs":0.050114,"t_rel":0.000627,"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': 
@@ -303094,8 +301865,8 @@
 pack_report: pack_mapped              =      26911 /      26911
 ---------------------------------------------------------------------
 
---- before	2025-12-18 01:36:16.482773267 +0000
-+++ after	2025-12-18 01:36:16.522773267 +0000
+--- before	2024-11-14 19:36:18.389831091 +0000
++++ after	2024-11-14 19:36:18.521832434 +0000
 @@ -1 +1 @@
 -a3caed54c4e80e89b950a3dc3137850a7de9e11a
 +6d88075ba6ae7fa70257e63b62d2182dc9825ed1
@@ -303187,8 +301958,8 @@
  create mode 100644 other.t
 3cd8c16e652034892da5481183a4d7aa2f7803dc
 d9be34f11dab75a3315b4361ae577329c4c5c312
-{"event":"data","sid":"20251218T013616.813844Z-Hfbad846e-P00002216","thread":"main","time":"2025-12-18T01:36:16.815138Z","file":"pack-bitmap.c","line":462,"repo":1,"t_abs":0.001472,"t_rel":0.001472,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
-{"event":"data","sid":"20251218T013616.813844Z-Hfbad846e-P00002216","thread":"main","time":"2025-12-18T01:36:16.815158Z","file":"pack-bitmap.c","line":436,"repo":1,"t_abs":0.001492,"t_rel":0.001492,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-19bdd1ccc6f741f53b9197695f9f145e7fcd9377.pack"}
+{"event":"data","sid":"20241114T193619.409187Z-H5c947e1c-P00000da7","thread":"main","time":"2024-11-14T19:36:19.410177Z","file":"pack-bitmap.c","line":462,"repo":1,"t_abs":0.001211,"t_rel":0.001211,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-63dbdd2da806a70649399187a2e9986677c885e5.pack"}
+{"event":"data","sid":"20241114T193619.409187Z-H5c947e1c-P00000da7","thread":"main","time":"2024-11-14T19:36:19.410194Z","file":"pack-bitmap.c","line":436,"repo":1,"t_abs":0.001229,"t_rel":0.001229,"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': 
@@ -303524,7 +302295,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20251218T013616.991989Z-Hfbad846e-P000022c7","thread":"main","time":"2025-12-18T01:36:16.993389Z","file":"pack-bitmap.c","line":1781,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20241114T193619.788010Z-H5c947e1c-P00000e75","thread":"main","time":"2024-11-14T19:36:19.797636Z","file":"pack-bitmap.c","line":1781,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -303810,7 +302581,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20251218T013617.001714Z-Hfbad846e-P000022d6","thread":"main","time":"2025-12-18T01:36:17.007210Z","file":"pack-bitmap.c","line":1781,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20241114T193619.832328Z-H5c947e1c-P00000e86","thread":"main","time":"2024-11-14T19:36:19.841697Z","file":"pack-bitmap.c","line":1781,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -304096,7 +302867,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20251218T013617.013235Z-Hfbad846e-P000022ea","thread":"main","time":"2025-12-18T01:36:17.014648Z","file":"pack-bitmap.c","line":1781,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
+{"event":"region_enter","sid":"20241114T193619.871697Z-H5c947e1c-P00000e95","thread":"main","time":"2024-11-14T19:36:19.872873Z","file":"pack-bitmap.c","line":1781,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/boundary"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -304382,7 +303153,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20251218T013617.022101Z-Hfbad846e-P000022f8","thread":"main","time":"2025-12-18T01:36:17.025575Z","file":"pack-bitmap.c","line":1785,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20241114T193619.933548Z-H5c947e1c-P00000ead","thread":"main","time":"2024-11-14T19:36:19.934655Z","file":"pack-bitmap.c","line":1785,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -304668,7 +303439,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20251218T013617.035877Z-Hfbad846e-P00002309","thread":"main","time":"2025-12-18T01:36:17.039858Z","file":"pack-bitmap.c","line":1785,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20241114T193619.971723Z-H5c947e1c-P00000ebe","thread":"main","time":"2024-11-14T19:36:19.978956Z","file":"pack-bitmap.c","line":1785,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -304954,7 +303725,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20251218T013617.044523Z-Hfbad846e-P00002314","thread":"main","time":"2025-12-18T01:36:17.045971Z","file":"pack-bitmap.c","line":1785,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20241114T193620.007655Z-H5c947e1c-P00000ecd","thread":"main","time":"2024-11-14T19:36:20.008856Z","file":"pack-bitmap.c","line":1785,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 d6d4242fbc1bef1b5c52ba7e03fcf696aeac12e7
 c84ede0472affcd5bf920f6397f0928128ffa6ea
 a18de210b34a22c770ff80dd3c0e292a014ccd5f
@@ -305240,7 +304011,7 @@
 c49d8ee1891540dc6eb6bfb0f42c8373ac760c63
 0654d050cc75268e8d3cd3f00b53dc2c5a4f1fab
 7cfbd65428ae9b638a6a7c05dc7cd8bfb3e30a1a
-{"event":"region_enter","sid":"20251218T013617.064674Z-Hfbad846e-P0000232f","thread":"main","time":"2025-12-18T01:36:17.066141Z","file":"pack-bitmap.c","line":1785,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
+{"event":"region_enter","sid":"20241114T193620.048053Z-H5c947e1c-P00000edd","thread":"main","time":"2024-11-14T19:36:20.058766Z","file":"pack-bitmap.c","line":1785,"repo":1,"nesting":1,"category":"pack-bitmap","label":"haves/classic"}
 ok 151 - boundary-based traversal is used when requested
 
 expecting success of 5310.152 'setup test repository': 
@@ -305517,8 +304288,8 @@
 		grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
 		grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
 	
-{"event":"data","sid":"20251218T013617.923103Z-Hfbad846e-P0000281d/20251218T013617.925455Z-Hfbad846e-P00002821","thread":"main","time":"2025-12-18T01:36:17.948624Z","file":"pack-bitmap-write.c","line":335,"repo":1,"t_abs":0.023382,"t_rel":0.000663,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
-{"event":"data","sid":"20251218T013617.923103Z-Hfbad846e-P0000281d/20251218T013617.925455Z-Hfbad846e-P00002821","thread":"main","time":"2025-12-18T01:36:17.948635Z","file":"pack-bitmap-write.c","line":337,"repo":1,"t_abs":0.023393,"t_rel":0.000674,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
+{"event":"data","sid":"20241114T193625.010372Z-H5c947e1c-P0000148c/20241114T193625.022754Z-H5c947e1c-P00001493","thread":"main","time":"2024-11-14T19:36:25.091544Z","file":"pack-bitmap-write.c","line":335,"repo":1,"t_abs":0.069003,"t_rel":0.000579,"nesting":3,"category":"pack-bitmap-write","key":"num_selected_commits","value":"106"}
+{"event":"data","sid":"20241114T193625.010372Z-H5c947e1c-P0000148c/20241114T193625.022754Z-H5c947e1c-P00001493","thread":"main","time":"2024-11-14T19:36:25.091559Z","file":"pack-bitmap-write.c","line":337,"repo":1,"t_abs":0.069020,"t_rel":0.000596,"nesting":3,"category":"pack-bitmap-write","key":"num_maximal_commits","value":"107"}
 ok 155 - full repack creates bitmaps
 
 expecting success of 5310.156 'rev-list --test-bitmap verifies bitmaps': 
@@ -305558,873 +304329,3108 @@
 	
 ok 160 - counting non-linear history (full bitmap, second)
 
-expecting success of 5310.161 'counting commits with limiting (full bitmap, second)': 
-		git rev-list --count $branch -- 1.t >expect &&
-		git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
+expecting success of 5310.161 'counting commits with limiting (full 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 161 - counting commits with limiting (full bitmap, second)
+
+expecting success of 5310.162 'counting objects via bitmap (full bitmap, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 162 - counting objects via bitmap (full bitmap, second)
+
+expecting success of 5310.163 'enumerate commits (full bitmap, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 163 - enumerate commits (full bitmap, second)
+
+expecting success of 5310.164 'enumerate --objects (full 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 4101, line 101
+ok 164 - enumerate --objects (full bitmap, second)
+
+expecting success of 5310.165 'bitmap --objects handles non-commit objects (full bitmap, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 165 - bitmap --objects handles non-commit objects (full bitmap, second)
+
+expecting success of 5310.166 'counting commits via bitmap (full bitmap, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 166 - counting commits via bitmap (full bitmap, other)
+
+expecting success of 5310.167 'counting partial commits via bitmap (full 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 167 - counting partial commits via bitmap (full bitmap, other)
+
+expecting success of 5310.168 'counting commits with limit (full 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 168 - counting commits with limit (full bitmap, other)
+
+expecting success of 5310.169 'counting non-linear history (full bitmap, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 169 - counting non-linear history (full bitmap, other)
+
+expecting success of 5310.170 'counting commits with limiting (full 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 170 - counting commits with limiting (full bitmap, other)
+
+expecting success of 5310.171 'counting objects via bitmap (full bitmap, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 171 - counting objects via bitmap (full bitmap, other)
+
+expecting success of 5310.172 '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 172 - enumerate commits (full bitmap, other)
+
+expecting success of 5310.173 '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 173 - enumerate --objects (full bitmap, other)
+
+expecting success of 5310.174 '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 174 - bitmap --objects handles non-commit objects (full bitmap, other)
+
+expecting success of 5310.175 '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 175 - clone from bitmapped repository
+
+expecting success of 5310.176 '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 176 - partial clone from bitmapped repository
+
+expecting success of 5310.177 'setup further non-bitmapped commits': 
+		test_commit_bulk --id=further 10
+	
+43182d8c02d9405d91b2a36088eec7ecf8f44f44
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           30 (         0 duplicates                  )
+      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           10 (         0 duplicates          9 deltas of          9 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:            119
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         16
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      58709 /      58709
+---------------------------------------------------------------------
+
+ok 177 - setup further non-bitmapped commits
+
+expecting success of 5310.178 '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 178 - counting commits via bitmap (partial bitmap, second)
+
+expecting success of 5310.179 '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 179 - counting partial commits via bitmap (partial bitmap, second)
+
+expecting success of 5310.180 '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 180 - counting commits with limit (partial bitmap, second)
+
+expecting success of 5310.181 '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 181 - counting non-linear history (partial bitmap, second)
+
+expecting success of 5310.182 '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 182 - counting commits with limiting (partial bitmap, second)
+
+expecting success of 5310.183 '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 183 - counting objects via bitmap (partial bitmap, second)
+
+expecting success of 5310.184 '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 184 - enumerate commits (partial bitmap, second)
+
+expecting success of 5310.185 '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 185 - enumerate --objects (partial bitmap, second)
+
+expecting success of 5310.186 '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 186 - bitmap --objects handles non-commit objects (partial bitmap, second)
+
+expecting success of 5310.187 '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 187 - counting commits via bitmap (partial bitmap, other)
+
+expecting success of 5310.188 '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 188 - counting partial commits via bitmap (partial bitmap, other)
+
+expecting success of 5310.189 '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 189 - counting commits with limit (partial bitmap, other)
+
+expecting success of 5310.190 '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 190 - counting non-linear history (partial bitmap, other)
+
+expecting success of 5310.191 '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 191 - counting commits with limiting (partial bitmap, other)
+
+expecting success of 5310.192 '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 192 - counting objects via bitmap (partial bitmap, other)
+
+expecting success of 5310.193 '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 193 - enumerate commits (partial bitmap, other)
+
+expecting success of 5310.194 '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 194 - enumerate --objects (partial bitmap, other)
+
+expecting success of 5310.195 '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 195 - bitmap --objects handles non-commit objects (partial bitmap, other)
+
+expecting success of 5310.196 '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.45.2/t/trash directory.t5310-pack-bitmaps/.
+   43182d8..01c75d7  second     -> second
+ok 196 - fetch (partial bitmap)
+
+expecting success of 5310.197 '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: 659, done.
+Total 659 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
+[second a9f0276] an extra commit object
+ Author: A U Thor <author@example.com>
+Enumerating objects: 660, done.
+Total 660 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
+ok 197 - enumerating progress counts pack-reused objects
+
+expecting success of 5310.198 'pack-objects respects --local (non-local loose)': 
+		git init --bare alt.git &&
+		echo $(pwd)/alt.git/objects >.git/objects/info/alternates &&
+		echo content1 >file1 &&
+		# non-local loose object which is not present in bitmapped pack
+		altblob=$(GIT_DIR=alt.git git hash-object -w file1) &&
+		# non-local loose object which is also present in bitmapped pack
+		git cat-file blob $blob | GIT_DIR=alt.git git hash-object -w --stdin &&
+		git add file1 &&
+		test_tick &&
+		git commit -m commit_file1 &&
+		echo HEAD | git pack-objects --local --stdout --revs >1.pack &&
+		git index-pack 1.pack &&
+		list_packed_objects 1.idx >1.objects &&
+		printf "%s\n" "$altblob" "$blob" >nonlocal-loose &&
+		! has_any nonlocal-loose 1.objects
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/alt.git/
+782f60206c837dcd3d441e106549ad6f58de55b5
+[second 8b3d0b3] commit_file1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file1
+42c9c43b45865350be479762d51665126aab2c7a
+ok 198 - pack-objects respects --local (non-local loose)
+
+expecting success of 5310.199 'pack-objects respects --honor-pack-keep (local non-bitmapped pack)': 
+		echo content2 >file2 &&
+		blob2=$(git hash-object -w file2) &&
+		git add file2 &&
+		test_tick &&
+		git commit -m commit_file2 &&
+		printf "%s\n" "$blob2" "$bitmaptip" >keepobjects &&
+		pack2=$(git pack-objects pack2 <keepobjects) &&
+		mv pack2-$pack2.* .git/objects/pack/ &&
+		>.git/objects/pack/pack2-$pack2.keep &&
+		rm $(objpath $blob2) &&
+		echo HEAD | git pack-objects --honor-pack-keep --stdout --revs >2a.pack &&
+		git index-pack 2a.pack &&
+		list_packed_objects 2a.idx >2a.objects &&
+		! has_any keepobjects 2a.objects
+	
+[second c497ff6] commit_file2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file2
+668f4d0903ff53d829803e3d1b2a8cfc8f697970
+ok 199 - pack-objects respects --honor-pack-keep (local non-bitmapped pack)
+
+expecting success of 5310.200 'pack-objects respects --local (non-local pack)': 
+		mv .git/objects/pack/pack2-$pack2.* alt.git/objects/pack/ &&
+		echo HEAD | git pack-objects --local --stdout --revs >2b.pack &&
+		git index-pack 2b.pack &&
+		list_packed_objects 2b.idx >2b.objects &&
+		! has_any keepobjects 2b.objects
+	
+11629401753ce54be03ac6152e14534cb5b0dda3
+ok 200 - pack-objects respects --local (non-local pack)
+
+expecting success of 5310.201 'pack-objects respects --honor-pack-keep (local bitmapped pack)': 
+		ls .git/objects/pack/ | grep bitmap >output &&
+		test_line_count = 1 output &&
+		packbitmap=$(basename $(cat output) .bitmap) &&
+		list_packed_objects .git/objects/pack/$packbitmap.idx >packbitmap.objects &&
+		test_when_finished "rm -f .git/objects/pack/$packbitmap.keep" &&
+		>.git/objects/pack/$packbitmap.keep &&
+		echo HEAD | git pack-objects --honor-pack-keep --stdout --revs >3a.pack &&
+		git index-pack 3a.pack &&
+		list_packed_objects 3a.idx >3a.objects &&
+		! has_any packbitmap.objects 3a.objects
+	
+83abfb5d92d28a5869d16ebeffa064cf85f2e051
+ok 201 - pack-objects respects --honor-pack-keep (local bitmapped pack)
+
+expecting success of 5310.202 'pack-objects respects --local (non-local bitmapped pack)': 
+		mv .git/objects/pack/$packbitmap.* alt.git/objects/pack/ &&
+		rm -f .git/objects/pack/multi-pack-index &&
+		test_when_finished "mv alt.git/objects/pack/$packbitmap.* .git/objects/pack/" &&
+		echo HEAD | git pack-objects --local --stdout --revs >3b.pack &&
+		git index-pack 3b.pack &&
+		list_packed_objects 3b.idx >3b.objects &&
+		! has_any packbitmap.objects 3b.objects
+	
+b9f05110dcb66206bb076a5316fd0d2278b170a1
+ok 202 - pack-objects respects --local (non-local bitmapped pack)
+
+expecting success of 5310.203 'pack-objects to file can use bitmap': 
+		# make sure we still have 1 bitmap index from previous tests
+		ls .git/objects/pack/ | grep bitmap >output &&
+		test_line_count = 1 output &&
+		# verify equivalent packs are generated with/without using bitmap index
+		packasha1=$(git pack-objects --no-use-bitmap-index --all packa </dev/null) &&
+		packbsha1=$(git pack-objects --use-bitmap-index --all packb </dev/null) &&
+		list_packed_objects packa-$packasha1.idx >packa.objects &&
+		list_packed_objects packb-$packbsha1.idx >packb.objects &&
+		test_cmp packa.objects packb.objects
+	
+ok 203 - pack-objects to file can use bitmap
+
+expecting success of 5310.204 'full repack, reusing previous bitmaps': 
+		git repack -ad &&
+		ls .git/objects/pack/ | grep bitmap >output &&
+		test_line_count = 1 output
+	
+ok 204 - full repack, reusing previous bitmaps
+
+expecting success of 5310.205 'fetch (full 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.45.2/t/trash directory.t5310-pack-bitmaps/.
+   01c75d7..c497ff6  second     -> second
+ok 205 - fetch (full bitmap)
+
+expecting success of 5310.206 'create objects for missing-HAVE tests': 
+		blob=$(echo "missing have" | git hash-object -w --stdin) &&
+		tree=$(printf "100644 blob $blob\tfile\n" | git mktree) &&
+		parent=$(echo parent | git commit-tree $tree) &&
+		commit=$(echo commit | git commit-tree $tree -p $parent) &&
+		cat >revs <<-EOF
+		HEAD
+		^HEAD^
+		^$commit
+		EOF
+	
+ok 206 - create objects for missing-HAVE tests
+
+expecting success of 5310.207 'pack-objects respects --incremental': 
+		cat >revs2 <<-EOF &&
+		HEAD
+		$commit
+		EOF
+		git pack-objects --incremental --stdout --revs <revs2 >4.pack &&
+		git index-pack 4.pack &&
+		list_packed_objects 4.idx >4.objects &&
+		test_line_count = 4 4.objects &&
+		git rev-list --objects $commit >revlist &&
+		cut -d" " -f1 revlist |sort >objects &&
+		test_cmp 4.objects objects
+	
+517b6cb5cfbd246ab76dee87a2dfdc0ca616190f
+ok 207 - pack-objects respects --incremental
+
+expecting success of 5310.208 'pack with missing blob': 
+		rm $(objpath $blob) &&
+		git pack-objects --stdout --revs <revs >/dev/null
+	
+ok 208 - pack with missing blob
+
+expecting success of 5310.209 'pack with missing tree': 
+		rm $(objpath $tree) &&
+		git pack-objects --stdout --revs <revs >/dev/null
+	
+ok 209 - pack with missing tree
+
+expecting success of 5310.210 'pack with missing parent': 
+		rm $(objpath $parent) &&
+		git pack-objects --stdout --revs <revs >/dev/null
+	
+ok 210 - pack with missing parent
+
+ok 211 # skip we can read jgit bitmaps (missing JGIT of JGIT,SHA1)
+
+ok 212 # skip jgit can read our bitmaps (missing JGIT of JGIT,SHA1)
+
+expecting success of 5310.213 'splitting packs does not generate bogus bitmaps': 
+		test-tool genrandom foo $((1024 * 1024)) >rand &&
+		git add rand &&
+		git commit -m "commit with big file" &&
+		git -c pack.packSizeLimit=500k repack -adb &&
+		git init --bare no-bitmaps.git &&
+		git -C no-bitmaps.git fetch .. HEAD
+	
+[second 86e86a6] commit with big file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 rand
+warning: minimum pack size limit is 1 MiB
+warning: disabling bitmap writing, packs are split due to pack.packSizeLimit
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/no-bitmaps.git/
+From ..
+ * branch            HEAD       -> FETCH_HEAD
+ok 213 - splitting packs does not generate bogus bitmaps
+
+expecting success of 5310.214 'set up reusable pack': 
+		rm -f .git/objects/pack/*.keep &&
+		git repack -adb &&
+		reusable_pack () {
+			git for-each-ref --format="%(objectname)" |
+			git pack-objects --delta-base-offset --revs --stdout "$@"
+		}
+	
+ok 214 - set up reusable pack
+
+expecting success of 5310.215 'pack reuse respects --honor-pack-keep': 
+		test_when_finished "rm -f .git/objects/pack/*.keep" &&
+		for i in .git/objects/pack/*.pack
+		do
+			>${i%.pack}.keep || return 1
+		done &&
+		reusable_pack --honor-pack-keep >empty.pack &&
+		git index-pack empty.pack &&
+		git show-index <empty.idx >actual &&
+		test_must_be_empty actual
+	
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+ok 215 - pack reuse respects --honor-pack-keep
+
+expecting success of 5310.216 'pack reuse respects --local': 
+		mv .git/objects/pack/* alt.git/objects/pack/ &&
+		test_when_finished "mv alt.git/objects/pack/* .git/objects/pack/" &&
+		reusable_pack --local >empty.pack &&
+		git index-pack empty.pack &&
+		git show-index <empty.idx >actual &&
+		test_must_be_empty actual
+	
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+ok 216 - pack reuse respects --local
+
+expecting success of 5310.217 'pack reuse respects --incremental': 
+		reusable_pack --incremental >empty.pack &&
+		git index-pack empty.pack &&
+		git show-index <empty.idx >actual &&
+		test_must_be_empty actual
+	
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+ok 217 - pack reuse respects --incremental
+
+expecting success of 5310.218 'truncated bitmap fails gracefully (ewah)': 
+		test_config pack.writebitmaphashcache false &&
+		test_config pack.writebitmaplookuptable false &&
+		git repack -ad &&
+		git rev-list --use-bitmap-index --count --all >expect &&
+		bitmap=$(ls .git/objects/pack/*.bitmap) &&
+		test_when_finished "rm -f $bitmap" &&
+		test_copy_bytes 256 <$bitmap >$bitmap.tmp &&
+		mv -f $bitmap.tmp $bitmap &&
+		git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
+		test_cmp expect actual &&
+		test_grep corrupt.ewah.bitmap stderr
+	
+error: corrupt ewah bitmap: eof in data (54 bytes short)
+error: corrupt ewah bitmap: eof in data (54 bytes short)
+ok 218 - truncated bitmap fails gracefully (ewah)
+
+expecting success of 5310.219 'truncated bitmap fails gracefully (cache)': 
+		git config pack.writeBitmapLookupTable true &&
+		git repack -ad &&
+		git rev-list --use-bitmap-index --count --all >expect &&
+		bitmap=$(ls .git/objects/pack/*.bitmap) &&
+		test_when_finished "rm -f $bitmap" &&
+		test_copy_bytes 512 <$bitmap >$bitmap.tmp &&
+		mv -f $bitmap.tmp $bitmap &&
+		git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
+		test_cmp expect actual &&
+		test_grep corrupted.bitmap.index stderr
+	
+error: corrupted bitmap index file (too short to fit hash cache)
+error: corrupted bitmap index file (too short to fit hash cache)
+ok 219 - truncated bitmap fails gracefully (cache)
+
+expecting success of 5310.220 'set up thin delta-reuse parent': 
+		# This first commit contains the buried base object.
+		test-tool genrandom delta 16384 >file &&
+		git add file &&
+		git commit -m "delta base" &&
+		base=$(git rev-parse --verify HEAD:file) &&
+
+		# These intermediate commits bury the base back in history.
+		# This becomes the "old" state.
+		for i in 1 2 3 4 5
+		do
+			echo $i >file &&
+			git commit -am "intermediate $i" || return 1
+		done &&
+		git branch delta-reuse-old &&
+
+		# And now our new history has a delta against the buried base. Note
+		# that this must be smaller than the original file, since pack-objects
+		# prefers to create deltas from smaller objects to larger.
+		test-tool genrandom delta 16300 >file &&
+		git commit -am "delta result" &&
+		delta=$(git rev-parse --verify HEAD:file) &&
+		git branch delta-reuse-new &&
+
+		# Repack with bitmaps and double check that we have the expected delta
+		# relationship.
+		git repack -adb &&
+		have_delta $delta $base
+	
+[second 4cff21d] delta base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[second ebc36d2] intermediate 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+[second 83a37f9] intermediate 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[second 2e2775c] intermediate 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[second 40235fc] intermediate 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[second b2b3320] intermediate 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[second c789171] delta result
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ok 220 - set up thin delta-reuse parent
+
+expecting success of 5310.221 'fetch without bitmaps ignores delta against old base': 
+		test_config pack.usebitmaps false &&
+		test_when_finished "rm -rf client.git" &&
+		git init --bare client.git &&
+		(
+			cd client.git &&
+			git config transfer.unpackLimit 1 &&
+			git fetch .. delta-reuse-old:delta-reuse-old &&
+			git fetch .. delta-reuse-new:delta-reuse-new &&
+			have_delta $delta $ZERO_OID
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/client.git/
+From ..
+ * [new branch]      delta-reuse-old -> delta-reuse-old
+From ..
+ * [new branch]      delta-reuse-new -> delta-reuse-new
+ok 221 - fetch without bitmaps ignores delta against old base
+
+expecting success of 5310.222 'fetch with bitmaps can reuse old base': 
+		test_config pack.usebitmaps true &&
+		test_when_finished "rm -rf client.git" &&
+		git init --bare client.git &&
+		(
+			cd client.git &&
+			git config transfer.unpackLimit 1 &&
+			git fetch .. delta-reuse-old:delta-reuse-old &&
+			git fetch .. delta-reuse-new:delta-reuse-new &&
+			have_delta $delta $base
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/client.git/
+From ..
+ * [new branch]      delta-reuse-old -> delta-reuse-old
+From ..
+ * [new branch]      delta-reuse-new -> delta-reuse-new
+ok 222 - fetch with bitmaps can reuse old base
+
+expecting success of 5310.223 'pack.preferBitmapTips': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable true &&
+
+			# create enough commits that not all are receive bitmap
+			# coverage even if they are all at the tip of some reference.
+			test_commit_bulk --message="%s" 103 &&
+
+			git rev-list HEAD >commits.raw &&
+			sort <commits.raw >commits &&
+
+			git log --format="create refs/tags/%s %H" HEAD >refs &&
+			git update-ref --stdin <refs &&
+
+			git repack -adb &&
+			test-tool bitmap list-commits | sort >bitmaps &&
+
+			# remember which commits did not receive bitmaps
+			comm -13 bitmaps commits >before &&
+			test_file_not_empty before &&
+
+			# mark the commits which did not receive bitmaps as preferred,
+			# and generate the bitmap again
+			perl -pe "s{^}{create refs/tags/include/$. }" <before |
+				git update-ref --stdin &&
+			git -c pack.preferBitmapTips=refs/tags/include repack -adb &&
+
+			# finally, check that the commit(s) without bitmap coverage
+			# are not the same ones as before
+			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.45.2/t/trash directory.t5310-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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      26918 /      26918
+---------------------------------------------------------------------
+
+--- before	2024-11-14 19:36:37.654027234 +0000
++++ after	2024-11-14 19:36:37.782028537 +0000
+@@ -1 +1 @@
+-37419f6d136228aef65f8c0814262f05f954d62a
++ed73bac8391ee3dfb2a90e3cd7df9bd765ce5b5f
+ok 223 - pack.preferBitmapTips
+
+expecting success of 5310.224 'pack.preferBitmapTips': 
+		git init repo &&
+		test_when_finished "rm -rf repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable true &&
+			test_commit_bulk --message="%s" 103 &&
+
+			cat >>.git/config <<-\EOF &&
+			[pack]
+				preferBitmapTips
+			EOF
+			cat >expect <<-\EOF &&
+			error: missing value for 'pack.preferbitmaptips'
+			EOF
+			git repack -adb 2>actual &&
+			test_cmp expect actual
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      26918 /      26918
+---------------------------------------------------------------------
+
+ok 224 - pack.preferBitmapTips
+
+expecting success of 5310.225 'complains about multiple pack bitmaps': 
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable true &&
+
+			test_commit base &&
+
+			git repack -adb &&
+			bitmap="$(ls .git/objects/pack/pack-*.bitmap)" &&
+			mv "$bitmap" "$bitmap.bak" &&
+
+			test_commit other &&
+			git repack -ab &&
+
+			mv "$bitmap.bak" "$bitmap" &&
+
+			find .git/objects/pack -type f -name "*.pack" >packs &&
+			find .git/objects/pack -type f -name "*.bitmap" >bitmaps &&
+			test_line_count = 2 packs &&
+			test_line_count = 2 bitmaps &&
+
+			GIT_TRACE2_EVENT=$(pwd)/trace2.txt git rev-list --use-bitmap-index HEAD &&
+			grep "opened bitmap" trace2.txt &&
+			grep "ignoring extra bitmap" trace2.txt
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/repo/.git/
+[master (root-commit) 92f77f6] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 1a76757] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 other.t
+1a76757cab55a0d45b9ba975eda6eb7dca4f716d
+92f77f689e270db411603dd57dea5c4d12ac65b6
+{"event":"data","sid":"20241114T193638.623694Z-H5c947e1c-P0000283f","thread":"main","time":"2024-11-14T19:36:38.624725Z","file":"pack-bitmap.c","line":462,"repo":1,"t_abs":0.001207,"t_rel":0.001207,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
+{"event":"data","sid":"20241114T193638.623694Z-H5c947e1c-P0000283f","thread":"main","time":"2024-11-14T19:36:38.624743Z","file":"pack-bitmap.c","line":436,"repo":1,"t_abs":0.001226,"t_rel":0.001226,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
+ok 225 - complains about multiple pack bitmaps
+
+expecting success of 5310.226 'verify writing bitmap lookup table when enabled': 
+	GIT_TRACE2_EVENT="$(pwd)/trace2" \
+		git repack -ad &&
+	grep "\"label\":\"writing_lookup_table\"" trace2
+
+{"event":"region_enter","sid":"20241114T193638.728163Z-H5c947e1c-P00002862/20241114T193638.750184Z-H5c947e1c-P0000286a","thread":"main","time":"2024-11-14T19:36:38.833735Z","file":"pack-bitmap-write.c","line":733,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20241114T193638.728163Z-H5c947e1c-P00002862/20241114T193638.750184Z-H5c947e1c-P0000286a","thread":"main","time":"2024-11-14T19:36:38.833746Z","file":"pack-bitmap-write.c","line":760,"repo":1,"t_rel":0.000013,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+ok 226 - verify writing bitmap lookup table when enabled
+
+expecting success of 5310.227 'truncated bitmap fails gracefully (lookup table)': 
+	test_config pack.writebitmaphashcache false &&
+	git repack -adb &&
+	git rev-list --use-bitmap-index --count --all >expect &&
+	bitmap=$(ls .git/objects/pack/*.bitmap) &&
+	test_when_finished "rm -f $bitmap" &&
+	test_copy_bytes 512 <$bitmap >$bitmap.tmp &&
+	mv -f $bitmap.tmp $bitmap &&
+	git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
+	test_cmp expect actual &&
+	test_grep corrupted.bitmap.index stderr
+
+error: corrupted bitmap index file (too short to fit lookup table)
+error: corrupted bitmap index file (too short to fit lookup table)
+ok 227 - truncated bitmap fails gracefully (lookup table)
+
+# passed all 227 test(s)
+1..227
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5330-no-lazy-fetch-with-commit-graph.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+
+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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+
+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
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5330-no-lazy-fetch-with-commit-graph/without-commit/
+ok 3 - setup: change the alternates to what without the commit
+
+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) &&
+	GIT_TRACE="$(pwd)/trace.txt" \
+		git -C with-commit-graph fetch origin $anycommit 2>err &&
+	! grep "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
+	grep "git fetch origin" trace.txt >actual &&
+	test_line_count = 1 actual
+
+[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
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5324-split-commit-graph.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/.git/
+expecting success of 5324.1 'setup repo': 
+	git init &&
+	git config core.commitGraph true &&
+	git config gc.writeCommitGraph false &&
+	infodir=".git/objects/info" &&
+	graphdir="$infodir/commit-graphs" &&
+	test_oid_cache <<-EOM
+	shallow sha1:2132
+	shallow sha256:2436
+
+	base sha1:1408
+	base sha256:1528
+
+	oid_version sha1:1
+	oid_version sha256:2
+	EOM
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/.git/
+ok 1 - setup repo
+
+expecting success of 5324.2 'tweak umask for modebit tests': 
+	umask 022
+
+ok 2 - tweak umask for modebit tests
+
+expecting success of 5324.3 'create commits and write commit-graph': 
+	for i in $(test_seq 3)
+	do
+		test_commit $i &&
+		git branch commits/$i || return 1
+	done &&
+	git commit-graph write --reachable &&
+	test_path_is_file $infodir/commit-graph &&
+	graph_read_expect 3
+
+[master (root-commit) d0dcf97] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 82335b2] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master ddc8575] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+ok 3 - create commits and write commit-graph
+
+expecting success of 5324.4 'check normal git operations: graph exists': 
+		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+		graph_git_two_modes "branch -vv" "$DIR" &&
+		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
+	
+ok 4 - check normal git operations: graph exists
+
+expecting success of 5324.5 'add more commits, and write a new base graph': 
+	git reset --hard commits/1 &&
+	for i in $(test_seq 4 5)
+	do
+		test_commit $i &&
+		git branch commits/$i || return 1
+	done &&
+	git reset --hard commits/2 &&
+	for i in $(test_seq 6 10)
+	do
+		test_commit $i &&
+		git branch commits/$i || return 1
+	done &&
+	git reset --hard commits/2 &&
+	git merge commits/4 &&
+	git branch merge/1 &&
+	git reset --hard commits/4 &&
+	git merge commits/6 &&
+	git branch merge/2 &&
+	git commit-graph write --reachable &&
+	graph_read_expect 12
+
+HEAD is now at d0dcf97 1
+[master 6efda21] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master 7ec8a1d] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+HEAD is now at 82335b2 2
+[master 76c4cb0] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+[master 12a06f3] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+[master 1883fab] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8.t
+[master 8ccfcf8] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9.t
+[master f52fba2] 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10.t
+HEAD is now at 82335b2 2
+Merge made by the 'ort' strategy.
+ 4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+HEAD is now at 6efda21 4
+Merge made by the 'ort' strategy.
+ 2.t | 1 +
+ 6.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 2.t
+ create mode 100644 6.t
+ok 5 - add more commits, and write a new base graph
+
+expecting success of 5324.6 'fork and fail to base a chain on a commit-graph file': 
+	test_when_finished rm -rf fork &&
+	git clone . fork &&
+	(
+		cd fork &&
+		rm .git/objects/info/commit-graph &&
+		echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
+		test_commit new-commit &&
+		git commit-graph write --reachable --split &&
+		test_path_is_file $graphdir/commit-graph-chain &&
+		test_line_count = 1 $graphdir/commit-graph-chain &&
+		verify_chain_files_exist $graphdir
+	)
+
+Cloning into 'fork'...
+done.
+[master aca87dd] new-commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new-commit.t
+ok 6 - fork and fail to base a chain on a commit-graph file
+
+expecting success of 5324.7 'add three more commits, write a tip graph': 
+	git reset --hard commits/3 &&
+	git merge merge/1 &&
+	git merge commits/5 &&
+	git merge merge/2 &&
+	git branch merge/3 &&
+	git commit-graph write --reachable --split &&
+	test_path_is_missing $infodir/commit-graph &&
+	test_path_is_file $graphdir/commit-graph-chain &&
+	ls $graphdir/graph-*.graph >graph-files &&
+	test_line_count = 2 graph-files &&
+	verify_chain_files_exist $graphdir
+
+HEAD is now at ddc8575 3
+Merge made by the 'ort' strategy.
+ 4.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+Merge made by the 'ort' strategy.
+ 5.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+Merge made by the 'ort' strategy.
+ 6.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+ok 7 - add three more commits, write a tip graph
+
+expecting success of 5324.8 'check normal git operations: split commit-graph: merge 3 vs 2': 
+		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+		graph_git_two_modes "branch -vv" "$DIR" &&
+		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
+	
+ok 8 - check normal git operations: split commit-graph: merge 3 vs 2
+
+expecting success of 5324.9 'add one commit, write a tip graph': 
+	test_commit 11 &&
+	git branch commits/11 &&
+	git commit-graph write --reachable --split &&
+	test_path_is_missing $infodir/commit-graph &&
+	test_path_is_file $graphdir/commit-graph-chain &&
+	ls $graphdir/graph-*.graph >graph-files &&
+	test_line_count = 3 graph-files &&
+	verify_chain_files_exist $graphdir
+
+[master 4942c62] 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11.t
+ok 9 - add one commit, write a tip graph
+
+expecting success of 5324.10 'check normal git operations: three-layer commit-graph: commit 11 vs 6': 
+		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+		graph_git_two_modes "branch -vv" "$DIR" &&
+		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
+	
+ok 10 - check normal git operations: three-layer commit-graph: commit 11 vs 6
+
+expecting success of 5324.11 'add one commit, write a merged graph': 
+	test_commit 12 &&
+	git branch commits/12 &&
+	git commit-graph write --reachable --split &&
+	test_path_is_file $graphdir/commit-graph-chain &&
+	test_line_count = 2 $graphdir/commit-graph-chain &&
+	ls $graphdir/graph-*.graph >graph-files &&
+	test_line_count = 2 graph-files &&
+	verify_chain_files_exist $graphdir
+
+[master 281f121] 12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12.t
+ok 11 - add one commit, write a merged graph
+
+expecting success of 5324.12 'check normal git operations: merged commit-graph: commit 12 vs 6': 
+		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+		graph_git_two_modes "branch -vv" "$DIR" &&
+		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
+	
+ok 12 - check normal git operations: merged commit-graph: commit 12 vs 6
+
+expecting success of 5324.13 'create fork and chain across alternate': 
+	git clone . fork &&
+	(
+		cd fork &&
+		git config core.commitGraph true &&
+		rm -rf $graphdir &&
+		echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
+		test_commit 13 &&
+		git branch commits/13 &&
+		git commit-graph write --reachable --split &&
+		test_path_is_file $graphdir/commit-graph-chain &&
+		test_line_count = 3 $graphdir/commit-graph-chain &&
+		ls $graphdir/graph-*.graph >graph-files &&
+		test_line_count = 1 graph-files &&
+		git -c core.commitGraph=true  rev-list HEAD >expect &&
+		git -c core.commitGraph=false rev-list HEAD >actual &&
+		test_cmp expect actual &&
+		test_commit 14 &&
+		git commit-graph write --reachable --split --object-dir=.git/objects/ &&
+		test_line_count = 3 $graphdir/commit-graph-chain &&
+		ls $graphdir/graph-*.graph >graph-files &&
+		test_line_count = 1 graph-files
+	)
+
+Cloning into 'fork'...
+done.
+[master f92bfb4] 13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13.t
+[master 77a503a] 14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14.t
+ok 13 - create fork and chain across alternate
+
+expecting success of 5324.14 'check normal git operations: alternate: commit 13 vs 6': 
+		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+		graph_git_two_modes "branch -vv" "$DIR" &&
+		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
+	
+ok 14 - check normal git operations: alternate: commit 13 vs 6
+
+expecting success of 5324.15 'test merge stragety constants': 
+	git clone . merge-2 &&
+	(
+		cd merge-2 &&
+		git config core.commitGraph true &&
+		test_line_count = 2 $graphdir/commit-graph-chain &&
+		test_commit 14 &&
+		git commit-graph write --reachable --split --size-multiple=2 &&
+		test_line_count = 3 $graphdir/commit-graph-chain
+
+	) &&
+	git clone . merge-10 &&
+	(
+		cd merge-10 &&
+		git config core.commitGraph true &&
+		test_line_count = 2 $graphdir/commit-graph-chain &&
+		test_commit 14 &&
+		git commit-graph write --reachable --split --size-multiple=10 &&
+		test_line_count = 1 $graphdir/commit-graph-chain &&
+		ls $graphdir/graph-*.graph >graph-files &&
+		test_line_count = 1 graph-files
+	) &&
+	git clone . merge-10-expire &&
+	(
+		cd merge-10-expire &&
+		git config core.commitGraph true &&
+		test_line_count = 2 $graphdir/commit-graph-chain &&
+		test_commit 15 &&
+		touch $graphdir/to-delete.graph $graphdir/to-keep.graph &&
+		test-tool chmtime =1546362000 $graphdir/to-delete.graph &&
+		test-tool chmtime =1546362001 $graphdir/to-keep.graph &&
+		git commit-graph write --reachable --split --size-multiple=10 \
+			--expire-time="2019-01-01 12:00 -05:00" &&
+		test_line_count = 1 $graphdir/commit-graph-chain &&
+		test_path_is_missing $graphdir/to-delete.graph &&
+		test_path_is_file $graphdir/to-keep.graph &&
+		ls $graphdir/graph-*.graph >graph-files &&
+		test_line_count = 3 graph-files
+	) &&
+	git clone --no-hardlinks . max-commits &&
+	(
+		cd max-commits &&
+		git config core.commitGraph true &&
+		test_line_count = 2 $graphdir/commit-graph-chain &&
+		test_commit 16 &&
+		test_commit 17 &&
+		git commit-graph write --reachable --split --max-commits=1 &&
+		test_line_count = 1 $graphdir/commit-graph-chain &&
+		ls $graphdir/graph-*.graph >graph-files &&
+		test_line_count = 1 graph-files
+	)
+
+Cloning into 'merge-2'...
+done.
+[master dff8101] 14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14.t
+Cloning into 'merge-10'...
+done.
+[master dff8101] 14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14.t
+Cloning into 'merge-10-expire'...
+done.
+[master b16d1f7] 15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 15.t
+Cloning into 'max-commits'...
+done.
+[master ffa95d4] 16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 16.t
+[master 5167fe2] 17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 17.t
+ok 15 - test merge stragety constants
+
+expecting success of 5324.16 'remove commit-graph-chain file after flattening': 
+	git clone . flatten &&
+	(
+		cd flatten &&
+		test_line_count = 2 $graphdir/commit-graph-chain &&
+		git commit-graph write --reachable &&
+		test_path_is_missing $graphdir/commit-graph-chain &&
+		ls $graphdir >graph-files &&
+		test_line_count = 0 graph-files
+	)
+
+Cloning into 'flatten'...
+done.
+ok 16 - remove commit-graph-chain file after flattening
+
+expecting success of 5324.17 'verify hashes along chain, even in shallow': 
+	git clone --no-hardlinks . verify &&
+	(
+		cd verify &&
+		git commit-graph verify &&
+		base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
+		corrupt_file "$base_file" $(test_oid shallow) "\01" &&
+		test_must_fail git commit-graph verify --shallow 2>test_err &&
+		grep -v "^+" test_err >err &&
+		test_grep "incorrect checksum" err
+	)
+
+Cloning into 'verify'...
+done.
+1+0 records in
+1+0 records out
+1 byte copied, 0.000382601 s, 2.6 kB/s
+the commit-graph file has incorrect checksum and is likely corrupt
+ok 17 - verify hashes along chain, even in shallow
+
+expecting success of 5324.18 'verify notices chain slice which is bogus (base)': 
+	git clone --no-hardlinks . verify-chain-bogus-base &&
+	(
+		cd verify-chain-bogus-base &&
+		git commit-graph verify &&
+		base_file=$graphdir/graph-$(sed -n 1p $graphdir/commit-graph-chain).graph &&
+		echo "garbage" >$base_file &&
+		test_must_fail git commit-graph verify 2>test_err &&
+		grep -v "^+" test_err >err &&
+		grep "commit-graph file is too small" err
+	)
+
+Cloning into 'verify-chain-bogus-base'...
+done.
+error: commit-graph file is too small
+ok 18 - verify notices chain slice which is bogus (base)
+
+expecting success of 5324.19 'verify notices chain slice which is bogus (tip)': 
+	git clone --no-hardlinks . verify-chain-bogus-tip &&
+	(
+		cd verify-chain-bogus-tip &&
+		git commit-graph verify &&
+		tip_file=$graphdir/graph-$(sed -n 2p $graphdir/commit-graph-chain).graph &&
+		echo "garbage" >$tip_file &&
+		test_must_fail git commit-graph verify 2>test_err &&
+		grep -v "^+" test_err >err &&
+		grep "commit-graph file is too small" err
+	)
+
+Cloning into 'verify-chain-bogus-tip'...
+done.
+error: commit-graph file is too small
+ok 19 - verify notices chain slice which is bogus (tip)
+
+expecting success of 5324.20 'verify --shallow does not check base contents': 
+	git clone --no-hardlinks . verify-shallow &&
+	(
+		cd verify-shallow &&
+		git commit-graph verify &&
+		base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
+		corrupt_file "$base_file" 1500 "\01" &&
+		git commit-graph verify --shallow &&
+		test_must_fail git commit-graph verify 2>test_err &&
+		grep -v "^+" test_err >err &&
+		test_grep "incorrect checksum" err
+	)
+
+Cloning into 'verify-shallow'...
+done.
+1+0 records in
+1+0 records out
+1 byte copied, 0.000369667 s, 2.7 kB/s
+the commit-graph file has incorrect checksum and is likely corrupt
+ok 20 - verify --shallow does not check base contents
+
+expecting success of 5324.21 'warn on base graph chunk incorrect': 
+	git clone --no-hardlinks . base-chunk &&
+	(
+		cd base-chunk &&
+		git commit-graph verify &&
+		base_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
+		corrupt_file "$base_file" $(test_oid base) "\01" &&
+		test_must_fail git commit-graph verify --shallow 2>test_err &&
+		grep -v "^+" test_err >err &&
+		test_grep "commit-graph chain does not match" err
+	)
+
+Cloning into 'base-chunk'...
+done.
+1+0 records in
+1+0 records out
+1 byte copied, 0.00751151 s, 0.1 kB/s
+warning: commit-graph chain does not match
+ok 21 - warn on base graph chunk incorrect
+
+expecting success of 5324.22 'verify after commit-graph-chain corruption (base)': 
+	git clone --no-hardlinks . verify-chain-base &&
+	(
+		cd verify-chain-base &&
+		corrupt_file "$graphdir/commit-graph-chain" 30 "G" &&
+		test_must_fail git commit-graph verify 2>test_err &&
+		grep -v "^+" test_err >err &&
+		test_grep "invalid commit-graph chain" err &&
+		corrupt_file "$graphdir/commit-graph-chain" 30 "A" &&
+		test_must_fail git commit-graph verify 2>test_err &&
+		grep -v "^+" test_err >err &&
+		test_grep "unable to find all commit-graph files" err
+	)
+
+Cloning into 'verify-chain-base'...
+done.
+1+0 records in
+1+0 records out
+1 byte copied, 0.00794234 s, 0.1 kB/s
+warning: invalid commit-graph chain: line 'a849e3566469ef6eec0d724b211560Ga5617cb1c' not a hash
+1+0 records in
+1+0 records out
+1 byte copied, 0.0152235 s, 0.1 kB/s
+warning: unable to find all commit-graph files
+ok 22 - verify after commit-graph-chain corruption (base)
+
+expecting success of 5324.23 'verify after commit-graph-chain corruption (tip)': 
+	git clone --no-hardlinks . verify-chain-tip &&
+	(
+		cd verify-chain-tip &&
+		corrupt_file "$graphdir/commit-graph-chain" 70 "G" &&
+		test_must_fail git commit-graph verify 2>test_err &&
+		grep -v "^+" test_err >err &&
+		test_grep "invalid commit-graph chain" err &&
+		corrupt_file "$graphdir/commit-graph-chain" 70 "A" &&
+		test_must_fail git commit-graph verify 2>test_err &&
+		grep -v "^+" test_err >err &&
+		test_grep "unable to find all commit-graph files" err
+	)
+
+Cloning into 'verify-chain-tip'...
+done.
+1+0 records in
+1+0 records out
+1 byte copied, 0.00320387 s, 0.3 kB/s
+warning: invalid commit-graph chain: line '944c3272bbe885450ef5fcad419a8Gcf35d1c284' not a hash
+1+0 records in
+1+0 records out
+1 byte copied, 5.1748e-05 s, 19.3 kB/s
+warning: unable to find all commit-graph files
+ok 23 - verify after commit-graph-chain corruption (tip)
+
+expecting success of 5324.24 'verify notices too-short chain file': 
+	git clone --no-hardlinks . verify-chain-short &&
+	(
+		cd verify-chain-short &&
+		git commit-graph verify &&
+		echo "garbage" >$graphdir/commit-graph-chain &&
+		test_must_fail git commit-graph verify 2>test_err &&
+		grep -v "^+" test_err >err &&
+		grep "commit-graph chain file too small" err
+	)
+
+Cloning into 'verify-chain-short'...
+done.
+warning: commit-graph chain file too small
+ok 24 - verify notices too-short chain file
+
+expecting success of 5324.25 'verify across alternates': 
+	git clone --no-hardlinks . verify-alt &&
+	(
+		cd verify-alt &&
+		rm -rf $graphdir &&
+		altdir="$(pwd)/../.git/objects" &&
+		echo "$altdir" >.git/objects/info/alternates &&
+		git commit-graph verify --object-dir="$altdir/" &&
+		test_commit extra &&
+		git commit-graph write --reachable --split &&
+		tip_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
+		corrupt_file "$tip_file" 1500 "\01" &&
+		test_must_fail git commit-graph verify --shallow 2>test_err &&
+		grep -v "^+" test_err >err &&
+		test_grep "incorrect checksum" err
+	)
+
+Cloning into 'verify-alt'...
+done.
+[master bcff7a4] extra
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 extra.t
+1+0 records in
+1+0 records out
+1 byte copied, 3.0188e-05 s, 33.1 kB/s
+the commit-graph file has incorrect checksum and is likely corrupt
+ok 25 - verify across alternates
+
+expecting success of 5324.26 'reader bounds-checks base-graph chunk': 
+	git clone --no-hardlinks . corrupt-base-chunk &&
+	(
+		cd corrupt-base-chunk &&
+		tip_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
+		corrupt_chunk_file "$tip_file" BASE clear 01020304 &&
+		git -c core.commitGraph=false log >expect.out &&
+		git -c core.commitGraph=true log >out 2>err &&
+		test_cmp expect.out out &&
+		grep "commit-graph base graphs chunk is too small" err
+	)
+
+Cloning into 'corrupt-base-chunk'...
+done.
+warning: commit-graph base graphs chunk is too small
+ok 26 - reader bounds-checks base-graph chunk
+
+expecting success of 5324.27 'add octopus merge': 
+	git reset --hard commits/10 &&
+	git merge commits/3 commits/4 &&
+	git branch merge/octopus &&
+	git commit-graph write --reachable --split &&
+	git commit-graph verify --progress 2>err &&
+	test_line_count = 1 err &&
+	grep "Verifying commits in commit graph: 100% (18/18)" err &&
+	test_grep ! warning err &&
+	test_line_count = 3 $graphdir/commit-graph-chain
+
+HEAD is now at f52fba2 10
+Trying simple merge with commits/3
+Trying simple merge with commits/4
+Merge made by the 'octopus' strategy.
+ 3.t | 1 +
+ 4.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 3.t
+ create mode 100644 4.t
+Verifying commits in commit graph:   5% (1/18)
Verifying commits in commit graph:  11% (2/18)
Verifying commits in commit graph:  16% (3/18)
Verifying commits in commit graph:  22% (4/18)
Verifying commits in commit graph:  27% (5/18)
Verifying commits in commit graph:  33% (6/18)
Verifying commits in commit graph:  38% (7/18)
Verifying commits in commit graph:  44% (8/18)
Verifying commits in commit graph:  50% (9/18)
Verifying commits in commit graph:  55% (10/18)
Verifying commits in commit graph:  61% (11/18)
Verifying commits in commit graph:  66% (12/18)
Verifying commits in commit graph:  72% (13/18)
Verifying commits in commit graph:  77% (14/18)
Verifying commits in commit graph:  83% (15/18)
Verifying commits in commit graph:  88% (16/18)
Verifying commits in commit graph:  94% (17/18)
Verifying commits in commit graph: 100% (18/18)
Verifying commits in commit graph: 100% (18/18), done.
+ok 27 - add octopus merge
+
+expecting success of 5324.28 'check normal git operations: graph exists': 
+		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
+		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
+		graph_git_two_modes "branch -vv" "$DIR" &&
+		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
+	
+ok 28 - check normal git operations: graph exists
+
+expecting success of 5324.29 'split across alternate where alternate is not split': 
+	git commit-graph write --reachable &&
+	test_path_is_file .git/objects/info/commit-graph &&
+	cp .git/objects/info/commit-graph . &&
+	git clone --no-hardlinks . alt-split &&
+	(
+		cd alt-split &&
+		rm -f .git/objects/info/commit-graph &&
+		echo "$(pwd)"/../.git/objects >.git/objects/info/alternates &&
+		test_commit 18 &&
+		git commit-graph write --reachable --split &&
+		test_line_count = 1 $graphdir/commit-graph-chain
+	) &&
+	test_cmp commit-graph .git/objects/info/commit-graph
+
+Cloning into 'alt-split'...
+done.
+[master e793b7e] 18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 18.t
+ok 29 - split across alternate where alternate is not split
+
+expecting success of 5324.30 '--split=no-merge always writes an incremental': 
+	test_when_finished rm -rf a b &&
+	rm -rf $graphdir $infodir/commit-graph &&
+	git reset --hard commits/2 &&
+	git rev-list HEAD~1 >a &&
+	git rev-list HEAD >b &&
+	git commit-graph write --split --stdin-commits <a &&
+	git commit-graph write --split=no-merge --stdin-commits <b &&
+	test_line_count = 2 $graphdir/commit-graph-chain
+
+HEAD is now at 82335b2 2
+ok 30 - --split=no-merge always writes an incremental
+
+expecting success of 5324.31 '--split=replace replaces the chain': 
+	rm -rf $graphdir $infodir/commit-graph &&
+	git reset --hard commits/3 &&
+	git rev-list -1 HEAD~2 >a &&
+	git rev-list -1 HEAD~1 >b &&
+	git rev-list -1 HEAD >c &&
+	git commit-graph write --split=no-merge --stdin-commits <a &&
+	git commit-graph write --split=no-merge --stdin-commits <b &&
+	git commit-graph write --split=no-merge --stdin-commits <c &&
+	test_line_count = 3 $graphdir/commit-graph-chain &&
+	git commit-graph write --stdin-commits --split=replace <b &&
+	test_path_is_missing $infodir/commit-graph &&
+	test_path_is_file $graphdir/commit-graph-chain &&
+	ls $graphdir/graph-*.graph >graph-files &&
+	test_line_count = 1 graph-files &&
+	verify_chain_files_exist $graphdir &&
+	graph_read_expect 2
+
+HEAD is now at ddc8575 3
+ok 31 - --split=replace replaces the chain
+
+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 5324.32 'handles file descriptor exhaustion': 
+	git init ulimit &&
+	(
+		cd ulimit &&
+		for i in $(test_seq 64)
+		do
+			test_commit $i &&
+			run_with_limited_open_files test_might_fail git commit-graph write \
+				--split=no-merge --reachable || return 1
+		done
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/ulimit/.git/
+[master (root-commit) b696783] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 87901d6] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master ea7a557] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[master 93db791] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master 99a5a6e] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+[master e7f1c5a] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+[master 3e4d82c] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+[master a0e4c69] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8.t
+[master 053af5f] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9.t
+[master 7b3839e] 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10.t
+[master ab7cebd] 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11.t
+[master 9b5149b] 12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12.t
+[master 51445d7] 13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13.t
+[master 600567c] 14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14.t
+[master d39117c] 15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 15.t
+[master 7ed88cc] 16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 16.t
+[master d4784f6] 17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 17.t
+[master d9af4e4] 18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 18.t
+[master d5314af] 19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 19.t
+[master 483a651] 20
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 20.t
+[master c00d2fe] 21
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 21.t
+[master 4b26ff2] 22
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 22.t
+[master ac29423] 23
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 23.t
+[master 2054315] 24
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 24.t
+[master 9d666a9] 25
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 25.t
+[master c1973a4] 26
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 26.t
+[master c40f0e0] 27
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 27.t
+[master 48fcf19] 28
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 28.t
+[master 0900777] 29
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 29.t
+[master 432f02e] 30
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 30.t
+[master 5688f4f] 31
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 31.t
+[master b34747d] 32
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 32.t
+[master 8ec35fe] 33
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 33.t
+[master 513eff2] 34
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 34.t
+[master c908ec0] 35
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 35.t
+[master cf1209b] 36
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 36.t
+[master 86ac877] 37
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 37.t
+[master c7d935d] 38
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 38.t
+[master 1fe243a] 39
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 39.t
+[master d93e5e9] 40
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 40.t
+[master f21b04c] 41
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 41.t
+[master b47e4d8] 42
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 42.t
+[master 43a5db7] 43
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 43.t
+[master 88e9031] 44
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 44.t
+[master 9c9b5bb] 45
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 45.t
+[master 5317a1b] 46
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 46.t
+[master 8e0d04e] 47
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 47.t
+[master 3d9b4d7] 48
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 48.t
+[master b6143e2] 49
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 49.t
+[master f62c708] 50
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 50.t
+[master 30e075a] 51
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 51.t
+[master aed8d05] 52
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 52.t
+[master eb37193] 53
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 53.t
+[master dff8022] 54
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 54.t
+[master d123fd0] 55
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 55.t
+[master 6833bbb] 56
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 56.t
+[master cd23a6c] 57
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 57.t
+[master 0ad3fbe] 58
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 58.t
+[master ec11693] 59
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 59.t
+[master df33166] 60
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 60.t
+[master 17100a5] 61
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 61.t
+[master 3cfb402] 62
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 62.t
+[master 4885c90] 63
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 63.t
+[master 1d3111d] 64
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 64.t
+ok 32 - handles file descriptor exhaustion
+
+expecting success of 5324.33 'split commit-graph respects core.sharedrepository 0666': 
+		rm -rf $graphdir $infodir/commit-graph &&
+		git reset --hard commits/1 &&
+		test_config core.sharedrepository "$mode" &&
+		git commit-graph write --split --reachable &&
+		ls $graphdir/graph-*.graph >graph-files &&
+		test_line_count = 1 graph-files &&
+		echo "$modebits" >expect &&
+		test_modebits $graphdir/graph-*.graph >actual &&
+		test_cmp expect actual &&
+		test_modebits $graphdir/commit-graph-chain >actual &&
+		test_cmp expect actual
+	
+HEAD is now at d0dcf97 1
+ok 33 - split commit-graph respects core.sharedrepository 0666
+
+expecting success of 5324.34 'split commit-graph respects core.sharedrepository 0600': 
+		rm -rf $graphdir $infodir/commit-graph &&
+		git reset --hard commits/1 &&
+		test_config core.sharedrepository "$mode" &&
+		git commit-graph write --split --reachable &&
+		ls $graphdir/graph-*.graph >graph-files &&
+		test_line_count = 1 graph-files &&
+		echo "$modebits" >expect &&
+		test_modebits $graphdir/graph-*.graph >actual &&
+		test_cmp expect actual &&
+		test_modebits $graphdir/commit-graph-chain >actual &&
+		test_cmp expect actual
+	
+HEAD is now at d0dcf97 1
+ok 34 - split commit-graph respects core.sharedrepository 0600
+
+expecting success of 5324.35 '--split=replace with partial Bloom data': 
+	rm -rf $graphdir $infodir/commit-graph &&
+	git reset --hard commits/3 &&
+	git rev-list -1 HEAD~2 >a &&
+	git rev-list -1 HEAD~1 >b &&
+	git commit-graph write --split=no-merge --stdin-commits --changed-paths <a &&
+	git commit-graph write --split=no-merge --stdin-commits <b &&
+	git commit-graph write --split=replace --stdin-commits --changed-paths <c &&
+	ls $graphdir/graph-*.graph >graph-files &&
+	test_line_count = 1 graph-files &&
+	verify_chain_files_exist $graphdir
+
+HEAD is now at ddc8575 3
+ok 35 - --split=replace with partial Bloom data
+
+expecting success of 5324.36 'prevent regression for duplicate commits across layers': 
+	git init dup &&
+	git -C dup commit --allow-empty -m one &&
+	git -C dup -c core.commitGraph=false commit-graph write --split=no-merge --reachable 2>err &&
+	test_grep "attempting to write a commit-graph" err &&
+	git -C dup commit-graph write --split=no-merge --reachable &&
+	git -C dup commit --allow-empty -m two &&
+	git -C dup commit-graph write --split=no-merge --reachable &&
+	git -C dup commit --allow-empty -m three &&
+	git -C dup commit-graph write --split --reachable &&
+	git -C dup commit-graph verify
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/dup/.git/
+[master (root-commit) a6701ea] one
+ Author: A U Thor <author@example.com>
+warning: attempting to write a commit-graph, but 'core.commitGraph' is disabled
+[master f065053] two
+ Author: A U Thor <author@example.com>
+[master 072bd61] three
+ Author: A U Thor <author@example.com>
+ok 36 - prevent regression for duplicate commits across layers
+
+expecting success of 5324.37 'setup repo for mixed generation commit-graph-chain': 
+	graphdir=".git/objects/info/commit-graphs" &&
+	test_oid_cache <<-EOF &&
+	oid_version sha1:1
+	oid_version sha256:2
+	EOF
+	git init mixed &&
+	(
+		cd mixed &&
+		git config core.commitGraph true &&
+		git config gc.writeCommitGraph false &&
+		for i in $(test_seq $NUM_FIRST_LAYER_COMMITS)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git -c commitGraph.generationVersion=2 commit-graph write --reachable --split &&
+		graph_read_expect $NUM_FIRST_LAYER_COMMITS &&
+		test_line_count = 1 $graphdir/commit-graph-chain &&
+		for i in $(test_seq $SECOND_LAYER_SEQUENCE_START $SECOND_LAYER_SEQUENCE_END)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git -c commitGraph.generationVersion=1 commit-graph write --reachable --split=no-merge &&
+		test_line_count = 2 $graphdir/commit-graph-chain &&
+		test-tool read-graph >output &&
+		cat >expect <<-EOF &&
+		header: 43475048 1 $(test_oid oid_version) 4 1
+		num_commits: $NUM_SECOND_LAYER_COMMITS
+		chunks: oid_fanout oid_lookup commit_metadata
+		options:
+		EOF
+		test_cmp expect output &&
+		git commit-graph verify &&
+		cat $graphdir/commit-graph-chain
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/mixed/.git/
+[master (root-commit) b696783] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 87901d6] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master ea7a557] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[master 93db791] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master 99a5a6e] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+[master e7f1c5a] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+[master 3e4d82c] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+[master a0e4c69] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8.t
+[master 053af5f] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9.t
+[master 7b3839e] 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10.t
+[master ab7cebd] 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11.t
+[master 9b5149b] 12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12.t
+[master 51445d7] 13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13.t
+[master 600567c] 14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14.t
+[master d39117c] 15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 15.t
+[master 7ed88cc] 16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 16.t
+[master d4784f6] 17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 17.t
+[master d9af4e4] 18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 18.t
+[master d5314af] 19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 19.t
+[master 483a651] 20
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 20.t
+[master c00d2fe] 21
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 21.t
+[master 4b26ff2] 22
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 22.t
+[master ac29423] 23
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 23.t
+[master 2054315] 24
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 24.t
+[master 9d666a9] 25
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 25.t
+[master c1973a4] 26
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 26.t
+[master c40f0e0] 27
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 27.t
+[master 48fcf19] 28
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 28.t
+[master 0900777] 29
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 29.t
+[master 432f02e] 30
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 30.t
+[master 5688f4f] 31
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 31.t
+[master b34747d] 32
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 32.t
+[master 8ec35fe] 33
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 33.t
+[master 513eff2] 34
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 34.t
+[master c908ec0] 35
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 35.t
+[master cf1209b] 36
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 36.t
+[master 86ac877] 37
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 37.t
+[master c7d935d] 38
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 38.t
+[master 1fe243a] 39
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 39.t
+[master d93e5e9] 40
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 40.t
+[master f21b04c] 41
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 41.t
+[master b47e4d8] 42
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 42.t
+[master 43a5db7] 43
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 43.t
+[master 88e9031] 44
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 44.t
+[master 9c9b5bb] 45
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 45.t
+[master 5317a1b] 46
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 46.t
+[master 8e0d04e] 47
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 47.t
+[master 3d9b4d7] 48
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 48.t
+[master b6143e2] 49
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 49.t
+[master f62c708] 50
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 50.t
+[master 30e075a] 51
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 51.t
+[master aed8d05] 52
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 52.t
+[master eb37193] 53
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 53.t
+[master dff8022] 54
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 54.t
+[master d123fd0] 55
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 55.t
+[master 6833bbb] 56
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 56.t
+[master cd23a6c] 57
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 57.t
+[master 0ad3fbe] 58
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 58.t
+[master ec11693] 59
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 59.t
+[master df33166] 60
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 60.t
+[master 17100a5] 61
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 61.t
+[master 3cfb402] 62
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 62.t
+[master 4885c90] 63
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 63.t
+[master 1d3111d] 64
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 64.t
+[master 5cad4d9] 65
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 65.t
+[master e0cddd6] 66
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 66.t
+[master 2356703] 67
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 67.t
+[master 6ee2712] 68
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 68.t
+[master 893dbc6] 69
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 69.t
+[master 47474f4] 70
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 70.t
+[master f7e0c47] 71
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 71.t
+[master 38ce058] 72
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 72.t
+[master aa3a53a] 73
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 73.t
+[master 4ec5ca2] 74
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 74.t
+[master 6d93ac7] 75
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 75.t
+[master 2c15d80] 76
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 76.t
+[master c28c815] 77
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 77.t
+[master cd8553d] 78
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 78.t
+[master b54c38f] 79
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 79.t
+[master 64acaa4] 80
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 80.t
+a107b8ee074ad1dc6006f594c1c01d8dbd30963c
+ad73577eaf380f4f00eb24a5152610a05f82c55b
+ok 37 - setup repo for mixed generation commit-graph-chain
+
+expecting success of 5324.38 'do not write generation data chunk if not present on existing tip': 
+	git clone mixed mixed-no-gdat &&
+	(
+		cd mixed-no-gdat &&
+		for i in $(test_seq $THIRD_LAYER_SEQUENCE_START $THIRD_LAYER_SEQUENCE_END)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git commit-graph write --reachable --split=no-merge &&
+		test_line_count = 3 $graphdir/commit-graph-chain &&
+		test-tool read-graph >output &&
+		cat >expect <<-EOF &&
+		header: 43475048 1 $(test_oid oid_version) 4 2
+		num_commits: $NUM_THIRD_LAYER_COMMITS
+		chunks: oid_fanout oid_lookup commit_metadata
+		options:
+		EOF
+		test_cmp expect output &&
+		git commit-graph verify
+	)
+
+Cloning into 'mixed-no-gdat'...
+done.
+[master 63fe9d8] 81
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 81.t
+[master 46b1698] 82
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 82.t
+[master 3a3e636] 83
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 83.t
+[master 8e168a7] 84
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 84.t
+[master bc6216c] 85
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 85.t
+[master 41d97f7] 86
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 86.t
+[master d27c973] 87
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 87.t
+ok 38 - do not write generation data chunk if not present on existing tip
+
+expecting success of 5324.39 'do not write generation data chunk if the topmost remaining layer does not have generation data chunk': 
+	git clone mixed-no-gdat mixed-merge-no-gdat &&
+	(
+		cd mixed-merge-no-gdat &&
+		for i in $(test_seq $FOURTH_LAYER_SEQUENCE_START $FOURTH_LAYER_SEQUENCE_END)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git commit-graph write --reachable --split --size-multiple 1 &&
+		test_line_count = 3 $graphdir/commit-graph-chain &&
+		test-tool read-graph >output &&
+		cat >expect <<-EOF &&
+		header: 43475048 1 $(test_oid oid_version) 4 2
+		num_commits: $(($NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS))
+		chunks: oid_fanout oid_lookup commit_metadata
+		options:
+		EOF
+		test_cmp expect output &&
+		git commit-graph verify
+	)
+
+Cloning into 'mixed-merge-no-gdat'...
+done.
+[master 6eb0fbf] 88
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 88.t
+[master 12abc91] 89
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 89.t
+[master 2c8ff3c] 90
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 90.t
+[master dc8351e] 91
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 91.t
+[master 59950af] 92
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 92.t
+[master 00ca893] 93
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 93.t
+[master 0d371ea] 94
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 94.t
+[master cfa8187] 95
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 95.t
+ok 39 - do not write generation data chunk if the topmost remaining layer does not have generation data chunk
+
+expecting success of 5324.40 'write generation data chunk if topmost remaining layer has generation data chunk': 
+	git clone mixed-merge-no-gdat mixed-merge-gdat &&
+	(
+		cd mixed-merge-gdat &&
+		for i in $(test_seq $FIFTH_LAYER_SEQUENCE_START $FIFTH_LAYER_SEQUENCE_END)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git commit-graph write --reachable --split --size-multiple 1 &&
+		test_line_count = 2 $graphdir/commit-graph-chain &&
+		test-tool read-graph >output &&
+		cat >expect <<-EOF &&
+		header: 43475048 1 $(test_oid oid_version) 5 1
+		num_commits: $(($NUM_SECOND_LAYER_COMMITS + $NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS + $NUM_FIFTH_LAYER_COMMITS))
+		chunks: oid_fanout oid_lookup commit_metadata generation_data
+		options: read_generation_data
+		EOF
+		test_cmp expect output
+	)
+
+Cloning into 'mixed-merge-gdat'...
+done.
+[master a22bc18] 96
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 96.t
+[master dc189f8] 97
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 97.t
+[master 7ef260e] 98
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 98.t
+[master e31cd18] 99
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 99.t
+[master df7c394] 100
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 100.t
+[master 914897f] 101
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 101.t
+[master c34363e] 102
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 102.t
+[master efcd50d] 103
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 103.t
+[master ae03b58] 104
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 104.t
+[master 2c87974] 105
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 105.t
+[master be2bb78] 106
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 106.t
+[master 98de601] 107
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 107.t
+[master e87578e] 108
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 108.t
+[master 7094c09] 109
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 109.t
+[master c87c1b7] 110
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 110.t
+[master 4501713] 111
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 111.t
+ok 40 - write generation data chunk if topmost remaining layer has generation data chunk
+
+expecting success of 5324.41 'write generation data chunk when commit-graph chain is replaced': 
+	git clone mixed mixed-replace &&
+	(
+		cd mixed-replace &&
+		git commit-graph write --reachable --split=replace &&
+		test_path_is_file $graphdir/commit-graph-chain &&
+		test_line_count = 1 $graphdir/commit-graph-chain &&
+		verify_chain_files_exist $graphdir &&
+		graph_read_expect $(($NUM_FIRST_LAYER_COMMITS + $NUM_SECOND_LAYER_COMMITS)) &&
+		git commit-graph verify
+	)
+
+Cloning into 'mixed-replace'...
+done.
+ok 41 - write generation data chunk when commit-graph chain is replaced
+
+# passed all 41 test(s)
+1..41
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5331-pack-objects-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/.git/
+expecting success of 5331.1 'setup for --stdin-packs tests': 
+	git init stdin-packs &&
+	(
+		cd stdin-packs &&
+
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
+
+		for id in A B C
+		do
+			git pack-objects .git/objects/pack/pack-$id \
+				--incremental --revs <<-EOF || exit 1
+			refs/tags/$id
+			EOF
+		done &&
+
+		ls -la .git/objects/pack
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/stdin-packs/.git/
+[main (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[main d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+794781495799da912f5473db27abed9641406f96
+3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc
+c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0
+total 44
+drwxr-xr-x  2 pbuilder2 pbuilder2 4096 Nov 14 19:36 .
+drwxr-xr-x 13 pbuilder2 pbuilder2 4096 Nov 14 19:36 ..
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Nov 14 19:36 pack-A-794781495799da912f5473db27abed9641406f96.idx
+-r--r--r--  1 pbuilder2 pbuilder2  210 Nov 14 19:36 pack-A-794781495799da912f5473db27abed9641406f96.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Nov 14 19:36 pack-A-794781495799da912f5473db27abed9641406f96.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Nov 14 19:36 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.idx
+-r--r--r--  1 pbuilder2 pbuilder2  267 Nov 14 19:36 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Nov 14 19:36 pack-B-3a49f2f8b4f3ab6cf43896d86dd34474bbe896bc.rev
+-r--r--r--  1 pbuilder2 pbuilder2 1156 Nov 14 19:36 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.idx
+-r--r--r--  1 pbuilder2 pbuilder2  292 Nov 14 19:36 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.pack
+-r--r--r--  1 pbuilder2 pbuilder2   64 Nov 14 19:36 pack-C-c693c4715d23abf4eb789ba8dcc2a8c2462fc7a0.rev
+ok 1 - setup for --stdin-packs tests
+
+expecting success of 5331.2 '--stdin-packs with excluded packs': 
+	(
+		cd stdin-packs &&
+
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+
+		git pack-objects test --stdin-packs <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx)
+		) >expect.raw &&
+		git show-index <$(ls test-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
 		test_cmp expect actual
-	
-ok 161 - counting commits with limiting (full bitmap, second)
+	)
 
-expecting success of 5310.162 'counting objects via bitmap (full bitmap, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 162 - counting objects via bitmap (full bitmap, second)
+d79f0a91fe88b889c156c95980949119173ad813
+ok 2 - --stdin-packs with excluded packs
 
-expecting success of 5310.163 'enumerate commits (full bitmap, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 163 - enumerate commits (full bitmap, second)
+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
+	)
 
-expecting success of 5310.164 'enumerate --objects (full 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 4101, line 101
-ok 164 - enumerate --objects (full bitmap, second)
+fatal: cannot use --filter with --stdin-packs
+ok 3 - --stdin-packs is incompatible with --filter
 
-expecting success of 5310.165 'bitmap --objects handles non-commit objects (full bitmap, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 165 - bitmap --objects handles non-commit objects (full bitmap, second)
+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
+	)
 
-expecting success of 5310.166 'counting commits via bitmap (full bitmap, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 166 - counting commits via bitmap (full bitmap, other)
+fatal: cannot use internal rev list with --stdin-packs
+ok 4 - --stdin-packs is incompatible with --revs
 
-expecting success of 5310.167 'counting partial commits via bitmap (full 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 167 - counting partial commits via bitmap (full bitmap, other)
+expecting success of 5331.5 '--stdin-packs with loose objects': 
+	(
+		cd stdin-packs &&
 
-expecting success of 5310.168 'counting commits with limit (full 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 168 - counting commits with limit (full bitmap, other)
+		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 5310.169 'counting non-linear history (full bitmap, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 169 - counting non-linear history (full bitmap, other)
+		test_commit D && # loose
 
-expecting success of 5310.170 'counting commits with limiting (full 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 170 - counting commits with limiting (full bitmap, other)
+		git pack-objects test2 --stdin-packs --unpacked <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		EOF
 
-expecting success of 5310.171 'counting objects via bitmap (full bitmap, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		(
+			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
-	
-ok 171 - counting objects via bitmap (full bitmap, other)
+	)
 
-expecting success of 5310.172 '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 172 - enumerate commits (full bitmap, other)
+[main 71a49b9] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+ac8103895b4f6d2ce5bec819104ee1f531ccbfb9
+total 72
+drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Nov 14 19:36 .
+drwxr-xr-x 4 pbuilder2 pbuilder2 4096 Nov 14 19:36 ..
+drwxr-xr-x 8 pbuilder2 pbuilder2 4096 Nov 14 19:36 .git
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Nov 14 19:36 A.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Nov 14 19:36 B.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Nov 14 19:36 C.t
+-rw-r--r-- 1 pbuilder2 pbuilder2    2 Nov 14 19:36 D.t
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Nov 14 19:36 actual
+-rw-r--r-- 1 pbuilder2 pbuilder2  335 Nov 14 19:36 actual.raw
+-rw-r--r-- 1 pbuilder2 pbuilder2   55 Nov 14 19:36 err
+-rw-r--r-- 1 pbuilder2 pbuilder2  246 Nov 14 19:36 expect
+-rw-r--r-- 1 pbuilder2 pbuilder2  457 Nov 14 19:36 expect.raw
+-r--r--r-- 1 pbuilder2 pbuilder2 1240 Nov 14 19:36 test-d79f0a91fe88b889c156c95980949119173ad813.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  470 Nov 14 19:36 test-d79f0a91fe88b889c156c95980949119173ad813.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   76 Nov 14 19:36 test-d79f0a91fe88b889c156c95980949119173ad813.rev
+-r--r--r-- 1 pbuilder2 pbuilder2 1324 Nov 14 19:36 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.idx
+-r--r--r-- 1 pbuilder2 pbuilder2  693 Nov 14 19:36 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.pack
+-r--r--r-- 1 pbuilder2 pbuilder2   88 Nov 14 19:36 test2-ac8103895b4f6d2ce5bec819104ee1f531ccbfb9.rev
+ok 5 - --stdin-packs with loose objects
 
-expecting success of 5310.173 '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 173 - enumerate --objects (full bitmap, other)
+expecting success of 5331.6 '--stdin-packs with broken links': 
+	(
+		cd stdin-packs &&
 
-expecting success of 5310.174 '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 174 - bitmap --objects handles non-commit objects (full bitmap, other)
+		# make an unreachable object with a bogus parent
+		git cat-file -p HEAD >commit &&
+		sed "s/$(git rev-parse HEAD^)/$(test_oid zero)/" <commit |
+		git hash-object -w -t commit --stdin >in &&
 
-expecting success of 5310.175 '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 175 - clone from bitmapped repository
+		git pack-objects .git/objects/pack/pack-D <in &&
 
-expecting success of 5310.176 '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 176 - partial clone from bitmapped repository
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+		PACK_D="$(basename .git/objects/pack/pack-D-*.pack)" &&
 
-expecting success of 5310.177 'setup further non-bitmapped commits': 
-		test_commit_bulk --id=further 10
-	
-43182d8c02d9405d91b2a36088eec7ecf8f44f44
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           30 (         0 duplicates                  )
-      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           10 (         0 duplicates          9 deltas of          9 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:            119
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         16
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      58709 /      58709
----------------------------------------------------------------------
+		git pack-objects test3 --stdin-packs --unpacked <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		$PACK_D
+		EOF
 
-ok 177 - setup further non-bitmapped commits
+		(
+			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 5310.178 'counting commits via bitmap (partial bitmap, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
 		test_cmp expect actual
-	
-ok 178 - counting commits via bitmap (partial bitmap, second)
+	)
 
-expecting success of 5310.179 '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 179 - counting partial commits via bitmap (partial bitmap, second)
+1c529235d2f84e54e1f186c4d2b6c65a26299d38
+ff80c980d491fa53537f36ea3206e7a9c12cf89b
+ok 6 - --stdin-packs with broken links
 
-expecting success of 5310.180 '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 180 - counting commits with limit (partial bitmap, second)
+expecting success of 5331.7 'pack-objects --stdin with duplicate packfile': 
+	test_when_finished "rm -fr repo" &&
 
-expecting success of 5310.181 '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 181 - counting non-linear history (partial bitmap, second)
+	git init repo &&
+	(
+		cd repo &&
+		test_commit "commit" &&
+		git repack -ad &&
 
-expecting success of 5310.182 '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 182 - counting commits with limiting (partial bitmap, second)
+		{
+			basename .git/objects/pack/pack-*.pack &&
+			basename .git/objects/pack/pack-*.pack
+		} >packfiles &&
 
-expecting success of 5310.183 'counting objects via bitmap (partial bitmap, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		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
-	
-ok 183 - counting objects via bitmap (partial bitmap, second)
+	)
 
-expecting success of 5310.184 '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 184 - enumerate commits (partial bitmap, second)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/repo/.git/
+[main (root-commit) 499d3ae] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+bb8f6d9d0f08840ee5644ac2998ee938e9ca5b57
+ok 7 - pack-objects --stdin with duplicate packfile
 
-expecting success of 5310.185 '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 185 - enumerate --objects (partial bitmap, second)
+expecting success of 5331.8 'pack-objects --stdin with same packfile excluded and included': 
+	test_when_finished "rm -fr repo" &&
 
-expecting success of 5310.186 '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 186 - bitmap --objects handles non-commit objects (partial bitmap, second)
+	git init repo &&
+	(
+		cd repo &&
+		test_commit "commit" &&
+		git repack -ad &&
 
-expecting success of 5310.187 '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 187 - counting commits via bitmap (partial bitmap, other)
+		{
+			basename .git/objects/pack/pack-*.pack &&
+			printf "^%s\n" "$(basename .git/objects/pack/pack-*.pack)"
+		} >packfiles &&
 
-expecting success of 5310.188 '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 188 - counting partial commits via bitmap (partial bitmap, other)
+		git pack-objects --stdin-packs generated-pack <packfiles &&
+		packed_objects generated-pack-*.idx >packed-objects &&
+		test_must_be_empty packed-objects
+	)
 
-expecting success of 5310.189 '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 189 - counting commits with limit (partial bitmap, other)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/repo/.git/
+[main (root-commit) 499d3ae] commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit.t
+029d08823bd8a8eab510ad6ac75c823cfd3ed31e
+ok 8 - pack-objects --stdin with same packfile excluded and included
 
-expecting success of 5310.190 '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 190 - counting non-linear history (partial bitmap, other)
+expecting success of 5331.9 'pack-objects --stdin with packfiles from alternate object database': 
+	test_when_finished "rm -fr shared member" &&
 
-expecting success of 5310.191 '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 191 - counting commits with limiting (partial bitmap, other)
+	# Set up a shared repository with a single packfile.
+	git init shared &&
+	test_commit -C shared "shared-objects" &&
+	git -C shared repack -ad &&
+	basename shared/.git/objects/pack/pack-*.pack >packfile &&
 
-expecting success of 5310.192 '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 192 - counting objects via bitmap (partial bitmap, other)
+	# 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 5310.193 '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 193 - enumerate commits (partial bitmap, other)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5331-pack-objects-stdin/shared/.git/
+[main (root-commit) 145e1e6] shared-objects
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 shared-objects.t
+Cloning into 'member'...
+done.
+33d7aff4e675ff5bc1d48bcdab29cb013e53965b
+ok 9 - pack-objects --stdin with packfiles from alternate object database
 
-expecting success of 5310.194 '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 194 - enumerate --objects (partial bitmap, other)
+expecting success of 5331.10 'pack-objects --stdin with packfiles from main and alternate object database': 
+	test_when_finished "rm -fr shared member" &&
 
-expecting success of 5310.195 '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 195 - bitmap --objects handles non-commit objects (partial bitmap, other)
+	# Set up a shared repository with a single packfile.
+	git init shared &&
+	test_commit -C shared "shared-commit" &&
+	git -C shared repack -ad &&
 
-expecting success of 5310.196 '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.45.2/t/trash directory.t5310-pack-bitmaps/.
-   43182d8..01c75d7  second     -> second
-ok 196 - fetch (partial bitmap)
+	# 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 &&
 
-expecting success of 5310.197 'enumerating progress counts pack-reused objects': 
-		count=$(git rev-list --objects --all --count) &&
-		git repack -adb &&
+	{
+		basename shared/.git/objects/pack/pack-*.pack &&
+		basename member/.git/objects/pack/pack-*.pack
+	} >packfiles &&
 
-		# 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 &&
+	{
+		packed_objects shared/.git/objects/pack/pack-*.idx &&
+		packed_objects member/.git/objects/pack/pack-*.idx
+	} | sort >expected-objects &&
 
-		# 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: 659, done.
-Total 659 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
-[second a9f0276] an extra commit object
- Author: A U Thor <author@example.com>
-Enumerating objects: 660, done.
-Total 660 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
-ok 197 - enumerating progress counts pack-reused objects
+	git -C member pack-objects --stdin-packs generated-pack <packfiles &&
+	packed_objects member/generated-pack-*.idx >actual-objects &&
+	test_cmp expected-objects actual-objects
 
-expecting success of 5310.198 'pack-objects respects --local (non-local loose)': 
-		git init --bare alt.git &&
-		echo $(pwd)/alt.git/objects >.git/objects/info/alternates &&
-		echo content1 >file1 &&
-		# non-local loose object which is not present in bitmapped pack
-		altblob=$(GIT_DIR=alt.git git hash-object -w file1) &&
-		# non-local loose object which is also present in bitmapped pack
-		git cat-file blob $blob | GIT_DIR=alt.git git hash-object -w --stdin &&
-		git add file1 &&
-		test_tick &&
-		git commit -m commit_file1 &&
-		echo HEAD | git pack-objects --local --stdout --revs >1.pack &&
-		git index-pack 1.pack &&
-		list_packed_objects 1.idx >1.objects &&
-		printf "%s\n" "$altblob" "$blob" >nonlocal-loose &&
-		! has_any nonlocal-loose 1.objects
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/alt.git/
-782f60206c837dcd3d441e106549ad6f58de55b5
-[second 8b3d0b3] commit_file1
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 file1
-42c9c43b45865350be479762d51665126aab2c7a
-ok 198 - pack-objects respects --local (non-local loose)
-
-expecting success of 5310.199 'pack-objects respects --honor-pack-keep (local non-bitmapped pack)': 
-		echo content2 >file2 &&
-		blob2=$(git hash-object -w file2) &&
-		git add file2 &&
-		test_tick &&
-		git commit -m commit_file2 &&
-		printf "%s\n" "$blob2" "$bitmaptip" >keepobjects &&
-		pack2=$(git pack-objects pack2 <keepobjects) &&
-		mv pack2-$pack2.* .git/objects/pack/ &&
-		>.git/objects/pack/pack2-$pack2.keep &&
-		rm $(objpath $blob2) &&
-		echo HEAD | git pack-objects --honor-pack-keep --stdout --revs >2a.pack &&
-		git index-pack 2a.pack &&
-		list_packed_objects 2a.idx >2a.objects &&
-		! has_any keepobjects 2a.objects
-	
-[second c497ff6] commit_file2
+ 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 file2
-668f4d0903ff53d829803e3d1b2a8cfc8f697970
-ok 199 - pack-objects respects --honor-pack-keep (local non-bitmapped pack)
-
-expecting success of 5310.200 'pack-objects respects --local (non-local pack)': 
-		mv .git/objects/pack/pack2-$pack2.* alt.git/objects/pack/ &&
-		echo HEAD | git pack-objects --local --stdout --revs >2b.pack &&
-		git index-pack 2b.pack &&
-		list_packed_objects 2b.idx >2b.objects &&
-		! has_any keepobjects 2b.objects
-	
-11629401753ce54be03ac6152e14534cb5b0dda3
-ok 200 - pack-objects respects --local (non-local pack)
+ create mode 100644 local-commit.t
+d3e539037cb74e50eb4452759efc2fac0ae5e17a
+ok 10 - pack-objects --stdin with packfiles from main and alternate object database
 
-expecting success of 5310.201 'pack-objects respects --honor-pack-keep (local bitmapped pack)': 
-		ls .git/objects/pack/ | grep bitmap >output &&
-		test_line_count = 1 output &&
-		packbitmap=$(basename $(cat output) .bitmap) &&
-		list_packed_objects .git/objects/pack/$packbitmap.idx >packbitmap.objects &&
-		test_when_finished "rm -f .git/objects/pack/$packbitmap.keep" &&
-		>.git/objects/pack/$packbitmap.keep &&
-		echo HEAD | git pack-objects --honor-pack-keep --stdout --revs >3a.pack &&
-		git index-pack 3a.pack &&
-		list_packed_objects 3a.idx >3a.objects &&
-		! has_any packbitmap.objects 3a.objects
-	
-83abfb5d92d28a5869d16ebeffa064cf85f2e051
-ok 201 - pack-objects respects --honor-pack-keep (local bitmapped pack)
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5332-multi-pack-reuse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 
-expecting success of 5310.202 'pack-objects respects --local (non-local bitmapped pack)': 
-		mv .git/objects/pack/$packbitmap.* alt.git/objects/pack/ &&
-		rm -f .git/objects/pack/multi-pack-index &&
-		test_when_finished "mv alt.git/objects/pack/$packbitmap.* .git/objects/pack/" &&
-		echo HEAD | git pack-objects --local --stdout --revs >3b.pack &&
-		git index-pack 3b.pack &&
-		list_packed_objects 3b.idx >3b.objects &&
-		! has_any packbitmap.objects 3b.objects
-	
-b9f05110dcb66206bb076a5316fd0d2278b170a1
-ok 202 - pack-objects respects --local (non-local bitmapped pack)
+	for i in A B
+	do
+		test_commit "$i" &&
+		git repack -d || return 1
+	done &&
 
-expecting success of 5310.203 'pack-objects to file can use bitmap': 
-		# make sure we still have 1 bitmap index from previous tests
-		ls .git/objects/pack/ | grep bitmap >output &&
-		test_line_count = 1 output &&
-		# verify equivalent packs are generated with/without using bitmap index
-		packasha1=$(git pack-objects --no-use-bitmap-index --all packa </dev/null) &&
-		packbsha1=$(git pack-objects --use-bitmap-index --all packb </dev/null) &&
-		list_packed_objects packa-$packasha1.idx >packa.objects &&
-		list_packed_objects packb-$packbsha1.idx >packb.objects &&
-		test_cmp packa.objects packb.objects
-	
-ok 203 - pack-objects to file can use bitmap
+	git multi-pack-index write --bitmap &&
 
-expecting success of 5310.204 'full repack, reusing previous bitmaps': 
-		git repack -ad &&
-		ls .git/objects/pack/ | grep bitmap >output &&
-		test_line_count = 1 output
-	
-ok 204 - full repack, reusing previous bitmaps
+	test_pack_objects_reused_all 3 1
 
-expecting success of 5310.205 'fetch (full 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.45.2/t/trash directory.t5310-pack-bitmaps/.
-   01c75d7..c497ff6  second     -> second
-ok 205 - fetch (full bitmap)
+[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":"20241114T193644.614159Z-H5c947e1c-P00003315","thread":"main","time":"2024-11-14T19:36:44.615324Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001335,"t_rel":0.001335,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20241114T193644.614159Z-H5c947e1c-P00003315","thread":"main","time":"2024-11-14T19:36:44.615329Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001340,"t_rel":0.001340,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+ok 1 - preferred pack is reused for single-pack reuse
 
-expecting success of 5310.206 'create objects for missing-HAVE tests': 
-		blob=$(echo "missing have" | git hash-object -w --stdin) &&
-		tree=$(printf "100644 blob $blob\tfile\n" | git mktree) &&
-		parent=$(echo parent | git commit-tree $tree) &&
-		commit=$(echo commit | git commit-tree $tree -p $parent) &&
-		cat >revs <<-EOF
-		HEAD
-		^HEAD^
-		^$commit
-		EOF
-	
-ok 206 - create objects for missing-HAVE tests
+expecting success of 5332.2 'multi-pack reuse is disabled by default': 
+	test_pack_objects_reused_all 3 1
 
-expecting success of 5310.207 'pack-objects respects --incremental': 
-		cat >revs2 <<-EOF &&
-		HEAD
-		$commit
-		EOF
-		git pack-objects --incremental --stdout --revs <revs2 >4.pack &&
-		git index-pack 4.pack &&
-		list_packed_objects 4.idx >4.objects &&
-		test_line_count = 4 4.objects &&
-		git rev-list --objects $commit >revlist &&
-		cut -d" " -f1 revlist |sort >objects &&
-		test_cmp 4.objects objects
-	
-517b6cb5cfbd246ab76dee87a2dfdc0ca616190f
-ok 207 - pack-objects respects --incremental
+{"event":"data","sid":"20241114T193644.691310Z-H5c947e1c-P00003330","thread":"main","time":"2024-11-14T19:36:44.692451Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001292,"t_rel":0.001292,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20241114T193644.691310Z-H5c947e1c-P00003330","thread":"main","time":"2024-11-14T19:36:44.692456Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001297,"t_rel":0.001297,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+ok 2 - multi-pack reuse is disabled by default
 
-expecting success of 5310.208 'pack with missing blob': 
-		rm $(objpath $blob) &&
-		git pack-objects --stdout --revs <revs >/dev/null
-	
-ok 208 - pack with missing blob
+expecting success of 5332.3 'feature.experimental implies multi-pack reuse': 
+	test_config feature.experimental true &&
 
-expecting success of 5310.209 'pack with missing tree': 
-		rm $(objpath $tree) &&
-		git pack-objects --stdout --revs <revs >/dev/null
-	
-ok 209 - pack with missing tree
+	test_pack_objects_reused_all 6 2
 
-expecting success of 5310.210 'pack with missing parent': 
-		rm $(objpath $parent) &&
-		git pack-objects --stdout --revs <revs >/dev/null
-	
-ok 210 - pack with missing parent
+{"event":"data","sid":"20241114T193644.767373Z-H5c947e1c-P00003346","thread":"main","time":"2024-11-14T19:36:44.768734Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001539,"t_rel":0.001539,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20241114T193644.767373Z-H5c947e1c-P00003346","thread":"main","time":"2024-11-14T19:36:44.768741Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001546,"t_rel":0.001546,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+ok 3 - feature.experimental implies multi-pack reuse
 
-ok 211 # skip we can read jgit bitmaps (missing JGIT of JGIT,SHA1)
+expecting success of 5332.4 'multi-pack reuse can be disabled with feature.experimental': 
+	test_config feature.experimental true &&
+	test_config pack.allowPackReuse single &&
 
-ok 212 # skip jgit can read our bitmaps (missing JGIT of JGIT,SHA1)
+	test_pack_objects_reused_all 3 1
 
-expecting success of 5310.213 'splitting packs does not generate bogus bitmaps': 
-		test-tool genrandom foo $((1024 * 1024)) >rand &&
-		git add rand &&
-		git commit -m "commit with big file" &&
-		git -c pack.packSizeLimit=500k repack -adb &&
-		git init --bare no-bitmaps.git &&
-		git -C no-bitmaps.git fetch .. HEAD
-	
-[second 86e86a6] commit with big file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 rand
-warning: minimum pack size limit is 1 MiB
-warning: disabling bitmap writing, packs are split due to pack.packSizeLimit
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/no-bitmaps.git/
-From ..
- * branch            HEAD       -> FETCH_HEAD
-ok 213 - splitting packs does not generate bogus bitmaps
+{"event":"data","sid":"20241114T193644.876465Z-H5c947e1c-P0000336f","thread":"main","time":"2024-11-14T19:36:44.877869Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001600,"t_rel":0.001600,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20241114T193644.876465Z-H5c947e1c-P0000336f","thread":"main","time":"2024-11-14T19:36:44.877875Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001607,"t_rel":0.001607,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+ok 4 - multi-pack reuse can be disabled with feature.experimental
 
-expecting success of 5310.214 'set up reusable pack': 
-		rm -f .git/objects/pack/*.keep &&
-		git repack -adb &&
-		reusable_pack () {
-			git for-each-ref --format="%(objectname)" |
-			git pack-objects --delta-base-offset --revs --stdout "$@"
-		}
-	
-ok 214 - set up reusable pack
+expecting success of 5332.5 'enable multi-pack reuse': 
+	git config pack.allowPackReuse multi
 
-expecting success of 5310.215 'pack reuse respects --honor-pack-keep': 
-		test_when_finished "rm -f .git/objects/pack/*.keep" &&
-		for i in .git/objects/pack/*.pack
-		do
-			>${i%.pack}.keep || return 1
-		done &&
-		reusable_pack --honor-pack-keep >empty.pack &&
-		git index-pack empty.pack &&
-		git show-index <empty.idx >actual &&
-		test_must_be_empty actual
-	
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-ok 215 - pack reuse respects --honor-pack-keep
+ok 5 - enable multi-pack reuse
 
-expecting success of 5310.216 'pack reuse respects --local': 
-		mv .git/objects/pack/* alt.git/objects/pack/ &&
-		test_when_finished "mv alt.git/objects/pack/* .git/objects/pack/" &&
-		reusable_pack --local >empty.pack &&
-		git index-pack empty.pack &&
-		git show-index <empty.idx >actual &&
-		test_must_be_empty actual
-	
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-ok 216 - pack reuse respects --local
+expecting success of 5332.6 'reuse all objects from subset of bitmapped packs': 
+	test_commit C &&
+	git repack -d &&
 
-expecting success of 5310.217 'pack reuse respects --incremental': 
-		reusable_pack --incremental >empty.pack &&
-		git index-pack empty.pack &&
-		git show-index <empty.idx >actual &&
-		test_must_be_empty actual
-	
-029d08823bd8a8eab510ad6ac75c823cfd3ed31e
-ok 217 - pack reuse respects --incremental
+	git multi-pack-index write --bitmap &&
 
-expecting success of 5310.218 'truncated bitmap fails gracefully (ewah)': 
-		test_config pack.writebitmaphashcache false &&
-		test_config pack.writebitmaplookuptable false &&
-		git repack -ad &&
-		git rev-list --use-bitmap-index --count --all >expect &&
-		bitmap=$(ls .git/objects/pack/*.bitmap) &&
-		test_when_finished "rm -f $bitmap" &&
-		test_copy_bytes 256 <$bitmap >$bitmap.tmp &&
-		mv -f $bitmap.tmp $bitmap &&
-		git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
-		test_cmp expect actual &&
-		test_grep corrupt.ewah.bitmap stderr
-	
-error: corrupt ewah bitmap: eof in data (54 bytes short)
-error: corrupt ewah bitmap: eof in data (54 bytes short)
-ok 218 - truncated bitmap fails gracefully (ewah)
+	cat >in <<-EOF &&
+	$(git rev-parse C)
+	^$(git rev-parse A)
+	EOF
 
-expecting success of 5310.219 'truncated bitmap fails gracefully (cache)': 
-		git config pack.writeBitmapLookupTable true &&
-		git repack -ad &&
-		git rev-list --use-bitmap-index --count --all >expect &&
-		bitmap=$(ls .git/objects/pack/*.bitmap) &&
-		test_when_finished "rm -f $bitmap" &&
-		test_copy_bytes 512 <$bitmap >$bitmap.tmp &&
-		mv -f $bitmap.tmp $bitmap &&
-		git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
-		test_cmp expect actual &&
-		test_grep corrupted.bitmap.index stderr
-	
-error: corrupted bitmap index file (too short to fit hash cache)
-error: corrupted bitmap index file (too short to fit hash cache)
-ok 219 - truncated bitmap fails gracefully (cache)
+	test_pack_objects_reused 6 2 <in
 
-expecting success of 5310.220 'set up thin delta-reuse parent': 
-		# This first commit contains the buried base object.
-		test-tool genrandom delta 16384 >file &&
-		git add file &&
-		git commit -m "delta base" &&
-		base=$(git rev-parse --verify HEAD:file) &&
+[master 35a8500] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+{"event":"data","sid":"20241114T193645.163014Z-H5c947e1c-P000033dc","thread":"main","time":"2024-11-14T19:36:45.164063Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001201,"t_rel":0.001201,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"6"}
+{"event":"data","sid":"20241114T193645.163014Z-H5c947e1c-P000033dc","thread":"main","time":"2024-11-14T19:36:45.164068Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001207,"t_rel":0.001207,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"2"}
+ok 6 - reuse all objects from subset of bitmapped packs
 
-		# These intermediate commits bury the base back in history.
-		# This becomes the "old" state.
-		for i in 1 2 3 4 5
-		do
-			echo $i >file &&
-			git commit -am "intermediate $i" || return 1
-		done &&
-		git branch delta-reuse-old &&
+expecting success of 5332.7 'reuse all objects from all packs': 
+	test_pack_objects_reused_all 9 3
 
-		# And now our new history has a delta against the buried base. Note
-		# that this must be smaller than the original file, since pack-objects
-		# prefers to create deltas from smaller objects to larger.
-		test-tool genrandom delta 16300 >file &&
-		git commit -am "delta result" &&
-		delta=$(git rev-parse --verify HEAD:file) &&
-		git branch delta-reuse-new &&
+{"event":"data","sid":"20241114T193645.197630Z-H5c947e1c-P000033f1","thread":"main","time":"2024-11-14T19:36:45.198695Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001178,"t_rel":0.001178,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"9"}
+{"event":"data","sid":"20241114T193645.197630Z-H5c947e1c-P000033f1","thread":"main","time":"2024-11-14T19:36:45.198700Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001183,"t_rel":0.001183,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+ok 7 - reuse all objects from all packs
 
-		# Repack with bitmaps and double check that we have the expected delta
-		# relationship.
-		git repack -adb &&
-		have_delta $delta $base
-	
-[second 4cff21d] delta base
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[second ebc36d2] intermediate 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-[second 83a37f9] intermediate 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[second 2e2775c] intermediate 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[second 40235fc] intermediate 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[second b2b3320] intermediate 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[second c789171] delta result
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-ok 220 - set up thin delta-reuse parent
+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 &&
 
-expecting success of 5310.221 'fetch without bitmaps ignores delta against old base': 
-		test_config pack.usebitmaps false &&
-		test_when_finished "rm -rf client.git" &&
-		git init --bare client.git &&
-		(
-			cd client.git &&
-			git config transfer.unpackLimit 1 &&
-			git fetch .. delta-reuse-old:delta-reuse-old &&
-			git fetch .. delta-reuse-new:delta-reuse-new &&
-			have_delta $delta $ZERO_OID
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/client.git/
-From ..
- * [new branch]      delta-reuse-old -> delta-reuse-old
-From ..
- * [new branch]      delta-reuse-new -> delta-reuse-new
-ok 221 - fetch without bitmaps ignores delta against old base
+	# 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)" &&
 
-expecting success of 5310.222 'fetch with bitmaps can reuse old base': 
-		test_config pack.usebitmaps true &&
-		test_when_finished "rm -rf client.git" &&
-		git init --bare client.git &&
-		(
-			cd client.git &&
-			git config transfer.unpackLimit 1 &&
-			git fetch .. delta-reuse-old:delta-reuse-old &&
-			git fetch .. delta-reuse-new:delta-reuse-new &&
-			have_delta $delta $base
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/client.git/
-From ..
- * [new branch]      delta-reuse-old -> delta-reuse-old
-From ..
- * [new branch]      delta-reuse-new -> delta-reuse-new
-ok 222 - fetch with bitmaps can reuse old base
+	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 5310.223 'pack.preferBitmapTips': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable true &&
+	# 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 &&
 
-			# create enough commits that not all are receive bitmap
-			# coverage even if they are all at the tip of some reference.
-			test_commit_bulk --message="%s" 103 &&
+	# 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" &&
 
-			git rev-list HEAD >commits.raw &&
-			sort <commits.raw >commits &&
+	cat >in <<-EOF &&
+	$(git rev-parse E)
+	^$(git rev-parse D)
+	EOF
 
-			git log --format="create refs/tags/%s %H" HEAD >refs &&
-			git update-ref --stdin <refs &&
+	test_pack_objects_reused 3 1 <in
 
-			git repack -adb &&
-			test-tool bitmap list-commits | sort >bitmaps &&
+[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":"20241114T193645.543024Z-H5c947e1c-P00003464","thread":"main","time":"2024-11-14T19:36:45.544687Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001881,"t_rel":0.001881,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20241114T193645.543024Z-H5c947e1c-P00003464","thread":"main","time":"2024-11-14T19:36:45.544693Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001888,"t_rel":0.001888,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+ok 8 - reuse objects from first pack with middle gap
 
-			# remember which commits did not receive bitmaps
-			comm -13 bitmaps commits >before &&
-			test_file_not_empty before &&
+expecting success of 5332.9 'reuse objects from middle pack with middle gap': 
+	rm -fr $packdir/multi-pack-index* &&
 
-			# mark the commits which did not receive bitmaps as preferred,
-			# and generate the bitmap again
-			perl -pe "s{^}{create refs/tags/include/$. }" <before |
-				git update-ref --stdin &&
-			git -c pack.preferBitmapTips=refs/tags/include repack -adb &&
+	# 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" &&
 
-			# finally, check that the commit(s) without bitmap coverage
-			# are not the same ones as before
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >after &&
+	cat >in <<-EOF &&
+	$(git rev-parse E)
+	^$(git rev-parse D)
+	EOF
 
-			! test_cmp before after
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      26918 /      26918
----------------------------------------------------------------------
+	test_pack_objects_reused 3 1 <in
 
---- before	2025-12-18 01:36:23.986773267 +0000
-+++ after	2025-12-18 01:36:24.034773267 +0000
-@@ -1 +1 @@
--37419f6d136228aef65f8c0814262f05f954d62a
-+ed73bac8391ee3dfb2a90e3cd7df9bd765ce5b5f
-ok 223 - pack.preferBitmapTips
+warning: unknown preferred pack: 'pack-.idx'
+{"event":"data","sid":"20241114T193645.601806Z-H5c947e1c-P0000347e","thread":"main","time":"2024-11-14T19:36:45.603382Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001773,"t_rel":0.001773,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20241114T193645.601806Z-H5c947e1c-P0000347e","thread":"main","time":"2024-11-14T19:36:45.603389Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001780,"t_rel":0.001780,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+ok 9 - reuse objects from middle pack with middle gap
 
-expecting success of 5310.224 'pack.preferBitmapTips': 
-		git init repo &&
-		test_when_finished "rm -rf repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable true &&
-			test_commit_bulk --message="%s" 103 &&
+expecting success of 5332.10 'omit delta with uninteresting base (same pack)': 
+	git repack -adk &&
 
-			cat >>.git/config <<-\EOF &&
-			[pack]
-				preferBitmapTips
-			EOF
-			cat >expect <<-\EOF &&
-			error: missing value for 'pack.preferbitmaptips'
-			EOF
-			git repack -adb 2>actual &&
-			test_cmp expect actual
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      26918 /      26918
----------------------------------------------------------------------
+	test_seq 32 >f &&
+	git add f &&
+	test_tick &&
+	git commit -m "delta" &&
+	delta="$(git rev-parse HEAD)" &&
 
-ok 224 - pack.preferBitmapTips
+	test_seq 64 >f &&
+	test_tick &&
+	git commit -a -m "base" &&
+	base="$(git rev-parse HEAD)" &&
 
-expecting success of 5310.225 'complains about multiple pack bitmaps': 
-		rm -fr repo &&
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable true &&
+	test_commit other &&
 
-			test_commit base &&
+	git repack -d &&
 
-			git repack -adb &&
-			bitmap="$(ls .git/objects/pack/pack-*.bitmap)" &&
-			mv "$bitmap" "$bitmap.bak" &&
+	have_delta "$(git rev-parse $delta:f)" "$(git rev-parse $base:f)" &&
 
-			test_commit other &&
-			git repack -ab &&
+	git multi-pack-index write --bitmap &&
 
-			mv "$bitmap.bak" "$bitmap" &&
+	cat >in <<-EOF &&
+	$(git rev-parse other)
+	^$base
+	EOF
 
-			find .git/objects/pack -type f -name "*.pack" >packs &&
-			find .git/objects/pack -type f -name "*.bitmap" >bitmaps &&
-			test_line_count = 2 packs &&
-			test_line_count = 2 bitmaps &&
+	# 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
 
-			GIT_TRACE2_EVENT=$(pwd)/trace2.txt git rev-list --use-bitmap-index HEAD &&
-			grep "opened bitmap" trace2.txt &&
-			grep "ignoring extra bitmap" trace2.txt
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5310-pack-bitmaps/repo/.git/
-[master (root-commit) 92f77f6] base
+[master 16753ad] delta
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 1a76757] other
+ 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
-1a76757cab55a0d45b9ba975eda6eb7dca4f716d
-92f77f689e270db411603dd57dea5c4d12ac65b6
-{"event":"data","sid":"20251218T013624.305203Z-Hfbad846e-P00003f60","thread":"main","time":"2025-12-18T01:36:24.306394Z","file":"pack-bitmap.c","line":462,"repo":1,"t_abs":0.001362,"t_rel":0.001362,"nesting":1,"category":"bitmap","key":"opened bitmap file","value":".git/objects/pack/pack-85a84125b8486451c50fe5eac71ae4078db4a9c8.pack"}
-{"event":"data","sid":"20251218T013624.305203Z-Hfbad846e-P00003f60","thread":"main","time":"2025-12-18T01:36:24.306411Z","file":"pack-bitmap.c","line":436,"repo":1,"t_abs":0.001380,"t_rel":0.001380,"nesting":1,"category":"bitmap","key":"ignoring extra bitmap file","value":".git/objects/pack/pack-f42a38f98066647f8c129c7f6755eceddb5c21ab.pack"}
-ok 225 - complains about multiple pack bitmaps
+{"event":"data","sid":"20241114T193645.964428Z-H5c947e1c-P00003515","thread":"main","time":"2024-11-14T19:36:45.969931Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.005709,"t_rel":0.005709,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"3"}
+{"event":"data","sid":"20241114T193645.964428Z-H5c947e1c-P00003515","thread":"main","time":"2024-11-14T19:36:45.969938Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.005716,"t_rel":0.005716,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"1"}
+ok 10 - omit delta with uninteresting base (same pack)
 
-expecting success of 5310.226 'verify writing bitmap lookup table when enabled': 
-	GIT_TRACE2_EVENT="$(pwd)/trace2" \
-		git repack -ad &&
-	grep "\"label\":\"writing_lookup_table\"" trace2
+expecting success of 5332.11 'omit delta from uninteresting base (cross pack)': 
+	cat >in <<-EOF &&
+	$(git rev-parse $base)
+	^$(git rev-parse $delta)
+	EOF
 
-{"event":"region_enter","sid":"20251218T013624.329066Z-Hfbad846e-P00003f7b/20251218T013624.332219Z-Hfbad846e-P00003f83","thread":"main","time":"2025-12-18T01:36:24.356386Z","file":"pack-bitmap-write.c","line":733,"repo":1,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20251218T013624.329066Z-Hfbad846e-P00003f7b/20251218T013624.332219Z-Hfbad846e-P00003f83","thread":"main","time":"2025-12-18T01:36:24.356399Z","file":"pack-bitmap-write.c","line":760,"repo":1,"t_rel":0.000015,"nesting":2,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-ok 226 - verify writing bitmap lookup table when enabled
+	P="$(git pack-objects --revs $packdir/pack <in)" &&
 
-expecting success of 5310.227 'truncated bitmap fails gracefully (lookup table)': 
-	test_config pack.writebitmaphashcache false &&
-	git repack -adb &&
-	git rev-list --use-bitmap-index --count --all >expect &&
-	bitmap=$(ls .git/objects/pack/*.bitmap) &&
-	test_when_finished "rm -f $bitmap" &&
-	test_copy_bytes 512 <$bitmap >$bitmap.tmp &&
-	mv -f $bitmap.tmp $bitmap &&
-	git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
-	test_cmp expect actual &&
-	test_grep corrupted.bitmap.index stderr
+	git multi-pack-index write --bitmap --preferred-pack="pack-$P.idx" &&
 
-error: corrupted bitmap index file (too short to fit lookup table)
-error: corrupted bitmap index file (too short to fit lookup table)
-ok 227 - truncated bitmap fails gracefully (lookup table)
+	packs_nr="$(find $packdir -type f -name "pack-*.pack" | wc -l)" &&
+	objects_nr="$(git rev-list --count --all --objects)" &&
 
-# passed all 227 test(s)
-1..227
+	test_pack_objects_reused_all $(($objects_nr - 1)) $packs_nr
+
+{"event":"data","sid":"20241114T193646.137952Z-H5c947e1c-P0000355f","thread":"main","time":"2024-11-14T19:36:46.139355Z","file":"builtin/pack-objects.c","line":4624,"repo":1,"t_abs":0.001526,"t_rel":0.001526,"nesting":1,"category":"pack-objects","key":"pack-reused","value":"26"}
+{"event":"data","sid":"20241114T193646.137952Z-H5c947e1c-P0000355f","thread":"main","time":"2024-11-14T19:36:46.139361Z","file":"builtin/pack-objects.c","line":4625,"repo":1,"t_abs":0.001532,"t_rel":0.001532,"nesting":1,"category":"pack-objects","key":"packs-reused","value":"3"}
+ok 11 - omit delta from uninteresting base (cross pack)
+
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5351-unpack-large-objects.sh ***
@@ -308685,8 +309691,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"child_start","sid":"20251218T013625.108972Z-Hfbad846e-P0000438e","thread":"main","time":"2025-12-18T01:36:25.113727Z","file":"run-command.c","line":724,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-17294-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20251218T013625.108972Z-Hfbad846e-P0000438e/20251218T013625.115543Z-Hfbad846e-P00004397","thread":"main","time":"2025-12-18T01:36:25.115603Z","file":"common-main.c","line":56,"t_abs":0.000192,"argv":["/build/reproducible-path/git-2.45.2/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-17294-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"child_start","sid":"20241114T193647.340164Z-H5c947e1c-P00003756","thread":"main","time":"2024-11-14T19:36:47.373169Z","file":"run-command.c","line":724,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-14166-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20241114T193647.340164Z-H5c947e1c-P00003756/20241114T193647.382408Z-H5c947e1c-P0000376a","thread":"main","time":"2024-11-14T19:36:47.382490Z","file":"common-main.c","line":56,"t_abs":0.000286,"argv":["/build/reproducible-path/git-2.45.2/git","pack-objects","--window=2","--delta-base-offset",".git/objects/pack/.tmp-14166-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': 
@@ -308708,8 +309714,8 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-{"event":"child_start","sid":"20251218T013625.165135Z-Hfbad846e-P000043c6","thread":"main","time":"2025-12-18T01:36:25.170523Z","file":"run-command.c","line":724,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-17350-pack","--cruft","--honor-pack-keep","--non-empty"]}
-{"event":"start","sid":"20251218T013625.165135Z-Hfbad846e-P000043c6/20251218T013625.172105Z-Hfbad846e-P000043df","thread":"main","time":"2025-12-18T01:36:25.172167Z","file":"common-main.c","line":56,"t_abs":0.000182,"argv":["/build/reproducible-path/git-2.45.2/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-17350-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"child_start","sid":"20241114T193647.571028Z-H5c947e1c-P000037cc","thread":"main","time":"2024-11-14T19:36:47.589207Z","file":"run-command.c","line":724,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-14284-pack","--cruft","--honor-pack-keep","--non-empty"]}
+{"event":"start","sid":"20241114T193647.571028Z-H5c947e1c-P000037cc/20241114T193647.598228Z-H5c947e1c-P000037ed","thread":"main","time":"2024-11-14T19:36:47.598304Z","file":"common-main.c","line":56,"t_abs":0.000240,"argv":["/build/reproducible-path/git-2.45.2/git","pack-objects","--window=3","--delta-base-offset",".git/objects/pack/.tmp-14284-pack","--cruft","--honor-pack-keep","--non-empty"]}
 ok 26 - cruft repack respects --window by default
 
 expecting success of 5329.27 'cruft repack respects --quiet': 
@@ -308780,7 +309786,7 @@
  1 file changed, 1 insertion(+)
  create mode 100644 other.t
 df967b96a579e45a18b8251732d16804b2e56a55
-822216280fd1de308f55f27cdd7a4196a8f5a189 1766021785
+822216280fd1de308f55f27cdd7a4196a8f5a189 1731613008
 ok 28 - cruft --local drops unreachable objects
 
 expecting success of 5329.29 'MIDX bitmaps tolerate reachable cruft objects': 
@@ -308855,7 +309861,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-822216280fd1de308f55f27cdd7a4196a8f5a189 1766021785
+822216280fd1de308f55f27cdd7a4196a8f5a189 1731613008
 822216280fd1de308f55f27cdd7a4196a8f5a189
 ok 30 - cruft objects are freshend via loose
 
@@ -309700,1849 +310706,2038 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5324-split-commit-graph.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/.git/
-expecting success of 5324.1 'setup repo': 
-	git init &&
-	git config core.commitGraph true &&
-	git config gc.writeCommitGraph false &&
-	infodir=".git/objects/info" &&
-	graphdir="$infodir/commit-graphs" &&
-	test_oid_cache <<-EOM
-	shallow sha1:2132
-	shallow sha256:2436
+*** t5408-send-pack-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-	base sha1:1408
-	base sha256:1528
+ok 1 - setup refs
 
-	oid_version sha1:1
-	oid_version sha256:2
-	EOM
+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
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/.git/
-ok 1 - setup repo
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 5324.2 'tweak umask for modebit tests': 
-	umask 022
+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
 
-ok 2 - tweak umask for modebit tests
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 5324.3 'create commits and write commit-graph': 
-	for i in $(test_seq 3)
-	do
-		test_commit $i &&
-		git branch commits/$i || return 1
-	done &&
-	git commit-graph write --reachable &&
-	test_path_is_file $infodir/commit-graph &&
-	graph_read_expect 3
+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
 
-[master (root-commit) d0dcf97] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 82335b2] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master ddc8575] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-ok 3 - create commits and write commit-graph
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 5324.4 'check normal git operations: graph exists': 
-		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
-		graph_git_two_modes "branch -vv" "$DIR" &&
-		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
-	
-ok 4 - check normal git operations: graph exists
+expecting success of 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
 
-expecting success of 5324.5 'add more commits, and write a new base graph': 
-	git reset --hard commits/1 &&
-	for i in $(test_seq 4 5)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5400-send-pack.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/.git/
+expecting success of 5400.1 'setup': 
+	test_tick &&
+	mkdir mozart mozart/is &&
+	echo "Commit #0" >mozart/is/pink &&
+	git update-index --add mozart/is/pink &&
+	tree=$(git write-tree) &&
+	commit=$(echo "Commit #0" | git commit-tree $tree) &&
+	zero=$commit &&
+	parent=$zero &&
+	i=0 &&
+	while test $i -le $cnt
 	do
-		test_commit $i &&
-		git branch commits/$i || return 1
+		i=$(($i+1)) &&
+		test_tick &&
+		echo "Commit #$i" >mozart/is/pink &&
+		git update-index --add mozart/is/pink &&
+		tree=$(git write-tree) &&
+		commit=$(echo "Commit #$i" |
+			 git commit-tree $tree -p $parent) &&
+		git update-ref refs/tags/commit$i $commit &&
+		parent=$commit || return 1
 	done &&
-	git reset --hard commits/2 &&
-	for i in $(test_seq 6 10)
+	git update-ref HEAD "$commit" &&
+	git clone ./. victim &&
+	( cd victim && git config receive.denyCurrentBranch warn && git log ) &&
+	git update-ref HEAD "$zero" &&
+	parent=$zero &&
+	i=0 &&
+	while test $i -le $cnt
 	do
-		test_commit $i &&
-		git branch commits/$i || return 1
+		i=$(($i+1)) &&
+		test_tick &&
+		echo "Rebase #$i" >mozart/is/pink &&
+		git update-index --add mozart/is/pink &&
+		tree=$(git write-tree) &&
+		commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
+		git update-ref refs/tags/rebase$i $commit &&
+		parent=$commit || return 1
 	done &&
-	git reset --hard commits/2 &&
-	git merge commits/4 &&
-	git branch merge/1 &&
-	git reset --hard commits/4 &&
-	git merge commits/6 &&
-	git branch merge/2 &&
-	git commit-graph write --reachable &&
-	graph_read_expect 12
+	git update-ref HEAD "$commit" &&
+	echo Rebase &&
+	git log
+Cloning into 'victim'...
+done.
+commit fbc850672173770f17d48f9f2dfcb286d30b70cb
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:18:13 2005 -0700
 
-HEAD is now at d0dcf97 1
-[master 6efda21] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master 7ec8a1d] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-HEAD is now at 82335b2 2
-[master 76c4cb0] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-[master 12a06f3] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-[master 1883fab] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-[master 8ccfcf8] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-[master f52fba2] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10.t
-HEAD is now at 82335b2 2
-Merge made by the 'ort' strategy.
- 4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-HEAD is now at 6efda21 4
-Merge made by the 'ort' strategy.
- 2.t | 1 +
- 6.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 2.t
- create mode 100644 6.t
-ok 5 - add more commits, and write a new base graph
+    Commit #65
 
-expecting success of 5324.6 'fork and fail to base a chain on a commit-graph file': 
-	test_when_finished rm -rf fork &&
-	git clone . fork &&
-	(
-		cd fork &&
-		rm .git/objects/info/commit-graph &&
-		echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
-		test_commit new-commit &&
-		git commit-graph write --reachable --split &&
-		test_path_is_file $graphdir/commit-graph-chain &&
-		test_line_count = 1 $graphdir/commit-graph-chain &&
-		verify_chain_files_exist $graphdir
-	)
+commit 940af75942cf34a9fc156d9dc79c8c370e4c3247
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:17:13 2005 -0700
 
-Cloning into 'fork'...
-done.
-[master aca87dd] new-commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new-commit.t
-ok 6 - fork and fail to base a chain on a commit-graph file
+    Commit #64
 
-expecting success of 5324.7 'add three more commits, write a tip graph': 
-	git reset --hard commits/3 &&
-	git merge merge/1 &&
-	git merge commits/5 &&
-	git merge merge/2 &&
-	git branch merge/3 &&
-	git commit-graph write --reachable --split &&
-	test_path_is_missing $infodir/commit-graph &&
-	test_path_is_file $graphdir/commit-graph-chain &&
-	ls $graphdir/graph-*.graph >graph-files &&
-	test_line_count = 2 graph-files &&
-	verify_chain_files_exist $graphdir
+commit 1fe3a3ebbeaddd1e503ee516a5433a8ebe097112
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:16:13 2005 -0700
 
-HEAD is now at ddc8575 3
-Merge made by the 'ort' strategy.
- 4.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-Merge made by the 'ort' strategy.
- 5.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-Merge made by the 'ort' strategy.
- 6.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-ok 7 - add three more commits, write a tip graph
+    Commit #63
 
-expecting success of 5324.8 'check normal git operations: split commit-graph: merge 3 vs 2': 
-		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
-		graph_git_two_modes "branch -vv" "$DIR" &&
-		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
-	
-ok 8 - check normal git operations: split commit-graph: merge 3 vs 2
+commit 0c78ec36deec72f8c6d458db5b753249a5447dec
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:15:13 2005 -0700
 
-expecting success of 5324.9 'add one commit, write a tip graph': 
-	test_commit 11 &&
-	git branch commits/11 &&
-	git commit-graph write --reachable --split &&
-	test_path_is_missing $infodir/commit-graph &&
-	test_path_is_file $graphdir/commit-graph-chain &&
-	ls $graphdir/graph-*.graph >graph-files &&
-	test_line_count = 3 graph-files &&
-	verify_chain_files_exist $graphdir
+    Commit #62
 
-[master 4942c62] 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11.t
-ok 9 - add one commit, write a tip graph
+commit 0ad1da14d02ef96f2c1cb8403952ffddeaaca439
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:14:13 2005 -0700
 
-expecting success of 5324.10 'check normal git operations: three-layer commit-graph: commit 11 vs 6': 
-		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
-		graph_git_two_modes "branch -vv" "$DIR" &&
-		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
-	
-ok 10 - check normal git operations: three-layer commit-graph: commit 11 vs 6
+    Commit #61
 
-expecting success of 5324.11 'add one commit, write a merged graph': 
-	test_commit 12 &&
-	git branch commits/12 &&
-	git commit-graph write --reachable --split &&
-	test_path_is_file $graphdir/commit-graph-chain &&
-	test_line_count = 2 $graphdir/commit-graph-chain &&
-	ls $graphdir/graph-*.graph >graph-files &&
-	test_line_count = 2 graph-files &&
-	verify_chain_files_exist $graphdir
+commit 15278e4b9b51ca8e00785fff5592d9ba7b8012ea
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:13:13 2005 -0700
 
-[master 281f121] 12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12.t
-ok 11 - add one commit, write a merged graph
+    Commit #60
 
-expecting success of 5324.12 'check normal git operations: merged commit-graph: commit 12 vs 6': 
-		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
-		graph_git_two_modes "branch -vv" "$DIR" &&
-		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
-	
-ok 12 - check normal git operations: merged commit-graph: commit 12 vs 6
+commit d92539d97407cae3ac62cdd1992188ce96a04699
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:12:13 2005 -0700
 
-expecting success of 5324.13 'create fork and chain across alternate': 
-	git clone . fork &&
-	(
-		cd fork &&
-		git config core.commitGraph true &&
-		rm -rf $graphdir &&
-		echo "$(pwd)/../.git/objects" >.git/objects/info/alternates &&
-		test_commit 13 &&
-		git branch commits/13 &&
-		git commit-graph write --reachable --split &&
-		test_path_is_file $graphdir/commit-graph-chain &&
-		test_line_count = 3 $graphdir/commit-graph-chain &&
-		ls $graphdir/graph-*.graph >graph-files &&
-		test_line_count = 1 graph-files &&
-		git -c core.commitGraph=true  rev-list HEAD >expect &&
-		git -c core.commitGraph=false rev-list HEAD >actual &&
-		test_cmp expect actual &&
-		test_commit 14 &&
-		git commit-graph write --reachable --split --object-dir=.git/objects/ &&
-		test_line_count = 3 $graphdir/commit-graph-chain &&
-		ls $graphdir/graph-*.graph >graph-files &&
-		test_line_count = 1 graph-files
-	)
+    Commit #59
 
-Cloning into 'fork'...
-done.
-[master f92bfb4] 13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13.t
-[master 77a503a] 14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14.t
-ok 13 - create fork and chain across alternate
+commit eeddc69755cde0046432203191b431846124c36d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:11:13 2005 -0700
 
-expecting success of 5324.14 'check normal git operations: alternate: commit 13 vs 6': 
-		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
-		graph_git_two_modes "branch -vv" "$DIR" &&
-		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
-	
-ok 14 - check normal git operations: alternate: commit 13 vs 6
+    Commit #58
 
-expecting success of 5324.15 'test merge stragety constants': 
-	git clone . merge-2 &&
-	(
-		cd merge-2 &&
-		git config core.commitGraph true &&
-		test_line_count = 2 $graphdir/commit-graph-chain &&
-		test_commit 14 &&
-		git commit-graph write --reachable --split --size-multiple=2 &&
-		test_line_count = 3 $graphdir/commit-graph-chain
+commit 9481eb1cebd4e35080a85eaac0a389e436d174d9
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:10:13 2005 -0700
 
-	) &&
-	git clone . merge-10 &&
-	(
-		cd merge-10 &&
-		git config core.commitGraph true &&
-		test_line_count = 2 $graphdir/commit-graph-chain &&
-		test_commit 14 &&
-		git commit-graph write --reachable --split --size-multiple=10 &&
-		test_line_count = 1 $graphdir/commit-graph-chain &&
-		ls $graphdir/graph-*.graph >graph-files &&
-		test_line_count = 1 graph-files
-	) &&
-	git clone . merge-10-expire &&
-	(
-		cd merge-10-expire &&
-		git config core.commitGraph true &&
-		test_line_count = 2 $graphdir/commit-graph-chain &&
-		test_commit 15 &&
-		touch $graphdir/to-delete.graph $graphdir/to-keep.graph &&
-		test-tool chmtime =1546362000 $graphdir/to-delete.graph &&
-		test-tool chmtime =1546362001 $graphdir/to-keep.graph &&
-		git commit-graph write --reachable --split --size-multiple=10 \
-			--expire-time="2019-01-01 12:00 -05:00" &&
-		test_line_count = 1 $graphdir/commit-graph-chain &&
-		test_path_is_missing $graphdir/to-delete.graph &&
-		test_path_is_file $graphdir/to-keep.graph &&
-		ls $graphdir/graph-*.graph >graph-files &&
-		test_line_count = 3 graph-files
-	) &&
-	git clone --no-hardlinks . max-commits &&
-	(
-		cd max-commits &&
-		git config core.commitGraph true &&
-		test_line_count = 2 $graphdir/commit-graph-chain &&
-		test_commit 16 &&
-		test_commit 17 &&
-		git commit-graph write --reachable --split --max-commits=1 &&
-		test_line_count = 1 $graphdir/commit-graph-chain &&
-		ls $graphdir/graph-*.graph >graph-files &&
-		test_line_count = 1 graph-files
-	)
+    Commit #57
 
-Cloning into 'merge-2'...
-done.
-[master dff8101] 14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14.t
-Cloning into 'merge-10'...
-done.
-[master dff8101] 14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14.t
-Cloning into 'merge-10-expire'...
-done.
-[master b16d1f7] 15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 15.t
-Cloning into 'max-commits'...
-done.
-[master ffa95d4] 16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 16.t
-[master 5167fe2] 17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 17.t
-ok 15 - test merge stragety constants
+commit 9ab7d0c3f85908c1624cc58f67c236b2e5d53c5d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:09:13 2005 -0700
 
-expecting success of 5324.16 'remove commit-graph-chain file after flattening': 
-	git clone . flatten &&
-	(
-		cd flatten &&
-		test_line_count = 2 $graphdir/commit-graph-chain &&
-		git commit-graph write --reachable &&
-		test_path_is_missing $graphdir/commit-graph-chain &&
-		ls $graphdir >graph-files &&
-		test_line_count = 0 graph-files
-	)
+    Commit #56
 
-Cloning into 'flatten'...
-done.
-ok 16 - remove commit-graph-chain file after flattening
+commit 070f3c8d7d43c5b9df69498416664b994a36a3e7
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:08:13 2005 -0700
 
-expecting success of 5324.17 'verify hashes along chain, even in shallow': 
-	git clone --no-hardlinks . verify &&
-	(
-		cd verify &&
-		git commit-graph verify &&
-		base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
-		corrupt_file "$base_file" $(test_oid shallow) "\01" &&
-		test_must_fail git commit-graph verify --shallow 2>test_err &&
-		grep -v "^+" test_err >err &&
-		test_grep "incorrect checksum" err
-	)
+    Commit #55
 
-Cloning into 'verify'...
-done.
-1+0 records in
-1+0 records out
-1 byte copied, 3.5854e-05 s, 27.9 kB/s
-the commit-graph file has incorrect checksum and is likely corrupt
-ok 17 - verify hashes along chain, even in shallow
+commit a2f3e1ffc14adb111494e37e857de5428da7230e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:07:13 2005 -0700
 
-expecting success of 5324.18 'verify notices chain slice which is bogus (base)': 
-	git clone --no-hardlinks . verify-chain-bogus-base &&
-	(
-		cd verify-chain-bogus-base &&
-		git commit-graph verify &&
-		base_file=$graphdir/graph-$(sed -n 1p $graphdir/commit-graph-chain).graph &&
-		echo "garbage" >$base_file &&
-		test_must_fail git commit-graph verify 2>test_err &&
-		grep -v "^+" test_err >err &&
-		grep "commit-graph file is too small" err
-	)
+    Commit #54
 
-Cloning into 'verify-chain-bogus-base'...
-done.
-error: commit-graph file is too small
-ok 18 - verify notices chain slice which is bogus (base)
+commit 373ca332c114a8af8262474c0b750133d11c3467
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:06:13 2005 -0700
 
-expecting success of 5324.19 'verify notices chain slice which is bogus (tip)': 
-	git clone --no-hardlinks . verify-chain-bogus-tip &&
-	(
-		cd verify-chain-bogus-tip &&
-		git commit-graph verify &&
-		tip_file=$graphdir/graph-$(sed -n 2p $graphdir/commit-graph-chain).graph &&
-		echo "garbage" >$tip_file &&
-		test_must_fail git commit-graph verify 2>test_err &&
-		grep -v "^+" test_err >err &&
-		grep "commit-graph file is too small" err
-	)
+    Commit #53
 
-Cloning into 'verify-chain-bogus-tip'...
-done.
-error: commit-graph file is too small
-ok 19 - verify notices chain slice which is bogus (tip)
+commit abddf6c6693561aed51ed7308754360720399450
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:05:13 2005 -0700
 
-expecting success of 5324.20 'verify --shallow does not check base contents': 
-	git clone --no-hardlinks . verify-shallow &&
-	(
-		cd verify-shallow &&
-		git commit-graph verify &&
-		base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
-		corrupt_file "$base_file" 1500 "\01" &&
-		git commit-graph verify --shallow &&
-		test_must_fail git commit-graph verify 2>test_err &&
-		grep -v "^+" test_err >err &&
-		test_grep "incorrect checksum" err
-	)
+    Commit #52
 
-Cloning into 'verify-shallow'...
-done.
-1+0 records in
-1+0 records out
-1 byte copied, 3.958e-05 s, 25.3 kB/s
-the commit-graph file has incorrect checksum and is likely corrupt
-ok 20 - verify --shallow does not check base contents
+commit e9dc99c35123a1d9dd416eb32975f518f7e52776
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:04:13 2005 -0700
 
-expecting success of 5324.21 'warn on base graph chunk incorrect': 
-	git clone --no-hardlinks . base-chunk &&
-	(
-		cd base-chunk &&
-		git commit-graph verify &&
-		base_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
-		corrupt_file "$base_file" $(test_oid base) "\01" &&
-		test_must_fail git commit-graph verify --shallow 2>test_err &&
-		grep -v "^+" test_err >err &&
-		test_grep "commit-graph chain does not match" err
-	)
+    Commit #51
 
-Cloning into 'base-chunk'...
-done.
-1+0 records in
-1+0 records out
-1 byte copied, 4.9404e-05 s, 20.2 kB/s
-warning: commit-graph chain does not match
-ok 21 - warn on base graph chunk incorrect
+commit 3efc54f7bd18addc186e565f051c1f57ae499205
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:03:13 2005 -0700
 
-expecting success of 5324.22 'verify after commit-graph-chain corruption (base)': 
-	git clone --no-hardlinks . verify-chain-base &&
-	(
-		cd verify-chain-base &&
-		corrupt_file "$graphdir/commit-graph-chain" 30 "G" &&
-		test_must_fail git commit-graph verify 2>test_err &&
-		grep -v "^+" test_err >err &&
-		test_grep "invalid commit-graph chain" err &&
-		corrupt_file "$graphdir/commit-graph-chain" 30 "A" &&
-		test_must_fail git commit-graph verify 2>test_err &&
-		grep -v "^+" test_err >err &&
-		test_grep "unable to find all commit-graph files" err
-	)
+    Commit #50
 
-Cloning into 'verify-chain-base'...
-done.
-1+0 records in
-1+0 records out
-1 byte copied, 3.6285e-05 s, 27.6 kB/s
-warning: invalid commit-graph chain: line 'a849e3566469ef6eec0d724b211560Ga5617cb1c' not a hash
-1+0 records in
-1+0 records out
-1 byte copied, 3.4722e-05 s, 28.8 kB/s
-warning: unable to find all commit-graph files
-ok 22 - verify after commit-graph-chain corruption (base)
+commit 288f90defdf9f8fe6cafb95c4a53d41e3d2914bc
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:02:13 2005 -0700
 
-expecting success of 5324.23 'verify after commit-graph-chain corruption (tip)': 
-	git clone --no-hardlinks . verify-chain-tip &&
-	(
-		cd verify-chain-tip &&
-		corrupt_file "$graphdir/commit-graph-chain" 70 "G" &&
-		test_must_fail git commit-graph verify 2>test_err &&
-		grep -v "^+" test_err >err &&
-		test_grep "invalid commit-graph chain" err &&
-		corrupt_file "$graphdir/commit-graph-chain" 70 "A" &&
-		test_must_fail git commit-graph verify 2>test_err &&
-		grep -v "^+" test_err >err &&
-		test_grep "unable to find all commit-graph files" err
-	)
+    Commit #49
 
-Cloning into 'verify-chain-tip'...
-done.
-1+0 records in
-1+0 records out
-1 byte copied, 3.8037e-05 s, 26.3 kB/s
-warning: invalid commit-graph chain: line '944c3272bbe885450ef5fcad419a8Gcf35d1c284' not a hash
-1+0 records in
-1+0 records out
-1 byte copied, 4.2414e-05 s, 23.6 kB/s
-warning: unable to find all commit-graph files
-ok 23 - verify after commit-graph-chain corruption (tip)
+commit 1dfae6503af0ff1c353be39162beb34744556d2d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:01:13 2005 -0700
 
-expecting success of 5324.24 'verify notices too-short chain file': 
-	git clone --no-hardlinks . verify-chain-short &&
-	(
-		cd verify-chain-short &&
-		git commit-graph verify &&
-		echo "garbage" >$graphdir/commit-graph-chain &&
-		test_must_fail git commit-graph verify 2>test_err &&
-		grep -v "^+" test_err >err &&
-		grep "commit-graph chain file too small" err
-	)
+    Commit #48
 
-Cloning into 'verify-chain-short'...
-done.
-warning: commit-graph chain file too small
-ok 24 - verify notices too-short chain file
+commit c21493faada856b0f2ac0b85de568ffd9f21ad09
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:00:13 2005 -0700
 
-expecting success of 5324.25 'verify across alternates': 
-	git clone --no-hardlinks . verify-alt &&
-	(
-		cd verify-alt &&
-		rm -rf $graphdir &&
-		altdir="$(pwd)/../.git/objects" &&
-		echo "$altdir" >.git/objects/info/alternates &&
-		git commit-graph verify --object-dir="$altdir/" &&
-		test_commit extra &&
-		git commit-graph write --reachable --split &&
-		tip_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
-		corrupt_file "$tip_file" 1500 "\01" &&
-		test_must_fail git commit-graph verify --shallow 2>test_err &&
-		grep -v "^+" test_err >err &&
-		test_grep "incorrect checksum" err
-	)
+    Commit #47
 
-Cloning into 'verify-alt'...
-done.
-[master bcff7a4] extra
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 extra.t
-1+0 records in
-1+0 records out
-1 byte copied, 3.4011e-05 s, 29.4 kB/s
-the commit-graph file has incorrect checksum and is likely corrupt
-ok 25 - verify across alternates
+commit 0e48e7bf42f7c84d1039794461501f4d3e6bef59
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:59:13 2005 -0700
 
-expecting success of 5324.26 'reader bounds-checks base-graph chunk': 
-	git clone --no-hardlinks . corrupt-base-chunk &&
-	(
-		cd corrupt-base-chunk &&
-		tip_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
-		corrupt_chunk_file "$tip_file" BASE clear 01020304 &&
-		git -c core.commitGraph=false log >expect.out &&
-		git -c core.commitGraph=true log >out 2>err &&
-		test_cmp expect.out out &&
-		grep "commit-graph base graphs chunk is too small" err
-	)
+    Commit #46
 
-Cloning into 'corrupt-base-chunk'...
-done.
-warning: commit-graph base graphs chunk is too small
-ok 26 - reader bounds-checks base-graph chunk
+commit bb0ff093c62b37247e4b570e41e57fa123962ee8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:58:13 2005 -0700
 
-expecting success of 5324.27 'add octopus merge': 
-	git reset --hard commits/10 &&
-	git merge commits/3 commits/4 &&
-	git branch merge/octopus &&
-	git commit-graph write --reachable --split &&
-	git commit-graph verify --progress 2>err &&
-	test_line_count = 1 err &&
-	grep "Verifying commits in commit graph: 100% (18/18)" err &&
-	test_grep ! warning err &&
-	test_line_count = 3 $graphdir/commit-graph-chain
+    Commit #45
 
-HEAD is now at f52fba2 10
-Trying simple merge with commits/3
-Trying simple merge with commits/4
-Merge made by the 'octopus' strategy.
- 3.t | 1 +
- 4.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 3.t
- create mode 100644 4.t
-Verifying commits in commit graph:   5% (1/18)
Verifying commits in commit graph:  11% (2/18)
Verifying commits in commit graph:  16% (3/18)
Verifying commits in commit graph:  22% (4/18)
Verifying commits in commit graph:  27% (5/18)
Verifying commits in commit graph:  33% (6/18)
Verifying commits in commit graph:  38% (7/18)
Verifying commits in commit graph:  44% (8/18)
Verifying commits in commit graph:  50% (9/18)
Verifying commits in commit graph:  55% (10/18)
Verifying commits in commit graph:  61% (11/18)
Verifying commits in commit graph:  66% (12/18)
Verifying commits in commit graph:  72% (13/18)
Verifying commits in commit graph:  77% (14/18)
Verifying commits in commit graph:  83% (15/18)
Verifying commits in commit graph:  88% (16/18)
Verifying commits in commit graph:  94% (17/18)
Verifying commits in commit graph: 100% (18/18)
Verifying commits in commit graph: 100% (18/18), done.
-ok 27 - add octopus merge
+commit a2d17f74bfdf7acc0c40e3b228d57a4d68a9c01b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:57:13 2005 -0700
 
-expecting success of 5324.28 'check normal git operations: graph exists': 
-		graph_git_two_modes "log --oneline $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --topo-order $BRANCH" "$DIR" &&
-		graph_git_two_modes "log --graph $COMPARE..$BRANCH" "$DIR" &&
-		graph_git_two_modes "branch -vv" "$DIR" &&
-		graph_git_two_modes "merge-base -a $BRANCH $COMPARE" "$DIR"
-	
-ok 28 - check normal git operations: graph exists
+    Commit #44
 
-expecting success of 5324.29 'split across alternate where alternate is not split': 
-	git commit-graph write --reachable &&
-	test_path_is_file .git/objects/info/commit-graph &&
-	cp .git/objects/info/commit-graph . &&
-	git clone --no-hardlinks . alt-split &&
-	(
-		cd alt-split &&
-		rm -f .git/objects/info/commit-graph &&
-		echo "$(pwd)"/../.git/objects >.git/objects/info/alternates &&
-		test_commit 18 &&
-		git commit-graph write --reachable --split &&
-		test_line_count = 1 $graphdir/commit-graph-chain
-	) &&
-	test_cmp commit-graph .git/objects/info/commit-graph
+commit cbac9fdcb0113800bc9ff62d8c1a0cfd61815b11
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:56:13 2005 -0700
 
-Cloning into 'alt-split'...
-done.
-[master e793b7e] 18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 18.t
-ok 29 - split across alternate where alternate is not split
+    Commit #43
 
-expecting success of 5324.30 '--split=no-merge always writes an incremental': 
-	test_when_finished rm -rf a b &&
-	rm -rf $graphdir $infodir/commit-graph &&
-	git reset --hard commits/2 &&
-	git rev-list HEAD~1 >a &&
-	git rev-list HEAD >b &&
-	git commit-graph write --split --stdin-commits <a &&
-	git commit-graph write --split=no-merge --stdin-commits <b &&
-	test_line_count = 2 $graphdir/commit-graph-chain
+commit 13eff776535a4d90e14a5ba1239e3bb094fce3ef
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:55:13 2005 -0700
 
-HEAD is now at 82335b2 2
-ok 30 - --split=no-merge always writes an incremental
+    Commit #42
 
-expecting success of 5324.31 '--split=replace replaces the chain': 
-	rm -rf $graphdir $infodir/commit-graph &&
-	git reset --hard commits/3 &&
-	git rev-list -1 HEAD~2 >a &&
-	git rev-list -1 HEAD~1 >b &&
-	git rev-list -1 HEAD >c &&
-	git commit-graph write --split=no-merge --stdin-commits <a &&
-	git commit-graph write --split=no-merge --stdin-commits <b &&
-	git commit-graph write --split=no-merge --stdin-commits <c &&
-	test_line_count = 3 $graphdir/commit-graph-chain &&
-	git commit-graph write --stdin-commits --split=replace <b &&
-	test_path_is_missing $infodir/commit-graph &&
-	test_path_is_file $graphdir/commit-graph-chain &&
-	ls $graphdir/graph-*.graph >graph-files &&
-	test_line_count = 1 graph-files &&
-	verify_chain_files_exist $graphdir &&
-	graph_read_expect 2
+commit b7592bd14654cc3f437db49791a176d29d3aa8f0
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:54:13 2005 -0700
 
-HEAD is now at ddc8575 3
-ok 31 - --split=replace replaces the chain
+    Commit #41
 
-checking prerequisite: ULIMIT_FILE_DESCRIPTORS
+commit 83b8bfc7c90441063b251721278b7e8f9c5a201a
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:53:13 2005 -0700
 
-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
+    Commit #40
 
-)
-prerequisite ULIMIT_FILE_DESCRIPTORS ok
-expecting success of 5324.32 'handles file descriptor exhaustion': 
-	git init ulimit &&
+commit 0b9d55bbcb1a6033be38cb93b03d75e5a78f9c3f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:52:13 2005 -0700
+
+    Commit #39
+
+commit d453237bfb3140a104f4c3946b562e8b8e9cda13
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:51:13 2005 -0700
+
+    Commit #38
+
+commit 63c4e0264b89e227660dc2fbd7fc8077627ab28e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:50:13 2005 -0700
+
+    Commit #37
+
+commit 5df897dfd4814feea01849f65e8fc3e81d72728f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:49:13 2005 -0700
+
+    Commit #36
+
+commit 5e2d0ff7bcf7c8973b325689dd3604bd01d6b075
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:48:13 2005 -0700
+
+    Commit #35
+
+commit cbf881eb049d21325ff0fba1e98746e36f1d46a8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:47:13 2005 -0700
+
+    Commit #34
+
+commit b8a9eb0e7c8cff2ab2d65d53f5a568dc7b54d5b0
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:46:13 2005 -0700
+
+    Commit #33
+
+commit 20db8c933b4ca134652d077a7a59a12f7653c3a4
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:45:13 2005 -0700
+
+    Commit #32
+
+commit 738136f07b8bf1cff560dc0dbf4a18eee3b1de94
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:44:13 2005 -0700
+
+    Commit #31
+
+commit dd3f1b3396477b30b131d10831090cd58add8a2f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:43:13 2005 -0700
+
+    Commit #30
+
+commit e7bbe70cb14feebd4d4ceada22d700e1bdcb301f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:42:13 2005 -0700
+
+    Commit #29
+
+commit 7c932743e94bd2239c435bf5645dccb051f3c5fe
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:41:13 2005 -0700
+
+    Commit #28
+
+commit c3cca0936c775de13190616bf109b3992732f2e1
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:40:13 2005 -0700
+
+    Commit #27
+
+commit 2eb3c6ccb3b91269a09de0d742aecfd52817f72f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:39:13 2005 -0700
+
+    Commit #26
+
+commit 0f219719c1472626b844e140343f904fa4972bcc
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:38:13 2005 -0700
+
+    Commit #25
+
+commit 03c8ac629a12338cc02e81b17da6d7cb0e1a802b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:37:13 2005 -0700
+
+    Commit #24
+
+commit 99b081ae6f13358b2cff7faad1b3f2a4c347edad
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:36:13 2005 -0700
+
+    Commit #23
+
+commit 7206ff76323748a074c19dacc097d2ed3b96bfb2
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:35:13 2005 -0700
+
+    Commit #22
+
+commit 490ddb36dddfeffa7779829333c151cbbe9e7366
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:34:13 2005 -0700
+
+    Commit #21
+
+commit a73206b2f61cdf7bf21c8138c9900794f0eab9a5
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:33:13 2005 -0700
+
+    Commit #20
+
+commit 01e16b5ab9e14247c98de5452a4be588930371be
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:32:13 2005 -0700
+
+    Commit #19
+
+commit 9c803e03a40e955e599e8ecb9131651832083f57
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:31:13 2005 -0700
+
+    Commit #18
+
+commit 6fc6ec72c6ce78e654a775f4f659411294f1d4e6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:30:13 2005 -0700
+
+    Commit #17
+
+commit b601a967eeee6cb91b552c6e43b4bafdf2b1c7ac
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:29:13 2005 -0700
+
+    Commit #16
+
+commit 1747235a5c3fa673cab96b05b46dd97adb0c00c8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:28:13 2005 -0700
+
+    Commit #15
+
+commit 26bc6342db340ab762645b0b3b83517623b4c675
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:27:13 2005 -0700
+
+    Commit #14
+
+commit b2f646eca1878e3000b6ceabd81b60ce604cb41e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:26:13 2005 -0700
+
+    Commit #13
+
+commit be3e57a8ad8950e367abdb48fe904d3f965e96fa
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:25:13 2005 -0700
+
+    Commit #12
+
+commit 838c59d0f1f2160aa980e1c58db52403effc9dc6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:24:13 2005 -0700
+
+    Commit #11
+
+commit 2d04f66a08825b9bd9631a379768ee94d9e35c94
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:23:13 2005 -0700
+
+    Commit #10
+
+commit 3b4907bf685c7f5694fd51989e990218a5844ee6
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:22:13 2005 -0700
+
+    Commit #9
+
+commit e87f17a34ce327a5cef1309626784bc0bcc74743
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:21:13 2005 -0700
+
+    Commit #8
+
+commit b1248b7697c5ba5bd2099f38eee5728f05a07a2c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:20:13 2005 -0700
+
+    Commit #7
+
+commit a69e0e75ae4b3c7d5954f52f3dc1666d7facf114
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:19:13 2005 -0700
+
+    Commit #6
+
+commit d2559a7d1598c17fb8259ed9c923a40f242edbd7
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:18:13 2005 -0700
+
+    Commit #5
+
+commit c45f8a131dd92e17228868c96e1b0b0b07693331
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:17:13 2005 -0700
+
+    Commit #4
+
+commit 758f634f1b1a066097ec1ee3c9a4aedc0bfb3d46
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:16:13 2005 -0700
+
+    Commit #3
+
+commit 2285e440694323e1c325d1838d97abdecada8ade
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    Commit #2
+
+commit b86cdba23d2682dd459133f2efac8ea660f1dd5b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    Commit #1
+
+commit e8d9fe63116478156180f7026f6c181cc60432c5
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    Commit #0
+Rebase
+commit b1a1c97e94b6388c108e195d28a3e89f00c81698
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:23:13 2005 -0700
+
+    Rebase #65
+
+commit b1a473533f3c7654e6aabe20b868f403cc4542c4
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:22:13 2005 -0700
+
+    Rebase #64
+
+commit b44d0fc2fa543aae48a3e88ca2d4bb69b0808618
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:21:13 2005 -0700
+
+    Rebase #63
+
+commit bdb72969f88d60418acc3c5cb69f94a9254e4069
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:20:13 2005 -0700
+
+    Rebase #62
+
+commit f4846c914d90426d0aa7d9ae8c617e23aeb7aadc
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:19:13 2005 -0700
+
+    Rebase #61
+
+commit 5513d6a596bf3937f715bf4c4fa240dae08c1183
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:18:13 2005 -0700
+
+    Rebase #60
+
+commit c17d7284cf4910e76deb07380fdb38db71d239c7
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:17:13 2005 -0700
+
+    Rebase #59
+
+commit 61c422e7618c96824dffec2cbb0cc7ec1933e48e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:16:13 2005 -0700
+
+    Rebase #58
+
+commit 2d32b535df82e1d77ee22da27287e3a676723ef8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:15:13 2005 -0700
+
+    Rebase #57
+
+commit d8638fd41e1699aa201527ace01d2ba19815aceb
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:14:13 2005 -0700
+
+    Rebase #56
+
+commit 04fe055c82dc9923f2be842c62ddf3325ed7e4c3
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:13:13 2005 -0700
+
+    Rebase #55
+
+commit 8b3228b708d50b5e797bb375d97082ec7afeace4
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:12:13 2005 -0700
+
+    Rebase #54
+
+commit 5f4c3fe8ed7e4d32b60d7abb0e2af50d1343cca0
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:11:13 2005 -0700
+
+    Rebase #53
+
+commit 7f88d5e9d36769f5c9c65bcdd6b74456be65794b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:10:13 2005 -0700
+
+    Rebase #52
+
+commit 54fa0318009bc334ce8aa9a83e559582a15df921
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:09:13 2005 -0700
+
+    Rebase #51
+
+commit 874533e6395fa245e3aad590c5b29b113c993d88
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:08:13 2005 -0700
+
+    Rebase #50
+
+commit dc1211213cf96c29abb9e65856f42adb8ae87f44
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:07:13 2005 -0700
+
+    Rebase #49
+
+commit ecc16305000cbf7e0e28eaefa037380923f54f2b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:06:13 2005 -0700
+
+    Rebase #48
+
+commit 22eb8b0dd79fa78df505878adb615b382c819795
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:05:13 2005 -0700
+
+    Rebase #47
+
+commit e658f744975d593f1d768ae6a252466f3d6f542e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:04:13 2005 -0700
+
+    Rebase #46
+
+commit 927e9cfe3212295919b60727098c2bcba986c37e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:03:13 2005 -0700
+
+    Rebase #45
+
+commit 8c6450200d3f0d8d334e87e0d8a8277a2f791251
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:02:13 2005 -0700
+
+    Rebase #44
+
+commit 63e19d3641a395e0933a71af193c8dab5ddf587a
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:01:13 2005 -0700
+
+    Rebase #43
+
+commit dea9ca7996241bf8d256a6207334ab6cb0a2f16d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 17:00:13 2005 -0700
+
+    Rebase #42
+
+commit 026648f873caf2683546bb4a0bffc8293d8c2a73
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:59:13 2005 -0700
+
+    Rebase #41
+
+commit 614287fbf62149f243db150a29195ddd2552620e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:58:13 2005 -0700
+
+    Rebase #40
+
+commit 796c2f217a5f8738534fbb7febc3879590747fc2
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:57:13 2005 -0700
+
+    Rebase #39
+
+commit 5aaad3995be7c0de7d694ab11b764a400a4df57f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:56:13 2005 -0700
+
+    Rebase #38
+
+commit 313b77b49a4baf7c7fe8055753a71c38bdd38b47
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:55:13 2005 -0700
+
+    Rebase #37
+
+commit a59332167314137eb8af8837e16115c9680e018e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:54:13 2005 -0700
+
+    Rebase #36
+
+commit 0ab0d27b1668006e073534c69e62685f0f9fc4ab
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:53:13 2005 -0700
+
+    Rebase #35
+
+commit 43f966630635e7421592b1564d06becd4329fb7f
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:52:13 2005 -0700
+
+    Rebase #34
+
+commit fe710d4f0305ee6cfcc29f08823ccc6a8eb2e78a
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:51:13 2005 -0700
+
+    Rebase #33
+
+commit 58465df8a64cc8cf28c98afc18e920e03dad9ec8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:50:13 2005 -0700
+
+    Rebase #32
+
+commit 559f5ec230a71724d6ea3399c0216e52938cba74
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:49:13 2005 -0700
+
+    Rebase #31
+
+commit 423868ae9fccf8a50212b69677d9fe252065eb3b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:48:13 2005 -0700
+
+    Rebase #30
+
+commit d02b87bdc1b8e96ed634d52ddefb6b7db693b84b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:47:13 2005 -0700
+
+    Rebase #29
+
+commit 04e55758ac35dc63f899b6c3d526b2b802cee7c9
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:46:13 2005 -0700
+
+    Rebase #28
+
+commit be5fbd2f45796936f2cfa86bb4dffe5b95013f0e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:45:13 2005 -0700
+
+    Rebase #27
+
+commit 213212c4ff3f0e681db0e061ed02dcc2e3902374
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:44:13 2005 -0700
+
+    Rebase #26
+
+commit 61a890331f2ecf786d50fa8248d4f86345569421
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:43:13 2005 -0700
+
+    Rebase #25
+
+commit a1bfffeeeb67da7d9433dd5d4dcc2876badda7de
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:42:13 2005 -0700
+
+    Rebase #24
+
+commit ade5cf07bd9f8a623762be2b83d5200fd4c23e78
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:41:13 2005 -0700
+
+    Rebase #23
+
+commit 541aba44d5797d319874b1d242c491aecd70072e
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:40:13 2005 -0700
+
+    Rebase #22
+
+commit 8ef186d480959ba1c1950497155e9db2bb5cf262
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:39:13 2005 -0700
+
+    Rebase #21
+
+commit dd1cc8a79dd40f7d83223b2b2293062a17ed60ee
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:38:13 2005 -0700
+
+    Rebase #20
+
+commit 60c8d8288c55de0f0dadd7f570f69a5bd9023e54
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:37:13 2005 -0700
+
+    Rebase #19
+
+commit 2720bed4e6e3a6011714b76356527f5626a8b7bf
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:36:13 2005 -0700
+
+    Rebase #18
+
+commit e4946f6736764ebcc7b4392c98b1916f37a8151c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:35:13 2005 -0700
+
+    Rebase #17
+
+commit f2a50e2577f679dd6edf5afa77fb0d331cf0e487
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:34:13 2005 -0700
+
+    Rebase #16
+
+commit ba62d05c67970ca150478a6e204c07876eb45310
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:33:13 2005 -0700
+
+    Rebase #15
+
+commit 16bbc537388506c6aa3568aec7a1c295ff664ad8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:32:13 2005 -0700
+
+    Rebase #14
+
+commit 8ae96d45eca9358820adedc310a2bc6ff331a3e7
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:31:13 2005 -0700
+
+    Rebase #13
+
+commit 2557a8c044e16526b8261947e17623841a0d5a91
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:30:13 2005 -0700
+
+    Rebase #12
+
+commit 3f1275e3115a421a76f0ccbd5dea35b7cf227ce9
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:29:13 2005 -0700
+
+    Rebase #11
+
+commit 6d31feb4517418400c8f76a834f7cff206a2b1ab
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:28:13 2005 -0700
+
+    Rebase #10
+
+commit 054728ce53143ed538a80cc1db2f91642848d9d8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:27:13 2005 -0700
+
+    Rebase #9
+
+commit dbee1ce0dbeb64756fba483e99628287182a0be1
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:26:13 2005 -0700
+
+    Rebase #8
+
+commit d174cc1075a864f5db77014609f7f9af0240ed0c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:25:13 2005 -0700
+
+    Rebase #7
+
+commit 18b56d78fb5f32acd1d2a027c139cb14df278e1c
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:24:13 2005 -0700
+
+    Rebase #6
+
+commit 754de5100e6921cb300704183c76e1c65e301beb
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:23:13 2005 -0700
+
+    Rebase #5
+
+commit 9fe752390a117faf8d6f239358fa821b464ff14d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:22:13 2005 -0700
+
+    Rebase #4
+
+commit 3e9bfb9468271e1707c357a5018af569c2a676d4
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:21:13 2005 -0700
+
+    Rebase #3
+
+commit d15adbaa5fdd6b03140db45c714342b2023152fa
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:20:13 2005 -0700
+
+    Rebase #2
+
+commit 82c2bc152fd9f785c269098549562d289347b2f8
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 16:19:13 2005 -0700
+
+    Rebase #1
+
+commit e8d9fe63116478156180f7026f6c181cc60432c5
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    Commit #0
+ok 1 - setup
+
+expecting success of 5400.2 'pack the source repository': 
+	git repack -a -d &&
+	git prune
+
+ok 2 - pack the source repository
+
+expecting success of 5400.3 'pack the destination repository': 
 	(
-		cd ulimit &&
-		for i in $(test_seq 64)
-		do
-			test_commit $i &&
-			run_with_limited_open_files test_might_fail git commit-graph write \
-				--split=no-merge --reachable || return 1
-		done
+		cd victim &&
+		git repack -a -d &&
+		git prune
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/ulimit/.git/
-[master (root-commit) b696783] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 87901d6] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master ea7a557] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master 93db791] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master 99a5a6e] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-[master e7f1c5a] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-[master 3e4d82c] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-[master a0e4c69] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-[master 053af5f] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-[master 7b3839e] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10.t
-[master ab7cebd] 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11.t
-[master 9b5149b] 12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12.t
-[master 51445d7] 13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13.t
-[master 600567c] 14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14.t
-[master d39117c] 15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 15.t
-[master 7ed88cc] 16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 16.t
-[master d4784f6] 17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 17.t
-[master d9af4e4] 18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 18.t
-[master d5314af] 19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 19.t
-[master 483a651] 20
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 20.t
-[master c00d2fe] 21
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 21.t
-[master 4b26ff2] 22
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 22.t
-[master ac29423] 23
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 23.t
-[master 2054315] 24
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 24.t
-[master 9d666a9] 25
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 25.t
-[master c1973a4] 26
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 26.t
-[master c40f0e0] 27
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 27.t
-[master 48fcf19] 28
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 28.t
-[master 0900777] 29
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 29.t
-[master 432f02e] 30
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 30.t
-[master 5688f4f] 31
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 31.t
-[master b34747d] 32
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 32.t
-[master 8ec35fe] 33
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 33.t
-[master 513eff2] 34
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 34.t
-[master c908ec0] 35
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 35.t
-[master cf1209b] 36
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 36.t
-[master 86ac877] 37
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 37.t
-[master c7d935d] 38
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 38.t
-[master 1fe243a] 39
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 39.t
-[master d93e5e9] 40
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 40.t
-[master f21b04c] 41
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 41.t
-[master b47e4d8] 42
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 42.t
-[master 43a5db7] 43
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 43.t
-[master 88e9031] 44
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 44.t
-[master 9c9b5bb] 45
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 45.t
-[master 5317a1b] 46
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 46.t
-[master 8e0d04e] 47
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 47.t
-[master 3d9b4d7] 48
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 48.t
-[master b6143e2] 49
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 49.t
-[master f62c708] 50
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 50.t
-[master 30e075a] 51
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 51.t
-[master aed8d05] 52
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 52.t
-[master eb37193] 53
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 53.t
-[master dff8022] 54
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 54.t
-[master d123fd0] 55
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 55.t
-[master 6833bbb] 56
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 56.t
-[master cd23a6c] 57
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 57.t
-[master 0ad3fbe] 58
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 58.t
-[master ec11693] 59
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 59.t
-[master df33166] 60
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 60.t
-[master 17100a5] 61
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 61.t
-[master 3cfb402] 62
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 62.t
-[master 4885c90] 63
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 63.t
-[master 1d3111d] 64
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 64.t
-ok 32 - handles file descriptor exhaustion
+ok 3 - pack the destination repository
 
-expecting success of 5324.33 'split commit-graph respects core.sharedrepository 0666': 
-		rm -rf $graphdir $infodir/commit-graph &&
-		git reset --hard commits/1 &&
-		test_config core.sharedrepository "$mode" &&
-		git commit-graph write --split --reachable &&
-		ls $graphdir/graph-*.graph >graph-files &&
-		test_line_count = 1 graph-files &&
-		echo "$modebits" >expect &&
-		test_modebits $graphdir/graph-*.graph >actual &&
-		test_cmp expect actual &&
-		test_modebits $graphdir/commit-graph-chain >actual &&
-		test_cmp expect actual
-	
-HEAD is now at d0dcf97 1
-ok 33 - split commit-graph respects core.sharedrepository 0666
+expecting success of 5400.4 'refuse pushing rewound head without --force': 
+	pushed_head=$(git rev-parse --verify main) &&
+	victim_orig=$(cd victim && git rev-parse --verify main) &&
+	test_must_fail git send-pack ./victim main &&
+	victim_head=$(cd victim && git rev-parse --verify main) &&
+	test "$victim_head" = "$victim_orig" &&
+	# this should update
+	git send-pack --force ./victim main &&
+	victim_head=$(cd victim && git rev-parse --verify main) &&
+	test "$victim_head" = "$pushed_head"
 
-expecting success of 5324.34 'split commit-graph respects core.sharedrepository 0600': 
-		rm -rf $graphdir $infodir/commit-graph &&
-		git reset --hard commits/1 &&
-		test_config core.sharedrepository "$mode" &&
-		git commit-graph write --split --reachable &&
-		ls $graphdir/graph-*.graph >graph-files &&
-		test_line_count = 1 graph-files &&
-		echo "$modebits" >expect &&
-		test_modebits $graphdir/graph-*.graph >actual &&
-		test_cmp expect actual &&
-		test_modebits $graphdir/commit-graph-chain >actual &&
-		test_cmp expect actual
-	
-HEAD is now at d0dcf97 1
-ok 34 - split commit-graph respects core.sharedrepository 0600
+To ./victim
+ ! [rejected]        main -> main (non-fast-forward)
+remote: warning: updating the current branch        
+To ./victim
+ + fbc8506...b1a1c97 main -> main (forced update)
+ok 4 - refuse pushing rewound head without --force
 
-expecting success of 5324.35 '--split=replace with partial Bloom data': 
-	rm -rf $graphdir $infodir/commit-graph &&
-	git reset --hard commits/3 &&
-	git rev-list -1 HEAD~2 >a &&
-	git rev-list -1 HEAD~1 >b &&
-	git commit-graph write --split=no-merge --stdin-commits --changed-paths <a &&
-	git commit-graph write --split=no-merge --stdin-commits <b &&
-	git commit-graph write --split=replace --stdin-commits --changed-paths <c &&
-	ls $graphdir/graph-*.graph >graph-files &&
-	test_line_count = 1 graph-files &&
-	verify_chain_files_exist $graphdir
+expecting success of 5400.5 'push can be used to delete a ref': 
+	( cd victim && git branch extra main ) &&
+	git send-pack ./victim :extra main &&
+	( cd victim &&
+	  test_must_fail git rev-parse --verify extra )
 
-HEAD is now at ddc8575 3
-ok 35 - --split=replace with partial Bloom data
+To ./victim
+ - [deleted]         extra
+fatal: Needed a single revision
+ok 5 - push can be used to delete a ref
 
-expecting success of 5324.36 'prevent regression for duplicate commits across layers': 
-	git init dup &&
-	git -C dup commit --allow-empty -m one &&
-	git -C dup -c core.commitGraph=false commit-graph write --split=no-merge --reachable 2>err &&
-	test_grep "attempting to write a commit-graph" err &&
-	git -C dup commit-graph write --split=no-merge --reachable &&
-	git -C dup commit --allow-empty -m two &&
-	git -C dup commit-graph write --split=no-merge --reachable &&
-	git -C dup commit --allow-empty -m three &&
-	git -C dup commit-graph write --split --reachable &&
-	git -C dup commit-graph verify
+expecting success of 5400.6 'refuse deleting push with denyDeletes': 
+	(
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyDeletes true &&
+		git branch extra main
+	) &&
+	test_must_fail git send-pack ./victim :extra main
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/dup/.git/
-[master (root-commit) a6701ea] one
- Author: A U Thor <author@example.com>
-warning: attempting to write a commit-graph, but 'core.commitGraph' is disabled
-[master f065053] two
- Author: A U Thor <author@example.com>
-[master 072bd61] three
- Author: A U Thor <author@example.com>
-ok 36 - prevent regression for duplicate commits across layers
+error: branch 'extra' not found
+remote: error: denying ref deletion for refs/heads/extra        
+To ./victim
+ ! [remote rejected] extra (deletion prohibited)
+ok 6 - refuse deleting push with denyDeletes
 
-expecting success of 5324.37 'setup repo for mixed generation commit-graph-chain': 
-	graphdir=".git/objects/info/commit-graphs" &&
-	test_oid_cache <<-EOF &&
-	oid_version sha1:1
-	oid_version sha256:2
-	EOF
-	git init mixed &&
+expecting success of 5400.7 'cannot override denyDeletes with git -c send-pack': 
 	(
-		cd mixed &&
-		git config core.commitGraph true &&
-		git config gc.writeCommitGraph false &&
-		for i in $(test_seq $NUM_FIRST_LAYER_COMMITS)
-		do
-			test_commit $i &&
-			git branch commits/$i || return 1
-		done &&
-		git -c commitGraph.generationVersion=2 commit-graph write --reachable --split &&
-		graph_read_expect $NUM_FIRST_LAYER_COMMITS &&
-		test_line_count = 1 $graphdir/commit-graph-chain &&
-		for i in $(test_seq $SECOND_LAYER_SEQUENCE_START $SECOND_LAYER_SEQUENCE_END)
-		do
-			test_commit $i &&
-			git branch commits/$i || return 1
-		done &&
-		git -c commitGraph.generationVersion=1 commit-graph write --reachable --split=no-merge &&
-		test_line_count = 2 $graphdir/commit-graph-chain &&
-		test-tool read-graph >output &&
-		cat >expect <<-EOF &&
-		header: 43475048 1 $(test_oid oid_version) 4 1
-		num_commits: $NUM_SECOND_LAYER_COMMITS
-		chunks: oid_fanout oid_lookup commit_metadata
-		options:
-		EOF
-		test_cmp expect output &&
-		git commit-graph verify &&
-		cat $graphdir/commit-graph-chain
-	)
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyDeletes true &&
+		git branch extra main
+	) &&
+	test_must_fail git -c receive.denyDeletes=false \
+					send-pack ./victim :extra main
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5324-split-commit-graph/mixed/.git/
-[master (root-commit) b696783] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 87901d6] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master ea7a557] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master 93db791] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master 99a5a6e] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-[master e7f1c5a] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-[master 3e4d82c] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-[master a0e4c69] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-[master 053af5f] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-[master 7b3839e] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10.t
-[master ab7cebd] 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11.t
-[master 9b5149b] 12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12.t
-[master 51445d7] 13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13.t
-[master 600567c] 14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14.t
-[master d39117c] 15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 15.t
-[master 7ed88cc] 16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 16.t
-[master d4784f6] 17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 17.t
-[master d9af4e4] 18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 18.t
-[master d5314af] 19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 19.t
-[master 483a651] 20
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 20.t
-[master c00d2fe] 21
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 21.t
-[master 4b26ff2] 22
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 22.t
-[master ac29423] 23
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 23.t
-[master 2054315] 24
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 24.t
-[master 9d666a9] 25
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 25.t
-[master c1973a4] 26
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 26.t
-[master c40f0e0] 27
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 27.t
-[master 48fcf19] 28
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 28.t
-[master 0900777] 29
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 29.t
-[master 432f02e] 30
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 30.t
-[master 5688f4f] 31
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 31.t
-[master b34747d] 32
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 32.t
-[master 8ec35fe] 33
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 33.t
-[master 513eff2] 34
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 34.t
-[master c908ec0] 35
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 35.t
-[master cf1209b] 36
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 36.t
-[master 86ac877] 37
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 37.t
-[master c7d935d] 38
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 38.t
-[master 1fe243a] 39
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 39.t
-[master d93e5e9] 40
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 40.t
-[master f21b04c] 41
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 41.t
-[master b47e4d8] 42
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 42.t
-[master 43a5db7] 43
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 43.t
-[master 88e9031] 44
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 44.t
-[master 9c9b5bb] 45
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 45.t
-[master 5317a1b] 46
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 46.t
-[master 8e0d04e] 47
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 47.t
-[master 3d9b4d7] 48
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 48.t
-[master b6143e2] 49
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 49.t
-[master f62c708] 50
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 50.t
-[master 30e075a] 51
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 51.t
-[master aed8d05] 52
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 52.t
-[master eb37193] 53
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 53.t
-[master dff8022] 54
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 54.t
-[master d123fd0] 55
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 55.t
-[master 6833bbb] 56
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 56.t
-[master cd23a6c] 57
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 57.t
-[master 0ad3fbe] 58
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 58.t
-[master ec11693] 59
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 59.t
-[master df33166] 60
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 60.t
-[master 17100a5] 61
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 61.t
-[master 3cfb402] 62
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 62.t
-[master 4885c90] 63
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 63.t
-[master 1d3111d] 64
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 64.t
-[master 5cad4d9] 65
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 65.t
-[master e0cddd6] 66
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 66.t
-[master 2356703] 67
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 67.t
-[master 6ee2712] 68
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 68.t
-[master 893dbc6] 69
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 69.t
-[master 47474f4] 70
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 70.t
-[master f7e0c47] 71
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 71.t
-[master 38ce058] 72
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 72.t
-[master aa3a53a] 73
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 73.t
-[master 4ec5ca2] 74
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 74.t
-[master 6d93ac7] 75
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 75.t
-[master 2c15d80] 76
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 76.t
-[master c28c815] 77
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 77.t
-[master cd8553d] 78
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 78.t
-[master b54c38f] 79
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 79.t
-[master 64acaa4] 80
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 80.t
-a107b8ee074ad1dc6006f594c1c01d8dbd30963c
-ad73577eaf380f4f00eb24a5152610a05f82c55b
-ok 37 - setup repo for mixed generation commit-graph-chain
+Deleted branch extra (was b1a1c97).
+remote: error: denying ref deletion for refs/heads/extra        
+To ./victim
+ ! [remote rejected] extra (deletion prohibited)
+ok 7 - cannot override denyDeletes with git -c send-pack
 
-expecting success of 5324.38 'do not write generation data chunk if not present on existing tip': 
-	git clone mixed mixed-no-gdat &&
+expecting success of 5400.8 'override denyDeletes with git -c receive-pack': 
 	(
-		cd mixed-no-gdat &&
-		for i in $(test_seq $THIRD_LAYER_SEQUENCE_START $THIRD_LAYER_SEQUENCE_END)
-		do
-			test_commit $i &&
-			git branch commits/$i || return 1
-		done &&
-		git commit-graph write --reachable --split=no-merge &&
-		test_line_count = 3 $graphdir/commit-graph-chain &&
-		test-tool read-graph >output &&
-		cat >expect <<-EOF &&
-		header: 43475048 1 $(test_oid oid_version) 4 2
-		num_commits: $NUM_THIRD_LAYER_COMMITS
-		chunks: oid_fanout oid_lookup commit_metadata
-		options:
-		EOF
-		test_cmp expect output &&
-		git commit-graph verify
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyDeletes true &&
+		git branch extra main
+	) &&
+	git send-pack \
+		--receive-pack="git -c receive.denyDeletes=false receive-pack" \
+		./victim :extra main
+
+Deleted branch extra (was b1a1c97).
+To ./victim
+ - [deleted]         extra
+ok 8 - override denyDeletes with git -c receive-pack
+
+expecting success of 5400.9 'denyNonFastforwards trumps --force': 
+	(
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyNonFastforwards true
+	) &&
+	victim_orig=$(cd victim && git rev-parse --verify main) &&
+	test_must_fail git send-pack --force ./victim main^:main &&
+	victim_head=$(cd victim && git rev-parse --verify main) &&
+	test "$victim_orig" = "$victim_head"
+
+error: branch 'extra' not found
+remote: warning: updating the current branch        
+remote: error: denying non-fast-forward refs/heads/main (you should pull first)        
+To ./victim
+ ! [remote rejected] main^ -> main (non-fast-forward)
+ok 9 - denyNonFastforwards trumps --force
+
+expecting success of 5400.10 'send-pack --all sends all branches': 
+	# make sure we have at least 2 branches with different
+	# values, just to be thorough
+	git branch other-branch HEAD^ &&
+
+	git init --bare all.git &&
+	git send-pack --all all.git &&
+	git for-each-ref refs/heads >expect &&
+	git -C all.git for-each-ref refs/heads >actual &&
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/all.git/
+To all.git
+ * [new branch]      main -> main
+ * [new branch]      other-branch -> other-branch
+ok 10 - send-pack --all sends all branches
+
+expecting success of 5400.11 'push --all excludes remote-tracking hierarchy': 
+	mkdir parent &&
+	(
+		cd parent &&
+		git init && : >file && git add file && git commit -m add
+	) &&
+	git clone parent child &&
+	(
+		cd child && git push --all
+	) &&
+	(
+		cd parent &&
+		test -z "$(git for-each-ref refs/remotes/origin)"
 	)
 
-Cloning into 'mixed-no-gdat'...
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) 9addffa] add
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Cloning into 'child'...
 done.
-[master 63fe9d8] 81
+Everything up-to-date
+ok 11 - push --all excludes remote-tracking hierarchy
+
+expecting success of 5400.12 'receive-pack runs auto-gc in remote repo': 
+	rm -rf parent child &&
+	git init parent &&
+	(
+		# Setup a repo with 2 packs
+		cd parent &&
+		echo "Some text" >file.txt &&
+		git add . &&
+		git commit -m "Initial commit" &&
+		git repack -adl &&
+		echo "Some more text" >>file.txt &&
+		git commit -a -m "Second commit" &&
+		git repack
+	) &&
+	cp -R parent child &&
+	(
+		# Set the child to auto-pack if more than one pack exists
+		cd child &&
+		git config gc.autopacklimit 1 &&
+		git config gc.autodetach false &&
+		git branch test_auto_gc &&
+		# And create a file that follows the temporary object naming
+		# convention for the auto-gc to remove
+		: >.git/objects/tmp_test_object &&
+		test-tool chmtime =-1209601 .git/objects/tmp_test_object
+	) &&
+	(
+		cd parent &&
+		echo "Even more text" >>file.txt &&
+		git commit -a -m "Third commit" &&
+		git send-pack ../child HEAD:refs/heads/test_auto_gc
+	) &&
+	test ! -e child/.git/objects/tmp_test_object
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) bdeab67] Initial commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 81.t
-[master 46b1698] 82
+ create mode 100644 file.txt
+[main 5404fd0] Second commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 82.t
-[master 3a3e636] 83
+[main 1f665f1] Third commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 83.t
-[master 8e168a7] 84
+To ../child
+   5404fd0..1f665f1  HEAD -> test_auto_gc
+ok 12 - receive-pack runs auto-gc in remote repo
+
+expecting success of 5400.13 'pushing explicit refspecs respects forcing': 
+	rewound_push_setup &&
+	parent_orig=$(cd parent && git rev-parse --verify main) &&
+	(
+		cd child &&
+		test_must_fail git send-pack ../parent \
+			refs/heads/main:refs/heads/main
+	) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	test "$parent_orig" = "$parent_head" &&
+	(
+		cd child &&
+		git send-pack ../parent \
+			+refs/heads/main:refs/heads/main
+	) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	child_head=$(cd child && git rev-parse --verify main) &&
+	test "$parent_head" = "$child_head"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) 14eeca9] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 84.t
-[master bc6216c] 85
+ create mode 100644 file
+[main 43ab524] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 85.t
-[master 41d97f7] 86
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'child'...
+done.
+HEAD is now at 14eeca9 one
+To ../parent
+ ! [rejected]        main -> main (non-fast-forward)
+remote: warning: updating the current branch        
+To ../parent
+ + 43ab524...14eeca9 main -> main (forced update)
+ok 13 - pushing explicit refspecs respects forcing
+
+expecting success of 5400.14 'pushing wildcard refspecs respects forcing': 
+	rewound_push_setup &&
+	parent_orig=$(cd parent && git rev-parse --verify main) &&
+	(
+		cd child &&
+		test_must_fail git send-pack ../parent \
+			"refs/heads/*:refs/heads/*"
+	) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	test "$parent_orig" = "$parent_head" &&
+	(
+		cd child &&
+		git send-pack ../parent \
+			"+refs/heads/*:refs/heads/*"
+	) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	child_head=$(cd child && git rev-parse --verify main) &&
+	test "$parent_head" = "$child_head"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) 14eeca9] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 86.t
-[master d27c973] 87
+ create mode 100644 file
+[main 43ab524] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 87.t
-ok 38 - do not write generation data chunk if not present on existing tip
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'child'...
+done.
+HEAD is now at 14eeca9 one
+To ../parent
+ ! [rejected]        main -> main (non-fast-forward)
+remote: warning: updating the current branch        
+To ../parent
+ + 43ab524...14eeca9 main -> main (forced update)
+ok 14 - pushing wildcard refspecs respects forcing
 
-expecting success of 5324.39 'do not write generation data chunk if the topmost remaining layer does not have generation data chunk': 
-	git clone mixed-no-gdat mixed-merge-no-gdat &&
+expecting success of 5400.15 'deny pushing to delete current branch': 
+	rewound_push_setup &&
 	(
-		cd mixed-merge-no-gdat &&
-		for i in $(test_seq $FOURTH_LAYER_SEQUENCE_START $FOURTH_LAYER_SEQUENCE_END)
-		do
-			test_commit $i &&
-			git branch commits/$i || return 1
-		done &&
-		git commit-graph write --reachable --split --size-multiple 1 &&
-		test_line_count = 3 $graphdir/commit-graph-chain &&
-		test-tool read-graph >output &&
-		cat >expect <<-EOF &&
-		header: 43475048 1 $(test_oid oid_version) 4 2
-		num_commits: $(($NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS))
-		chunks: oid_fanout oid_lookup commit_metadata
-		options:
-		EOF
-		test_cmp expect output &&
-		git commit-graph verify
+		cd child &&
+		test_must_fail git send-pack ../parent :refs/heads/main 2>errs
 	)
 
-Cloning into 'mixed-merge-no-gdat'...
-done.
-[master 6eb0fbf] 88
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 88.t
-[master 12abc91] 89
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 89.t
-[master 2c8ff3c] 90
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 90.t
-[master dc8351e] 91
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 91.t
-[master 59950af] 92
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 92.t
-[master 00ca893] 93
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 93.t
-[master 0d371ea] 94
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
+[main (root-commit) 14eeca9] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 94.t
-[master cfa8187] 95
+ create mode 100644 file
+[main 43ab524] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 95.t
-ok 39 - do not write generation data chunk if the topmost remaining layer does not have generation data chunk
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Cloning into 'child'...
+done.
+HEAD is now at 14eeca9 one
+ok 15 - deny pushing to delete current branch
 
-expecting success of 5324.40 'write generation data chunk if topmost remaining layer has generation data chunk': 
-	git clone mixed-merge-no-gdat mixed-merge-gdat &&
+expecting success of 5400.16 'receive-pack de-dupes .have lines': 
+	git init shared &&
+	git -C shared commit --allow-empty -m both &&
+	git clone -s shared fork &&
 	(
-		cd mixed-merge-gdat &&
-		for i in $(test_seq $FIFTH_LAYER_SEQUENCE_START $FIFTH_LAYER_SEQUENCE_END)
-		do
-			test_commit $i &&
-			git branch commits/$i || return 1
-		done &&
-		git commit-graph write --reachable --split --size-multiple 1 &&
-		test_line_count = 2 $graphdir/commit-graph-chain &&
-		test-tool read-graph >output &&
-		cat >expect <<-EOF &&
-		header: 43475048 1 $(test_oid oid_version) 5 1
-		num_commits: $(($NUM_SECOND_LAYER_COMMITS + $NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS + $NUM_FIFTH_LAYER_COMMITS))
-		chunks: oid_fanout oid_lookup commit_metadata generation_data
-		options: read_generation_data
-		EOF
-		test_cmp expect output
-	)
+		cd shared &&
+		git checkout -b only-shared &&
+		git commit --allow-empty -m only-shared &&
+		git update-ref refs/heads/foo HEAD
+	) &&
 
-Cloning into 'mixed-merge-gdat'...
+	# Notable things in this expectation:
+	#  - local refs are not de-duped
+	#  - .have does not duplicate locals
+	#  - .have does not duplicate itself
+	local=$(git -C fork rev-parse HEAD) &&
+	shared=$(git -C shared rev-parse only-shared) &&
+	cat >expect <<-EOF &&
+	$local refs/heads/main
+	$local refs/remotes/origin/HEAD
+	$local refs/remotes/origin/main
+	$shared .have
+	EOF
+
+	GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \
+	git push \
+		--receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
+		fork HEAD:foo &&
+	extract_ref_advertisement <trace >refs &&
+	test_cmp expect refs
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/shared/.git/
+[main (root-commit) 5285e17] both
+ Author: A U Thor <author@example.com>
+Cloning into 'fork'...
 done.
-[master a22bc18] 96
+Switched to a new branch 'only-shared'
+[only-shared 53d9066] only-shared
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 96.t
-[master dc189f8] 97
+To fork
+ * [new branch]      HEAD -> foo
+ok 16 - receive-pack de-dupes .have lines
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5407-post-rewrite-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5407-post-rewrite-hook/.git/
+expecting success of 5407.1 'setup': 
+	test_commit A foo A &&
+	test_commit B foo B &&
+	test_commit C foo C &&
+	test_commit D foo D &&
+	git checkout A^0 &&
+	test_commit E bar E &&
+	test_commit F foo F &&
+	git checkout B &&
+	git merge E &&
+	git tag merge-E &&
+	test_commit G G &&
+	test_commit H H &&
+	test_commit I I &&
+	git checkout main &&
+
+	test_hook --setup post-rewrite <<-EOF
+	echo \$@ > "$TRASH_DIRECTORY"/post-rewrite.args
+	cat > "$TRASH_DIRECTORY"/post-rewrite.data
+	EOF
+
+[main (root-commit) be6e19b] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 97.t
-[master 7ef260e] 98
+ create mode 100644 foo
+[main df02547] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 98.t
-[master e31cd18] 99
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2362ae8] C
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 99.t
-[master df7c394] 100
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main babc8a4] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 100.t
-[master 914897f] 101
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at be6e19b A
+[detached HEAD 5baa167] E
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 101.t
-[master c34363e] 102
+ create mode 100644 bar
+[detached HEAD 38c24e8] F
  Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Previous HEAD position was 38c24e8 F
+HEAD is now at df02547 B
+Merge made by the 'ort' strategy.
+ bar | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 102.t
-[master efcd50d] 103
+ create mode 100644 bar
+[detached HEAD 8b1f855] G
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 103.t
-[master ae03b58] 104
+ create mode 100644 G
+[detached HEAD 33a20ae] H
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 104.t
-[master 2c87974] 105
+ create mode 100644 H
+[detached HEAD dda16b5] I
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 105.t
-[master be2bb78] 106
+ create mode 100644 I
+Previous HEAD position was dda16b5 I
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 5407.2 'git commit --amend': 
+	clear_hook_input &&
+	echo "D new message" > newmsg &&
+	oldsha=$(git rev-parse HEAD^0) &&
+	git commit -Fnewmsg --amend &&
+	echo amend > expected.args &&
+	echo $oldsha $(git rev-parse HEAD^0) > expected.data &&
+	verify_hook_input
+
+[main ebd82eb] D new message
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 106.t
-[master 98de601] 107
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - git commit --amend
+
+expecting success of 5407.3 'git commit --amend --no-post-rewrite': 
+	clear_hook_input &&
+	echo "D new message again" > newmsg &&
+	git commit --no-post-rewrite -Fnewmsg --amend &&
+	test ! -f post-rewrite.args &&
+	test ! -f post-rewrite.data
+
+[main 5e7f7a8] D new message again
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 107.t
-[master e87578e] 108
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - git commit --amend --no-post-rewrite
+
+expecting success of 5407.4 'git rebase --apply': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase --apply --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+First, rewinding head to replay your work on top of it...
+Applying: C
+Using index info to reconstruct a base tree...
+M	foo
+Falling back to patching base and 3-way merge...
+Merging:
+be6e19b A
+virtual C
+found 1 common ancestor:
+virtual e6a635ee70776f6585de405639ebebd74da5c390
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 C
+Applying: C
+Applying: D
+ok 4 - git rebase --apply
+
+expecting success of 5407.5 'git rebase --apply --skip': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase --apply --onto A B &&
+	test_must_fail git rebase --skip &&
+	echo D > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+First, rewinding head to replay your work on top of it...
+Applying: C
+Using index info to reconstruct a base tree...
+M	foo
+Falling back to patching base and 3-way merge...
+Merging:
+be6e19b A
+virtual C
+found 1 common ancestor:
+virtual e6a635ee70776f6585de405639ebebd74da5c390
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0001 C
+Applying: D
+Using index info to reconstruct a base tree...
+M	foo
+Falling back to patching base and 3-way merge...
+Merging:
+be6e19b A
+virtual D
+found 1 common ancestor:
+virtual a0d64960e32dc5d0cf8eff7ded11a413a31c0891
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0002 D
+Applying: D
+ok 5 - git rebase --apply --skip
+
+expecting success of 5407.6 'git rebase --apply --skip the last one': 
+	git reset --hard F &&
+	clear_hook_input &&
+	test_must_fail git rebase --apply --onto D A &&
+	git rebase --skip &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse E) $(git rev-parse HEAD)
+	$(git rev-parse F) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at 38c24e8 F
+First, rewinding head to replay your work on top of it...
+Applying: E
+Applying: F
+Using index info to reconstruct a base tree...
+M	foo
+Falling back to patching base and 3-way merge...
+Merging:
+0aed93c E
+virtual F
+found 1 common ancestor:
+virtual bdb58bd8ea55127260d069a5e7ee2995726633f9
+Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: Failed to merge in the changes.
+hint: Use 'git am --show-current-patch=diff' to see the failed patch
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Patch failed at 0002 F
+ok 6 - git rebase --apply --skip the last one
+
+expecting success of 5407.7 'git rebase -m': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase -m --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 2362ae8... C
+[detached HEAD 67a07b9] C
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 108.t
-[master 7094c09] 109
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/main.
+ok 7 - git rebase -m
+
+expecting success of 5407.8 'git rebase -m --skip': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase -m --onto A B &&
+	test_must_fail git rebase --skip &&
+	echo D > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 2362ae8... C
+Rebasing (2/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply babc8a4... D
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply babc8a4... D
+[detached HEAD 9aefc10] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 109.t
-[master c87c1b7] 110
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
                                                                                
Successfully rebased and updated refs/heads/main.
+ok 8 - git rebase -m --skip
+
+expecting success of 5407.9 'git rebase with implicit use of merge backend': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase --keep-empty --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 2362ae8... C
+[detached HEAD 67a07b9] C
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 110.t
-[master 4501713] 111
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/main.
+ok 9 - git rebase with implicit use of merge backend
+
+expecting success of 5407.10 'git rebase --skip with implicit use of merge backend': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_must_fail git rebase --keep-empty --onto A B &&
+	test_must_fail git rebase --skip &&
+	echo D > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
+
+HEAD is now at babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 2362ae8... C
+Rebasing (2/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply babc8a4... D
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply babc8a4... D
+[detached HEAD 9aefc10] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 111.t
-ok 40 - write generation data chunk if topmost remaining layer has generation data chunk
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
                                                                                
Successfully rebased and updated refs/heads/main.
+ok 10 - git rebase --skip with implicit use of merge backend
+
+expecting success of 5407.11 'git rebase with failed pick': 
+	clear_hook_input &&
+	cat >todo <<-\EOF &&
+	exec >bar
+	merge -C merge-E E
+	exec >G
+	pick G
+	exec >H 2>I
+	pick H
+	fixup I
+	EOF
 
-expecting success of 5324.41 'write generation data chunk when commit-graph chain is replaced': 
-	git clone mixed mixed-replace &&
 	(
-		cd mixed-replace &&
-		git commit-graph write --reachable --split=replace &&
-		test_path_is_file $graphdir/commit-graph-chain &&
-		test_line_count = 1 $graphdir/commit-graph-chain &&
-		verify_chain_files_exist $graphdir &&
-		graph_read_expect $(($NUM_FIRST_LAYER_COMMITS + $NUM_SECOND_LAYER_COMMITS)) &&
-		git commit-graph verify
-	)
+		set_replace_editor todo &&
+		test_must_fail git rebase -i D D 2>err
+	) &&
+	grep "would be overwritten" err &&
+	rm bar &&
 
-Cloning into 'mixed-replace'...
-done.
-ok 41 - write generation data chunk when commit-graph chain is replaced
+	test_must_fail git rebase --continue 2>err &&
+	grep "would be overwritten" err &&
+	rm G &&
 
-# passed all 41 test(s)
-1..41
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5408-send-pack-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+	test_must_fail git rebase --continue 2>err &&
+	grep "would be overwritten" err &&
+	rm H &&
 
-ok 1 - setup refs
+	test_must_fail git rebase --continue 2>err &&
+	grep "would be overwritten" err &&
+	rm I &&
 
-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
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse merge-E) $(git rev-parse HEAD~2)
+	$(git rev-parse G) $(git rev-parse HEAD~1)
+	$(git rev-parse H) $(git rev-parse HEAD)
+	$(git rev-parse I) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+rebase -i script after editing:
+exec >bar
+merge -C merge-E E
+exec >G
+pick G
+exec >H 2>I
+pick H
+fixup I
+Rebasing (2/7)
error: The following untracked working tree files would be overwritten by merge:
+Rebasing (5/8)
error: The following untracked working tree files would be overwritten by merge:
+Rebasing (8/9)
error: The following untracked working tree files would be overwritten by merge:
+Rebasing (9/10)
Rebasing (10/10)
error: The following untracked working tree files would be overwritten by merge:
+Rebasing (11/11)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 11 - git rebase with failed pick
 
-expecting success of 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
+expecting success of 5407.12 'git rebase -i (unchanged)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_fail_interactive_rebase "1 2" --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 C
+pick babc8a4 D
 
-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
+rebase -i script after editing:
+pick 2362ae8 C
+pick babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 2362ae8... C
+[detached HEAD 67a07b9] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 12 - git rebase -i (unchanged)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 5407.13 'git rebase -i (skip)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_fail_interactive_rebase "2" --onto A B &&
+	echo D > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
 
-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
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 C
+pick babc8a4 D
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+rebase -i script after editing:
+pick babc8a4 D
+Rebasing (1/1)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply babc8a4... D
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply babc8a4... D
+[detached HEAD 9aefc10] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
                                                                                
Successfully rebased and updated detached HEAD.
+ok 13 - git rebase -i (skip)
 
-expecting success of 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
+expecting success of 5407.14 'git rebase -i (squash)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	test_fail_interactive_rebase "1 squash 2" --onto A B &&
+	echo C > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 C
+pick babc8a4 D
 
-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
+rebase -i script after editing:
+pick 2362ae8 C
+squash babc8a4 D
+Rebasing (1/2)
Auto-merging foo
+CONFLICT (content): Merge conflict in foo
+error: could not apply 2362ae8... C
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 2362ae8... C
+[detached HEAD 67a07b9] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (2/2)
[detached HEAD 1018f76] C
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
                                                                                
Successfully rebased and updated detached HEAD.
+ok 14 - git rebase -i (squash)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 5407.15 'git rebase -i (fixup without conflict)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	FAKE_LINES="1 fixup 2" git rebase -i B &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
 
-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)
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 C
+pick babc8a4 D
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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>...)
+rebase -i script after editing:
+pick 2362ae8 C
+fixup babc8a4 D
+Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 15 - git rebase -i (fixup without conflict)
 
-    -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
+expecting success of 5407.16 'git rebase -i (double edit)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	FAKE_LINES="edit 1 edit 2" git rebase -i B &&
+	git rebase --continue &&
+	echo something > foo &&
+	git add foo &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
+	EOF
+	verify_hook_input
 
-ok 8 - refspecs and --mirror do not mix (cmdline)
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 C
+pick babc8a4 D
 
-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
+rebase -i script after editing:
+edit 2362ae8 C
+edit babc8a4 D
+Rebasing (1/2)

                                                                                
Stopped at 2362ae8...  C
+You can amend the commit now, with
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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>...)
+  git commit --amend 
 
-    -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
+Once you are satisfied with your changes, run
 
-ok 9 - refspecs and --mirror do not mix (stdin)
+  git rebase --continue
+Rebasing (2/2)

                                                                                
Stopped at babc8a4...  D
+You can amend the commit now, with
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5410-receive-pack-alternates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5410-receive-pack-alternates/.git/
-expecting success of 5410.1 'setup': 
-	test_commit base &&
-	git clone -s --bare . fork &&
-	git checkout -b public/branch main &&
-	test_commit public &&
-	git checkout -b private/branch main &&
-	test_commit private
+  git commit --amend 
 
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Cloning into bare repository 'fork'...
-done.
-Switched to a new branch 'public/branch'
-[public/branch d7bb355] public
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 public.t
-Switched to a new branch 'private/branch'
-[private/branch 9725dbe] private
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD 52eb20e] D
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 private.t
-ok 1 - setup
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
                                                                                
Successfully rebased and updated detached HEAD.
+ok 16 - git rebase -i (double edit)
 
-expecting success of 5410.2 'with core.alternateRefsCommand': 
-	write_script fork/alternate-refs <<-\EOF &&
-		git --git-dir="$1" for-each-ref \
-			--format="%(objectname)" \
-			refs/heads/public/
+expecting success of 5407.17 'git rebase -i (exec)': 
+	git reset --hard D &&
+	clear_hook_input &&
+	FAKE_LINES="edit 1 exec_false 2" git rebase -i B &&
+	echo something >bar &&
+	git add bar &&
+	# Fails because of exec false
+	test_must_fail git rebase --continue &&
+	git rebase --continue &&
+	echo rebase >expected.args &&
+	cat >expected.data <<-EOF &&
+	$(git rev-parse C) $(git rev-parse HEAD^)
+	$(git rev-parse D) $(git rev-parse HEAD)
 	EOF
-	test_config -C fork core.alternateRefsCommand ./alternate-refs &&
-	git rev-parse public/branch >expect &&
-	printf "0000" | git receive-pack fork >actual &&
-	extract_haves <actual >actual.haves &&
-	test_cmp expect actual.haves
+	verify_hook_input
 
-ok 2 - with core.alternateRefsCommand
+HEAD is now at babc8a4 D
+rebase -i script before editing:
+pick 2362ae8 C
+pick babc8a4 D
 
-expecting success of 5410.3 'with core.alternateRefsPrefixes': 
-	test_config -C fork core.alternateRefsPrefixes "refs/heads/private" &&
-	git rev-parse private/branch >expect &&
-	printf "0000" | git receive-pack fork >actual &&
-	extract_haves <actual >actual.haves &&
-	test_cmp expect actual.haves
+rebase -i script after editing:
+edit 2362ae8 C
+exec false
+pick babc8a4 D
+Rebasing (1/3)

                                                                                
Stopped at 2362ae8...  C
+You can amend the commit now, with
 
-ok 3 - with core.alternateRefsPrefixes
+  git commit --amend 
 
-# passed all 3 test(s)
-1..3
+Once you are satisfied with your changes, run
+
+  git rebase --continue
+[detached HEAD b4a6059] C
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:15:13 2005 -0700
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 bar
+Rebasing (2/3)

                                                                                
Executing: false
+warning: execution failed: false
+You can fix the problem, and then run
+
+  git rebase --continue
+
+
+Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
+ok 17 - git rebase -i (exec)
+
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5409-colorize-remote-messages.sh ***
@@ -311684,3208 +312879,5399 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5400-send-pack.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/.git/
-expecting success of 5400.1 'setup': 
-	test_tick &&
-	mkdir mozart mozart/is &&
-	echo "Commit #0" >mozart/is/pink &&
-	git update-index --add mozart/is/pink &&
-	tree=$(git write-tree) &&
-	commit=$(echo "Commit #0" | git commit-tree $tree) &&
-	zero=$commit &&
-	parent=$zero &&
-	i=0 &&
-	while test $i -le $cnt
-	do
-		i=$(($i+1)) &&
-		test_tick &&
-		echo "Commit #$i" >mozart/is/pink &&
-		git update-index --add mozart/is/pink &&
-		tree=$(git write-tree) &&
-		commit=$(echo "Commit #$i" |
-			 git commit-tree $tree -p $parent) &&
-		git update-ref refs/tags/commit$i $commit &&
-		parent=$commit || return 1
-	done &&
-	git update-ref HEAD "$commit" &&
-	git clone ./. victim &&
-	( cd victim && git config receive.denyCurrentBranch warn && git log ) &&
-	git update-ref HEAD "$zero" &&
-	parent=$zero &&
-	i=0 &&
-	while test $i -le $cnt
-	do
-		i=$(($i+1)) &&
-		test_tick &&
-		echo "Rebase #$i" >mozart/is/pink &&
-		git update-index --add mozart/is/pink &&
-		tree=$(git write-tree) &&
-		commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
-		git update-ref refs/tags/rebase$i $commit &&
-		parent=$commit || return 1
-	done &&
-	git update-ref HEAD "$commit" &&
-	echo Rebase &&
-	git log
-Cloning into 'victim'...
+*** t5410-receive-pack-alternates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5410-receive-pack-alternates/.git/
+expecting success of 5410.1 'setup': 
+	test_commit base &&
+	git clone -s --bare . fork &&
+	git checkout -b public/branch main &&
+	test_commit public &&
+	git checkout -b private/branch main &&
+	test_commit private
+
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+Cloning into bare repository 'fork'...
 done.
-commit fbc850672173770f17d48f9f2dfcb286d30b70cb
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:18:13 2005 -0700
+Switched to a new branch 'public/branch'
+[public/branch d7bb355] public
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 public.t
+Switched to a new branch 'private/branch'
+[private/branch 9725dbe] private
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 private.t
+ok 1 - setup
 
-    Commit #65
+expecting success of 5410.2 'with core.alternateRefsCommand': 
+	write_script fork/alternate-refs <<-\EOF &&
+		git --git-dir="$1" for-each-ref \
+			--format="%(objectname)" \
+			refs/heads/public/
+	EOF
+	test_config -C fork core.alternateRefsCommand ./alternate-refs &&
+	git rev-parse public/branch >expect &&
+	printf "0000" | git receive-pack fork >actual &&
+	extract_haves <actual >actual.haves &&
+	test_cmp expect actual.haves
 
-commit 940af75942cf34a9fc156d9dc79c8c370e4c3247
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:17:13 2005 -0700
+ok 2 - with core.alternateRefsCommand
 
-    Commit #64
+expecting success of 5410.3 'with core.alternateRefsPrefixes': 
+	test_config -C fork core.alternateRefsPrefixes "refs/heads/private" &&
+	git rev-parse private/branch >expect &&
+	printf "0000" | git receive-pack fork >actual &&
+	extract_haves <actual >actual.haves &&
+	test_cmp expect actual.haves
 
-commit 1fe3a3ebbeaddd1e503ee516a5433a8ebe097112
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:16:13 2005 -0700
+ok 3 - with core.alternateRefsPrefixes
 
-    Commit #63
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5326-multi-pack-bitmaps.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/.git/
+expecting success of 5326.1 'setup test_repository': 
+		rm -rf * .git &&
+		git init &&
+		git config pack.writeBitmapLookupTable false
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/.git/
+ok 1 - setup test_repository
 
-commit 0c78ec36deec72f8c6d458db5b753249a5447dec
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:15:13 2005 -0700
+expecting success of 5326.2 'setup repo with moderate-sized history': 
+		test_commit_bulk --id=file 10 &&
+		git branch -M second &&
+		git checkout -b other HEAD~5 &&
+		test_commit_bulk --id=side 10 &&
 
-    Commit #62
+		# add complicated history setup, including merges and
+		# ambiguous merge-bases
 
-commit 0ad1da14d02ef96f2c1cb8403952ffddeaaca439
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:14:13 2005 -0700
+		git checkout -b merge-left other~2 &&
+		git merge second~2 -m "merge-left" &&
 
-    Commit #61
+		git checkout -b merge-right second~1 &&
+		git merge other~1 -m "merge-right" &&
 
-commit 15278e4b9b51ca8e00785fff5592d9ba7b8012ea
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:13:13 2005 -0700
+		git checkout -b octo-second second &&
+		git merge merge-left merge-right -m "octopus-second" &&
 
-    Commit #60
+		git checkout -b octo-other other &&
+		git merge merge-left merge-right -m "octopus-other" &&
 
-commit d92539d97407cae3ac62cdd1992188ce96a04699
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:12:13 2005 -0700
+		git checkout other &&
+		git merge octo-other -m "pull octopus" &&
 
-    Commit #59
+		git checkout second &&
+		git merge octo-second -m "pull octopus" &&
 
-commit eeddc69755cde0046432203191b431846124c36d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:11:13 2005 -0700
+		# Remove these branches so they are not selected
+		# as bitmap tips
+		git branch -D merge-left &&
+		git branch -D merge-right &&
+		git branch -D octo-other &&
+		git branch -D octo-second &&
 
-    Commit #58
+		# add padding to make these merges less interesting
+		# and avoid having them selected for bitmaps
+		test_commit_bulk --id=file 100 &&
+		git checkout other &&
+		test_commit_bulk --id=side 100 &&
+		git checkout second &&
 
-commit 9481eb1cebd4e35080a85eaac0a389e436d174d9
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:10:13 2005 -0700
+		bitmaptip=$(git rev-parse second) &&
+		blob=$(echo tagged-blob | git hash-object -w --stdin) &&
+		git tag tagged-blob $blob
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           30 (         0 duplicates                  )
+      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           10 (         0 duplicates          9 deltas of          9 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:             10
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =       2283 /       2283
+---------------------------------------------------------------------
 
-    Commit #57
+Switched to a new branch 'other'
+87e15289879c5c34553169b2be5c9d6b111519b2
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           30 (         0 duplicates                  )
+      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           10 (         0 duplicates          9 deltas of          9 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:             15
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         16
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       4747 /       4747
+---------------------------------------------------------------------
 
-commit 9ab7d0c3f85908c1624cc58f67c236b2e5d53c5d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:09:13 2005 -0700
+Switched to a new branch 'merge-left'
+Merge made by the 'ort' strategy.
+ file-6.t | 1 +
+ file-7.t | 1 +
+ file-8.t | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 file-6.t
+ create mode 100644 file-7.t
+ create mode 100644 file-8.t
+Switched to a new branch 'merge-right'
+Merge made by the 'ort' strategy.
+ side-1.t | 1 +
+ side-2.t | 1 +
+ side-3.t | 1 +
+ side-4.t | 1 +
+ side-5.t | 1 +
+ side-6.t | 1 +
+ side-7.t | 1 +
+ side-8.t | 1 +
+ side-9.t | 1 +
+ 9 files changed, 9 insertions(+)
+ create mode 100644 side-1.t
+ create mode 100644 side-2.t
+ create mode 100644 side-3.t
+ create mode 100644 side-4.t
+ create mode 100644 side-5.t
+ create mode 100644 side-6.t
+ create mode 100644 side-7.t
+ create mode 100644 side-8.t
+ create mode 100644 side-9.t
+Switched to a new branch 'octo-second'
+Trying simple merge with merge-left
+Trying simple merge with merge-right
+Merge made by the 'octopus' strategy.
+ side-1.t | 1 +
+ side-2.t | 1 +
+ side-3.t | 1 +
+ side-4.t | 1 +
+ side-5.t | 1 +
+ side-6.t | 1 +
+ side-7.t | 1 +
+ side-8.t | 1 +
+ side-9.t | 1 +
+ 9 files changed, 9 insertions(+)
+ create mode 100644 side-1.t
+ create mode 100644 side-2.t
+ create mode 100644 side-3.t
+ create mode 100644 side-4.t
+ create mode 100644 side-5.t
+ create mode 100644 side-6.t
+ create mode 100644 side-7.t
+ create mode 100644 side-8.t
+ create mode 100644 side-9.t
+Switched to a new branch 'octo-other'
+Trying simple merge with merge-left
+Trying simple merge with merge-right
+Merge made by the 'octopus' strategy.
+ file-6.t | 1 +
+ file-7.t | 1 +
+ file-8.t | 1 +
+ file-9.t | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 file-6.t
+ create mode 100644 file-7.t
+ create mode 100644 file-8.t
+ create mode 100644 file-9.t
+Switched to branch 'other'
+Updating 90a1514..63e663a
+Fast-forward (no commit created; -m option ignored)
+ file-6.t | 1 +
+ file-7.t | 1 +
+ file-8.t | 1 +
+ file-9.t | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 file-6.t
+ create mode 100644 file-7.t
+ create mode 100644 file-8.t
+ create mode 100644 file-9.t
+Switched to branch 'second'
+Updating 6a83e25..58d166b
+Fast-forward (no commit created; -m option ignored)
+ side-1.t | 1 +
+ side-2.t | 1 +
+ side-3.t | 1 +
+ side-4.t | 1 +
+ side-5.t | 1 +
+ side-6.t | 1 +
+ side-7.t | 1 +
+ side-8.t | 1 +
+ side-9.t | 1 +
+ 9 files changed, 9 insertions(+)
+ create mode 100644 side-1.t
+ create mode 100644 side-2.t
+ create mode 100644 side-3.t
+ create mode 100644 side-4.t
+ create mode 100644 side-5.t
+ create mode 100644 side-6.t
+ create mode 100644 side-7.t
+ create mode 100644 side-8.t
+ create mode 100644 side-9.t
+Deleted branch merge-left (was f47c2b6).
+Deleted branch merge-right (was ba9a821).
+Deleted branch octo-other (was 63e663a).
+Deleted branch octo-second (was 58d166b).
+58d166b12a4ce065824c4a21dd38aef9f2d94667
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          280 (        10 duplicates                  )
+      blobs  :           90 (        10 duplicates          0 deltas of          0 attempts)
+      trees  :           90 (         0 duplicates         88 deltas of         88 attempts)
+      commits:          100 (         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:            109
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =        102
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      26599 /      26599
+---------------------------------------------------------------------
 
-    Commit #56
+Switched to branch 'other'
+63e663a9348fa8f46b3f8835cb82274158356e6a
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          280 (        10 duplicates                  )
+      blobs  :           90 (        10 duplicates          0 deltas of          0 attempts)
+      trees  :           90 (         0 duplicates         88 deltas of         88 attempts)
+      commits:          100 (         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:            109
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =        102
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      26765 /      26765
+---------------------------------------------------------------------
 
-commit 070f3c8d7d43c5b9df69498416664b994a36a3e7
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:08:13 2005 -0700
+Switched to branch 'second'
+ok 2 - setup repo with moderate-sized history
 
-    Commit #55
+expecting success of 5326.3 'create single-pack midx with bitmaps': 
+		git repack -ad &&
+		git multi-pack-index write --bitmap &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	
+ok 3 - create single-pack midx with bitmaps
 
-commit a2f3e1ffc14adb111494e37e857de5428da7230e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:07:13 2005 -0700
+expecting success of 5326.4 'reverse index exists (midx)': 
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+			git rev-list --test-bitmap "$commit" &&
 
-    Commit #54
+		if test "rev" = "$kind"
+		then
+			test_path_is_file $midx-$(midx_checksum $objdir).rev
+		fi &&
+		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
+	
+Bitmap v1 test (106 entries loaded)
+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":"20241114T193615.407675Z-H5c947e1c-P000006af","thread":"main","time":"2024-11-14T19:36:15.408713Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001212,"t_rel":0.001212,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+ok 4 - reverse index exists (midx)
 
-commit 373ca332c114a8af8262474c0b750133d11c3467
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:06:13 2005 -0700
+expecting success of 5326.5 'rev-list --test-bitmap verifies bitmaps': 
+		git rev-list --test-bitmap HEAD
+	
+Bitmap v1 test (106 entries loaded)
+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!
+ok 5 - rev-list --test-bitmap verifies bitmaps
 
-    Commit #53
+expecting success of 5326.6 'counting commits via bitmap (full bitmap, second)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 6 - counting commits via bitmap (full bitmap, second)
 
-commit abddf6c6693561aed51ed7308754360720399450
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:05:13 2005 -0700
+expecting success of 5326.7 'counting partial commits via bitmap (full 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 7 - counting partial commits via bitmap (full bitmap, second)
 
-    Commit #52
+expecting success of 5326.8 'counting commits with limit (full 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 8 - counting commits with limit (full bitmap, second)
 
-commit e9dc99c35123a1d9dd416eb32975f518f7e52776
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:04:13 2005 -0700
+expecting success of 5326.9 'counting non-linear history (full bitmap, second)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 9 - counting non-linear history (full bitmap, second)
 
-    Commit #51
+expecting success of 5326.10 'counting commits with limiting (full 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 10 - counting commits with limiting (full bitmap, second)
 
-commit 3efc54f7bd18addc186e565f051c1f57ae499205
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:03:13 2005 -0700
+expecting success of 5326.11 'counting objects via bitmap (full bitmap, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 11 - counting objects via bitmap (full bitmap, second)
 
-    Commit #50
+expecting success of 5326.12 'enumerate commits (full bitmap, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 12 - enumerate commits (full bitmap, second)
 
-commit 288f90defdf9f8fe6cafb95c4a53d41e3d2914bc
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:02:13 2005 -0700
+expecting success of 5326.13 'enumerate --objects (full 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 4101, line 101
+ok 13 - enumerate --objects (full bitmap, second)
 
-    Commit #49
+expecting success of 5326.14 'bitmap --objects handles non-commit objects (full bitmap, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 14 - bitmap --objects handles non-commit objects (full bitmap, second)
 
-commit 1dfae6503af0ff1c353be39162beb34744556d2d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:01:13 2005 -0700
+expecting success of 5326.15 'counting commits via bitmap (full bitmap, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 15 - counting commits via bitmap (full bitmap, other)
 
-    Commit #48
+expecting success of 5326.16 'counting partial commits via bitmap (full 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 16 - counting partial commits via bitmap (full bitmap, other)
 
-commit c21493faada856b0f2ac0b85de568ffd9f21ad09
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:00:13 2005 -0700
+expecting success of 5326.17 'counting commits with limit (full 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 17 - counting commits with limit (full bitmap, other)
 
-    Commit #47
+expecting success of 5326.18 'counting non-linear history (full bitmap, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 18 - counting non-linear history (full bitmap, other)
 
-commit 0e48e7bf42f7c84d1039794461501f4d3e6bef59
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:59:13 2005 -0700
+expecting success of 5326.19 'counting commits with limiting (full 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 19 - counting commits with limiting (full bitmap, other)
 
-    Commit #46
+expecting success of 5326.20 'counting objects via bitmap (full bitmap, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 20 - counting objects via bitmap (full bitmap, other)
 
-commit bb0ff093c62b37247e4b570e41e57fa123962ee8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:58:13 2005 -0700
+expecting success of 5326.21 '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 21 - enumerate commits (full bitmap, other)
 
-    Commit #45
+expecting success of 5326.22 '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 22 - enumerate --objects (full bitmap, other)
 
-commit a2d17f74bfdf7acc0c40e3b228d57a4d68a9c01b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:57:13 2005 -0700
+expecting success of 5326.23 '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 23 - bitmap --objects handles non-commit objects (full bitmap, other)
 
-    Commit #44
+expecting success of 5326.24 '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 24 - clone from bitmapped repository
 
-commit cbac9fdcb0113800bc9ff62d8c1a0cfd61815b11
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:56:13 2005 -0700
+expecting success of 5326.25 '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 25 - partial clone from bitmapped repository
 
-    Commit #43
+expecting success of 5326.26 'setup further non-bitmapped commits': 
+		test_commit_bulk --id=further 10
+	
+4b27f21bf7560051516fe49b50eb4063d0ea6f90
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           30 (         0 duplicates                  )
+      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           10 (         0 duplicates          9 deltas of          9 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:            119
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         16
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      58718 /      58718
+---------------------------------------------------------------------
 
-commit 13eff776535a4d90e14a5ba1239e3bb094fce3ef
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:55:13 2005 -0700
+ok 26 - setup further non-bitmapped commits
 
-    Commit #42
+expecting success of 5326.27 '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 27 - counting commits via bitmap (partial bitmap, second)
 
-commit b7592bd14654cc3f437db49791a176d29d3aa8f0
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:54:13 2005 -0700
+expecting success of 5326.28 '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 28 - counting partial commits via bitmap (partial bitmap, second)
 
-    Commit #41
+expecting success of 5326.29 '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 29 - counting commits with limit (partial bitmap, second)
 
-commit 83b8bfc7c90441063b251721278b7e8f9c5a201a
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:53:13 2005 -0700
+expecting success of 5326.30 '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 30 - counting non-linear history (partial bitmap, second)
 
-    Commit #40
+expecting success of 5326.31 '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 31 - counting commits with limiting (partial bitmap, second)
 
-commit 0b9d55bbcb1a6033be38cb93b03d75e5a78f9c3f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:52:13 2005 -0700
+expecting success of 5326.32 '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 32 - counting objects via bitmap (partial bitmap, second)
 
-    Commit #39
+expecting success of 5326.33 '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 33 - enumerate commits (partial bitmap, second)
 
-commit d453237bfb3140a104f4c3946b562e8b8e9cda13
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:51:13 2005 -0700
+expecting success of 5326.34 '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 34 - enumerate --objects (partial bitmap, second)
 
-    Commit #38
+expecting success of 5326.35 '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 35 - bitmap --objects handles non-commit objects (partial bitmap, second)
 
-commit 63c4e0264b89e227660dc2fbd7fc8077627ab28e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:50:13 2005 -0700
+expecting success of 5326.36 '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 36 - counting commits via bitmap (partial bitmap, other)
 
-    Commit #37
+expecting success of 5326.37 '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 37 - counting partial commits via bitmap (partial bitmap, other)
 
-commit 5df897dfd4814feea01849f65e8fc3e81d72728f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:49:13 2005 -0700
+expecting success of 5326.38 '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 38 - counting commits with limit (partial bitmap, other)
 
-    Commit #36
+expecting success of 5326.39 '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 39 - counting non-linear history (partial bitmap, other)
 
-commit 5e2d0ff7bcf7c8973b325689dd3604bd01d6b075
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:48:13 2005 -0700
+expecting success of 5326.40 '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 40 - counting commits with limiting (partial bitmap, other)
 
-    Commit #35
+expecting success of 5326.41 '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 41 - counting objects via bitmap (partial bitmap, other)
 
-commit cbf881eb049d21325ff0fba1e98746e36f1d46a8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:47:13 2005 -0700
+expecting success of 5326.42 '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 42 - enumerate commits (partial bitmap, other)
 
-    Commit #34
+expecting success of 5326.43 '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 43 - enumerate --objects (partial bitmap, other)
 
-commit b8a9eb0e7c8cff2ab2d65d53f5a568dc7b54d5b0
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:46:13 2005 -0700
+expecting success of 5326.44 '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 44 - bitmap --objects handles non-commit objects (partial bitmap, other)
 
-    Commit #33
+expecting success of 5326.45 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
+   4b27f21..8ca4c84  second     -> second
+ok 45 - fetch (partial bitmap)
 
-commit 20db8c933b4ca134652d077a7a59a12f7653c3a4
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:45:13 2005 -0700
+expecting success of 5326.46 'enumerating progress counts pack-reused objects': 
+		count=$(git rev-list --objects --all --count) &&
+		git repack -adb &&
 
-    Commit #32
+		# 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 &&
 
-commit 738136f07b8bf1cff560dc0dbf4a18eee3b1de94
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:44:13 2005 -0700
+		# 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: 659, done.
+Total 659 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
+[second 170f281] an extra commit object
+ Author: A U Thor <author@example.com>
+Enumerating objects: 660, done.
+Total 660 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
+ok 46 - enumerating progress counts pack-reused objects
 
-    Commit #31
+expecting success of 5326.47 'create new additional packs': 
+		for i in $(test_seq 1 16)
+		do
+			test_commit "$i" &&
+			git repack -d || return 1
+		done &&
 
-commit dd3f1b3396477b30b131d10831090cd58add8a2f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:43:13 2005 -0700
+		git checkout -b other2 HEAD~8 &&
+		for i in $(test_seq 1 8)
+		do
+			test_commit "side-$i" &&
+			git repack -d || return 1
+		done &&
+		git checkout second
+	
+[second 3a76cec] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[second 694ecd4] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[second ffe77aa] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[second 50af4e8] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[second 9c1f241] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+[second b53317f] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+[second cc19a36] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+[second d484d57] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8.t
+[second 8a35e54] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9.t
+[second 4563a0f] 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10.t
+[second 0eb4f5f] 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11.t
+[second 620cfb0] 12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12.t
+[second 7580d0b] 13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13.t
+[second 622a67a] 14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14.t
+[second 5b39d34] 15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 15.t
+[second 199e4bb] 16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 16.t
+Switched to a new branch 'other2'
+[other2 beb075d] side-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 bb5edb3] side-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 1106e57] side-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 6805bc2] side-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 d7d949c] side-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 10e7b33] side-6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 d9f1819] side-7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 a9c1793] side-8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'second'
+ok 47 - create new additional packs
 
-    Commit #30
+expecting success of 5326.48 'create multi-pack midx with bitmaps': 
+		git multi-pack-index write --bitmap &&
 
-commit e7bbe70cb14feebd4d4ceada22d700e1bdcb301f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:42:13 2005 -0700
+		ls $objdir/pack/pack-*.pack >packs &&
+		test_line_count = 25 packs &&
 
-    Commit #29
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	
+ok 48 - create multi-pack midx with bitmaps
 
-commit 7c932743e94bd2239c435bf5645dccb051f3c5fe
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:41:13 2005 -0700
+expecting success of 5326.49 'reverse index exists (midx)': 
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+			git rev-list --test-bitmap "$commit" &&
 
-    Commit #28
+		if test "rev" = "$kind"
+		then
+			test_path_is_file $midx-$(midx_checksum $objdir).rev
+		fi &&
+		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
+	
+Bitmap v1 test (107 entries loaded)
+Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 82224a27 checksum
+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":"20241114T193615.407675Z-H5c947e1c-P000006af","thread":"main","time":"2024-11-14T19:36:15.408713Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001212,"t_rel":0.001212,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20241114T193626.030832Z-H5c947e1c-P00001646","thread":"main","time":"2024-11-14T19:36:26.032020Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001331,"t_rel":0.001331,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+ok 49 - reverse index exists (midx)
 
-commit c3cca0936c775de13190616bf109b3992732f2e1
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:40:13 2005 -0700
+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 / 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
 
-    Commit #27
+expecting success of 5326.51 'counting commits via bitmap (full bitmap, second)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 51 - counting commits via bitmap (full bitmap, second)
 
-commit 2eb3c6ccb3b91269a09de0d742aecfd52817f72f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:39:13 2005 -0700
+expecting success of 5326.52 'counting partial commits via bitmap (full 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 52 - counting partial commits via bitmap (full bitmap, second)
 
-    Commit #26
+expecting success of 5326.53 'counting commits with limit (full 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 53 - counting commits with limit (full bitmap, second)
 
-commit 0f219719c1472626b844e140343f904fa4972bcc
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:38:13 2005 -0700
+expecting success of 5326.54 'counting non-linear history (full bitmap, second)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 54 - counting non-linear history (full bitmap, second)
 
-    Commit #25
+expecting success of 5326.55 'counting commits with limiting (full 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 55 - counting commits with limiting (full bitmap, second)
 
-commit 03c8ac629a12338cc02e81b17da6d7cb0e1a802b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:37:13 2005 -0700
+expecting success of 5326.56 'counting objects via bitmap (full bitmap, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 56 - counting objects via bitmap (full bitmap, second)
 
-    Commit #24
+expecting success of 5326.57 'enumerate commits (full bitmap, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 57 - enumerate commits (full bitmap, second)
 
-commit 99b081ae6f13358b2cff7faad1b3f2a4c347edad
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:36:13 2005 -0700
+expecting success of 5326.58 'enumerate --objects (full 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 58 - enumerate --objects (full bitmap, second)
 
-    Commit #23
+expecting success of 5326.59 'bitmap --objects handles non-commit objects (full bitmap, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 59 - bitmap --objects handles non-commit objects (full bitmap, second)
 
-commit 7206ff76323748a074c19dacc097d2ed3b96bfb2
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:35:13 2005 -0700
+expecting success of 5326.60 'counting commits via bitmap (full bitmap, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 60 - counting commits via bitmap (full bitmap, other)
 
-    Commit #22
+expecting success of 5326.61 'counting partial commits via bitmap (full 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 61 - counting partial commits via bitmap (full bitmap, other)
 
-commit 490ddb36dddfeffa7779829333c151cbbe9e7366
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:34:13 2005 -0700
+expecting success of 5326.62 'counting commits with limit (full 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 62 - counting commits with limit (full bitmap, other)
 
-    Commit #21
+expecting success of 5326.63 'counting non-linear history (full bitmap, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 63 - counting non-linear history (full bitmap, other)
 
-commit a73206b2f61cdf7bf21c8138c9900794f0eab9a5
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:33:13 2005 -0700
+expecting success of 5326.64 'counting commits with limiting (full 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 64 - counting commits with limiting (full bitmap, other)
 
-    Commit #20
+expecting success of 5326.65 'counting objects via bitmap (full bitmap, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 65 - counting objects via bitmap (full bitmap, other)
 
-commit 01e16b5ab9e14247c98de5452a4be588930371be
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:32:13 2005 -0700
+expecting success of 5326.66 '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 66 - enumerate commits (full bitmap, other)
 
-    Commit #19
+expecting success of 5326.67 '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 67 - enumerate --objects (full bitmap, other)
 
-commit 9c803e03a40e955e599e8ecb9131651832083f57
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:31:13 2005 -0700
+expecting success of 5326.68 '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 68 - bitmap --objects handles non-commit objects (full bitmap, other)
 
-    Commit #18
+expecting success of 5326.69 '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 69 - clone from bitmapped repository
 
-commit 6fc6ec72c6ce78e654a775f4f659411294f1d4e6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:30:13 2005 -0700
+expecting success of 5326.70 '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 70 - partial clone from bitmapped repository
 
-    Commit #17
+expecting success of 5326.71 'setup further non-bitmapped commits': 
+		test_commit_bulk --id=further 10
+	
+199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42
+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:            135
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         16
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =       8628 /       8628
+---------------------------------------------------------------------
 
-commit b601a967eeee6cb91b552c6e43b4bafdf2b1c7ac
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:29:13 2005 -0700
+ok 71 - setup further non-bitmapped commits
 
-    Commit #16
+expecting success of 5326.72 '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 72 - counting commits via bitmap (partial bitmap, second)
 
-commit 1747235a5c3fa673cab96b05b46dd97adb0c00c8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:28:13 2005 -0700
+expecting success of 5326.73 '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 73 - counting partial commits via bitmap (partial bitmap, second)
 
-    Commit #15
+expecting success of 5326.74 '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 74 - counting commits with limit (partial bitmap, second)
 
-commit 26bc6342db340ab762645b0b3b83517623b4c675
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:27:13 2005 -0700
+expecting success of 5326.75 '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 75 - counting non-linear history (partial bitmap, second)
 
-    Commit #14
+expecting success of 5326.76 '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 76 - counting commits with limiting (partial bitmap, second)
 
-commit b2f646eca1878e3000b6ceabd81b60ce604cb41e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:26:13 2005 -0700
+expecting success of 5326.77 '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 77 - counting objects via bitmap (partial bitmap, second)
 
-    Commit #13
+expecting success of 5326.78 '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 78 - enumerate commits (partial bitmap, second)
 
-commit be3e57a8ad8950e367abdb48fe904d3f965e96fa
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:25:13 2005 -0700
+expecting success of 5326.79 '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 79 - enumerate --objects (partial bitmap, second)
 
-    Commit #12
+expecting success of 5326.80 '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 80 - bitmap --objects handles non-commit objects (partial bitmap, second)
 
-commit 838c59d0f1f2160aa980e1c58db52403effc9dc6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:24:13 2005 -0700
+expecting success of 5326.81 '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 81 - counting commits via bitmap (partial bitmap, other)
 
-    Commit #11
+expecting success of 5326.82 '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 82 - counting partial commits via bitmap (partial bitmap, other)
 
-commit 2d04f66a08825b9bd9631a379768ee94d9e35c94
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:23:13 2005 -0700
+expecting success of 5326.83 '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 83 - counting commits with limit (partial bitmap, other)
 
-    Commit #10
+expecting success of 5326.84 '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 84 - counting non-linear history (partial bitmap, other)
 
-commit 3b4907bf685c7f5694fd51989e990218a5844ee6
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:22:13 2005 -0700
+expecting success of 5326.85 '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 85 - counting commits with limiting (partial bitmap, other)
 
-    Commit #9
+expecting success of 5326.86 '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 86 - counting objects via bitmap (partial bitmap, other)
 
-commit e87f17a34ce327a5cef1309626784bc0bcc74743
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:21:13 2005 -0700
+expecting success of 5326.87 '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 87 - enumerate commits (partial bitmap, other)
 
-    Commit #8
+expecting success of 5326.88 '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 88 - enumerate --objects (partial bitmap, other)
 
-commit b1248b7697c5ba5bd2099f38eee5728f05a07a2c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:20:13 2005 -0700
+expecting success of 5326.89 '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 89 - bitmap --objects handles non-commit objects (partial bitmap, other)
 
-    Commit #7
+expecting success of 5326.90 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
+   199e4bb..2f32443  second     -> second
+ok 90 - fetch (partial bitmap)
 
-commit a69e0e75ae4b3c7d5954f52f3dc1666d7facf114
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:19:13 2005 -0700
+expecting success of 5326.91 'enumerating progress counts pack-reused objects': 
+		count=$(git rev-list --objects --all --count) &&
+		git repack -adb &&
 
-    Commit #6
+		# 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 &&
 
-commit d2559a7d1598c17fb8259ed9c923a40f242edbd7
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:18:13 2005 -0700
+		# 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: 742, done.
+Total 742 (delta 0), reused 0 (delta 0), pack-reused 742 (from 1)
+[second e44e978] an extra commit object
+ Author: A U Thor <author@example.com>
+Enumerating objects: 743, done.
+Total 743 (delta 0), reused 0 (delta 0), pack-reused 742 (from 1)
+ok 91 - enumerating progress counts pack-reused objects
 
-    Commit #5
+expecting success of 5326.92 '--no-bitmap is respected when bitmaps exist': 
+		git multi-pack-index write --bitmap &&
 
-commit c45f8a131dd92e17228868c96e1b0b0b07693331
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:17:13 2005 -0700
+		test_commit respect--no-bitmap &&
+		git repack -d &&
 
-    Commit #4
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-commit 758f634f1b1a066097ec1ee3c9a4aedc0bfb3d46
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:16:13 2005 -0700
+		git multi-pack-index write --no-bitmap &&
 
-    Commit #3
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-$(midx_checksum $objdir).bitmap &&
+		test_path_is_missing $midx-$(midx_checksum $objdir).rev
+	
+[second 39f81e4] respect--no-bitmap
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 respect--no-bitmap.t
+ok 92 - --no-bitmap is respected when bitmaps exist
 
-commit 2285e440694323e1c325d1838d97abdecada8ade
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
+expecting success of 5326.93 'setup midx with base from later pack': 
+		# Write a and b so that "a" is a delta on top of base "b", since Git
+		# prefers to delete contents out of a base rather than add to a shorter
+		# object.
+		test_seq 1 128 >a &&
+		test_seq 1 130 >b &&
 
-    Commit #2
+		git add a b &&
+		git commit -m "initial commit" &&
 
-commit b86cdba23d2682dd459133f2efac8ea660f1dd5b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
+		a=$(git rev-parse HEAD:a) &&
+		b=$(git rev-parse HEAD:b) &&
 
-    Commit #1
+		# In the first pack, "a" is stored as a delta to "b".
+		p1=$(git pack-objects .git/objects/pack/pack <<-EOF
+		$a
+		$b
+		EOF
+		) &&
 
-commit e8d9fe63116478156180f7026f6c181cc60432c5
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+		# In the second pack, "a" is missing, and "b" is not a delta nor base to
+		# any other object.
+		p2=$(git pack-objects .git/objects/pack/pack <<-EOF
+		$b
+		$(git rev-parse HEAD)
+		$(git rev-parse HEAD^{tree})
+		EOF
+		) &&
 
-    Commit #0
-Rebase
-commit b1a1c97e94b6388c108e195d28a3e89f00c81698
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:23:13 2005 -0700
+		git prune-packed &&
+		# Use the second pack as the preferred source, so that "b" occurs
+		# earlier in the MIDX object order, rendering "a" unusable for pack
+		# reuse.
+		git multi-pack-index write --bitmap --preferred-pack=pack-$p2.idx &&
 
-    Rebase #65
+		have_delta $a $b &&
+		test $(midx_pack_source $a) != $(midx_pack_source $b)
+	
+[second 800d70e] initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 258 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+ok 93 - setup midx with base from later pack
 
-commit b1a473533f3c7654e6aabe20b868f403cc4542c4
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:22:13 2005 -0700
+expecting success of 5326.94 'counting commits via bitmap (full bitmap with backwards delta, second)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 94 - counting commits via bitmap (full bitmap with backwards delta, second)
 
-    Rebase #64
+expecting success of 5326.95 'counting partial commits via bitmap (full bitmap with backwards delta, 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 95 - counting partial commits via bitmap (full bitmap with backwards delta, second)
 
-commit b44d0fc2fa543aae48a3e88ca2d4bb69b0808618
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:21:13 2005 -0700
+expecting success of 5326.96 'counting commits with limit (full bitmap with backwards delta, 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 96 - counting commits with limit (full bitmap with backwards delta, second)
 
-    Rebase #63
+expecting success of 5326.97 'counting non-linear history (full bitmap with backwards delta, second)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 97 - counting non-linear history (full bitmap with backwards delta, second)
 
-commit bdb72969f88d60418acc3c5cb69f94a9254e4069
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:20:13 2005 -0700
+expecting success of 5326.98 'counting commits with limiting (full bitmap with backwards delta, 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 98 - counting commits with limiting (full bitmap with backwards delta, second)
 
-    Rebase #62
+expecting success of 5326.99 'counting objects via bitmap (full bitmap with backwards delta, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 99 - counting objects via bitmap (full bitmap with backwards delta, second)
 
-commit f4846c914d90426d0aa7d9ae8c617e23aeb7aadc
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:19:13 2005 -0700
+expecting success of 5326.100 'enumerate commits (full bitmap with backwards delta, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 100 - enumerate commits (full bitmap with backwards delta, second)
 
-    Rebase #61
+expecting success of 5326.101 'enumerate --objects (full bitmap with backwards delta, 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 5741, line 141
+ok 101 - enumerate --objects (full bitmap with backwards delta, second)
 
-commit 5513d6a596bf3937f715bf4c4fa240dae08c1183
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:18:13 2005 -0700
+expecting success of 5326.102 'bitmap --objects handles non-commit objects (full bitmap with backwards delta, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 102 - bitmap --objects handles non-commit objects (full bitmap with backwards delta, second)
 
-    Rebase #60
+expecting success of 5326.103 'counting commits via bitmap (full bitmap with backwards delta, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 103 - counting commits via bitmap (full bitmap with backwards delta, other)
 
-commit c17d7284cf4910e76deb07380fdb38db71d239c7
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:17:13 2005 -0700
+expecting success of 5326.104 'counting partial commits via bitmap (full bitmap with backwards delta, 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 104 - counting partial commits via bitmap (full bitmap with backwards delta, other)
 
-    Rebase #59
+expecting success of 5326.105 'counting commits with limit (full bitmap with backwards delta, 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 105 - counting commits with limit (full bitmap with backwards delta, other)
 
-commit 61c422e7618c96824dffec2cbb0cc7ec1933e48e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:16:13 2005 -0700
+expecting success of 5326.106 'counting non-linear history (full bitmap with backwards delta, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 106 - counting non-linear history (full bitmap with backwards delta, other)
 
-    Rebase #58
+expecting success of 5326.107 'counting commits with limiting (full bitmap with backwards delta, 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 107 - counting commits with limiting (full bitmap with backwards delta, other)
 
-commit 2d32b535df82e1d77ee22da27287e3a676723ef8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:15:13 2005 -0700
+expecting success of 5326.108 'counting objects via bitmap (full bitmap with backwards delta, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 108 - counting objects via bitmap (full bitmap with backwards delta, other)
 
-    Rebase #57
+expecting success of 5326.109 'enumerate commits (full bitmap with backwards delta, other)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 109 - enumerate commits (full bitmap with backwards delta, other)
 
-commit d8638fd41e1699aa201527ace01d2ba19815aceb
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:14:13 2005 -0700
+expecting success of 5326.110 'enumerate --objects (full bitmap with backwards delta, 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 110 - enumerate --objects (full bitmap with backwards delta, other)
 
-    Rebase #56
+expecting success of 5326.111 'bitmap --objects handles non-commit objects (full bitmap with backwards delta, other)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 111 - bitmap --objects handles non-commit objects (full bitmap with backwards delta, other)
 
-commit 04fe055c82dc9923f2be842c62ddf3325ed7e4c3
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:13:13 2005 -0700
+expecting success of 5326.112 'clone with bitmaps enabled': 
+		git clone --no-local --bare . clone-reverse-delta.git &&
+		test_when_finished "rm -fr clone-reverse-delta.git" &&
 
-    Rebase #55
+		git rev-parse HEAD >expect &&
+		git --git-dir=clone-reverse-delta.git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	
+Cloning into bare repository 'clone-reverse-delta.git'...
+ok 112 - clone with bitmaps enabled
 
-commit 8b3228b708d50b5e797bb375d97082ec7afeace4
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:12:13 2005 -0700
+expecting success of 5326.113 'changing the preferred pack does not corrupt bitmaps': 
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+
+			test_commit A &&
+			test_commit B &&
+
+			git rev-list --objects --no-object-names HEAD^ >A.objects &&
+			git rev-list --objects --no-object-names HEAD^.. >B.objects &&
+
+			A=$(git pack-objects $objdir/pack/pack <A.objects) &&
+			B=$(git pack-objects $objdir/pack/pack <B.objects) &&
+
+			cat >indexes <<-EOF &&
+			pack-$A.idx
+			pack-$B.idx
+			EOF
+
+			git multi-pack-index write --bitmap --stdin-packs \
+				--preferred-pack=pack-$A.pack <indexes &&
+			git rev-list --test-bitmap A &&
+
+			git multi-pack-index write --bitmap --stdin-packs \
+				--preferred-pack=pack-$B.pack <indexes &&
+			git rev-list --test-bitmap A
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 392b20c] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master a4e158a] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Bitmap v1 test (2 entries loaded)
+Found bitmap for '392b20c46362b6de2a5e9c7f30dbcf5c1a8278ba'. 64 bits / 11030517 checksum
+Verifying bitmap entries:  33% (1/3)
Verifying bitmap entries:  66% (2/3)
Verifying bitmap entries: 100% (3/3)
Verifying bitmap entries: 100% (3/3), done.
+OK!
+Bitmap v1 test (2 entries loaded)
+Found bitmap for '392b20c46362b6de2a5e9c7f30dbcf5c1a8278ba'. 64 bits / f31c9bc6 checksum
+Verifying bitmap entries:  33% (1/3)
Verifying bitmap entries:  66% (2/3)
Verifying bitmap entries: 100% (3/3)
Verifying bitmap entries: 100% (3/3), done.
+OK!
+ok 113 - changing the preferred pack does not corrupt bitmaps
+
+expecting success of 5326.114 'setup pack reuse tests (pack -> MIDX)': 
+		rm -fr repo &&
+		git init repo &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk 16 &&
+			git tag old-tip &&
+
+			git config core.multiPackIndex true &&
+			if test "MIDX" = "$from"
+			then
+				git repack -Ad &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =       3592 /       3592
+---------------------------------------------------------------------
+
+ok 114 - setup pack reuse tests (pack -> MIDX)
+
+expecting success of 5326.115 'build bitmap from existing (pack -> MIDX)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk --id=further 16 &&
+			git tag new-tip &&
+
+			if test "MIDX" = "$to"
+			then
+				git repack -d &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+ab0640cc3905d1f6994fbda7d62bcb8721bde6fd
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         36
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       7771 /       7771
+---------------------------------------------------------------------
+
+Nothing new to pack.
+ok 115 - build bitmap from existing (pack -> MIDX)
+
+expecting success of 5326.116 'verify resulting bitmaps (pack -> MIDX)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			git for-each-ref &&
+			git rev-list --test-bitmap refs/tags/old-tip &&
+			git rev-list --test-bitmap refs/tags/new-tip
+		)
+	
+bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/heads/master
+bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/tags/new-tip
+ab0640cc3905d1f6994fbda7d62bcb8721bde6fd commit	refs/tags/old-tip
+Bitmap v1 test (32 entries loaded)
+Found bitmap for 'ab0640cc3905d1f6994fbda7d62bcb8721bde6fd'. 64 bits / 26205a9e checksum
+Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
+OK!
+Bitmap v1 test (32 entries loaded)
+Found bitmap for 'bc1bb2602ce06fbf454b00e2fc62d6577aa466c6'. 128 bits / f4d5cc9b checksum
+Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
+OK!
+ok 116 - verify resulting bitmaps (pack -> MIDX)
+
+expecting success of 5326.117 'setup pack reuse tests (MIDX -> pack)': 
+		rm -fr repo &&
+		git init repo &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk 16 &&
+			git tag old-tip &&
+
+			git config core.multiPackIndex true &&
+			if test "MIDX" = "$from"
+			then
+				git repack -Ad &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =       3592 /       3592
+---------------------------------------------------------------------
+
+ok 117 - setup pack reuse tests (MIDX -> pack)
+
+expecting success of 5326.118 'build bitmap from existing (MIDX -> pack)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk --id=further 16 &&
+			git tag new-tip &&
+
+			if test "MIDX" = "$to"
+			then
+				git repack -d &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+ab0640cc3905d1f6994fbda7d62bcb8721bde6fd
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         36
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       7771 /       7771
+---------------------------------------------------------------------
+
+ok 118 - build bitmap from existing (MIDX -> pack)
+
+expecting success of 5326.119 'verify resulting bitmaps (MIDX -> pack)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			git for-each-ref &&
+			git rev-list --test-bitmap refs/tags/old-tip &&
+			git rev-list --test-bitmap refs/tags/new-tip
+		)
+	
+bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/heads/master
+bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/tags/new-tip
+ab0640cc3905d1f6994fbda7d62bcb8721bde6fd commit	refs/tags/old-tip
+Bitmap v1 test (32 entries loaded)
+Found bitmap for 'ab0640cc3905d1f6994fbda7d62bcb8721bde6fd'. 128 bits / 1beec19b checksum
+Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
+OK!
+Bitmap v1 test (32 entries loaded)
+Found bitmap for 'bc1bb2602ce06fbf454b00e2fc62d6577aa466c6'. 128 bits / f4d5cc9b checksum
+Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
+OK!
+ok 119 - verify resulting bitmaps (MIDX -> pack)
+
+expecting success of 5326.120 'setup pack reuse tests (MIDX -> MIDX)': 
+		rm -fr repo &&
+		git init repo &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk 16 &&
+			git tag old-tip &&
+
+			git config core.multiPackIndex true &&
+			if test "MIDX" = "$from"
+			then
+				git repack -Ad &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =       3592 /       3592
+---------------------------------------------------------------------
+
+ok 120 - setup pack reuse tests (MIDX -> MIDX)
+
+expecting success of 5326.121 'build bitmap from existing (MIDX -> MIDX)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk --id=further 16 &&
+			git tag new-tip &&
+
+			if test "MIDX" = "$to"
+			then
+				git repack -d &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+ab0640cc3905d1f6994fbda7d62bcb8721bde6fd
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         36
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       7771 /       7771
+---------------------------------------------------------------------
+
+Nothing new to pack.
+ok 121 - build bitmap from existing (MIDX -> MIDX)
+
+expecting success of 5326.122 'verify resulting bitmaps (MIDX -> MIDX)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			git for-each-ref &&
+			git rev-list --test-bitmap refs/tags/old-tip &&
+			git rev-list --test-bitmap refs/tags/new-tip
+		)
+	
+bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/heads/master
+bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/tags/new-tip
+ab0640cc3905d1f6994fbda7d62bcb8721bde6fd commit	refs/tags/old-tip
+Bitmap v1 test (32 entries loaded)
+Found bitmap for 'ab0640cc3905d1f6994fbda7d62bcb8721bde6fd'. 64 bits / 26205a9e checksum
+Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
+OK!
+Bitmap v1 test (32 entries loaded)
+Found bitmap for 'bc1bb2602ce06fbf454b00e2fc62d6577aa466c6'. 128 bits / f4d5cc9b checksum
+Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
+OK!
+ok 122 - verify resulting bitmaps (MIDX -> MIDX)
+
+expecting success of 5326.123 'missing object closure fails gracefully': 
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+
+			test_commit loose &&
+			test_commit packed &&
+
+			# Do not pass "--revs"; we want a pack without the "loose"
+			# commit.
+			git pack-objects $objdir/pack/pack <<-EOF &&
+			$(git rev-parse packed)
+			EOF
+
+			test_must_fail git multi-pack-index write --bitmap 2>err &&
+			grep "doesn.t have full closure" err &&
+			test_path_is_missing $midx
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 6999e23] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+[master 23fd6e3] packed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 packed.t
+6042bfdbe94037eaba8f1b0e553a64da0e4258ec
+warning: Failed to write bitmap index. Packfile doesn't have full closure (object 6999e2351f5ce16aeecbe180fdbc9d0c6966c007 is missing)
+ok 123 - missing object closure fails gracefully
+
+expecting success of 5326.124 'setup partial bitmaps': 
+		test_commit packed &&
+		git repack &&
+		test_commit loose &&
+		git multi-pack-index write --bitmap &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	
+[second a0f9530] packed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 packed.t
+[second eb7dd10] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+ok 124 - setup partial bitmaps
+
+expecting success of 5326.125 'reverse index exists (midx)': 
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+			git rev-list --test-bitmap "$commit" &&
+
+		if test "rev" = "$kind"
+		then
+			test_path_is_file $midx-$(midx_checksum $objdir).rev
+		fi &&
+		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
+	
+Bitmap v1 test (107 entries loaded)
+Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 768 bits / 24365dde checksum
+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":"20241114T193615.407675Z-H5c947e1c-P000006af","thread":"main","time":"2024-11-14T19:36:15.408713Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001212,"t_rel":0.001212,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20241114T193626.030832Z-H5c947e1c-P00001646","thread":"main","time":"2024-11-14T19:36:26.032020Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001331,"t_rel":0.001331,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20241114T193638.439835Z-H5c947e1c-P000027f2","thread":"main","time":"2024-11-14T19:36:38.457087Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.017431,"t_rel":0.017431,"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 / 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
+
+expecting success of 5326.127 'counting commits via bitmap (full bitmap, second)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 127 - counting commits via bitmap (full bitmap, second)
+
+expecting success of 5326.128 'counting partial commits via bitmap (full 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 128 - counting partial commits via bitmap (full bitmap, second)
+
+expecting success of 5326.129 'counting commits with limit (full 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 129 - counting commits with limit (full bitmap, second)
+
+expecting success of 5326.130 'counting non-linear history (full bitmap, second)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 130 - counting non-linear history (full bitmap, second)
+
+expecting success of 5326.131 'counting commits with limiting (full 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 131 - counting commits with limiting (full bitmap, second)
+
+expecting success of 5326.132 'counting objects via bitmap (full bitmap, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 132 - counting objects via bitmap (full bitmap, second)
+
+expecting success of 5326.133 'enumerate commits (full bitmap, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 133 - enumerate commits (full bitmap, second)
+
+expecting success of 5326.134 'enumerate --objects (full 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 134 - enumerate --objects (full bitmap, second)
+
+expecting success of 5326.135 'bitmap --objects handles non-commit objects (full bitmap, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 135 - bitmap --objects handles non-commit objects (full bitmap, second)
+
+expecting success of 5326.136 'counting commits via bitmap (full bitmap, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 136 - counting commits via bitmap (full bitmap, other)
+
+expecting success of 5326.137 'counting partial commits via bitmap (full 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 137 - counting partial commits via bitmap (full bitmap, other)
+
+expecting success of 5326.138 'counting commits with limit (full 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 138 - counting commits with limit (full bitmap, other)
+
+expecting success of 5326.139 'counting non-linear history (full bitmap, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 139 - counting non-linear history (full bitmap, other)
+
+expecting success of 5326.140 'counting commits with limiting (full 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 140 - counting commits with limiting (full bitmap, other)
+
+expecting success of 5326.141 'counting objects via bitmap (full bitmap, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 141 - counting objects via bitmap (full bitmap, other)
+
+expecting success of 5326.142 '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 142 - enumerate commits (full bitmap, other)
+
+expecting success of 5326.143 '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 143 - enumerate --objects (full bitmap, other)
+
+expecting success of 5326.144 '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 144 - bitmap --objects handles non-commit objects (full bitmap, other)
+
+expecting success of 5326.145 '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 145 - clone from bitmapped repository
+
+expecting success of 5326.146 '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 146 - partial clone from bitmapped repository
+
+expecting success of 5326.147 'setup further non-bitmapped commits': 
+		test_commit_bulk --id=further 10
+	
+eb7dd10cacf916c0fbe0aa62deed5ff900c6845c
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         12
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       5261 /       5261
+---------------------------------------------------------------------
+
+ok 147 - setup further non-bitmapped commits
+
+expecting success of 5326.148 '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 148 - counting commits via bitmap (partial bitmap, second)
+
+expecting success of 5326.149 '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 149 - counting partial commits via bitmap (partial bitmap, second)
+
+expecting success of 5326.150 '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 150 - counting commits with limit (partial bitmap, second)
+
+expecting success of 5326.151 '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 151 - counting non-linear history (partial bitmap, second)
+
+expecting success of 5326.152 '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 152 - counting commits with limiting (partial bitmap, second)
+
+expecting success of 5326.153 '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 153 - counting objects via bitmap (partial bitmap, second)
+
+expecting success of 5326.154 '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 154 - enumerate commits (partial bitmap, second)
+
+expecting success of 5326.155 '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 155 - enumerate --objects (partial bitmap, second)
+
+expecting success of 5326.156 '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 156 - bitmap --objects handles non-commit objects (partial bitmap, second)
+
+expecting success of 5326.157 '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 157 - counting commits via bitmap (partial bitmap, other)
+
+expecting success of 5326.158 '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 158 - counting partial commits via bitmap (partial bitmap, other)
+
+expecting success of 5326.159 '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 159 - counting commits with limit (partial bitmap, other)
+
+expecting success of 5326.160 '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 160 - counting non-linear history (partial bitmap, other)
+
+expecting success of 5326.161 '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 161 - counting commits with limiting (partial bitmap, other)
+
+expecting success of 5326.162 '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 162 - counting objects via bitmap (partial bitmap, other)
+
+expecting success of 5326.163 '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 163 - enumerate commits (partial bitmap, other)
+
+expecting success of 5326.164 '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 164 - enumerate --objects (partial bitmap, other)
+
+expecting success of 5326.165 '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 165 - bitmap --objects handles non-commit objects (partial bitmap, other)
+
+expecting success of 5326.166 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
+   eb7dd10..5374668  second     -> second
+ok 166 - fetch (partial bitmap)
+
+expecting success of 5326.167 '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 07d40ce] 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 167 - enumerating progress counts pack-reused objects
+
+expecting success of 5326.168 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) c7b3d3a] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 6b19708] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+ok 168 - removing a MIDX clears stale bitmaps
+
+expecting success of 5326.169 '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.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      26910 /      26910
+---------------------------------------------------------------------
+
+--- before	2024-11-14 19:36:43.110082786 +0000
++++ after	2024-11-14 19:36:43.238084089 +0000
+@@ -1 +1 @@
+-fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
++ddf14642c6faca04471beee86e605bcbfd21396e
+ok 169 - pack.preferBitmapTips
+
+expecting success of 5326.170 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 0fe3286] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 4484e5d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+0fe3286fcbe602bb880b56d28a01d1851b7945c9
+4484e5d24e9474a8b002de8f670f676c5c0af441
+0fe3286fcbe602bb880b56d28a01d1851b7945c9
+ok 170 - writing a bitmap with --refs-snapshot
+
+expecting success of 5326.171 '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.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =      26910 /      26910
+---------------------------------------------------------------------
+
+--- before	2024-11-14 19:36:44.010091949 +0000
++++ after	2024-11-14 19:36:44.162093497 +0000
+@@ -1 +1 @@
+-fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
++ddf14642c6faca04471beee86e605bcbfd21396e
+ok 171 - write a bitmap with --refs-snapshot (preferred tips)
+
+expecting success of 5326.172 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) c7b3d3a] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 63dc8a8] base2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base2.t
+[master fa4104d] new
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 new.t
+ok 172 - hash-cache values are propagated from pack bitmaps
+
+expecting success of 5326.173 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+warning: refusing to write multi-pack .bitmap without any objects
+ok 173 - no .bitmap is written without any objects
+
+expecting success of 5326.174 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) c7b3d3a] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+c7b3d3a32a70b7a1e8b65ae6f01c75bf4c23e8c4
+ok 174 - graceful fallback when missing reverse index
+
+expecting success of 5326.175 'setup test_repository': 
+		rm -rf * .git &&
+		git init &&
+		git config pack.writeBitmapLookupTable true
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/.git/
+ok 175 - setup test_repository
+
+expecting success of 5326.176 'setup repo with moderate-sized history': 
+		test_commit_bulk --id=file 10 &&
+		git branch -M second &&
+		git checkout -b other HEAD~5 &&
+		test_commit_bulk --id=side 10 &&
+
+		# add complicated history setup, including merges and
+		# ambiguous merge-bases
+
+		git checkout -b merge-left other~2 &&
+		git merge second~2 -m "merge-left" &&
+
+		git checkout -b merge-right second~1 &&
+		git merge other~1 -m "merge-right" &&
+
+		git checkout -b octo-second second &&
+		git merge merge-left merge-right -m "octopus-second" &&
+
+		git checkout -b octo-other other &&
+		git merge merge-left merge-right -m "octopus-other" &&
+
+		git checkout other &&
+		git merge octo-other -m "pull octopus" &&
+
+		git checkout second &&
+		git merge octo-second -m "pull octopus" &&
+
+		# Remove these branches so they are not selected
+		# as bitmap tips
+		git branch -D merge-left &&
+		git branch -D merge-right &&
+		git branch -D octo-other &&
+		git branch -D octo-second &&
+
+		# add padding to make these merges less interesting
+		# and avoid having them selected for bitmaps
+		test_commit_bulk --id=file 100 &&
+		git checkout other &&
+		test_commit_bulk --id=side 100 &&
+		git checkout second &&
+
+		bitmaptip=$(git rev-parse second) &&
+		blob=$(echo tagged-blob | git hash-object -w --stdin) &&
+		git tag tagged-blob $blob
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           30 (         0 duplicates                  )
+      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           10 (         0 duplicates          9 deltas of          9 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:             10
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =       2285 /       2285
+---------------------------------------------------------------------
+
+Switched to a new branch 'other'
+0977809a2f6f01041c676e76708c1fce2ec15a77
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           30 (         0 duplicates                  )
+      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           10 (         0 duplicates          9 deltas of          9 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:             15
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         16
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       4747 /       4747
+---------------------------------------------------------------------
+
+Switched to a new branch 'merge-left'
+Merge made by the 'ort' strategy.
+ file-6.t | 1 +
+ file-7.t | 1 +
+ file-8.t | 1 +
+ 3 files changed, 3 insertions(+)
+ create mode 100644 file-6.t
+ create mode 100644 file-7.t
+ create mode 100644 file-8.t
+Switched to a new branch 'merge-right'
+Merge made by the 'ort' strategy.
+ side-1.t | 1 +
+ side-2.t | 1 +
+ side-3.t | 1 +
+ side-4.t | 1 +
+ side-5.t | 1 +
+ side-6.t | 1 +
+ side-7.t | 1 +
+ side-8.t | 1 +
+ side-9.t | 1 +
+ 9 files changed, 9 insertions(+)
+ create mode 100644 side-1.t
+ create mode 100644 side-2.t
+ create mode 100644 side-3.t
+ create mode 100644 side-4.t
+ create mode 100644 side-5.t
+ create mode 100644 side-6.t
+ create mode 100644 side-7.t
+ create mode 100644 side-8.t
+ create mode 100644 side-9.t
+Switched to a new branch 'octo-second'
+Trying simple merge with merge-left
+Trying simple merge with merge-right
+Merge made by the 'octopus' strategy.
+ side-1.t | 1 +
+ side-2.t | 1 +
+ side-3.t | 1 +
+ side-4.t | 1 +
+ side-5.t | 1 +
+ side-6.t | 1 +
+ side-7.t | 1 +
+ side-8.t | 1 +
+ side-9.t | 1 +
+ 9 files changed, 9 insertions(+)
+ create mode 100644 side-1.t
+ create mode 100644 side-2.t
+ create mode 100644 side-3.t
+ create mode 100644 side-4.t
+ create mode 100644 side-5.t
+ create mode 100644 side-6.t
+ create mode 100644 side-7.t
+ create mode 100644 side-8.t
+ create mode 100644 side-9.t
+Switched to a new branch 'octo-other'
+Trying simple merge with merge-left
+Trying simple merge with merge-right
+Merge made by the 'octopus' strategy.
+ file-6.t | 1 +
+ file-7.t | 1 +
+ file-8.t | 1 +
+ file-9.t | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 file-6.t
+ create mode 100644 file-7.t
+ create mode 100644 file-8.t
+ create mode 100644 file-9.t
+Switched to branch 'other'
+Updating 23793a5..6dbf429
+Fast-forward (no commit created; -m option ignored)
+ file-6.t | 1 +
+ file-7.t | 1 +
+ file-8.t | 1 +
+ file-9.t | 1 +
+ 4 files changed, 4 insertions(+)
+ create mode 100644 file-6.t
+ create mode 100644 file-7.t
+ create mode 100644 file-8.t
+ create mode 100644 file-9.t
+Switched to branch 'second'
+Updating 89c9df7..fe580a0
+Fast-forward (no commit created; -m option ignored)
+ side-1.t | 1 +
+ side-2.t | 1 +
+ side-3.t | 1 +
+ side-4.t | 1 +
+ side-5.t | 1 +
+ side-6.t | 1 +
+ side-7.t | 1 +
+ side-8.t | 1 +
+ side-9.t | 1 +
+ 9 files changed, 9 insertions(+)
+ create mode 100644 side-1.t
+ create mode 100644 side-2.t
+ create mode 100644 side-3.t
+ create mode 100644 side-4.t
+ create mode 100644 side-5.t
+ create mode 100644 side-6.t
+ create mode 100644 side-7.t
+ create mode 100644 side-8.t
+ create mode 100644 side-9.t
+Deleted branch merge-left (was fbc62e6).
+Deleted branch merge-right (was c5b6896).
+Deleted branch octo-other (was 6dbf429).
+Deleted branch octo-second (was fe580a0).
+fe580a073cb0a105ec2998652ed9d1674ebb849d
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          280 (        10 duplicates                  )
+      blobs  :           90 (        10 duplicates          0 deltas of          0 attempts)
+      trees  :           90 (         0 duplicates         88 deltas of         88 attempts)
+      commits:          100 (         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:            109
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =        102
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      26598 /      26598
+---------------------------------------------------------------------
+
+Switched to branch 'other'
+6dbf4290e5b18e89ba78cd6a7115518279638769
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:          280 (        10 duplicates                  )
+      blobs  :           90 (        10 duplicates          0 deltas of          0 attempts)
+      trees  :           90 (         0 duplicates         88 deltas of         88 attempts)
+      commits:          100 (         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:            109
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =        102
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      26775 /      26775
+---------------------------------------------------------------------
+
+Switched to branch 'second'
+ok 176 - setup repo with moderate-sized history
+
+expecting success of 5326.177 'create single-pack midx with bitmaps': 
+		git repack -ad &&
+		git multi-pack-index write --bitmap &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	
+ok 177 - create single-pack midx with bitmaps
+
+expecting success of 5326.178 'reverse index exists (midx)': 
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+			git rev-list --test-bitmap "$commit" &&
+
+		if test "rev" = "$kind"
+		then
+			test_path_is_file $midx-$(midx_checksum $objdir).rev
+		fi &&
+		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
+	
+Bitmap v1 test (106 entries)
+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":"20241114T193646.822896Z-H5c947e1c-P00003680","thread":"main","time":"2024-11-14T19:36:46.823866Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001132,"t_rel":0.001132,"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': 
+		git rev-list --test-bitmap HEAD
+	
+Bitmap v1 test (106 entries)
+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!
+ok 179 - rev-list --test-bitmap verifies bitmaps
+
+expecting success of 5326.180 'counting commits via bitmap (full bitmap, second)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 180 - counting commits via bitmap (full bitmap, second)
+
+expecting success of 5326.181 'counting partial commits via bitmap (full 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 181 - counting partial commits via bitmap (full bitmap, second)
+
+expecting success of 5326.182 'counting commits with limit (full 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 182 - counting commits with limit (full bitmap, second)
+
+expecting success of 5326.183 'counting non-linear history (full bitmap, second)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 183 - counting non-linear history (full bitmap, second)
+
+expecting success of 5326.184 'counting commits with limiting (full 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 184 - counting commits with limiting (full bitmap, second)
+
+expecting success of 5326.185 'counting objects via bitmap (full bitmap, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 185 - counting objects via bitmap (full bitmap, second)
+
+expecting success of 5326.186 'enumerate commits (full bitmap, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 186 - enumerate commits (full bitmap, second)
+
+expecting success of 5326.187 'enumerate --objects (full 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 4102, line 101
+ok 187 - enumerate --objects (full bitmap, second)
+
+expecting success of 5326.188 'bitmap --objects handles non-commit objects (full bitmap, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 188 - bitmap --objects handles non-commit objects (full bitmap, second)
+
+expecting success of 5326.189 'counting commits via bitmap (full bitmap, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 189 - counting commits via bitmap (full bitmap, other)
+
+expecting success of 5326.190 'counting partial commits via bitmap (full 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 190 - counting partial commits via bitmap (full bitmap, other)
+
+expecting success of 5326.191 'counting commits with limit (full 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 191 - counting commits with limit (full bitmap, other)
+
+expecting success of 5326.192 'counting non-linear history (full bitmap, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 192 - counting non-linear history (full bitmap, other)
+
+expecting success of 5326.193 'counting commits with limiting (full 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 193 - counting commits with limiting (full bitmap, other)
+
+expecting success of 5326.194 'counting objects via bitmap (full bitmap, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 194 - counting objects via bitmap (full bitmap, other)
+
+expecting success of 5326.195 '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 195 - enumerate commits (full bitmap, other)
+
+expecting success of 5326.196 '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 196 - enumerate --objects (full bitmap, other)
+
+expecting success of 5326.197 '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 197 - bitmap --objects handles non-commit objects (full bitmap, other)
+
+expecting success of 5326.198 '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 198 - clone from bitmapped repository
+
+expecting success of 5326.199 '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 199 - partial clone from bitmapped repository
+
+expecting success of 5326.200 'setup further non-bitmapped commits': 
+		test_commit_bulk --id=further 10
+	
+db2803b34efd93d3448bc6cf028a889473ba3735
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           30 (         0 duplicates                  )
+      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           10 (         0 duplicates          9 deltas of          9 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:            119
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         16
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      58728 /      58728
+---------------------------------------------------------------------
+
+ok 200 - setup further non-bitmapped commits
+
+expecting success of 5326.201 '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 201 - counting commits via bitmap (partial bitmap, second)
+
+expecting success of 5326.202 '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 202 - counting partial commits via bitmap (partial bitmap, second)
+
+expecting success of 5326.203 '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 203 - counting commits with limit (partial bitmap, second)
+
+expecting success of 5326.204 '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 204 - counting non-linear history (partial bitmap, second)
+
+expecting success of 5326.205 '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 205 - counting commits with limiting (partial bitmap, second)
+
+expecting success of 5326.206 '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 206 - counting objects via bitmap (partial bitmap, second)
+
+expecting success of 5326.207 '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 207 - enumerate commits (partial bitmap, second)
+
+expecting success of 5326.208 '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 208 - enumerate --objects (partial bitmap, second)
+
+expecting success of 5326.209 '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 209 - bitmap --objects handles non-commit objects (partial bitmap, second)
+
+expecting success of 5326.210 '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 210 - counting commits via bitmap (partial bitmap, other)
+
+expecting success of 5326.211 '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 211 - counting partial commits via bitmap (partial bitmap, other)
+
+expecting success of 5326.212 '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 212 - counting commits with limit (partial bitmap, other)
+
+expecting success of 5326.213 '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 213 - counting non-linear history (partial bitmap, other)
+
+expecting success of 5326.214 '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 214 - counting commits with limiting (partial bitmap, other)
+
+expecting success of 5326.215 '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 215 - counting objects via bitmap (partial bitmap, other)
+
+expecting success of 5326.216 '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 216 - enumerate commits (partial bitmap, other)
+
+expecting success of 5326.217 '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 217 - enumerate --objects (partial bitmap, other)
+
+expecting success of 5326.218 '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 218 - bitmap --objects handles non-commit objects (partial bitmap, other)
+
+expecting success of 5326.219 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
+   db2803b..21b05a3  second     -> second
+ok 219 - fetch (partial bitmap)
+
+expecting success of 5326.220 '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: 659, done.
+Total 659 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
+[second 9d9466a] an extra commit object
+ Author: A U Thor <author@example.com>
+Enumerating objects: 660, done.
+Total 660 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
+ok 220 - enumerating progress counts pack-reused objects
+
+expecting success of 5326.221 'create new additional packs': 
+		for i in $(test_seq 1 16)
+		do
+			test_commit "$i" &&
+			git repack -d || return 1
+		done &&
+
+		git checkout -b other2 HEAD~8 &&
+		for i in $(test_seq 1 8)
+		do
+			test_commit "side-$i" &&
+			git repack -d || return 1
+		done &&
+		git checkout second
+	
+[second c508966] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[second 7852397] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[second e8764eb] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[second e7b65f1] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[second ff287bb] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+[second 734ba24] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 6.t
+[second 7e37ce6] 7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 7.t
+[second 22aa444] 8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 8.t
+[second 82c3a80] 9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 9.t
+[second 8a6fa0d] 10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 10.t
+[second 1508049] 11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 11.t
+[second aec6ca5] 12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 12.t
+[second 32a5e04] 13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 13.t
+[second a28bee6] 14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 14.t
+[second 12a188f] 15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 15.t
+[second 576966f] 16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 16.t
+Switched to a new branch 'other2'
+[other2 b3d62c0] side-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 e8f946b] side-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 56d7f89] side-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 dbe4b2d] side-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 9286b7d] side-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 75e0202] side-6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 b26808f] side-7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[other2 b145b7a] side-8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'second'
+ok 221 - create new additional packs
+
+expecting success of 5326.222 'create multi-pack midx with bitmaps': 
+		git multi-pack-index write --bitmap &&
+
+		ls $objdir/pack/pack-*.pack >packs &&
+		test_line_count = 25 packs &&
+
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	
+ok 222 - create multi-pack midx with bitmaps
+
+expecting success of 5326.223 'reverse index exists (midx)': 
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+			git rev-list --test-bitmap "$commit" &&
+
+		if test "rev" = "$kind"
+		then
+			test_path_is_file $midx-$(midx_checksum $objdir).rev
+		fi &&
+		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
+	
+Bitmap v1 test (107 entries)
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 236971ab 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":"20241114T193646.822896Z-H5c947e1c-P00003680","thread":"main","time":"2024-11-14T19:36:46.823866Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001132,"t_rel":0.001132,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20241114T193652.823583Z-H5c947e1c-P000041d6","thread":"main","time":"2024-11-14T19:36:52.824767Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001341,"t_rel":0.001341,"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 / 236971ab 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
 
-    Rebase #54
+expecting success of 5326.225 'counting commits via bitmap (full bitmap, second)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 225 - counting commits via bitmap (full bitmap, second)
 
-commit 5f4c3fe8ed7e4d32b60d7abb0e2af50d1343cca0
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:11:13 2005 -0700
+expecting success of 5326.226 'counting partial commits via bitmap (full 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 226 - counting partial commits via bitmap (full bitmap, second)
 
-    Rebase #53
+expecting success of 5326.227 'counting commits with limit (full 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 227 - counting commits with limit (full bitmap, second)
 
-commit 7f88d5e9d36769f5c9c65bcdd6b74456be65794b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:10:13 2005 -0700
+expecting success of 5326.228 'counting non-linear history (full bitmap, second)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 228 - counting non-linear history (full bitmap, second)
 
-    Rebase #52
+expecting success of 5326.229 'counting commits with limiting (full 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 229 - counting commits with limiting (full bitmap, second)
 
-commit 54fa0318009bc334ce8aa9a83e559582a15df921
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:09:13 2005 -0700
+expecting success of 5326.230 'counting objects via bitmap (full bitmap, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 230 - counting objects via bitmap (full bitmap, second)
 
-    Rebase #51
+expecting success of 5326.231 'enumerate commits (full bitmap, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 231 - enumerate commits (full bitmap, second)
 
-commit 874533e6395fa245e3aad590c5b29b113c993d88
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:08:13 2005 -0700
+expecting success of 5326.232 'enumerate --objects (full 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 232 - enumerate --objects (full bitmap, second)
 
-    Rebase #50
+expecting success of 5326.233 'bitmap --objects handles non-commit objects (full bitmap, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 233 - bitmap --objects handles non-commit objects (full bitmap, second)
 
-commit dc1211213cf96c29abb9e65856f42adb8ae87f44
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:07:13 2005 -0700
+expecting success of 5326.234 'counting commits via bitmap (full bitmap, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 234 - counting commits via bitmap (full bitmap, other)
 
-    Rebase #49
+expecting success of 5326.235 'counting partial commits via bitmap (full 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 235 - counting partial commits via bitmap (full bitmap, other)
 
-commit ecc16305000cbf7e0e28eaefa037380923f54f2b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:06:13 2005 -0700
+expecting success of 5326.236 'counting commits with limit (full 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 236 - counting commits with limit (full bitmap, other)
 
-    Rebase #48
+expecting success of 5326.237 'counting non-linear history (full bitmap, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 237 - counting non-linear history (full bitmap, other)
 
-commit 22eb8b0dd79fa78df505878adb615b382c819795
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:05:13 2005 -0700
+expecting success of 5326.238 'counting commits with limiting (full 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 238 - counting commits with limiting (full bitmap, other)
 
-    Rebase #47
+expecting success of 5326.239 'counting objects via bitmap (full bitmap, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 239 - counting objects via bitmap (full bitmap, other)
 
-commit e658f744975d593f1d768ae6a252466f3d6f542e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:04:13 2005 -0700
+expecting success of 5326.240 '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 240 - enumerate commits (full bitmap, other)
 
-    Rebase #46
+expecting success of 5326.241 '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 241 - enumerate --objects (full bitmap, other)
 
-commit 927e9cfe3212295919b60727098c2bcba986c37e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:03:13 2005 -0700
+expecting success of 5326.242 '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 242 - bitmap --objects handles non-commit objects (full bitmap, other)
 
-    Rebase #45
+expecting success of 5326.243 '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 243 - clone from bitmapped repository
 
-commit 8c6450200d3f0d8d334e87e0d8a8277a2f791251
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:02:13 2005 -0700
+expecting success of 5326.244 '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 244 - partial clone from bitmapped repository
 
-    Rebase #44
+expecting success of 5326.245 'setup further non-bitmapped commits': 
+		test_commit_bulk --id=further 10
+	
+576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7
+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:            135
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         16
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =       8626 /       8626
+---------------------------------------------------------------------
 
-commit 63e19d3641a395e0933a71af193c8dab5ddf587a
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:01:13 2005 -0700
+ok 245 - setup further non-bitmapped commits
 
-    Rebase #43
+expecting success of 5326.246 '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 246 - counting commits via bitmap (partial bitmap, second)
 
-commit dea9ca7996241bf8d256a6207334ab6cb0a2f16d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 17:00:13 2005 -0700
+expecting success of 5326.247 '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 247 - counting partial commits via bitmap (partial bitmap, second)
 
-    Rebase #42
+expecting success of 5326.248 '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 248 - counting commits with limit (partial bitmap, second)
 
-commit 026648f873caf2683546bb4a0bffc8293d8c2a73
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:59:13 2005 -0700
+expecting success of 5326.249 '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 249 - counting non-linear history (partial bitmap, second)
 
-    Rebase #41
+expecting success of 5326.250 '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 250 - counting commits with limiting (partial bitmap, second)
 
-commit 614287fbf62149f243db150a29195ddd2552620e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:58:13 2005 -0700
+expecting success of 5326.251 '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 251 - counting objects via bitmap (partial bitmap, second)
 
-    Rebase #40
+expecting success of 5326.252 '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 252 - enumerate commits (partial bitmap, second)
 
-commit 796c2f217a5f8738534fbb7febc3879590747fc2
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:57:13 2005 -0700
+expecting success of 5326.253 '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 253 - enumerate --objects (partial bitmap, second)
 
-    Rebase #39
+expecting success of 5326.254 '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 254 - bitmap --objects handles non-commit objects (partial bitmap, second)
 
-commit 5aaad3995be7c0de7d694ab11b764a400a4df57f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:56:13 2005 -0700
+expecting success of 5326.255 '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 255 - counting commits via bitmap (partial bitmap, other)
 
-    Rebase #38
+expecting success of 5326.256 '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 256 - counting partial commits via bitmap (partial bitmap, other)
 
-commit 313b77b49a4baf7c7fe8055753a71c38bdd38b47
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:55:13 2005 -0700
+expecting success of 5326.257 '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 257 - counting commits with limit (partial bitmap, other)
 
-    Rebase #37
+expecting success of 5326.258 '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 258 - counting non-linear history (partial bitmap, other)
 
-commit a59332167314137eb8af8837e16115c9680e018e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:54:13 2005 -0700
+expecting success of 5326.259 '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 259 - counting commits with limiting (partial bitmap, other)
 
-    Rebase #36
+expecting success of 5326.260 '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 260 - counting objects via bitmap (partial bitmap, other)
 
-commit 0ab0d27b1668006e073534c69e62685f0f9fc4ab
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:53:13 2005 -0700
+expecting success of 5326.261 '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 261 - enumerate commits (partial bitmap, other)
 
-    Rebase #35
+expecting success of 5326.262 '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 262 - enumerate --objects (partial bitmap, other)
 
-commit 43f966630635e7421592b1564d06becd4329fb7f
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:52:13 2005 -0700
+expecting success of 5326.263 '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 263 - bitmap --objects handles non-commit objects (partial bitmap, other)
 
-    Rebase #34
+expecting success of 5326.264 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
+   576966f..078ff48  second     -> second
+ok 264 - fetch (partial bitmap)
 
-commit fe710d4f0305ee6cfcc29f08823ccc6a8eb2e78a
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:51:13 2005 -0700
+expecting success of 5326.265 'enumerating progress counts pack-reused objects': 
+		count=$(git rev-list --objects --all --count) &&
+		git repack -adb &&
 
-    Rebase #33
+		# 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 &&
 
-commit 58465df8a64cc8cf28c98afc18e920e03dad9ec8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:50:13 2005 -0700
+		# 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: 742, done.
+Total 742 (delta 0), reused 0 (delta 0), pack-reused 742 (from 1)
+[second 2cbe96f] an extra commit object
+ Author: A U Thor <author@example.com>
+Enumerating objects: 743, done.
+Total 743 (delta 0), reused 0 (delta 0), pack-reused 742 (from 1)
+ok 265 - enumerating progress counts pack-reused objects
 
-    Rebase #32
+expecting success of 5326.266 '--no-bitmap is respected when bitmaps exist': 
+		git multi-pack-index write --bitmap &&
 
-commit 559f5ec230a71724d6ea3399c0216e52938cba74
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:49:13 2005 -0700
+		test_commit respect--no-bitmap &&
+		git repack -d &&
 
-    Rebase #31
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-commit 423868ae9fccf8a50212b69677d9fe252065eb3b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:48:13 2005 -0700
+		git multi-pack-index write --no-bitmap &&
 
-    Rebase #30
+		test_path_is_file $midx &&
+		test_path_is_missing $midx-$(midx_checksum $objdir).bitmap &&
+		test_path_is_missing $midx-$(midx_checksum $objdir).rev
+	
+[second aec4170] respect--no-bitmap
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 respect--no-bitmap.t
+ok 266 - --no-bitmap is respected when bitmaps exist
 
-commit d02b87bdc1b8e96ed634d52ddefb6b7db693b84b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:47:13 2005 -0700
+expecting success of 5326.267 'setup midx with base from later pack': 
+		# Write a and b so that "a" is a delta on top of base "b", since Git
+		# prefers to delete contents out of a base rather than add to a shorter
+		# object.
+		test_seq 1 128 >a &&
+		test_seq 1 130 >b &&
 
-    Rebase #29
+		git add a b &&
+		git commit -m "initial commit" &&
 
-commit 04e55758ac35dc63f899b6c3d526b2b802cee7c9
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:46:13 2005 -0700
+		a=$(git rev-parse HEAD:a) &&
+		b=$(git rev-parse HEAD:b) &&
 
-    Rebase #28
+		# In the first pack, "a" is stored as a delta to "b".
+		p1=$(git pack-objects .git/objects/pack/pack <<-EOF
+		$a
+		$b
+		EOF
+		) &&
 
-commit be5fbd2f45796936f2cfa86bb4dffe5b95013f0e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:45:13 2005 -0700
+		# In the second pack, "a" is missing, and "b" is not a delta nor base to
+		# any other object.
+		p2=$(git pack-objects .git/objects/pack/pack <<-EOF
+		$b
+		$(git rev-parse HEAD)
+		$(git rev-parse HEAD^{tree})
+		EOF
+		) &&
 
-    Rebase #27
+		git prune-packed &&
+		# Use the second pack as the preferred source, so that "b" occurs
+		# earlier in the MIDX object order, rendering "a" unusable for pack
+		# reuse.
+		git multi-pack-index write --bitmap --preferred-pack=pack-$p2.idx &&
 
-commit 213212c4ff3f0e681db0e061ed02dcc2e3902374
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:44:13 2005 -0700
+		have_delta $a $b &&
+		test $(midx_pack_source $a) != $(midx_pack_source $b)
+	
+[second 59dfa27] initial commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 258 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+ok 267 - setup midx with base from later pack
 
-    Rebase #26
+expecting success of 5326.268 'counting commits via bitmap (full bitmap with backwards delta, second)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 268 - counting commits via bitmap (full bitmap with backwards delta, second)
 
-commit 61a890331f2ecf786d50fa8248d4f86345569421
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:43:13 2005 -0700
+expecting success of 5326.269 'counting partial commits via bitmap (full bitmap with backwards delta, 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 269 - counting partial commits via bitmap (full bitmap with backwards delta, second)
 
-    Rebase #25
+expecting success of 5326.270 'counting commits with limit (full bitmap with backwards delta, 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 270 - counting commits with limit (full bitmap with backwards delta, second)
 
-commit a1bfffeeeb67da7d9433dd5d4dcc2876badda7de
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:42:13 2005 -0700
+expecting success of 5326.271 'counting non-linear history (full bitmap with backwards delta, second)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 271 - counting non-linear history (full bitmap with backwards delta, second)
 
-    Rebase #24
+expecting success of 5326.272 'counting commits with limiting (full bitmap with backwards delta, 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 272 - counting commits with limiting (full bitmap with backwards delta, second)
 
-commit ade5cf07bd9f8a623762be2b83d5200fd4c23e78
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:41:13 2005 -0700
+expecting success of 5326.273 'counting objects via bitmap (full bitmap with backwards delta, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 273 - counting objects via bitmap (full bitmap with backwards delta, second)
 
-    Rebase #23
+expecting success of 5326.274 'enumerate commits (full bitmap with backwards delta, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 274 - enumerate commits (full bitmap with backwards delta, second)
 
-commit 541aba44d5797d319874b1d242c491aecd70072e
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:40:13 2005 -0700
+expecting success of 5326.275 'enumerate --objects (full bitmap with backwards delta, 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 42, line 2
+ok 275 - enumerate --objects (full bitmap with backwards delta, second)
 
-    Rebase #22
+expecting success of 5326.276 'bitmap --objects handles non-commit objects (full bitmap with backwards delta, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 276 - bitmap --objects handles non-commit objects (full bitmap with backwards delta, second)
 
-commit 8ef186d480959ba1c1950497155e9db2bb5cf262
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:39:13 2005 -0700
+expecting success of 5326.277 'counting commits via bitmap (full bitmap with backwards delta, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 277 - counting commits via bitmap (full bitmap with backwards delta, other)
 
-    Rebase #21
+expecting success of 5326.278 'counting partial commits via bitmap (full bitmap with backwards delta, 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 278 - counting partial commits via bitmap (full bitmap with backwards delta, other)
 
-commit dd1cc8a79dd40f7d83223b2b2293062a17ed60ee
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:38:13 2005 -0700
+expecting success of 5326.279 'counting commits with limit (full bitmap with backwards delta, 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 279 - counting commits with limit (full bitmap with backwards delta, other)
 
-    Rebase #20
+expecting success of 5326.280 'counting non-linear history (full bitmap with backwards delta, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 280 - counting non-linear history (full bitmap with backwards delta, other)
 
-commit 60c8d8288c55de0f0dadd7f570f69a5bd9023e54
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:37:13 2005 -0700
+expecting success of 5326.281 'counting commits with limiting (full bitmap with backwards delta, 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 281 - counting commits with limiting (full bitmap with backwards delta, other)
 
-    Rebase #19
+expecting success of 5326.282 'counting objects via bitmap (full bitmap with backwards delta, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 282 - counting objects via bitmap (full bitmap with backwards delta, other)
 
-commit 2720bed4e6e3a6011714b76356527f5626a8b7bf
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:36:13 2005 -0700
+expecting success of 5326.283 'enumerate commits (full bitmap with backwards delta, other)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 283 - enumerate commits (full bitmap with backwards delta, other)
 
-    Rebase #18
+expecting success of 5326.284 'enumerate --objects (full bitmap with backwards delta, 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 284 - enumerate --objects (full bitmap with backwards delta, other)
 
-commit e4946f6736764ebcc7b4392c98b1916f37a8151c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:35:13 2005 -0700
+expecting success of 5326.285 'bitmap --objects handles non-commit objects (full bitmap with backwards delta, other)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 285 - bitmap --objects handles non-commit objects (full bitmap with backwards delta, other)
 
-    Rebase #17
+expecting success of 5326.286 'clone with bitmaps enabled': 
+		git clone --no-local --bare . clone-reverse-delta.git &&
+		test_when_finished "rm -fr clone-reverse-delta.git" &&
 
-commit f2a50e2577f679dd6edf5afa77fb0d331cf0e487
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:34:13 2005 -0700
+		git rev-parse HEAD >expect &&
+		git --git-dir=clone-reverse-delta.git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	
+Cloning into bare repository 'clone-reverse-delta.git'...
+ok 286 - clone with bitmaps enabled
 
-    Rebase #16
+expecting success of 5326.287 'changing the preferred pack does not corrupt bitmaps': 
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
 
-commit ba62d05c67970ca150478a6e204c07876eb45310
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:33:13 2005 -0700
+			test_commit A &&
+			test_commit B &&
 
-    Rebase #15
+			git rev-list --objects --no-object-names HEAD^ >A.objects &&
+			git rev-list --objects --no-object-names HEAD^.. >B.objects &&
 
-commit 16bbc537388506c6aa3568aec7a1c295ff664ad8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:32:13 2005 -0700
+			A=$(git pack-objects $objdir/pack/pack <A.objects) &&
+			B=$(git pack-objects $objdir/pack/pack <B.objects) &&
 
-    Rebase #14
+			cat >indexes <<-EOF &&
+			pack-$A.idx
+			pack-$B.idx
+			EOF
 
-commit 8ae96d45eca9358820adedc310a2bc6ff331a3e7
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:31:13 2005 -0700
+			git multi-pack-index write --bitmap --stdin-packs \
+				--preferred-pack=pack-$A.pack <indexes &&
+			git rev-list --test-bitmap A &&
 
-    Rebase #13
+			git multi-pack-index write --bitmap --stdin-packs \
+				--preferred-pack=pack-$B.pack <indexes &&
+			git rev-list --test-bitmap A
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 4e815f0] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master f2c4359] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Bitmap v1 test (2 entries loaded)
+Found bitmap for '4e815f02723eafa37a84fae71005bfba7924b84d'. 64 bits / 11030517 checksum
+Verifying bitmap entries:  33% (1/3)
Verifying bitmap entries:  66% (2/3)
Verifying bitmap entries: 100% (3/3)
Verifying bitmap entries: 100% (3/3), done.
+OK!
+Bitmap v1 test (2 entries loaded)
+Found bitmap for '4e815f02723eafa37a84fae71005bfba7924b84d'. 64 bits / f31c9bc6 checksum
+Verifying bitmap entries:  33% (1/3)
Verifying bitmap entries:  66% (2/3)
Verifying bitmap entries: 100% (3/3)
Verifying bitmap entries: 100% (3/3), done.
+OK!
+ok 287 - changing the preferred pack does not corrupt bitmaps
 
-commit 2557a8c044e16526b8261947e17623841a0d5a91
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:30:13 2005 -0700
+expecting success of 5326.288 'setup pack reuse tests (pack -> MIDX)': 
+		rm -fr repo &&
+		git init repo &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk 16 &&
+			git tag old-tip &&
 
-    Rebase #12
+			git config core.multiPackIndex true &&
+			if test "MIDX" = "$from"
+			then
+				git repack -Ad &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =       3589 /       3589
+---------------------------------------------------------------------
 
-commit 3f1275e3115a421a76f0ccbd5dea35b7cf227ce9
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:29:13 2005 -0700
+ok 288 - setup pack reuse tests (pack -> MIDX)
 
-    Rebase #11
+expecting success of 5326.289 'build bitmap from existing (pack -> MIDX)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk --id=further 16 &&
+			git tag new-tip &&
 
-commit 6d31feb4517418400c8f76a834f7cff206a2b1ab
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:28:13 2005 -0700
+			if test "MIDX" = "$to"
+			then
+				git repack -d &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+91737470c84f833fd6e011c3f3d39674d6352beb
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         36
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       7771 /       7771
+---------------------------------------------------------------------
 
-    Rebase #10
+Nothing new to pack.
+ok 289 - build bitmap from existing (pack -> MIDX)
 
-commit 054728ce53143ed538a80cc1db2f91642848d9d8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:27:13 2005 -0700
+expecting success of 5326.290 'verify resulting bitmaps (pack -> MIDX)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			git for-each-ref &&
+			git rev-list --test-bitmap refs/tags/old-tip &&
+			git rev-list --test-bitmap refs/tags/new-tip
+		)
+	
+d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/heads/master
+d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/tags/new-tip
+91737470c84f833fd6e011c3f3d39674d6352beb commit	refs/tags/old-tip
+Bitmap v1 test (32 entries loaded)
+Found bitmap for '91737470c84f833fd6e011c3f3d39674d6352beb'. 64 bits / 26205a9e checksum
+Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
+OK!
+Bitmap v1 test (32 entries loaded)
+Found bitmap for 'd0446f42140c9a0eba50442626df052f850c97f6'. 128 bits / f4d5cc9b checksum
+Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
+OK!
+ok 290 - verify resulting bitmaps (pack -> MIDX)
 
-    Rebase #9
+expecting success of 5326.291 'setup pack reuse tests (MIDX -> pack)': 
+		rm -fr repo &&
+		git init repo &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk 16 &&
+			git tag old-tip &&
 
-commit dbee1ce0dbeb64756fba483e99628287182a0be1
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:26:13 2005 -0700
+			git config core.multiPackIndex true &&
+			if test "MIDX" = "$from"
+			then
+				git repack -Ad &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =       3589 /       3589
+---------------------------------------------------------------------
 
-    Rebase #8
+ok 291 - setup pack reuse tests (MIDX -> pack)
 
-commit d174cc1075a864f5db77014609f7f9af0240ed0c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:25:13 2005 -0700
+expecting success of 5326.292 'build bitmap from existing (MIDX -> pack)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk --id=further 16 &&
+			git tag new-tip &&
 
-    Rebase #7
+			if test "MIDX" = "$to"
+			then
+				git repack -d &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+91737470c84f833fd6e011c3f3d39674d6352beb
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         36
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       7771 /       7771
+---------------------------------------------------------------------
 
-commit 18b56d78fb5f32acd1d2a027c139cb14df278e1c
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:24:13 2005 -0700
+ok 292 - build bitmap from existing (MIDX -> pack)
 
-    Rebase #6
+expecting success of 5326.293 'verify resulting bitmaps (MIDX -> pack)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			git for-each-ref &&
+			git rev-list --test-bitmap refs/tags/old-tip &&
+			git rev-list --test-bitmap refs/tags/new-tip
+		)
+	
+d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/heads/master
+d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/tags/new-tip
+91737470c84f833fd6e011c3f3d39674d6352beb commit	refs/tags/old-tip
+Bitmap v1 test (32 entries loaded)
+Found bitmap for '91737470c84f833fd6e011c3f3d39674d6352beb'. 128 bits / 1beec19b checksum
+Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
+OK!
+Bitmap v1 test (32 entries loaded)
+Found bitmap for 'd0446f42140c9a0eba50442626df052f850c97f6'. 128 bits / f4d5cc9b checksum
+Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
+OK!
+ok 293 - verify resulting bitmaps (MIDX -> pack)
 
-commit 754de5100e6921cb300704183c76e1c65e301beb
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:23:13 2005 -0700
+expecting success of 5326.294 'setup pack reuse tests (MIDX -> MIDX)': 
+		rm -fr repo &&
+		git init repo &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk 16 &&
+			git tag old-tip &&
 
-    Rebase #5
+			git config core.multiPackIndex true &&
+			if test "MIDX" = "$from"
+			then
+				git repack -Ad &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =       3589 /       3589
+---------------------------------------------------------------------
 
-commit 9fe752390a117faf8d6f239358fa821b464ff14d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:22:13 2005 -0700
+ok 294 - setup pack reuse tests (MIDX -> MIDX)
 
-    Rebase #4
+expecting success of 5326.295 'build bitmap from existing (MIDX -> MIDX)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			test_commit_bulk --id=further 16 &&
+			git tag new-tip &&
 
-commit 3e9bfb9468271e1707c357a5018af569c2a676d4
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:21:13 2005 -0700
+			if test "MIDX" = "$to"
+			then
+				git repack -d &&
+				git multi-pack-index write --bitmap
+			else
+				git repack -Adb
+			fi
+		)
+	
+91737470c84f833fd6e011c3f3d39674d6352beb
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           48 (         0 duplicates                  )
+      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         36
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =       7771 /       7771
+---------------------------------------------------------------------
 
-    Rebase #3
+Nothing new to pack.
+ok 295 - build bitmap from existing (MIDX -> MIDX)
 
-commit d15adbaa5fdd6b03140db45c714342b2023152fa
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:20:13 2005 -0700
+expecting success of 5326.296 'verify resulting bitmaps (MIDX -> MIDX)': 
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
+			git for-each-ref &&
+			git rev-list --test-bitmap refs/tags/old-tip &&
+			git rev-list --test-bitmap refs/tags/new-tip
+		)
+	
+d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/heads/master
+d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/tags/new-tip
+91737470c84f833fd6e011c3f3d39674d6352beb commit	refs/tags/old-tip
+Bitmap v1 test (32 entries loaded)
+Found bitmap for '91737470c84f833fd6e011c3f3d39674d6352beb'. 64 bits / 26205a9e checksum
+Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
+OK!
+Bitmap v1 test (32 entries loaded)
+Found bitmap for 'd0446f42140c9a0eba50442626df052f850c97f6'. 128 bits / f4d5cc9b checksum
+Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
+OK!
+ok 296 - verify resulting bitmaps (MIDX -> MIDX)
 
-    Rebase #2
+expecting success of 5326.297 'missing object closure fails gracefully': 
+		rm -fr repo &&
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
 
-commit 82c2bc152fd9f785c269098549562d289347b2f8
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 16:19:13 2005 -0700
+			test_commit loose &&
+			test_commit packed &&
 
-    Rebase #1
+			# Do not pass "--revs"; we want a pack without the "loose"
+			# commit.
+			git pack-objects $objdir/pack/pack <<-EOF &&
+			$(git rev-parse packed)
+			EOF
 
-commit e8d9fe63116478156180f7026f6c181cc60432c5
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
+			test_must_fail git multi-pack-index write --bitmap 2>err &&
+			grep "doesn.t have full closure" err &&
+			test_path_is_missing $midx
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) cca5daf] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+[master 50fe1f1] packed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 packed.t
+390347bc6f8f8d558b0e5de4029f69205094a364
+warning: Failed to write bitmap index. Packfile doesn't have full closure (object cca5dafc59fe86471e00a628c40aa7d8a947eb54 is missing)
+ok 297 - missing object closure fails gracefully
 
-    Commit #0
-ok 1 - setup
+expecting success of 5326.298 'setup partial bitmaps': 
+		test_commit packed &&
+		git repack &&
+		test_commit loose &&
+		git multi-pack-index write --bitmap &&
+		test_path_is_file $midx &&
+		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
+	
+[second 8f696af] packed
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 packed.t
+[second 37cdfb1] loose
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 loose.t
+ok 298 - setup partial bitmaps
 
-expecting success of 5400.2 'pack the source repository': 
-	git repack -a -d &&
-	git prune
+expecting success of 5326.299 'reverse index exists (midx)': 
+		GIT_TRACE2_EVENT=$(pwd)/event.trace \
+			git rev-list --test-bitmap "$commit" &&
 
-ok 2 - pack the source repository
+		if test "rev" = "$kind"
+		then
+			test_path_is_file $midx-$(midx_checksum $objdir).rev
+		fi &&
+		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
+	
+Bitmap v1 test (107 entries)
+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":"20241114T193646.822896Z-H5c947e1c-P00003680","thread":"main","time":"2024-11-14T19:36:46.823866Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001132,"t_rel":0.001132,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20241114T193652.823583Z-H5c947e1c-P000041d6","thread":"main","time":"2024-11-14T19:36:52.824767Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001341,"t_rel":0.001341,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+{"event":"data","sid":"20241114T193700.162334Z-H5c947e1c-P000050e8","thread":"main","time":"2024-11-14T19:37:00.163423Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001184,"t_rel":0.001184,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
+ok 299 - reverse index exists (midx)
 
-expecting success of 5400.3 'pack the destination repository': 
-	(
-		cd victim &&
-		git repack -a -d &&
-		git prune
-	)
+expecting success of 5326.300 'rev-list --test-bitmap verifies bitmaps': 
+		git rev-list --test-bitmap HEAD~
+	
+Bitmap v1 test (107 entries)
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
+Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
+OK!
+ok 300 - rev-list --test-bitmap verifies bitmaps
 
-ok 3 - pack the destination repository
+expecting success of 5326.301 'counting commits via bitmap (full bitmap, second)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 301 - counting commits via bitmap (full bitmap, second)
 
-expecting success of 5400.4 'refuse pushing rewound head without --force': 
-	pushed_head=$(git rev-parse --verify main) &&
-	victim_orig=$(cd victim && git rev-parse --verify main) &&
-	test_must_fail git send-pack ./victim main &&
-	victim_head=$(cd victim && git rev-parse --verify main) &&
-	test "$victim_head" = "$victim_orig" &&
-	# this should update
-	git send-pack --force ./victim main &&
-	victim_head=$(cd victim && git rev-parse --verify main) &&
-	test "$victim_head" = "$pushed_head"
+expecting success of 5326.302 'counting partial commits via bitmap (full 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 302 - counting partial commits via bitmap (full bitmap, second)
 
-To ./victim
- ! [rejected]        main -> main (non-fast-forward)
-remote: warning: updating the current branch        
-To ./victim
- + fbc8506...b1a1c97 main -> main (forced update)
-ok 4 - refuse pushing rewound head without --force
+expecting success of 5326.303 'counting commits with limit (full 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 303 - counting commits with limit (full bitmap, second)
 
-expecting success of 5400.5 'push can be used to delete a ref': 
-	( cd victim && git branch extra main ) &&
-	git send-pack ./victim :extra main &&
-	( cd victim &&
-	  test_must_fail git rev-parse --verify extra )
+expecting success of 5326.304 'counting non-linear history (full bitmap, second)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 304 - counting non-linear history (full bitmap, second)
 
-To ./victim
- - [deleted]         extra
-fatal: Needed a single revision
-ok 5 - push can be used to delete a ref
+expecting success of 5326.305 'counting commits with limiting (full 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 305 - counting commits with limiting (full bitmap, second)
 
-expecting success of 5400.6 'refuse deleting push with denyDeletes': 
-	(
-		cd victim &&
-		test_might_fail git branch -D extra &&
-		git config receive.denyDeletes true &&
-		git branch extra main
-	) &&
-	test_must_fail git send-pack ./victim :extra main
+expecting success of 5326.306 'counting objects via bitmap (full bitmap, second)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 306 - counting objects via bitmap (full bitmap, second)
 
-error: branch 'extra' not found
-remote: error: denying ref deletion for refs/heads/extra        
-To ./victim
- ! [remote rejected] extra (deletion prohibited)
-ok 6 - refuse deleting push with denyDeletes
+expecting success of 5326.307 'enumerate commits (full bitmap, second)': 
+		git rev-list --use-bitmap-index $branch >actual &&
+		git rev-list $branch >expect &&
+		test_bitmap_traversal --no-confirm-bitmaps expect actual
+	
+ok 307 - enumerate commits (full bitmap, second)
 
-expecting success of 5400.7 'cannot override denyDeletes with git -c send-pack': 
-	(
-		cd victim &&
-		test_might_fail git branch -D extra &&
-		git config receive.denyDeletes true &&
-		git branch extra main
-	) &&
-	test_must_fail git -c receive.denyDeletes=false \
-					send-pack ./victim :extra main
+expecting success of 5326.308 'enumerate --objects (full 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 308 - enumerate --objects (full bitmap, second)
 
-Deleted branch extra (was b1a1c97).
-remote: error: denying ref deletion for refs/heads/extra        
-To ./victim
- ! [remote rejected] extra (deletion prohibited)
-ok 7 - cannot override denyDeletes with git -c send-pack
+expecting success of 5326.309 'bitmap --objects handles non-commit objects (full bitmap, second)': 
+		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
+		grep $blob actual
+	
+782f60206c837dcd3d441e106549ad6f58de55b5
+ok 309 - bitmap --objects handles non-commit objects (full bitmap, second)
 
-expecting success of 5400.8 'override denyDeletes with git -c receive-pack': 
-	(
-		cd victim &&
-		test_might_fail git branch -D extra &&
-		git config receive.denyDeletes true &&
-		git branch extra main
-	) &&
-	git send-pack \
-		--receive-pack="git -c receive.denyDeletes=false receive-pack" \
-		./victim :extra main
+expecting success of 5326.310 'counting commits via bitmap (full bitmap, other)': 
+		git rev-list --count $branch >expect &&
+		git rev-list --use-bitmap-index --count $branch >actual &&
+		test_cmp expect actual
+	
+ok 310 - counting commits via bitmap (full bitmap, other)
 
-Deleted branch extra (was b1a1c97).
-To ./victim
- - [deleted]         extra
-ok 8 - override denyDeletes with git -c receive-pack
+expecting success of 5326.311 'counting partial commits via bitmap (full 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 311 - counting partial commits via bitmap (full bitmap, other)
 
-expecting success of 5400.9 'denyNonFastforwards trumps --force': 
-	(
-		cd victim &&
-		test_might_fail git branch -D extra &&
-		git config receive.denyNonFastforwards true
-	) &&
-	victim_orig=$(cd victim && git rev-parse --verify main) &&
-	test_must_fail git send-pack --force ./victim main^:main &&
-	victim_head=$(cd victim && git rev-parse --verify main) &&
-	test "$victim_orig" = "$victim_head"
+expecting success of 5326.312 'counting commits with limit (full 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 312 - counting commits with limit (full bitmap, other)
 
-error: branch 'extra' not found
-remote: warning: updating the current branch        
-remote: error: denying non-fast-forward refs/heads/main (you should pull first)        
-To ./victim
- ! [remote rejected] main^ -> main (non-fast-forward)
-ok 9 - denyNonFastforwards trumps --force
+expecting success of 5326.313 'counting non-linear history (full bitmap, other)': 
+		git rev-list --count other...second >expect &&
+		git rev-list --use-bitmap-index --count other...second >actual &&
+		test_cmp expect actual
+	
+ok 313 - counting non-linear history (full bitmap, other)
 
-expecting success of 5400.10 'send-pack --all sends all branches': 
-	# make sure we have at least 2 branches with different
-	# values, just to be thorough
-	git branch other-branch HEAD^ &&
+expecting success of 5326.314 'counting commits with limiting (full 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 314 - counting commits with limiting (full bitmap, other)
 
-	git init --bare all.git &&
-	git send-pack --all all.git &&
-	git for-each-ref refs/heads >expect &&
-	git -C all.git for-each-ref refs/heads >actual &&
-	test_cmp expect actual
+expecting success of 5326.315 'counting objects via bitmap (full bitmap, other)': 
+		git rev-list --count --objects $branch >expect &&
+		git rev-list --use-bitmap-index --count --objects $branch >actual &&
+		test_cmp expect actual
+	
+ok 315 - counting objects via bitmap (full bitmap, other)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/all.git/
-To all.git
- * [new branch]      main -> main
- * [new branch]      other-branch -> other-branch
-ok 10 - send-pack --all sends all branches
+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 5400.11 'push --all excludes remote-tracking hierarchy': 
-	mkdir parent &&
-	(
-		cd parent &&
-		git init && : >file && git add file && git commit -m add
-	) &&
-	git clone parent child &&
-	(
-		cd child && git push --all
-	) &&
-	(
-		cd parent &&
-		test -z "$(git for-each-ref refs/remotes/origin)"
-	)
+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)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) 9addffa] add
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Cloning into 'child'...
-done.
-Everything up-to-date
-ok 11 - push --all excludes remote-tracking hierarchy
+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 5400.12 'receive-pack runs auto-gc in remote repo': 
-	rm -rf parent child &&
-	git init parent &&
-	(
-		# Setup a repo with 2 packs
-		cd parent &&
-		echo "Some text" >file.txt &&
-		git add . &&
-		git commit -m "Initial commit" &&
-		git repack -adl &&
-		echo "Some more text" >>file.txt &&
-		git commit -a -m "Second commit" &&
-		git repack
-	) &&
-	cp -R parent child &&
-	(
-		# Set the child to auto-pack if more than one pack exists
-		cd child &&
-		git config gc.autopacklimit 1 &&
-		git config gc.autodetach false &&
-		git branch test_auto_gc &&
-		# And create a file that follows the temporary object naming
-		# convention for the auto-gc to remove
-		: >.git/objects/tmp_test_object &&
-		test-tool chmtime =-1209601 .git/objects/tmp_test_object
-	) &&
-	(
-		cd parent &&
-		echo "Even more text" >>file.txt &&
-		git commit -a -m "Third commit" &&
-		git send-pack ../child HEAD:refs/heads/test_auto_gc
-	) &&
-	test ! -e child/.git/objects/tmp_test_object
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) bdeab67] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.txt
-[main 5404fd0] Second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 1f665f1] Third commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To ../child
-   5404fd0..1f665f1  HEAD -> test_auto_gc
-ok 12 - receive-pack runs auto-gc in remote repo
+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 5400.13 'pushing explicit refspecs respects forcing': 
-	rewound_push_setup &&
-	parent_orig=$(cd parent && git rev-parse --verify main) &&
-	(
-		cd child &&
-		test_must_fail git send-pack ../parent \
-			refs/heads/main:refs/heads/main
-	) &&
-	parent_head=$(cd parent && git rev-parse --verify main) &&
-	test "$parent_orig" = "$parent_head" &&
-	(
-		cd child &&
-		git send-pack ../parent \
-			+refs/heads/main:refs/heads/main
-	) &&
-	parent_head=$(cd parent && git rev-parse --verify main) &&
-	child_head=$(cd child && git rev-parse --verify main) &&
-	test "$parent_head" = "$child_head"
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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
+---------------------------------------------------------------------
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) 14eeca9] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 43ab524] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'child'...
-done.
-HEAD is now at 14eeca9 one
-To ../parent
- ! [rejected]        main -> main (non-fast-forward)
-remote: warning: updating the current branch        
-To ../parent
- + 43ab524...14eeca9 main -> main (forced update)
-ok 13 - pushing explicit refspecs respects forcing
+ok 321 - setup further non-bitmapped commits
 
-expecting success of 5400.14 'pushing wildcard refspecs respects forcing': 
-	rewound_push_setup &&
-	parent_orig=$(cd parent && git rev-parse --verify main) &&
-	(
-		cd child &&
-		test_must_fail git send-pack ../parent \
-			"refs/heads/*:refs/heads/*"
-	) &&
-	parent_head=$(cd parent && git rev-parse --verify main) &&
-	test "$parent_orig" = "$parent_head" &&
-	(
-		cd child &&
-		git send-pack ../parent \
-			"+refs/heads/*:refs/heads/*"
-	) &&
-	parent_head=$(cd parent && git rev-parse --verify main) &&
-	child_head=$(cd child && git rev-parse --verify main) &&
-	test "$parent_head" = "$child_head"
+expecting success of 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)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) 14eeca9] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 43ab524] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'child'...
-done.
-HEAD is now at 14eeca9 one
-To ../parent
- ! [rejected]        main -> main (non-fast-forward)
-remote: warning: updating the current branch        
-To ../parent
- + 43ab524...14eeca9 main -> main (forced update)
-ok 14 - pushing wildcard refspecs respects forcing
+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 5400.15 'deny pushing to delete current branch': 
-	rewound_push_setup &&
-	(
-		cd child &&
-		test_must_fail git send-pack ../parent :refs/heads/main 2>errs
-	)
+expecting success of 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)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/parent/.git/
-[main (root-commit) 14eeca9] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 43ab524] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Cloning into 'child'...
-done.
-HEAD is now at 14eeca9 one
-ok 15 - deny pushing to delete current branch
+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 5400.16 'receive-pack de-dupes .have lines': 
-	git init shared &&
-	git -C shared commit --allow-empty -m both &&
-	git clone -s shared fork &&
-	(
-		cd shared &&
-		git checkout -b only-shared &&
-		git commit --allow-empty -m only-shared &&
-		git update-ref refs/heads/foo HEAD
-	) &&
+expecting success of 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)
 
-	# Notable things in this expectation:
-	#  - local refs are not de-duped
-	#  - .have does not duplicate locals
-	#  - .have does not duplicate itself
-	local=$(git -C fork rev-parse HEAD) &&
-	shared=$(git -C shared rev-parse only-shared) &&
-	cat >expect <<-EOF &&
-	$local refs/heads/main
-	$local refs/remotes/origin/HEAD
-	$local refs/remotes/origin/main
-	$shared .have
-	EOF
+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)
 
-	GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \
-	git push \
-		--receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
-		fork HEAD:foo &&
-	extract_ref_advertisement <trace >refs &&
-	test_cmp expect refs
+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)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5400-send-pack/shared/.git/
-[main (root-commit) 5285e17] both
- Author: A U Thor <author@example.com>
-Cloning into 'fork'...
-done.
-Switched to a new branch 'only-shared'
-[only-shared 53d9066] only-shared
- Author: A U Thor <author@example.com>
-To fork
- * [new branch]      HEAD -> foo
-ok 16 - receive-pack de-dupes .have lines
+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)
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5407-post-rewrite-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5407-post-rewrite-hook/.git/
-expecting success of 5407.1 'setup': 
-	test_commit A foo A &&
-	test_commit B foo B &&
-	test_commit C foo C &&
-	test_commit D foo D &&
-	git checkout A^0 &&
-	test_commit E bar E &&
-	test_commit F foo F &&
-	git checkout B &&
-	git merge E &&
-	git tag merge-E &&
-	test_commit G G &&
-	test_commit H H &&
-	test_commit I I &&
-	git checkout main &&
+expecting success of 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)
 
-	test_hook --setup post-rewrite <<-EOF
-	echo \$@ > "$TRASH_DIRECTORY"/post-rewrite.args
-	cat > "$TRASH_DIRECTORY"/post-rewrite.data
-	EOF
+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)
 
-[main (root-commit) be6e19b] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main df02547] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2362ae8] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main babc8a4] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: switching to 'A^0'.
+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)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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)
 
-If you want to 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 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)
 
-  git switch -c <new-branch-name>
+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)
 
-Or undo this operation with:
+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)
 
-  git switch -
+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)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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)
 
-HEAD is now at be6e19b A
-[detached HEAD 5baa167] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[detached HEAD 38c24e8] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Previous HEAD position was 38c24e8 F
-HEAD is now at df02547 B
-Merge made by the 'ort' strategy.
- bar | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[detached HEAD 8b1f855] G
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G
-[detached HEAD 33a20ae] H
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 H
-[detached HEAD dda16b5] I
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 I
-Previous HEAD position was dda16b5 I
-Switched to branch 'main'
-ok 1 - setup
+expecting success of 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 5407.2 'git commit --amend': 
-	clear_hook_input &&
-	echo "D new message" > newmsg &&
-	oldsha=$(git rev-parse HEAD^0) &&
-	git commit -Fnewmsg --amend &&
-	echo amend > expected.args &&
-	echo $oldsha $(git rev-parse HEAD^0) > expected.data &&
-	verify_hook_input
+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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
+   37cdfb1..8935311  second     -> second
+ok 340 - fetch (partial bitmap)
 
-[main ebd82eb] D new message
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - git commit --amend
+expecting success of 5326.341 'enumerating progress counts pack-reused objects': 
+		count=$(git rev-list --objects --all --count) &&
+		git repack -adb &&
 
-expecting success of 5407.3 'git commit --amend --no-post-rewrite': 
-	clear_hook_input &&
-	echo "D new message again" > newmsg &&
-	git commit --no-post-rewrite -Fnewmsg --amend &&
-	test ! -f post-rewrite.args &&
-	test ! -f post-rewrite.data
+		# 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 &&
 
-[main 5e7f7a8] D new message again
+		# 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>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - git commit --amend --no-post-rewrite
-
-expecting success of 5407.4 'git rebase --apply': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase --apply --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-First, rewinding head to replay your work on top of it...
-Applying: C
-Using index info to reconstruct a base tree...
-M	foo
-Falling back to patching base and 3-way merge...
-Merging:
-be6e19b A
-virtual C
-found 1 common ancestor:
-virtual e6a635ee70776f6585de405639ebebd74da5c390
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 C
-Applying: C
-Applying: D
-ok 4 - git rebase --apply
-
-expecting success of 5407.5 'git rebase --apply --skip': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase --apply --onto A B &&
-	test_must_fail git rebase --skip &&
-	echo D > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
-
-HEAD is now at babc8a4 D
-First, rewinding head to replay your work on top of it...
-Applying: C
-Using index info to reconstruct a base tree...
-M	foo
-Falling back to patching base and 3-way merge...
-Merging:
-be6e19b A
-virtual C
-found 1 common ancestor:
-virtual e6a635ee70776f6585de405639ebebd74da5c390
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0001 C
-Applying: D
-Using index info to reconstruct a base tree...
-M	foo
-Falling back to patching base and 3-way merge...
-Merging:
-be6e19b A
-virtual D
-found 1 common ancestor:
-virtual a0d64960e32dc5d0cf8eff7ded11a413a31c0891
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0002 D
-Applying: D
-ok 5 - git rebase --apply --skip
+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 5407.6 'git rebase --apply --skip the last one': 
-	git reset --hard F &&
-	clear_hook_input &&
-	test_must_fail git rebase --apply --onto D A &&
-	git rebase --skip &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse E) $(git rev-parse HEAD)
-	$(git rev-parse F) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+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 &&
 
-HEAD is now at 38c24e8 F
-First, rewinding head to replay your work on top of it...
-Applying: E
-Applying: F
-Using index info to reconstruct a base tree...
-M	foo
-Falling back to patching base and 3-way merge...
-Merging:
-0aed93c E
-virtual F
-found 1 common ancestor:
-virtual bdb58bd8ea55127260d069a5e7ee2995726633f9
-Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch=diff' to see the failed patch
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Patch failed at 0002 F
-ok 6 - git rebase --apply --skip the last one
+			# Write a MIDX and bitmap; remove the MIDX but leave the bitmap.
+			stale_bitmap=$midx-$(midx_checksum $objdir).bitmap &&
+			rm $midx &&
 
-expecting success of 5407.7 'git rebase -m': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase -m --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+			# Then write a new MIDX.
+			test_commit new &&
+			git repack &&
+			git multi-pack-index write --bitmap &&
 
-HEAD is now at babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 2362ae8... C
-[detached HEAD 67a07b9] C
+			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.45.2/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(+), 1 deletion(-)
-Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/main.
-ok 7 - git rebase -m
+ 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 5407.8 'git rebase -m --skip': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase -m --onto A B &&
-	test_must_fail git rebase --skip &&
-	echo D > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+expecting success of 5326.343 'pack.preferBitmapTips': 
+		git init repo &&
+		test_when_finished "rm -fr repo" &&
+		(
+			cd repo &&
+			git config pack.writeBitmapLookupTable false &&
 
-HEAD is now at babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 2362ae8... C
-Rebasing (2/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply babc8a4... D
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply babc8a4... D
-[detached HEAD 9aefc10] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated refs/heads/main.
-ok 8 - git rebase -m --skip
+			test_commit_bulk --message="%s" 103 &&
 
-expecting success of 5407.9 'git rebase with implicit use of merge backend': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase --keep-empty --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+			git log --format="%H" >commits.raw &&
+			sort <commits.raw >commits &&
 
-HEAD is now at babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 2362ae8... C
-[detached HEAD 67a07b9] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/main.
-ok 9 - git rebase with implicit use of merge backend
+			git log --format="create refs/tags/%s %H" HEAD >refs &&
+			git update-ref --stdin <refs &&
 
-expecting success of 5407.10 'git rebase --skip with implicit use of merge backend': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_must_fail git rebase --keep-empty --onto A B &&
-	test_must_fail git rebase --skip &&
-	echo D > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+			git multi-pack-index write --bitmap &&
+			test_path_is_file $midx &&
+			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-HEAD is now at babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 2362ae8... C
-Rebasing (2/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply babc8a4... D
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply babc8a4... D
-[detached HEAD 9aefc10] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated refs/heads/main.
-ok 10 - git rebase --skip with implicit use of merge backend
+			test-tool bitmap list-commits | sort >bitmaps &&
+			comm -13 bitmaps commits >before &&
+			test_line_count = 1 before &&
 
-expecting success of 5407.11 'git rebase with failed pick': 
-	clear_hook_input &&
-	cat >todo <<-\EOF &&
-	exec >bar
-	merge -C merge-E E
-	exec >G
-	pick G
-	exec >H 2>I
-	pick H
-	fixup I
-	EOF
+			perl -ne "printf(\"create refs/tags/include/%d \", $.); print" \
+				<before | git update-ref --stdin &&
 
-	(
-		set_replace_editor todo &&
-		test_must_fail git rebase -i D D 2>err
-	) &&
-	grep "would be overwritten" err &&
-	rm bar &&
+			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+			rm -fr $midx &&
 
-	test_must_fail git rebase --continue 2>err &&
-	grep "would be overwritten" err &&
-	rm G &&
+			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_must_fail git rebase --continue 2>err &&
-	grep "would be overwritten" err &&
-	rm H &&
+			! test_cmp before after
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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
+---------------------------------------------------------------------
 
-	test_must_fail git rebase --continue 2>err &&
-	grep "would be overwritten" err &&
-	rm I &&
+--- before	2024-11-14 19:37:04.462300183 +0000
++++ after	2024-11-14 19:37:04.678302382 +0000
+@@ -1 +1 @@
+-a09427aadc45553b705d3a726a24ceeaa43874f0
++e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
+ok 343 - pack.preferBitmapTips
 
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse merge-E) $(git rev-parse HEAD~2)
-	$(git rev-parse G) $(git rev-parse HEAD~1)
-	$(git rev-parse H) $(git rev-parse HEAD)
-	$(git rev-parse I) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+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 &&
 
-rebase -i script after editing:
-exec >bar
-merge -C merge-E E
-exec >G
-pick G
-exec >H 2>I
-pick H
-fixup I
-Rebasing (2/7)
error: The following untracked working tree files would be overwritten by merge:
-Rebasing (5/8)
error: The following untracked working tree files would be overwritten by merge:
-Rebasing (8/9)
error: The following untracked working tree files would be overwritten by merge:
-Rebasing (9/10)
Rebasing (10/10)
error: The following untracked working tree files would be overwritten by merge:
-Rebasing (11/11)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 11 - git rebase with failed pick
+			test_commit one &&
+			test_commit two &&
 
-expecting success of 5407.12 'git rebase -i (unchanged)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_fail_interactive_rebase "1 2" --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+			git rev-parse one >snapshot &&
 
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 C
-pick babc8a4 D
+			git repack -ad &&
 
-rebase -i script after editing:
-pick 2362ae8 C
-pick babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 2362ae8... C
-[detached HEAD 67a07b9] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 12 - git rebase -i (unchanged)
+			# 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 5407.13 'git rebase -i (skip)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_fail_interactive_rebase "2" --onto A B &&
-	echo D > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+			test_path_is_file $midx &&
+			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 C
-pick babc8a4 D
+			test-tool bitmap list-commits | sort >bitmaps &&
+			grep "$(git rev-parse one)" bitmaps &&
+			grep "$(git rev-parse two)" bitmaps &&
 
-rebase -i script after editing:
-pick babc8a4 D
-Rebasing (1/1)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply babc8a4... D
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply babc8a4... D
-[detached HEAD 9aefc10] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 13 - git rebase -i (skip)
+			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+			rm -fr $midx &&
 
-expecting success of 5407.14 'git rebase -i (squash)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	test_fail_interactive_rebase "1 squash 2" --onto A B &&
-	echo C > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+			# Then again, but with a refs snapshot which only sees
+			# refs/tags/one.
+			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
 
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 C
-pick babc8a4 D
+			test_path_is_file $midx &&
+			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-rebase -i script after editing:
-pick 2362ae8 C
-squash babc8a4 D
-Rebasing (1/2)
Auto-merging foo
-CONFLICT (content): Merge conflict in foo
-error: could not apply 2362ae8... C
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 2362ae8... C
-[detached HEAD 67a07b9] C
+			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.45.2/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(+), 1 deletion(-)
-Rebasing (2/2)
[detached HEAD 1018f76] C
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 3d96559] two
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 14 - git rebase -i (squash)
-
-expecting success of 5407.15 'git rebase -i (fixup without conflict)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	FAKE_LINES="1 fixup 2" git rebase -i B &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+9b01d555d17b903201cacf13508d9da2598a89a5
+3d9655938dbedf871db7ad3f79a0636d8d0acc16
+9b01d555d17b903201cacf13508d9da2598a89a5
+ok 344 - writing a bitmap with --refs-snapshot
 
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 C
-pick babc8a4 D
+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 &&
 
-rebase -i script after editing:
-pick 2362ae8 C
-fixup babc8a4 D
-Rebasing (2/2)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 15 - git rebase -i (fixup without conflict)
+			test_commit_bulk --message="%s" 103 &&
 
-expecting success of 5407.16 'git rebase -i (double edit)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	FAKE_LINES="edit 1 edit 2" git rebase -i B &&
-	git rebase --continue &&
-	echo something > foo &&
-	git add foo &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+			git log --format="%H" >commits.raw &&
+			sort <commits.raw >commits &&
 
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 C
-pick babc8a4 D
+			git log --format="create refs/tags/%s %H" HEAD >refs &&
+			git update-ref --stdin <refs &&
 
-rebase -i script after editing:
-edit 2362ae8 C
-edit babc8a4 D
-Rebasing (1/2)

                                                                                
Stopped at 2362ae8...  C
-You can amend the commit now, with
+			git multi-pack-index write --bitmap &&
+			test_path_is_file $midx &&
+			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
 
-  git commit --amend 
+			test-tool bitmap list-commits | sort >bitmaps &&
+			comm -13 bitmaps commits >before &&
+			test_line_count = 1 before &&
 
-Once you are satisfied with your changes, run
+			(
+				grep -vf before commits.raw &&
+				# mark missing commits as preferred
+				sed "s/^/+/" before
+			) >snapshot &&
 
-  git rebase --continue
-Rebasing (2/2)

                                                                                
Stopped at babc8a4...  D
-You can amend the commit now, with
+			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
+			rm -fr $midx &&
 
-  git commit --amend 
+			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+			test-tool bitmap list-commits | sort >bitmaps &&
+			comm -13 bitmaps commits >after &&
 
-Once you are satisfied with your changes, run
+			! test_cmp before after
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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
+---------------------------------------------------------------------
 
-  git rebase --continue
-[detached HEAD 52eb20e] D
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
                                                                                
Successfully rebased and updated detached HEAD.
-ok 16 - git rebase -i (double edit)
+--- before	2024-11-14 19:37:05.974315577 +0000
++++ after	2024-11-14 19:37:06.238318265 +0000
+@@ -1 +1 @@
+-a09427aadc45553b705d3a726a24ceeaa43874f0
++e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
+ok 345 - write a bitmap with --refs-snapshot (preferred tips)
 
-expecting success of 5407.17 'git rebase -i (exec)': 
-	git reset --hard D &&
-	clear_hook_input &&
-	FAKE_LINES="edit 1 exec_false 2" git rebase -i B &&
-	echo something >bar &&
-	git add bar &&
-	# Fails because of exec false
-	test_must_fail git rebase --continue &&
-	git rebase --continue &&
-	echo rebase >expected.args &&
-	cat >expected.data <<-EOF &&
-	$(git rev-parse C) $(git rev-parse HEAD^)
-	$(git rev-parse D) $(git rev-parse HEAD)
-	EOF
-	verify_hook_input
+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 &&
 
-HEAD is now at babc8a4 D
-rebase -i script before editing:
-pick 2362ae8 C
-pick babc8a4 D
+			test_commit base &&
+			test_commit base2 &&
+			git repack -adb &&
 
-rebase -i script after editing:
-edit 2362ae8 C
-exec false
-pick babc8a4 D
-Rebasing (1/3)

                                                                                
Stopped at 2362ae8...  C
-You can amend the commit now, with
+			test-tool bitmap dump-hashes >pack.raw &&
+			test_file_not_empty pack.raw &&
+			sort pack.raw >pack.hashes &&
 
-  git commit --amend 
+			test_commit new &&
+			git repack &&
+			git multi-pack-index write --bitmap &&
 
-Once you are satisfied with your changes, run
+			test-tool bitmap dump-hashes >midx.raw &&
+			sort midx.raw >midx.hashes &&
 
-  git rebase --continue
-[detached HEAD b4a6059] C
+			# 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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
+[master (root-commit) 099797b] base
  Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:15:13 2005 -0700
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 bar
-Rebasing (2/3)

                                                                                
Executing: false
-warning: execution failed: false
-You can fix the problem, and then run
+ 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
 
-  git rebase --continue
+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
 
-Rebasing (3/3)

                                                                                
Successfully rebased and updated detached HEAD.
-ok 17 - git rebase -i (exec)
+			git multi-pack-index write --bitmap --stdin-packs \
+				<packs 2>err &&
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5502-quickfetch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5502-quickfetch/.git/
-expecting success of 5502.1 'setup': 
+			grep "bitmap without any objects" err &&
 
-	test_tick &&
-	echo ichi >file &&
-	git add file &&
-	git commit -m initial &&
+			test_path_is_file $midx &&
+			test_path_is_missing $midx-$(midx_checksum $objdir).bitmap
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-	cnt=$( (
-		git count-objects | sed -e "s/ *objects,.*//"
-	) ) &&
-	test $cnt -eq 3
+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 &&
 
-[main (root-commit) f3b89bf] initial
+			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.45.2/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 file
-ok 1 - setup
-
-expecting success of 5502.2 'clone without alternate': 
+ 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" &&
 	(
-		mkdir cloned &&
-		cd cloned &&
-		git init-db &&
-		git remote add -f origin ..
-	) &&
-	cnt=$( (
-		cd cloned &&
-		git count-objects | sed -e "s/ *objects,.*//"
-	) ) &&
-	test $cnt -eq 3
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5502-quickfetch/cloned/.git/
-Updating origin
-From ..
- * [new branch]      main       -> origin/main
-ok 2 - clone without alternate
-
-expecting success of 5502.3 'further commits in the original': 
-
-	test_tick &&
-	echo ni >file &&
-	git commit -a -m second &&
-
-	cnt=$( (
-		git count-objects | sed -e "s/ *objects,.*//"
-	) ) &&
-	test $cnt -eq 6
+		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
+	)
 
-[main 12e0958] second
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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(+), 1 deletion(-)
-ok 3 - further commits in the original
-
-expecting success of 5502.4 'copy commit and tree but not blob by hand': 
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+{"event":"region_enter","sid":"20241114T193708.689990Z-H5c947e1c-P00005c44","thread":"main","time":"2024-11-14T19:37:08.691983Z","file":"pack-bitmap-write.c","line":733,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+{"event":"region_leave","sid":"20241114T193708.689990Z-H5c947e1c-P00005c44","thread":"main","time":"2024-11-14T19:37:08.691994Z","file":"pack-bitmap-write.c","line":760,"repo":1,"t_rel":0.000013,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
+ok 349 - multi-pack-index write writes lookup table if enabled
 
-	git rev-list --objects HEAD |
-	git pack-objects --stdout |
+expecting success of 5326.350 'preferred pack change with existing MIDX bitmap': 
+	git init preferred-pack-with-existing &&
 	(
-		cd cloned &&
-		git unpack-objects
-	) &&
-
-	cnt=$( (
-		cd cloned &&
-		git count-objects | sed -e "s/ *objects,.*//"
-	) ) &&
-	test $cnt -eq 6 &&
-
-	blob=$(git rev-parse HEAD:file | sed -e "s|..|&/|") &&
-	test -f "cloned/.git/objects/$blob" &&
-	rm -f "cloned/.git/objects/$blob" &&
-
-	cnt=$( (
-		cd cloned &&
-		git count-objects | sed -e "s/ *objects,.*//"
-	) ) &&
-	test $cnt -eq 5
+		cd preferred-pack-with-existing &&
 
+		test_commit base &&
+		test_commit other &&
 
-ok 4 - copy commit and tree but not blob by hand
+		git rev-list --objects --no-object-names base >p1.objects &&
+		git rev-list --objects --no-object-names other >p2.objects &&
 
-expecting success of 5502.5 'quickfetch should not leave a corrupted repository': 
+		p1="$(git pack-objects "$objdir/pack/pack" \
+			--delta-base-offset <p1.objects)" &&
+		p2="$(git pack-objects "$objdir/pack/pack" \
+			--delta-base-offset <p2.objects)" &&
 
-	(
-		cd cloned &&
-		git fetch
-	) &&
+		# 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 &&
 
-	cnt=$( (
-		cd cloned &&
-		git count-objects | sed -e "s/ *objects,.*//"
-	) ) &&
-	test $cnt -eq 6
+		# 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 &&
 
-From ..
-   f3b89bf..12e0958  main       -> origin/main
-ok 5 - quickfetch should not leave a corrupted repository
+		# When the above circumstances are met, the preferred
+		# pack should change appropriately and clones should
+		# (still) succeed.
+		git clone --no-local . clone2
+	)
 
-expecting success of 5502.6 'quickfetch should not copy from alternate': 
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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" &&
 	(
-		mkdir quickclone &&
-		cd quickclone &&
-		git init-db &&
-		(cd ../.git/objects && pwd) >.git/objects/info/alternates &&
-		git remote add origin .. &&
-		git fetch -k -k
-	) &&
-	obj_cnt=$( (
-		cd quickclone &&
-		git count-objects | sed -e "s/ *objects,.*//"
-	) ) &&
-	pck_cnt=$( (
-		cd quickclone &&
-		git count-objects -v | sed -n -e "/packs:/{
-				s/packs://
-				p
-				q
-			}"
-	) ) &&
-	origin_main=$( (
-		cd quickclone &&
-		git rev-parse origin/main
-	) ) &&
-	echo "loose objects: $obj_cnt, packfiles: $pck_cnt" &&
-	test $obj_cnt -eq 0 &&
-	test $pck_cnt -eq 0 &&
-	test z$origin_main = z$(git rev-parse main)
+		cd repo &&
 
+		test_commit --annotate base &&
+		git repack -d &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5502-quickfetch/quickclone/.git/
-From ..
- * [new branch]      main       -> origin/main
-loose objects: 0, packfiles:  0
-ok 6 - quickfetch should not copy from alternate
+		# 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 &&
 
-expecting success of 5502.7 'quickfetch should handle ~1000 refs (on Windows)': 
+		git multi-pack-index write --bitmap &&
 
-	git gc &&
-	head=$(git rev-parse HEAD) &&
-	branchprefix="$head refs/heads/branch" &&
-	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
-			for k in 0 1 2 3 4 5 6 7 8 9; do
-				echo "$branchprefix$i$j$k" >> .git/packed-refs || return 1
-			done
-		done
-	done &&
-	(
-		cd cloned &&
-		git fetch &&
-		git fetch
+		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.45.2/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'.
 
-From ..
- * [new branch]      branch000  -> origin/branch000
- * [new branch]      branch001  -> origin/branch001
- * [new branch]      branch002  -> origin/branch002
- * [new branch]      branch003  -> origin/branch003
- * [new branch]      branch004  -> origin/branch004
- * [new branch]      branch005  -> origin/branch005
- * [new branch]      branch006  -> origin/branch006
- * [new branch]      branch007  -> origin/branch007
- * [new branch]      branch008  -> origin/branch008
- * [new branch]      branch009  -> origin/branch009
- * [new branch]      branch010  -> origin/branch010
- * [new branch]      branch011  -> origin/branch011
- * [new branch]      branch012  -> origin/branch012
- * [new branch]      branch013  -> origin/branch013
- * [new branch]      branch014  -> origin/branch014
- * [new branch]      branch015  -> origin/branch015
- * [new branch]      branch016  -> origin/branch016
- * [new branch]      branch017  -> origin/branch017
- * [new branch]      branch018  -> origin/branch018
- * [new branch]      branch019  -> origin/branch019
- * [new branch]      branch020  -> origin/branch020
- * [new branch]      branch021  -> origin/branch021
- * [new branch]      branch022  -> origin/branch022
- * [new branch]      branch023  -> origin/branch023
- * [new branch]      branch024  -> origin/branch024
- * [new branch]      branch025  -> origin/branch025
- * [new branch]      branch026  -> origin/branch026
- * [new branch]      branch027  -> origin/branch027
- * [new branch]      branch028  -> origin/branch028
- * [new branch]      branch029  -> origin/branch029
- * [new branch]      branch030  -> origin/branch030
- * [new branch]      branch031  -> origin/branch031
- * [new branch]      branch032  -> origin/branch032
- * [new branch]      branch033  -> origin/branch033
- * [new branch]      branch034  -> origin/branch034
- * [new branch]      branch035  -> origin/branch035
- * [new branch]      branch036  -> origin/branch036
- * [new branch]      branch037  -> origin/branch037
- * [new branch]      branch038  -> origin/branch038
- * [new branch]      branch039  -> origin/branch039
- * [new branch]      branch040  -> origin/branch040
- * [new branch]      branch041  -> origin/branch041
- * [new branch]      branch042  -> origin/branch042
- * [new branch]      branch043  -> origin/branch043
- * [new branch]      branch044  -> origin/branch044
- * [new branch]      branch045  -> origin/branch045
- * [new branch]      branch046  -> origin/branch046
- * [new branch]      branch047  -> origin/branch047
- * [new branch]      branch048  -> origin/branch048
- * [new branch]      branch049  -> origin/branch049
- * [new branch]      branch050  -> origin/branch050
- * [new branch]      branch051  -> origin/branch051
- * [new branch]      branch052  -> origin/branch052
- * [new branch]      branch053  -> origin/branch053
- * [new branch]      branch054  -> origin/branch054
- * [new branch]      branch055  -> origin/branch055
- * [new branch]      branch056  -> origin/branch056
- * [new branch]      branch057  -> origin/branch057
- * [new branch]      branch058  -> origin/branch058
- * [new branch]      branch059  -> origin/branch059
- * [new branch]      branch060  -> origin/branch060
- * [new branch]      branch061  -> origin/branch061
- * [new branch]      branch062  -> origin/branch062
- * [new branch]      branch063  -> origin/branch063
- * [new branch]      branch064  -> origin/branch064
- * [new branch]      branch065  -> origin/branch065
- * [new branch]      branch066  -> origin/branch066
- * [new branch]      branch067  -> origin/branch067
- * [new branch]      branch068  -> origin/branch068
- * [new branch]      branch069  -> origin/branch069
- * [new branch]      branch070  -> origin/branch070
- * [new branch]      branch071  -> origin/branch071
- * [new branch]      branch072  -> origin/branch072
- * [new branch]      branch073  -> origin/branch073
- * [new branch]      branch074  -> origin/branch074
- * [new branch]      branch075  -> origin/branch075
- * [new branch]      branch076  -> origin/branch076
- * [new branch]      branch077  -> origin/branch077
- * [new branch]      branch078  -> origin/branch078
- * [new branch]      branch079  -> origin/branch079
- * [new branch]      branch080  -> origin/branch080
- * [new branch]      branch081  -> origin/branch081
- * [new branch]      branch082  -> origin/branch082
- * [new branch]      branch083  -> origin/branch083
- * [new branch]      branch084  -> origin/branch084
- * [new branch]      branch085  -> origin/branch085
- * [new branch]      branch086  -> origin/branch086
- * [new branch]      branch087  -> origin/branch087
- * [new branch]      branch088  -> origin/branch088
- * [new branch]      branch089  -> origin/branch089
- * [new branch]      branch090  -> origin/branch090
- * [new branch]      branch091  -> origin/branch091
- * [new branch]      branch092  -> origin/branch092
- * [new branch]      branch093  -> origin/branch093
- * [new branch]      branch094  -> origin/branch094
- * [new branch]      branch095  -> origin/branch095
- * [new branch]      branch096  -> origin/branch096
- * [new branch]      branch097  -> origin/branch097
- * [new branch]      branch098  -> origin/branch098
- * [new branch]      branch099  -> origin/branch099
- * [new branch]      branch100  -> origin/branch100
- * [new branch]      branch101  -> origin/branch101
- * [new branch]      branch102  -> origin/branch102
- * [new branch]      branch103  -> origin/branch103
- * [new branch]      branch104  -> origin/branch104
- * [new branch]      branch105  -> origin/branch105
- * [new branch]      branch106  -> origin/branch106
- * [new branch]      branch107  -> origin/branch107
- * [new branch]      branch108  -> origin/branch108
- * [new branch]      branch109  -> origin/branch109
- * [new branch]      branch110  -> origin/branch110
- * [new branch]      branch111  -> origin/branch111
- * [new branch]      branch112  -> origin/branch112
- * [new branch]      branch113  -> origin/branch113
- * [new branch]      branch114  -> origin/branch114
- * [new branch]      branch115  -> origin/branch115
- * [new branch]      branch116  -> origin/branch116
- * [new branch]      branch117  -> origin/branch117
- * [new branch]      branch118  -> origin/branch118
- * [new branch]      branch119  -> origin/branch119
- * [new branch]      branch120  -> origin/branch120
- * [new branch]      branch121  -> origin/branch121
- * [new branch]      branch122  -> origin/branch122
- * [new branch]      branch123  -> origin/branch123
- * [new branch]      branch124  -> origin/branch124
- * [new branch]      branch125  -> origin/branch125
- * [new branch]      branch126  -> origin/branch126
- * [new branch]      branch127  -> origin/branch127
- * [new branch]      branch128  -> origin/branch128
- * [new branch]      branch129  -> origin/branch129
- * [new branch]      branch130  -> origin/branch130
- * [new branch]      branch131  -> origin/branch131
- * [new branch]      branch132  -> origin/branch132
- * [new branch]      branch133  -> origin/branch133
- * [new branch]      branch134  -> origin/branch134
- * [new branch]      branch135  -> origin/branch135
- * [new branch]      branch136  -> origin/branch136
- * [new branch]      branch137  -> origin/branch137
- * [new branch]      branch138  -> origin/branch138
- * [new branch]      branch139  -> origin/branch139
- * [new branch]      branch140  -> origin/branch140
- * [new branch]      branch141  -> origin/branch141
- * [new branch]      branch142  -> origin/branch142
- * [new branch]      branch143  -> origin/branch143
- * [new branch]      branch144  -> origin/branch144
- * [new branch]      branch145  -> origin/branch145
- * [new branch]      branch146  -> origin/branch146
- * [new branch]      branch147  -> origin/branch147
- * [new branch]      branch148  -> origin/branch148
- * [new branch]      branch149  -> origin/branch149
- * [new branch]      branch150  -> origin/branch150
- * [new branch]      branch151  -> origin/branch151
- * [new branch]      branch152  -> origin/branch152
- * [new branch]      branch153  -> origin/branch153
- * [new branch]      branch154  -> origin/branch154
- * [new branch]      branch155  -> origin/branch155
- * [new branch]      branch156  -> origin/branch156
- * [new branch]      branch157  -> origin/branch157
- * [new branch]      branch158  -> origin/branch158
- * [new branch]      branch159  -> origin/branch159
- * [new branch]      branch160  -> origin/branch160
- * [new branch]      branch161  -> origin/branch161
- * [new branch]      branch162  -> origin/branch162
- * [new branch]      branch163  -> origin/branch163
- * [new branch]      branch164  -> origin/branch164
- * [new branch]      branch165  -> origin/branch165
- * [new branch]      branch166  -> origin/branch166
- * [new branch]      branch167  -> origin/branch167
- * [new branch]      branch168  -> origin/branch168
- * [new branch]      branch169  -> origin/branch169
- * [new branch]      branch170  -> origin/branch170
- * [new branch]      branch171  -> origin/branch171
- * [new branch]      branch172  -> origin/branch172
- * [new branch]      branch173  -> origin/branch173
- * [new branch]      branch174  -> origin/branch174
- * [new branch]      branch175  -> origin/branch175
- * [new branch]      branch176  -> origin/branch176
- * [new branch]      branch177  -> origin/branch177
- * [new branch]      branch178  -> origin/branch178
- * [new branch]      branch179  -> origin/branch179
- * [new branch]      branch180  -> origin/branch180
- * [new branch]      branch181  -> origin/branch181
- * [new branch]      branch182  -> origin/branch182
- * [new branch]      branch183  -> origin/branch183
- * [new branch]      branch184  -> origin/branch184
- * [new branch]      branch185  -> origin/branch185
- * [new branch]      branch186  -> origin/branch186
- * [new branch]      branch187  -> origin/branch187
- * [new branch]      branch188  -> origin/branch188
- * [new branch]      branch189  -> origin/branch189
- * [new branch]      branch190  -> origin/branch190
- * [new branch]      branch191  -> origin/branch191
- * [new branch]      branch192  -> origin/branch192
- * [new branch]      branch193  -> origin/branch193
- * [new branch]      branch194  -> origin/branch194
- * [new branch]      branch195  -> origin/branch195
- * [new branch]      branch196  -> origin/branch196
- * [new branch]      branch197  -> origin/branch197
- * [new branch]      branch198  -> origin/branch198
- * [new branch]      branch199  -> origin/branch199
- * [new branch]      branch200  -> origin/branch200
- * [new branch]      branch201  -> origin/branch201
- * [new branch]      branch202  -> origin/branch202
- * [new branch]      branch203  -> origin/branch203
- * [new branch]      branch204  -> origin/branch204
- * [new branch]      branch205  -> origin/branch205
- * [new branch]      branch206  -> origin/branch206
- * [new branch]      branch207  -> origin/branch207
- * [new branch]      branch208  -> origin/branch208
- * [new branch]      branch209  -> origin/branch209
- * [new branch]      branch210  -> origin/branch210
- * [new branch]      branch211  -> origin/branch211
- * [new branch]      branch212  -> origin/branch212
- * [new branch]      branch213  -> origin/branch213
- * [new branch]      branch214  -> origin/branch214
- * [new branch]      branch215  -> origin/branch215
- * [new branch]      branch216  -> origin/branch216
- * [new branch]      branch217  -> origin/branch217
- * [new branch]      branch218  -> origin/branch218
- * [new branch]      branch219  -> origin/branch219
- * [new branch]      branch220  -> origin/branch220
- * [new branch]      branch221  -> origin/branch221
- * [new branch]      branch222  -> origin/branch222
- * [new branch]      branch223  -> origin/branch223
- * [new branch]      branch224  -> origin/branch224
- * [new branch]      branch225  -> origin/branch225
- * [new branch]      branch226  -> origin/branch226
- * [new branch]      branch227  -> origin/branch227
- * [new branch]      branch228  -> origin/branch228
- * [new branch]      branch229  -> origin/branch229
- * [new branch]      branch230  -> origin/branch230
- * [new branch]      branch231  -> origin/branch231
- * [new branch]      branch232  -> origin/branch232
- * [new branch]      branch233  -> origin/branch233
- * [new branch]      branch234  -> origin/branch234
- * [new branch]      branch235  -> origin/branch235
- * [new branch]      branch236  -> origin/branch236
- * [new branch]      branch237  -> origin/branch237
- * [new branch]      branch238  -> origin/branch238
- * [new branch]      branch239  -> origin/branch239
- * [new branch]      branch240  -> origin/branch240
- * [new branch]      branch241  -> origin/branch241
- * [new branch]      branch242  -> origin/branch242
- * [new branch]      branch243  -> origin/branch243
- * [new branch]      branch244  -> origin/branch244
- * [new branch]      branch245  -> origin/branch245
- * [new branch]      branch246  -> origin/branch246
- * [new branch]      branch247  -> origin/branch247
- * [new branch]      branch248  -> origin/branch248
- * [new branch]      branch249  -> origin/branch249
- * [new branch]      branch250  -> origin/branch250
- * [new branch]      branch251  -> origin/branch251
- * [new branch]      branch252  -> origin/branch252
- * [new branch]      branch253  -> origin/branch253
- * [new branch]      branch254  -> origin/branch254
- * [new branch]      branch255  -> origin/branch255
- * [new branch]      branch256  -> origin/branch256
- * [new branch]      branch257  -> origin/branch257
- * [new branch]      branch258  -> origin/branch258
- * [new branch]      branch259  -> origin/branch259
- * [new branch]      branch260  -> origin/branch260
- * [new branch]      branch261  -> origin/branch261
- * [new branch]      branch262  -> origin/branch262
- * [new branch]      branch263  -> origin/branch263
- * [new branch]      branch264  -> origin/branch264
- * [new branch]      branch265  -> origin/branch265
- * [new branch]      branch266  -> origin/branch266
- * [new branch]      branch267  -> origin/branch267
- * [new branch]      branch268  -> origin/branch268
- * [new branch]      branch269  -> origin/branch269
- * [new branch]      branch270  -> origin/branch270
- * [new branch]      branch271  -> origin/branch271
- * [new branch]      branch272  -> origin/branch272
- * [new branch]      branch273  -> origin/branch273
- * [new branch]      branch274  -> origin/branch274
- * [new branch]      branch275  -> origin/branch275
- * [new branch]      branch276  -> origin/branch276
- * [new branch]      branch277  -> origin/branch277
- * [new branch]      branch278  -> origin/branch278
- * [new branch]      branch279  -> origin/branch279
- * [new branch]      branch280  -> origin/branch280
- * [new branch]      branch281  -> origin/branch281
- * [new branch]      branch282  -> origin/branch282
- * [new branch]      branch283  -> origin/branch283
- * [new branch]      branch284  -> origin/branch284
- * [new branch]      branch285  -> origin/branch285
- * [new branch]      branch286  -> origin/branch286
- * [new branch]      branch287  -> origin/branch287
- * [new branch]      branch288  -> origin/branch288
- * [new branch]      branch289  -> origin/branch289
- * [new branch]      branch290  -> origin/branch290
- * [new branch]      branch291  -> origin/branch291
- * [new branch]      branch292  -> origin/branch292
- * [new branch]      branch293  -> origin/branch293
- * [new branch]      branch294  -> origin/branch294
- * [new branch]      branch295  -> origin/branch295
- * [new branch]      branch296  -> origin/branch296
- * [new branch]      branch297  -> origin/branch297
- * [new branch]      branch298  -> origin/branch298
- * [new branch]      branch299  -> origin/branch299
- * [new branch]      branch300  -> origin/branch300
- * [new branch]      branch301  -> origin/branch301
- * [new branch]      branch302  -> origin/branch302
- * [new branch]      branch303  -> origin/branch303
- * [new branch]      branch304  -> origin/branch304
- * [new branch]      branch305  -> origin/branch305
- * [new branch]      branch306  -> origin/branch306
- * [new branch]      branch307  -> origin/branch307
- * [new branch]      branch308  -> origin/branch308
- * [new branch]      branch309  -> origin/branch309
- * [new branch]      branch310  -> origin/branch310
- * [new branch]      branch311  -> origin/branch311
- * [new branch]      branch312  -> origin/branch312
- * [new branch]      branch313  -> origin/branch313
- * [new branch]      branch314  -> origin/branch314
- * [new branch]      branch315  -> origin/branch315
- * [new branch]      branch316  -> origin/branch316
- * [new branch]      branch317  -> origin/branch317
- * [new branch]      branch318  -> origin/branch318
- * [new branch]      branch319  -> origin/branch319
- * [new branch]      branch320  -> origin/branch320
- * [new branch]      branch321  -> origin/branch321
- * [new branch]      branch322  -> origin/branch322
- * [new branch]      branch323  -> origin/branch323
- * [new branch]      branch324  -> origin/branch324
- * [new branch]      branch325  -> origin/branch325
- * [new branch]      branch326  -> origin/branch326
- * [new branch]      branch327  -> origin/branch327
- * [new branch]      branch328  -> origin/branch328
- * [new branch]      branch329  -> origin/branch329
- * [new branch]      branch330  -> origin/branch330
- * [new branch]      branch331  -> origin/branch331
- * [new branch]      branch332  -> origin/branch332
- * [new branch]      branch333  -> origin/branch333
- * [new branch]      branch334  -> origin/branch334
- * [new branch]      branch335  -> origin/branch335
- * [new branch]      branch336  -> origin/branch336
- * [new branch]      branch337  -> origin/branch337
- * [new branch]      branch338  -> origin/branch338
- * [new branch]      branch339  -> origin/branch339
- * [new branch]      branch340  -> origin/branch340
- * [new branch]      branch341  -> origin/branch341
- * [new branch]      branch342  -> origin/branch342
- * [new branch]      branch343  -> origin/branch343
- * [new branch]      branch344  -> origin/branch344
- * [new branch]      branch345  -> origin/branch345
- * [new branch]      branch346  -> origin/branch346
- * [new branch]      branch347  -> origin/branch347
- * [new branch]      branch348  -> origin/branch348
- * [new branch]      branch349  -> origin/branch349
- * [new branch]      branch350  -> origin/branch350
- * [new branch]      branch351  -> origin/branch351
- * [new branch]      branch352  -> origin/branch352
- * [new branch]      branch353  -> origin/branch353
- * [new branch]      branch354  -> origin/branch354
- * [new branch]      branch355  -> origin/branch355
- * [new branch]      branch356  -> origin/branch356
- * [new branch]      branch357  -> origin/branch357
- * [new branch]      branch358  -> origin/branch358
- * [new branch]      branch359  -> origin/branch359
- * [new branch]      branch360  -> origin/branch360
- * [new branch]      branch361  -> origin/branch361
- * [new branch]      branch362  -> origin/branch362
- * [new branch]      branch363  -> origin/branch363
- * [new branch]      branch364  -> origin/branch364
- * [new branch]      branch365  -> origin/branch365
- * [new branch]      branch366  -> origin/branch366
- * [new branch]      branch367  -> origin/branch367
- * [new branch]      branch368  -> origin/branch368
- * [new branch]      branch369  -> origin/branch369
- * [new branch]      branch370  -> origin/branch370
- * [new branch]      branch371  -> origin/branch371
- * [new branch]      branch372  -> origin/branch372
- * [new branch]      branch373  -> origin/branch373
- * [new branch]      branch374  -> origin/branch374
- * [new branch]      branch375  -> origin/branch375
- * [new branch]      branch376  -> origin/branch376
- * [new branch]      branch377  -> origin/branch377
- * [new branch]      branch378  -> origin/branch378
- * [new branch]      branch379  -> origin/branch379
- * [new branch]      branch380  -> origin/branch380
- * [new branch]      branch381  -> origin/branch381
- * [new branch]      branch382  -> origin/branch382
- * [new branch]      branch383  -> origin/branch383
- * [new branch]      branch384  -> origin/branch384
- * [new branch]      branch385  -> origin/branch385
- * [new branch]      branch386  -> origin/branch386
- * [new branch]      branch387  -> origin/branch387
- * [new branch]      branch388  -> origin/branch388
- * [new branch]      branch389  -> origin/branch389
- * [new branch]      branch390  -> origin/branch390
- * [new branch]      branch391  -> origin/branch391
- * [new branch]      branch392  -> origin/branch392
- * [new branch]      branch393  -> origin/branch393
- * [new branch]      branch394  -> origin/branch394
- * [new branch]      branch395  -> origin/branch395
- * [new branch]      branch396  -> origin/branch396
- * [new branch]      branch397  -> origin/branch397
- * [new branch]      branch398  -> origin/branch398
- * [new branch]      branch399  -> origin/branch399
- * [new branch]      branch400  -> origin/branch400
- * [new branch]      branch401  -> origin/branch401
- * [new branch]      branch402  -> origin/branch402
- * [new branch]      branch403  -> origin/branch403
- * [new branch]      branch404  -> origin/branch404
- * [new branch]      branch405  -> origin/branch405
- * [new branch]      branch406  -> origin/branch406
- * [new branch]      branch407  -> origin/branch407
- * [new branch]      branch408  -> origin/branch408
- * [new branch]      branch409  -> origin/branch409
- * [new branch]      branch410  -> origin/branch410
- * [new branch]      branch411  -> origin/branch411
- * [new branch]      branch412  -> origin/branch412
- * [new branch]      branch413  -> origin/branch413
- * [new branch]      branch414  -> origin/branch414
- * [new branch]      branch415  -> origin/branch415
- * [new branch]      branch416  -> origin/branch416
- * [new branch]      branch417  -> origin/branch417
- * [new branch]      branch418  -> origin/branch418
- * [new branch]      branch419  -> origin/branch419
- * [new branch]      branch420  -> origin/branch420
- * [new branch]      branch421  -> origin/branch421
- * [new branch]      branch422  -> origin/branch422
- * [new branch]      branch423  -> origin/branch423
- * [new branch]      branch424  -> origin/branch424
- * [new branch]      branch425  -> origin/branch425
- * [new branch]      branch426  -> origin/branch426
- * [new branch]      branch427  -> origin/branch427
- * [new branch]      branch428  -> origin/branch428
- * [new branch]      branch429  -> origin/branch429
- * [new branch]      branch430  -> origin/branch430
- * [new branch]      branch431  -> origin/branch431
- * [new branch]      branch432  -> origin/branch432
- * [new branch]      branch433  -> origin/branch433
- * [new branch]      branch434  -> origin/branch434
- * [new branch]      branch435  -> origin/branch435
- * [new branch]      branch436  -> origin/branch436
- * [new branch]      branch437  -> origin/branch437
- * [new branch]      branch438  -> origin/branch438
- * [new branch]      branch439  -> origin/branch439
- * [new branch]      branch440  -> origin/branch440
- * [new branch]      branch441  -> origin/branch441
- * [new branch]      branch442  -> origin/branch442
- * [new branch]      branch443  -> origin/branch443
- * [new branch]      branch444  -> origin/branch444
- * [new branch]      branch445  -> origin/branch445
- * [new branch]      branch446  -> origin/branch446
- * [new branch]      branch447  -> origin/branch447
- * [new branch]      branch448  -> origin/branch448
- * [new branch]      branch449  -> origin/branch449
- * [new branch]      branch450  -> origin/branch450
- * [new branch]      branch451  -> origin/branch451
- * [new branch]      branch452  -> origin/branch452
- * [new branch]      branch453  -> origin/branch453
- * [new branch]      branch454  -> origin/branch454
- * [new branch]      branch455  -> origin/branch455
- * [new branch]      branch456  -> origin/branch456
- * [new branch]      branch457  -> origin/branch457
- * [new branch]      branch458  -> origin/branch458
- * [new branch]      branch459  -> origin/branch459
- * [new branch]      branch460  -> origin/branch460
- * [new branch]      branch461  -> origin/branch461
- * [new branch]      branch462  -> origin/branch462
- * [new branch]      branch463  -> origin/branch463
- * [new branch]      branch464  -> origin/branch464
- * [new branch]      branch465  -> origin/branch465
- * [new branch]      branch466  -> origin/branch466
- * [new branch]      branch467  -> origin/branch467
- * [new branch]      branch468  -> origin/branch468
- * [new branch]      branch469  -> origin/branch469
- * [new branch]      branch470  -> origin/branch470
- * [new branch]      branch471  -> origin/branch471
- * [new branch]      branch472  -> origin/branch472
- * [new branch]      branch473  -> origin/branch473
- * [new branch]      branch474  -> origin/branch474
- * [new branch]      branch475  -> origin/branch475
- * [new branch]      branch476  -> origin/branch476
- * [new branch]      branch477  -> origin/branch477
- * [new branch]      branch478  -> origin/branch478
- * [new branch]      branch479  -> origin/branch479
- * [new branch]      branch480  -> origin/branch480
- * [new branch]      branch481  -> origin/branch481
- * [new branch]      branch482  -> origin/branch482
- * [new branch]      branch483  -> origin/branch483
- * [new branch]      branch484  -> origin/branch484
- * [new branch]      branch485  -> origin/branch485
- * [new branch]      branch486  -> origin/branch486
- * [new branch]      branch487  -> origin/branch487
- * [new branch]      branch488  -> origin/branch488
- * [new branch]      branch489  -> origin/branch489
- * [new branch]      branch490  -> origin/branch490
- * [new branch]      branch491  -> origin/branch491
- * [new branch]      branch492  -> origin/branch492
- * [new branch]      branch493  -> origin/branch493
- * [new branch]      branch494  -> origin/branch494
- * [new branch]      branch495  -> origin/branch495
- * [new branch]      branch496  -> origin/branch496
- * [new branch]      branch497  -> origin/branch497
- * [new branch]      branch498  -> origin/branch498
- * [new branch]      branch499  -> origin/branch499
- * [new branch]      branch500  -> origin/branch500
- * [new branch]      branch501  -> origin/branch501
- * [new branch]      branch502  -> origin/branch502
- * [new branch]      branch503  -> origin/branch503
- * [new branch]      branch504  -> origin/branch504
- * [new branch]      branch505  -> origin/branch505
- * [new branch]      branch506  -> origin/branch506
- * [new branch]      branch507  -> origin/branch507
- * [new branch]      branch508  -> origin/branch508
- * [new branch]      branch509  -> origin/branch509
- * [new branch]      branch510  -> origin/branch510
- * [new branch]      branch511  -> origin/branch511
- * [new branch]      branch512  -> origin/branch512
- * [new branch]      branch513  -> origin/branch513
- * [new branch]      branch514  -> origin/branch514
- * [new branch]      branch515  -> origin/branch515
- * [new branch]      branch516  -> origin/branch516
- * [new branch]      branch517  -> origin/branch517
- * [new branch]      branch518  -> origin/branch518
- * [new branch]      branch519  -> origin/branch519
- * [new branch]      branch520  -> origin/branch520
- * [new branch]      branch521  -> origin/branch521
- * [new branch]      branch522  -> origin/branch522
- * [new branch]      branch523  -> origin/branch523
- * [new branch]      branch524  -> origin/branch524
- * [new branch]      branch525  -> origin/branch525
- * [new branch]      branch526  -> origin/branch526
- * [new branch]      branch527  -> origin/branch527
- * [new branch]      branch528  -> origin/branch528
- * [new branch]      branch529  -> origin/branch529
- * [new branch]      branch530  -> origin/branch530
- * [new branch]      branch531  -> origin/branch531
- * [new branch]      branch532  -> origin/branch532
- * [new branch]      branch533  -> origin/branch533
- * [new branch]      branch534  -> origin/branch534
- * [new branch]      branch535  -> origin/branch535
- * [new branch]      branch536  -> origin/branch536
- * [new branch]      branch537  -> origin/branch537
- * [new branch]      branch538  -> origin/branch538
- * [new branch]      branch539  -> origin/branch539
- * [new branch]      branch540  -> origin/branch540
- * [new branch]      branch541  -> origin/branch541
- * [new branch]      branch542  -> origin/branch542
- * [new branch]      branch543  -> origin/branch543
- * [new branch]      branch544  -> origin/branch544
- * [new branch]      branch545  -> origin/branch545
- * [new branch]      branch546  -> origin/branch546
- * [new branch]      branch547  -> origin/branch547
- * [new branch]      branch548  -> origin/branch548
- * [new branch]      branch549  -> origin/branch549
- * [new branch]      branch550  -> origin/branch550
- * [new branch]      branch551  -> origin/branch551
- * [new branch]      branch552  -> origin/branch552
- * [new branch]      branch553  -> origin/branch553
- * [new branch]      branch554  -> origin/branch554
- * [new branch]      branch555  -> origin/branch555
- * [new branch]      branch556  -> origin/branch556
- * [new branch]      branch557  -> origin/branch557
- * [new branch]      branch558  -> origin/branch558
- * [new branch]      branch559  -> origin/branch559
- * [new branch]      branch560  -> origin/branch560
- * [new branch]      branch561  -> origin/branch561
- * [new branch]      branch562  -> origin/branch562
- * [new branch]      branch563  -> origin/branch563
- * [new branch]      branch564  -> origin/branch564
- * [new branch]      branch565  -> origin/branch565
- * [new branch]      branch566  -> origin/branch566
- * [new branch]      branch567  -> origin/branch567
- * [new branch]      branch568  -> origin/branch568
- * [new branch]      branch569  -> origin/branch569
- * [new branch]      branch570  -> origin/branch570
- * [new branch]      branch571  -> origin/branch571
- * [new branch]      branch572  -> origin/branch572
- * [new branch]      branch573  -> origin/branch573
- * [new branch]      branch574  -> origin/branch574
- * [new branch]      branch575  -> origin/branch575
- * [new branch]      branch576  -> origin/branch576
- * [new branch]      branch577  -> origin/branch577
- * [new branch]      branch578  -> origin/branch578
- * [new branch]      branch579  -> origin/branch579
- * [new branch]      branch580  -> origin/branch580
- * [new branch]      branch581  -> origin/branch581
- * [new branch]      branch582  -> origin/branch582
- * [new branch]      branch583  -> origin/branch583
- * [new branch]      branch584  -> origin/branch584
- * [new branch]      branch585  -> origin/branch585
- * [new branch]      branch586  -> origin/branch586
- * [new branch]      branch587  -> origin/branch587
- * [new branch]      branch588  -> origin/branch588
- * [new branch]      branch589  -> origin/branch589
- * [new branch]      branch590  -> origin/branch590
- * [new branch]      branch591  -> origin/branch591
- * [new branch]      branch592  -> origin/branch592
- * [new branch]      branch593  -> origin/branch593
- * [new branch]      branch594  -> origin/branch594
- * [new branch]      branch595  -> origin/branch595
- * [new branch]      branch596  -> origin/branch596
- * [new branch]      branch597  -> origin/branch597
- * [new branch]      branch598  -> origin/branch598
- * [new branch]      branch599  -> origin/branch599
- * [new branch]      branch600  -> origin/branch600
- * [new branch]      branch601  -> origin/branch601
- * [new branch]      branch602  -> origin/branch602
- * [new branch]      branch603  -> origin/branch603
- * [new branch]      branch604  -> origin/branch604
- * [new branch]      branch605  -> origin/branch605
- * [new branch]      branch606  -> origin/branch606
- * [new branch]      branch607  -> origin/branch607
- * [new branch]      branch608  -> origin/branch608
- * [new branch]      branch609  -> origin/branch609
- * [new branch]      branch610  -> origin/branch610
- * [new branch]      branch611  -> origin/branch611
- * [new branch]      branch612  -> origin/branch612
- * [new branch]      branch613  -> origin/branch613
- * [new branch]      branch614  -> origin/branch614
- * [new branch]      branch615  -> origin/branch615
- * [new branch]      branch616  -> origin/branch616
- * [new branch]      branch617  -> origin/branch617
- * [new branch]      branch618  -> origin/branch618
- * [new branch]      branch619  -> origin/branch619
- * [new branch]      branch620  -> origin/branch620
- * [new branch]      branch621  -> origin/branch621
- * [new branch]      branch622  -> origin/branch622
- * [new branch]      branch623  -> origin/branch623
- * [new branch]      branch624  -> origin/branch624
- * [new branch]      branch625  -> origin/branch625
- * [new branch]      branch626  -> origin/branch626
- * [new branch]      branch627  -> origin/branch627
- * [new branch]      branch628  -> origin/branch628
- * [new branch]      branch629  -> origin/branch629
- * [new branch]      branch630  -> origin/branch630
- * [new branch]      branch631  -> origin/branch631
- * [new branch]      branch632  -> origin/branch632
- * [new branch]      branch633  -> origin/branch633
- * [new branch]      branch634  -> origin/branch634
- * [new branch]      branch635  -> origin/branch635
- * [new branch]      branch636  -> origin/branch636
- * [new branch]      branch637  -> origin/branch637
- * [new branch]      branch638  -> origin/branch638
- * [new branch]      branch639  -> origin/branch639
- * [new branch]      branch640  -> origin/branch640
- * [new branch]      branch641  -> origin/branch641
- * [new branch]      branch642  -> origin/branch642
- * [new branch]      branch643  -> origin/branch643
- * [new branch]      branch644  -> origin/branch644
- * [new branch]      branch645  -> origin/branch645
- * [new branch]      branch646  -> origin/branch646
- * [new branch]      branch647  -> origin/branch647
- * [new branch]      branch648  -> origin/branch648
- * [new branch]      branch649  -> origin/branch649
- * [new branch]      branch650  -> origin/branch650
- * [new branch]      branch651  -> origin/branch651
- * [new branch]      branch652  -> origin/branch652
- * [new branch]      branch653  -> origin/branch653
- * [new branch]      branch654  -> origin/branch654
- * [new branch]      branch655  -> origin/branch655
- * [new branch]      branch656  -> origin/branch656
- * [new branch]      branch657  -> origin/branch657
- * [new branch]      branch658  -> origin/branch658
- * [new branch]      branch659  -> origin/branch659
- * [new branch]      branch660  -> origin/branch660
- * [new branch]      branch661  -> origin/branch661
- * [new branch]      branch662  -> origin/branch662
- * [new branch]      branch663  -> origin/branch663
- * [new branch]      branch664  -> origin/branch664
- * [new branch]      branch665  -> origin/branch665
- * [new branch]      branch666  -> origin/branch666
- * [new branch]      branch667  -> origin/branch667
- * [new branch]      branch668  -> origin/branch668
- * [new branch]      branch669  -> origin/branch669
- * [new branch]      branch670  -> origin/branch670
- * [new branch]      branch671  -> origin/branch671
- * [new branch]      branch672  -> origin/branch672
- * [new branch]      branch673  -> origin/branch673
- * [new branch]      branch674  -> origin/branch674
- * [new branch]      branch675  -> origin/branch675
- * [new branch]      branch676  -> origin/branch676
- * [new branch]      branch677  -> origin/branch677
- * [new branch]      branch678  -> origin/branch678
- * [new branch]      branch679  -> origin/branch679
- * [new branch]      branch680  -> origin/branch680
- * [new branch]      branch681  -> origin/branch681
- * [new branch]      branch682  -> origin/branch682
- * [new branch]      branch683  -> origin/branch683
- * [new branch]      branch684  -> origin/branch684
- * [new branch]      branch685  -> origin/branch685
- * [new branch]      branch686  -> origin/branch686
- * [new branch]      branch687  -> origin/branch687
- * [new branch]      branch688  -> origin/branch688
- * [new branch]      branch689  -> origin/branch689
- * [new branch]      branch690  -> origin/branch690
- * [new branch]      branch691  -> origin/branch691
- * [new branch]      branch692  -> origin/branch692
- * [new branch]      branch693  -> origin/branch693
- * [new branch]      branch694  -> origin/branch694
- * [new branch]      branch695  -> origin/branch695
- * [new branch]      branch696  -> origin/branch696
- * [new branch]      branch697  -> origin/branch697
- * [new branch]      branch698  -> origin/branch698
- * [new branch]      branch699  -> origin/branch699
- * [new branch]      branch700  -> origin/branch700
- * [new branch]      branch701  -> origin/branch701
- * [new branch]      branch702  -> origin/branch702
- * [new branch]      branch703  -> origin/branch703
- * [new branch]      branch704  -> origin/branch704
- * [new branch]      branch705  -> origin/branch705
- * [new branch]      branch706  -> origin/branch706
- * [new branch]      branch707  -> origin/branch707
- * [new branch]      branch708  -> origin/branch708
- * [new branch]      branch709  -> origin/branch709
- * [new branch]      branch710  -> origin/branch710
- * [new branch]      branch711  -> origin/branch711
- * [new branch]      branch712  -> origin/branch712
- * [new branch]      branch713  -> origin/branch713
- * [new branch]      branch714  -> origin/branch714
- * [new branch]      branch715  -> origin/branch715
- * [new branch]      branch716  -> origin/branch716
- * [new branch]      branch717  -> origin/branch717
- * [new branch]      branch718  -> origin/branch718
- * [new branch]      branch719  -> origin/branch719
- * [new branch]      branch720  -> origin/branch720
- * [new branch]      branch721  -> origin/branch721
- * [new branch]      branch722  -> origin/branch722
- * [new branch]      branch723  -> origin/branch723
- * [new branch]      branch724  -> origin/branch724
- * [new branch]      branch725  -> origin/branch725
- * [new branch]      branch726  -> origin/branch726
- * [new branch]      branch727  -> origin/branch727
- * [new branch]      branch728  -> origin/branch728
- * [new branch]      branch729  -> origin/branch729
- * [new branch]      branch730  -> origin/branch730
- * [new branch]      branch731  -> origin/branch731
- * [new branch]      branch732  -> origin/branch732
- * [new branch]      branch733  -> origin/branch733
- * [new branch]      branch734  -> origin/branch734
- * [new branch]      branch735  -> origin/branch735
- * [new branch]      branch736  -> origin/branch736
- * [new branch]      branch737  -> origin/branch737
- * [new branch]      branch738  -> origin/branch738
- * [new branch]      branch739  -> origin/branch739
- * [new branch]      branch740  -> origin/branch740
- * [new branch]      branch741  -> origin/branch741
- * [new branch]      branch742  -> origin/branch742
- * [new branch]      branch743  -> origin/branch743
- * [new branch]      branch744  -> origin/branch744
- * [new branch]      branch745  -> origin/branch745
- * [new branch]      branch746  -> origin/branch746
- * [new branch]      branch747  -> origin/branch747
- * [new branch]      branch748  -> origin/branch748
- * [new branch]      branch749  -> origin/branch749
- * [new branch]      branch750  -> origin/branch750
- * [new branch]      branch751  -> origin/branch751
- * [new branch]      branch752  -> origin/branch752
- * [new branch]      branch753  -> origin/branch753
- * [new branch]      branch754  -> origin/branch754
- * [new branch]      branch755  -> origin/branch755
- * [new branch]      branch756  -> origin/branch756
- * [new branch]      branch757  -> origin/branch757
- * [new branch]      branch758  -> origin/branch758
- * [new branch]      branch759  -> origin/branch759
- * [new branch]      branch760  -> origin/branch760
- * [new branch]      branch761  -> origin/branch761
- * [new branch]      branch762  -> origin/branch762
- * [new branch]      branch763  -> origin/branch763
- * [new branch]      branch764  -> origin/branch764
- * [new branch]      branch765  -> origin/branch765
- * [new branch]      branch766  -> origin/branch766
- * [new branch]      branch767  -> origin/branch767
- * [new branch]      branch768  -> origin/branch768
- * [new branch]      branch769  -> origin/branch769
- * [new branch]      branch770  -> origin/branch770
- * [new branch]      branch771  -> origin/branch771
- * [new branch]      branch772  -> origin/branch772
- * [new branch]      branch773  -> origin/branch773
- * [new branch]      branch774  -> origin/branch774
- * [new branch]      branch775  -> origin/branch775
- * [new branch]      branch776  -> origin/branch776
- * [new branch]      branch777  -> origin/branch777
- * [new branch]      branch778  -> origin/branch778
- * [new branch]      branch779  -> origin/branch779
- * [new branch]      branch780  -> origin/branch780
- * [new branch]      branch781  -> origin/branch781
- * [new branch]      branch782  -> origin/branch782
- * [new branch]      branch783  -> origin/branch783
- * [new branch]      branch784  -> origin/branch784
- * [new branch]      branch785  -> origin/branch785
- * [new branch]      branch786  -> origin/branch786
- * [new branch]      branch787  -> origin/branch787
- * [new branch]      branch788  -> origin/branch788
- * [new branch]      branch789  -> origin/branch789
- * [new branch]      branch790  -> origin/branch790
- * [new branch]      branch791  -> origin/branch791
- * [new branch]      branch792  -> origin/branch792
- * [new branch]      branch793  -> origin/branch793
- * [new branch]      branch794  -> origin/branch794
- * [new branch]      branch795  -> origin/branch795
- * [new branch]      branch796  -> origin/branch796
- * [new branch]      branch797  -> origin/branch797
- * [new branch]      branch798  -> origin/branch798
- * [new branch]      branch799  -> origin/branch799
- * [new branch]      branch800  -> origin/branch800
- * [new branch]      branch801  -> origin/branch801
- * [new branch]      branch802  -> origin/branch802
- * [new branch]      branch803  -> origin/branch803
- * [new branch]      branch804  -> origin/branch804
- * [new branch]      branch805  -> origin/branch805
- * [new branch]      branch806  -> origin/branch806
- * [new branch]      branch807  -> origin/branch807
- * [new branch]      branch808  -> origin/branch808
- * [new branch]      branch809  -> origin/branch809
- * [new branch]      branch810  -> origin/branch810
- * [new branch]      branch811  -> origin/branch811
- * [new branch]      branch812  -> origin/branch812
- * [new branch]      branch813  -> origin/branch813
- * [new branch]      branch814  -> origin/branch814
- * [new branch]      branch815  -> origin/branch815
- * [new branch]      branch816  -> origin/branch816
- * [new branch]      branch817  -> origin/branch817
- * [new branch]      branch818  -> origin/branch818
- * [new branch]      branch819  -> origin/branch819
- * [new branch]      branch820  -> origin/branch820
- * [new branch]      branch821  -> origin/branch821
- * [new branch]      branch822  -> origin/branch822
- * [new branch]      branch823  -> origin/branch823
- * [new branch]      branch824  -> origin/branch824
- * [new branch]      branch825  -> origin/branch825
- * [new branch]      branch826  -> origin/branch826
- * [new branch]      branch827  -> origin/branch827
- * [new branch]      branch828  -> origin/branch828
- * [new branch]      branch829  -> origin/branch829
- * [new branch]      branch830  -> origin/branch830
- * [new branch]      branch831  -> origin/branch831
- * [new branch]      branch832  -> origin/branch832
- * [new branch]      branch833  -> origin/branch833
- * [new branch]      branch834  -> origin/branch834
- * [new branch]      branch835  -> origin/branch835
- * [new branch]      branch836  -> origin/branch836
- * [new branch]      branch837  -> origin/branch837
- * [new branch]      branch838  -> origin/branch838
- * [new branch]      branch839  -> origin/branch839
- * [new branch]      branch840  -> origin/branch840
- * [new branch]      branch841  -> origin/branch841
- * [new branch]      branch842  -> origin/branch842
- * [new branch]      branch843  -> origin/branch843
- * [new branch]      branch844  -> origin/branch844
- * [new branch]      branch845  -> origin/branch845
- * [new branch]      branch846  -> origin/branch846
- * [new branch]      branch847  -> origin/branch847
- * [new branch]      branch848  -> origin/branch848
- * [new branch]      branch849  -> origin/branch849
- * [new branch]      branch850  -> origin/branch850
- * [new branch]      branch851  -> origin/branch851
- * [new branch]      branch852  -> origin/branch852
- * [new branch]      branch853  -> origin/branch853
- * [new branch]      branch854  -> origin/branch854
- * [new branch]      branch855  -> origin/branch855
- * [new branch]      branch856  -> origin/branch856
- * [new branch]      branch857  -> origin/branch857
- * [new branch]      branch858  -> origin/branch858
- * [new branch]      branch859  -> origin/branch859
- * [new branch]      branch860  -> origin/branch860
- * [new branch]      branch861  -> origin/branch861
- * [new branch]      branch862  -> origin/branch862
- * [new branch]      branch863  -> origin/branch863
- * [new branch]      branch864  -> origin/branch864
- * [new branch]      branch865  -> origin/branch865
- * [new branch]      branch866  -> origin/branch866
- * [new branch]      branch867  -> origin/branch867
- * [new branch]      branch868  -> origin/branch868
- * [new branch]      branch869  -> origin/branch869
- * [new branch]      branch870  -> origin/branch870
- * [new branch]      branch871  -> origin/branch871
- * [new branch]      branch872  -> origin/branch872
- * [new branch]      branch873  -> origin/branch873
- * [new branch]      branch874  -> origin/branch874
- * [new branch]      branch875  -> origin/branch875
- * [new branch]      branch876  -> origin/branch876
- * [new branch]      branch877  -> origin/branch877
- * [new branch]      branch878  -> origin/branch878
- * [new branch]      branch879  -> origin/branch879
- * [new branch]      branch880  -> origin/branch880
- * [new branch]      branch881  -> origin/branch881
- * [new branch]      branch882  -> origin/branch882
- * [new branch]      branch883  -> origin/branch883
- * [new branch]      branch884  -> origin/branch884
- * [new branch]      branch885  -> origin/branch885
- * [new branch]      branch886  -> origin/branch886
- * [new branch]      branch887  -> origin/branch887
- * [new branch]      branch888  -> origin/branch888
- * [new branch]      branch889  -> origin/branch889
- * [new branch]      branch890  -> origin/branch890
- * [new branch]      branch891  -> origin/branch891
- * [new branch]      branch892  -> origin/branch892
- * [new branch]      branch893  -> origin/branch893
- * [new branch]      branch894  -> origin/branch894
- * [new branch]      branch895  -> origin/branch895
- * [new branch]      branch896  -> origin/branch896
- * [new branch]      branch897  -> origin/branch897
- * [new branch]      branch898  -> origin/branch898
- * [new branch]      branch899  -> origin/branch899
- * [new branch]      branch900  -> origin/branch900
- * [new branch]      branch901  -> origin/branch901
- * [new branch]      branch902  -> origin/branch902
- * [new branch]      branch903  -> origin/branch903
- * [new branch]      branch904  -> origin/branch904
- * [new branch]      branch905  -> origin/branch905
- * [new branch]      branch906  -> origin/branch906
- * [new branch]      branch907  -> origin/branch907
- * [new branch]      branch908  -> origin/branch908
- * [new branch]      branch909  -> origin/branch909
- * [new branch]      branch910  -> origin/branch910
- * [new branch]      branch911  -> origin/branch911
- * [new branch]      branch912  -> origin/branch912
- * [new branch]      branch913  -> origin/branch913
- * [new branch]      branch914  -> origin/branch914
- * [new branch]      branch915  -> origin/branch915
- * [new branch]      branch916  -> origin/branch916
- * [new branch]      branch917  -> origin/branch917
- * [new branch]      branch918  -> origin/branch918
- * [new branch]      branch919  -> origin/branch919
- * [new branch]      branch920  -> origin/branch920
- * [new branch]      branch921  -> origin/branch921
- * [new branch]      branch922  -> origin/branch922
- * [new branch]      branch923  -> origin/branch923
- * [new branch]      branch924  -> origin/branch924
- * [new branch]      branch925  -> origin/branch925
- * [new branch]      branch926  -> origin/branch926
- * [new branch]      branch927  -> origin/branch927
- * [new branch]      branch928  -> origin/branch928
- * [new branch]      branch929  -> origin/branch929
- * [new branch]      branch930  -> origin/branch930
- * [new branch]      branch931  -> origin/branch931
- * [new branch]      branch932  -> origin/branch932
- * [new branch]      branch933  -> origin/branch933
- * [new branch]      branch934  -> origin/branch934
- * [new branch]      branch935  -> origin/branch935
- * [new branch]      branch936  -> origin/branch936
- * [new branch]      branch937  -> origin/branch937
- * [new branch]      branch938  -> origin/branch938
- * [new branch]      branch939  -> origin/branch939
- * [new branch]      branch940  -> origin/branch940
- * [new branch]      branch941  -> origin/branch941
- * [new branch]      branch942  -> origin/branch942
- * [new branch]      branch943  -> origin/branch943
- * [new branch]      branch944  -> origin/branch944
- * [new branch]      branch945  -> origin/branch945
- * [new branch]      branch946  -> origin/branch946
- * [new branch]      branch947  -> origin/branch947
- * [new branch]      branch948  -> origin/branch948
- * [new branch]      branch949  -> origin/branch949
- * [new branch]      branch950  -> origin/branch950
- * [new branch]      branch951  -> origin/branch951
- * [new branch]      branch952  -> origin/branch952
- * [new branch]      branch953  -> origin/branch953
- * [new branch]      branch954  -> origin/branch954
- * [new branch]      branch955  -> origin/branch955
- * [new branch]      branch956  -> origin/branch956
- * [new branch]      branch957  -> origin/branch957
- * [new branch]      branch958  -> origin/branch958
- * [new branch]      branch959  -> origin/branch959
- * [new branch]      branch960  -> origin/branch960
- * [new branch]      branch961  -> origin/branch961
- * [new branch]      branch962  -> origin/branch962
- * [new branch]      branch963  -> origin/branch963
- * [new branch]      branch964  -> origin/branch964
- * [new branch]      branch965  -> origin/branch965
- * [new branch]      branch966  -> origin/branch966
- * [new branch]      branch967  -> origin/branch967
- * [new branch]      branch968  -> origin/branch968
- * [new branch]      branch969  -> origin/branch969
- * [new branch]      branch970  -> origin/branch970
- * [new branch]      branch971  -> origin/branch971
- * [new branch]      branch972  -> origin/branch972
- * [new branch]      branch973  -> origin/branch973
- * [new branch]      branch974  -> origin/branch974
- * [new branch]      branch975  -> origin/branch975
- * [new branch]      branch976  -> origin/branch976
- * [new branch]      branch977  -> origin/branch977
- * [new branch]      branch978  -> origin/branch978
- * [new branch]      branch979  -> origin/branch979
- * [new branch]      branch980  -> origin/branch980
- * [new branch]      branch981  -> origin/branch981
- * [new branch]      branch982  -> origin/branch982
- * [new branch]      branch983  -> origin/branch983
- * [new branch]      branch984  -> origin/branch984
- * [new branch]      branch985  -> origin/branch985
- * [new branch]      branch986  -> origin/branch986
- * [new branch]      branch987  -> origin/branch987
- * [new branch]      branch988  -> origin/branch988
- * [new branch]      branch989  -> origin/branch989
- * [new branch]      branch990  -> origin/branch990
- * [new branch]      branch991  -> origin/branch991
- * [new branch]      branch992  -> origin/branch992
- * [new branch]      branch993  -> origin/branch993
- * [new branch]      branch994  -> origin/branch994
- * [new branch]      branch995  -> origin/branch995
- * [new branch]      branch996  -> origin/branch996
- * [new branch]      branch997  -> origin/branch997
- * [new branch]      branch998  -> origin/branch998
- * [new branch]      branch999  -> origin/branch999
-ok 7 - quickfetch should handle ~1000 refs (on Windows)
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5503-tagfollow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5503-tagfollow/.git/
-expecting success of 5503.1 'setup': 
-	test_tick &&
-	echo ichi >file &&
-	git add file &&
-	git commit -m L &&
-	L=$(git rev-parse --verify 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:
 
-	(
-		mkdir cloned &&
-		cd cloned &&
-		git init-db &&
-		git remote add -f origin ..
-	) &&
+  git switch -c <new-branch-name>
 
-	test_tick &&
-	echo A >file &&
-	git add file &&
-	git commit -m A &&
-	A=$(git rev-parse --verify HEAD)
+Or undo this operation with:
 
-[main (root-commit) 6a9c5e4] L
- 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.45.2/t/trash directory.t5503-tagfollow/cloned/.git/
-Updating origin
-From ..
- * [new branch]      main       -> origin/main
-[main c06aaaf] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+  git switch -
 
-expecting success of 5503.2 'setup expect': 
-cat - <<EOF >expect
-want $A
-EOF
+Turn off this advice by setting config variable advice.detachedHead to false
 
-ok 2 - setup expect
+HEAD is now at 099797b base
+Deleted branch main (was 099797b).
+099797b4d0eb8d4e4edb917fe24ec0b4659190f9
+ok 351 - tagged commits are selected for bitmapping
 
-expecting success of 5503.3 'fetch A (new commit : 1 connection)': 
-	rm -f $U &&
-	(
-		cd cloned &&
-		GIT_TRACE_PACKET=$UPATH git fetch &&
-		test $A = $(git rev-parse --verify origin/main)
-	) &&
-	get_needs $U >actual &&
-	test_cmp expect actual
+expecting success of 5326.352 'git fsck correctly identifies good and bad bitmaps': 
+	git init valid &&
+	test_when_finished rm -rf valid &&
 
-From ..
-   6a9c5e4..c06aaaf  main       -> origin/main
-ok 3 - fetch A (new commit : 1 connection)
+	test_commit_bulk 20 &&
+	git repack -adbf &&
 
-expecting success of 5503.4 'create tag T on A, create C on branch cat': 
-	git tag -a -m tag1 tag1 $A &&
-	T=$(git rev-parse --verify tag1) &&
+	# Move pack-bitmap aside so it is not deleted
+	# in next repack.
+	packbitmap=$(ls .git/objects/pack/pack-*.bitmap) &&
+	mv "$packbitmap" "$packbitmap.bak" &&
 
-	git checkout -b cat &&
-	echo C >file &&
-	git add file &&
-	git commit -m C &&
-	C=$(git rev-parse --verify HEAD) &&
-	git checkout main
+	test_commit_bulk 10 &&
+	git repack -b --write-midx &&
+	midxbitmap=$(ls .git/objects/pack/multi-pack-index-*.bitmap) &&
 
-Switched to a new branch 'cat'
-[cat f888ed6] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-ok 4 - create tag T on A, create C on branch cat
+	# Copy MIDX bitmap to backup. Copy pack bitmap from backup.
+	cp "$midxbitmap" "$midxbitmap.bak" &&
+	cp "$packbitmap.bak" "$packbitmap" &&
 
-expecting success of 5503.5 'setup expect': 
-cat - <<EOF >expect
-want $C
-want $T
-EOF
+	# fsck works at first
+	git fsck 2>err &&
+	test_must_be_empty err &&
 
-ok 5 - setup expect
+	corrupt_file "$packbitmap" &&
+	test_must_fail git fsck 2>err &&
+	grep "bitmap file '$packbitmap' has invalid checksum" err &&
 
-expecting success of 5503.6 'fetch C, T (new branch, tag : 1 connection)': 
-	rm -f $U &&
-	(
-		cd cloned &&
-		GIT_TRACE_PACKET=$UPATH git fetch &&
-		test $C = $(git rev-parse --verify origin/cat) &&
-		test $T = $(git rev-parse --verify tag1) &&
-		test $A = $(git rev-parse --verify tag1^0)
-	) &&
-	get_needs $U >actual &&
-	test_cmp expect actual
+	cp "$packbitmap.bak" "$packbitmap" &&
+	corrupt_file "$midxbitmap" &&
+	test_must_fail git fsck 2>err &&
+	grep "bitmap file '$midxbitmap' has invalid checksum" err &&
 
-From ..
- * [new branch]      cat        -> origin/cat
- * [new tag]         tag1       -> tag1
-ok 6 - fetch C, T (new branch, tag : 1 connection)
+	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
 
-expecting success of 5503.7 'create commits O, B, tag S on B': 
-	test_tick &&
-	echo O >file &&
-	git add file &&
-	git commit -m O &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         23
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      74958 /      74958
+---------------------------------------------------------------------
 
-	test_tick &&
-	echo B >file &&
-	git add file &&
-	git commit -m B &&
-	B=$(git rev-parse --verify HEAD) &&
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =         16
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =      88119 /      88119
+---------------------------------------------------------------------
 
-	git tag -a -m tag2 tag2 $B &&
-	S=$(git rev-parse --verify tag2)
+Nothing new to pack.
+dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
+dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
+5+0 records in
+5+0 records out
+5 bytes copied, 4.0367e-05 s, 124 kB/s
+dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
+dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
+error: bitmap file '.git/objects/pack/pack-758100af2d3ab1a641ab30bb0e434776f3ae102f.bitmap' has invalid checksum
+5+0 records in
+5+0 records out
+5 bytes copied, 0.00690176 s, 0.7 kB/s
+dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
+dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
+error: bitmap file '.git/objects/pack/multi-pack-index-217aa0030f92f3f6f3a6dc06b98f76698af8d051.bitmap' has invalid checksum
+5+0 records in
+5+0 records out
+5 bytes copied, 4.0116e-05 s, 125 kB/s
+dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
+dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
+error: bitmap file '.git/objects/pack/multi-pack-index-217aa0030f92f3f6f3a6dc06b98f76698af8d051.bitmap' has invalid checksum
+error: bitmap file '.git/objects/pack/pack-758100af2d3ab1a641ab30bb0e434776f3ae102f.bitmap' has invalid checksum
+ok 352 - git fsck correctly identifies good and bad bitmaps
 
-[main 0129221] O
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 8e10cf4] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - create commits O, B, tag S on B
+expecting success of 5326.353 'corrupt MIDX with bitmap causes fallback': 
+	git init corrupt-midx-bitmap &&
+	(
+		cd corrupt-midx-bitmap &&
 
-expecting success of 5503.8 'setup expect': 
-cat - <<EOF >expect
-want $B
-want $S
-EOF
+		test_commit first &&
+		git repack -d &&
+		test_commit second &&
+		git repack -d &&
 
-ok 8 - setup expect
+		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 &&
 
-expecting success of 5503.9 'fetch B, S (commit and tag : 1 connection)': 
-	rm -f $U &&
-	(
-		cd cloned &&
-		GIT_TRACE_PACKET=$UPATH git fetch &&
-		test $B = $(git rev-parse --verify origin/main) &&
-		test $B = $(git rev-parse --verify tag2^0) &&
-		test $S = $(git rev-parse --verify tag2)
-	) &&
-	get_needs $U >actual &&
-	test_cmp expect actual
+		# 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)
+	)
 
-From ..
-   c06aaaf..8e10cf4  main       -> origin/main
- * [new tag]         tag2       -> tag2
-ok 9 - fetch B, S (commit and tag : 1 connection)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 353 - corrupt MIDX with bitmap causes fallback
 
-expecting success of 5503.10 'setup expect': 
-cat - <<EOF >expect
-want $B
-want $S
-EOF
+expecting success of 5326.354 '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 &&
 
-ok 10 - setup expect
+			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.45.2/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 354 - reading MIDX without BTMP chunk does not complain with single pack reuse
 
-expecting success of 5503.11 'new clone fetch main and tags': 
-	test_might_fail git branch -D cat &&
-	rm -f $U &&
-	(
-		mkdir clone2 &&
-		cd clone2 &&
-		git init &&
-		git remote add origin .. &&
-		GIT_TRACE_PACKET=$UPATH git fetch &&
-		test $B = $(git rev-parse --verify origin/main) &&
-		test $S = $(git rev-parse --verify tag2) &&
-		test $B = $(git rev-parse --verify tag2^0) &&
-		test $T = $(git rev-parse --verify tag1) &&
-		test $A = $(git rev-parse --verify tag1^0)
-	) &&
-	get_needs $U >actual &&
-	test_cmp expect actual
+expecting success of 5326.355 '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 &&
 
-Deleted branch cat (was f888ed6).
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5503-tagfollow/clone2/.git/
-From ..
- * [new branch]      main       -> origin/main
- * [new tag]         tag2       -> tag2
- * [new tag]         tag1       -> tag1
-ok 11 - new clone fetch main and tags
+			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.45.2/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 multi pack reuse
 
-# passed all 11 test(s)
-1..11
+# passed all 355 test(s)
+1..355
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5327-multi-pack-bitmaps-rev.sh ***
@@ -315173,7 +318559,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":"20251218T013616.664540Z-Hfbad846e-P00002180","thread":"main","time":"2025-12-18T01:36:16.665859Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001513,"t_rel":0.001513,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193635.359890Z-H5c947e1c-P0000227f","thread":"main","time":"2024-11-14T19:36:35.365913Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.006220,"t_rel":0.006220,"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': 
@@ -315671,8 +319057,8 @@
 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":"20251218T013616.664540Z-Hfbad846e-P00002180","thread":"main","time":"2025-12-18T01:36:16.665859Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001513,"t_rel":0.001513,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20251218T013621.825067Z-Hfbad846e-P000032a7","thread":"main","time":"2025-12-18T01:36:21.826345Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001423,"t_rel":0.001423,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193635.359890Z-H5c947e1c-P0000227f","thread":"main","time":"2024-11-14T19:36:35.365913Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.006220,"t_rel":0.006220,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193642.631871Z-H5c947e1c-P00002f91","thread":"main","time":"2024-11-14T19:36:42.632977Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001294,"t_rel":0.001294,"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': 
@@ -316321,19 +319707,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":"20251218T013616.664540Z-Hfbad846e-P00002180","thread":"main","time":"2025-12-18T01:36:16.665859Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001513,"t_rel":0.001513,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20251218T013621.825067Z-Hfbad846e-P000032a7","thread":"main","time":"2025-12-18T01:36:21.826345Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001423,"t_rel":0.001423,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20251218T013624.548334Z-Hfbad846e-P000040b2","thread":"main","time":"2025-12-18T01:36:24.549662Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001470,"t_rel":0.001470,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193635.359890Z-H5c947e1c-P0000227f","thread":"main","time":"2024-11-14T19:36:35.365913Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.006220,"t_rel":0.006220,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193642.631871Z-H5c947e1c-P00002f91","thread":"main","time":"2024-11-14T19:36:42.632977Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001294,"t_rel":0.001294,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193648.239532Z-H5c947e1c-P0000393d","thread":"main","time":"2024-11-14T19:36:48.240705Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001342,"t_rel":0.001342,"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
@@ -316975,7 +320361,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":"20251218T013626.575395Z-Hfbad846e-P00004c8c","thread":"main","time":"2025-12-18T01:36:26.576934Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001767,"t_rel":0.001767,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193653.634116Z-H5c947e1c-P0000439e","thread":"main","time":"2024-11-14T19:36:53.635049Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001123,"t_rel":0.001123,"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': 
@@ -317470,18 +320856,18 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 611f51b9 checksum
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 236971ab 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":"20251218T013626.575395Z-Hfbad846e-P00004c8c","thread":"main","time":"2025-12-18T01:36:26.576934Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001767,"t_rel":0.001767,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20251218T013629.690293Z-Hfbad846e-P00005bfc","thread":"main","time":"2025-12-18T01:36:29.691697Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001552,"t_rel":0.001552,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193653.634116Z-H5c947e1c-P0000439e","thread":"main","time":"2024-11-14T19:36:53.635049Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001123,"t_rel":0.001123,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193659.555876Z-H5c947e1c-P00004fde","thread":"main","time":"2024-11-14T19:36:59.561183Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.005498,"t_rel":0.005498,"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 / 611f51b9 checksum
+Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 236971ab 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
@@ -318123,19 +321509,19 @@
 		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / e99a0c7c checksum
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
-{"event":"data","sid":"20251218T013626.575395Z-Hfbad846e-P00004c8c","thread":"main","time":"2025-12-18T01:36:26.576934Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001767,"t_rel":0.001767,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20251218T013629.690293Z-Hfbad846e-P00005bfc","thread":"main","time":"2025-12-18T01:36:29.691697Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001552,"t_rel":0.001552,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
-{"event":"data","sid":"20251218T013632.821472Z-Hfbad846e-P000072b1","thread":"main","time":"2025-12-18T01:36:32.823001Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001697,"t_rel":0.001697,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193653.634116Z-H5c947e1c-P0000439e","thread":"main","time":"2024-11-14T19:36:53.635049Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001123,"t_rel":0.001123,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193659.555876Z-H5c947e1c-P00004fde","thread":"main","time":"2024-11-14T19:36:59.561183Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.005498,"t_rel":0.005498,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
+{"event":"data","sid":"20241114T193709.486097Z-H5c947e1c-P00005cac","thread":"main","time":"2024-11-14T19:37:09.487337Z","file":"pack-revindex.c","line":381,"repo":1,"t_abs":0.001401,"t_rel":0.001401,"nesting":1,"category":"load_midx_revindex","key":"source","value":"rev"}
 ok 272 - reverse index exists (rev)
 
 expecting success of 5327.273 'rev-list --test-bitmap verifies bitmaps': 
 		git rev-list --test-bitmap HEAD~
 	
 Bitmap v1 test (107 entries)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / e99a0c7c checksum
+Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 24365dde checksum
 Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
 OK!
 ok 273 - rev-list --test-bitmap verifies bitmaps
@@ -318498,3378 +321884,1914 @@
 1..314
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5411-proc-receive-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t5501-fetch-push-alternates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 "post-receive< $old $new $ref"
+			echo "$i" >count &&
+			git add count &&
+			git commit -m "$i" || exit
+			i=$(($i + 1))
 		done
-		EOF
+	) &&
+	(
+		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
 
-		upstream=upstream.git
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5411-proc-receive-hook/upstream.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5411-proc-receive-hook/workbench/.git/
-[main (root-commit) 0ddfaf1] A
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 A.t
-[main d9df450] B
+ create mode 100644 count
+[main 00c614b] 1
  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.45.2/t/trash directory.t5411-proc-receive-hook/upstream.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5411-proc-receive-hook/workbench/.git/
-[main (root-commit) a3899a0] A
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 5ec1e45] 2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main 7763d60] B
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main a9efc77] 3
  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)
+ 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.45.2/t/trash directory.t5501-fetch-push-alternates/receiver/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5501-fetch-push-alternates/fetcher/.git/
+ok 1 - setup
 
-expecting success of 5411.10 'cleanup (builtin protocol)': 
+expecting success of 5501.2 'pushing into a repository with the same alternate': 
 	(
-		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 one &&
+		git push ../receiver main:refs/heads/it
+	) &&
 	(
-		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"
+		cd receiver &&
+		count_objects >../receiver.count
+	) &&
+	test_cmp one.count receiver.count
 
-ok 21 - cleanup (builtin protocol/porcelain)
+To ../receiver
+ * [new branch]      main -> it
+ok 2 - pushing into a repository with the same alternate
 
-expecting success of 5411.22 'add two receive.procReceiveRefs settings': 
+expecting success of 5501.3 'fetching from a repository with the same alternate': 
 	(
-		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
+		cd fetcher &&
+		git fetch ../one main:refs/heads/it &&
+		count_objects >../fetcher.count
+	) &&
+	test_cmp one.count fetcher.count
 
-ok 128 - proc-receive: report option refname and old-oid (builtin protocol/porcelain)
+From ../one
+ * [new branch]      main       -> it
+ok 3 - fetching from a repository with the same alternate
 
-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
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5502-quickfetch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5502-quickfetch/.git/
+expecting success of 5502.1 'setup': 
 
-ok 129 - setup proc-receive hook (option old-oid, builtin protocol/porcelain)
+	test_tick &&
+	echo ichi >file &&
+	git add file &&
+	git commit -m initial &&
 
-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
+	cnt=$( (
+		git count-objects | sed -e "s/ *objects,.*//"
+	) ) &&
+	test $cnt -eq 3
 
-ok 130 - proc-receive: report option old-oid (builtin protocol/porcelain)
+[main (root-commit) f3b89bf] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
 
-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
+expecting success of 5502.2 'clone without alternate': 
 
-ok 131 - setup proc-receive hook (option old-oid and new-oid, builtin protocol/porcelain)
+	(
+		mkdir cloned &&
+		cd cloned &&
+		git init-db &&
+		git remote add -f origin ..
+	) &&
+	cnt=$( (
+		cd cloned &&
+		git count-objects | sed -e "s/ *objects,.*//"
+	) ) &&
+	test $cnt -eq 3
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5502-quickfetch/cloned/.git/
+Updating origin
+From ..
+ * [new branch]      main       -> origin/main
+ok 2 - clone without alternate
 
-ok 132 - proc-receive: report option old-oid and new-oid (builtin protocol/porcelain)
+expecting success of 5502.3 'further commits in the original': 
 
-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"
+	test_tick &&
+	echo ni >file &&
+	git commit -a -m second &&
 
-	EOF
+	cnt=$( (
+		git count-objects | sed -e "s/ *objects,.*//"
+	) ) &&
+	test $cnt -eq 6
 
-ok 133 - setup proc-receive hook (report with multiple rewrites, builtin protocol/porcelain)
+[main 12e0958] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - further commits in the original
 
-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 5502.4 'copy commit and tree but not blob by hand': 
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+	git rev-list --objects HEAD |
+	git pack-objects --stdout |
+	(
+		cd cloned &&
+		git unpack-objects
+	) &&
 
-ok 134 - proc-receive: report with multiple rewrites (builtin protocol/porcelain)
+	cnt=$( (
+		cd cloned &&
+		git count-objects | sed -e "s/ *objects,.*//"
+	) ) &&
+	test $cnt -eq 6 &&
 
-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
+	blob=$(git rev-parse HEAD:file | sed -e "s|..|&/|") &&
+	test -f "cloned/.git/objects/$blob" &&
+	rm -f "cloned/.git/objects/$blob" &&
 
-ok 135 - setup proc-receive hook (ft, builtin protocol)
+	cnt=$( (
+		cd cloned &&
+		git count-objects | sed -e "s/ *objects,.*//"
+	) ) &&
+	test $cnt -eq 5
 
-expecting success of 5411.136 'proc-receive: fall throught, 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 4 - copy commit and tree but not blob by hand
 
-ok 136 - proc-receive: fall throught, let receive-pack to execute (builtin protocol)
+expecting success of 5502.5 'quickfetch should not leave a corrupted repository': 
 
-expecting success of 5411.137 'cleanup (builtin protocol)': 
-	git -C "$upstream" update-ref -d refs/for/main/topic
+	(
+		cd cloned &&
+		git fetch
+	) &&
 
-ok 137 - cleanup (builtin protocol)
+	cnt=$( (
+		cd cloned &&
+		git count-objects | sed -e "s/ *objects,.*//"
+	) ) &&
+	test $cnt -eq 6
 
-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)
+From ..
+   f3b89bf..12e0958  main       -> origin/main
+ok 5 - quickfetch should not leave a corrupted repository
 
-expecting success of 5411.139 'proc-receive: fall throught, 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 &&
+expecting success of 5502.6 'quickfetch should not copy from alternate': 
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/for/main/topic
-	<COMMIT-A> refs/heads/main
-	EOF
+	(
+		mkdir quickclone &&
+		cd quickclone &&
+		git init-db &&
+		(cd ../.git/objects && pwd) >.git/objects/info/alternates &&
+		git remote add origin .. &&
+		git fetch -k -k
+	) &&
+	obj_cnt=$( (
+		cd quickclone &&
+		git count-objects | sed -e "s/ *objects,.*//"
+	) ) &&
+	pck_cnt=$( (
+		cd quickclone &&
+		git count-objects -v | sed -n -e "/packs:/{
+				s/packs://
+				p
+				q
+			}"
+	) ) &&
+	origin_main=$( (
+		cd quickclone &&
+		git rev-parse origin/main
+	) ) &&
+	echo "loose objects: $obj_cnt, packfiles: $pck_cnt" &&
+	test $obj_cnt -eq 0 &&
+	test $pck_cnt -eq 0 &&
+	test z$origin_main = z$(git rev-parse main)
 
-ok 139 - proc-receive: fall throught, 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5502-quickfetch/quickclone/.git/
+From ..
+ * [new branch]      main       -> origin/main
+loose objects: 0, packfiles:  0
+ok 6 - quickfetch should not copy from alternate
 
-ok 140 - cleanup (builtin protocol/porcelain)
+expecting success of 5502.7 'quickfetch should handle ~1000 refs (on Windows)': 
 
-expecting success of 5411.141 'setup git config for remote-tracking of special refs': 
+	git gc &&
+	head=$(git rev-parse HEAD) &&
+	branchprefix="$head refs/heads/branch" &&
+	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
+			for k in 0 1 2 3 4 5 6 7 8 9; do
+				echo "$branchprefix$i$j$k" >> .git/packed-refs || return 1
+			done
+		done
+	done &&
 	(
-		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
+		cd cloned &&
+		git fetch &&
+		git fetch
 	)
 
-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
+From ..
+ * [new branch]      branch000  -> origin/branch000
+ * [new branch]      branch001  -> origin/branch001
+ * [new branch]      branch002  -> origin/branch002
+ * [new branch]      branch003  -> origin/branch003
+ * [new branch]      branch004  -> origin/branch004
+ * [new branch]      branch005  -> origin/branch005
+ * [new branch]      branch006  -> origin/branch006
+ * [new branch]      branch007  -> origin/branch007
+ * [new branch]      branch008  -> origin/branch008
+ * [new branch]      branch009  -> origin/branch009
+ * [new branch]      branch010  -> origin/branch010
+ * [new branch]      branch011  -> origin/branch011
+ * [new branch]      branch012  -> origin/branch012
+ * [new branch]      branch013  -> origin/branch013
+ * [new branch]      branch014  -> origin/branch014
+ * [new branch]      branch015  -> origin/branch015
+ * [new branch]      branch016  -> origin/branch016
+ * [new branch]      branch017  -> origin/branch017
+ * [new branch]      branch018  -> origin/branch018
+ * [new branch]      branch019  -> origin/branch019
+ * [new branch]      branch020  -> origin/branch020
+ * [new branch]      branch021  -> origin/branch021
+ * [new branch]      branch022  -> origin/branch022
+ * [new branch]      branch023  -> origin/branch023
+ * [new branch]      branch024  -> origin/branch024
+ * [new branch]      branch025  -> origin/branch025
+ * [new branch]      branch026  -> origin/branch026
+ * [new branch]      branch027  -> origin/branch027
+ * [new branch]      branch028  -> origin/branch028
+ * [new branch]      branch029  -> origin/branch029
+ * [new branch]      branch030  -> origin/branch030
+ * [new branch]      branch031  -> origin/branch031
+ * [new branch]      branch032  -> origin/branch032
+ * [new branch]      branch033  -> origin/branch033
+ * [new branch]      branch034  -> origin/branch034
+ * [new branch]      branch035  -> origin/branch035
+ * [new branch]      branch036  -> origin/branch036
+ * [new branch]      branch037  -> origin/branch037
+ * [new branch]      branch038  -> origin/branch038
+ * [new branch]      branch039  -> origin/branch039
+ * [new branch]      branch040  -> origin/branch040
+ * [new branch]      branch041  -> origin/branch041
+ * [new branch]      branch042  -> origin/branch042
+ * [new branch]      branch043  -> origin/branch043
+ * [new branch]      branch044  -> origin/branch044
+ * [new branch]      branch045  -> origin/branch045
+ * [new branch]      branch046  -> origin/branch046
+ * [new branch]      branch047  -> origin/branch047
+ * [new branch]      branch048  -> origin/branch048
+ * [new branch]      branch049  -> origin/branch049
+ * [new branch]      branch050  -> origin/branch050
+ * [new branch]      branch051  -> origin/branch051
+ * [new branch]      branch052  -> origin/branch052
+ * [new branch]      branch053  -> origin/branch053
+ * [new branch]      branch054  -> origin/branch054
+ * [new branch]      branch055  -> origin/branch055
+ * [new branch]      branch056  -> origin/branch056
+ * [new branch]      branch057  -> origin/branch057
+ * [new branch]      branch058  -> origin/branch058
+ * [new branch]      branch059  -> origin/branch059
+ * [new branch]      branch060  -> origin/branch060
+ * [new branch]      branch061  -> origin/branch061
+ * [new branch]      branch062  -> origin/branch062
+ * [new branch]      branch063  -> origin/branch063
+ * [new branch]      branch064  -> origin/branch064
+ * [new branch]      branch065  -> origin/branch065
+ * [new branch]      branch066  -> origin/branch066
+ * [new branch]      branch067  -> origin/branch067
+ * [new branch]      branch068  -> origin/branch068
+ * [new branch]      branch069  -> origin/branch069
+ * [new branch]      branch070  -> origin/branch070
+ * [new branch]      branch071  -> origin/branch071
+ * [new branch]      branch072  -> origin/branch072
+ * [new branch]      branch073  -> origin/branch073
+ * [new branch]      branch074  -> origin/branch074
+ * [new branch]      branch075  -> origin/branch075
+ * [new branch]      branch076  -> origin/branch076
+ * [new branch]      branch077  -> origin/branch077
+ * [new branch]      branch078  -> origin/branch078
+ * [new branch]      branch079  -> origin/branch079
+ * [new branch]      branch080  -> origin/branch080
+ * [new branch]      branch081  -> origin/branch081
+ * [new branch]      branch082  -> origin/branch082
+ * [new branch]      branch083  -> origin/branch083
+ * [new branch]      branch084  -> origin/branch084
+ * [new branch]      branch085  -> origin/branch085
+ * [new branch]      branch086  -> origin/branch086
+ * [new branch]      branch087  -> origin/branch087
+ * [new branch]      branch088  -> origin/branch088
+ * [new branch]      branch089  -> origin/branch089
+ * [new branch]      branch090  -> origin/branch090
+ * [new branch]      branch091  -> origin/branch091
+ * [new branch]      branch092  -> origin/branch092
+ * [new branch]      branch093  -> origin/branch093
+ * [new branch]      branch094  -> origin/branch094
+ * [new branch]      branch095  -> origin/branch095
+ * [new branch]      branch096  -> origin/branch096
+ * [new branch]      branch097  -> origin/branch097
+ * [new branch]      branch098  -> origin/branch098
+ * [new branch]      branch099  -> origin/branch099
+ * [new branch]      branch100  -> origin/branch100
+ * [new branch]      branch101  -> origin/branch101
+ * [new branch]      branch102  -> origin/branch102
+ * [new branch]      branch103  -> origin/branch103
+ * [new branch]      branch104  -> origin/branch104
+ * [new branch]      branch105  -> origin/branch105
+ * [new branch]      branch106  -> origin/branch106
+ * [new branch]      branch107  -> origin/branch107
+ * [new branch]      branch108  -> origin/branch108
+ * [new branch]      branch109  -> origin/branch109
+ * [new branch]      branch110  -> origin/branch110
+ * [new branch]      branch111  -> origin/branch111
+ * [new branch]      branch112  -> origin/branch112
+ * [new branch]      branch113  -> origin/branch113
+ * [new branch]      branch114  -> origin/branch114
+ * [new branch]      branch115  -> origin/branch115
+ * [new branch]      branch116  -> origin/branch116
+ * [new branch]      branch117  -> origin/branch117
+ * [new branch]      branch118  -> origin/branch118
+ * [new branch]      branch119  -> origin/branch119
+ * [new branch]      branch120  -> origin/branch120
+ * [new branch]      branch121  -> origin/branch121
+ * [new branch]      branch122  -> origin/branch122
+ * [new branch]      branch123  -> origin/branch123
+ * [new branch]      branch124  -> origin/branch124
+ * [new branch]      branch125  -> origin/branch125
+ * [new branch]      branch126  -> origin/branch126
+ * [new branch]      branch127  -> origin/branch127
+ * [new branch]      branch128  -> origin/branch128
+ * [new branch]      branch129  -> origin/branch129
+ * [new branch]      branch130  -> origin/branch130
+ * [new branch]      branch131  -> origin/branch131
+ * [new branch]      branch132  -> origin/branch132
+ * [new branch]      branch133  -> origin/branch133
+ * [new branch]      branch134  -> origin/branch134
+ * [new branch]      branch135  -> origin/branch135
+ * [new branch]      branch136  -> origin/branch136
+ * [new branch]      branch137  -> origin/branch137
+ * [new branch]      branch138  -> origin/branch138
+ * [new branch]      branch139  -> origin/branch139
+ * [new branch]      branch140  -> origin/branch140
+ * [new branch]      branch141  -> origin/branch141
+ * [new branch]      branch142  -> origin/branch142
+ * [new branch]      branch143  -> origin/branch143
+ * [new branch]      branch144  -> origin/branch144
+ * [new branch]      branch145  -> origin/branch145
+ * [new branch]      branch146  -> origin/branch146
+ * [new branch]      branch147  -> origin/branch147
+ * [new branch]      branch148  -> origin/branch148
+ * [new branch]      branch149  -> origin/branch149
+ * [new branch]      branch150  -> origin/branch150
+ * [new branch]      branch151  -> origin/branch151
+ * [new branch]      branch152  -> origin/branch152
+ * [new branch]      branch153  -> origin/branch153
+ * [new branch]      branch154  -> origin/branch154
+ * [new branch]      branch155  -> origin/branch155
+ * [new branch]      branch156  -> origin/branch156
+ * [new branch]      branch157  -> origin/branch157
+ * [new branch]      branch158  -> origin/branch158
+ * [new branch]      branch159  -> origin/branch159
+ * [new branch]      branch160  -> origin/branch160
+ * [new branch]      branch161  -> origin/branch161
+ * [new branch]      branch162  -> origin/branch162
+ * [new branch]      branch163  -> origin/branch163
+ * [new branch]      branch164  -> origin/branch164
+ * [new branch]      branch165  -> origin/branch165
+ * [new branch]      branch166  -> origin/branch166
+ * [new branch]      branch167  -> origin/branch167
+ * [new branch]      branch168  -> origin/branch168
+ * [new branch]      branch169  -> origin/branch169
+ * [new branch]      branch170  -> origin/branch170
+ * [new branch]      branch171  -> origin/branch171
+ * [new branch]      branch172  -> origin/branch172
+ * [new branch]      branch173  -> origin/branch173
+ * [new branch]      branch174  -> origin/branch174
+ * [new branch]      branch175  -> origin/branch175
+ * [new branch]      branch176  -> origin/branch176
+ * [new branch]      branch177  -> origin/branch177
+ * [new branch]      branch178  -> origin/branch178
+ * [new branch]      branch179  -> origin/branch179
+ * [new branch]      branch180  -> origin/branch180
+ * [new branch]      branch181  -> origin/branch181
+ * [new branch]      branch182  -> origin/branch182
+ * [new branch]      branch183  -> origin/branch183
+ * [new branch]      branch184  -> origin/branch184
+ * [new branch]      branch185  -> origin/branch185
+ * [new branch]      branch186  -> origin/branch186
+ * [new branch]      branch187  -> origin/branch187
+ * [new branch]      branch188  -> origin/branch188
+ * [new branch]      branch189  -> origin/branch189
+ * [new branch]      branch190  -> origin/branch190
+ * [new branch]      branch191  -> origin/branch191
+ * [new branch]      branch192  -> origin/branch192
+ * [new branch]      branch193  -> origin/branch193
+ * [new branch]      branch194  -> origin/branch194
+ * [new branch]      branch195  -> origin/branch195
+ * [new branch]      branch196  -> origin/branch196
+ * [new branch]      branch197  -> origin/branch197
+ * [new branch]      branch198  -> origin/branch198
+ * [new branch]      branch199  -> origin/branch199
+ * [new branch]      branch200  -> origin/branch200
+ * [new branch]      branch201  -> origin/branch201
+ * [new branch]      branch202  -> origin/branch202
+ * [new branch]      branch203  -> origin/branch203
+ * [new branch]      branch204  -> origin/branch204
+ * [new branch]      branch205  -> origin/branch205
+ * [new branch]      branch206  -> origin/branch206
+ * [new branch]      branch207  -> origin/branch207
+ * [new branch]      branch208  -> origin/branch208
+ * [new branch]      branch209  -> origin/branch209
+ * [new branch]      branch210  -> origin/branch210
+ * [new branch]      branch211  -> origin/branch211
+ * [new branch]      branch212  -> origin/branch212
+ * [new branch]      branch213  -> origin/branch213
+ * [new branch]      branch214  -> origin/branch214
+ * [new branch]      branch215  -> origin/branch215
+ * [new branch]      branch216  -> origin/branch216
+ * [new branch]      branch217  -> origin/branch217
+ * [new branch]      branch218  -> origin/branch218
+ * [new branch]      branch219  -> origin/branch219
+ * [new branch]      branch220  -> origin/branch220
+ * [new branch]      branch221  -> origin/branch221
+ * [new branch]      branch222  -> origin/branch222
+ * [new branch]      branch223  -> origin/branch223
+ * [new branch]      branch224  -> origin/branch224
+ * [new branch]      branch225  -> origin/branch225
+ * [new branch]      branch226  -> origin/branch226
+ * [new branch]      branch227  -> origin/branch227
+ * [new branch]      branch228  -> origin/branch228
+ * [new branch]      branch229  -> origin/branch229
+ * [new branch]      branch230  -> origin/branch230
+ * [new branch]      branch231  -> origin/branch231
+ * [new branch]      branch232  -> origin/branch232
+ * [new branch]      branch233  -> origin/branch233
+ * [new branch]      branch234  -> origin/branch234
+ * [new branch]      branch235  -> origin/branch235
+ * [new branch]      branch236  -> origin/branch236
+ * [new branch]      branch237  -> origin/branch237
+ * [new branch]      branch238  -> origin/branch238
+ * [new branch]      branch239  -> origin/branch239
+ * [new branch]      branch240  -> origin/branch240
+ * [new branch]      branch241  -> origin/branch241
+ * [new branch]      branch242  -> origin/branch242
+ * [new branch]      branch243  -> origin/branch243
+ * [new branch]      branch244  -> origin/branch244
+ * [new branch]      branch245  -> origin/branch245
+ * [new branch]      branch246  -> origin/branch246
+ * [new branch]      branch247  -> origin/branch247
+ * [new branch]      branch248  -> origin/branch248
+ * [new branch]      branch249  -> origin/branch249
+ * [new branch]      branch250  -> origin/branch250
+ * [new branch]      branch251  -> origin/branch251
+ * [new branch]      branch252  -> origin/branch252
+ * [new branch]      branch253  -> origin/branch253
+ * [new branch]      branch254  -> origin/branch254
+ * [new branch]      branch255  -> origin/branch255
+ * [new branch]      branch256  -> origin/branch256
+ * [new branch]      branch257  -> origin/branch257
+ * [new branch]      branch258  -> origin/branch258
+ * [new branch]      branch259  -> origin/branch259
+ * [new branch]      branch260  -> origin/branch260
+ * [new branch]      branch261  -> origin/branch261
+ * [new branch]      branch262  -> origin/branch262
+ * [new branch]      branch263  -> origin/branch263
+ * [new branch]      branch264  -> origin/branch264
+ * [new branch]      branch265  -> origin/branch265
+ * [new branch]      branch266  -> origin/branch266
+ * [new branch]      branch267  -> origin/branch267
+ * [new branch]      branch268  -> origin/branch268
+ * [new branch]      branch269  -> origin/branch269
+ * [new branch]      branch270  -> origin/branch270
+ * [new branch]      branch271  -> origin/branch271
+ * [new branch]      branch272  -> origin/branch272
+ * [new branch]      branch273  -> origin/branch273
+ * [new branch]      branch274  -> origin/branch274
+ * [new branch]      branch275  -> origin/branch275
+ * [new branch]      branch276  -> origin/branch276
+ * [new branch]      branch277  -> origin/branch277
+ * [new branch]      branch278  -> origin/branch278
+ * [new branch]      branch279  -> origin/branch279
+ * [new branch]      branch280  -> origin/branch280
+ * [new branch]      branch281  -> origin/branch281
+ * [new branch]      branch282  -> origin/branch282
+ * [new branch]      branch283  -> origin/branch283
+ * [new branch]      branch284  -> origin/branch284
+ * [new branch]      branch285  -> origin/branch285
+ * [new branch]      branch286  -> origin/branch286
+ * [new branch]      branch287  -> origin/branch287
+ * [new branch]      branch288  -> origin/branch288
+ * [new branch]      branch289  -> origin/branch289
+ * [new branch]      branch290  -> origin/branch290
+ * [new branch]      branch291  -> origin/branch291
+ * [new branch]      branch292  -> origin/branch292
+ * [new branch]      branch293  -> origin/branch293
+ * [new branch]      branch294  -> origin/branch294
+ * [new branch]      branch295  -> origin/branch295
+ * [new branch]      branch296  -> origin/branch296
+ * [new branch]      branch297  -> origin/branch297
+ * [new branch]      branch298  -> origin/branch298
+ * [new branch]      branch299  -> origin/branch299
+ * [new branch]      branch300  -> origin/branch300
+ * [new branch]      branch301  -> origin/branch301
+ * [new branch]      branch302  -> origin/branch302
+ * [new branch]      branch303  -> origin/branch303
+ * [new branch]      branch304  -> origin/branch304
+ * [new branch]      branch305  -> origin/branch305
+ * [new branch]      branch306  -> origin/branch306
+ * [new branch]      branch307  -> origin/branch307
+ * [new branch]      branch308  -> origin/branch308
+ * [new branch]      branch309  -> origin/branch309
+ * [new branch]      branch310  -> origin/branch310
+ * [new branch]      branch311  -> origin/branch311
+ * [new branch]      branch312  -> origin/branch312
+ * [new branch]      branch313  -> origin/branch313
+ * [new branch]      branch314  -> origin/branch314
+ * [new branch]      branch315  -> origin/branch315
+ * [new branch]      branch316  -> origin/branch316
+ * [new branch]      branch317  -> origin/branch317
+ * [new branch]      branch318  -> origin/branch318
+ * [new branch]      branch319  -> origin/branch319
+ * [new branch]      branch320  -> origin/branch320
+ * [new branch]      branch321  -> origin/branch321
+ * [new branch]      branch322  -> origin/branch322
+ * [new branch]      branch323  -> origin/branch323
+ * [new branch]      branch324  -> origin/branch324
+ * [new branch]      branch325  -> origin/branch325
+ * [new branch]      branch326  -> origin/branch326
+ * [new branch]      branch327  -> origin/branch327
+ * [new branch]      branch328  -> origin/branch328
+ * [new branch]      branch329  -> origin/branch329
+ * [new branch]      branch330  -> origin/branch330
+ * [new branch]      branch331  -> origin/branch331
+ * [new branch]      branch332  -> origin/branch332
+ * [new branch]      branch333  -> origin/branch333
+ * [new branch]      branch334  -> origin/branch334
+ * [new branch]      branch335  -> origin/branch335
+ * [new branch]      branch336  -> origin/branch336
+ * [new branch]      branch337  -> origin/branch337
+ * [new branch]      branch338  -> origin/branch338
+ * [new branch]      branch339  -> origin/branch339
+ * [new branch]      branch340  -> origin/branch340
+ * [new branch]      branch341  -> origin/branch341
+ * [new branch]      branch342  -> origin/branch342
+ * [new branch]      branch343  -> origin/branch343
+ * [new branch]      branch344  -> origin/branch344
+ * [new branch]      branch345  -> origin/branch345
+ * [new branch]      branch346  -> origin/branch346
+ * [new branch]      branch347  -> origin/branch347
+ * [new branch]      branch348  -> origin/branch348
+ * [new branch]      branch349  -> origin/branch349
+ * [new branch]      branch350  -> origin/branch350
+ * [new branch]      branch351  -> origin/branch351
+ * [new branch]      branch352  -> origin/branch352
+ * [new branch]      branch353  -> origin/branch353
+ * [new branch]      branch354  -> origin/branch354
+ * [new branch]      branch355  -> origin/branch355
+ * [new branch]      branch356  -> origin/branch356
+ * [new branch]      branch357  -> origin/branch357
+ * [new branch]      branch358  -> origin/branch358
+ * [new branch]      branch359  -> origin/branch359
+ * [new branch]      branch360  -> origin/branch360
+ * [new branch]      branch361  -> origin/branch361
+ * [new branch]      branch362  -> origin/branch362
+ * [new branch]      branch363  -> origin/branch363
+ * [new branch]      branch364  -> origin/branch364
+ * [new branch]      branch365  -> origin/branch365
+ * [new branch]      branch366  -> origin/branch366
+ * [new branch]      branch367  -> origin/branch367
+ * [new branch]      branch368  -> origin/branch368
+ * [new branch]      branch369  -> origin/branch369
+ * [new branch]      branch370  -> origin/branch370
+ * [new branch]      branch371  -> origin/branch371
+ * [new branch]      branch372  -> origin/branch372
+ * [new branch]      branch373  -> origin/branch373
+ * [new branch]      branch374  -> origin/branch374
+ * [new branch]      branch375  -> origin/branch375
+ * [new branch]      branch376  -> origin/branch376
+ * [new branch]      branch377  -> origin/branch377
+ * [new branch]      branch378  -> origin/branch378
+ * [new branch]      branch379  -> origin/branch379
+ * [new branch]      branch380  -> origin/branch380
+ * [new branch]      branch381  -> origin/branch381
+ * [new branch]      branch382  -> origin/branch382
+ * [new branch]      branch383  -> origin/branch383
+ * [new branch]      branch384  -> origin/branch384
+ * [new branch]      branch385  -> origin/branch385
+ * [new branch]      branch386  -> origin/branch386
+ * [new branch]      branch387  -> origin/branch387
+ * [new branch]      branch388  -> origin/branch388
+ * [new branch]      branch389  -> origin/branch389
+ * [new branch]      branch390  -> origin/branch390
+ * [new branch]      branch391  -> origin/branch391
+ * [new branch]      branch392  -> origin/branch392
+ * [new branch]      branch393  -> origin/branch393
+ * [new branch]      branch394  -> origin/branch394
+ * [new branch]      branch395  -> origin/branch395
+ * [new branch]      branch396  -> origin/branch396
+ * [new branch]      branch397  -> origin/branch397
+ * [new branch]      branch398  -> origin/branch398
+ * [new branch]      branch399  -> origin/branch399
+ * [new branch]      branch400  -> origin/branch400
+ * [new branch]      branch401  -> origin/branch401
+ * [new branch]      branch402  -> origin/branch402
+ * [new branch]      branch403  -> origin/branch403
+ * [new branch]      branch404  -> origin/branch404
+ * [new branch]      branch405  -> origin/branch405
+ * [new branch]      branch406  -> origin/branch406
+ * [new branch]      branch407  -> origin/branch407
+ * [new branch]      branch408  -> origin/branch408
+ * [new branch]      branch409  -> origin/branch409
+ * [new branch]      branch410  -> origin/branch410
+ * [new branch]      branch411  -> origin/branch411
+ * [new branch]      branch412  -> origin/branch412
+ * [new branch]      branch413  -> origin/branch413
+ * [new branch]      branch414  -> origin/branch414
+ * [new branch]      branch415  -> origin/branch415
+ * [new branch]      branch416  -> origin/branch416
+ * [new branch]      branch417  -> origin/branch417
+ * [new branch]      branch418  -> origin/branch418
+ * [new branch]      branch419  -> origin/branch419
+ * [new branch]      branch420  -> origin/branch420
+ * [new branch]      branch421  -> origin/branch421
+ * [new branch]      branch422  -> origin/branch422
+ * [new branch]      branch423  -> origin/branch423
+ * [new branch]      branch424  -> origin/branch424
+ * [new branch]      branch425  -> origin/branch425
+ * [new branch]      branch426  -> origin/branch426
+ * [new branch]      branch427  -> origin/branch427
+ * [new branch]      branch428  -> origin/branch428
+ * [new branch]      branch429  -> origin/branch429
+ * [new branch]      branch430  -> origin/branch430
+ * [new branch]      branch431  -> origin/branch431
+ * [new branch]      branch432  -> origin/branch432
+ * [new branch]      branch433  -> origin/branch433
+ * [new branch]      branch434  -> origin/branch434
+ * [new branch]      branch435  -> origin/branch435
+ * [new branch]      branch436  -> origin/branch436
+ * [new branch]      branch437  -> origin/branch437
+ * [new branch]      branch438  -> origin/branch438
+ * [new branch]      branch439  -> origin/branch439
+ * [new branch]      branch440  -> origin/branch440
+ * [new branch]      branch441  -> origin/branch441
+ * [new branch]      branch442  -> origin/branch442
+ * [new branch]      branch443  -> origin/branch443
+ * [new branch]      branch444  -> origin/branch444
+ * [new branch]      branch445  -> origin/branch445
+ * [new branch]      branch446  -> origin/branch446
+ * [new branch]      branch447  -> origin/branch447
+ * [new branch]      branch448  -> origin/branch448
+ * [new branch]      branch449  -> origin/branch449
+ * [new branch]      branch450  -> origin/branch450
+ * [new branch]      branch451  -> origin/branch451
+ * [new branch]      branch452  -> origin/branch452
+ * [new branch]      branch453  -> origin/branch453
+ * [new branch]      branch454  -> origin/branch454
+ * [new branch]      branch455  -> origin/branch455
+ * [new branch]      branch456  -> origin/branch456
+ * [new branch]      branch457  -> origin/branch457
+ * [new branch]      branch458  -> origin/branch458
+ * [new branch]      branch459  -> origin/branch459
+ * [new branch]      branch460  -> origin/branch460
+ * [new branch]      branch461  -> origin/branch461
+ * [new branch]      branch462  -> origin/branch462
+ * [new branch]      branch463  -> origin/branch463
+ * [new branch]      branch464  -> origin/branch464
+ * [new branch]      branch465  -> origin/branch465
+ * [new branch]      branch466  -> origin/branch466
+ * [new branch]      branch467  -> origin/branch467
+ * [new branch]      branch468  -> origin/branch468
+ * [new branch]      branch469  -> origin/branch469
+ * [new branch]      branch470  -> origin/branch470
+ * [new branch]      branch471  -> origin/branch471
+ * [new branch]      branch472  -> origin/branch472
+ * [new branch]      branch473  -> origin/branch473
+ * [new branch]      branch474  -> origin/branch474
+ * [new branch]      branch475  -> origin/branch475
+ * [new branch]      branch476  -> origin/branch476
+ * [new branch]      branch477  -> origin/branch477
+ * [new branch]      branch478  -> origin/branch478
+ * [new branch]      branch479  -> origin/branch479
+ * [new branch]      branch480  -> origin/branch480
+ * [new branch]      branch481  -> origin/branch481
+ * [new branch]      branch482  -> origin/branch482
+ * [new branch]      branch483  -> origin/branch483
+ * [new branch]      branch484  -> origin/branch484
+ * [new branch]      branch485  -> origin/branch485
+ * [new branch]      branch486  -> origin/branch486
+ * [new branch]      branch487  -> origin/branch487
+ * [new branch]      branch488  -> origin/branch488
+ * [new branch]      branch489  -> origin/branch489
+ * [new branch]      branch490  -> origin/branch490
+ * [new branch]      branch491  -> origin/branch491
+ * [new branch]      branch492  -> origin/branch492
+ * [new branch]      branch493  -> origin/branch493
+ * [new branch]      branch494  -> origin/branch494
+ * [new branch]      branch495  -> origin/branch495
+ * [new branch]      branch496  -> origin/branch496
+ * [new branch]      branch497  -> origin/branch497
+ * [new branch]      branch498  -> origin/branch498
+ * [new branch]      branch499  -> origin/branch499
+ * [new branch]      branch500  -> origin/branch500
+ * [new branch]      branch501  -> origin/branch501
+ * [new branch]      branch502  -> origin/branch502
+ * [new branch]      branch503  -> origin/branch503
+ * [new branch]      branch504  -> origin/branch504
+ * [new branch]      branch505  -> origin/branch505
+ * [new branch]      branch506  -> origin/branch506
+ * [new branch]      branch507  -> origin/branch507
+ * [new branch]      branch508  -> origin/branch508
+ * [new branch]      branch509  -> origin/branch509
+ * [new branch]      branch510  -> origin/branch510
+ * [new branch]      branch511  -> origin/branch511
+ * [new branch]      branch512  -> origin/branch512
+ * [new branch]      branch513  -> origin/branch513
+ * [new branch]      branch514  -> origin/branch514
+ * [new branch]      branch515  -> origin/branch515
+ * [new branch]      branch516  -> origin/branch516
+ * [new branch]      branch517  -> origin/branch517
+ * [new branch]      branch518  -> origin/branch518
+ * [new branch]      branch519  -> origin/branch519
+ * [new branch]      branch520  -> origin/branch520
+ * [new branch]      branch521  -> origin/branch521
+ * [new branch]      branch522  -> origin/branch522
+ * [new branch]      branch523  -> origin/branch523
+ * [new branch]      branch524  -> origin/branch524
+ * [new branch]      branch525  -> origin/branch525
+ * [new branch]      branch526  -> origin/branch526
+ * [new branch]      branch527  -> origin/branch527
+ * [new branch]      branch528  -> origin/branch528
+ * [new branch]      branch529  -> origin/branch529
+ * [new branch]      branch530  -> origin/branch530
+ * [new branch]      branch531  -> origin/branch531
+ * [new branch]      branch532  -> origin/branch532
+ * [new branch]      branch533  -> origin/branch533
+ * [new branch]      branch534  -> origin/branch534
+ * [new branch]      branch535  -> origin/branch535
+ * [new branch]      branch536  -> origin/branch536
+ * [new branch]      branch537  -> origin/branch537
+ * [new branch]      branch538  -> origin/branch538
+ * [new branch]      branch539  -> origin/branch539
+ * [new branch]      branch540  -> origin/branch540
+ * [new branch]      branch541  -> origin/branch541
+ * [new branch]      branch542  -> origin/branch542
+ * [new branch]      branch543  -> origin/branch543
+ * [new branch]      branch544  -> origin/branch544
+ * [new branch]      branch545  -> origin/branch545
+ * [new branch]      branch546  -> origin/branch546
+ * [new branch]      branch547  -> origin/branch547
+ * [new branch]      branch548  -> origin/branch548
+ * [new branch]      branch549  -> origin/branch549
+ * [new branch]      branch550  -> origin/branch550
+ * [new branch]      branch551  -> origin/branch551
+ * [new branch]      branch552  -> origin/branch552
+ * [new branch]      branch553  -> origin/branch553
+ * [new branch]      branch554  -> origin/branch554
+ * [new branch]      branch555  -> origin/branch555
+ * [new branch]      branch556  -> origin/branch556
+ * [new branch]      branch557  -> origin/branch557
+ * [new branch]      branch558  -> origin/branch558
+ * [new branch]      branch559  -> origin/branch559
+ * [new branch]      branch560  -> origin/branch560
+ * [new branch]      branch561  -> origin/branch561
+ * [new branch]      branch562  -> origin/branch562
+ * [new branch]      branch563  -> origin/branch563
+ * [new branch]      branch564  -> origin/branch564
+ * [new branch]      branch565  -> origin/branch565
+ * [new branch]      branch566  -> origin/branch566
+ * [new branch]      branch567  -> origin/branch567
+ * [new branch]      branch568  -> origin/branch568
+ * [new branch]      branch569  -> origin/branch569
+ * [new branch]      branch570  -> origin/branch570
+ * [new branch]      branch571  -> origin/branch571
+ * [new branch]      branch572  -> origin/branch572
+ * [new branch]      branch573  -> origin/branch573
+ * [new branch]      branch574  -> origin/branch574
+ * [new branch]      branch575  -> origin/branch575
+ * [new branch]      branch576  -> origin/branch576
+ * [new branch]      branch577  -> origin/branch577
+ * [new branch]      branch578  -> origin/branch578
+ * [new branch]      branch579  -> origin/branch579
+ * [new branch]      branch580  -> origin/branch580
+ * [new branch]      branch581  -> origin/branch581
+ * [new branch]      branch582  -> origin/branch582
+ * [new branch]      branch583  -> origin/branch583
+ * [new branch]      branch584  -> origin/branch584
+ * [new branch]      branch585  -> origin/branch585
+ * [new branch]      branch586  -> origin/branch586
+ * [new branch]      branch587  -> origin/branch587
+ * [new branch]      branch588  -> origin/branch588
+ * [new branch]      branch589  -> origin/branch589
+ * [new branch]      branch590  -> origin/branch590
+ * [new branch]      branch591  -> origin/branch591
+ * [new branch]      branch592  -> origin/branch592
+ * [new branch]      branch593  -> origin/branch593
+ * [new branch]      branch594  -> origin/branch594
+ * [new branch]      branch595  -> origin/branch595
+ * [new branch]      branch596  -> origin/branch596
+ * [new branch]      branch597  -> origin/branch597
+ * [new branch]      branch598  -> origin/branch598
+ * [new branch]      branch599  -> origin/branch599
+ * [new branch]      branch600  -> origin/branch600
+ * [new branch]      branch601  -> origin/branch601
+ * [new branch]      branch602  -> origin/branch602
+ * [new branch]      branch603  -> origin/branch603
+ * [new branch]      branch604  -> origin/branch604
+ * [new branch]      branch605  -> origin/branch605
+ * [new branch]      branch606  -> origin/branch606
+ * [new branch]      branch607  -> origin/branch607
+ * [new branch]      branch608  -> origin/branch608
+ * [new branch]      branch609  -> origin/branch609
+ * [new branch]      branch610  -> origin/branch610
+ * [new branch]      branch611  -> origin/branch611
+ * [new branch]      branch612  -> origin/branch612
+ * [new branch]      branch613  -> origin/branch613
+ * [new branch]      branch614  -> origin/branch614
+ * [new branch]      branch615  -> origin/branch615
+ * [new branch]      branch616  -> origin/branch616
+ * [new branch]      branch617  -> origin/branch617
+ * [new branch]      branch618  -> origin/branch618
+ * [new branch]      branch619  -> origin/branch619
+ * [new branch]      branch620  -> origin/branch620
+ * [new branch]      branch621  -> origin/branch621
+ * [new branch]      branch622  -> origin/branch622
+ * [new branch]      branch623  -> origin/branch623
+ * [new branch]      branch624  -> origin/branch624
+ * [new branch]      branch625  -> origin/branch625
+ * [new branch]      branch626  -> origin/branch626
+ * [new branch]      branch627  -> origin/branch627
+ * [new branch]      branch628  -> origin/branch628
+ * [new branch]      branch629  -> origin/branch629
+ * [new branch]      branch630  -> origin/branch630
+ * [new branch]      branch631  -> origin/branch631
+ * [new branch]      branch632  -> origin/branch632
+ * [new branch]      branch633  -> origin/branch633
+ * [new branch]      branch634  -> origin/branch634
+ * [new branch]      branch635  -> origin/branch635
+ * [new branch]      branch636  -> origin/branch636
+ * [new branch]      branch637  -> origin/branch637
+ * [new branch]      branch638  -> origin/branch638
+ * [new branch]      branch639  -> origin/branch639
+ * [new branch]      branch640  -> origin/branch640
+ * [new branch]      branch641  -> origin/branch641
+ * [new branch]      branch642  -> origin/branch642
+ * [new branch]      branch643  -> origin/branch643
+ * [new branch]      branch644  -> origin/branch644
+ * [new branch]      branch645  -> origin/branch645
+ * [new branch]      branch646  -> origin/branch646
+ * [new branch]      branch647  -> origin/branch647
+ * [new branch]      branch648  -> origin/branch648
+ * [new branch]      branch649  -> origin/branch649
+ * [new branch]      branch650  -> origin/branch650
+ * [new branch]      branch651  -> origin/branch651
+ * [new branch]      branch652  -> origin/branch652
+ * [new branch]      branch653  -> origin/branch653
+ * [new branch]      branch654  -> origin/branch654
+ * [new branch]      branch655  -> origin/branch655
+ * [new branch]      branch656  -> origin/branch656
+ * [new branch]      branch657  -> origin/branch657
+ * [new branch]      branch658  -> origin/branch658
+ * [new branch]      branch659  -> origin/branch659
+ * [new branch]      branch660  -> origin/branch660
+ * [new branch]      branch661  -> origin/branch661
+ * [new branch]      branch662  -> origin/branch662
+ * [new branch]      branch663  -> origin/branch663
+ * [new branch]      branch664  -> origin/branch664
+ * [new branch]      branch665  -> origin/branch665
+ * [new branch]      branch666  -> origin/branch666
+ * [new branch]      branch667  -> origin/branch667
+ * [new branch]      branch668  -> origin/branch668
+ * [new branch]      branch669  -> origin/branch669
+ * [new branch]      branch670  -> origin/branch670
+ * [new branch]      branch671  -> origin/branch671
+ * [new branch]      branch672  -> origin/branch672
+ * [new branch]      branch673  -> origin/branch673
+ * [new branch]      branch674  -> origin/branch674
+ * [new branch]      branch675  -> origin/branch675
+ * [new branch]      branch676  -> origin/branch676
+ * [new branch]      branch677  -> origin/branch677
+ * [new branch]      branch678  -> origin/branch678
+ * [new branch]      branch679  -> origin/branch679
+ * [new branch]      branch680  -> origin/branch680
+ * [new branch]      branch681  -> origin/branch681
+ * [new branch]      branch682  -> origin/branch682
+ * [new branch]      branch683  -> origin/branch683
+ * [new branch]      branch684  -> origin/branch684
+ * [new branch]      branch685  -> origin/branch685
+ * [new branch]      branch686  -> origin/branch686
+ * [new branch]      branch687  -> origin/branch687
+ * [new branch]      branch688  -> origin/branch688
+ * [new branch]      branch689  -> origin/branch689
+ * [new branch]      branch690  -> origin/branch690
+ * [new branch]      branch691  -> origin/branch691
+ * [new branch]      branch692  -> origin/branch692
+ * [new branch]      branch693  -> origin/branch693
+ * [new branch]      branch694  -> origin/branch694
+ * [new branch]      branch695  -> origin/branch695
+ * [new branch]      branch696  -> origin/branch696
+ * [new branch]      branch697  -> origin/branch697
+ * [new branch]      branch698  -> origin/branch698
+ * [new branch]      branch699  -> origin/branch699
+ * [new branch]      branch700  -> origin/branch700
+ * [new branch]      branch701  -> origin/branch701
+ * [new branch]      branch702  -> origin/branch702
+ * [new branch]      branch703  -> origin/branch703
+ * [new branch]      branch704  -> origin/branch704
+ * [new branch]      branch705  -> origin/branch705
+ * [new branch]      branch706  -> origin/branch706
+ * [new branch]      branch707  -> origin/branch707
+ * [new branch]      branch708  -> origin/branch708
+ * [new branch]      branch709  -> origin/branch709
+ * [new branch]      branch710  -> origin/branch710
+ * [new branch]      branch711  -> origin/branch711
+ * [new branch]      branch712  -> origin/branch712
+ * [new branch]      branch713  -> origin/branch713
+ * [new branch]      branch714  -> origin/branch714
+ * [new branch]      branch715  -> origin/branch715
+ * [new branch]      branch716  -> origin/branch716
+ * [new branch]      branch717  -> origin/branch717
+ * [new branch]      branch718  -> origin/branch718
+ * [new branch]      branch719  -> origin/branch719
+ * [new branch]      branch720  -> origin/branch720
+ * [new branch]      branch721  -> origin/branch721
+ * [new branch]      branch722  -> origin/branch722
+ * [new branch]      branch723  -> origin/branch723
+ * [new branch]      branch724  -> origin/branch724
+ * [new branch]      branch725  -> origin/branch725
+ * [new branch]      branch726  -> origin/branch726
+ * [new branch]      branch727  -> origin/branch727
+ * [new branch]      branch728  -> origin/branch728
+ * [new branch]      branch729  -> origin/branch729
+ * [new branch]      branch730  -> origin/branch730
+ * [new branch]      branch731  -> origin/branch731
+ * [new branch]      branch732  -> origin/branch732
+ * [new branch]      branch733  -> origin/branch733
+ * [new branch]      branch734  -> origin/branch734
+ * [new branch]      branch735  -> origin/branch735
+ * [new branch]      branch736  -> origin/branch736
+ * [new branch]      branch737  -> origin/branch737
+ * [new branch]      branch738  -> origin/branch738
+ * [new branch]      branch739  -> origin/branch739
+ * [new branch]      branch740  -> origin/branch740
+ * [new branch]      branch741  -> origin/branch741
+ * [new branch]      branch742  -> origin/branch742
+ * [new branch]      branch743  -> origin/branch743
+ * [new branch]      branch744  -> origin/branch744
+ * [new branch]      branch745  -> origin/branch745
+ * [new branch]      branch746  -> origin/branch746
+ * [new branch]      branch747  -> origin/branch747
+ * [new branch]      branch748  -> origin/branch748
+ * [new branch]      branch749  -> origin/branch749
+ * [new branch]      branch750  -> origin/branch750
+ * [new branch]      branch751  -> origin/branch751
+ * [new branch]      branch752  -> origin/branch752
+ * [new branch]      branch753  -> origin/branch753
+ * [new branch]      branch754  -> origin/branch754
+ * [new branch]      branch755  -> origin/branch755
+ * [new branch]      branch756  -> origin/branch756
+ * [new branch]      branch757  -> origin/branch757
+ * [new branch]      branch758  -> origin/branch758
+ * [new branch]      branch759  -> origin/branch759
+ * [new branch]      branch760  -> origin/branch760
+ * [new branch]      branch761  -> origin/branch761
+ * [new branch]      branch762  -> origin/branch762
+ * [new branch]      branch763  -> origin/branch763
+ * [new branch]      branch764  -> origin/branch764
+ * [new branch]      branch765  -> origin/branch765
+ * [new branch]      branch766  -> origin/branch766
+ * [new branch]      branch767  -> origin/branch767
+ * [new branch]      branch768  -> origin/branch768
+ * [new branch]      branch769  -> origin/branch769
+ * [new branch]      branch770  -> origin/branch770
+ * [new branch]      branch771  -> origin/branch771
+ * [new branch]      branch772  -> origin/branch772
+ * [new branch]      branch773  -> origin/branch773
+ * [new branch]      branch774  -> origin/branch774
+ * [new branch]      branch775  -> origin/branch775
+ * [new branch]      branch776  -> origin/branch776
+ * [new branch]      branch777  -> origin/branch777
+ * [new branch]      branch778  -> origin/branch778
+ * [new branch]      branch779  -> origin/branch779
+ * [new branch]      branch780  -> origin/branch780
+ * [new branch]      branch781  -> origin/branch781
+ * [new branch]      branch782  -> origin/branch782
+ * [new branch]      branch783  -> origin/branch783
+ * [new branch]      branch784  -> origin/branch784
+ * [new branch]      branch785  -> origin/branch785
+ * [new branch]      branch786  -> origin/branch786
+ * [new branch]      branch787  -> origin/branch787
+ * [new branch]      branch788  -> origin/branch788
+ * [new branch]      branch789  -> origin/branch789
+ * [new branch]      branch790  -> origin/branch790
+ * [new branch]      branch791  -> origin/branch791
+ * [new branch]      branch792  -> origin/branch792
+ * [new branch]      branch793  -> origin/branch793
+ * [new branch]      branch794  -> origin/branch794
+ * [new branch]      branch795  -> origin/branch795
+ * [new branch]      branch796  -> origin/branch796
+ * [new branch]      branch797  -> origin/branch797
+ * [new branch]      branch798  -> origin/branch798
+ * [new branch]      branch799  -> origin/branch799
+ * [new branch]      branch800  -> origin/branch800
+ * [new branch]      branch801  -> origin/branch801
+ * [new branch]      branch802  -> origin/branch802
+ * [new branch]      branch803  -> origin/branch803
+ * [new branch]      branch804  -> origin/branch804
+ * [new branch]      branch805  -> origin/branch805
+ * [new branch]      branch806  -> origin/branch806
+ * [new branch]      branch807  -> origin/branch807
+ * [new branch]      branch808  -> origin/branch808
+ * [new branch]      branch809  -> origin/branch809
+ * [new branch]      branch810  -> origin/branch810
+ * [new branch]      branch811  -> origin/branch811
+ * [new branch]      branch812  -> origin/branch812
+ * [new branch]      branch813  -> origin/branch813
+ * [new branch]      branch814  -> origin/branch814
+ * [new branch]      branch815  -> origin/branch815
+ * [new branch]      branch816  -> origin/branch816
+ * [new branch]      branch817  -> origin/branch817
+ * [new branch]      branch818  -> origin/branch818
+ * [new branch]      branch819  -> origin/branch819
+ * [new branch]      branch820  -> origin/branch820
+ * [new branch]      branch821  -> origin/branch821
+ * [new branch]      branch822  -> origin/branch822
+ * [new branch]      branch823  -> origin/branch823
+ * [new branch]      branch824  -> origin/branch824
+ * [new branch]      branch825  -> origin/branch825
+ * [new branch]      branch826  -> origin/branch826
+ * [new branch]      branch827  -> origin/branch827
+ * [new branch]      branch828  -> origin/branch828
+ * [new branch]      branch829  -> origin/branch829
+ * [new branch]      branch830  -> origin/branch830
+ * [new branch]      branch831  -> origin/branch831
+ * [new branch]      branch832  -> origin/branch832
+ * [new branch]      branch833  -> origin/branch833
+ * [new branch]      branch834  -> origin/branch834
+ * [new branch]      branch835  -> origin/branch835
+ * [new branch]      branch836  -> origin/branch836
+ * [new branch]      branch837  -> origin/branch837
+ * [new branch]      branch838  -> origin/branch838
+ * [new branch]      branch839  -> origin/branch839
+ * [new branch]      branch840  -> origin/branch840
+ * [new branch]      branch841  -> origin/branch841
+ * [new branch]      branch842  -> origin/branch842
+ * [new branch]      branch843  -> origin/branch843
+ * [new branch]      branch844  -> origin/branch844
+ * [new branch]      branch845  -> origin/branch845
+ * [new branch]      branch846  -> origin/branch846
+ * [new branch]      branch847  -> origin/branch847
+ * [new branch]      branch848  -> origin/branch848
+ * [new branch]      branch849  -> origin/branch849
+ * [new branch]      branch850  -> origin/branch850
+ * [new branch]      branch851  -> origin/branch851
+ * [new branch]      branch852  -> origin/branch852
+ * [new branch]      branch853  -> origin/branch853
+ * [new branch]      branch854  -> origin/branch854
+ * [new branch]      branch855  -> origin/branch855
+ * [new branch]      branch856  -> origin/branch856
+ * [new branch]      branch857  -> origin/branch857
+ * [new branch]      branch858  -> origin/branch858
+ * [new branch]      branch859  -> origin/branch859
+ * [new branch]      branch860  -> origin/branch860
+ * [new branch]      branch861  -> origin/branch861
+ * [new branch]      branch862  -> origin/branch862
+ * [new branch]      branch863  -> origin/branch863
+ * [new branch]      branch864  -> origin/branch864
+ * [new branch]      branch865  -> origin/branch865
+ * [new branch]      branch866  -> origin/branch866
+ * [new branch]      branch867  -> origin/branch867
+ * [new branch]      branch868  -> origin/branch868
+ * [new branch]      branch869  -> origin/branch869
+ * [new branch]      branch870  -> origin/branch870
+ * [new branch]      branch871  -> origin/branch871
+ * [new branch]      branch872  -> origin/branch872
+ * [new branch]      branch873  -> origin/branch873
+ * [new branch]      branch874  -> origin/branch874
+ * [new branch]      branch875  -> origin/branch875
+ * [new branch]      branch876  -> origin/branch876
+ * [new branch]      branch877  -> origin/branch877
+ * [new branch]      branch878  -> origin/branch878
+ * [new branch]      branch879  -> origin/branch879
+ * [new branch]      branch880  -> origin/branch880
+ * [new branch]      branch881  -> origin/branch881
+ * [new branch]      branch882  -> origin/branch882
+ * [new branch]      branch883  -> origin/branch883
+ * [new branch]      branch884  -> origin/branch884
+ * [new branch]      branch885  -> origin/branch885
+ * [new branch]      branch886  -> origin/branch886
+ * [new branch]      branch887  -> origin/branch887
+ * [new branch]      branch888  -> origin/branch888
+ * [new branch]      branch889  -> origin/branch889
+ * [new branch]      branch890  -> origin/branch890
+ * [new branch]      branch891  -> origin/branch891
+ * [new branch]      branch892  -> origin/branch892
+ * [new branch]      branch893  -> origin/branch893
+ * [new branch]      branch894  -> origin/branch894
+ * [new branch]      branch895  -> origin/branch895
+ * [new branch]      branch896  -> origin/branch896
+ * [new branch]      branch897  -> origin/branch897
+ * [new branch]      branch898  -> origin/branch898
+ * [new branch]      branch899  -> origin/branch899
+ * [new branch]      branch900  -> origin/branch900
+ * [new branch]      branch901  -> origin/branch901
+ * [new branch]      branch902  -> origin/branch902
+ * [new branch]      branch903  -> origin/branch903
+ * [new branch]      branch904  -> origin/branch904
+ * [new branch]      branch905  -> origin/branch905
+ * [new branch]      branch906  -> origin/branch906
+ * [new branch]      branch907  -> origin/branch907
+ * [new branch]      branch908  -> origin/branch908
+ * [new branch]      branch909  -> origin/branch909
+ * [new branch]      branch910  -> origin/branch910
+ * [new branch]      branch911  -> origin/branch911
+ * [new branch]      branch912  -> origin/branch912
+ * [new branch]      branch913  -> origin/branch913
+ * [new branch]      branch914  -> origin/branch914
+ * [new branch]      branch915  -> origin/branch915
+ * [new branch]      branch916  -> origin/branch916
+ * [new branch]      branch917  -> origin/branch917
+ * [new branch]      branch918  -> origin/branch918
+ * [new branch]      branch919  -> origin/branch919
+ * [new branch]      branch920  -> origin/branch920
+ * [new branch]      branch921  -> origin/branch921
+ * [new branch]      branch922  -> origin/branch922
+ * [new branch]      branch923  -> origin/branch923
+ * [new branch]      branch924  -> origin/branch924
+ * [new branch]      branch925  -> origin/branch925
+ * [new branch]      branch926  -> origin/branch926
+ * [new branch]      branch927  -> origin/branch927
+ * [new branch]      branch928  -> origin/branch928
+ * [new branch]      branch929  -> origin/branch929
+ * [new branch]      branch930  -> origin/branch930
+ * [new branch]      branch931  -> origin/branch931
+ * [new branch]      branch932  -> origin/branch932
+ * [new branch]      branch933  -> origin/branch933
+ * [new branch]      branch934  -> origin/branch934
+ * [new branch]      branch935  -> origin/branch935
+ * [new branch]      branch936  -> origin/branch936
+ * [new branch]      branch937  -> origin/branch937
+ * [new branch]      branch938  -> origin/branch938
+ * [new branch]      branch939  -> origin/branch939
+ * [new branch]      branch940  -> origin/branch940
+ * [new branch]      branch941  -> origin/branch941
+ * [new branch]      branch942  -> origin/branch942
+ * [new branch]      branch943  -> origin/branch943
+ * [new branch]      branch944  -> origin/branch944
+ * [new branch]      branch945  -> origin/branch945
+ * [new branch]      branch946  -> origin/branch946
+ * [new branch]      branch947  -> origin/branch947
+ * [new branch]      branch948  -> origin/branch948
+ * [new branch]      branch949  -> origin/branch949
+ * [new branch]      branch950  -> origin/branch950
+ * [new branch]      branch951  -> origin/branch951
+ * [new branch]      branch952  -> origin/branch952
+ * [new branch]      branch953  -> origin/branch953
+ * [new branch]      branch954  -> origin/branch954
+ * [new branch]      branch955  -> origin/branch955
+ * [new branch]      branch956  -> origin/branch956
+ * [new branch]      branch957  -> origin/branch957
+ * [new branch]      branch958  -> origin/branch958
+ * [new branch]      branch959  -> origin/branch959
+ * [new branch]      branch960  -> origin/branch960
+ * [new branch]      branch961  -> origin/branch961
+ * [new branch]      branch962  -> origin/branch962
+ * [new branch]      branch963  -> origin/branch963
+ * [new branch]      branch964  -> origin/branch964
+ * [new branch]      branch965  -> origin/branch965
+ * [new branch]      branch966  -> origin/branch966
+ * [new branch]      branch967  -> origin/branch967
+ * [new branch]      branch968  -> origin/branch968
+ * [new branch]      branch969  -> origin/branch969
+ * [new branch]      branch970  -> origin/branch970
+ * [new branch]      branch971  -> origin/branch971
+ * [new branch]      branch972  -> origin/branch972
+ * [new branch]      branch973  -> origin/branch973
+ * [new branch]      branch974  -> origin/branch974
+ * [new branch]      branch975  -> origin/branch975
+ * [new branch]      branch976  -> origin/branch976
+ * [new branch]      branch977  -> origin/branch977
+ * [new branch]      branch978  -> origin/branch978
+ * [new branch]      branch979  -> origin/branch979
+ * [new branch]      branch980  -> origin/branch980
+ * [new branch]      branch981  -> origin/branch981
+ * [new branch]      branch982  -> origin/branch982
+ * [new branch]      branch983  -> origin/branch983
+ * [new branch]      branch984  -> origin/branch984
+ * [new branch]      branch985  -> origin/branch985
+ * [new branch]      branch986  -> origin/branch986
+ * [new branch]      branch987  -> origin/branch987
+ * [new branch]      branch988  -> origin/branch988
+ * [new branch]      branch989  -> origin/branch989
+ * [new branch]      branch990  -> origin/branch990
+ * [new branch]      branch991  -> origin/branch991
+ * [new branch]      branch992  -> origin/branch992
+ * [new branch]      branch993  -> origin/branch993
+ * [new branch]      branch994  -> origin/branch994
+ * [new branch]      branch995  -> origin/branch995
+ * [new branch]      branch996  -> origin/branch996
+ * [new branch]      branch997  -> origin/branch997
+ * [new branch]      branch998  -> origin/branch998
+ * [new branch]      branch999  -> origin/branch999
+ok 7 - quickfetch should handle ~1000 refs (on Windows)
 
-ok 158 - proc-receive: report update of mixed refs (builtin protocol)
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5503-tagfollow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5503-tagfollow/.git/
+expecting success of 5503.1 'setup': 
+	test_tick &&
+	echo ichi >file &&
+	git add file &&
+	git commit -m L &&
+	L=$(git rev-parse --verify HEAD) &&
 
-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
-	)
+		mkdir cloned &&
+		cd cloned &&
+		git init-db &&
+		git remote add -f origin ..
+	) &&
 
-ok 159 - cleanup (builtin protocol)
+	test_tick &&
+	echo A >file &&
+	git add file &&
+	git commit -m A &&
+	A=$(git rev-parse --verify HEAD)
 
-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
+[main (root-commit) 6a9c5e4] L
+ 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.45.2/t/trash directory.t5503-tagfollow/cloned/.git/
+Updating origin
+From ..
+ * [new branch]      main       -> origin/main
+[main c06aaaf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-ok 160 - setup proc-receive hook (builtin protocol/porcelain)
+expecting success of 5503.2 'setup expect': 
+cat - <<EOF >expect
+want $A
+EOF
 
-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 &&
+ok 2 - setup expect
 
-	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 5503.3 'fetch A (new commit : 1 connection)': 
+	rm -f $U &&
+	(
+		cd cloned &&
+		GIT_TRACE_PACKET=$UPATH git fetch &&
+		test $A = $(git rev-parse --verify origin/main)
+	) &&
+	get_needs $U >actual &&
+	test_cmp expect actual
 
-ok 161 - proc-receive: report update of mixed refs (builtin protocol/porcelain)
+From ..
+   6a9c5e4..c06aaaf  main       -> origin/main
+ok 3 - fetch A (new commit : 1 connection)
 
-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 5503.4 'create tag T on A, create C on branch cat': 
+	git tag -a -m tag1 tag1 $A &&
+	T=$(git rev-parse --verify tag1) &&
 
+	git checkout -b cat &&
+	echo C >file &&
+	git add file &&
+	git commit -m C &&
+	C=$(git rev-parse --verify HEAD) &&
+	git checkout main
 
-ok 162 - cleanup (builtin protocol/porcelain)
+Switched to a new branch 'cat'
+[cat f888ed6] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 4 - create tag T on A, create C on branch cat
 
-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 5503.5 'setup expect': 
+cat - <<EOF >expect
+want $C
+want $T
+EOF
 
-ok 163 - config receive.procReceiveRefs = refs (builtin protocol)
+ok 5 - setup expect
 
-expecting success of 5411.164 'setup upstream branches (builtin protocol)': 
+expecting success of 5503.6 'fetch C, T (new branch, tag : 1 connection)': 
+	rm -f $U &&
 	(
-		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 cloned &&
+		GIT_TRACE_PACKET=$UPATH git fetch &&
+		test $C = $(git rev-parse --verify origin/cat) &&
+		test $T = $(git rev-parse --verify tag1) &&
+		test $A = $(git rev-parse --verify tag1^0)
+	) &&
+	get_needs $U >actual &&
+	test_cmp expect actual
 
+From ..
+ * [new branch]      cat        -> origin/cat
+ * [new tag]         tag1       -> tag1
+ok 6 - fetch C, T (new branch, tag : 1 connection)
 
-ok 164 - setup upstream branches (builtin protocol)
+expecting success of 5503.7 'create commits O, B, tag S on B': 
+	test_tick &&
+	echo O >file &&
+	git add file &&
+	git commit -m O &&
 
-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
+	test_tick &&
+	echo B >file &&
+	git add file &&
+	git commit -m B &&
+	B=$(git rev-parse --verify HEAD) &&
 
-ok 165 - setup proc-receive hook (builtin protocol)
+	git tag -a -m tag2 tag2 $B &&
+	S=$(git rev-parse --verify tag2)
 
-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 &&
+[main 0129221] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 8e10cf4] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - create commits O, B, tag S on B
 
-	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 5503.8 'setup expect': 
+cat - <<EOF >expect
+want $B
+want $S
+EOF
 
-ok 166 - proc-receive: process all refs (builtin protocol)
+ok 8 - setup expect
 
-expecting success of 5411.167 'cleanup (builtin protocol)': 
+expecting success of 5503.9 'fetch B, S (commit and tag : 1 connection)': 
+	rm -f $U &&
 	(
-		cd "$upstream" &&
-		git update-ref -d refs/heads/bar &&
-		git update-ref -d refs/heads/baz
-	)
+		cd cloned &&
+		GIT_TRACE_PACKET=$UPATH git fetch &&
+		test $B = $(git rev-parse --verify origin/main) &&
+		test $B = $(git rev-parse --verify tag2^0) &&
+		test $S = $(git rev-parse --verify tag2)
+	) &&
+	get_needs $U >actual &&
+	test_cmp expect actual
 
-ok 167 - cleanup (builtin protocol)
+From ..
+   c06aaaf..8e10cf4  main       -> origin/main
+ * [new tag]         tag2       -> tag2
+ok 9 - fetch B, S (commit and tag : 1 connection)
 
-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 5503.10 'setup expect': 
+cat - <<EOF >expect
+want $B
+want $S
+EOF
 
-ok 168 - config receive.procReceiveRefs = refs (builtin protocol/porcelain)
+ok 10 - setup expect
 
-expecting success of 5411.169 'setup upstream branches (builtin protocol/porcelain)': 
+expecting success of 5503.11 'new clone fetch main and tags': 
+	test_might_fail git branch -D cat &&
+	rm -f $U &&
 	(
-		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
-	)
-
-
-ok 169 - setup upstream branches (builtin protocol/porcelain)
-
-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
-
-ok 170 - setup proc-receive hook (builtin protocol/porcelain)
-
-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_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-B> refs/heads/bar
-	<COMMIT-A> refs/heads/baz
-	<COMMIT-A> refs/heads/main
-	EOF
-
-ok 171 - proc-receive: process all refs (builtin protocol/porcelain)
+		mkdir clone2 &&
+		cd clone2 &&
+		git init &&
+		git remote add origin .. &&
+		GIT_TRACE_PACKET=$UPATH git fetch &&
+		test $B = $(git rev-parse --verify origin/main) &&
+		test $S = $(git rev-parse --verify tag2) &&
+		test $B = $(git rev-parse --verify tag2^0) &&
+		test $T = $(git rev-parse --verify tag1) &&
+		test $A = $(git rev-parse --verify tag1^0)
+	) &&
+	get_needs $U >actual &&
+	test_cmp expect actual
 
-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
-	)
+Deleted branch cat (was f888ed6).
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5503-tagfollow/clone2/.git/
+From ..
+ * [new branch]      main       -> origin/main
+ * [new tag]         tag2       -> tag2
+ * [new tag]         tag1       -> tag1
+ok 11 - new clone fetch main and tags
 
-ok 172 - cleanup (builtin protocol/porcelain)
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5506-remote-groups.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-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"
-	)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5506-remote-groups/one/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5506-remote-groups/two/.git/
+ok 1 - setup
 
-ok 173 - config receive.procReceiveRefs with modifiers (builtin protocol)
+expecting success of 5506.2 'no group updates all': 
+	mark update-all &&
+	update_repos &&
+	git remote update &&
+	repo_fetched one &&
+	repo_fetched two
 
-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
+[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
 
-ok 174 - setup proc-receive hook (builtin protocol)
+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
 
-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 &&
+[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
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	EOF
+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
 
-ok 175 - proc-receive: update branch and new tag (builtin protocol)
+[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 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 5506.5 'updating group updates all members (fetch)': 
+	mark fetch-group-all &&
+	update_repos &&
+	git fetch all &&
+	repo_fetched one &&
+	repo_fetched two
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-A> refs/heads/topic
-	<TAG-v123> refs/tags/v123
-	EOF
+[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)
 
-ok 176 - setup upstream: create tags/v123 (builtin protocol)
+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
 
-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
+[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)
 
-ok 177 - setup proc-receive hook (builtin protocol)
+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
 
-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 &&
+[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)
 
-	test_cmp_refs -C "$upstream" <<-EOF
-	<COMMIT-A> refs/heads/main
-	<COMMIT-B> refs/heads/topic
-	EOF
+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
 
-ok 178 - proc-receive: create/delete branch, and delete tag (builtin protocol)
+[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
 
-checking prerequisite: NOT_ROOT
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+[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)
 
-)
-prerequisite NOT_ROOT ok
-# passed all 178 test(s)
-# SKIP no web server found at ''
-1..178
+# passed all 9 test(s)
+1..9
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5504-fetch-receive-strict.sh ***
@@ -321892,8 +323814,8 @@
  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
+error: b023018cabc396e7692c70bbf5784a93d3f738ab: hash-path mismatch, found at: .git/objects/ce/013625030ba8dba906f756967f9e9ca394464a
 missing blob ce013625030ba8dba906f756967f9e9ca394464a
 ok 1 - setup and inject "corrupt or missing" object
 
@@ -322384,379 +324306,6 @@
 1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5501-fetch-push-alternates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t/trash directory.t5501-fetch-push-alternates/receiver/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5507-remote-environment.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5507-remote-environment/.git/
 expecting success of 5507.1 'set up "remote" push situation': 
@@ -322851,192 +324400,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5506-remote-groups.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5506-remote-groups/one/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5509-fetch-push-namespaces.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5509-fetch-push-namespaces/.git/
 expecting success of 5509.1 'setup': 
@@ -323267,5344 +324630,3548 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5326-multi-pack-bitmaps.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/.git/
-expecting success of 5326.1 'setup test_repository': 
-		rm -rf * .git &&
-		git init &&
-		git config pack.writeBitmapLookupTable false
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/.git/
-ok 1 - setup test_repository
-
-expecting success of 5326.2 'setup repo with moderate-sized history': 
-		test_commit_bulk --id=file 10 &&
-		git branch -M second &&
-		git checkout -b other HEAD~5 &&
-		test_commit_bulk --id=side 10 &&
-
-		# add complicated history setup, including merges and
-		# ambiguous merge-bases
-
-		git checkout -b merge-left other~2 &&
-		git merge second~2 -m "merge-left" &&
-
-		git checkout -b merge-right second~1 &&
-		git merge other~1 -m "merge-right" &&
-
-		git checkout -b octo-second second &&
-		git merge merge-left merge-right -m "octopus-second" &&
-
-		git checkout -b octo-other other &&
-		git merge merge-left merge-right -m "octopus-other" &&
-
-		git checkout other &&
-		git merge octo-other -m "pull octopus" &&
-
-		git checkout second &&
-		git merge octo-second -m "pull octopus" &&
-
-		# Remove these branches so they are not selected
-		# as bitmap tips
-		git branch -D merge-left &&
-		git branch -D merge-right &&
-		git branch -D octo-other &&
-		git branch -D octo-second &&
-
-		# add padding to make these merges less interesting
-		# and avoid having them selected for bitmaps
-		test_commit_bulk --id=file 100 &&
-		git checkout other &&
-		test_commit_bulk --id=side 100 &&
-		git checkout second &&
-
-		bitmaptip=$(git rev-parse second) &&
-		blob=$(echo tagged-blob | git hash-object -w --stdin) &&
-		git tag tagged-blob $blob
-	
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           30 (         0 duplicates                  )
-      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           10 (         0 duplicates          9 deltas of          9 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:             10
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       2283 /       2283
----------------------------------------------------------------------
-
-Switched to a new branch 'other'
-87e15289879c5c34553169b2be5c9d6b111519b2
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           30 (         0 duplicates                  )
-      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           10 (         0 duplicates          9 deltas of          9 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:             15
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         16
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       4747 /       4747
----------------------------------------------------------------------
-
-Switched to a new branch 'merge-left'
-Merge made by the 'ort' strategy.
- file-6.t | 1 +
- file-7.t | 1 +
- file-8.t | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 file-6.t
- create mode 100644 file-7.t
- create mode 100644 file-8.t
-Switched to a new branch 'merge-right'
-Merge made by the 'ort' strategy.
- side-1.t | 1 +
- side-2.t | 1 +
- side-3.t | 1 +
- side-4.t | 1 +
- side-5.t | 1 +
- side-6.t | 1 +
- side-7.t | 1 +
- side-8.t | 1 +
- side-9.t | 1 +
- 9 files changed, 9 insertions(+)
- create mode 100644 side-1.t
- create mode 100644 side-2.t
- create mode 100644 side-3.t
- create mode 100644 side-4.t
- create mode 100644 side-5.t
- create mode 100644 side-6.t
- create mode 100644 side-7.t
- create mode 100644 side-8.t
- create mode 100644 side-9.t
-Switched to a new branch 'octo-second'
-Trying simple merge with merge-left
-Trying simple merge with merge-right
-Merge made by the 'octopus' strategy.
- side-1.t | 1 +
- side-2.t | 1 +
- side-3.t | 1 +
- side-4.t | 1 +
- side-5.t | 1 +
- side-6.t | 1 +
- side-7.t | 1 +
- side-8.t | 1 +
- side-9.t | 1 +
- 9 files changed, 9 insertions(+)
- create mode 100644 side-1.t
- create mode 100644 side-2.t
- create mode 100644 side-3.t
- create mode 100644 side-4.t
- create mode 100644 side-5.t
- create mode 100644 side-6.t
- create mode 100644 side-7.t
- create mode 100644 side-8.t
- create mode 100644 side-9.t
-Switched to a new branch 'octo-other'
-Trying simple merge with merge-left
-Trying simple merge with merge-right
-Merge made by the 'octopus' strategy.
- file-6.t | 1 +
- file-7.t | 1 +
- file-8.t | 1 +
- file-9.t | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 file-6.t
- create mode 100644 file-7.t
- create mode 100644 file-8.t
- create mode 100644 file-9.t
-Switched to branch 'other'
-Updating 90a1514..63e663a
-Fast-forward (no commit created; -m option ignored)
- file-6.t | 1 +
- file-7.t | 1 +
- file-8.t | 1 +
- file-9.t | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 file-6.t
- create mode 100644 file-7.t
- create mode 100644 file-8.t
- create mode 100644 file-9.t
-Switched to branch 'second'
-Updating 6a83e25..58d166b
-Fast-forward (no commit created; -m option ignored)
- side-1.t | 1 +
- side-2.t | 1 +
- side-3.t | 1 +
- side-4.t | 1 +
- side-5.t | 1 +
- side-6.t | 1 +
- side-7.t | 1 +
- side-8.t | 1 +
- side-9.t | 1 +
- 9 files changed, 9 insertions(+)
- create mode 100644 side-1.t
- create mode 100644 side-2.t
- create mode 100644 side-3.t
- create mode 100644 side-4.t
- create mode 100644 side-5.t
- create mode 100644 side-6.t
- create mode 100644 side-7.t
- create mode 100644 side-8.t
- create mode 100644 side-9.t
-Deleted branch merge-left (was f47c2b6).
-Deleted branch merge-right (was ba9a821).
-Deleted branch octo-other (was 63e663a).
-Deleted branch octo-second (was 58d166b).
-58d166b12a4ce065824c4a21dd38aef9f2d94667
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          280 (        10 duplicates                  )
-      blobs  :           90 (        10 duplicates          0 deltas of          0 attempts)
-      trees  :           90 (         0 duplicates         88 deltas of         88 attempts)
-      commits:          100 (         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:            109
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =        102
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      26599 /      26599
----------------------------------------------------------------------
-
-Switched to branch 'other'
-63e663a9348fa8f46b3f8835cb82274158356e6a
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          280 (        10 duplicates                  )
-      blobs  :           90 (        10 duplicates          0 deltas of          0 attempts)
-      trees  :           90 (         0 duplicates         88 deltas of         88 attempts)
-      commits:          100 (         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:            109
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =        102
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      26765 /      26765
----------------------------------------------------------------------
-
-Switched to branch 'second'
-ok 2 - setup repo with moderate-sized history
-
-expecting success of 5326.3 'create single-pack midx with bitmaps': 
-		git repack -ad &&
-		git multi-pack-index write --bitmap &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
-	
-ok 3 - create single-pack midx with bitmaps
+*** t5511-refspec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 5326.4 'reverse index exists (midx)': 
-		GIT_TRACE2_EVENT=$(pwd)/event.trace \
-			git rev-list --test-bitmap "$commit" &&
+expecting success of 5511.2 'push :': git ls-remote frotz
+ok 2 - push :
 
-		if test "rev" = "$kind"
-		then
-			test_path_is_file $midx-$(midx_checksum $objdir).rev
-		fi &&
-		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
-	
-Bitmap v1 test (106 entries loaded)
-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":"20251218T013614.845690Z-Hfbad846e-P00001836","thread":"main","time":"2025-12-18T01:36:14.846986Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001498,"t_rel":0.001498,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-ok 4 - reverse index exists (midx)
+expecting success of 5511.3 'push :: (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec '::'
+ok 3 - push :: (invalid)
 
-expecting success of 5326.5 'rev-list --test-bitmap verifies bitmaps': 
-		git rev-list --test-bitmap HEAD
-	
-Bitmap v1 test (106 entries loaded)
-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!
-ok 5 - rev-list --test-bitmap verifies bitmaps
+expecting success of 5511.4 'push +:': git ls-remote frotz
+ok 4 - push +:
 
-expecting success of 5326.6 'counting commits via bitmap (full bitmap, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 6 - counting commits via bitmap (full bitmap, second)
+expecting success of 5511.5 'fetch ': git ls-remote frotz
+ok 5 - fetch 
 
-expecting success of 5326.7 'counting partial commits via bitmap (full 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 7 - counting partial commits via bitmap (full bitmap, second)
+expecting success of 5511.6 'fetch :': git ls-remote frotz
+ok 6 - fetch :
 
-expecting success of 5326.8 'counting commits with limit (full 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 8 - counting commits with limit (full bitmap, second)
+expecting success of 5511.7 'fetch :: (invalid)': test_must_fail git ls-remote frotz
+fatal: invalid refspec '::'
+ok 7 - fetch :: (invalid)
 
-expecting success of 5326.9 'counting non-linear history (full bitmap, second)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 9 - counting non-linear history (full bitmap, second)
+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 5326.10 'counting commits with limiting (full 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 10 - counting commits with limiting (full bitmap, second)
+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 5326.11 'counting objects via bitmap (full bitmap, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 11 - counting objects via bitmap (full bitmap, second)
+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 5326.12 'enumerate commits (full bitmap, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 12 - enumerate commits (full bitmap, second)
+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 5326.13 'enumerate --objects (full 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 4101, line 101
-ok 13 - enumerate --objects (full bitmap, second)
+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 5326.14 'bitmap --objects handles non-commit objects (full bitmap, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 14 - bitmap --objects handles non-commit objects (full bitmap, second)
+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 5326.15 'counting commits via bitmap (full bitmap, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 15 - counting commits via bitmap (full bitmap, other)
+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 5326.16 'counting partial commits via bitmap (full 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 16 - counting partial commits via bitmap (full bitmap, other)
+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 5326.17 'counting commits with limit (full 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 17 - counting commits with limit (full bitmap, other)
+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 5326.18 'counting non-linear history (full bitmap, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 18 - counting non-linear history (full bitmap, other)
+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 5326.19 'counting commits with limiting (full 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 19 - counting commits with limiting (full bitmap, other)
+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 5326.20 'counting objects via bitmap (full bitmap, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 20 - counting objects via bitmap (full bitmap, other)
+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 5326.21 '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 21 - enumerate commits (full bitmap, other)
+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 5326.22 '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 22 - enumerate --objects (full bitmap, other)
+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 5326.23 '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 23 - bitmap --objects handles non-commit objects (full bitmap, other)
+expecting success of 5511.22 'push HEAD': git ls-remote frotz
+ok 22 - push HEAD
 
-expecting success of 5326.24 '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 24 - clone from bitmapped repository
+expecting success of 5511.23 'fetch HEAD': git ls-remote frotz
+ok 23 - fetch HEAD
 
-expecting success of 5326.25 '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 25 - partial clone from bitmapped repository
+expecting success of 5511.24 'push @': git ls-remote frotz
+ok 24 - push @
 
-expecting success of 5326.26 'setup further non-bitmapped commits': 
-		test_commit_bulk --id=further 10
-	
-4b27f21bf7560051516fe49b50eb4063d0ea6f90
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           30 (         0 duplicates                  )
-      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           10 (         0 duplicates          9 deltas of          9 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:            119
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         16
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      58718 /      58718
----------------------------------------------------------------------
+expecting success of 5511.25 'fetch @': git ls-remote frotz
+ok 25 - fetch @
 
-ok 26 - setup further non-bitmapped commits
+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 5326.27 '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 27 - counting commits via bitmap (partial bitmap, second)
+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 5326.28 '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 28 - counting partial commits via bitmap (partial bitmap, second)
+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 5326.29 '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 29 - counting commits with limit (partial bitmap, second)
+expecting success of 5511.29 'fetch HEAD:': git ls-remote frotz
+ok 29 - fetch HEAD:
 
-expecting success of 5326.30 '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 30 - counting non-linear history (partial bitmap, second)
+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 5326.31 '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 31 - counting commits with limiting (partial bitmap, second)
+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 5326.32 '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 32 - counting objects via bitmap (partial bitmap, second)
+expecting success of 5511.32 'push :refs/remotes/frotz/deleteme': git ls-remote frotz
+ok 32 - push :refs/remotes/frotz/deleteme
 
-expecting success of 5326.33 '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 33 - enumerate commits (partial bitmap, second)
+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 5326.34 '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 34 - enumerate --objects (partial bitmap, second)
+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 5326.35 '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 35 - bitmap --objects handles non-commit objects (partial bitmap, second)
+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 5326.36 '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 36 - counting commits via bitmap (partial bitmap, other)
+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 5326.37 '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 37 - counting partial commits via bitmap (partial bitmap, other)
+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 5326.38 '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 38 - counting commits with limit (partial bitmap, other)
+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 5326.39 '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 39 - counting non-linear history (partial bitmap, other)
+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 5326.40 '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 40 - counting commits with limiting (partial bitmap, other)
+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 5326.41 '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 41 - counting objects via bitmap (partial bitmap, other)
+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 5326.42 '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 42 - enumerate commits (partial bitmap, other)
+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 5326.43 '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 43 - enumerate --objects (partial bitmap, other)
+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 5326.44 '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 44 - bitmap --objects handles non-commit objects (partial bitmap, other)
+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 5326.45 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
-   4b27f21..8ca4c84  second     -> second
-ok 45 - fetch (partial bitmap)
+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 5326.46 'enumerating progress counts pack-reused objects': 
-		count=$(git rev-list --objects --all --count) &&
-		git repack -adb &&
+expecting success of 5511.46 'fetch refs/heads/Ä': git ls-remote frotz
+ok 46 - fetch refs/heads/Ä
 
-		# 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 &&
+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)
 
-		# 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: 659, done.
-Total 659 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
-[second 170f281] an extra commit object
- Author: A U Thor <author@example.com>
-Enumerating objects: 660, done.
-Total 660 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
-ok 46 - enumerating progress counts pack-reused objects
+# passed all 47 test(s)
+1..47
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5411-proc-receive-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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) &&
 
-expecting success of 5326.47 'create new additional packs': 
-		for i in $(test_seq 1 16)
+		# 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
-			test_commit "$i" &&
-			git repack -d || return 1
-		done &&
+			echo "pre-receive< $old $new $ref"
+		done
+		EOF
 
-		git checkout -b other2 HEAD~8 &&
-		for i in $(test_seq 1 8)
+		# 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
-			test_commit "side-$i" &&
-			git repack -d || return 1
-		done &&
-		git checkout second
+			echo "post-receive< $old $new $ref"
+		done
+		EOF
+
+		upstream=upstream.git
 	
-[second 3a76cec] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[second 694ecd4] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[second ffe77aa] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[second 50af4e8] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[second 9c1f241] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-[second b53317f] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-[second cc19a36] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-[second d484d57] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-[second 8a35e54] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-[second 4563a0f] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10.t
-[second 0eb4f5f] 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11.t
-[second 620cfb0] 12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12.t
-[second 7580d0b] 13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13.t
-[second 622a67a] 14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14.t
-[second 5b39d34] 15
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5411-proc-receive-hook/upstream.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 15.t
-[second 199e4bb] 16
+ create mode 100644 A.t
+[main d9df450] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 16.t
-Switched to a new branch 'other2'
-[other2 beb075d] side-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 bb5edb3] side-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 1106e57] side-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 6805bc2] side-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 d7d949c] side-5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 10e7b33] side-6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 d9f1819] side-7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 a9c1793] side-8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'second'
-ok 47 - create new additional packs
+ create mode 100644 B.t
+To ../upstream.git
+ * [new branch]      main -> main
+ok 1 - setup upstream and workbench
 
-expecting success of 5326.48 'create multi-pack midx with bitmaps': 
-		git multi-pack-index write --bitmap &&
+expecting success of 5411.2 'setup receive.procReceiveRefs': 
+	git -C "$upstream" config --add receive.procReceiveRefs refs/for
 
-		ls $objdir/pack/pack-*.pack >packs &&
-		test_line_count = 25 packs &&
+ok 2 - setup receive.procReceiveRefs
 
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
-	
-ok 48 - create multi-pack midx with bitmaps
+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
 
-expecting success of 5326.49 'reverse index exists (midx)': 
-		GIT_TRACE2_EVENT=$(pwd)/event.trace \
-			git rev-list --test-bitmap "$commit" &&
+ok 3 - setup proc-receive hook
 
-		if test "rev" = "$kind"
+expecting success of 5411.4 'proc-receive: report status v1': 
+	{
+		if test -z "$GIT_DEFAULT_HASH" || test "$GIT_DEFAULT_HASH" = "sha1"
 		then
-			test_path_is_file $midx-$(midx_checksum $objdir).rev
+			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 &&
-		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
-	
-Bitmap v1 test (107 entries loaded)
-Found bitmap for '199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42'. 768 bits / 0f0d6be4 checksum
-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":"20251218T013614.845690Z-Hfbad846e-P00001836","thread":"main","time":"2025-12-18T01:36:14.846986Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001498,"t_rel":0.001498,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20251218T013617.502052Z-Hfbad846e-P00002593","thread":"main","time":"2025-12-18T01:36:17.503459Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001586,"t_rel":0.001586,"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 / 0f0d6be4 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
-
-expecting success of 5326.51 'counting commits via bitmap (full bitmap, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 51 - counting commits via bitmap (full bitmap, second)
-
-expecting success of 5326.52 'counting partial commits via bitmap (full 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 52 - counting partial commits via bitmap (full bitmap, second)
-
-expecting success of 5326.53 'counting commits with limit (full 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 53 - counting commits with limit (full bitmap, second)
-
-expecting success of 5326.54 'counting non-linear history (full bitmap, second)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 54 - counting non-linear history (full bitmap, second)
-
-expecting success of 5326.55 'counting commits with limiting (full 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 55 - counting commits with limiting (full bitmap, second)
-
-expecting success of 5326.56 'counting objects via bitmap (full bitmap, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 56 - counting objects via bitmap (full bitmap, second)
-
-expecting success of 5326.57 'enumerate commits (full bitmap, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 57 - enumerate commits (full bitmap, second)
-
-expecting success of 5326.58 'enumerate --objects (full 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 58 - enumerate --objects (full bitmap, second)
-
-expecting success of 5326.59 'bitmap --objects handles non-commit objects (full bitmap, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 59 - bitmap --objects handles non-commit objects (full bitmap, second)
-
-expecting success of 5326.60 'counting commits via bitmap (full bitmap, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 60 - counting commits via bitmap (full bitmap, other)
-
-expecting success of 5326.61 'counting partial commits via bitmap (full 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 61 - counting partial commits via bitmap (full bitmap, other)
-
-expecting success of 5326.62 'counting commits with limit (full 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 62 - counting commits with limit (full bitmap, other)
-
-expecting success of 5326.63 'counting non-linear history (full bitmap, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 63 - counting non-linear history (full bitmap, other)
-
-expecting success of 5326.64 'counting commits with limiting (full 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 64 - counting commits with limiting (full bitmap, other)
-
-expecting success of 5326.65 'counting objects via bitmap (full bitmap, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 65 - counting objects via bitmap (full bitmap, other)
-
-expecting success of 5326.66 '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 66 - enumerate commits (full bitmap, other)
-
-expecting success of 5326.67 '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 67 - enumerate --objects (full bitmap, other)
+		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 &&
 
-expecting success of 5326.68 '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 68 - bitmap --objects handles non-commit objects (full bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/for/main/topic1
+	<COMMIT-A> refs/heads/foo
+	<COMMIT-B> refs/heads/main
+	EOF
 
-expecting success of 5326.69 '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 69 - clone from bitmapped repository
+ok 4 - proc-receive: report status v1
 
-expecting success of 5326.70 '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 &&
+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 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 70 - partial clone from bitmapped repository
-
-expecting success of 5326.71 'setup further non-bitmapped commits': 
-		test_commit_bulk --id=further 10
-	
-199e4bb8d2cd306cdaed1c3289bc82d6dcf63c42
-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:            135
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         16
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =       8628 /       8628
----------------------------------------------------------------------
-
-ok 71 - setup further non-bitmapped commits
-
-expecting success of 5326.72 '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 72 - counting commits via bitmap (partial bitmap, second)
-
-expecting success of 5326.73 '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 73 - counting partial commits via bitmap (partial bitmap, second)
-
-expecting success of 5326.74 '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 74 - counting commits with limit (partial bitmap, second)
-
-expecting success of 5326.75 '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 75 - counting non-linear history (partial bitmap, second)
-
-expecting success of 5326.76 '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 76 - counting commits with limiting (partial bitmap, second)
-
-expecting success of 5326.77 '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 77 - counting objects via bitmap (partial bitmap, second)
-
-expecting success of 5326.78 '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 78 - enumerate commits (partial bitmap, second)
-
-expecting success of 5326.79 '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 79 - enumerate --objects (partial bitmap, second)
-
-expecting success of 5326.80 '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 80 - bitmap --objects handles non-commit objects (partial bitmap, second)
-
-expecting success of 5326.81 '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 81 - counting commits via bitmap (partial bitmap, other)
-
-expecting success of 5326.82 '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 82 - counting partial commits via bitmap (partial bitmap, other)
-
-expecting success of 5326.83 '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 83 - counting commits with limit (partial bitmap, other)
-
-expecting success of 5326.84 '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 84 - counting non-linear history (partial bitmap, other)
-
-expecting success of 5326.85 '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 85 - counting commits with limiting (partial bitmap, other)
-
-expecting success of 5326.86 '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 86 - counting objects via bitmap (partial bitmap, other)
-
-expecting success of 5326.87 '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 87 - enumerate commits (partial bitmap, other)
-
-expecting success of 5326.88 '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 88 - enumerate --objects (partial bitmap, other)
-
-expecting success of 5326.89 '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 89 - bitmap --objects handles non-commit objects (partial bitmap, other)
-
-expecting success of 5326.90 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
-   199e4bb..2f32443  second     -> second
-ok 90 - fetch (partial bitmap)
-
-expecting success of 5326.91 '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: 742, done.
-Total 742 (delta 0), reused 0 (delta 0), pack-reused 742 (from 1)
-[second e44e978] an extra commit object
- Author: A U Thor <author@example.com>
-Enumerating objects: 743, done.
-Total 743 (delta 0), reused 0 (delta 0), pack-reused 742 (from 1)
-ok 91 - enumerating progress counts pack-reused objects
-
-expecting success of 5326.92 '--no-bitmap is respected when bitmaps exist': 
-		git multi-pack-index write --bitmap &&
-
-		test_commit respect--no-bitmap &&
-		git repack -d &&
-
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
-
-		git multi-pack-index write --no-bitmap &&
-
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-$(midx_checksum $objdir).bitmap &&
-		test_path_is_missing $midx-$(midx_checksum $objdir).rev
-	
-[second 39f81e4] respect--no-bitmap
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 respect--no-bitmap.t
-ok 92 - --no-bitmap is respected when bitmaps exist
-
-expecting success of 5326.93 'setup midx with base from later pack': 
-		# Write a and b so that "a" is a delta on top of base "b", since Git
-		# prefers to delete contents out of a base rather than add to a shorter
-		# object.
-		test_seq 1 128 >a &&
-		test_seq 1 130 >b &&
-
-		git add a b &&
-		git commit -m "initial commit" &&
-
-		a=$(git rev-parse HEAD:a) &&
-		b=$(git rev-parse HEAD:b) &&
-
-		# In the first pack, "a" is stored as a delta to "b".
-		p1=$(git pack-objects .git/objects/pack/pack <<-EOF
-		$a
-		$b
-		EOF
+			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) &&
 
-		# In the second pack, "a" is missing, and "b" is not a delta nor base to
-		# any other object.
-		p2=$(git pack-objects .git/objects/pack/pack <<-EOF
-		$b
-		$(git rev-parse HEAD)
-		$(git rev-parse HEAD^{tree})
+		# 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
-		) &&
-
-		git prune-packed &&
-		# Use the second pack as the preferred source, so that "b" occurs
-		# earlier in the MIDX object order, rendering "a" unusable for pack
-		# reuse.
-		git multi-pack-index write --bitmap --preferred-pack=pack-$p2.idx &&
-
-		have_delta $a $b &&
-		test $(midx_pack_source $a) != $(midx_pack_source $b)
-	
-[second 800d70e] initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 258 insertions(+)
- create mode 100644 a
- create mode 100644 b
-ok 93 - setup midx with base from later pack
-
-expecting success of 5326.94 'counting commits via bitmap (full bitmap with backwards delta, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 94 - counting commits via bitmap (full bitmap with backwards delta, second)
-
-expecting success of 5326.95 'counting partial commits via bitmap (full bitmap with backwards delta, 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 95 - counting partial commits via bitmap (full bitmap with backwards delta, second)
 
-expecting success of 5326.96 'counting commits with limit (full bitmap with backwards delta, 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 96 - counting commits with limit (full bitmap with backwards delta, second)
-
-expecting success of 5326.97 'counting non-linear history (full bitmap with backwards delta, second)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 97 - counting non-linear history (full bitmap with backwards delta, second)
-
-expecting success of 5326.98 'counting commits with limiting (full bitmap with backwards delta, 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 98 - counting commits with limiting (full bitmap with backwards delta, second)
-
-expecting success of 5326.99 'counting objects via bitmap (full bitmap with backwards delta, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 99 - counting objects via bitmap (full bitmap with backwards delta, second)
-
-expecting success of 5326.100 'enumerate commits (full bitmap with backwards delta, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 100 - enumerate commits (full bitmap with backwards delta, second)
-
-expecting success of 5326.101 'enumerate --objects (full bitmap with backwards delta, 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 5741, line 141
-ok 101 - enumerate --objects (full bitmap with backwards delta, second)
-
-expecting success of 5326.102 'bitmap --objects handles non-commit objects (full bitmap with backwards delta, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 102 - bitmap --objects handles non-commit objects (full bitmap with backwards delta, second)
-
-expecting success of 5326.103 'counting commits via bitmap (full bitmap with backwards delta, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 103 - counting commits via bitmap (full bitmap with backwards delta, other)
-
-expecting success of 5326.104 'counting partial commits via bitmap (full bitmap with backwards delta, 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 104 - counting partial commits via bitmap (full bitmap with backwards delta, other)
-
-expecting success of 5326.105 'counting commits with limit (full bitmap with backwards delta, 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 105 - counting commits with limit (full bitmap with backwards delta, other)
-
-expecting success of 5326.106 'counting non-linear history (full bitmap with backwards delta, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 106 - counting non-linear history (full bitmap with backwards delta, other)
-
-expecting success of 5326.107 'counting commits with limiting (full bitmap with backwards delta, 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 107 - counting commits with limiting (full bitmap with backwards delta, other)
-
-expecting success of 5326.108 'counting objects via bitmap (full bitmap with backwards delta, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 108 - counting objects via bitmap (full bitmap with backwards delta, other)
-
-expecting success of 5326.109 'enumerate commits (full bitmap with backwards delta, other)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 109 - enumerate commits (full bitmap with backwards delta, other)
-
-expecting success of 5326.110 'enumerate --objects (full bitmap with backwards delta, 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 110 - enumerate --objects (full bitmap with backwards delta, other)
-
-expecting success of 5326.111 'bitmap --objects handles non-commit objects (full bitmap with backwards delta, other)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 111 - bitmap --objects handles non-commit objects (full bitmap with backwards delta, other)
-
-expecting success of 5326.112 'clone with bitmaps enabled': 
-		git clone --no-local --bare . clone-reverse-delta.git &&
-		test_when_finished "rm -fr clone-reverse-delta.git" &&
-
-		git rev-parse HEAD >expect &&
-		git --git-dir=clone-reverse-delta.git rev-parse HEAD >actual &&
-		test_cmp expect actual
-	
-Cloning into bare repository 'clone-reverse-delta.git'...
-ok 112 - clone with bitmaps enabled
-
-expecting success of 5326.113 'changing the preferred pack does not corrupt bitmaps': 
-		rm -fr repo &&
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-
-			test_commit A &&
-			test_commit B &&
-
-			git rev-list --objects --no-object-names HEAD^ >A.objects &&
-			git rev-list --objects --no-object-names HEAD^.. >B.objects &&
-
-			A=$(git pack-objects $objdir/pack/pack <A.objects) &&
-			B=$(git pack-objects $objdir/pack/pack <B.objects) &&
-
-			cat >indexes <<-EOF &&
-			pack-$A.idx
-			pack-$B.idx
-			EOF
-
-			git multi-pack-index write --bitmap --stdin-packs \
-				--preferred-pack=pack-$A.pack <indexes &&
-			git rev-list --test-bitmap A &&
+		# 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
 
-			git multi-pack-index write --bitmap --stdin-packs \
-				--preferred-pack=pack-$B.pack <indexes &&
-			git rev-list --test-bitmap A
-		)
+		upstream=upstream.git
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 392b20c] A
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5411-proc-receive-hook/upstream.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-[master a4e158a] B
+[main 7763d60] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 B.t
-Bitmap v1 test (2 entries loaded)
-Found bitmap for '392b20c46362b6de2a5e9c7f30dbcf5c1a8278ba'. 64 bits / 11030517 checksum
-Verifying bitmap entries:  33% (1/3)
Verifying bitmap entries:  66% (2/3)
Verifying bitmap entries: 100% (3/3)
Verifying bitmap entries: 100% (3/3), done.
-OK!
-Bitmap v1 test (2 entries loaded)
-Found bitmap for '392b20c46362b6de2a5e9c7f30dbcf5c1a8278ba'. 64 bits / f31c9bc6 checksum
-Verifying bitmap entries:  33% (1/3)
Verifying bitmap entries:  66% (2/3)
Verifying bitmap entries: 100% (3/3)
Verifying bitmap entries: 100% (3/3), done.
-OK!
-ok 113 - changing the preferred pack does not corrupt bitmaps
-
-expecting success of 5326.114 'setup pack reuse tests (pack -> MIDX)': 
-		rm -fr repo &&
-		git init repo &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk 16 &&
-			git tag old-tip &&
-
-			git config core.multiPackIndex true &&
-			if test "MIDX" = "$from"
-			then
-				git repack -Ad &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       3592 /       3592
----------------------------------------------------------------------
-
-ok 114 - setup pack reuse tests (pack -> MIDX)
-
-expecting success of 5326.115 'build bitmap from existing (pack -> MIDX)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk --id=further 16 &&
-			git tag new-tip &&
-
-			if test "MIDX" = "$to"
-			then
-				git repack -d &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-ab0640cc3905d1f6994fbda7d62bcb8721bde6fd
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         36
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       7771 /       7771
----------------------------------------------------------------------
-
-Nothing new to pack.
-ok 115 - build bitmap from existing (pack -> MIDX)
-
-expecting success of 5326.116 'verify resulting bitmaps (pack -> MIDX)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			git for-each-ref &&
-			git rev-list --test-bitmap refs/tags/old-tip &&
-			git rev-list --test-bitmap refs/tags/new-tip
-		)
-	
-bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/heads/master
-bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/tags/new-tip
-ab0640cc3905d1f6994fbda7d62bcb8721bde6fd commit	refs/tags/old-tip
-Bitmap v1 test (32 entries loaded)
-Found bitmap for 'ab0640cc3905d1f6994fbda7d62bcb8721bde6fd'. 64 bits / 26205a9e checksum
-Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
-OK!
-Bitmap v1 test (32 entries loaded)
-Found bitmap for 'bc1bb2602ce06fbf454b00e2fc62d6577aa466c6'. 128 bits / f4d5cc9b checksum
-Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
-OK!
-ok 116 - verify resulting bitmaps (pack -> MIDX)
-
-expecting success of 5326.117 'setup pack reuse tests (MIDX -> pack)': 
-		rm -fr repo &&
-		git init repo &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk 16 &&
-			git tag old-tip &&
-
-			git config core.multiPackIndex true &&
-			if test "MIDX" = "$from"
-			then
-				git repack -Ad &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       3592 /       3592
----------------------------------------------------------------------
-
-ok 117 - setup pack reuse tests (MIDX -> pack)
-
-expecting success of 5326.118 'build bitmap from existing (MIDX -> pack)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk --id=further 16 &&
-			git tag new-tip &&
-
-			if test "MIDX" = "$to"
-			then
-				git repack -d &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-ab0640cc3905d1f6994fbda7d62bcb8721bde6fd
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         36
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       7771 /       7771
----------------------------------------------------------------------
-
-ok 118 - build bitmap from existing (MIDX -> pack)
-
-expecting success of 5326.119 'verify resulting bitmaps (MIDX -> pack)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			git for-each-ref &&
-			git rev-list --test-bitmap refs/tags/old-tip &&
-			git rev-list --test-bitmap refs/tags/new-tip
-		)
-	
-bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/heads/master
-bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/tags/new-tip
-ab0640cc3905d1f6994fbda7d62bcb8721bde6fd commit	refs/tags/old-tip
-Bitmap v1 test (32 entries loaded)
-Found bitmap for 'ab0640cc3905d1f6994fbda7d62bcb8721bde6fd'. 128 bits / 1beec19b checksum
-Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
-OK!
-Bitmap v1 test (32 entries loaded)
-Found bitmap for 'bc1bb2602ce06fbf454b00e2fc62d6577aa466c6'. 128 bits / f4d5cc9b checksum
-Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
-OK!
-ok 119 - verify resulting bitmaps (MIDX -> pack)
-
-expecting success of 5326.120 'setup pack reuse tests (MIDX -> MIDX)': 
-		rm -fr repo &&
-		git init repo &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk 16 &&
-			git tag old-tip &&
-
-			git config core.multiPackIndex true &&
-			if test "MIDX" = "$from"
-			then
-				git repack -Ad &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       3592 /       3592
----------------------------------------------------------------------
-
-ok 120 - setup pack reuse tests (MIDX -> MIDX)
-
-expecting success of 5326.121 'build bitmap from existing (MIDX -> MIDX)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk --id=further 16 &&
-			git tag new-tip &&
-
-			if test "MIDX" = "$to"
-			then
-				git repack -d &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-ab0640cc3905d1f6994fbda7d62bcb8721bde6fd
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         36
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       7771 /       7771
----------------------------------------------------------------------
-
-Nothing new to pack.
-ok 121 - build bitmap from existing (MIDX -> MIDX)
-
-expecting success of 5326.122 'verify resulting bitmaps (MIDX -> MIDX)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			git for-each-ref &&
-			git rev-list --test-bitmap refs/tags/old-tip &&
-			git rev-list --test-bitmap refs/tags/new-tip
-		)
-	
-bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/heads/master
-bc1bb2602ce06fbf454b00e2fc62d6577aa466c6 commit	refs/tags/new-tip
-ab0640cc3905d1f6994fbda7d62bcb8721bde6fd commit	refs/tags/old-tip
-Bitmap v1 test (32 entries loaded)
-Found bitmap for 'ab0640cc3905d1f6994fbda7d62bcb8721bde6fd'. 64 bits / 26205a9e checksum
-Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
-OK!
-Bitmap v1 test (32 entries loaded)
-Found bitmap for 'bc1bb2602ce06fbf454b00e2fc62d6577aa466c6'. 128 bits / f4d5cc9b checksum
-Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
-OK!
-ok 122 - verify resulting bitmaps (MIDX -> MIDX)
-
-expecting success of 5326.123 'missing object closure fails gracefully': 
-		rm -fr repo &&
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-
-			test_commit loose &&
-			test_commit packed &&
-
-			# Do not pass "--revs"; we want a pack without the "loose"
-			# commit.
-			git pack-objects $objdir/pack/pack <<-EOF &&
-			$(git rev-parse packed)
-			EOF
-
-			test_must_fail git multi-pack-index write --bitmap 2>err &&
-			grep "doesn.t have full closure" err &&
-			test_path_is_missing $midx
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 6999e23] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-[master 23fd6e3] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-6042bfdbe94037eaba8f1b0e553a64da0e4258ec
-warning: Failed to write bitmap index. Packfile doesn't have full closure (object 6999e2351f5ce16aeecbe180fdbc9d0c6966c007 is missing)
-ok 123 - missing object closure fails gracefully
-
-expecting success of 5326.124 'setup partial bitmaps': 
-		test_commit packed &&
-		git repack &&
-		test_commit loose &&
-		git multi-pack-index write --bitmap &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
-	
-[second a0f9530] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[second eb7dd10] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-ok 124 - setup partial bitmaps
-
-expecting success of 5326.125 'reverse index exists (midx)': 
-		GIT_TRACE2_EVENT=$(pwd)/event.trace \
-			git rev-list --test-bitmap "$commit" &&
-
-		if test "rev" = "$kind"
-		then
-			test_path_is_file $midx-$(midx_checksum $objdir).rev
-		fi &&
-		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
-	
-Bitmap v1 test (107 entries loaded)
-Found bitmap for 'a0f95302e15db7fcc4b1078cca104b61ddf091e3'. 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":"20251218T013614.845690Z-Hfbad846e-P00001836","thread":"main","time":"2025-12-18T01:36:14.846986Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001498,"t_rel":0.001498,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20251218T013617.502052Z-Hfbad846e-P00002593","thread":"main","time":"2025-12-18T01:36:17.503459Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001586,"t_rel":0.001586,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20251218T013623.452085Z-Hfbad846e-P00003ae6","thread":"main","time":"2025-12-18T01:36:23.453468Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001557,"t_rel":0.001557,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-ok 125 - reverse index exists (midx)
+To ../upstream.git
+ * [new branch]      main -> main
+ok 5 - setup upstream and workbench
 
-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 / 13802fc1 checksum
-Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
-OK!
-ok 126 - rev-list --test-bitmap verifies bitmaps
+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 &&
 
-expecting success of 5326.127 'counting commits via bitmap (full bitmap, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 127 - counting commits via bitmap (full bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-expecting success of 5326.128 'counting partial commits via bitmap (full 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 128 - counting partial commits via bitmap (full bitmap, second)
+ok 6 - git-push (builtin protocol)
 
-expecting success of 5326.129 'counting commits with limit (full 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 129 - counting commits with limit (full bitmap, second)
+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 &&
 
-expecting success of 5326.130 'counting non-linear history (full bitmap, second)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 130 - counting non-linear history (full bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-expecting success of 5326.131 'counting commits with limiting (full 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 131 - counting commits with limiting (full bitmap, second)
+ok 7 - git-push --atomic (builtin protocol)
 
-expecting success of 5326.132 'counting objects via bitmap (full bitmap, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 132 - counting objects via bitmap (full bitmap, second)
+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 &&
 
-expecting success of 5326.133 'enumerate commits (full bitmap, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 133 - enumerate commits (full bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-B> refs/heads/next
+	EOF
 
-expecting success of 5326.134 'enumerate --objects (full 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 134 - enumerate --objects (full bitmap, second)
+ok 8 - non-fast-forward git-push (builtin protocol)
 
-expecting success of 5326.135 'bitmap --objects handles non-commit objects (full bitmap, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 135 - bitmap --objects handles non-commit objects (full bitmap, second)
+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 &&
 
-expecting success of 5326.136 'counting commits via bitmap (full bitmap, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 136 - counting commits via bitmap (full bitmap, other)
+	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
 
-expecting success of 5326.137 'counting partial commits via bitmap (full 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 137 - counting partial commits via bitmap (full bitmap, other)
+ok 9 - git-push -f (builtin protocol)
 
-expecting success of 5326.138 'counting commits with limit (full 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 138 - counting commits with limit (full bitmap, other)
+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
+	)
 
-expecting success of 5326.139 'counting non-linear history (full bitmap, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 139 - counting non-linear history (full bitmap, other)
+ok 10 - cleanup (builtin protocol)
 
-expecting success of 5326.140 'counting commits with limiting (full 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 140 - counting commits with limiting (full bitmap, other)
+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 &&
 
-expecting success of 5326.141 'counting objects via bitmap (full bitmap, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 141 - counting objects via bitmap (full bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-expecting success of 5326.142 '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 142 - enumerate commits (full bitmap, other)
+ok 11 - git-push (builtin protocol/porcelain)
 
-expecting success of 5326.143 '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 143 - enumerate --objects (full bitmap, other)
+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 &&
 
-expecting success of 5326.144 '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 144 - bitmap --objects handles non-commit objects (full bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-expecting success of 5326.145 '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 145 - clone from bitmapped repository
+ok 12 - git-push --atomic (builtin protocol/porcelain)
 
-expecting success of 5326.146 '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 146 - partial clone from bitmapped repository
+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 &&
 
-expecting success of 5326.147 'setup further non-bitmapped commits': 
-		test_commit_bulk --id=further 10
-	
-eb7dd10cacf916c0fbe0aa62deed5ff900c6845c
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         12
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       5261 /       5261
----------------------------------------------------------------------
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-B> refs/heads/next
+	EOF
 
-ok 147 - setup further non-bitmapped commits
+ok 13 - non-fast-forward git-push (builtin protocol/porcelain)
 
-expecting success of 5326.148 '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 148 - counting commits via bitmap (partial bitmap, second)
+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 &&
 
-expecting success of 5326.149 '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 149 - counting partial commits via bitmap (partial bitmap, second)
+	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
 
-expecting success of 5326.150 '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 150 - counting commits with limit (partial bitmap, second)
+ok 14 - git-push -f (builtin protocol/porcelain)
 
-expecting success of 5326.151 '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 151 - counting non-linear history (partial bitmap, second)
+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
+	)
 
-expecting success of 5326.152 '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 152 - counting commits with limiting (partial bitmap, second)
+ok 15 - cleanup (builtin protocol/porcelain)
 
-expecting success of 5326.153 '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 153 - counting objects via bitmap (partial bitmap, second)
+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
 
-expecting success of 5326.154 '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 154 - enumerate commits (partial bitmap, second)
+ok 16 - setup pre-receive hook (builtin protocol)
 
-expecting success of 5326.155 '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 155 - enumerate --objects (partial bitmap, second)
+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 &&
 
-expecting success of 5326.156 '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 156 - bitmap --objects handles non-commit objects (partial bitmap, second)
+	test_cmp_refs -C "$upstream" <<-\EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.157 '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 157 - counting commits via bitmap (partial bitmap, other)
+ok 17 - git-push is declined (builtin protocol)
 
-expecting success of 5326.158 '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 158 - counting partial commits via bitmap (partial bitmap, other)
+expecting success of 5411.18 'cleanup (builtin protocol)': 
+	mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
 
-expecting success of 5326.159 '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 159 - counting commits with limit (partial bitmap, other)
+ok 18 - cleanup (builtin protocol)
 
-expecting success of 5326.160 '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 160 - counting non-linear history (partial bitmap, other)
+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
 
-expecting success of 5326.161 '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 161 - counting commits with limiting (partial bitmap, other)
+ok 19 - setup pre-receive hook (builtin protocol/porcelain)
 
-expecting success of 5326.162 '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 162 - counting objects via bitmap (partial bitmap, other)
+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 &&
 
-expecting success of 5326.163 '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 163 - enumerate commits (partial bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.164 '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 164 - enumerate --objects (partial bitmap, other)
+ok 20 - git-push is declined (builtin protocol/porcelain)
 
-expecting success of 5326.165 '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 165 - bitmap --objects handles non-commit objects (partial bitmap, other)
+expecting success of 5411.21 'cleanup (builtin protocol/porcelain)': 
+	mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
 
-expecting success of 5326.166 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
-   eb7dd10..5374668  second     -> second
-ok 166 - fetch (partial bitmap)
+ok 21 - cleanup (builtin protocol/porcelain)
 
-expecting success of 5326.167 'enumerating progress counts pack-reused objects': 
-		count=$(git rev-list --objects --all --count) &&
-		git repack -adb &&
+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/
+	)
 
-		# 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 &&
+ok 22 - add two receive.procReceiveRefs settings
 
-		# 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 07d40ce] 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 167 - enumerating progress counts pack-reused objects
+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 &&
 
-expecting success of 5326.168 '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 &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-			# Write a MIDX and bitmap; remove the MIDX but leave the bitmap.
-			stale_bitmap=$midx-$(midx_checksum $objdir).bitmap &&
-			rm $midx &&
+ok 23 - proc-receive: no hook, fail to push special ref (builtin protocol)
 
-			# Then write a new MIDX.
-			test_commit new &&
-			git repack &&
-			git multi-pack-index write --bitmap &&
+expecting success of 5411.24 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/heads/next
 
-			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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) c7b3d3a] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 6b19708] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-ok 168 - removing a MIDX clears stale bitmaps
+ok 24 - cleanup (builtin protocol)
 
-expecting success of 5326.169 'pack.preferBitmapTips': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+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_commit_bulk --message="%s" 103 &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			git log --format="%H" >commits.raw &&
-			sort <commits.raw >commits &&
+ok 25 - proc-receive: no hook, all failed for atomic push (builtin protocol)
 
-			git log --format="create refs/tags/%s %H" HEAD >refs &&
-			git update-ref --stdin <refs &&
+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 &&
 
-			git multi-pack-index write --bitmap &&
-			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-A> refs/heads/next
+	EOF
 
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >before &&
-			test_line_count = 1 before &&
+ok 26 - proc-receive: no hook, fail to push special ref (builtin protocol/porcelain)
 
-			perl -ne "printf(\"create refs/tags/include/%d \", $.); print" \
-				<before | git update-ref --stdin &&
+expecting success of 5411.27 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/heads/next
 
-			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-			rm -fr $midx &&
+ok 27 - cleanup (builtin protocol/porcelain)
 
-			git -c pack.preferBitmapTips=refs/tags/include \
-				multi-pack-index write --bitmap &&
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >after &&
+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 before after
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      26910 /      26910
----------------------------------------------------------------------
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
---- before	2025-12-18 01:36:24.986773267 +0000
-+++ after	2025-12-18 01:36:25.026773267 +0000
-@@ -1 +1 @@
--fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
-+ddf14642c6faca04471beee86e605bcbfd21396e
-ok 169 - pack.preferBitmapTips
+ok 28 - proc-receive: no hook, all failed for atomic push (builtin protocol/porcelain)
 
-expecting success of 5326.170 'writing a bitmap with --refs-snapshot': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+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
 
-			test_commit one &&
-			test_commit two &&
+ok 29 - setup proc-receive hook (unknown version, builtin protocol)
 
-			git rev-parse one >snapshot &&
+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 &&
 
-			git repack -ad &&
+	# 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 &&
 
-			# 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 &&
+	# 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_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			test-tool bitmap list-commits | sort >bitmaps &&
-			grep "$(git rev-parse one)" bitmaps &&
-			grep "$(git rev-parse two)" bitmaps &&
+ok 30 - proc-receive: bad protocol (unknown version, builtin protocol)
 
-			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-			rm -fr $midx &&
+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
 
-			# Then again, but with a refs snapshot which only sees
-			# refs/tags/one.
-			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+ok 31 - setup proc-receive hook (hook --die-read-version, builtin protocol)
 
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+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-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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 0fe3286] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 4484e5d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-0fe3286fcbe602bb880b56d28a01d1851b7945c9
-4484e5d24e9474a8b002de8f670f676c5c0af441
-0fe3286fcbe602bb880b56d28a01d1851b7945c9
-ok 170 - writing a bitmap with --refs-snapshot
+	test_cmp_refs -C "$upstream" <<-\EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.171 'write a bitmap with --refs-snapshot (preferred tips)': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+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)
 
-			test_commit_bulk --message="%s" 103 &&
+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
 
-			git log --format="%H" >commits.raw &&
-			sort <commits.raw >commits &&
+ok 33 - setup proc-receive hook (hook --die-write-version, builtin protocol)
 
-			git log --format="create refs/tags/%s %H" HEAD >refs &&
-			git update-ref --stdin <refs &&
+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 &&
 
-			git multi-pack-index write --bitmap &&
-			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
+	EOF
 
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >before &&
-			test_line_count = 1 before &&
+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)
 
-			(
-				grep -vf before commits.raw &&
-				# mark missing commits as preferred
-				sed "s/^/+/" before
-			) >snapshot &&
+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
 
-			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-			rm -fr $midx &&
+ok 35 - setup proc-receive hook (hook --die-read-commands, builtin protocol)
 
-			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >after &&
+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 before after
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =      26910 /      26910
----------------------------------------------------------------------
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
---- before	2025-12-18 01:36:25.378773267 +0000
-+++ after	2025-12-18 01:36:25.414773267 +0000
-@@ -1 +1 @@
--fa4fd5b5dc98cbc7b40febbcdae7093e095b854e
-+ddf14642c6faca04471beee86e605bcbfd21396e
-ok 171 - write a bitmap with --refs-snapshot (preferred tips)
+remote: fatal: die with the --die-read-commands option        
+ok 36 - proc-receive: bad protocol (hook --die-read-commands, builtin protocol)
 
-expecting success of 5326.172 '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 &&
+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
 
-			test_commit base &&
-			test_commit base2 &&
-			git repack -adb &&
+ok 37 - setup proc-receive hook (hook --die-read-push-options, builtin protocol)
 
-			test-tool bitmap dump-hashes >pack.raw &&
-			test_file_not_empty pack.raw &&
-			sort pack.raw >pack.hashes &&
+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_commit new &&
-			git repack &&
-			git multi-pack-index write --bitmap &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			test-tool bitmap dump-hashes >midx.raw &&
-			sort midx.raw >midx.hashes &&
+remote: fatal: die with the --die-read-push-options option        
+ok 38 - proc-receive: bad protocol (hook --die-read-push-options, builtin protocol)
 
-			# 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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) c7b3d3a] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 63dc8a8] base2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base2.t
-[master fa4104d] new
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new.t
-ok 172 - hash-cache values are propagated from pack bitmaps
+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
 
-expecting success of 5326.173 '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 &&
+ok 39 - setup proc-receive hook (hook --die-write-report, builtin protocol)
 
-			empty="$(git pack-objects $objdir/pack/pack </dev/null)" &&
-			cat >packs <<-EOF &&
-			pack-$empty.idx
-			EOF
+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 &&
 
-			git multi-pack-index write --bitmap --stdin-packs \
-				<packs 2>err &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			grep "bitmap without any objects" err &&
+remote: fatal: die with the --die-write-report option        
+ok 40 - proc-receive: bad protocol (hook --die-write-report, builtin protocol)
 
-			test_path_is_file $midx &&
-			test_path_is_missing $midx-$(midx_checksum $objdir).bitmap
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-warning: refusing to write multi-pack .bitmap without any objects
-ok 173 - no .bitmap is written without any objects
+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
 
-expecting success of 5326.174 '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 &&
+ok 41 - setup proc-receive hook (no report, builtin protocol)
 
-			test_commit base &&
+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 &&
 
-			# write a pack and MIDX bitmap containing base
-			git repack -adb &&
-			git multi-pack-index write --bitmap &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-			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.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) c7b3d3a] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-c7b3d3a32a70b7a1e8b65ae6f01c75bf4c23e8c4
-ok 174 - graceful fallback when missing reverse index
+ok 42 - proc-receive: bad protocol (no report, builtin protocol)
 
-expecting success of 5326.175 'setup test_repository': 
-		rm -rf * .git &&
-		git init &&
-		git config pack.writeBitmapLookupTable true
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/.git/
-ok 175 - setup test_repository
+expecting success of 5411.43 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/heads/next
 
-expecting success of 5326.176 'setup repo with moderate-sized history': 
-		test_commit_bulk --id=file 10 &&
-		git branch -M second &&
-		git checkout -b other HEAD~5 &&
-		test_commit_bulk --id=side 10 &&
 
-		# add complicated history setup, including merges and
-		# ambiguous merge-bases
+ok 43 - cleanup (builtin protocol)
 
-		git checkout -b merge-left other~2 &&
-		git merge second~2 -m "merge-left" &&
+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
 
-		git checkout -b merge-right second~1 &&
-		git merge other~1 -m "merge-right" &&
+ok 44 - setup proc-receive hook (no ref, builtin protocol)
 
-		git checkout -b octo-second second &&
-		git merge merge-left merge-right -m "octopus-second" &&
+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 &&
 
-		git checkout -b octo-other other &&
-		git merge merge-left merge-right -m "octopus-other" &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-		git checkout other &&
-		git merge octo-other -m "pull octopus" &&
+ok 45 - proc-receive: bad protocol (no ref, builtin protocol)
 
-		git checkout second &&
-		git merge octo-second -m "pull octopus" &&
+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
 
-		# Remove these branches so they are not selected
-		# as bitmap tips
-		git branch -D merge-left &&
-		git branch -D merge-right &&
-		git branch -D octo-other &&
-		git branch -D octo-second &&
+ok 46 - setup proc-receive hook (unknown status, builtin protocol)
 
-		# add padding to make these merges less interesting
-		# and avoid having them selected for bitmaps
-		test_commit_bulk --id=file 100 &&
-		git checkout other &&
-		test_commit_bulk --id=side 100 &&
-		git checkout second &&
+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 &&
 
-		bitmaptip=$(git rev-parse second) &&
-		blob=$(echo tagged-blob | git hash-object -w --stdin) &&
-		git tag tagged-blob $blob
-	
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           30 (         0 duplicates                  )
-      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           10 (         0 duplicates          9 deltas of          9 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:             10
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       2285 /       2285
----------------------------------------------------------------------
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-Switched to a new branch 'other'
-0977809a2f6f01041c676e76708c1fce2ec15a77
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           30 (         0 duplicates                  )
-      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           10 (         0 duplicates          9 deltas of          9 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:             15
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         16
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       4747 /       4747
----------------------------------------------------------------------
+ok 47 - proc-receive: bad protocol (unknown status, builtin protocol)
 
-Switched to a new branch 'merge-left'
-Merge made by the 'ort' strategy.
- file-6.t | 1 +
- file-7.t | 1 +
- file-8.t | 1 +
- 3 files changed, 3 insertions(+)
- create mode 100644 file-6.t
- create mode 100644 file-7.t
- create mode 100644 file-8.t
-Switched to a new branch 'merge-right'
-Merge made by the 'ort' strategy.
- side-1.t | 1 +
- side-2.t | 1 +
- side-3.t | 1 +
- side-4.t | 1 +
- side-5.t | 1 +
- side-6.t | 1 +
- side-7.t | 1 +
- side-8.t | 1 +
- side-9.t | 1 +
- 9 files changed, 9 insertions(+)
- create mode 100644 side-1.t
- create mode 100644 side-2.t
- create mode 100644 side-3.t
- create mode 100644 side-4.t
- create mode 100644 side-5.t
- create mode 100644 side-6.t
- create mode 100644 side-7.t
- create mode 100644 side-8.t
- create mode 100644 side-9.t
-Switched to a new branch 'octo-second'
-Trying simple merge with merge-left
-Trying simple merge with merge-right
-Merge made by the 'octopus' strategy.
- side-1.t | 1 +
- side-2.t | 1 +
- side-3.t | 1 +
- side-4.t | 1 +
- side-5.t | 1 +
- side-6.t | 1 +
- side-7.t | 1 +
- side-8.t | 1 +
- side-9.t | 1 +
- 9 files changed, 9 insertions(+)
- create mode 100644 side-1.t
- create mode 100644 side-2.t
- create mode 100644 side-3.t
- create mode 100644 side-4.t
- create mode 100644 side-5.t
- create mode 100644 side-6.t
- create mode 100644 side-7.t
- create mode 100644 side-8.t
- create mode 100644 side-9.t
-Switched to a new branch 'octo-other'
-Trying simple merge with merge-left
-Trying simple merge with merge-right
-Merge made by the 'octopus' strategy.
- file-6.t | 1 +
- file-7.t | 1 +
- file-8.t | 1 +
- file-9.t | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 file-6.t
- create mode 100644 file-7.t
- create mode 100644 file-8.t
- create mode 100644 file-9.t
-Switched to branch 'other'
-Updating 23793a5..6dbf429
-Fast-forward (no commit created; -m option ignored)
- file-6.t | 1 +
- file-7.t | 1 +
- file-8.t | 1 +
- file-9.t | 1 +
- 4 files changed, 4 insertions(+)
- create mode 100644 file-6.t
- create mode 100644 file-7.t
- create mode 100644 file-8.t
- create mode 100644 file-9.t
-Switched to branch 'second'
-Updating 89c9df7..fe580a0
-Fast-forward (no commit created; -m option ignored)
- side-1.t | 1 +
- side-2.t | 1 +
- side-3.t | 1 +
- side-4.t | 1 +
- side-5.t | 1 +
- side-6.t | 1 +
- side-7.t | 1 +
- side-8.t | 1 +
- side-9.t | 1 +
- 9 files changed, 9 insertions(+)
- create mode 100644 side-1.t
- create mode 100644 side-2.t
- create mode 100644 side-3.t
- create mode 100644 side-4.t
- create mode 100644 side-5.t
- create mode 100644 side-6.t
- create mode 100644 side-7.t
- create mode 100644 side-8.t
- create mode 100644 side-9.t
-Deleted branch merge-left (was fbc62e6).
-Deleted branch merge-right (was c5b6896).
-Deleted branch octo-other (was 6dbf429).
-Deleted branch octo-second (was fe580a0).
-fe580a073cb0a105ec2998652ed9d1674ebb849d
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          280 (        10 duplicates                  )
-      blobs  :           90 (        10 duplicates          0 deltas of          0 attempts)
-      trees  :           90 (         0 duplicates         88 deltas of         88 attempts)
-      commits:          100 (         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:            109
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =        102
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      26598 /      26598
----------------------------------------------------------------------
+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
 
-Switched to branch 'other'
-6dbf4290e5b18e89ba78cd6a7115518279638769
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:          280 (        10 duplicates                  )
-      blobs  :           90 (        10 duplicates          0 deltas of          0 attempts)
-      trees  :           90 (         0 duplicates         88 deltas of         88 attempts)
-      commits:          100 (         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:            109
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =        102
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      26775 /      26775
----------------------------------------------------------------------
+ok 48 - setup proc-receive hook (unknown version, builtin protocol/porcelain)
 
-Switched to branch 'second'
-ok 176 - setup repo with moderate-sized history
+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 &&
 
-expecting success of 5326.177 'create single-pack midx with bitmaps': 
-		git repack -ad &&
-		git multi-pack-index write --bitmap &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
-	
-ok 177 - create single-pack midx with bitmaps
+	# 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 &&
 
-expecting success of 5326.178 'reverse index exists (midx)': 
-		GIT_TRACE2_EVENT=$(pwd)/event.trace \
-			git rev-list --test-bitmap "$commit" &&
+	# 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 &&
 
-		if test "rev" = "$kind"
-		then
-			test_path_is_file $midx-$(midx_checksum $objdir).rev
-		fi &&
-		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
-	
-Bitmap v1 test (106 entries)
-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":"20251218T013626.536870Z-Hfbad846e-P00004c41","thread":"main","time":"2025-12-18T01:36:26.538256Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001573,"t_rel":0.001573,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-ok 178 - reverse index exists (midx)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.179 'rev-list --test-bitmap verifies bitmaps': 
-		git rev-list --test-bitmap HEAD
-	
-Bitmap v1 test (106 entries)
-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!
-ok 179 - rev-list --test-bitmap verifies bitmaps
+ok 49 - proc-receive: bad protocol (unknown version, builtin protocol/porcelain)
 
-expecting success of 5326.180 'counting commits via bitmap (full bitmap, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 180 - counting commits via bitmap (full bitmap, second)
+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
 
-expecting success of 5326.181 'counting partial commits via bitmap (full 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 181 - counting partial commits via bitmap (full bitmap, second)
+ok 50 - setup proc-receive hook (hook --die-read-version, builtin protocol/porcelain)
 
-expecting success of 5326.182 'counting commits with limit (full 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 182 - counting commits with limit (full bitmap, second)
+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 &&
 
-expecting success of 5326.183 'counting non-linear history (full bitmap, second)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 183 - counting non-linear history (full bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.184 'counting commits with limiting (full 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 184 - counting commits with limiting (full bitmap, second)
+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 5326.185 'counting objects via bitmap (full bitmap, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 185 - counting objects via bitmap (full bitmap, second)
+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
 
-expecting success of 5326.186 'enumerate commits (full bitmap, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 186 - enumerate commits (full bitmap, second)
+ok 52 - setup proc-receive hook (hook --die-write-version, builtin protocol/porcelain)
 
-expecting success of 5326.187 'enumerate --objects (full 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 4102, line 101
-ok 187 - enumerate --objects (full bitmap, second)
+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 &&
 
-expecting success of 5326.188 'bitmap --objects handles non-commit objects (full bitmap, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 188 - bitmap --objects handles non-commit objects (full bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.189 'counting commits via bitmap (full bitmap, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 189 - counting commits via bitmap (full bitmap, other)
+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 5326.190 'counting partial commits via bitmap (full 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 190 - counting partial commits via bitmap (full bitmap, other)
+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
 
-expecting success of 5326.191 'counting commits with limit (full 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 191 - counting commits with limit (full bitmap, other)
+ok 54 - setup proc-receive hook (hook --die-read-commands, builtin protocol/porcelain)
 
-expecting success of 5326.192 'counting non-linear history (full bitmap, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 192 - counting non-linear history (full bitmap, other)
+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 &&
 
-expecting success of 5326.193 'counting commits with limiting (full 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 193 - counting commits with limiting (full bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.194 'counting objects via bitmap (full bitmap, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 194 - counting objects via bitmap (full bitmap, other)
+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 5326.195 '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 195 - enumerate commits (full bitmap, other)
+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
 
-expecting success of 5326.196 '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 196 - enumerate --objects (full bitmap, other)
+ok 56 - setup proc-receive hook (hook --die-read-push-options, builtin protocol/porcelain)
 
-expecting success of 5326.197 '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 197 - bitmap --objects handles non-commit objects (full bitmap, other)
+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 &&
 
-expecting success of 5326.198 '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 198 - clone from bitmapped repository
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.199 '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 199 - partial clone from bitmapped repository
+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 5326.200 'setup further non-bitmapped commits': 
-		test_commit_bulk --id=further 10
-	
-db2803b34efd93d3448bc6cf028a889473ba3735
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           30 (         0 duplicates                  )
-      blobs  :           10 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           10 (         0 duplicates          9 deltas of          9 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:            119
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         16
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      58728 /      58728
----------------------------------------------------------------------
+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 200 - setup further non-bitmapped commits
+ok 58 - setup proc-receive hook (hook --die-write-report, builtin protocol/porcelain)
 
-expecting success of 5326.201 '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 201 - counting commits via bitmap (partial bitmap, second)
+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 &&
 
-expecting success of 5326.202 '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 202 - counting partial commits via bitmap (partial bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.203 '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 203 - counting commits with limit (partial bitmap, second)
+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 5326.204 '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 204 - counting non-linear history (partial bitmap, second)
+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
 
-expecting success of 5326.205 '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 205 - counting commits with limiting (partial bitmap, second)
+ok 60 - setup proc-receive hook (no report, builtin protocol/porcelain)
 
-expecting success of 5326.206 '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 206 - counting objects via bitmap (partial bitmap, second)
+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 &&
 
-expecting success of 5326.207 '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 207 - enumerate commits (partial bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-expecting success of 5326.208 '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 208 - enumerate --objects (partial bitmap, second)
+ok 61 - proc-receive: bad protocol (no report, builtin protocol/porcelain)
 
-expecting success of 5326.209 '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 209 - bitmap --objects handles non-commit objects (partial bitmap, second)
+expecting success of 5411.62 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/heads/next
 
-expecting success of 5326.210 '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 210 - counting commits via bitmap (partial bitmap, other)
+ok 62 - cleanup (builtin protocol/porcelain)
 
-expecting success of 5326.211 '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 211 - counting partial commits via bitmap (partial bitmap, other)
+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
 
-expecting success of 5326.212 '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 212 - counting commits with limit (partial bitmap, other)
+ok 63 - setup proc-receive hook (no ref, builtin protocol/porcelain)
 
-expecting success of 5326.213 '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 213 - counting non-linear history (partial bitmap, other)
+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 &&
 
-expecting success of 5326.214 '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 214 - counting commits with limiting (partial bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.215 '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 215 - counting objects via bitmap (partial bitmap, other)
+ok 64 - proc-receive: bad protocol (no ref, builtin protocol/porcelain)
 
-expecting success of 5326.216 '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 216 - enumerate commits (partial bitmap, other)
+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
 
-expecting success of 5326.217 '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 217 - enumerate --objects (partial bitmap, other)
+ok 65 - setup proc-receive hook (unknown status, builtin protocol/porcelain)
 
-expecting success of 5326.218 '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 218 - bitmap --objects handles non-commit objects (partial bitmap, other)
+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 &&
 
-expecting success of 5326.219 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
-   db2803b..21b05a3  second     -> second
-ok 219 - fetch (partial bitmap)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.220 'enumerating progress counts pack-reused objects': 
-		count=$(git rev-list --objects --all --count) &&
-		git repack -adb &&
+ok 66 - proc-receive: bad protocol (unknown status, builtin protocol/porcelain)
 
-		# 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 &&
+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
 
-		# 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: 659, done.
-Total 659 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
-[second 9d9466a] an extra commit object
- Author: A U Thor <author@example.com>
-Enumerating objects: 660, done.
-Total 660 (delta 0), reused 0 (delta 0), pack-reused 659 (from 1)
-ok 220 - enumerating progress counts pack-reused objects
+ok 67 - setup proc-receive hook (ng, no message, builtin protocol)
 
-expecting success of 5326.221 'create new additional packs': 
-		for i in $(test_seq 1 16)
-		do
-			test_commit "$i" &&
-			git repack -d || return 1
-		done &&
+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 &&
 
-		git checkout -b other2 HEAD~8 &&
-		for i in $(test_seq 1 8)
-		do
-			test_commit "side-$i" &&
-			git repack -d || return 1
-		done &&
-		git checkout second
-	
-[second c508966] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[second 7852397] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[second e8764eb] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[second e7b65f1] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[second ff287bb] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-[second 734ba24] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-[second 7e37ce6] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-[second 22aa444] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-[second 82c3a80] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-[second 8a6fa0d] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10.t
-[second 1508049] 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11.t
-[second aec6ca5] 12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 12.t
-[second 32a5e04] 13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 13.t
-[second a28bee6] 14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 14.t
-[second 12a188f] 15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 15.t
-[second 576966f] 16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 16.t
-Switched to a new branch 'other2'
-[other2 b3d62c0] side-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 e8f946b] side-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 56d7f89] side-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 dbe4b2d] side-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 9286b7d] side-5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 75e0202] side-6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 b26808f] side-7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[other2 b145b7a] side-8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'second'
-ok 221 - create new additional packs
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.222 'create multi-pack midx with bitmaps': 
-		git multi-pack-index write --bitmap &&
+ok 68 - proc-receive: fail to update (ng, no message, builtin protocol)
 
-		ls $objdir/pack/pack-*.pack >packs &&
-		test_line_count = 25 packs &&
+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
 
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
-	
-ok 222 - create multi-pack midx with bitmaps
+ok 69 - setup proc-receive hook (ng message, builtin protocol)
 
-expecting success of 5326.223 'reverse index exists (midx)': 
-		GIT_TRACE2_EVENT=$(pwd)/event.trace \
-			git rev-list --test-bitmap "$commit" &&
+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 &&
 
-		if test "rev" = "$kind"
-		then
-			test_path_is_file $midx-$(midx_checksum $objdir).rev
-		fi &&
-		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
-	
-Bitmap v1 test (107 entries)
-Found bitmap for '576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7'. 768 bits / 236971ab 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":"20251218T013626.536870Z-Hfbad846e-P00004c41","thread":"main","time":"2025-12-18T01:36:26.538256Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001573,"t_rel":0.001573,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20251218T013629.421077Z-Hfbad846e-P00005a5e","thread":"main","time":"2025-12-18T01:36:29.422394Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001491,"t_rel":0.001491,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-ok 223 - reverse index exists (midx)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-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 / 236971ab 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
+ok 70 - proc-receive: fail to update (ng, with message, builtin protocol)
 
-expecting success of 5326.225 'counting commits via bitmap (full bitmap, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 225 - counting commits via bitmap (full bitmap, second)
+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
 
-expecting success of 5326.226 'counting partial commits via bitmap (full 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 226 - counting partial commits via bitmap (full bitmap, second)
+ok 71 - setup proc-receive hook (ng, no message, builtin protocol/porcelain)
 
-expecting success of 5326.227 'counting commits with limit (full 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 227 - counting commits with limit (full bitmap, second)
+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 &&
 
-expecting success of 5326.228 'counting non-linear history (full bitmap, second)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 228 - counting non-linear history (full bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.229 'counting commits with limiting (full 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 229 - counting commits with limiting (full bitmap, second)
+ok 72 - proc-receive: fail to update (ng, no message, builtin protocol/porcelain)
 
-expecting success of 5326.230 'counting objects via bitmap (full bitmap, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 230 - counting objects via bitmap (full bitmap, second)
+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
 
-expecting success of 5326.231 'enumerate commits (full bitmap, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 231 - enumerate commits (full bitmap, second)
+ok 73 - setup proc-receive hook (ng message, builtin protocol/porcelain)
 
-expecting success of 5326.232 'enumerate --objects (full 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 232 - enumerate --objects (full bitmap, second)
+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 &&
 
-expecting success of 5326.233 'bitmap --objects handles non-commit objects (full bitmap, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 233 - bitmap --objects handles non-commit objects (full bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.234 'counting commits via bitmap (full bitmap, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 234 - counting commits via bitmap (full bitmap, other)
+ok 74 - proc-receive: fail to update (ng, with message, builtin protocol/porcelain)
 
-expecting success of 5326.235 'counting partial commits via bitmap (full 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 235 - counting partial commits via bitmap (full bitmap, other)
+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
 
-expecting success of 5326.236 'counting commits with limit (full 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 236 - counting commits with limit (full bitmap, other)
+ok 75 - setup proc-receive hook (unexpected ref, builtin protocol)
 
-expecting success of 5326.237 'counting non-linear history (full bitmap, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 237 - counting non-linear history (full bitmap, other)
+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 &&
 
-expecting success of 5326.238 'counting commits with limiting (full 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 238 - counting commits with limiting (full bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	EOF
 
-expecting success of 5326.239 'counting objects via bitmap (full bitmap, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 239 - counting objects via bitmap (full bitmap, other)
+ok 76 - proc-receive: report unexpected ref (builtin protocol)
 
-expecting success of 5326.240 '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 240 - enumerate commits (full bitmap, other)
+expecting success of 5411.77 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref refs/heads/main $A
 
-expecting success of 5326.241 '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 241 - enumerate --objects (full bitmap, other)
+ok 77 - cleanup (builtin protocol)
 
-expecting success of 5326.242 '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 242 - bitmap --objects handles non-commit objects (full bitmap, other)
+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
 
-expecting success of 5326.243 '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 243 - clone from bitmapped repository
+ok 78 - setup proc-receive hook (unexpected ref, builtin protocol/porcelain)
 
-expecting success of 5326.244 '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 244 - partial clone from bitmapped repository
+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 &&
 
-expecting success of 5326.245 'setup further non-bitmapped commits': 
-		test_commit_bulk --id=further 10
-	
-576966fc3b893dbc7e2ca80ceecf4329d8e9e7a7
-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:            135
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         16
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =       8626 /       8626
----------------------------------------------------------------------
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	EOF
 
-ok 245 - setup further non-bitmapped commits
+ok 79 - proc-receive: report unexpected ref (builtin protocol/porcelain)
 
-expecting success of 5326.246 '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 246 - counting commits via bitmap (partial bitmap, second)
+expecting success of 5411.80 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref refs/heads/main $A
 
-expecting success of 5326.247 '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 247 - counting partial commits via bitmap (partial bitmap, second)
+ok 80 - cleanup (builtin protocol/porcelain)
 
-expecting success of 5326.248 '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 248 - counting commits with limit (partial bitmap, second)
+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
 
-expecting success of 5326.249 '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 249 - counting non-linear history (partial bitmap, second)
+ok 81 - setup proc-receive hook (unexpected ref, builtin protocol)
 
-expecting success of 5326.250 '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 250 - counting commits with limiting (partial bitmap, second)
+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 &&
 
-expecting success of 5326.251 '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 251 - counting objects via bitmap (partial bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.252 '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 252 - enumerate commits (partial bitmap, second)
+ok 82 - proc-receive: report unknown reference (builtin protocol)
 
-expecting success of 5326.253 '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 253 - enumerate --objects (partial bitmap, second)
+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
 
-expecting success of 5326.254 '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 254 - bitmap --objects handles non-commit objects (partial bitmap, second)
+ok 83 - setup proc-receive hook (unexpected ref, builtin protocol/porcelain)
 
-expecting success of 5326.255 '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 255 - counting commits via bitmap (partial bitmap, other)
+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 &&
 
-expecting success of 5326.256 '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 256 - counting partial commits via bitmap (partial bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.257 '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 257 - counting commits with limit (partial bitmap, other)
+ok 84 - proc-receive: report unknown reference (builtin protocol/porcelain)
 
-expecting success of 5326.258 '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 258 - counting non-linear history (partial bitmap, other)
+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
 
-expecting success of 5326.259 '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 259 - counting commits with limiting (partial bitmap, other)
+ok 85 - setup proc-receive hook and disable push-options (builtin protocol)
 
-expecting success of 5326.260 '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 260 - counting objects via bitmap (partial bitmap, other)
+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 &&
 
-expecting success of 5326.261 '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 261 - enumerate commits (partial bitmap, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.262 '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 262 - enumerate --objects (partial bitmap, other)
+fatal: the receiving end does not support push options
+ok 86 - proc-receive: not support push options (builtin protocol)
 
-expecting success of 5326.263 '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 263 - bitmap --objects handles non-commit objects (partial bitmap, other)
+expecting success of 5411.87 'enable push options (builtin protocol)': 
+	git -C "$upstream" config receive.advertisePushOptions true
 
-expecting success of 5326.264 '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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
-   576966f..078ff48  second     -> second
-ok 264 - fetch (partial bitmap)
+ok 87 - enable push options (builtin protocol)
 
-expecting success of 5326.265 'enumerating progress counts pack-reused objects': 
-		count=$(git rev-list --objects --all --count) &&
-		git repack -adb &&
+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
 
-		# 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 &&
+ok 88 - setup version=0 for proc-receive hook (builtin protocol)
 
-		# 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: 742, done.
-Total 742 (delta 0), reused 0 (delta 0), pack-reused 742 (from 1)
-[second 2cbe96f] an extra commit object
- Author: A U Thor <author@example.com>
-Enumerating objects: 743, done.
-Total 743 (delta 0), reused 0 (delta 0), pack-reused 742 (from 1)
-ok 265 - enumerating progress counts pack-reused objects
+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 &&
 
-expecting success of 5326.266 '--no-bitmap is respected when bitmaps exist': 
-		git multi-pack-index write --bitmap &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-		test_commit respect--no-bitmap &&
-		git repack -d &&
+ok 89 - proc-receive: ignore push-options for version 0 (builtin protocol)
 
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+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
 
-		git multi-pack-index write --no-bitmap &&
+ok 90 - restore proc-receive hook (builtin protocol)
 
-		test_path_is_file $midx &&
-		test_path_is_missing $midx-$(midx_checksum $objdir).bitmap &&
-		test_path_is_missing $midx-$(midx_checksum $objdir).rev
-	
-[second aec4170] respect--no-bitmap
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 respect--no-bitmap.t
-ok 266 - --no-bitmap is respected when bitmaps exist
+expecting success of 5411.91 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/heads/next
 
-expecting success of 5326.267 'setup midx with base from later pack': 
-		# Write a and b so that "a" is a delta on top of base "b", since Git
-		# prefers to delete contents out of a base rather than add to a shorter
-		# object.
-		test_seq 1 128 >a &&
-		test_seq 1 130 >b &&
+ok 91 - cleanup (builtin protocol)
 
-		git add a b &&
-		git commit -m "initial commit" &&
+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 &&
 
-		a=$(git rev-parse HEAD:a) &&
-		b=$(git rev-parse HEAD:b) &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-		# In the first pack, "a" is stored as a delta to "b".
-		p1=$(git pack-objects .git/objects/pack/pack <<-EOF
-		$a
-		$b
-		EOF
-		) &&
+ok 92 - proc-receive: push with options (builtin protocol)
 
-		# In the second pack, "a" is missing, and "b" is not a delta nor base to
-		# any other object.
-		p2=$(git pack-objects .git/objects/pack/pack <<-EOF
-		$b
-		$(git rev-parse HEAD)
-		$(git rev-parse HEAD^{tree})
-		EOF
-		) &&
+expecting success of 5411.93 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/heads/next
 
-		git prune-packed &&
-		# Use the second pack as the preferred source, so that "b" occurs
-		# earlier in the MIDX object order, rendering "a" unusable for pack
-		# reuse.
-		git multi-pack-index write --bitmap --preferred-pack=pack-$p2.idx &&
+ok 93 - cleanup (builtin protocol)
 
-		have_delta $a $b &&
-		test $(midx_pack_source $a) != $(midx_pack_source $b)
-	
-[second 59dfa27] initial commit
- Author: A U Thor <author@example.com>
- 2 files changed, 258 insertions(+)
- create mode 100644 a
- create mode 100644 b
-ok 267 - setup midx with base from later pack
+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
 
-expecting success of 5326.268 'counting commits via bitmap (full bitmap with backwards delta, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 268 - counting commits via bitmap (full bitmap with backwards delta, second)
+ok 94 - setup proc-receive hook and disable push-options (builtin protocol/porcelain)
 
-expecting success of 5326.269 'counting partial commits via bitmap (full bitmap with backwards delta, 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 269 - counting partial commits via bitmap (full bitmap with backwards delta, second)
+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 &&
 
-expecting success of 5326.270 'counting commits with limit (full bitmap with backwards delta, 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 270 - counting commits with limit (full bitmap with backwards delta, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.271 'counting non-linear history (full bitmap with backwards delta, second)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 271 - counting non-linear history (full bitmap with backwards delta, second)
+fatal: the receiving end does not support push options
+ok 95 - proc-receive: not support push options (builtin protocol/porcelain)
 
-expecting success of 5326.272 'counting commits with limiting (full bitmap with backwards delta, 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 272 - counting commits with limiting (full bitmap with backwards delta, second)
+expecting success of 5411.96 'enable push options (builtin protocol/porcelain)': 
+	git -C "$upstream" config receive.advertisePushOptions true
 
-expecting success of 5326.273 'counting objects via bitmap (full bitmap with backwards delta, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 273 - counting objects via bitmap (full bitmap with backwards delta, second)
+ok 96 - enable push options (builtin protocol/porcelain)
 
-expecting success of 5326.274 'enumerate commits (full bitmap with backwards delta, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 274 - enumerate commits (full bitmap with backwards delta, second)
+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
 
-expecting success of 5326.275 'enumerate --objects (full bitmap with backwards delta, 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 5742, line 141
-ok 275 - enumerate --objects (full bitmap with backwards delta, second)
+ok 97 - setup version=0 for proc-receive hook (builtin protocol/porcelain)
 
-expecting success of 5326.276 'bitmap --objects handles non-commit objects (full bitmap with backwards delta, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 276 - bitmap --objects handles non-commit objects (full bitmap with backwards delta, second)
+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 &&
 
-expecting success of 5326.277 'counting commits via bitmap (full bitmap with backwards delta, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 277 - counting commits via bitmap (full bitmap with backwards delta, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-expecting success of 5326.278 'counting partial commits via bitmap (full bitmap with backwards delta, 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 278 - counting partial commits via bitmap (full bitmap with backwards delta, other)
+ok 98 - proc-receive: ignore push-options for version 0 (builtin protocol/porcelain)
 
-expecting success of 5326.279 'counting commits with limit (full bitmap with backwards delta, 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 279 - counting commits with limit (full bitmap with backwards delta, other)
+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
 
-expecting success of 5326.280 'counting non-linear history (full bitmap with backwards delta, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 280 - counting non-linear history (full bitmap with backwards delta, other)
+ok 99 - restore proc-receive hook (builtin protocol/porcelain)
 
-expecting success of 5326.281 'counting commits with limiting (full bitmap with backwards delta, 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 281 - counting commits with limiting (full bitmap with backwards delta, other)
+expecting success of 5411.100 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/heads/next
 
-expecting success of 5326.282 'counting objects via bitmap (full bitmap with backwards delta, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 282 - counting objects via bitmap (full bitmap with backwards delta, other)
+ok 100 - cleanup (builtin protocol/porcelain)
 
-expecting success of 5326.283 'enumerate commits (full bitmap with backwards delta, other)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 283 - enumerate commits (full bitmap with backwards delta, other)
+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 &&
 
-expecting success of 5326.284 'enumerate --objects (full bitmap with backwards delta, 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 284 - enumerate --objects (full bitmap with backwards delta, other)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
 
-expecting success of 5326.285 'bitmap --objects handles non-commit objects (full bitmap with backwards delta, other)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 285 - bitmap --objects handles non-commit objects (full bitmap with backwards delta, other)
+ok 101 - proc-receive: push with options (builtin protocol/porcelain)
 
-expecting success of 5326.286 'clone with bitmaps enabled': 
-		git clone --no-local --bare . clone-reverse-delta.git &&
-		test_when_finished "rm -fr clone-reverse-delta.git" &&
+expecting success of 5411.102 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/heads/next
 
-		git rev-parse HEAD >expect &&
-		git --git-dir=clone-reverse-delta.git rev-parse HEAD >actual &&
-		test_cmp expect actual
-	
-Cloning into bare repository 'clone-reverse-delta.git'...
-ok 286 - clone with bitmaps enabled
+ok 102 - cleanup (builtin protocol/porcelain)
 
-expecting success of 5326.287 'changing the preferred pack does not corrupt bitmaps': 
-		rm -fr repo &&
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
+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
 
-			test_commit A &&
-			test_commit B &&
+ok 103 - setup proc-receive hook (ok, builtin protocol)
 
-			git rev-list --objects --no-object-names HEAD^ >A.objects &&
-			git rev-list --objects --no-object-names HEAD^.. >B.objects &&
+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 &&
 
-			A=$(git pack-objects $objdir/pack/pack <A.objects) &&
-			B=$(git pack-objects $objdir/pack/pack <B.objects) &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			cat >indexes <<-EOF &&
-			pack-$A.idx
-			pack-$B.idx
-			EOF
+ok 104 - proc-receive: ok (builtin protocol)
 
-			git multi-pack-index write --bitmap --stdin-packs \
-				--preferred-pack=pack-$A.pack <indexes &&
-			git rev-list --test-bitmap A &&
+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
 
-			git multi-pack-index write --bitmap --stdin-packs \
-				--preferred-pack=pack-$B.pack <indexes &&
-			git rev-list --test-bitmap A
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) 4e815f0] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master f2c4359] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Bitmap v1 test (2 entries loaded)
-Found bitmap for '4e815f02723eafa37a84fae71005bfba7924b84d'. 64 bits / 11030517 checksum
-Verifying bitmap entries:  33% (1/3)
Verifying bitmap entries:  66% (2/3)
Verifying bitmap entries: 100% (3/3)
Verifying bitmap entries: 100% (3/3), done.
-OK!
-Bitmap v1 test (2 entries loaded)
-Found bitmap for '4e815f02723eafa37a84fae71005bfba7924b84d'. 64 bits / f31c9bc6 checksum
-Verifying bitmap entries:  33% (1/3)
Verifying bitmap entries:  66% (2/3)
Verifying bitmap entries: 100% (3/3)
Verifying bitmap entries: 100% (3/3), done.
-OK!
-ok 287 - changing the preferred pack does not corrupt bitmaps
+ok 105 - setup proc-receive hook (ok, builtin protocol/porcelain)
 
-expecting success of 5326.288 'setup pack reuse tests (pack -> MIDX)': 
-		rm -fr repo &&
-		git init repo &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk 16 &&
-			git tag old-tip &&
+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 &&
 
-			git config core.multiPackIndex true &&
-			if test "MIDX" = "$from"
-			then
-				git repack -Ad &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       3589 /       3589
----------------------------------------------------------------------
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-ok 288 - setup pack reuse tests (pack -> MIDX)
+ok 106 - proc-receive: ok (builtin protocol/porcelain)
 
-expecting success of 5326.289 'build bitmap from existing (pack -> MIDX)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk --id=further 16 &&
-			git tag new-tip &&
+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
 
-			if test "MIDX" = "$to"
-			then
-				git repack -d &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-91737470c84f833fd6e011c3f3d39674d6352beb
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         36
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       7771 /       7771
----------------------------------------------------------------------
+ok 107 - setup proc-receive hook (option without matching ok, builtin protocol)
 
-Nothing new to pack.
-ok 289 - build bitmap from existing (pack -> MIDX)
+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 5326.290 'verify resulting bitmaps (pack -> MIDX)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			git for-each-ref &&
-			git rev-list --test-bitmap refs/tags/old-tip &&
-			git rev-list --test-bitmap refs/tags/new-tip
-		)
-	
-d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/heads/master
-d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/tags/new-tip
-91737470c84f833fd6e011c3f3d39674d6352beb commit	refs/tags/old-tip
-Bitmap v1 test (32 entries loaded)
-Found bitmap for '91737470c84f833fd6e011c3f3d39674d6352beb'. 64 bits / 26205a9e checksum
-Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
-OK!
-Bitmap v1 test (32 entries loaded)
-Found bitmap for 'd0446f42140c9a0eba50442626df052f850c97f6'. 128 bits / f4d5cc9b checksum
-Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
-OK!
-ok 290 - verify resulting bitmaps (pack -> MIDX)
+ok 108 - proc-receive: report option without matching ok (builtin protocol)
 
-expecting success of 5326.291 'setup pack reuse tests (MIDX -> pack)': 
-		rm -fr repo &&
-		git init repo &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk 16 &&
-			git tag old-tip &&
+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
 
-			git config core.multiPackIndex true &&
-			if test "MIDX" = "$from"
-			then
-				git repack -Ad &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       3589 /       3589
----------------------------------------------------------------------
+ok 109 - setup proc-receive hook (option refname, builtin protocol)
 
-ok 291 - setup pack reuse tests (MIDX -> pack)
+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 5326.292 'build bitmap from existing (MIDX -> pack)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk --id=further 16 &&
-			git tag new-tip &&
+ok 110 - proc-receive: report option refname (builtin protocol)
 
-			if test "MIDX" = "$to"
-			then
-				git repack -d &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-91737470c84f833fd6e011c3f3d39674d6352beb
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         36
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       7771 /       7771
----------------------------------------------------------------------
+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 292 - build bitmap from existing (MIDX -> pack)
+ok 111 - setup proc-receive hook (option refname and forced-update, builtin protocol)
 
-expecting success of 5326.293 'verify resulting bitmaps (MIDX -> pack)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			git for-each-ref &&
-			git rev-list --test-bitmap refs/tags/old-tip &&
-			git rev-list --test-bitmap refs/tags/new-tip
-		)
-	
-d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/heads/master
-d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/tags/new-tip
-91737470c84f833fd6e011c3f3d39674d6352beb commit	refs/tags/old-tip
-Bitmap v1 test (32 entries loaded)
-Found bitmap for '91737470c84f833fd6e011c3f3d39674d6352beb'. 128 bits / 1beec19b checksum
-Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
-OK!
-Bitmap v1 test (32 entries loaded)
-Found bitmap for 'd0446f42140c9a0eba50442626df052f850c97f6'. 128 bits / f4d5cc9b checksum
-Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
-OK!
-ok 293 - verify resulting bitmaps (MIDX -> pack)
+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 5326.294 'setup pack reuse tests (MIDX -> MIDX)': 
-		rm -fr repo &&
-		git init repo &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk 16 &&
-			git tag old-tip &&
+ok 112 - proc-receive: report option refname and forced-update (builtin protocol)
 
-			git config core.multiPackIndex true &&
-			if test "MIDX" = "$from"
-			then
-				git repack -Ad &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             16
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       3589 /       3589
----------------------------------------------------------------------
+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 294 - setup pack reuse tests (MIDX -> MIDX)
+ok 113 - setup proc-receive hook (option refname and old-oid, builtin protocol)
 
-expecting success of 5326.295 'build bitmap from existing (MIDX -> MIDX)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			test_commit_bulk --id=further 16 &&
-			git tag new-tip &&
+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
 
-			if test "MIDX" = "$to"
-			then
-				git repack -d &&
-				git multi-pack-index write --bitmap
-			else
-				git repack -Adb
-			fi
-		)
-	
-91737470c84f833fd6e011c3f3d39674d6352beb
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           48 (         0 duplicates                  )
-      blobs  :           16 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :           16 (         0 duplicates         15 deltas of         15 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:             32
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         36
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =       7771 /       7771
----------------------------------------------------------------------
+ok 114 - proc-receive: report option refname and old-oid (builtin protocol)
 
-Nothing new to pack.
-ok 295 - build bitmap from existing (MIDX -> MIDX)
+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 5326.296 'verify resulting bitmaps (MIDX -> MIDX)': 
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
-			git for-each-ref &&
-			git rev-list --test-bitmap refs/tags/old-tip &&
-			git rev-list --test-bitmap refs/tags/new-tip
-		)
-	
-d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/heads/master
-d0446f42140c9a0eba50442626df052f850c97f6 commit	refs/tags/new-tip
-91737470c84f833fd6e011c3f3d39674d6352beb commit	refs/tags/old-tip
-Bitmap v1 test (32 entries loaded)
-Found bitmap for '91737470c84f833fd6e011c3f3d39674d6352beb'. 64 bits / 26205a9e checksum
-Verifying bitmap entries:   2% (1/48)
Verifying bitmap entries:   4% (2/48)
Verifying bitmap entries:   6% (3/48)
Verifying bitmap entries:   8% (4/48)
Verifying bitmap entries:  10% (5/48)
Verifying bitmap entries:  12% (6/48)
Verifying bitmap entries:  14% (7/48)
Verifying bitmap entries:  16% (8/48)
Verifying bitmap entries:  18% (9/48)
Verifying bitmap entries:  20% (10/48)
Verifying bitmap entries:  22% (11/48)
Verifying bitmap entries:  25% (12/48)
Verifying bitmap entries:  27% (13/48)
Verifying bitmap entries:  29% (14/48)
Verifying bitmap entries:  31% (15/48)
Verifying bitmap entries:  33% (16/48)
Verifying bitmap entries:  35% (17/48)
Verifying bitmap entries:  37% (18/48)
Verifying bitmap entries:  39% (19/48)
Verifying bitmap entries:  41% (20/48)
Verifying bitmap entries:  43% (21/48)
Verifying bitmap entries:  45% (22/48)
Verifying bitmap entries:  47% (23/48)
Verifying bitmap entries:  50% (24/48)
Verifying bitmap entries:  52% (25/48)
Verifying bitmap entries:  54% (26/48)
Verifying bitmap entries:  56% (27/48)
Verifying bitmap entries:  58% (28/48)
Verifying bitmap entries:  60% (29/48)
Verifying bitmap entries:  62% (30/48)
Verifying bitmap entries:  64% (31/48)
Verifying bitmap entries:  66% (32/48)
Verifying bitmap entries:  68% (33/48)
Verifying bitmap entries:  70% (34/48)
Verifying bitmap entries:  72% (35/48)
Verifying bitmap entries:  75% (36/48)
Verifying bitmap entries:  77% (37/48)
Verifying bitmap entries:  79% (38/48)
Verifying bitmap entries:  81% (39/48)
Verifying bitmap entries:  83% (40/48)
Verifying bitmap entries:  85% (41/48)
Verifying bitmap entries:  87% (42/48)
Verifying bitmap entries:  89% (43/48)
Verifying bitmap entries:  91% (44/48)
Verifying bitmap entries:  93% (45/48)
Verifying bitmap entries:  95% (46/48)
Verifying bitmap entries:  97% (47/48)
Verifying bitmap entries: 100% (48/48)
Verifying bitmap entries: 100% (48/48), done.
-OK!
-Bitmap v1 test (32 entries loaded)
-Found bitmap for 'd0446f42140c9a0eba50442626df052f850c97f6'. 128 bits / f4d5cc9b checksum
-Verifying bitmap entries:   1% (1/96)
Verifying bitmap entries:   2% (2/96)
Verifying bitmap entries:   3% (3/96)
Verifying bitmap entries:   4% (4/96)
Verifying bitmap entries:   5% (5/96)
Verifying bitmap entries:   6% (6/96)
Verifying bitmap entries:   7% (7/96)
Verifying bitmap entries:   8% (8/96)
Verifying bitmap entries:   9% (9/96)
Verifying bitmap entries:  10% (10/96)
Verifying bitmap entries:  11% (11/96)
Verifying bitmap entries:  12% (12/96)
Verifying bitmap entries:  13% (13/96)
Verifying bitmap entries:  14% (14/96)
Verifying bitmap entries:  15% (15/96)
Verifying bitmap entries:  16% (16/96)
Verifying bitmap entries:  17% (17/96)
Verifying bitmap entries:  18% (18/96)
Verifying bitmap entries:  19% (19/96)
Verifying bitmap entries:  20% (20/96)
Verifying bitmap entries:  21% (21/96)
Verifying bitmap entries:  22% (22/96)
Verifying bitmap entries:  23% (23/96)
Verifying bitmap entries:  25% (24/96)
Verifying bitmap entries:  26% (25/96)
Verifying bitmap entries:  27% (26/96)
Verifying bitmap entries:  28% (27/96)
Verifying bitmap entries:  29% (28/96)
Verifying bitmap entries:  30% (29/96)
Verifying bitmap entries:  31% (30/96)
Verifying bitmap entries:  32% (31/96)
Verifying bitmap entries:  33% (32/96)
Verifying bitmap entries:  34% (33/96)
Verifying bitmap entries:  35% (34/96)
Verifying bitmap entries:  36% (35/96)
Verifying bitmap entries:  37% (36/96)
Verifying bitmap entries:  38% (37/96)
Verifying bitmap entries:  39% (38/96)
Verifying bitmap entries:  40% (39/96)
Verifying bitmap entries:  41% (40/96)
Verifying bitmap entries:  42% (41/96)
Verifying bitmap entries:  43% (42/96)
Verifying bitmap entries:  44% (43/96)
Verifying bitmap entries:  45% (44/96)
Verifying bitmap entries:  46% (45/96)
Verifying bitmap entries:  47% (46/96)
Verifying bitmap entries:  48% (47/96)
Verifying bitmap entries:  50% (48/96)
Verifying bitmap entries:  51% (49/96)
Verifying bitmap entries:  52% (50/96)
Verifying bitmap entries:  53% (51/96)
Verifying bitmap entries:  54% (52/96)
Verifying bitmap entries:  55% (53/96)
Verifying bitmap entries:  56% (54/96)
Verifying bitmap entries:  57% (55/96)
Verifying bitmap entries:  58% (56/96)
Verifying bitmap entries:  59% (57/96)
Verifying bitmap entries:  60% (58/96)
Verifying bitmap entries:  61% (59/96)
Verifying bitmap entries:  62% (60/96)
Verifying bitmap entries:  63% (61/96)
Verifying bitmap entries:  64% (62/96)
Verifying bitmap entries:  65% (63/96)
Verifying bitmap entries:  66% (64/96)
Verifying bitmap entries:  67% (65/96)
Verifying bitmap entries:  68% (66/96)
Verifying bitmap entries:  69% (67/96)
Verifying bitmap entries:  70% (68/96)
Verifying bitmap entries:  71% (69/96)
Verifying bitmap entries:  72% (70/96)
Verifying bitmap entries:  73% (71/96)
Verifying bitmap entries:  75% (72/96)
Verifying bitmap entries:  76% (73/96)
Verifying bitmap entries:  77% (74/96)
Verifying bitmap entries:  78% (75/96)
Verifying bitmap entries:  79% (76/96)
Verifying bitmap entries:  80% (77/96)
Verifying bitmap entries:  81% (78/96)
Verifying bitmap entries:  82% (79/96)
Verifying bitmap entries:  83% (80/96)
Verifying bitmap entries:  84% (81/96)
Verifying bitmap entries:  85% (82/96)
Verifying bitmap entries:  86% (83/96)
Verifying bitmap entries:  87% (84/96)
Verifying bitmap entries:  88% (85/96)
Verifying bitmap entries:  89% (86/96)
Verifying bitmap entries:  90% (87/96)
Verifying bitmap entries:  91% (88/96)
Verifying bitmap entries:  92% (89/96)
Verifying bitmap entries:  93% (90/96)
Verifying bitmap entries:  94% (91/96)
Verifying bitmap entries:  95% (92/96)
Verifying bitmap entries:  96% (93/96)
Verifying bitmap entries:  97% (94/96)
Verifying bitmap entries:  98% (95/96)
Verifying bitmap entries: 100% (96/96)
Verifying bitmap entries: 100% (96/96), done.
-OK!
-ok 296 - verify resulting bitmaps (MIDX -> MIDX)
+ok 115 - setup proc-receive hook (option old-oid, builtin protocol)
 
-expecting success of 5326.297 'missing object closure fails gracefully': 
-		rm -fr repo &&
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+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
 
-			test_commit loose &&
-			test_commit packed &&
+ok 116 - proc-receive: report option old-oid (builtin protocol)
 
-			# Do not pass "--revs"; we want a pack without the "loose"
-			# commit.
-			git pack-objects $objdir/pack/pack <<-EOF &&
-			$(git rev-parse packed)
-			EOF
+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
 
-			test_must_fail git multi-pack-index write --bitmap 2>err &&
-			grep "doesn.t have full closure" err &&
-			test_path_is_missing $midx
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5326-multi-pack-bitmaps/repo/.git/
-[master (root-commit) cca5daf] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-[master 50fe1f1] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-390347bc6f8f8d558b0e5de4029f69205094a364
-warning: Failed to write bitmap index. Packfile doesn't have full closure (object cca5dafc59fe86471e00a628c40aa7d8a947eb54 is missing)
-ok 297 - missing object closure fails gracefully
+ok 117 - setup proc-receive hook (option old-oid and new-oid, builtin protocol)
 
-expecting success of 5326.298 'setup partial bitmaps': 
-		test_commit packed &&
-		git repack &&
-		test_commit loose &&
-		git multi-pack-index write --bitmap &&
-		test_path_is_file $midx &&
-		test_path_is_file $midx-$(midx_checksum $objdir).bitmap
-	
-[second 8f696af] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[second 37cdfb1] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-ok 298 - setup partial bitmaps
+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
 
-expecting success of 5326.299 'reverse index exists (midx)': 
-		GIT_TRACE2_EVENT=$(pwd)/event.trace \
-			git rev-list --test-bitmap "$commit" &&
+ok 118 - proc-receive: report option old-oid and new-oid (builtin protocol)
 
-		if test "rev" = "$kind"
-		then
-			test_path_is_file $midx-$(midx_checksum $objdir).rev
-		fi &&
-		grep "\"category\":\"load_midx_revindex\",\"key\":\"source\",\"value\":\"$kind\"" event.trace
-	
-Bitmap v1 test (107 entries)
-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":"20251218T013626.536870Z-Hfbad846e-P00004c41","thread":"main","time":"2025-12-18T01:36:26.538256Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001573,"t_rel":0.001573,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20251218T013629.421077Z-Hfbad846e-P00005a5e","thread":"main","time":"2025-12-18T01:36:29.422394Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001491,"t_rel":0.001491,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-{"event":"data","sid":"20251218T013633.257629Z-Hfbad846e-P000075fe","thread":"main","time":"2025-12-18T01:36:33.259033Z","file":"pack-revindex.c","line":375,"repo":1,"t_abs":0.001576,"t_rel":0.001576,"nesting":1,"category":"load_midx_revindex","key":"source","value":"midx"}
-ok 299 - reverse index exists (midx)
+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
 
-expecting success of 5326.300 'rev-list --test-bitmap verifies bitmaps': 
-		git rev-list --test-bitmap HEAD~
-	
-Bitmap v1 test (107 entries)
-Found bitmap for '8f696aff37c64e3202f920ceebf2456f81392ece'. 768 bits / 13802fc1 checksum
-Verifying bitmap entries:   0% (1/443)
Verifying bitmap entries:   1% (5/443)
Verifying bitmap entries:   2% (9/443)
Verifying bitmap entries:   3% (14/443)
Verifying bitmap entries:   4% (18/443)
Verifying bitmap entries:   5% (23/443)
Verifying bitmap entries:   6% (27/443)
Verifying bitmap entries:   7% (32/443)
Verifying bitmap entries:   8% (36/443)
Verifying bitmap entries:   9% (40/443)
Verifying bitmap entries:  10% (45/443)
Verifying bitmap entries:  11% (49/443)
Verifying bitmap entries:  12% (54/443)
Verifying bitmap entries:  13% (58/443)
Verifying bitmap entries:  14% (63/443)
Verifying bitmap entries:  15% (67/443)
Verifying bitmap entries:  16% (71/443)
Verifying bitmap entries:  17% (76/443)
Verifying bitmap entries:  18% (80/443)
Verifying bitmap entries:  19% (85/443)
Verifying bitmap entries:  20% (89/443)
Verifying bitmap entries:  21% (94/443)
Verifying bitmap entries:  22% (98/443)
Verifying bitmap entries:  23% (102/443)
Verifying bitmap entries:  24% (107/443)
Verifying bitmap entries:  25% (111/443)
Verifying bitmap entries:  26% (116/443)
Verifying bitmap entries:  27% (120/443)
Verifying bitmap entries:  28% (125/443)
Verifying bitmap entries:  29% (129/443)
Verifying bitmap entries:  30% (133/443)
Verifying bitmap entries:  31% (138/443)
Verifying bitmap entries:  32% (142/443)
Verifying bitmap entries:  33% (147/443)
Verifying bitmap entries:  34% (151/443)
Verifying bitmap entries:  35% (156/443)
Verifying bitmap entries:  36% (160/443)
Verifying bitmap entries:  37% (164/443)
Verifying bitmap entries:  38% (169/443)
Verifying bitmap entries:  39% (173/443)
Verifying bitmap entries:  40% (178/443)
Verifying bitmap entries:  41% (182/443)
Verifying bitmap entries:  42% (187/443)
Verifying bitmap entries:  43% (191/443)
Verifying bitmap entries:  44% (195/443)
Verifying bitmap entries:  45% (200/443)
Verifying bitmap entries:  46% (204/443)
Verifying bitmap entries:  47% (209/443)
Verifying bitmap entries:  48% (213/443)
Verifying bitmap entries:  49% (218/443)
Verifying bitmap entries:  50% (222/443)
Verifying bitmap entries:  51% (226/443)
Verifying bitmap entries:  52% (231/443)
Verifying bitmap entries:  53% (235/443)
Verifying bitmap entries:  54% (240/443)
Verifying bitmap entries:  55% (244/443)
Verifying bitmap entries:  56% (249/443)
Verifying bitmap entries:  57% (253/443)
Verifying bitmap entries:  58% (257/443)
Verifying bitmap entries:  59% (262/443)
Verifying bitmap entries:  60% (266/443)
Verifying bitmap entries:  61% (271/443)
Verifying bitmap entries:  62% (275/443)
Verifying bitmap entries:  63% (280/443)
Verifying bitmap entries:  64% (284/443)
Verifying bitmap entries:  65% (288/443)
Verifying bitmap entries:  66% (293/443)
Verifying bitmap entries:  67% (297/443)
Verifying bitmap entries:  68% (302/443)
Verifying bitmap entries:  69% (306/443)
Verifying bitmap entries:  70% (311/443)
Verifying bitmap entries:  71% (315/443)
Verifying bitmap entries:  72% (319/443)
Verifying bitmap entries:  73% (324/443)
Verifying bitmap entries:  74% (328/443)
Verifying bitmap entries:  75% (333/443)
Verifying bitmap entries:  76% (337/443)
Verifying bitmap entries:  77% (342/443)
Verifying bitmap entries:  78% (346/443)
Verifying bitmap entries:  79% (350/443)
Verifying bitmap entries:  80% (355/443)
Verifying bitmap entries:  81% (359/443)
Verifying bitmap entries:  82% (364/443)
Verifying bitmap entries:  83% (368/443)
Verifying bitmap entries:  84% (373/443)
Verifying bitmap entries:  85% (377/443)
Verifying bitmap entries:  86% (381/443)
Verifying bitmap entries:  87% (386/443)
Verifying bitmap entries:  88% (390/443)
Verifying bitmap entries:  89% (395/443)
Verifying bitmap entries:  90% (399/443)
Verifying bitmap entries:  91% (404/443)
Verifying bitmap entries:  92% (408/443)
Verifying bitmap entries:  93% (412/443)
Verifying bitmap entries:  94% (417/443)
Verifying bitmap entries:  95% (421/443)
Verifying bitmap entries:  96% (426/443)
Verifying bitmap entries:  97% (430/443)
Verifying bitmap entries:  98% (435/443)
Verifying bitmap entries:  99% (439/443)
Verifying bitmap entries: 100% (443/443)
Verifying bitmap entries: 100% (443/443), done.
-OK!
-ok 300 - rev-list --test-bitmap verifies bitmaps
+ok 119 - setup proc-receive hook (report with multiple rewrites, builtin protocol)
 
-expecting success of 5326.301 'counting commits via bitmap (full bitmap, second)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 301 - counting commits via bitmap (full bitmap, second)
+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 &&
 
-expecting success of 5326.302 'counting partial commits via bitmap (full 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 302 - counting partial commits via bitmap (full bitmap, second)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-expecting success of 5326.303 'counting commits with limit (full 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 303 - counting commits with limit (full bitmap, second)
+ok 120 - proc-receive: report with multiple rewrites (builtin protocol)
 
-expecting success of 5326.304 'counting non-linear history (full bitmap, second)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 304 - counting non-linear history (full bitmap, second)
+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
 
-expecting success of 5326.305 'counting commits with limiting (full 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 305 - counting commits with limiting (full bitmap, second)
+ok 121 - setup proc-receive hook (option without matching ok, builtin protocol/porcelain)
 
-expecting success of 5326.306 'counting objects via bitmap (full bitmap, second)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 306 - counting objects via bitmap (full bitmap, second)
+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
 
-expecting success of 5326.307 'enumerate commits (full bitmap, second)': 
-		git rev-list --use-bitmap-index $branch >actual &&
-		git rev-list $branch >expect &&
-		test_bitmap_traversal --no-confirm-bitmaps expect actual
-	
-ok 307 - enumerate commits (full bitmap, second)
+ok 122 - proc-receive: report option without matching ok (builtin protocol/porcelain)
 
-expecting success of 5326.308 'enumerate --objects (full 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 308 - enumerate --objects (full bitmap, second)
+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
 
-expecting success of 5326.309 'bitmap --objects handles non-commit objects (full bitmap, second)': 
-		git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
-		grep $blob actual
-	
-782f60206c837dcd3d441e106549ad6f58de55b5
-ok 309 - bitmap --objects handles non-commit objects (full bitmap, second)
+ok 123 - setup proc-receive hook (option refname, builtin protocol/porcelain)
 
-expecting success of 5326.310 'counting commits via bitmap (full bitmap, other)': 
-		git rev-list --count $branch >expect &&
-		git rev-list --use-bitmap-index --count $branch >actual &&
-		test_cmp expect actual
-	
-ok 310 - counting commits via bitmap (full bitmap, other)
+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
 
-expecting success of 5326.311 'counting partial commits via bitmap (full 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 311 - counting partial commits via bitmap (full bitmap, other)
+ok 124 - proc-receive: report option refname (builtin protocol/porcelain)
 
-expecting success of 5326.312 'counting commits with limit (full 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 312 - counting commits with limit (full bitmap, other)
+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
 
-expecting success of 5326.313 'counting non-linear history (full bitmap, other)': 
-		git rev-list --count other...second >expect &&
-		git rev-list --use-bitmap-index --count other...second >actual &&
-		test_cmp expect actual
-	
-ok 313 - counting non-linear history (full bitmap, other)
+ok 125 - setup proc-receive hook (option refname and forced-update, builtin protocol/porcelain)
 
-expecting success of 5326.314 'counting commits with limiting (full 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 314 - counting commits with limiting (full bitmap, other)
+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
 
-expecting success of 5326.315 'counting objects via bitmap (full bitmap, other)': 
-		git rev-list --count --objects $branch >expect &&
-		git rev-list --use-bitmap-index --count --objects $branch >actual &&
-		test_cmp expect actual
-	
-ok 315 - counting objects via bitmap (full bitmap, other)
+ok 126 - proc-receive: report option refname and forced-update (builtin protocol/porcelain)
 
-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 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 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 127 - setup proc-receive hook (option refname and old-oid, builtin protocol/porcelain)
 
-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.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
 
-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 128 - proc-receive: report option refname and old-oid (builtin protocol/porcelain)
 
-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.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
 
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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 129 - setup proc-receive hook (option old-oid, builtin protocol/porcelain)
 
-ok 321 - setup further non-bitmapped commits
+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
 
-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)
+ok 130 - proc-receive: report option old-oid (builtin protocol/porcelain)
 
-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 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
 
-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)
+ok 131 - setup proc-receive hook (option old-oid and new-oid, builtin protocol/porcelain)
 
-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 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
 
-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 132 - proc-receive: report option old-oid and new-oid (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.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"
 
-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)
+	EOF
 
-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)
+ok 133 - setup proc-receive hook (report with multiple rewrites, builtin protocol/porcelain)
 
-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 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 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)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-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)
+ok 134 - proc-receive: report with multiple rewrites (builtin protocol/porcelain)
 
-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 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
 
-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)
+ok 135 - setup proc-receive hook (ft, builtin protocol)
 
-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 5411.136 'proc-receive: fall throught, 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 &&
 
-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)
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/for/main/topic
+	<COMMIT-A> refs/heads/main
+	EOF
 
-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)
+ok 136 - proc-receive: fall throught, let receive-pack to execute (builtin protocol)
 
-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 5411.137 'cleanup (builtin protocol)': 
+	git -C "$upstream" update-ref -d refs/for/main/topic
 
-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)
+ok 137 - cleanup (builtin protocol)
 
-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.45.2/t/trash directory.t5326-multi-pack-bitmaps/.
-   37cdfb1..8935311  second     -> second
-ok 340 - fetch (partial bitmap)
+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 5326.341 'enumerating progress counts pack-reused objects': 
-		count=$(git rev-list --objects --all --count) &&
-		git repack -adb &&
+ok 138 - setup proc-receive hook (fall-through, builtin protocol/porcelain)
 
-		# 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 &&
+expecting success of 5411.139 'proc-receive: fall throught, 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 &&
 
-		# 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
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/for/main/topic
+	<COMMIT-A> refs/heads/main
+	EOF
 
-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 &&
+ok 139 - proc-receive: fall throught, let receive-pack to execute (builtin protocol/porcelain)
 
-			# Write a MIDX and bitmap; remove the MIDX but leave the bitmap.
-			stale_bitmap=$midx-$(midx_checksum $objdir).bitmap &&
-			rm $midx &&
+expecting success of 5411.140 'cleanup (builtin protocol/porcelain)': 
+	git -C "$upstream" update-ref -d refs/for/main/topic
 
-			# Then write a new MIDX.
-			test_commit new &&
-			git repack &&
-			git multi-pack-index write --bitmap &&
+ok 140 - cleanup (builtin protocol/porcelain)
 
-			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.45.2/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 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
+	)
 
-expecting success of 5326.343 'pack.preferBitmapTips': 
-		git init repo &&
-		test_when_finished "rm -fr repo" &&
-		(
-			cd repo &&
-			git config pack.writeBitmapLookupTable false &&
+ok 141 - setup git config for remote-tracking of special refs
 
-			test_commit_bulk --message="%s" 103 &&
+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
 
-			git log --format="%H" >commits.raw &&
-			sort <commits.raw >commits &&
+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 &&
 
-			git log --format="create refs/tags/%s %H" HEAD >refs &&
-			git update-ref --stdin <refs &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			git multi-pack-index write --bitmap &&
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ok 143 - proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol)
 
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >before &&
-			test_line_count = 1 before &&
+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
 
-			perl -ne "printf(\"create refs/tags/include/%d \", $.); print" \
-				<before | git update-ref --stdin &&
+ok 144 - proc-receive: check remote-tracking #1 (builtin protocol)
 
-			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-			rm -fr $midx &&
+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
 
-			git -c pack.preferBitmapTips=refs/tags/include \
-				multi-pack-index write --bitmap &&
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >after &&
+ok 145 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol)
 
-			! test_cmp before after
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
----------------------------------------------------------------------
+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 &&
 
---- before	2025-12-18 01:36:35.010773267 +0000
-+++ after	2025-12-18 01:36:35.058773267 +0000
-@@ -1 +1 @@
--a09427aadc45553b705d3a726a24ceeaa43874f0
-+e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
-ok 343 - pack.preferBitmapTips
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-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 &&
+ok 146 - proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol)
 
-			test_commit one &&
-			test_commit two &&
+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
 
-			git rev-parse one >snapshot &&
+ok 147 - proc-receive: check remote-tracking #2 (builtin protocol)
 
-			git repack -ad &&
+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
 
-			# 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 &&
+ok 148 - setup proc-receive hook (multiple rewrites for one ref, builtin protocol)
 
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+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-tool bitmap list-commits | sort >bitmaps &&
-			grep "$(git rev-parse one)" bitmaps &&
-			grep "$(git rev-parse two)" bitmaps &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-			rm -fr $midx &&
+ok 149 - proc-receive: multiple rewrites for one ref (builtin protocol)
 
-			# Then again, but with a refs snapshot which only sees
-			# refs/tags/one.
-			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
+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
 
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+ok 150 - proc-receive: check remote-tracking #3 (builtin protocol)
 
-			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.45.2/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 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 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 &&
+ok 151 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, builtin protocol/porcelain)
 
-			test_commit_bulk --message="%s" 103 &&
+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 &&
 
-			git log --format="%H" >commits.raw &&
-			sort <commits.raw >commits &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			git log --format="create refs/tags/%s %H" HEAD >refs &&
-			git update-ref --stdin <refs &&
+ok 152 - proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite (builtin protocol/porcelain)
 
-			git multi-pack-index write --bitmap &&
-			test_path_is_file $midx &&
-			test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
+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
 
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >before &&
-			test_line_count = 1 before &&
+ok 153 - setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, builtin protocol/porcelain)
 
-			(
-				grep -vf before commits.raw &&
-				# mark missing commits as preferred
-				sed "s/^/+/" before
-			) >snapshot &&
+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 &&
 
-			rm -fr $midx-$(midx_checksum $objdir).bitmap &&
-			rm -fr $midx &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			git multi-pack-index write --bitmap --refs-snapshot=snapshot &&
-			test-tool bitmap list-commits | sort >bitmaps &&
-			comm -13 bitmaps commits >after &&
+ok 154 - proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite (builtin protocol/porcelain)
 
-			! test_cmp before after
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
----------------------------------------------------------------------
+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
 
---- before	2025-12-18 01:36:35.398773267 +0000
-+++ after	2025-12-18 01:36:35.426773267 +0000
-@@ -1 +1 @@
--a09427aadc45553b705d3a726a24ceeaa43874f0
-+e8ecff2ac3e6e0a87c9bd5c4436dad90e555810b
-ok 345 - write a bitmap with --refs-snapshot (preferred tips)
+ok 155 - setup proc-receive hook (multiple rewrites for one ref, builtin protocol/porcelain)
 
-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 &&
+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_commit base &&
-			test_commit base2 &&
-			git repack -adb &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-			test-tool bitmap dump-hashes >pack.raw &&
-			test_file_not_empty pack.raw &&
-			sort pack.raw >pack.hashes &&
+ok 156 - proc-receive: multiple rewrites for one ref (builtin protocol/porcelain)
 
-			test_commit new &&
-			git repack &&
-			git multi-pack-index write --bitmap &&
+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
 
-			test-tool bitmap dump-hashes >midx.raw &&
-			sort midx.raw >midx.hashes &&
+ok 157 - setup proc-receive hook (builtin protocol)
 
-			# 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.45.2/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 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 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 &&
+	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
 
-			empty="$(git pack-objects $objdir/pack/pack </dev/null)" &&
-			cat >packs <<-EOF &&
-			pack-$empty.idx
-			EOF
+ok 158 - proc-receive: report update of mixed refs (builtin protocol)
 
-			git multi-pack-index write --bitmap --stdin-packs \
-				<packs 2>err &&
+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
+	)
 
-			grep "bitmap without any objects" err &&
+ok 159 - cleanup (builtin protocol)
 
-			test_path_is_file $midx &&
-			test_path_is_missing $midx-$(midx_checksum $objdir).bitmap
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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.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 &&
+ok 160 - setup proc-receive hook (builtin protocol/porcelain)
 
-			test_commit base &&
+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 &&
 
-			# write a pack and MIDX bitmap containing base
-			git repack -adb &&
-			git multi-pack-index write --bitmap &&
+	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
 
-			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.45.2/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
+ok 161 - proc-receive: report update of mixed refs (builtin protocol/porcelain)
 
-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" &&
+expecting success of 5411.162 'cleanup (builtin protocol/porcelain)': 
 	(
-		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
+		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.45.2/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":"20251218T013635.772702Z-Hfbad846e-P00000620","thread":"main","time":"2025-12-18T01:36:35.775462Z","file":"pack-bitmap-write.c","line":733,"repo":1,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-{"event":"region_leave","sid":"20251218T013635.772702Z-Hfbad846e-P00000620","thread":"main","time":"2025-12-18T01:36:35.775467Z","file":"pack-bitmap-write.c","line":760,"repo":1,"t_rel":0.000006,"nesting":3,"category":"pack-bitmap-write","label":"writing_lookup_table"}
-ok 349 - multi-pack-index write writes lookup table if enabled
-
-expecting success of 5326.350 'preferred pack change with existing MIDX bitmap': 
-	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 &&
+ok 162 - cleanup (builtin protocol/porcelain)
 
-		p1="$(git pack-objects "$objdir/pack/pack" \
-			--delta-base-offset <p1.objects)" &&
-		p2="$(git pack-objects "$objdir/pack/pack" \
-			--delta-base-offset <p2.objects)" &&
+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
 
-		# 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 &&
+ok 163 - config receive.procReceiveRefs = refs (builtin protocol)
 
-		# 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 &&
+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
+	)
 
-		# 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
-	)
+ok 164 - setup upstream branches (builtin protocol)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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.351 'tagged commits are selected for bitmapping': 
-	rm -fr repo &&
-	git init repo &&
-	test_when_finished "rm -fr repo" &&
-	(
-		cd repo &&
+ok 165 - setup proc-receive hook (builtin protocol)
 
-		test_commit --annotate base &&
-		git repack -d &&
+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 &&
 
-		# 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 &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/main
+	EOF
 
-		git multi-pack-index write --bitmap &&
+ok 166 - proc-receive: process all refs (builtin protocol)
 
-		git rev-parse HEAD >want &&
-		test-tool bitmap list-commits >actual &&
-		grep $(cat want) actual
+expecting success of 5411.167 'cleanup (builtin protocol)': 
+	(
+		cd "$upstream" &&
+		git update-ref -d refs/heads/bar &&
+		git update-ref -d refs/heads/baz
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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'.
+ok 167 - cleanup (builtin protocol)
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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
 
-If you want to 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 168 - config receive.procReceiveRefs = refs (builtin protocol/porcelain)
 
-  git switch -c <new-branch-name>
+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
+	)
 
-Or undo this operation with:
 
-  git switch -
+ok 169 - setup upstream branches (builtin protocol/porcelain)
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 099797b base
-Deleted branch main (was 099797b).
-099797b4d0eb8d4e4edb917fe24ec0b4659190f9
-ok 351 - tagged commits are selected for bitmapping
+ok 170 - setup proc-receive hook (builtin protocol/porcelain)
 
-expecting success of 5326.352 'git fsck correctly identifies good and bad bitmaps': 
-	git init valid &&
-	test_when_finished rm -rf valid &&
+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_commit_bulk 20 &&
-	git repack -adbf &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/main
+	EOF
 
-	# Move pack-bitmap aside so it is not deleted
-	# in next repack.
-	packbitmap=$(ls .git/objects/pack/pack-*.bitmap) &&
-	mv "$packbitmap" "$packbitmap.bak" &&
+ok 171 - proc-receive: process all refs (builtin protocol/porcelain)
 
-	test_commit_bulk 10 &&
-	git repack -b --write-midx &&
-	midxbitmap=$(ls .git/objects/pack/multi-pack-index-*.bitmap) &&
+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
+	)
 
-	# Copy MIDX bitmap to backup. Copy pack bitmap from backup.
-	cp "$midxbitmap" "$midxbitmap.bak" &&
-	cp "$packbitmap.bak" "$packbitmap" &&
+ok 172 - cleanup (builtin protocol/porcelain)
 
-	# fsck works at first
-	git fsck 2>err &&
-	test_must_be_empty err &&
+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"
+	)
 
-	corrupt_file "$packbitmap" &&
-	test_must_fail git fsck 2>err &&
-	grep "bitmap file '$packbitmap' has invalid checksum" err &&
+ok 173 - config receive.procReceiveRefs with modifiers (builtin protocol)
 
-	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 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
 
-	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
+ok 174 - setup proc-receive hook (builtin protocol)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         23
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      74392 /      74392
----------------------------------------------------------------------
+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 &&
 
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         16
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =      85067 /      85067
----------------------------------------------------------------------
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
 
-Nothing new to pack.
-dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
-dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-5+0 records in
-5+0 records out
-5 bytes copied, 6.9884e-05 s, 71.5 kB/s
-dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
-dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/pack-632ef30d84374a3e2fb713b5bed60597b5a6d70a.bitmap' has invalid checksum
-5+0 records in
-5+0 records out
-5 bytes copied, 4.0761e-05 s, 123 kB/s
-dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
-dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-1bf86e278a23cda26950f96c619ccdc18763af35.bitmap' has invalid checksum
-5+0 records in
-5+0 records out
-5 bytes copied, 3.985e-05 s, 125 kB/s
-dangling tree 2f619c7f402f5571da4f915d4ba4b7264c7f2654
-dangling tree 52cc70b92a804c21a20d6d7b9137f36e9e206fa1
-error: bitmap file '.git/objects/pack/multi-pack-index-1bf86e278a23cda26950f96c619ccdc18763af35.bitmap' has invalid checksum
-error: bitmap file '.git/objects/pack/pack-632ef30d84374a3e2fb713b5bed60597b5a6d70a.bitmap' has invalid checksum
-ok 352 - git fsck correctly identifies good and bad bitmaps
+ok 175 - proc-receive: update branch and new tag (builtin protocol)
 
-expecting success of 5326.353 'corrupt MIDX with bitmap causes fallback': 
-	git init corrupt-midx-bitmap &&
-	(
-		cd corrupt-midx-bitmap &&
+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 &&
 
-		test_commit first &&
-		git repack -d &&
-		test_commit second &&
-		git repack -d &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/topic
+	<TAG-v123> refs/tags/v123
+	EOF
 
-		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 &&
+ok 176 - setup upstream: create tags/v123 (builtin protocol)
 
-		# 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 &&
+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 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)
-	)
+ok 177 - setup proc-receive hook (builtin protocol)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 353 - corrupt MIDX with bitmap causes fallback
+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 5326.354 '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 &&
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-B> refs/heads/topic
+	EOF
 
-			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.45.2/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 354 - reading MIDX without BTMP chunk does not complain with single pack reuse
+ok 178 - proc-receive: create/delete branch, and delete tag (builtin protocol)
 
-expecting success of 5326.355 '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 &&
+checking prerequisite: NOT_ROOT
 
-			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.45.2/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 multi pack reuse
+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 355 test(s)
-1..355
+)
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5513-fetch-track.sh ***
@@ -328790,8 +328357,8 @@
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.1
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.10
 1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/tags/mark1.2
---- exp_err	2025-12-18 01:36:37.558773267 +0000
-+++ actual_err	2025-12-18 01:36:37.590773267 +0000
+--- exp_err	2024-11-14 19:37:26.510524658 +0000
++++ actual_err	2024-11-14 19:37:26.582525392 +0000
 @@ -1 +0,0 @@
 -From /build/reproducible-path/git-2.45.2/t/trash directory.t5512-ls-remote/.git
 ok 14 - suppress "From <url>" with -q
@@ -329107,721 +328674,6 @@
 1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5511-refspec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5514-fetch-multiple.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5514-fetch-multiple/.git/
-expecting success of 5514.1 'setup': 
-	setup_repository one &&
-	setup_repository two &&
-	(
-		cd two && git branch another
-	) &&
-	git clone --mirror two three &&
-	git clone one test
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5514-fetch-multiple/one/.git/
-[main (root-commit) 9d34b14] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Switched to a new branch 'side'
-[side 2ce9c50] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 elif
-Switched to branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5514-fetch-multiple/two/.git/
-[main (root-commit) 9d34b14] Initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Switched to a new branch 'side'
-[side 2ce9c50] Second
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 elif
-Switched to branch 'main'
-Cloning into bare repository 'three'...
-done.
-Cloning into 'test'...
-done.
-ok 1 - setup
-
-expecting success of 5514.2 'git fetch --all': 
-	(cd test &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 git remote add three ../three &&
-	 git fetch --all &&
-	 git branch -r > output &&
-	 test_cmp expect output)
-
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 2 - git fetch --all
-
-expecting success of 5514.3 'git fetch --all --no-write-fetch-head': 
-	(cd test &&
-	rm -f .git/FETCH_HEAD &&
-	git fetch --all --no-write-fetch-head &&
-	test_path_is_missing .git/FETCH_HEAD)
-
-Fetching origin
-Fetching one
-Fetching two
-Fetching three
-ok 3 - git fetch --all --no-write-fetch-head
-
-expecting success of 5514.4 'git fetch --all should continue if a remote has errors': 
-	(git clone one test2 &&
-	 cd test2 &&
-	 git remote add bad ../non-existing &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 git remote add three ../three &&
-	 test_must_fail git fetch --all &&
-	 git branch -r > output &&
-	 test_cmp ../test/expect output)
-
-Cloning into 'test2'...
-done.
-Fetching origin
-Fetching bad
-fatal: '../non-existing' does not appear to be a git repository
-fatal: Could not read from remote repository.
-
-Please make sure you have the correct access rights
-and the repository exists.
-error: could not fetch bad
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 4 - git fetch --all should continue if a remote has errors
-
-expecting success of 5514.5 'git fetch --all does not allow non-option arguments': 
-	(cd test &&
-	 test_must_fail git fetch --all origin &&
-	 test_must_fail git fetch --all origin main)
-
-fatal: fetch --all does not take a repository argument
-fatal: fetch --all does not make sense with refspecs
-ok 5 - git fetch --all does not allow non-option arguments
-
-expecting success of 5514.6 'git fetch --multiple (but only one remote)': 
-	(git clone one test3 &&
-	 cd test3 &&
-	 git remote add three ../three &&
-	 git fetch --multiple three &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-
-Cloning into 'test3'...
-done.
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 6 - git fetch --multiple (but only one remote)
-
-expecting success of 5514.7 'git fetch --multiple (two remotes)': 
-	(git clone one test4 &&
-	 cd test4 &&
-	 git remote rm origin &&
-	 git remote add one ../one &&
-	 git remote add two ../two &&
-	 GIT_TRACE=1 git fetch --multiple one two 2>trace &&
-	 git branch -r > output &&
-	 test_cmp ../expect output &&
-	 grep "built-in: git maintenance" trace >gc &&
-	 test_line_count = 1 gc
-	)
-
-Cloning into 'test4'...
-done.
-Fetching one
-Fetching two
-ok 7 - git fetch --multiple (two remotes)
-
-expecting success of 5514.8 'git fetch --multiple (bad remote names)': 
-	(cd test4 &&
-	 test_must_fail git fetch --multiple four)
-
-fatal: no such remote or remote group: four
-ok 8 - git fetch --multiple (bad remote names)
-
-expecting success of 5514.9 'git fetch --all (skipFetchAll)': 
-	(cd test4 &&
-	 for b in $(git branch -r)
-	 do
-		git branch -r -d $b || exit 1
-	 done &&
-	 git remote add three ../three &&
-	 git config remote.three.skipFetchAll true &&
-	 git fetch --all &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-
-Deleted remote-tracking branch one/main (was 9d34b14).
-Deleted remote-tracking branch one/side (was 2ce9c50).
-Deleted remote-tracking branch two/another (was 9d34b14).
-Deleted remote-tracking branch two/main (was 9d34b14).
-Deleted remote-tracking branch two/side (was 2ce9c50).
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-ok 9 - git fetch --all (skipFetchAll)
-
-expecting success of 5514.10 'git fetch --multiple (ignoring skipFetchAll)': 
-	(cd test4 &&
-	 for b in $(git branch -r)
-	 do
-		git branch -r -d $b || exit 1
-	 done &&
-	 git fetch --multiple one two three &&
-	 git branch -r > output &&
-	 test_cmp ../expect output)
-
-Deleted remote-tracking branch one/main (was 9d34b14).
-Deleted remote-tracking branch one/side (was 2ce9c50).
-Deleted remote-tracking branch two/another (was 9d34b14).
-Deleted remote-tracking branch two/main (was 9d34b14).
-Deleted remote-tracking branch two/side (was 2ce9c50).
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 10 - git fetch --multiple (ignoring skipFetchAll)
-
-expecting success of 5514.11 'git fetch --all --no-tags': 
-	git clone one test5 &&
-	git clone test5 test6 &&
-	(cd test5 && git tag test-tag) &&
-	(
-		cd test6 &&
-		git fetch --all --no-tags &&
-		git tag >output
-	) &&
-	test_must_be_empty test6/output
-
-Cloning into 'test5'...
-done.
-Cloning into 'test6'...
-done.
-ok 11 - git fetch --all --no-tags
-
-expecting success of 5514.12 'git fetch --all --tags': 
-	echo test-tag >expect &&
-	git clone one test7 &&
-	git clone test7 test8 &&
-	(
-		cd test7 &&
-		test_commit test-tag &&
-		git reset --hard HEAD^
-	) &&
-	(
-		cd test8 &&
-		git fetch --all --tags &&
-		git tag >output
-	) &&
-	test_cmp expect test8/output
-
-Cloning into 'test7'...
-done.
-Cloning into 'test8'...
-done.
-[main 09d3cd3] test-tag
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-tag.t
-HEAD is now at 9d34b14 Initial
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5514-fetch-multiple/test7
- * [new tag]         test-tag   -> test-tag
-ok 12 - git fetch --all --tags
-
-expecting success of 5514.13 'parallel': 
-	git remote add one ./bogus1 &&
-	git remote add two ./bogus2 &&
-
-	test_must_fail env GIT_TRACE="$PWD/trace" \
-		git fetch --jobs=2 --multiple one two 2>err &&
-	grep "preparing to run up to 2 tasks" trace &&
-	test_grep "could not fetch .one.*128" err &&
-	test_grep "could not fetch .two.*128" err
-
-Fetching one
-Fetching two
-run_processes_parallel: preparing to run up to 2 tasks
-could not fetch 'one' (exit code: 128)
-could not fetch 'two' (exit code: 128)
-ok 13 - parallel
-
-expecting success of 5514.14 'git fetch --multiple --jobs=0 picks a default': 
-	(cd test &&
-	 git fetch --multiple --jobs=0)
-
-ok 14 - git fetch --multiple --jobs=0 picks a default
-
-expecting success of 5514.15 'git fetch --all (works with fetch.all = true)': 
-		test_dir="test_fetch_all_$fetch_all" &&
-		setup_test_clone "$test_dir" &&
-		(
-			cd "$test_dir" &&
-			git config fetch.all $fetch_all &&
-			git fetch --all &&
-			create_fetch_all_expect &&
-			git branch -r >actual &&
-			test_cmp expect actual
-		)
-	
-Cloning into 'test_fetch_all_true'...
-done.
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 15 - git fetch --all (works with fetch.all = true)
-
-expecting success of 5514.16 'git fetch --all (works with fetch.all = false)': 
-		test_dir="test_fetch_all_$fetch_all" &&
-		setup_test_clone "$test_dir" &&
-		(
-			cd "$test_dir" &&
-			git config fetch.all $fetch_all &&
-			git fetch --all &&
-			create_fetch_all_expect &&
-			git branch -r >actual &&
-			test_cmp expect actual
-		)
-	
-Cloning into 'test_fetch_all_false'...
-done.
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 16 - git fetch --all (works with fetch.all = false)
-
-expecting success of 5514.17 'git fetch (fetch all remotes with fetch.all = true)': 
-	setup_test_clone test9 &&
-	(
-		cd test9 &&
-		git config fetch.all true &&
-		git fetch &&
-		git branch -r >actual &&
-		create_fetch_all_expect &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test9'...
-done.
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 17 - git fetch (fetch all remotes with fetch.all = true)
-
-expecting success of 5514.18 'git fetch one (explicit remote overrides fetch.all)': 
-	setup_test_clone test10 &&
-	(
-		cd test10 &&
-		git config fetch.all true &&
-		git fetch one &&
-		create_fetch_one_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test10'...
-done.
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-ok 18 - git fetch one (explicit remote overrides fetch.all)
-
-expecting success of 5514.19 'git config fetch.all false (fetch only default remote)': 
-	setup_test_clone test11 &&
-	(
-		cd test11 &&
-		git config fetch.all false &&
-		git remote set-url origin ../two &&
-		git fetch &&
-		create_fetch_two_as_origin_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test11'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 19 - git config fetch.all false (fetch only default remote)
-
-expecting success of 5514.20 'git fetch --no-all (fetch only default remote with fetch.all = true)': 
-		test_dir="test_no_all_fetch_all_$fetch_all" &&
-		setup_test_clone "$test_dir" &&
-		(
-			cd "$test_dir" &&
-			git config fetch.all $fetch_all &&
-			git remote set-url origin ../two &&
-			git fetch --no-all &&
-			create_fetch_two_as_origin_expect &&
-			git branch -r >actual &&
-			test_cmp expect actual
-		)
-	
-Cloning into 'test_no_all_fetch_all_true'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 20 - git fetch --no-all (fetch only default remote with fetch.all = true)
-
-expecting success of 5514.21 'git fetch --no-all (fetch only default remote with fetch.all = false)': 
-		test_dir="test_no_all_fetch_all_$fetch_all" &&
-		setup_test_clone "$test_dir" &&
-		(
-			cd "$test_dir" &&
-			git config fetch.all $fetch_all &&
-			git remote set-url origin ../two &&
-			git fetch --no-all &&
-			create_fetch_two_as_origin_expect &&
-			git branch -r >actual &&
-			test_cmp expect actual
-		)
-	
-Cloning into 'test_no_all_fetch_all_false'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 21 - git fetch --no-all (fetch only default remote with fetch.all = false)
-
-expecting success of 5514.22 'git fetch --no-all (fetch only default remote without fetch.all)': 
-	setup_test_clone test12 &&
-	(
-		cd test12 &&
-		git config --unset-all fetch.all || true &&
-		git remote set-url origin ../two &&
-		git fetch --no-all &&
-		create_fetch_two_as_origin_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test12'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 22 - git fetch --no-all (fetch only default remote without fetch.all)
-
-expecting success of 5514.23 'git fetch --all --no-all (fetch only default remote)': 
-	setup_test_clone test13 &&
-	(
-		cd test13 &&
-		git remote set-url origin ../two &&
-		git fetch --all --no-all &&
-		create_fetch_two_as_origin_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test13'...
-done.
-From ../two
- * [new branch]      another    -> origin/another
-ok 23 - git fetch --all --no-all (fetch only default remote)
-
-expecting success of 5514.24 'git fetch --no-all one (fetch only explicit remote)': 
-	setup_test_clone test14 &&
-	(
-		cd test14 &&
-		git fetch --no-all one &&
-		create_fetch_one_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test14'...
-done.
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-ok 24 - git fetch --no-all one (fetch only explicit remote)
-
-expecting success of 5514.25 'git fetch --no-all --all (fetch all remotes)': 
-	setup_test_clone test15 &&
-	(
-		cd test15 &&
-		git fetch --no-all --all &&
-		create_fetch_all_expect &&
-		git branch -r >actual &&
-		test_cmp expect actual
-	)
-
-Cloning into 'test15'...
-done.
-Fetching origin
-Fetching one
-From ../one
- * [new branch]      main       -> one/main
- * [new branch]      side       -> one/side
-Fetching two
-From ../two
- * [new branch]      another    -> two/another
- * [new branch]      main       -> two/main
- * [new branch]      side       -> two/side
-Fetching three
-From ../three
- * [new branch]      another    -> three/another
- * [new branch]      main       -> three/main
- * [new branch]      side       -> three/side
-ok 25 - git fetch --no-all --all (fetch all remotes)
-
-# passed all 25 test(s)
-1..25
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5505-remote.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5505-remote/.git/
 expecting success of 5505.1 'setup': 
@@ -330187,8 +329039,8 @@
 	test_cmp expect output
 
 error: src refspec refs/tags/lastbackup does not match any
---- expect	2025-12-18 01:36:36.730773267 +0000
-+++ output	2025-12-18 01:36:36.770773267 +0000
+--- expect	2024-11-14 19:37:19.346451721 +0000
++++ output	2024-11-14 19:37:19.390452169 +0000
 @@ -4,7 +4,7 @@
    HEAD branch: main
    Remote branches:
@@ -330896,8 +329748,8 @@
 warning: The global configuration remote.pushDefault in:
 	file:2
 now names the non-existent remote 'origin'
-{"event":"region_enter","sid":"20251218T013639.093934Z-Hfbad846e-P00001461","thread":"main","time":"2025-12-18T01:36:39.131110Z","file":"progress.c","line":270,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
-{"event":"region_leave","sid":"20251218T013639.093934Z-Hfbad846e-P00001461","thread":"main","time":"2025-12-18T01:36:39.149008Z","file":"progress.c","line":348,"repo":1,"t_rel":0.017901,"nesting":1,"category":"progress","label":"Renaming remote references"}
+{"event":"region_enter","sid":"20241114T193723.936741Z-H5c947e1c-P00007825","thread":"main","time":"2024-11-14T19:37:23.953490Z","file":"progress.c","line":270,"repo":1,"nesting":1,"category":"progress","label":"Renaming remote references"}
+{"event":"region_leave","sid":"20241114T193723.936741Z-H5c947e1c-P00007825","thread":"main","time":"2024-11-14T19:37:23.955566Z","file":"progress.c","line":348,"repo":1,"t_rel":0.002078,"nesting":1,"category":"progress","label":"Renaming remote references"}
 	pushRemote = upstream
 ok 58 - rename a remote
 
@@ -331692,263 +330544,549 @@
 1..111
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5518-fetch-exit-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5518-fetch-exit-status/.git/
-expecting success of 5518.1 'setup': 
-
-	>file &&
-	git add file &&
-	git commit -m initial &&
-
-	git checkout -b side &&
-	echo side >file &&
-	git commit -a -m side &&
-
-	git checkout main &&
-	echo next >file &&
-	git commit -a -m next
+*** t5514-fetch-multiple.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5514-fetch-multiple/.git/
+expecting success of 5514.1 'setup': 
+	setup_repository one &&
+	setup_repository two &&
+	(
+		cd two && git branch another
+	) &&
+	git clone --mirror two three &&
+	git clone one test
 
-[main (root-commit) 6ce5622] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5514-fetch-multiple/one/.git/
+[main (root-commit) 9d34b14] Initial
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file
 Switched to a new branch 'side'
-[side 2c17685] side
+[side 2ce9c50] Second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 elif
 Switched to branch 'main'
-[main 883918d] next
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5514-fetch-multiple/two/.git/
+[main (root-commit) 9d34b14] Initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side 2ce9c50] Second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 elif
+Switched to branch 'main'
+Cloning into bare repository 'three'...
+done.
+Cloning into 'test'...
+done.
 ok 1 - setup
 
-expecting success of 5518.2 'non-fast-forward fetch': 
+expecting success of 5514.2 'git fetch --all': 
+	(cd test &&
+	 git remote add one ../one &&
+	 git remote add two ../two &&
+	 git remote add three ../three &&
+	 git fetch --all &&
+	 git branch -r > output &&
+	 test_cmp expect output)
 
-	test_must_fail git fetch . main:side
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 2 - git fetch --all
 
+expecting success of 5514.3 'git fetch --all --no-write-fetch-head': 
+	(cd test &&
+	rm -f .git/FETCH_HEAD &&
+	git fetch --all --no-write-fetch-head &&
+	test_path_is_missing .git/FETCH_HEAD)
 
-From .
- ! [rejected]        main       -> side  (non-fast-forward)
-ok 2 - non-fast-forward fetch
+Fetching origin
+Fetching one
+Fetching two
+Fetching three
+ok 3 - git fetch --all --no-write-fetch-head
 
-expecting success of 5518.3 'forced update': 
+expecting success of 5514.4 'git fetch --all should continue if a remote has errors': 
+	(git clone one test2 &&
+	 cd test2 &&
+	 git remote add bad ../non-existing &&
+	 git remote add one ../one &&
+	 git remote add two ../two &&
+	 git remote add three ../three &&
+	 test_must_fail git fetch --all &&
+	 git branch -r > output &&
+	 test_cmp ../test/expect output)
 
-	git fetch . +main:side
+Cloning into 'test2'...
+done.
+Fetching origin
+Fetching bad
+fatal: '../non-existing' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+error: could not fetch bad
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 4 - git fetch --all should continue if a remote has errors
 
+expecting success of 5514.5 'git fetch --all does not allow non-option arguments': 
+	(cd test &&
+	 test_must_fail git fetch --all origin &&
+	 test_must_fail git fetch --all origin main)
 
-From .
- + 2c17685...883918d main       -> side  (forced update)
-ok 3 - forced update
+fatal: fetch --all does not take a repository argument
+fatal: fetch --all does not make sense with refspecs
+ok 5 - git fetch --all does not allow non-option arguments
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5519-push-alternates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5519-push-alternates/.git/
-expecting success of 5519.1 'setup': 
-	mkdir alice-pub &&
-	(
-		cd alice-pub &&
-		GIT_DIR=. git init
-	) &&
-	mkdir alice-work &&
+expecting success of 5514.6 'git fetch --multiple (but only one remote)': 
+	(git clone one test3 &&
+	 cd test3 &&
+	 git remote add three ../three &&
+	 git fetch --multiple three &&
+	 git branch -r > output &&
+	 test_cmp ../expect output)
+
+Cloning into 'test3'...
+done.
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 6 - git fetch --multiple (but only one remote)
+
+expecting success of 5514.7 'git fetch --multiple (two remotes)': 
+	(git clone one test4 &&
+	 cd test4 &&
+	 git remote rm origin &&
+	 git remote add one ../one &&
+	 git remote add two ../two &&
+	 GIT_TRACE=1 git fetch --multiple one two 2>trace &&
+	 git branch -r > output &&
+	 test_cmp ../expect output &&
+	 grep "built-in: git maintenance" trace >gc &&
+	 test_line_count = 1 gc
+	)
+
+Cloning into 'test4'...
+done.
+Fetching one
+Fetching two
+ok 7 - git fetch --multiple (two remotes)
+
+expecting success of 5514.8 'git fetch --multiple (bad remote names)': 
+	(cd test4 &&
+	 test_must_fail git fetch --multiple four)
+
+fatal: no such remote or remote group: four
+ok 8 - git fetch --multiple (bad remote names)
+
+expecting success of 5514.9 'git fetch --all (skipFetchAll)': 
+	(cd test4 &&
+	 for b in $(git branch -r)
+	 do
+		git branch -r -d $b || exit 1
+	 done &&
+	 git remote add three ../three &&
+	 git config remote.three.skipFetchAll true &&
+	 git fetch --all &&
+	 git branch -r > output &&
+	 test_cmp ../expect output)
+
+Deleted remote-tracking branch one/main (was 9d34b14).
+Deleted remote-tracking branch one/side (was 2ce9c50).
+Deleted remote-tracking branch two/another (was 9d34b14).
+Deleted remote-tracking branch two/main (was 9d34b14).
+Deleted remote-tracking branch two/side (was 2ce9c50).
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+ok 9 - git fetch --all (skipFetchAll)
+
+expecting success of 5514.10 'git fetch --multiple (ignoring skipFetchAll)': 
+	(cd test4 &&
+	 for b in $(git branch -r)
+	 do
+		git branch -r -d $b || exit 1
+	 done &&
+	 git fetch --multiple one two three &&
+	 git branch -r > output &&
+	 test_cmp ../expect output)
+
+Deleted remote-tracking branch one/main (was 9d34b14).
+Deleted remote-tracking branch one/side (was 2ce9c50).
+Deleted remote-tracking branch two/another (was 9d34b14).
+Deleted remote-tracking branch two/main (was 9d34b14).
+Deleted remote-tracking branch two/side (was 2ce9c50).
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 10 - git fetch --multiple (ignoring skipFetchAll)
+
+expecting success of 5514.11 'git fetch --all --no-tags': 
+	git clone one test5 &&
+	git clone test5 test6 &&
+	(cd test5 && git tag test-tag) &&
 	(
-		cd alice-work &&
-		git init &&
-		>file &&
-		git add . &&
-		git commit -m initial &&
-		git push ../alice-pub main
+		cd test6 &&
+		git fetch --all --no-tags &&
+		git tag >output
 	) &&
+	test_must_be_empty test6/output
 
-	# Project Bob is a fork of project Alice
-	mkdir bob-pub &&
+Cloning into 'test5'...
+done.
+Cloning into 'test6'...
+done.
+ok 11 - git fetch --all --no-tags
+
+expecting success of 5514.12 'git fetch --all --tags': 
+	echo test-tag >expect &&
+	git clone one test7 &&
+	git clone test7 test8 &&
 	(
-		cd bob-pub &&
-		GIT_DIR=. git init &&
-		mkdir -p objects/info &&
-		echo ../../alice-pub/objects >objects/info/alternates
+		cd test7 &&
+		test_commit test-tag &&
+		git reset --hard HEAD^
 	) &&
-	git clone alice-pub bob-work &&
 	(
-		cd bob-work &&
-		git push ../bob-pub main
-	)
+		cd test8 &&
+		git fetch --all --tags &&
+		git tag >output
+	) &&
+	test_cmp expect test8/output
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5519-push-alternates/alice-pub/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5519-push-alternates/alice-work/.git/
-[main (root-commit) 6ce5622] initial
+Cloning into 'test7'...
+done.
+Cloning into 'test8'...
+done.
+[main 09d3cd3] test-tag
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-To ../alice-pub
- * [new branch]      main -> main
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5519-push-alternates/bob-pub/
-Cloning into 'bob-work'...
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-tag.t
+HEAD is now at 9d34b14 Initial
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5514-fetch-multiple/test7
+ * [new tag]         test-tag   -> test-tag
+ok 12 - git fetch --all --tags
+
+expecting success of 5514.13 'parallel': 
+	git remote add one ./bogus1 &&
+	git remote add two ./bogus2 &&
+
+	test_must_fail env GIT_TRACE="$PWD/trace" \
+		git fetch --jobs=2 --multiple one two 2>err &&
+	grep "preparing to run up to 2 tasks" trace &&
+	test_grep "could not fetch .one.*128" err &&
+	test_grep "could not fetch .two.*128" err
+
+Fetching one
+Fetching two
+run_processes_parallel: preparing to run up to 2 tasks
+could not fetch 'one' (exit code: 128)
+could not fetch 'two' (exit code: 128)
+ok 13 - parallel
+
+expecting success of 5514.14 'git fetch --multiple --jobs=0 picks a default': 
+	(cd test &&
+	 git fetch --multiple --jobs=0)
+
+ok 14 - git fetch --multiple --jobs=0 picks a default
+
+expecting success of 5514.15 'git fetch --all (works with fetch.all = true)': 
+		test_dir="test_fetch_all_$fetch_all" &&
+		setup_test_clone "$test_dir" &&
+		(
+			cd "$test_dir" &&
+			git config fetch.all $fetch_all &&
+			git fetch --all &&
+			create_fetch_all_expect &&
+			git branch -r >actual &&
+			test_cmp expect actual
+		)
+	
+Cloning into 'test_fetch_all_true'...
 done.
-To ../bob-pub
- * [new branch]      main -> main
-ok 1 - setup
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 15 - git fetch --all (works with fetch.all = true)
 
-expecting success of 5519.2 'alice works and pushes': 
+expecting success of 5514.16 'git fetch --all (works with fetch.all = false)': 
+		test_dir="test_fetch_all_$fetch_all" &&
+		setup_test_clone "$test_dir" &&
+		(
+			cd "$test_dir" &&
+			git config fetch.all $fetch_all &&
+			git fetch --all &&
+			create_fetch_all_expect &&
+			git branch -r >actual &&
+			test_cmp expect actual
+		)
+	
+Cloning into 'test_fetch_all_false'...
+done.
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 16 - git fetch --all (works with fetch.all = false)
+
+expecting success of 5514.17 'git fetch (fetch all remotes with fetch.all = true)': 
+	setup_test_clone test9 &&
 	(
-		cd alice-work &&
-		echo more >file &&
-		git commit -a -m second &&
-		git push ../alice-pub :
+		cd test9 &&
+		git config fetch.all true &&
+		git fetch &&
+		git branch -r >actual &&
+		create_fetch_all_expect &&
+		test_cmp expect actual
 	)
 
-[main 4d906ec] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To ../alice-pub
-   6ce5622..4d906ec  main -> main
-ok 2 - alice works and pushes
-
-expecting success of 5519.3 'bob fetches from alice, works and pushes': 
-	(
-		# Bob acquires what Alice did in his work tree first.
-		# Even though these objects are not directly in
-		# the public repository of Bob, this push does not
-		# need to send the commit Bob received from Alice
-		# to his public repository, as all the object Alice
-		# has at her public repository are available to it
-		# via its alternates.
-		cd bob-work &&
-		git pull ../alice-pub main &&
-		echo more bob >file &&
-		git commit -a -m third &&
-		git push ../bob-pub :
-	) &&
+Cloning into 'test9'...
+done.
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 17 - git fetch (fetch all remotes with fetch.all = true)
 
-	# Check that the second commit by Alice is not sent
-	# to ../bob-pub
+expecting success of 5514.18 'git fetch one (explicit remote overrides fetch.all)': 
+	setup_test_clone test10 &&
 	(
-		cd bob-pub &&
-		second=$(git rev-parse HEAD^) &&
-		rm -f objects/info/alternates &&
-		test_must_fail git cat-file -t $second &&
-		echo ../../alice-pub/objects >objects/info/alternates
+		cd test10 &&
+		git config fetch.all true &&
+		git fetch one &&
+		create_fetch_one_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
 	)
 
-From ../alice-pub
- * branch            main       -> FETCH_HEAD
-Updating 6ce5622..4d906ec
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-[main 4ea5236] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../bob-pub
-   6ce5622..4ea5236  main -> main
-fatal: git cat-file: could not get object info
-ok 3 - bob fetches from alice, works and pushes
+Cloning into 'test10'...
+done.
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+ok 18 - git fetch one (explicit remote overrides fetch.all)
 
-expecting success of 5519.4 'clean-up in case the previous failed': 
+expecting success of 5514.19 'git config fetch.all false (fetch only default remote)': 
+	setup_test_clone test11 &&
 	(
-		cd bob-pub &&
-		echo ../../alice-pub/objects >objects/info/alternates
+		cd test11 &&
+		git config fetch.all false &&
+		git remote set-url origin ../two &&
+		git fetch &&
+		create_fetch_two_as_origin_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
 	)
 
-ok 4 - clean-up in case the previous failed
+Cloning into 'test11'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 19 - git config fetch.all false (fetch only default remote)
 
-expecting success of 5519.5 'alice works and pushes again': 
+expecting success of 5514.20 'git fetch --no-all (fetch only default remote with fetch.all = true)': 
+		test_dir="test_no_all_fetch_all_$fetch_all" &&
+		setup_test_clone "$test_dir" &&
+		(
+			cd "$test_dir" &&
+			git config fetch.all $fetch_all &&
+			git remote set-url origin ../two &&
+			git fetch --no-all &&
+			create_fetch_two_as_origin_expect &&
+			git branch -r >actual &&
+			test_cmp expect actual
+		)
+	
+Cloning into 'test_no_all_fetch_all_true'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 20 - git fetch --no-all (fetch only default remote with fetch.all = true)
+
+expecting success of 5514.21 'git fetch --no-all (fetch only default remote with fetch.all = false)': 
+		test_dir="test_no_all_fetch_all_$fetch_all" &&
+		setup_test_clone "$test_dir" &&
+		(
+			cd "$test_dir" &&
+			git config fetch.all $fetch_all &&
+			git remote set-url origin ../two &&
+			git fetch --no-all &&
+			create_fetch_two_as_origin_expect &&
+			git branch -r >actual &&
+			test_cmp expect actual
+		)
+	
+Cloning into 'test_no_all_fetch_all_false'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 21 - git fetch --no-all (fetch only default remote with fetch.all = false)
+
+expecting success of 5514.22 'git fetch --no-all (fetch only default remote without fetch.all)': 
+	setup_test_clone test12 &&
 	(
-		# Alice does not care what Bob does.  She does not
-		# even have to be aware of his existence.  She just
-		# keeps working and pushing
-		cd alice-work &&
-		echo more alice >file &&
-		git commit -a -m fourth &&
-		git push ../alice-pub :
+		cd test12 &&
+		git config --unset-all fetch.all || true &&
+		git remote set-url origin ../two &&
+		git fetch --no-all &&
+		create_fetch_two_as_origin_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
 	)
 
-[main 605b499] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../alice-pub
-   4d906ec..605b499  main -> main
-ok 5 - alice works and pushes again
+Cloning into 'test12'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 22 - git fetch --no-all (fetch only default remote without fetch.all)
 
-expecting success of 5519.6 'bob works and pushes': 
+expecting success of 5514.23 'git fetch --all --no-all (fetch only default remote)': 
+	setup_test_clone test13 &&
 	(
-		# This time Bob does not pull from Alice, and
-		# the main branch at her public repository points
-		# at a commit Bob does not know about.  This should
-		# not prevent the push by Bob from succeeding.
-		cd bob-work &&
-		echo yet more bob >file &&
-		git commit -a -m fifth &&
-		git push ../bob-pub :
+		cd test13 &&
+		git remote set-url origin ../two &&
+		git fetch --all --no-all &&
+		create_fetch_two_as_origin_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
 	)
 
-[main de7f69b] fifth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../bob-pub
-   4ea5236..de7f69b  main -> main
-ok 6 - bob works and pushes
+Cloning into 'test13'...
+done.
+From ../two
+ * [new branch]      another    -> origin/another
+ok 23 - git fetch --all --no-all (fetch only default remote)
 
-expecting success of 5519.7 'alice works and pushes yet again': 
+expecting success of 5514.24 'git fetch --no-all one (fetch only explicit remote)': 
+	setup_test_clone test14 &&
 	(
-		# Alice does not care what Bob does.  She does not
-		# even have to be aware of his existence.  She just
-		# keeps working and pushing
-		cd alice-work &&
-		echo more and more alice >file &&
-		git commit -a -m sixth.1 &&
-		echo more and more alice >>file &&
-		git commit -a -m sixth.2 &&
-		echo more and more alice >>file &&
-		git commit -a -m sixth.3 &&
-		git push ../alice-pub :
+		cd test14 &&
+		git fetch --no-all one &&
+		create_fetch_one_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
 	)
 
-[main ea85bff] sixth.1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 2dcce9e] sixth.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 30a147f] sixth.3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-To ../alice-pub
-   605b499..30a147f  main -> main
-ok 7 - alice works and pushes yet again
+Cloning into 'test14'...
+done.
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+ok 24 - git fetch --no-all one (fetch only explicit remote)
 
-expecting success of 5519.8 'bob works and pushes again': 
-	(
-		cd alice-pub &&
-		git cat-file commit main >../bob-work/commit
-	) &&
+expecting success of 5514.25 'git fetch --no-all --all (fetch all remotes)': 
+	setup_test_clone test15 &&
 	(
-		# This time Bob does not pull from Alice, and
-		# the main branch at her public repository points
-		# at a commit Bob does not fully know about, but
-		# he happens to have the commit object (but not the
-		# necessary tree) in his repository from Alice.
-		# This should not prevent the push by Bob from
-		# succeeding.
-		cd bob-work &&
-		git hash-object -t commit -w commit &&
-		echo even more bob >file &&
-		git commit -a -m seventh &&
-		git push ../bob-pub :
+		cd test15 &&
+		git fetch --no-all --all &&
+		create_fetch_all_expect &&
+		git branch -r >actual &&
+		test_cmp expect actual
 	)
 
-30a147f90d294d00cfbd7300e6dee07a60be8019
-[main 6e12bed] seventh
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../bob-pub
-   de7f69b..6e12bed  main -> main
-ok 8 - bob works and pushes again
+Cloning into 'test15'...
+done.
+Fetching origin
+Fetching one
+From ../one
+ * [new branch]      main       -> one/main
+ * [new branch]      side       -> one/side
+Fetching two
+From ../two
+ * [new branch]      another    -> two/another
+ * [new branch]      main       -> two/main
+ * [new branch]      side       -> two/side
+Fetching three
+From ../three
+ * [new branch]      another    -> three/another
+ * [new branch]      main       -> three/main
+ * [new branch]      side       -> three/side
+ok 25 - git fetch --no-all --all (fetch all remotes)
 
-# passed all 8 test(s)
-1..8
+# passed all 25 test(s)
+1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5517-push-mirror.sh ***
@@ -332429,466 +331567,263 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5521-pull-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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)
+*** t5518-fetch-exit-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5518-fetch-exit-status/.git/
+expecting success of 5518.1 'setup': 
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5521-pull-options/clonedvrb/.git/
-ok 7 - git pull -v --rebase
+	>file &&
+	git add file &&
+	git commit -m initial &&
 
-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)
+	git checkout -b side &&
+	echo side >file &&
+	git commit -a -m side &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5521-pull-options/clonedvq/.git/
-ok 8 - git pull -v -q --no-rebase
+	git checkout main &&
+	echo next >file &&
+	git commit -a -m next
 
-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)
+[main (root-commit) 6ce5622] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side 2c17685] side
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+[main 883918d] next
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5521-pull-options/clonedqv/.git/
-ok 9 - git pull -q -v --no-rebase
+expecting success of 5518.2 'non-fast-forward fetch': 
 
-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)
+	test_must_fail git fetch . main:side
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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)
+From .
+ ! [rejected]        main       -> side  (non-fast-forward)
+ok 2 - non-fast-forward fetch
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 5518.3 '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
-	git pull two &&
-	test_commit A &&
-	git branch -f origin &&
-	git pull --no-rebase --all --force
-	)
+	git fetch . +main:side
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-	)
+From .
+ + 2c17685...883918d main       -> side  (forced update)
+ok 3 - forced update
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5519-push-alternates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5519-push-alternates/.git/
+expecting success of 5519.1 'setup': 
+	mkdir alice-pub &&
+	(
+		cd alice-pub &&
+		GIT_DIR=. git init
+	) &&
+	mkdir alice-work &&
+	(
+		cd alice-work &&
+		git init &&
+		>file &&
+		git add . &&
+		git commit -m initial &&
+		git push ../alice-pub main
+	) &&
 
-expecting success of 5521.14 'git pull --dry-run': 
-	test_when_finished "rm -rf clonedry" &&
-	git init clonedry &&
+	# Project Bob is a fork of project Alice
+	mkdir bob-pub &&
 	(
-		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
+		cd bob-pub &&
+		GIT_DIR=. git init &&
+		mkdir -p objects/info &&
+		echo ../../alice-pub/objects >objects/info/alternates
+	) &&
+	git clone alice-pub bob-work &&
+	(
+		cd bob-work &&
+		git push ../bob-pub main
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5519-push-alternates/alice-pub/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5519-push-alternates/alice-work/.git/
+[main (root-commit) 6ce5622] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+To ../alice-pub
+ * [new branch]      main -> main
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5519-push-alternates/bob-pub/
+Cloning into 'bob-work'...
+done.
+To ../bob-pub
+ * [new branch]      main -> main
+ok 1 - setup
 
-expecting success of 5521.15 'git pull --all --dry-run': 
-	test_when_finished "rm -rf cloneddry" &&
-	git init clonedry &&
+expecting success of 5519.2 'alice works and pushes': 
 	(
-		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
+		cd alice-work &&
+		echo more >file &&
+		git commit -a -m second &&
+		git push ../alice-pub :
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+[main 4d906ec] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+To ../alice-pub
+   6ce5622..4d906ec  main -> main
+ok 2 - alice works and pushes
 
-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 &&
+expecting success of 5519.3 'bob fetches from alice, works and pushes': 
 	(
-		cd src &&
-		git checkout --orphan side HEAD^ &&
-		test_commit three
+		# Bob acquires what Alice did in his work tree first.
+		# Even though these objects are not directly in
+		# the public repository of Bob, this push does not
+		# need to send the commit Bob received from Alice
+		# to his public repository, as all the object Alice
+		# has at her public repository are available to it
+		# via its alternates.
+		cd bob-work &&
+		git pull ../alice-pub main &&
+		echo more bob >file &&
+		git commit -a -m third &&
+		git push ../bob-pub :
 	) &&
+
+	# Check that the second commit by Alice is not sent
+	# to ../bob-pub
 	(
-		cd dst &&
-		test_must_fail git pull ../src side &&
-		git pull --no-rebase --allow-unrelated-histories ../src side
+		cd bob-pub &&
+		second=$(git rev-parse HEAD^) &&
+		rm -f objects/info/alternates &&
+		test_must_fail git cat-file -t $second &&
+		echo ../../alice-pub/objects >objects/info/alternates
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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>
+From ../alice-pub
+ * branch            main       -> FETCH_HEAD
+Updating 6ce5622..4d906ec
+Fast-forward
+ file | 1 +
  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
+[main 4ea5236] third
  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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../bob-pub
+   6ce5622..4ea5236  main -> main
+fatal: git cat-file: could not get object info
+ok 3 - bob fetches from alice, works and pushes
 
-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 5519.4 'clean-up in case the previous failed': 
+	(
+		cd bob-pub &&
+		echo ../../alice-pub/objects >objects/info/alternates
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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 4 - clean-up in case the previous failed
 
-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 5519.5 'alice works and pushes again': 
+	(
+		# Alice does not care what Bob does.  She does not
+		# even have to be aware of his existence.  She just
+		# keeps working and pushing
+		cd alice-work &&
+		echo more alice >file &&
+		git commit -a -m fourth &&
+		git push ../alice-pub :
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+[main 605b499] fourth
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.45.2/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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../alice-pub
+   4d906ec..605b499  main -> main
+ok 5 - alice works and pushes again
 
-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
+expecting success of 5519.6 'bob works and pushes': 
+	(
+		# This time Bob does not pull from Alice, and
+		# the main branch at her public repository points
+		# at a commit Bob does not know about.  This should
+		# not prevent the push by Bob from succeeding.
+		cd bob-work &&
+		echo yet more bob >file &&
+		git commit -a -m fifth &&
+		git push ../bob-pub :
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+[main de7f69b] fifth
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.45.2/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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../bob-pub
+   4ea5236..de7f69b  main -> main
+ok 6 - bob works and pushes
 
-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
+expecting success of 5519.7 'alice works and pushes yet again': 
+	(
+		# Alice does not care what Bob does.  She does not
+		# even have to be aware of his existence.  She just
+		# keeps working and pushing
+		cd alice-work &&
+		echo more and more alice >file &&
+		git commit -a -m sixth.1 &&
+		echo more and more alice >>file &&
+		git commit -a -m sixth.2 &&
+		echo more and more alice >>file &&
+		git commit -a -m sixth.3 &&
+		git push ../alice-pub :
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+[main ea85bff] sixth.1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5521-pull-options/src/.git/
-[main (root-commit) 0ba3da9] one
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 2dcce9e] sixth.2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Cloning into 'dst'...
-done.
-[main 9f92fa5] two
+[main 30a147f] sixth.3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.45.2/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
+To ../alice-pub
+   605b499..30a147f  main -> main
+ok 7 - alice works and pushes yet again
 
-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
+expecting success of 5519.8 'bob works and pushes again': 
+	(
+		cd alice-pub &&
+		git cat-file commit main >../bob-work/commit
+	) &&
+	(
+		# This time Bob does not pull from Alice, and
+		# the main branch at her public repository points
+		# at a commit Bob does not fully know about, but
+		# he happens to have the commit object (but not the
+		# necessary tree) in his repository from Alice.
+		# This should not prevent the push by Bob from
+		# succeeding.
+		cd bob-work &&
+		git hash-object -t commit -w commit &&
+		echo even more bob >file &&
+		git commit -a -m seventh &&
+		git push ../bob-pub :
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+30a147f90d294d00cfbd7300e6dee07a60be8019
+[main 6e12bed] seventh
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-From /build/reproducible-path/git-2.45.2/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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../bob-pub
+   de7f69b..6e12bed  main -> main
+ok 8 - bob works and pushes again
 
-# passed all 22 test(s)
-1..22
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5515-fetch-merge-logic.sh ***
@@ -336223,213 +335158,6 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5522-pull-symlink.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5524-pull-msg.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.git/
-expecting success of 5524.1 'setup': 
-	test_commit initial afile original &&
-	git clone . cloned &&
-	(
-		cd cloned &&
-		echo added >bfile &&
-		git add bfile &&
-		test_tick &&
-		git commit -m "add bfile"
-	) &&
-	test_tick && test_tick &&
-	echo "second" >afile &&
-	git add afile &&
-	git commit -m "second commit" &&
-	echo "original $dollar" >afile &&
-	git add afile &&
-	git commit -m "do not clobber $dollar signs"
-
-[master (root-commit) f176df3] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 afile
-Cloning into 'cloned'...
-done.
-[master 1facbb5] add bfile
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bfile
-[master 4db85b7] second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master 8393f95] do not clobber $Dollar signs
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 5524.2 'pull': 
-(
-	cd cloned &&
-	git pull --no-rebase --log &&
-	git log -2 &&
-	git cat-file commit HEAD >result &&
-	grep Dollar result
-)
-
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.
-   f176df3..8393f95  master     -> origin/master
-Merge made by the 'ort' strategy.
- afile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-commit a454b21b358cc261191163cddb6b8a9277aa2aa1
-Merge: 1facbb5 8393f95
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    Merge branch 'master' of /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.
-    
-    * 'master' of /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.:
-      do not clobber $Dollar signs
-      second commit
-
-commit 8393f95971e86cb10f5e23411fa764a2751859f1
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    do not clobber $Dollar signs
-  do not clobber $Dollar signs
-ok 2 - pull
-
-expecting success of 5524.3 '--log=1 limits shortlog length': 
-(
-	cd cloned &&
-	git reset --hard HEAD^ &&
-	test "$(cat afile)" = original &&
-	test "$(cat bfile)" = added &&
-	git pull --no-rebase --log=1 &&
-	git log -3 &&
-	git cat-file commit HEAD >result &&
-	grep Dollar result &&
-	! grep "second commit" result
-)
-
-HEAD is now at 1facbb5 add bfile
-Merge made by the 'ort' strategy.
- afile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-commit 066d400d03db10d535d48a62f8dcea1a078252c0
-Merge: 1facbb5 8393f95
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    Merge branch 'master' of /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.
-    
-    * 'master' of /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.: (2 commits)
-      do not clobber $Dollar signs
-      ...
-
-commit 8393f95971e86cb10f5e23411fa764a2751859f1
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    do not clobber $Dollar signs
-
-commit 4db85b7332a1f2dd47ed83e51fbde7f24b2baa43
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    second commit
-  do not clobber $Dollar signs
-ok 3 - --log=1 limits shortlog length
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5500-fetch-pack.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5500-fetch-pack/.git/
 expecting success of 5500.1 'setup': 
@@ -336548,9 +335276,9 @@
 remote: Enumerating objects: 192, done.        
 remote: Counting objects:   0% (1/192)        
remote: Counting objects:   1% (2/192)        
remote: Counting objects:   2% (4/192)        
remote: Counting objects:   3% (6/192)        
remote: Counting objects:   4% (8/192)        
remote: Counting objects:   5% (10/192)        
remote: Counting objects:   6% (12/192)        
remote: Counting objects:   7% (14/192)        
remote: Counting objects:   8% (16/192)        
remote: Counting objects:   9% (18/192)        
remote: Counting objects:  10% (20/192)        
remote: Counting objects:  11% (22/192)        
remote: Counting objects:  12% (24/192)        
remote: Counting objects:  13% (25/192)        
remote: Counting objects:  14% (27/192)        
remote: Counting objects:  15% (29/192)        
remote: Counting objects:  16% (31/192)        
remote: Counting objects:  17% (33/192)        
remote: Counting objects:  18% (35/192)        
remote: Counting objects:  19% (37/192)        
remote: Counting objects:  20% (39/192)        
remote: Counting objects:  21% (41/192)        
remote: Counting objects:  22% (43/192)        
remote: Counting objects:  23% (45/192)        
remote: Counting objects:  24% (47/192)        
remote: Counting objects:  25% (48/192)        
remote: Counting objects:  26% (50/192)        
remote: Counting objects:  27% (52/192)        
remote: Counting objects:  28% (54/192)        
remote: Counting objects:  29% (56/192)        
remote: Counting objects:  30% (58/192)        
remote: Counting objects:  31% (60/192)        
remote: Counting objects:  32% (62/192)        
remote: Counting objects:  33% (64/192)        
remote: Counting objects:  34% (66/192)        
remote: Counting objects:  35% (68/192)        
remote: Counting objects:  36% (70/192)        
remote: Counting objects:  37% (72/192)        
remote: Counting objects:  38% (73/192)        
remote: Counting objects:  39% (75/192)        
remote: Counting objects:  40% (77/192)        
remote: Counting objects:  41% (79/192)        
remote: Counting objects:  42% (81/192)        
remote: Counting objects:  43% (83/192)        
remote: Counting objects:  44% (85/192)        
remote: Counting objects:  45% (87/192)        
remote: Counting objects:  46% (89/192)        
remote: Counting objects:  47% (91/192)        
remote: Counting objects:  48% (93/192)        
remote: Counting objects:  49% (95/192)        
remote: Counting objects:  50% (96/192)        
remote: Counting objects:  51% (98/192)        
remote: Counting objects:  52% (100/192)        
remote: Counting objects:  53% (102/192)        
remote: Counting objects:  54% (104/192)        
remote: Counting objects:  55% (106/192)        
remote: Counting objects:  56% (108/192)        
remote: Counting objects:  57% (110/192)        
remote: Counting objects:  58% (112/192)        
remote: Counting objects:  59% (114/192)        
remote: Counting objects:  60% (116/192)        
remote: Counting objects:  61% (118/192)        
remote: Counting objects:  62% (120/192)        
remote: Counting objects:  63% (121/192)        
remote: Counting objects:  64% (123/192)        
remote: Counting objects:  65% (125/192)        
remote: Counting objects:  66% (127/192)        
remote: Counting objects:  67% (129/192)        
remote: Counting objects:  68% (131/192)        
remote: Counting objects:  69% (133/192)        
remote: Counting objects:  70% (135/192)        
remote: Counting objects:  71% (137/192)        
remote: Counting objects:  72% (139/192)        
remote: Counting objects:  73% (141/192)        
remote: Counting objects:  74% (143/192)        
remote: Counting objects:  75% (144/192)        
remote: Counting objects:  76% (146/192)        
remote: Counting objects:  77% (148/192)        
remote: Counting objects:  78% (150/192)        
remote: Counting objects:  79% (152/192)        
remote: Counting objects:  80% (154/192)        
remote: Counting objects:  81% (156/192)        
remote: Counting objects:  82% (158/192)        
remote: Counting objects:  83% (160/192)        
remote: Counting objects:  84% (162/192)        
remote: Counting objects:  85% (164/192)        
remote: Counting objects:  86% (166/192)        
remote: Counting objects:  87% (168/192)        
remote: Counting objects:  88% (169/192)        
remote: Counting objects:  89% (171/192)        
remote: Counting objects:  90% (173/192)        
remote: Counting objects:  91% (175/192)        
remote: Counting objects:  92% (177/192)        
remote: Counting objects:  93% (179/192)        
remote: Counting objects:  94% (181/192)        
remote: Counting objects:  95% (183/192)        
remote: Counting objects:  96% (185/192)        
remote: Counting objects:  97% (187/192)        
remote: Counting objects:  98% (189/192)        
remote: Counting objects:  99% (191/192)        
remote: Counting objects: 100% (192/192)        
remote: Counting objects: 100% (192/192), done.        
 remote: Compressing objects:   1% (1/64)        
remote: Compressing objects:   3% (2/64)        
remote: Compressing objects:   4% (3/64)        
remote: Compressing objects:   6% (4/64)        
remote: Compressing objects:   7% (5/64)        
remote: Compressing objects:   9% (6/64)        
remote: Compressing objects:  10% (7/64)        
remote: Compressing objects:  12% (8/64)        
remote: Compressing objects:  14% (9/64)        
remote: Compressing objects:  15% (10/64)        
remote: Compressing objects:  17% (11/64)        
remote: Compressing objects:  18% (12/64)        
remote: Compressing objects:  20% (13/64)        
remote: Compressing objects:  21% (14/64)        
remote: Compressing objects:  23% (15/64)        
remote: Compressing objects:  25% (16/64)        
remote: Compressing objects:  26% (17/64)        
remote: Compressing objects:  28% (18/64)        
remote: Compressing objects:  29% (19/64)        
remote: Compressing objects:  31% (20/64)        
remote: Compressing objects:  32% (21/64)        
remote: Compressing objects:  34% (22/64)        
remote: Compressing objects:  35% (23/64)        
remote: Compressing objects:  37% (24/64)        
remote: Compressing objects:  39% (25/64)        
remote: Compressing objects:  40% (26/64)        
remote: Compressing objects:  42% (27/64)        
remote: Compressing objects:  43% (28/64)        
remote: Compressing objects:  45% (29/64)        
remote: Compressing objects:  46% (30/64)        
remote: Compressing objects:  48% (31/64)        
remote: Compressing objects:  50% (32/64)        
remote: Compressing objects:  51% (33/64)        
remote: Compressing objects:  53% (34/64)        
remote: Compressing objects:  54% (35/64)        
remote: Compressing objects:  56% (36/64)        
remote: Compressing objects:  57% (37/64)        
remote: Compressing objects:  59% (38/64)        
remote: Compressing objects:  60% (39/64)        
remote: Compressing objects:  62% (40/64)        
remote: Compressing objects:  64% (41/64)        
remote: Compressing objects:  65% (42/64)        
remote: Compressing objects:  67% (43/64)        
remote: Compressing objects:  68% (44/64)        
remote: Compressing objects:  70% (45/64)        
remote: Compressing objects:  71% (46/64)        
remote: Compressing objects:  73% (47/64)        
remote: Compressing objects:  75% (48/64)        
remote: Compressing objects:  76% (49/64)        
remote: Compressing objects:  78% (50/64)        
remote: Compressing objects:  79% (51/64)        
remote: Compressing objects:  81% (52/64)        
remote: Compressing objects:  82% (53/64)        
remote: Compressing objects:  84% (54/64)        
remote: Compressing objects:  85% (55/64)        
remote: Compressing objects:  87% (56/64)        
remote: Compressing objects:  89% (57/64)        
remote: Compressing objects:  90% (58/64)        
remote: Compressing objects:  92% (59/64)        
remote: Compressing objects:  93% (60/64)        
remote: Compressing objects:  95% (61/64)        
remote: Compressing objects:  96% (62/64)        
remote: Compressing objects:  98% (63/64)        
remote: Compressing objects: 100% (64/64)        
remote: Compressing objects: 100% (64/64), done.        
-Receiving objects:   0% (1/192)
Receiving objects:   1% (2/192)
Receiving objects:   2% (4/192)
Receiving objects:   3% (6/192)
Receiving objects:   4% (8/192)
Receiving objects:   5% (10/192)
Receiving objects:   6% (12/192)
Receiving objects:   7% (14/192)
Receiving objects:   8% (16/192)
Receiving objects:   9% (18/192)
Receiving objects:  10% (20/192)
Receiving objects:  11% (22/192)
Receiving objects:  12% (24/192)
Receiving objects:  13% (25/192)
Receiving objects:  14% (27/192)
Receiving objects:  15% (29/192)
Receiving objects:  16% (31/192)
Receiving objects:  17% (33/192)
Receiving objects:  18% (35/192)
Receiving objects:  19% (37/192)
Receiving objects:  20% (39/192)
Receiving objects:  21% (41/192)
Receiving objects:  22% (43/192)
Receiving objects:  23% (45/192)
Receiving objects:  24% (47/192)
Receiving objects:  25% (48/192)
Receiving objects:  26% (50/192)
Receiving objects:  27% (52/192)
Receiving objects:  28% (54/192)
Receiving objects:  29% (56/192)
Receiving objects:  30% (58/192)
Receiving objects:  31% (60/192)
Receiving objects:  32% (62/192)
Receiving objects:  33% (64/192)
Receiving objects:  34% (66/192)
Receiving objects:  35% (68/192)
Receiving objects:  36% (70/192)
Receiving objects:  37% (72/192)
Receiving objects:  38% (73/192)
Receiving objects:  39% (75/192)
Receiving objects:  40% (77/192)
Receiving objects:  41% (79/192)
Receiving objects:  42% (81/192)
Receiving objects:  43% (83/192)
Receiving objects:  44% (85/192)
Receiving objects:  45% (87/192)
Receiving objects:  46% (89/192)
Receiving objects:  47% (91/192)
Receiving objects:  48% (93/192)
Receiving objects:  49% (95/192)
Receiving objects:  50% (96/192)
Receiving objects:  51% (98/192)
Receiving objects:  52% (100/192)
Receiving objects:  53% (102/192)
Receiving objects:  54% (104/192)
Receiving objects:  55% (106/192)
Receiving objects:  56% (108/192)
Receiving objects:  57% (110/192)
Receiving objects:  58% (112/192)
Receiving objects:  59% (114/192)
Receiving objects:  60% (116/192)
Receiving objects:  61% (118/192)
Receiving objects:  62% (120/192)
Receiving objects:  63% (121/192)
Receiving objects:  64% (123/192)
Receiving objects:  65% (125/192)
Receiving objects:  66% (127/192)
Receiving objects:  67% (129/192)
Receiving objects:  68% (131/192)
Receiving objects:  69% (133/192)
Receiving objects:  70% (135/192)
Receiving objects:  71% (137/192)
Receiving objects:  72% (139/192)
Receiving objects:  73% (141/192)
Receiving objects:  74% (143/192)
Receiving objects:  75% (144/192)
Receiving objects:  76% (146/192)
Receiving objects:  77% (148/192)
Receiving objects:  78% (150/192)
Receiving objects:  79% (152/192)
Receiving objects:  80% (154/192)
Receiving objects:  81% (156/192)
Receiving objects:  82% (158/192)
Receiving objects:  83% (160/192)
Receiving objects:  84% (162/192)
Receiving objects:  85% (164/192)
Receiving objects:  86% (166/192)
Receiving objects:  87% (168/192)
Receiving objects:  88% (169/192)
Receiving objects:  89% (171/192)
Receiving objects:  90% (173/192)
Receiving objects:  91% (175/192)
Receiving objects:  92% (177/192)
Receiving objects:  93% (179/192)
Receiving objects:  94% (181/192)
Receiving objects:  95% (183/192)
Receiving objects:  96% (185/192)
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.29 KiB | 1.02 MiB/s, done.
+Receiving objects:   0% (1/192)
Receiving objects:   1% (2/192)
Receiving objects:   2% (4/192)
Receiving objects:   3% (6/192)
Receiving objects:   4% (8/192)
Receiving objects:   5% (10/192)
Receiving objects:   6% (12/192)
Receiving objects:   7% (14/192)
Receiving objects:   8% (16/192)
Receiving objects:   9% (18/192)
Receiving objects:  10% (20/192)
Receiving objects:  11% (22/192)
Receiving objects:  12% (24/192)
Receiving objects:  13% (25/192)
Receiving objects:  14% (27/192)
Receiving objects:  15% (29/192)
Receiving objects:  16% (31/192)
Receiving objects:  17% (33/192)
Receiving objects:  18% (35/192)
Receiving objects:  19% (37/192)
Receiving objects:  20% (39/192)
Receiving objects:  21% (41/192)
Receiving objects:  22% (43/192)
Receiving objects:  23% (45/192)
Receiving objects:  24% (47/192)
Receiving objects:  25% (48/192)
Receiving objects:  26% (50/192)
Receiving objects:  27% (52/192)
Receiving objects:  28% (54/192)
Receiving objects:  29% (56/192)
Receiving objects:  30% (58/192)
Receiving objects:  31% (60/192)
Receiving objects:  32% (62/192)
Receiving objects:  33% (64/192)
Receiving objects:  34% (66/192)
Receiving objects:  35% (68/192)
Receiving objects:  36% (70/192)
Receiving objects:  37% (72/192)
Receiving objects:  38% (73/192)
Receiving objects:  39% (75/192)
Receiving objects:  40% (77/192)
Receiving objects:  41% (79/192)
Receiving objects:  42% (81/192)
Receiving objects:  43% (83/192)
Receiving objects:  44% (85/192)
Receiving objects:  45% (87/192)
Receiving objects:  46% (89/192)
Receiving objects:  47% (91/192)
Receiving objects:  48% (93/192)
Receiving objects:  49% (95/192)
Receiving objects:  50% (96/192)
Receiving objects:  51% (98/192)
Receiving objects:  52% (100/192)
Receiving objects:  53% (102/192)
Receiving objects:  54% (104/192)
Receiving objects:  55% (106/192)
Receiving objects:  56% (108/192)
Receiving objects:  57% (110/192)
Receiving objects:  58% (112/192)
Receiving objects:  59% (114/192)
Receiving objects:  60% (116/192)
Receiving objects:  61% (118/192)
Receiving objects:  62% (120/192)
Receiving objects:  63% (121/192)
Receiving objects:  64% (123/192)
Receiving objects:  65% (125/192)
Receiving objects:  66% (127/192)
Receiving objects:  67% (129/192)
Receiving objects:  68% (131/192)
Receiving objects:  69% (133/192)
Receiving objects:  70% (135/192)
Receiving objects:  71% (137/192)
Receiving objects:  72% (139/192)
Receiving objects:  73% (141/192)
Receiving objects:  74% (143/192)
Receiving objects:  75% (144/192)
Receiving objects:  76% (146/192)
Receiving objects:  77% (148/192)
Receiving objects:  78% (150/192)
Receiving objects:  79% (152/192)
Receiving objects:  80% (154/192)
Receiving objects:  81% (156/192)
Receiving objects:  82% (158/192)
Receiving objects:  83% (160/192)
Receiving objects:  84% (162/192)
Receiving objects:  85% (164/192)
Receiving objects:  86% (166/192)
Receiving objects:  87% (168/192)
Receiving objects:  88% (169/192)
Receiving objects:  89% (171/192)
Receiving objects:  90% (173/192)
Receiving objects:  91% (175/192)
Receiving objects:  92% (177/192)
Receiving objects:  93% (179/192)
Receiving objects:  94% (181/192)
Receiving objects:  95% (183/192)
Receiving objects:  96% (185/192)
remote: Total 192 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
+Receiving objects:  97% (187/192)
Receiving objects:  98% (189/192)
Receiving objects:  99% (191/192)
Receiving objects: 100% (192/192)
Receiving objects: 100% (192/192), 16.30 KiB | 1.02 MiB/s, done.
 pack	d6698cfcaf6e075007fcb2123d8a138210d6d911
-remote: Total 192 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
 27f494dfb7e67d2f9cd2282404adf1d97581aa34 refs/heads/B
 notice: HEAD points to an unborn branch (r)
 notice: HEAD points to an unborn branch (r)
@@ -336625,8 +335353,8 @@
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 origin/B
-{"event":"data_json","sid":"20251218T013634.395030Z-Hfbad846e-P00007cde","thread":"main","time":"2025-12-18T01:36:34.409694Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.014832,"t_rel":0.014832,"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":"20251218T013634.395030Z-Hfbad846e-P00007cde","thread":"main","time":"2025-12-18T01:36:34.409694Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.014832,"t_rel":0.014832,"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":"20241114T193715.464450Z-H5c947e1c-P000066d5","thread":"main","time":"2024-11-14T19:37:15.485260Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.021055,"t_rel":0.021055,"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":"20241114T193715.464450Z-H5c947e1c-P000066d5","thread":"main","time":"2024-11-14T19:37:15.485260Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.021055,"t_rel":0.021055,"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': 
@@ -336636,7 +335364,7 @@
 	grep \"fetch-info\".*\"depth\":1 shallow0/trace2_event
 
 Cloning into 'shallow0'...
-{"event":"data_json","sid":"20251218T013634.508409Z-Hfbad846e-P00007d8e","thread":"main","time":"2025-12-18T01:36:34.525191Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.017026,"t_rel":0.017026,"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":"20241114T193715.687670Z-H5c947e1c-P0000671b","thread":"main","time":"2024-11-14T19:37:15.701248Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.013754,"t_rel":0.013754,"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': 
@@ -336769,8 +335497,8 @@
 Fast-forward
  test.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-{"event":"data_json","sid":"20251218T013635.208499Z-Hfbad846e-P000002d5/20251218T013635.210831Z-Hfbad846e-P000002da/20251218T013635.213852Z-Hfbad846e-P000002e2","thread":"main","time":"2025-12-18T01:36:35.216721Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.003044,"t_rel":0.003044,"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":"20251218T013635.208499Z-Hfbad846e-P000002d5/20251218T013635.210831Z-Hfbad846e-P000002da/20251218T013635.213852Z-Hfbad846e-P000002e2","thread":"main","time":"2025-12-18T01:36:35.216721Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.003044,"t_rel":0.003044,"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":"20241114T193717.323480Z-H5c947e1c-P000069cb/20241114T193717.338582Z-H5c947e1c-P000069ce/20241114T193717.355570Z-H5c947e1c-P000069d3","thread":"main","time":"2024-11-14T19:37:17.361843Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.006439,"t_rel":0.006439,"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":"20241114T193717.323480Z-H5c947e1c-P000069cb/20241114T193717.338582Z-H5c947e1c-P000069ce/20241114T193717.355570Z-H5c947e1c-P000069d3","thread":"main","time":"2024-11-14T19:37:17.361843Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.006439,"t_rel":0.006439,"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': 
@@ -336987,9 +335715,9 @@
 		grep \"fetch-info\".*\"depth\":2147483647 trace2_event
 	)
 
-{"event":"data_json","sid":"20251218T013635.208499Z-Hfbad846e-P000002d5/20251218T013635.210831Z-Hfbad846e-P000002da/20251218T013635.213852Z-Hfbad846e-P000002e2","thread":"main","time":"2025-12-18T01:36:35.216721Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.003044,"t_rel":0.003044,"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":"20251218T013635.527336Z-Hfbad846e-P000004ae/20251218T013635.530709Z-Hfbad846e-P000004b5","thread":"main","time":"2025-12-18T01:36:35.534972Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.004455,"t_rel":0.004455,"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":"20251218T013635.527336Z-Hfbad846e-P000004ae/20251218T013635.530709Z-Hfbad846e-P000004b5","thread":"main","time":"2025-12-18T01:36:35.534972Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.004455,"t_rel":0.004455,"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":"20241114T193717.323480Z-H5c947e1c-P000069cb/20241114T193717.338582Z-H5c947e1c-P000069ce/20241114T193717.355570Z-H5c947e1c-P000069d3","thread":"main","time":"2024-11-14T19:37:17.361843Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.006439,"t_rel":0.006439,"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":"20241114T193718.275546Z-H5c947e1c-P00006bb7/20241114T193718.292422Z-H5c947e1c-P00006bbd","thread":"main","time":"2024-11-14T19:37:18.306138Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.013958,"t_rel":0.013958,"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":"20241114T193718.275546Z-H5c947e1c-P00006bb7/20241114T193718.292422Z-H5c947e1c-P00006bbd","thread":"main","time":"2024-11-14T19:37:18.306138Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.013958,"t_rel":0.013958,"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': 
@@ -337299,7 +336027,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 to_fetch.t
-{"event":"data","sid":"20251218T013637.754805Z-Hfbad846e-P00000e91","thread":"main","time":"2025-12-18T01:36:37.766817Z","file":"fetch-pack.c","line":1757,"repo":1,"t_abs":0.012222,"t_rel":0.006560,"nesting":2,"category":"negotiation_v2","key":"total_rounds","value":"6"}
+{"event":"data","sid":"20241114T193721.059798Z-H5c947e1c-P00007210","thread":"main","time":"2024-11-14T19:37:21.105695Z","file":"fetch-pack.c","line":1757,"repo":1,"t_abs":0.046051,"t_rel":0.011974,"nesting":2,"category":"negotiation_v2","key":"total_rounds","value":"6"}
 remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)        
 ok 44 - in_vain resetted upon ACK
 
@@ -337587,9 +336315,9 @@
 remote: Enumerating objects: 267, done.        
 remote: Counting objects:   0% (1/267)        
remote: Counting objects:   1% (3/267)        
remote: Counting objects:   2% (6/267)        
remote: Counting objects:   3% (9/267)        
remote: Counting objects:   4% (11/267)        
remote: Counting objects:   5% (14/267)        
remote: Counting objects:   6% (17/267)        
remote: Counting objects:   7% (19/267)        
remote: Counting objects:   8% (22/267)        
remote: Counting objects:   9% (25/267)        
remote: Counting objects:  10% (27/267)        
remote: Counting objects:  11% (30/267)        
remote: Counting objects:  12% (33/267)        
remote: Counting objects:  13% (35/267)        
remote: Counting objects:  14% (38/267)        
remote: Counting objects:  15% (41/267)        
remote: Counting objects:  16% (43/267)        
remote: Counting objects:  17% (46/267)        
remote: Counting objects:  18% (49/267)        
remote: Counting objects:  19% (51/267)        
remote: Counting objects:  20% (54/267)        
remote: Counting objects:  21% (57/267)        
remote: Counting objects:  22% (59/267)        
remote: Counting objects:  23% (62/267)        
remote: Counting objects:  24% (65/267)        
remote: Counting objects:  25% (67/267)        
remote: Counting objects:  26% (70/267)        
remote: Counting objects:  27% (73/267)        
remote: Counting objects:  28% (75/267)        
remote: Counting objects:  29% (78/267)        
remote: Counting objects:  30% (81/267)        
remote: Counting objects:  31% (83/267)        
remote: Counting objects:  32% (86/267)        
remote: Counting objects:  33% (89/267)        
remote: Counting objects:  34% (91/267)        
remote: Counting objects:  35% (94/267)        
remote: Counting objects:  36% (97/267)        
remote: Counting objects:  37% (99/267)        
remote: Counting objects:  38% (102/267)        
remote: Counting objects:  39% (105/267)        
remote: Counting objects:  40% (107/267)        
remote: Counting objects:  41% (110/267)        
remote: Counting objects:  42% (113/267)        
remote: Counting objects:  43% (115/267)        
remote: Counting objects:  44% (118/267)        
remote: Counting objects:  45% (121/267)        
remote: Counting objects:  46% (123/267)        
remote: Counting objects:  47% (126/267)        
remote: Counting objects:  48% (129/267)        
remote: Counting objects:  49% (131/267)        
remote: Counting objects:  50% (134/267)        
remote: Counting objects:  51% (137/267)        
remote: Counting objects:  52% (139/267)        
remote: Counting objects:  53% (142/267)        
remote: Counting objects:  54% (145/267)        
remote: Counting objects:  55% (147/267)        
remote: Counting objects:  56% (150/267)        
remote: Counting objects:  57% (153/267)        
remote: Counting objects:  58% (155/267)        
remote: Counting objects:  59% (158/267)        
remote: Counting objects:  60% (161/267)        
remote: Counting objects:  61% (163/267)        
remote: Counting objects:  62% (166/267)        
remote: Counting objects:  63% (169/267)        
remote: Counting objects:  64% (171/267)        
remote: Counting objects:  65% (174/267)        
remote: Counting objects:  66% (177/267)        
remote: Counting objects:  67% (179/267)        
remote: Counting objects:  68% (182/267)        
remote: Counting objects:  69% (185/267)        
remote: Counting objects:  70% (187/267)        
remote: Counting objects:  71% (190/267)        
remote: Counting objects:  72% (193/267)        
remote: Counting objects:  73% (195/267)        
remote: Counting objects:  74% (198/267)        
remote: Counting objects:  75% (201/267)        
remote: Counting objects:  76% (203/267)        
remote: Counting objects:  77% (206/267)        
remote: Counting objects:  78% (209/267)        
remote: Counting objects:  79% (211/267)        
remote: Counting objects:  80% (214/267)        
remote: Counting objects:  81% (217/267)        
remote: Counting objects:  82% (219/267)        
remote: Counting objects:  83% (222/267)        
remote: Counting objects:  84% (225/267)        
remote: Counting objects:  85% (227/267)        
remote: Counting objects:  86% (230/267)        
remote: Counting objects:  87% (233/267)        
remote: Counting objects:  88% (235/267)        
remote: Counting objects:  89% (238/267)        
remote: Counting objects:  90% (241/267)        
remote: Counting objects:  91% (243/267)        
remote: Counting objects:  92% (246/267)        
remote: Counting objects:  93% (249/267)        
remote: Counting objects:  94% (251/267)        
remote: Counting objects:  95% (254/267)        
remote: Counting objects:  96% (257/267)        
remote: Counting objects:  97% (259/267)        
remote: Counting objects:  98% (262/267)        
remote: Counting objects:  99% (265/267)        
remote: Counting objects: 100% (267/267)        
remote: Counting objects: 100% (267/267), done.        
 remote: Compressing objects:   1% (1/96)        
remote: Compressing objects:   2% (2/96)        
remote: Compressing objects:   3% (3/96)        
remote: Compressing objects:   4% (4/96)        
remote: Compressing objects:   5% (5/96)        
remote: Compressing objects:   6% (6/96)        
remote: Compressing objects:   7% (7/96)        
remote: Compressing objects:   8% (8/96)        
remote: Compressing objects:   9% (9/96)        
remote: Compressing objects:  10% (10/96)        
remote: Compressing objects:  11% (11/96)        
remote: Compressing objects:  12% (12/96)        
remote: Compressing objects:  13% (13/96)        
remote: Compressing objects:  14% (14/96)        
remote: Compressing objects:  15% (15/96)        
remote: Compressing objects:  16% (16/96)        
remote: Compressing objects:  17% (17/96)        
remote: Compressing objects:  18% (18/96)        
remote: Compressing objects:  19% (19/96)        
remote: Compressing objects:  20% (20/96)        
remote: Compressing objects:  21% (21/96)        
remote: Compressing objects:  22% (22/96)        
remote: Compressing objects:  23% (23/96)        
remote: Compressing objects:  25% (24/96)        
remote: Compressing objects:  26% (25/96)        
remote: Compressing objects:  27% (26/96)        
remote: Compressing objects:  28% (27/96)        
remote: Compressing objects:  29% (28/96)        
remote: Compressing objects:  30% (29/96)        
remote: Compressing objects:  31% (30/96)        
remote: Compressing objects:  32% (31/96)        
remote: Compressing objects:  33% (32/96)        
remote: Compressing objects:  34% (33/96)        
remote: Compressing objects:  35% (34/96)        
remote: Compressing objects:  36% (35/96)        
remote: Compressing objects:  37% (36/96)        
remote: Compressing objects:  38% (37/96)        
remote: Compressing objects:  39% (38/96)        
remote: Compressing objects:  40% (39/96)        
remote: Compressing objects:  41% (40/96)        
remote: Compressing objects:  42% (41/96)        
remote: Compressing objects:  43% (42/96)        
remote: Compressing objects:  44% (43/96)        
remote: Compressing objects:  45% (44/96)        
remote: Compressing objects:  46% (45/96)        
remote: Compressing objects:  47% (46/96)        
remote: Compressing objects:  48% (47/96)        
remote: Compressing objects:  50% (48/96)        
remote: Compressing objects:  51% (49/96)        
remote: Compressing objects:  52% (50/96)        
remote: Compressing objects:  53% (51/96)        
remote: Compressing objects:  54% (52/96)        
remote: Compressing objects:  55% (53/96)        
remote: Compressing objects:  56% (54/96)        
remote: Compressing objects:  57% (55/96)        
remote: Compressing objects:  58% (56/96)        
remote: Compressing objects:  59% (57/96)        
remote: Compressing objects:  60% (58/96)        
remote: Compressing objects:  61% (59/96)        
remote: Compressing objects:  62% (60/96)        
remote: Compressing objects:  63% (61/96)        
remote: Compressing objects:  64% (62/96)        
remote: Compressing objects:  65% (63/96)        
remote: Compressing objects:  66% (64/96)        
remote: Compressing objects:  67% (65/96)        
remote: Compressing objects:  68% (66/96)        
remote: Compressing objects:  69% (67/96)        
remote: Compressing objects:  70% (68/96)        
remote: Compressing objects:  71% (69/96)        
remote: Compressing objects:  72% (70/96)        
remote: Compressing objects:  73% (71/96)        
remote: Compressing objects:  75% (72/96)        
remote: Compressing objects:  76% (73/96)        
remote: Compressing objects:  77% (74/96)        
remote: Compressing objects:  78% (75/96)        
remote: Compressing objects:  79% (76/96)        
remote: Compressing objects:  80% (77/96)        
remote: Compressing objects:  81% (78/96)        
remote: Compressing objects:  82% (79/96)        
remote: Compressing objects:  83% (80/96)        
remote: Compressing objects:  84% (81/96)        
remote: Compressing objects:  85% (82/96)        
remote: Compressing objects:  86% (83/96)        
remote: Compressing objects:  87% (84/96)        
remote: Compressing objects:  88% (85/96)        
remote: Compressing objects:  89% (86/96)        
remote: Compressing objects:  90% (87/96)        
remote: Compressing objects:  91% (88/96)        
remote: Compressing objects:  92% (89/96)        
remote: Compressing objects:  93% (90/96)        
remote: Compressing objects:  94% (91/96)        
remote: Compressing objects:  95% (92/96)        
remote: Compressing objects:  96% (93/96)        
remote: Compressing objects:  97% (94/96)        
remote: Compressing objects:  98% (95/96)        
remote: Compressing objects: 100% (96/96)        
remote: Compressing objects: 100% (96/96), done.        
-Receiving objects:   0% (1/267)
Receiving objects:   1% (3/267)
Receiving objects:   2% (6/267)
Receiving objects:   3% (9/267)
Receiving objects:   4% (11/267)
Receiving objects:   5% (14/267)
Receiving objects:   6% (17/267)
Receiving objects:   7% (19/267)
Receiving objects:   8% (22/267)
Receiving objects:   9% (25/267)
Receiving objects:  10% (27/267)
Receiving objects:  11% (30/267)
Receiving objects:  12% (33/267)
Receiving objects:  13% (35/267)
Receiving objects:  14% (38/267)
Receiving objects:  15% (41/267)
Receiving objects:  16% (43/267)
Receiving objects:  17% (46/267)
Receiving objects:  18% (49/267)
Receiving objects:  19% (51/267)
Receiving objects:  20% (54/267)
Receiving objects:  21% (57/267)
Receiving objects:  22% (59/267)
Receiving objects:  23% (62/267)
Receiving objects:  24% (65/267)
Receiving objects:  25% (67/267)
Receiving objects:  26% (70/267)
Receiving objects:  27% (73/267)
Receiving objects:  28% (75/267)
Receiving objects:  29% (78/267)
Receiving objects:  30% (81/267)
Receiving objects:  31% (83/267)
Receiving objects:  32% (86/267)
Receiving objects:  33% (89/267)
Receiving objects:  34% (91/267)
Receiving objects:  35% (94/267)
Receiving objects:  36% (97/267)
Receiving objects:  37% (99/267)
Receiving objects:  38% (102/267)
Receiving objects:  39% (105/267)
Receiving objects:  40% (107/267)
Receiving objects:  41% (110/267)
Receiving objects:  42% (113/267)
Receiving objects:  43% (115/267)
Receiving objects:  44% (118/267)
Receiving objects:  45% (121/267)
Receiving objects:  46% (123/267)
Receiving objects:  47% (126/267)
Receiving objects:  48% (129/267)
Receiving objects:  49% (131/267)
Receiving objects:  50% (134/267)
Receiving objects:  51% (137/267)
Receiving objects:  52% (139/267)
Receiving objects:  53% (142/267)
Receiving objects:  54% (145/267)
Receiving objects:  55% (147/267)
Receiving objects:  56% (150/267)
Receiving objects:  57% (153/267)
Receiving objects:  58% (155/267)
Receiving objects:  59% (158/267)
Receiving objects:  60% (161/267)
Receiving objects:  61% (163/267)
Receiving objects:  62% (166/267)
Receiving objects:  63% (169/267)
Receiving objects:  64% (171/267)
Receiving objects:  65% (174/267)
Receiving objects:  66% (177/267)
Receiving objects:  67% (179/267)
Receiving objects:  68% (182/267)
Receiving objects:  69% (185/267)
Receiving objects:  70% (187/267)
Receiving objects:  71% (190/267)
Receiving objects:  72% (193/267)
Receiving objects:  73% (195/267)
Receiving objects:  74% (198/267)
Receiving objects:  75% (201/267)
Receiving objects:  76% (203/267)
Receiving objects:  77% (206/267)
Receiving objects:  78% (209/267)
Receiving objects:  79% (211/267)
Receiving objects:  80% (214/267)
Receiving objects:  81% (217/267)
Receiving objects:  82% (219/267)
Receiving objects:  83% (222/267)
Receiving objects:  84% (225/267)
Receiving objects:  85% (227/267)
Receiving objects:  86% (230/267)
Receiving objects:  87% (233/267)
Receiving objects:  88% (235/267)
Receiving objects:  89% (238/267)
Receiving objects:  90% (241/267)
Receiving objects:  91% (243/267)
Receiving objects:  92% (246/267)
Receiving objects:  93% (249/267)
Receiving objects:  94% (251/267)
Receiving objects:  95% (254/267)
Receiving objects:  96% (257/267)
Receiving objects:  97% (259/267)
Receiving objects:  98% (262/267)
Receiving objects:  99% (265/267)
Receiving objects: 100% (267/267)
Receiving objects: 100% (267/267), 22.41 KiB | 1.24 MiB/s, done.
-Resolving deltas:   0% (0/3)
Resolving deltas:  33% (1/3)
Resolving deltas:  66% (2/3)
remote: Total 267 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)        
-Resolving deltas: 100% (3/3)
Resolving deltas: 100% (3/3), done.
+Receiving objects:   0% (1/267)
Receiving objects:   1% (3/267)
Receiving objects:   2% (6/267)
Receiving objects:   3% (9/267)
Receiving objects:   4% (11/267)
Receiving objects:   5% (14/267)
Receiving objects:   6% (17/267)
Receiving objects:   7% (19/267)
Receiving objects:   8% (22/267)
Receiving objects:   9% (25/267)
Receiving objects:  10% (27/267)
Receiving objects:  11% (30/267)
Receiving objects:  12% (33/267)
Receiving objects:  13% (35/267)
Receiving objects:  14% (38/267)
Receiving objects:  15% (41/267)
Receiving objects:  16% (43/267)
Receiving objects:  17% (46/267)
Receiving objects:  18% (49/267)
Receiving objects:  19% (51/267)
Receiving objects:  20% (54/267)
Receiving objects:  21% (57/267)
Receiving objects:  22% (59/267)
Receiving objects:  23% (62/267)
Receiving objects:  24% (65/267)
Receiving objects:  25% (67/267)
Receiving objects:  26% (70/267)
Receiving objects:  27% (73/267)
Receiving objects:  28% (75/267)
Receiving objects:  29% (78/267)
Receiving objects:  30% (81/267)
Receiving objects:  31% (83/267)
Receiving objects:  32% (86/267)
Receiving objects:  33% (89/267)
Receiving objects:  34% (91/267)
Receiving objects:  35% (94/267)
Receiving objects:  36% (97/267)
Receiving objects:  37% (99/267)
Receiving objects:  38% (102/267)
Receiving objects:  39% (105/267)
Receiving objects:  40% (107/267)
Receiving objects:  41% (110/267)
Receiving objects:  42% (113/267)
Receiving objects:  43% (115/267)
Receiving objects:  44% (118/267)
Receiving objects:  45% (121/267)
Receiving objects:  46% (123/267)
Receiving objects:  47% (126/267)
Receiving objects:  48% (129/267)
Receiving objects:  49% (131/267)
Receiving objects:  50% (134/267)
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 | 882.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
@@ -339222,7 +337950,7 @@
 	test_cmp expected actual &&
 	grep \"fetch-info\".*\"deepen-since\":true shallow11/trace2_event
 
-{"event":"data_json","sid":"20251218T013646.246278Z-Hfbad846e-P000040d4/20251218T013646.252011Z-Hfbad846e-P000040e2","thread":"main","time":"2025-12-18T01:36:46.256296Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.004472,"t_rel":0.004472,"nesting":1,"category":"upload-pack","key":"fetch-info","value":{"haves":1,"wants":1,"want-refs":0,"depth":0,"shallows":1,"deepen-since":true,"deepen-not":0,"deepen-relative":false,"filter":null}}
+{"event":"data_json","sid":"20241114T193744.600242Z-H5c947e1c-P0000269c/20241114T193744.621491Z-H5c947e1c-P000026a1","thread":"main","time":"2024-11-14T19:37:44.624423Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.003062,"t_rel":0.003062,"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': 
@@ -339304,258 +338032,810 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 one.t
-[main ea3a09e] two
+[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.45.2/t/trash directory.t5500-fetch-pack/shallow-exclude/.
+ * [new tag]         two        -> two
+ok 367 - fetch exclude tag one
+
+expecting success of 5500.368 '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.45.2/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.45.2/t/trash directory.t5500-fetch-pack/shallow-deepen/.
+   28cfb97..8f42874  main       -> origin/main
+ * [new tag]         four       -> four
+ * [new tag]         two        -> two
+ok 368 - fetching deepen
+
+expecting success of 5500.369 'use ref advertisement to prune "have" lines sent': 
+	test_negotiation_algorithm_default
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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 369 - use ref advertisement to prune "have" lines sent
+
+expecting success of 5500.370 '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.45.2/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.45.2/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.45.2/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 370 - same as last but with config overrides
+
+expecting success of 5500.371 '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] [--bare]
+           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
+           [--config-env=<name>=<envvar>] <command> [<args>]
+ok 371 - ensure bogus fetch.negotiationAlgorithm yields error
+
+expecting success of 5500.372 '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.45.2/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.45.2/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)        
+b73245b187a878a9334892236f3e85ef70d56705 HEAD
+{"event":"data_json","sid":"20241114T193746.870435Z-H5c947e1c-P00002c74/20241114T193746.879774Z-H5c947e1c-P00002c78","thread":"main","time":"2024-11-14T19:37:46.881253Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.001668,"t_rel":0.001668,"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 372 - filtering by size
+
+expecting success of 5500.373 '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.45.2/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.45.2/t/trash directory.t5500-fetch-pack/client/.git/
+946f2fc4f06e44010ec7f3ed95172068b132ee22 HEAD
+5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
+warning: filtering not recognized by server, ignoring
+ok 373 - filtering by size has no effect if support for it is not advertised
+
+expecting success of 5500.374 'fetch with --filter=blob:limit=0': 
+	fetch_filter_blob_limit_zero server server
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+Cloning into 'client'...
+done.
+[main e2f01e0] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5500-fetch-pack/server
+ * [new ref]         HEAD       -> somewhere
+ * [new tag]         two        -> two
+e2f01e0f193ab9dc45dd1ee874c3edb2a176bf18
+ok 374 - 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 374 test(s)
+# SKIP no web server found at ''
+1..374
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5522-pull-symlink.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5521-pull-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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
-[main 28cfb97] three
+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
-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.45.2/t/trash directory.t5500-fetch-pack/shallow-exclude/.
- * [new tag]         two        -> two
-ok 367 - fetch exclude tag one
+ok 16 - git pull --allow-unrelated-histories
 
-expecting success of 5500.368 '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 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.45.2/t/trash directory.t5500-fetch-pack/shallow-deepen/.git/
-[main (root-commit) 7d32f63] one
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 ea3a09e] two
+Cloning into 'dst'...
+done.
+[main 139b20d] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-[main 28cfb97] three
+From /build/reproducible-path/git-2.45.2/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.45.2/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 three.t
-Cloning into 'deepen'...
-[main 8f42874] four
+ 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 four.t
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5500-fetch-pack/shallow-deepen/.
-   28cfb97..8f42874  main       -> origin/main
- * [new tag]         four       -> four
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5521-pull-options/src
+   4331c28..00bbe3d  main       -> origin/main
  * [new tag]         two        -> two
-ok 368 - fetching deepen
+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 5500.369 'use ref advertisement to prune "have" lines sent': 
-	test_negotiation_algorithm_default
+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.45.2/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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 both_have_2.t
-Cloning into 'client'...
+ create mode 100644 one.t
+Cloning into 'dst'...
 done.
-[main c107eb0] server_has
+[main 5c4888c] two
  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>
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.45.2/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 client_has.t
-From /build/reproducible-path/git-2.45.2/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.45.2/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 369 - use ref advertisement to prune "have" lines sent
+ create mode 100644 two.t
+ok 19 - git pull --signoff add a sign-off line
 
-expecting success of 5500.370 'same as last but with config overrides': 
-	test_negotiation_algorithm_default \
-		-c feature.experimental=true \
-		-c fetch.negotiationAlgorithm=consecutive
+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.45.2/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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 both_have_2.t
-Cloning into 'client'...
+ create mode 100644 one.t
+Cloning into 'dst'...
 done.
-[main d7eee63] server_has
+[main 738d2f7] two
  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>
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.45.2/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 client_has.t
-From /build/reproducible-path/git-2.45.2/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.45.2/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 370 - same as last but with config overrides
-
-expecting success of 5500.371 '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] [--bare]
-           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
-           [--config-env=<name>=<envvar>] <command> [<args>]
-ok 371 - ensure bogus fetch.negotiationAlgorithm yields error
-
-expecting success of 5500.372 '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 &&
+ create mode 100644 two.t
+ok 20 - git pull --no-signoff flag cancels --signoff flag
 
-	grep \"fetch-info\".*\"filter\":\"blob:limit\" client/trace2_event
+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.45.2/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) b73245b] one
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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)        
-b73245b187a878a9334892236f3e85ef70d56705 HEAD
-{"event":"data_json","sid":"20251218T013647.951434Z-Hfbad846e-P00004a75/20251218T013647.956926Z-Hfbad846e-P00004a86","thread":"main","time":"2025-12-18T01:36:47.959529Z","file":"upload-pack.c","line":1579,"repo":0,"t_abs":0.002795,"t_rel":0.002795,"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 372 - filtering by size
-
-expecting success of 5500.373 '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.45.2/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 946f2fc] one
+Cloning into 'dst'...
+done.
+[main 9f92fa5] two
  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.45.2/t/trash directory.t5500-fetch-pack/client/.git/
-946f2fc4f06e44010ec7f3ed95172068b132ee22 HEAD
-5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
-warning: filtering not recognized by server, ignoring
-ok 373 - filtering by size has no effect if support for it is not advertised
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.45.2/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 5500.374 'fetch with --filter=blob:limit=0': 
-	fetch_filter_blob_limit_zero server server
+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.45.2/t/trash directory.t5500-fetch-pack/server/.git/
-[main (root-commit) 65824a5] one
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 'client'...
+Cloning into 'dst'...
 done.
-[main e2f01e0] two
+[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.45.2/t/trash directory.t5500-fetch-pack/server
- * [new ref]         HEAD       -> somewhere
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5521-pull-options/src
+   ac97c8d..4ae1176  main       -> origin/main
  * [new tag]         two        -> two
-e2f01e0f193ab9dc45dd1ee874c3edb2a176bf18
-ok 374 - 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
+Not committing merge; use 'git commit' to complete the merge.
+ok 22 - git pull --no-verify --verify passed to merge
 
-)
-prerequisite NOT_ROOT ok
-# passed all 374 test(s)
-# SKIP no web server found at ''
-1..374
+# passed all 22 test(s)
+1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5523-push-upstream.sh ***
@@ -339773,6 +339053,123 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5524-pull-msg.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.git/
+expecting success of 5524.1 'setup': 
+	test_commit initial afile original &&
+	git clone . cloned &&
+	(
+		cd cloned &&
+		echo added >bfile &&
+		git add bfile &&
+		test_tick &&
+		git commit -m "add bfile"
+	) &&
+	test_tick && test_tick &&
+	echo "second" >afile &&
+	git add afile &&
+	git commit -m "second commit" &&
+	echo "original $dollar" >afile &&
+	git add afile &&
+	git commit -m "do not clobber $dollar signs"
+
+[master (root-commit) f176df3] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 afile
+Cloning into 'cloned'...
+done.
+[master 1facbb5] add bfile
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bfile
+[master 4db85b7] second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master 8393f95] do not clobber $Dollar signs
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 5524.2 'pull': 
+(
+	cd cloned &&
+	git pull --no-rebase --log &&
+	git log -2 &&
+	git cat-file commit HEAD >result &&
+	grep Dollar result
+)
+
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.
+   f176df3..8393f95  master     -> origin/master
+Merge made by the 'ort' strategy.
+ afile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+commit a454b21b358cc261191163cddb6b8a9277aa2aa1
+Merge: 1facbb5 8393f95
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    Merge branch 'master' of /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.
+    
+    * 'master' of /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.:
+      do not clobber $Dollar signs
+      second commit
+
+commit 8393f95971e86cb10f5e23411fa764a2751859f1
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    do not clobber $Dollar signs
+  do not clobber $Dollar signs
+ok 2 - pull
+
+expecting success of 5524.3 '--log=1 limits shortlog length': 
+(
+	cd cloned &&
+	git reset --hard HEAD^ &&
+	test "$(cat afile)" = original &&
+	test "$(cat bfile)" = added &&
+	git pull --no-rebase --log=1 &&
+	git log -3 &&
+	git cat-file commit HEAD >result &&
+	grep Dollar result &&
+	! grep "second commit" result
+)
+
+HEAD is now at 1facbb5 add bfile
+Merge made by the 'ort' strategy.
+ afile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+commit 066d400d03db10d535d48a62f8dcea1a078252c0
+Merge: 1facbb5 8393f95
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    Merge branch 'master' of /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.
+    
+    * 'master' of /build/reproducible-path/git-2.45.2/t/trash directory.t5524-pull-msg/.: (2 commits)
+      do not clobber $Dollar signs
+      ...
+
+commit 8393f95971e86cb10f5e23411fa764a2751859f1
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    do not clobber $Dollar signs
+
+commit 4db85b7332a1f2dd47ed83e51fbde7f24b2baa43
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    second commit
+  do not clobber $Dollar signs
+ok 3 - --log=1 limits shortlog length
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5525-fetch-tagopt.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5525-fetch-tagopt/.git/
 expecting success of 5525.1 'setup': 
@@ -339962,899 +339359,6 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5529-push-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5529-push-errors/.git/
-expecting success of 5529.1 'setup commits': 
-	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 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.45.2/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 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 6 - detect ambiguous refs early
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5530-upload-pack-error.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5530-upload-pack-error/.git/
-expecting success of 5530.1 'setup and corrupt repository': 
-	echo file >file &&
-	git add file &&
-	git rev-parse :file &&
-	git commit -a -m original &&
-	test_tick &&
-	echo changed >file &&
-	git commit -a -m changed &&
-	corrupt_repo HEAD:file
-
-
-f73f3093ff865c514c6c51f867e35f693487d0d3
-[master (root-commit) 2cbe290] original
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 28c3702] changed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup and corrupt repository
-
-expecting success of 5530.2 'fsck fails': 
-	test_must_fail git fsck
-
-missing blob 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
-ok 2 - fsck fails
-
-expecting success of 5530.3 'upload-pack fails due to error in pack-objects packing': 
-	head=$(git rev-parse HEAD) &&
-	hexsz=$(test_oid hexsz) &&
-	printf "%04xwant %s\n00000009done\n0000" \
-		$(($hexsz + 10)) $head >input &&
-	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
-	test_grep "unable to read" output.err &&
-	test_grep "pack-objects died" output.err
-
-fatal: unable to read 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
-error: git upload-pack: git-pack-objects died with error.
-ok 3 - upload-pack fails due to error in pack-objects packing
-
-expecting success of 5530.4 'corrupt repo differently': 
-
-	git hash-object -w file &&
-	corrupt_repo HEAD^^{tree}
-
-
-5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
-ok 4 - corrupt repo differently
-
-expecting success of 5530.5 'fsck fails': 
-	test_must_fail git fsck
-
-broken link from  commit 2cbe290f6e7f12b1021e10cbe824d1208f5edc19
-              to    tree bec63e37d08c454ad3a60cde90b70f3f7d077852
-dangling blob f73f3093ff865c514c6c51f867e35f693487d0d3
-missing tree bec63e37d08c454ad3a60cde90b70f3f7d077852
-ok 5 - fsck fails
-
-expecting success of 5530.6 'upload-pack fails due to error in rev-list': 
-
-	printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \
-		$(($hexsz + 10)) $(git rev-parse HEAD) \
-		$(($hexsz + 12)) $(git rev-parse HEAD^) >input &&
-	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
-	grep "bad tree object" output.err
-
-fatal: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852
-ok 6 - upload-pack fails due to error in rev-list
-
-expecting success of 5530.7 'upload-pack fails due to bad want (no object)': 
-
-	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
-		$(($hexsz + 29)) $(test_oid deadbeef) >input &&
-	test_must_fail git upload-pack . <input >output 2>output.err &&
-	grep "not our ref" output.err &&
-	grep "ERR" output &&
-	! grep multi_ack_detailed output.err
-
-fatal: git upload-pack: not our ref deadbeefdeadbeefdeadbeefdeadbeefdeadbeef
-grep: output: binary file matches
-ok 7 - upload-pack fails due to bad want (no object)
-
-expecting success of 5530.8 'upload-pack fails due to bad want (not tip)': 
-
-	oid=$(echo an object we have | git hash-object -w --stdin) &&
-	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
-		$(($hexsz + 29)) "$oid" >input &&
-	test_must_fail git upload-pack . <input >output 2>output.err &&
-	grep "not our ref" output.err &&
-	grep "ERR" output &&
-	! grep multi_ack_detailed output.err
-
-error: git upload-pack: not our ref 023832c7c4fbc3a6d75879d18bbbef0b476b78b5
-grep: output: binary file matches
-ok 8 - upload-pack fails due to bad want (not tip)
-
-expecting success of 5530.9 'upload-pack fails due to error in pack-objects enumeration': 
-
-	printf "%04xwant %s\n00000009done\n0000" \
-		$((hexsz + 10)) $(git rev-parse HEAD) >input &&
-	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
-	grep "bad tree object" output.err &&
-	grep "pack-objects died" output.err
-
-fatal: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852
-error: git upload-pack: git-pack-objects died with error.
-ok 9 - upload-pack fails due to error in pack-objects enumeration
-
-expecting success of 5530.10 'upload-pack tolerates EOF just after stateless client wants': 
-	test_commit initial &&
-	head=$(git rev-parse HEAD) &&
-
-	{
-		packetize "want $head" &&
-		packetize "shallow $head" &&
-		packetize "deepen 1" &&
-		printf "0000"
-	} >request &&
-
-	printf "0000" >expect &&
-
-	git upload-pack --stateless-rpc . <request >actual &&
-	test_cmp expect actual
-
-[master 61923d4] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-ok 10 - upload-pack tolerates EOF just after stateless client wants
-
-expecting success of 5530.11 'create empty repository': 
-
-	mkdir foo &&
-	cd foo &&
-	git init
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5530-upload-pack-error/foo/.git/
-ok 11 - create empty repository
-
-expecting success of 5530.12 'fetch fails': 
-
-	test_must_fail git fetch .. main
-
-
-fatal: couldn't find remote ref main
-ok 12 - fetch fails
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5528-push-default.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5528-push-default/.git/
-expecting success of 5528.1 'setup bare remotes': 
-	git init --bare repo1 &&
-	git remote add parent1 repo1 &&
-	git init --bare repo2 &&
-	git remote add parent2 repo2 &&
-	test_commit one &&
-	git push parent1 HEAD &&
-	git push parent2 HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5528-push-default/repo1/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5528-push-default/repo2/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-To repo1
- * [new branch]      HEAD -> main
-To repo2
- * [new branch]      HEAD -> main
-ok 1 - setup bare remotes
-
-expecting success of 5528.2 '"upstream" pushes to configured upstream': 
-	git checkout main &&
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/foo &&
-	test_commit two &&
-	test_push_success upstream foo
-
-Already on 'main'
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-To repo1
- * [new branch]      main -> foo
-ok 2 - "upstream" pushes to configured upstream
-
-expecting success of 5528.3 '"upstream" does not push on unconfigured remote': 
-	git checkout main &&
-	test_unconfig branch.main.remote &&
-	test_commit three &&
-	test_push_failure upstream
-
-Already on 'main'
-[main 7c7cd71] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-ok 3 - "upstream" does not push on unconfigured remote
-
-expecting success of 5528.4 '"upstream" does not push on unconfigured branch': 
-	git checkout main &&
-	test_config branch.main.remote parent1 &&
-	test_unconfig branch.main.merge &&
-	test_commit four &&
-	test_push_failure upstream
-
-Already on 'main'
-[main fd8d77e] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-fatal: The current branch main has no upstream branch.
-To push the current branch and set the remote as upstream, use
-
-    git push --set-upstream parent1 main
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-ok 4 - "upstream" does not push on unconfigured branch
-
-expecting success of 5528.5 '"upstream" does not push when remotes do not match': 
-	git checkout main &&
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/foo &&
-	test_config push.default upstream &&
-	test_commit five &&
-	test_must_fail git push parent2
-
-Already on 'main'
-[main a383792] five
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-fatal: You are pushing to remote 'parent2', which is not the upstream of
-your current branch 'main', without telling me what to push
-to update which remote branch.
-ok 5 - "upstream" does not push when remotes do not match
-
-expecting success of 5528.6 '"current" does not push when multiple remotes and none origin': 
-	git checkout main &&
-	test_config push.default current &&
-	test_commit current-multi &&
-	test_must_fail git push
-
-Already on 'main'
-[main 4ca23d4] current-multi
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 current-multi.t
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-ok 6 - "current" does not push when multiple remotes and none origin
-
-expecting success of 5528.7 '"current" pushes when remote explicitly specified': 
-	git checkout main &&
-	test_config push.default current &&
-	test_commit current-specified &&
-	git push parent1
-
-Already on 'main'
-[main 400b0d2] current-specified
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 current-specified.t
-To repo1
-   d79ce16..400b0d2  main -> main
-ok 7 - "current" pushes when remote explicitly specified
-
-expecting success of 5528.8 '"current" pushes to origin when no remote specified among multiple': 
-	git checkout main &&
-	test_config remote.origin.url repo1 &&
-	test_config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
-	test_commit current-origin &&
-	test_push_success current main
-
-Already on 'main'
-[main 7eb4f8b] current-origin
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 current-origin.t
-To repo1
-   400b0d2..7eb4f8b  main -> main
-ok 8 - "current" pushes to origin when no remote specified among multiple
-
-expecting success of 5528.9 '"current" pushes to single remote even when not specified': 
-	git checkout main &&
-	test_when_finished git remote add parent1 repo1 &&
-	git remote remove parent1 &&
-	test_commit current-implied &&
-	test_push_success current main repo2
-
-Already on 'main'
-[main ac06b97] current-implied
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 current-implied.t
-To repo2
-   d79ce16..ac06b97  main -> main
-ok 9 - "current" pushes to single remote even when not specified
-
-expecting success of 5528.10 'push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple ': 
-	git checkout -b new-branch &&
-	test_push_failure simple &&
-	test_push_failure matching &&
-	test_push_failure upstream &&
-	test_push_failure current
-
-Switched to a new branch 'new-branch'
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-fatal: No configured push destination.
-Either specify the URL from the command-line or configure a remote repository using
-
-    git remote add <name> <url>
-
-and then push using the remote name
-
-    git push <name>
-
-ok 10 - push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple 
-
-expecting success of 5528.11 'push from/to new branch fails with upstream and simple ': 
-	git checkout -b new-branch-1 &&
-	test_config branch.new-branch-1.remote parent1 &&
-	test_push_failure simple &&
-	test_push_failure upstream
-
-Switched to a new branch 'new-branch-1'
-fatal: The current branch new-branch-1 has no upstream branch.
-To push the current branch and set the remote as upstream, use
-
-    git push --set-upstream parent1 new-branch-1
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-fatal: The current branch new-branch-1 has no upstream branch.
-To push the current branch and set the remote as upstream, use
-
-    git push --set-upstream parent1 new-branch-1
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-ok 11 - push from/to new branch fails with upstream and simple 
-
-checking known breakage of 5528.12 'push from/to new branch fails with matching ': 
-	git checkout -b new-branch-2 &&
-	test_config branch.new-branch-2.remote parent1 &&
-	test_push_failure matching
-
-Switched to a new branch 'new-branch-2'
-To repo1
-   7eb4f8b..ac06b97  main -> main
-test_must_fail: command succeeded: git -c push.default=matching push
-not ok 12 - push from/to new branch fails with matching  # TODO known breakage
-
-expecting success of 5528.13 'push from/to branch with tracking fails with nothing ': 
-	git checkout -b tracked-branch &&
-	test_config branch.tracked-branch.remote parent1 &&
-	test_config branch.tracked-branch.merge refs/heads/tracked-branch &&
-	test_push_failure nothing
-
-Switched to a new branch 'tracked-branch'
-fatal: You didn't specify any refspecs to push, and push.default is "nothing".
-ok 13 - push from/to branch with tracking fails with nothing 
-
-expecting success of 5528.14 'push from/to new branch succeeds with upstream if push.autoSetupRemote': 
-	git checkout -b new-branch-a &&
-	test_config push.autoSetupRemote true &&
-	test_config branch.new-branch-a.remote parent1 &&
-	test_push_success upstream new-branch-a
-
-Switched to a new branch 'new-branch-a'
-To repo1
- * [new branch]      new-branch-a -> new-branch-a
-branch 'new-branch-a' set up to track 'parent1/new-branch-a'.
-ok 14 - push from/to new branch succeeds with upstream if push.autoSetupRemote
-
-expecting success of 5528.15 'push from/to new branch succeeds with simple if push.autoSetupRemote': 
-	git checkout -b new-branch-c &&
-	test_config push.autoSetupRemote true &&
-	test_config branch.new-branch-c.remote parent1 &&
-	test_push_success simple new-branch-c
-
-Switched to a new branch 'new-branch-c'
-To repo1
- * [new branch]      new-branch-c -> new-branch-c
-branch 'new-branch-c' set up to track 'parent1/new-branch-c'.
-ok 15 - push from/to new branch succeeds with simple if push.autoSetupRemote
-
-expecting success of 5528.16 '"matching" fails if none match': 
-	git init --bare empty &&
-	test_must_fail git push empty : 2>actual &&
-	test_grep "Perhaps you should specify a branch" actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5528-push-default/empty/
-Perhaps you should specify a branch.
-ok 16 - "matching" fails if none match
-
-expecting success of 5528.17 'push ambiguously named branch with upstream, matching and simple': 
-	git checkout -b ambiguous &&
-	test_config branch.ambiguous.remote parent1 &&
-	test_config branch.ambiguous.merge refs/heads/ambiguous &&
-	git tag ambiguous &&
-	test_push_success simple ambiguous &&
-	test_push_success matching ambiguous &&
-	test_push_success upstream ambiguous
-
-Switched to a new branch 'ambiguous'
-To repo1
- * [new branch]      ambiguous -> ambiguous
-Everything up-to-date
-Everything up-to-date
-ok 17 - push ambiguously named branch with upstream, matching and simple
-
-expecting success of 5528.18 'push from/to new branch with current creates remote branch': 
-	test_config branch.new-branch.remote repo1 &&
-	git checkout new-branch &&
-	test_push_success current new-branch
-
-Switched to branch 'new-branch'
-To repo1
- * [new branch]      new-branch -> new-branch
-ok 18 - push from/to new branch with current creates remote branch
-
-expecting success of 5528.19 'push to existing branch, with no upstream configured': 
-	test_config branch.main.remote repo1 &&
-	git checkout main &&
-	test_push_failure simple &&
-	test_push_failure upstream
-
-Switched to branch 'main'
-fatal: The current branch main has no upstream branch.
-To push the current branch and set the remote as upstream, use
-
-    git push --set-upstream repo1 main
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-fatal: The current branch main has no upstream branch.
-To push the current branch and set the remote as upstream, use
-
-    git push --set-upstream repo1 main
-
-To have this happen automatically for branches without a tracking
-upstream, see 'push.autoSetupRemote' in 'git help config'.
-
-ok 19 - push to existing branch, with no upstream configured
-
-expecting success of 5528.20 'push to existing branch, upstream configured with same name': 
-	test_config branch.main.remote repo1 &&
-	test_config branch.main.merge refs/heads/main &&
-	git checkout main &&
-	test_commit six &&
-	test_push_success upstream main &&
-	test_commit seven &&
-	test_push_success simple main
-
-Already on 'main'
-[main 09c26db] six
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-To repo1
-   ac06b97..09c26db  main -> main
-[main 5990f7c] seven
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 seven.t
-To repo1
-   09c26db..5990f7c  main -> main
-ok 20 - push to existing branch, upstream configured with same name
-
-expecting success of 5528.21 'push to existing branch, upstream configured with different name': 
-	test_config branch.main.remote repo1 &&
-	test_config branch.main.merge refs/heads/other-name &&
-	git checkout main &&
-	test_commit eight &&
-	test_push_success upstream other-name &&
-	test_commit nine &&
-	test_push_failure simple &&
-	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >expect-other-name &&
-	test_push_success current main &&
-	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name &&
-	test_cmp expect-other-name actual-other-name
-
-Already on 'main'
-[main ce5228b] eight
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 eight.t
-To repo1
- * [new branch]      main -> other-name
-[main a4fa18b] nine
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 nine.t
-fatal: The upstream branch of your current branch does not match
-the name of your current branch.  To push to the upstream branch
-on the remote, use
-
-    git push repo1 HEAD:other-name
-
-To push to the branch of the same name on the remote, use
-
-    git push repo1 HEAD
-
-To avoid automatically configuring an upstream branch when its name
-won't match the local branch, see option 'simple' of branch.autoSetupMerge
-in 'git help config'.
-
-To repo1
-   5990f7c..a4fa18b  main -> main
-ok 21 - push to existing branch, upstream configured with different name
-
-expecting success of 5528.22 'push.default = current success in central workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-current &&
-		test_push_success current main 
-	
-[main 9a2e3d7] commit-for-current
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-current.t
-To repo1
-   a4fa18b..9a2e3d7  main -> main
-ok 22 - push.default = current success in central workflows
-
-expecting success of 5528.23 'push.default = upstream success in central workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-upstream &&
-		test_push_success upstream foo 
-	
-[main 62006a2] commit-for-upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-upstream.t
-To repo1
-   139b20d..62006a2  main -> foo
-ok 23 - push.default = upstream success in central workflows
-
-expecting success of 5528.24 'push.default = simple failure in central workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-simple &&
-		test_push_failure simple main 
-	
-[main 1552b1b] commit-for-simple
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-simple.t
-fatal: The upstream branch of your current branch does not match
-the name of your current branch.  To push to the upstream branch
-on the remote, use
-
-    git push parent1 HEAD:foo
-
-To push to the branch of the same name on the remote, use
-
-    git push parent1 HEAD
-
-To avoid automatically configuring an upstream branch when its name
-won't match the local branch, see option 'simple' of branch.autoSetupMerge
-in 'git help config'.
-
-ok 24 - push.default = simple failure in central workflows
-
-expecting success of 5528.25 'push.default = matching success in central workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent1 &&
-		test_commit commit-for-matching &&
-		test_push_success matching main 
-	
-[main 75f04d7] commit-for-matching
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-matching.t
-To repo1
-   9a2e3d7..75f04d7  main -> main
-ok 25 - push.default = matching success in central workflows
-
-expecting success of 5528.26 'push.default = current success in triangular workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-current-triangular &&
-		test_push_success current main repo2
-	
-[main 533b416] commit-for-current-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-current-triangular.t
-To repo2
-   ac06b97..533b416  main -> main
-ok 26 - push.default = current success in triangular workflows
-
-expecting success of 5528.27 'push.default = upstream failure in triangular workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-upstream-triangular &&
-		test_push_failure upstream foo repo2
-	
-[main c0923f2] commit-for-upstream-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-upstream-triangular.t
-fatal: You are pushing to remote 'parent2', which is not the upstream of
-your current branch 'main', without telling me what to push
-to update which remote branch.
-ok 27 - push.default = upstream failure in triangular workflows
-
-expecting success of 5528.28 'push.default = simple success in triangular workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-simple-triangular &&
-		test_push_success simple main repo2
-	
-[main 1e888ee] commit-for-simple-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-simple-triangular.t
-To repo2
-   533b416..1e888ee  main -> main
-ok 28 - push.default = simple success in triangular workflows
-
-expecting success of 5528.29 'push.default = matching success in triangular workflows': 
-		test_config branch.main.remote parent1 &&
-		test_config branch.main.merge refs/heads/foo &&
-		test_config remote.pushdefault parent2 &&
-		test_commit commit-for-matching-triangular &&
-		test_push_success matching main repo2
-	
-[main d27b2db] commit-for-matching-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit-for-matching-triangular.t
-To repo2
-   1e888ee..d27b2db  main -> main
-ok 29 - push.default = matching success in triangular workflows
-
-expecting success of 5528.30 'default behavior allows "simple" push': 
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/main &&
-	test_config remote.pushdefault parent1 &&
-	test_commit default-main-main &&
-	test_push_success "" main
-
-[main d645001] default-main-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default-main-main.t
-To repo1
-   75f04d7..d645001  main -> main
-ok 30 - default behavior allows "simple" push
-
-expecting success of 5528.31 'default behavior rejects non-simple push': 
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/foo &&
-	test_config remote.pushdefault parent1 &&
-	test_commit default-main-foo &&
-	test_push_failure ""
-
-[main 4b5e552] default-main-foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default-main-foo.t
-fatal: The upstream branch of your current branch does not match
-the name of your current branch.  To push to the upstream branch
-on the remote, use
-
-    git push parent1 HEAD:foo
-
-To push to the branch of the same name on the remote, use
-
-    git push parent1 HEAD
-
-To choose either option permanently, see push.default in 'git help config'.
-
-To avoid automatically configuring an upstream branch when its name
-won't match the local branch, see option 'simple' of branch.autoSetupMerge
-in 'git help config'.
-
-ok 31 - default behavior rejects non-simple push
-
-expecting success of 5528.32 'default triangular behavior acts like "current"': 
-	test_config branch.main.remote parent1 &&
-	test_config branch.main.merge refs/heads/foo &&
-	test_config remote.pushdefault parent2 &&
-	test_commit default-triangular &&
-	test_push_success "" main repo2
-
-[main daf1bc1] default-triangular
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 default-triangular.t
-To repo2
-   d27b2db..daf1bc1  main -> main
-ok 32 - default triangular behavior acts like "current"
-
-# still have 1 known breakage(s)
-# passed all remaining 31 test(s)
-1..32
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5532-fetch-proxy.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5532-fetch-proxy/.git/
-expecting success of 5532.1 'setup remote repo': 
-	git init remote &&
-	(cd remote &&
-	 echo content >file &&
-	 git add file &&
-	 git commit -m one
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5532-fetch-proxy/remote/.git/
-[master (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup remote repo
-
-expecting success of 5532.2 'setup proxy script': 
-	write_script proxy-get-cmd "$PERL_PATH" <<-\EOF &&
-	read(STDIN, $buf, 4);
-	my $n = hex($buf) - 4;
-	read(STDIN, $buf, $n);
-	my ($cmd, $other) = split /\0/, $buf;
-	# drop absolute-path on repo name
-	$cmd =~ s{ /}{ };
-	print $cmd;
-	EOF
-
-	write_script proxy <<-\EOF
-	echo >&2 "proxying for $*"
-	cmd=$(./proxy-get-cmd)
-	echo >&2 "Running $cmd"
-	exec $cmd
-	EOF
-
-ok 2 - setup proxy script
-
-expecting success of 5532.3 'setup local repo': 
-	git remote add fake git://example.com/remote &&
-	git config core.gitproxy ./proxy
-
-ok 3 - setup local repo
-
-expecting success of 5532.4 'fetch through proxy works': 
-	git fetch fake &&
-	echo one >expect &&
-	git log -1 --format=%s FETCH_HEAD >actual &&
-	test_cmp expect actual
-
-proxying for example.com 9418
-Running git-upload-pack remote
-From git://example.com/remote
- * [new branch]      master     -> fake/master
-ok 4 - fetch through proxy works
-
-expecting success of 5532.5 'funny hostnames are rejected before running proxy': 
-	test_must_fail git fetch git://-remote/repo.git 2>stderr &&
-	! grep "proxying for" stderr
-
-ok 5 - funny hostnames are rejected before running proxy
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5520-pull.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5520-pull/.git/
 expecting success of 5520.1 'setup': 
@@ -342234,2336 +340738,832 @@
 1..72
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5534-push-signed.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/.git/
-expecting success of 5534.1 'setup': 
-	# main, ff and noff branches pointing at the same commit
-	test_tick &&
-	git commit --allow-empty -m initial &&
-
-	git checkout -b noop &&
-	git checkout -b ff &&
-	git checkout -b noff &&
-
-	# noop stays the same, ff advances, noff rewrites
-	test_tick &&
-	git commit --allow-empty --amend -m rewritten &&
-	git checkout ff &&
-
-	test_tick &&
-	git commit --allow-empty -m second
-
-[main (root-commit) 66fe8b3] initial
- Author: A U Thor <author@example.com>
-Switched to a new branch 'noop'
-Switched to a new branch 'ff'
-Switched to a new branch 'noff'
-[noff 6391b7f] rewritten
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
-Switched to branch 'ff'
-[ff 566fbd3] second
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 5534.2 'unsigned push does not send push certificate': 
-	prepare_dst &&
-	test_hook -C dst post-receive <<-\EOF &&
-	# discard the update list
-	cat >/dev/null
-	# record the push certificate
-	if test -n "${GIT_PUSH_CERT-}"
-	then
-		git cat-file blob $GIT_PUSH_CERT >../push-cert
-	fi
-	EOF
-
-	git push dst noop ff +noff &&
-	! test -f dst/push-cert
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/dst/.git/
-To dst
- * [new branch]      main -> noop
- * [new branch]      main -> ff
- * [new branch]      main -> noff
-To dst
-   66fe8b3..566fbd3  ff -> ff
- + 66fe8b3...6391b7f noff -> noff (forced update)
-ok 2 - unsigned push does not send push certificate
-
-expecting success of 5534.3 'talking with a receiver without push certificate support': 
-	prepare_dst &&
-	test_hook -C dst post-receive <<-\EOF &&
-	# discard the update list
-	cat >/dev/null
-	# record the push certificate
-	if test -n "${GIT_PUSH_CERT-}"
-	then
-		git cat-file blob $GIT_PUSH_CERT >../push-cert
-	fi
-	EOF
-
-	git push dst noop ff +noff &&
-	! test -f dst/push-cert
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/dst/.git/
-To dst
- * [new branch]      main -> noop
- * [new branch]      main -> ff
- * [new branch]      main -> noff
-To dst
-   66fe8b3..566fbd3  ff -> ff
- + 66fe8b3...6391b7f noff -> noff (forced update)
-ok 3 - talking with a receiver without push certificate support
-
-expecting success of 5534.4 'push --signed fails with a receiver without push certificate support': 
-	prepare_dst &&
-	test_must_fail git push --signed dst noop ff +noff 2>err &&
-	test_grep "the receiving end does not support" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/dst/.git/
-To dst
- * [new branch]      main -> noop
- * [new branch]      main -> ff
- * [new branch]      main -> noff
-fatal: the receiving end does not support --signed push
-ok 4 - push --signed fails with a receiver without push certificate support
-
-expecting success of 5534.5 'push --signed=1 is accepted': 
-	prepare_dst &&
-	test_must_fail git push --signed=1 dst noop ff +noff 2>err &&
-	test_grep "the receiving end does not support" err
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/dst/.git/
-To dst
- * [new branch]      main -> noop
- * [new branch]      main -> ff
- * [new branch]      main -> noff
-fatal: the receiving end does not support --signed push
-ok 5 - push --signed=1 is accepted
-
-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 6 # skip no certificate for a signed push with no update (missing GPG)
-
-ok 7 # skip signed push sends push certificate (missing GPG)
-
-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 8 # skip ssh signed push sends push certificate (missing GPGSSH)
-
-ok 9 # skip inconsistent push options in signed push not allowed (missing GPG)
-
-ok 10 # skip fail without key and heed user.signingkey (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 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5535-fetch-push-symref.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 )
+*** t5529-push-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5529-push-errors/.git/
+expecting success of 5529.1 'setup commits': 
+	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
-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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5536-fetch-conflicts.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5536-fetch-conflicts/ok/.git/
-From /build/reproducible-path/git-2.45.2/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
+ok 1 - setup commits
 
-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
-	)
+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.45.2/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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5529-push-errors/remote.git/
+ok 2 - setup remote
 
-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
-	)
+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\""
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5536-fetch-conflicts/dcc/.git/
-From /build/reproducible-path/git-2.45.2/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
+ok 3 - setup fake receive-pack
 
-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
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5536-fetch-conflicts/aoc/.git/
-From /build/reproducible-path/git-2.45.2/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
+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 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
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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 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
-	)
+expecting success of 5529.6 '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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+error: src refspec foo matches more than one
+error: failed to push some refs to 'remote.git'
+ok 6 - detect ambiguous refs early
 
-# passed all 7 test(s)
-1..7
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5531-deep-submodule-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5531-deep-submodule-push/pub.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/work/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+*** t5530-upload-pack-error.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5530-upload-pack-error/.git/
+expecting success of 5530.1 'setup and corrupt repository': 
+	echo file >file &&
+	git add file &&
+	git rev-parse :file &&
+	git commit -a -m original &&
+	test_tick &&
+	echo changed >file &&
+	git commit -a -m changed &&
+	corrupt_repo HEAD:file
 
-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
+f73f3093ff865c514c6c51f867e35f693487d0d3
+[master (root-commit) 2cbe290] original
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 28c3702] changed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-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
-	)
+ok 1 - setup and corrupt repository
 
-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 5530.2 'fsck fails': 
+	test_must_fail git fsck
 
-Please try
+missing blob 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
+ok 2 - fsck fails
 
-	git push --recurse-submodules=on-demand
+expecting success of 5530.3 'upload-pack fails due to error in pack-objects packing': 
+	head=$(git rev-parse HEAD) &&
+	hexsz=$(test_oid hexsz) &&
+	printf "%04xwant %s\n00000009done\n0000" \
+		$(($hexsz + 10)) $head >input &&
+	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
+	test_grep "unable to read" output.err &&
+	test_grep "pack-objects died" output.err
 
-or cd to the path and use
+fatal: unable to read 5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
+error: git upload-pack: git-pack-objects died with error.
+ok 3 - upload-pack fails due to error in pack-objects packing
 
-	git push
+expecting success of 5530.4 'corrupt repo differently': 
 
-to push them to a remote.
+	git hash-object -w file &&
+	corrupt_repo HEAD^^{tree}
 
-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
+5ea2ed416fbd4a4cbe227b75fe255dd7fa6bd4d6
+ok 4 - corrupt repo differently
 
-	git push --recurse-submodules=on-demand
+expecting success of 5530.5 'fsck fails': 
+	test_must_fail git fsck
 
-or cd to the path and use
+broken link from  commit 2cbe290f6e7f12b1021e10cbe824d1208f5edc19
+              to    tree bec63e37d08c454ad3a60cde90b70f3f7d077852
+dangling blob f73f3093ff865c514c6c51f867e35f693487d0d3
+missing tree bec63e37d08c454ad3a60cde90b70f3f7d077852
+ok 5 - fsck fails
 
-	git push
+expecting success of 5530.6 'upload-pack fails due to error in rev-list': 
 
-to push them to a remote.
+	printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \
+		$(($hexsz + 10)) $(git rev-parse HEAD) \
+		$(($hexsz + 12)) $(git rev-parse HEAD^) >input &&
+	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
+	grep "bad tree object" output.err
 
-fatal: Aborting.
-ok 4 - push fails if submodule commit not on remote
+fatal: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852
+ok 6 - upload-pack fails due to error in rev-list
 
-fatal: the remote end hung up unexpectedly
-expecting success of 5531.5 'push succeeds after commit was pushed to remote': 
-	(
-		cd work/gar/bage &&
-		git push origin main
-	) &&
-	(
-		cd work &&
-		git push --recurse-submodules=check ../pub.git main
-	)
+expecting success of 5530.7 'upload-pack fails due to bad want (no object)': 
 
-To ../../../submodule.git
-   def33d6..18a8afc  main -> main
-To ../pub.git
-   61d752a..7484e0a  main -> main
-ok 5 - push succeeds after commit was pushed to remote
+	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
+		$(($hexsz + 29)) $(test_oid deadbeef) >input &&
+	test_must_fail git upload-pack . <input >output 2>output.err &&
+	grep "not our ref" output.err &&
+	grep "ERR" output &&
+	! grep multi_ack_detailed output.err
 
-expecting success of 5531.6 'push succeeds if submodule commit not on remote but using on-demand on command line': 
-	(
-		cd work/gar/bage &&
-		>recurse-on-demand-on-command-line &&
-		git add recurse-on-demand-on-command-line &&
-		git commit -m "Recurse on-demand on command line junk"
-	) &&
-	(
-		cd work &&
-		git add gar/bage &&
-		git commit -m "Recurse on-demand on command line for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git main &&
-		# Check that the supermodule commit got there
-		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD main &&
-		# Check that the submodule commit got there too
-		cd gar/bage &&
-		git diff --quiet origin/main main
-	)
+fatal: git upload-pack: not our ref deadbeefdeadbeefdeadbeefdeadbeefdeadbeef
+grep: output: binary file matches
+ok 7 - upload-pack fails due to bad want (no object)
 
-[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 5530.8 'upload-pack fails due to bad want (not tip)': 
 
-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
-	)
+	oid=$(echo an object we have | git hash-object -w --stdin) &&
+	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
+		$(($hexsz + 29)) "$oid" >input &&
+	test_must_fail git upload-pack . <input >output 2>output.err &&
+	grep "not our ref" output.err &&
+	grep "ERR" output &&
+	! grep multi_ack_detailed output.err
 
-[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
+error: git upload-pack: not our ref 023832c7c4fbc3a6d75879d18bbbef0b476b78b5
+grep: output: binary file matches
+ok 8 - upload-pack fails due to bad want (not tip)
 
-expecting success of 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
-	)
+expecting success of 5530.9 'upload-pack fails due to error in pack-objects enumeration': 
 
-[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
+	printf "%04xwant %s\n00000009done\n0000" \
+		$((hexsz + 10)) $(git rev-parse HEAD) >input &&
+	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
+	grep "bad tree object" output.err &&
+	grep "pack-objects died" output.err
 
-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" &&
+fatal: bad tree object bec63e37d08c454ad3a60cde90b70f3f7d077852
+error: git upload-pack: git-pack-objects died with error.
+ok 9 - upload-pack fails due to error in pack-objects enumeration
 
-		# 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^) &&
+expecting success of 5530.10 'upload-pack tolerates EOF just after stateless client wants': 
+	test_commit initial &&
+	head=$(git rev-parse HEAD) &&
 
-		# 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^) &&
+	{
+		packetize "want $head" &&
+		packetize "shallow $head" &&
+		packetize "deepen 1" &&
+		printf "0000"
+	} >request &&
 
-		# 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^) &&
+	printf "0000" >expect &&
 
-		# 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 upload-pack --stateless-rpc . <request >actual &&
+	test_cmp expect actual
 
-[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
+[master 61923d4] initial
  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 overridiing 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^) &&
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+ok 10 - upload-pack tolerates EOF just after stateless client wants
 
-		# 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)
-	)
+expecting success of 5530.11 'create empty repository': 
 
-[main 5786194] Recurse on command-line overridiing 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 24751d1] 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
+	mkdir foo &&
+	cd foo &&
+	git init
 
-Please try
 
-	git push --recurse-submodules=on-demand
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5530-upload-pack-error/foo/.git/
+ok 11 - create empty repository
 
-or cd to the path and use
+expecting success of 5530.12 'fetch fails': 
 
-	git push
+	test_must_fail git fetch .. main
 
-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..24751d1  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Everything up-to-date
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   b5bd2c4..5786194  main -> main
-Everything up-to-date
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 10 - push recurse-submodules last one wins on command line
+fatal: couldn't find remote ref main
+ok 12 - fetch fails
 
-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
-	)
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5528-push-default.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5528-push-default/.git/
+expecting success of 5528.1 'setup bare remotes': 
+	git init --bare repo1 &&
+	git remote add parent1 repo1 &&
+	git init --bare repo2 &&
+	git remote add parent2 repo2 &&
+	test_commit one &&
+	git push parent1 HEAD &&
+	git push parent2 HEAD
 
-[main 1e38ba1] 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 e6b601f] Recurse on-demand on command-line overriding config for gar/bage
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5528-push-default/repo1/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5528-push-default/repo2/
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   5786194..1e38ba1  main -> main
-To ../pub.git
-   24751d1..e6b601f  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-ok 11 - push succeeds if submodule commit not on remote using on-demand from cmdline overriding config
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+To repo1
+ * [new branch]      HEAD -> main
+To repo2
+ * [new branch]      HEAD -> main
+ok 1 - setup bare remotes
 
-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
-	)
+expecting success of 5528.2 '"upstream" pushes to configured upstream': 
+	git checkout main &&
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/foo &&
+	test_commit two &&
+	test_push_success upstream foo
 
-[main 0ec5589] 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 87771bd] Recurse disable on command-line overriding config for gar/bage
+Already on 'main'
+[main 139b20d] two
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   e6b601f..87771bd  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   1e38ba1..0ec5589  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 two.t
+To repo1
+ * [new branch]      main -> foo
+ok 2 - "upstream" pushes to configured upstream
 
-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
-	)
+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
 
-[main 8a95ebc] 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 58db74b] Recurse disable on command-line alternative overriding config for gar/bage
+Already on 'main'
+[main 7c7cd71] three
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   87771bd..58db74b  main -> main
-From ../pub
- * branch            HEAD       -> FETCH_HEAD
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   0ec5589..8a95ebc  main -> main
-Everything up-to-date
-ok 13 - push succeeds if submodule commit disabling recursion from cmdline (alternative form) overriding config
+ 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
 
-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
+    git remote add <name> <url>
 
-[main 58d58de] bad commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: submodule entry 'gar/bage' (158eaa063541ac49203e71fb5012f43df9559cf6) is a tag, not a commit
-HEAD is now at 58db74b Recurse disable on command-line alternative overriding config for gar/bage
-ok 14 - submodule entry pointing at a tag is error
+and then push using the remote name
 
-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 push <name>
 
-[main 631ecb2] 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 8ffc817] 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
-   8a95ebc..631ecb2  main -> main
-To ../pub.git
-   58db74b..8ffc817  main -> main
-ok 15 - push fails if recurse submodules option passed as yes
+ok 3 - "upstream" does not push on unconfigured remote
 
-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
-	)
+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
 
-[main c5a29bf] Fourth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk4
-[main 357d056] Fourth commit for gar/bage
+Already on 'main'
+[main fd8d77e] four
  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:
+ 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 switch -c <new-branch-name>
+    git push --set-upstream parent1 main
 
-Or undo this operation with:
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-  git switch -
+ok 4 - "upstream" does not push on unconfigured branch
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 631ecb2 Recurse push fails if recurse submodules option passed as yes
-[branch2 c7025c9] First junk
+Already on 'main'
+[main a383792] five
  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 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
 
-Please try
+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
 
-	git push --recurse-submodules=on-demand
+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
 
-or cd to the path and use
+    git remote add <name> <url>
 
-	git push
+and then push using the remote name
 
-to push them to a remote.
+    git push <name>
 
-fatal: Aborting.
-ok 16 - push fails when commit on multiple branches if one branch has no remote
+ok 6 - "current" does not push when multiple remotes and none origin
 
-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
-	)
+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
 
-fatal: the remote end hung up unexpectedly
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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 advice.addEmbeddedRepo false"
-[main (root-commit) c2121a0] added submodule
+Already on 'main'
+[main 400b0d2] current-specified
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 160000 b
-To /build/reproducible-path/git-2.45.2/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 631ecb2 Recurse push fails if recurse submodules option passed as yes
-Switched to branch 'main'
-[main 1c18247] Fifth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk5
-To ../../../submodule.git
-   631ecb2..1c18247  main -> main
-Switched to branch 'main'
-M	gar/bage
-[main 7c1f605] Fifth commit for gar/bage
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-To ../pub.git
-   8ffc817..7c1f605  main -> main
-ok 18 - push unpushed submodules when not needed
+ create mode 100644 current-specified.t
+To repo1
+   d79ce16..400b0d2  main -> main
+ok 7 - "current" pushes when remote explicitly specified
 
-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
+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
 
-[main bf3a7b7] Sixth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk6
-[main 4df5b78] Second junk for work
+Already on 'main'
+[main 7eb4f8b] current-origin
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk2
-To ../pub.git
-   7c1f605..4df5b78  main -> main
-ok 19 - push unpushed submodules when not needed 2
+ 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 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
+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 e687a1f] 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 e7bbb73] Seventh commit for gar/bage
+[main ac06b97] current-implied
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   1c18247..e687a1f  main -> main
-To ../pub.git
-   4df5b78..e7bbb73  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.
+ 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
 
-If you want to 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 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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+    git remote add <name> <url>
 
-  git switch -
+and then push using the remote name
 
-Turn off this advice by setting config variable advice.detachedHead to false
+    git push <name>
 
-HEAD is now at e687a1f Seventh junk
-[detached HEAD 9c6181e] Eighth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk8
-[main 55d30e4] 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
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
 
-Please try
+    git remote add <name> <url>
 
-	git push --recurse-submodules=on-demand
+and then push using the remote name
 
-or cd to the path and use
+    git push <name>
 
-	git push
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
 
-to push them to a remote.
+    git remote add <name> <url>
 
-fatal: Aborting.
-fatal: the remote end hung up unexpectedly
-HEAD is now at e7bbb73 Seventh commit for gar/bage
-ok 21 - push unpushable submodule recursively fails
+and then push using the remote name
 
-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 push <name>
 
-		# 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
+fatal: No configured push destination.
+Either specify the URL from the command-line or configure a remote repository using
 
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+    git remote add <name> <url>
 
-  9c6181e Eighth junk
+and then push using the remote name
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+    git push <name>
 
- git branch <new-branch-name> 9c6181e
+ok 10 - push from/to new branch with non-defaulted remote fails with upstream, matching, current and simple 
 
-Switched to branch 'main'
-[main 98997b9] 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 abf9a2f] 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
-   e687a1f..98997b9  main -> main
-To ../pub.git
-   e7bbb73..abf9a2f  main -> main
-ok 22 - push --dry-run does not recursively update submodules
+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
 
-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 &&
+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 -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 push --set-upstream parent1 new-branch-1
 
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   e687a1f..98997b9  main -> main
-Everything up-to-date
-ok 23 - push --dry-run does not recursively update submodules
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-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 &&
+fatal: The current branch new-branch-1 has no upstream branch.
+To push the current branch and set the remote as upstream, use
 
-	git -C work push --recurse-submodules=only ../pub.git main &&
+    git push --set-upstream parent1 new-branch-1
 
-	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
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-Pushing submodule 'gar/bage'
-To ../../../submodule.git
-   e687a1f..98997b9  main -> main
-Everything up-to-date
-ok 24 - push only unpushed submodules recursively
+ok 11 - push from/to new branch fails with upstream and simple 
 
-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 &&
+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
 
-	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
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
-done.
-Submodule path 'sub': checked out '368641e94e5de2829cfae22976de19274d54c11a'
-Submodule 'deepsub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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 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
 
-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 &&
+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_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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
-done.
-Submodule path 'sub': checked out '14913541b28e52bad23119683708fc45d9376bed'
-Submodule 'deepsub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
-Cloning into '/build/reproducible-path/git-2.45.2/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
+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 5531.27 'push propagating the remotes name to a submodule': 
-	git -C work remote add origin ../pub.git &&
-	git -C work remote add pub ../pub.git &&
+expecting success of 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
 
-	> 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" &&
+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
 
-	# Fails when submodule does not have a matching remote
-	test_must_fail git -C work push --recurse-submodules=on-demand pub main &&
-	# Succeeds when submodules has matching remote and refspec
-	git -C work push --recurse-submodules=on-demand origin main &&
+expecting success of 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
 
-	git -C submodule.git rev-parse main >actual_submodule &&
-	git -C pub.git rev-parse main >actual_pub &&
-	git -C work/gar/bage rev-parse main >expected_submodule &&
-	git -C work rev-parse main >expected_pub &&
-	test_cmp expected_submodule actual_submodule &&
-	test_cmp expected_pub actual_pub
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5528-push-default/empty/
+Perhaps you should specify a branch.
+ok 16 - "matching" fails if none match
 
-[main ba83752] Tenth junk
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 junk10
-[main 9ea36f0] 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
-   98997b9..ba83752  main -> main
-To ../pub.git
-   e7bbb73..9ea36f0  main -> main
-ok 27 - push propagating the remotes name to a submodule
+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
 
-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" &&
+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
 
-	git -C work checkout branch2 &&
-	git -C work add gar/bage &&
-	git -C work commit -m "updating gar/bage in branch2" &&
+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
 
-	# 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 &&
+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
 
-	git -C work/gar/bage branch branch2 main &&
-	git -C work push --recurse-submodules=on-demand origin branch2 &&
+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 -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 'main'
+fatal: The current branch main has no upstream branch.
+To push the current branch and set the remote as upstream, use
 
-[main f5bf038] 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 e90f65a] 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 'e90f65a59e381ada484131b40a354ef272b4fe2d' 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
+    git push --set-upstream repo1 main
 
-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" &&
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-	git -C work checkout branch2 &&
-	git -C work add gar/bage &&
-	git -C work commit -m "updating gar/bage in branch2" &&
+fatal: The current branch main has no upstream branch.
+To push the current branch and set the remote as upstream, use
 
-	# Passes since the superproject and submodules HEAD are both on branch2
-	git -C work push --recurse-submodules=on-demand origin \
-		HEAD:refs/heads/branch2 &&
+    git push --set-upstream repo1 main
 
-	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
+To have this happen automatically for branches without a tracking
+upstream, see 'push.autoSetupRemote' in 'git help config'.
 
-Switched to branch 'branch2'
-[branch2 70ffd3e] 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 0c08f34] 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
-   f5bf038..70ffd3e  HEAD -> branch2
-To ../pub.git
-   e90f65a..0c08f34  HEAD -> branch2
-ok 29 - push propagating HEAD refspec to a submodule
+ok 19 - push to existing branch, with no upstream configured
 
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5538-push-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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
 
-[main (root-commit) 866032c] 1
+Already on 'main'
+[main 09c26db] six
  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.45.2/t/trash directory.t5538-push-shallow/full-abc/.git/
-[main (root-commit) 5f99454] a
+ 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 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
+ 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 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
+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
 
-[main a94059e] 5
+Already on 'main'
+[main ce5228b] eight
  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
+ 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(+), 1 deletion(-)
-To shallow2/.git
- * [new reference]   main -> top/main
-ok 6 - push from full to shallow
+ 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
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5539-fetch-http-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5539-fetch-http-shallow/.git/
-checking prerequisite: NOT_ROOT
+    git push repo1 HEAD:other-name
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+To push to the branch of the same name on the remote, use
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5540-http-push-webdav.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5540-http-push-webdav/.git/
-checking prerequisite: NOT_ROOT
+    git push repo1 HEAD
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+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'.
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5537-fetch-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+To repo1
+   5990f7c..a4fa18b  main -> main
+ok 21 - push to existing branch, upstream configured with different name
 
-[main (root-commit) 866032c] 1
+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 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
-	)
+ create mode 100644 commit-for-current.t
+To repo1
+   a4fa18b..9a2e3d7  main -> main
+ok 22 - push.default = current success in central workflows
 
-[main a94059e] 5
+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(+), 1 deletion(-)
-From /build/reproducible-path/git-2.45.2/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
-	)
+ 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
 
-[main 27db150] 6
+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(+), 1 deletion(-)
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/shallow
-   a94059e..27db150  main       -> origin/main
-ok 5 - fetch --depth from shallow clone
+ 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
 
-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
-	)
+    git push parent1 HEAD:foo
 
-ok 6 - fetch --unshallow from shallow clone
+To push to the branch of the same name on the remote, use
 
-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
-	)
+    git push parent1 HEAD
 
-Cloning into 'shallow3'...
-ok 7 - fetch --unshallow from a full clone
+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 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
+ok 24 - push.default = simple failure in central workflows
 
-fatal: git cat-file d00491fd7e5bb6fa28c517a0bb32b8b506539d4d: bad file
-[main c7f5970] add-1-back
+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 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
-	)
+ create mode 100644 commit-for-matching.t
+To repo1
+   9a2e3d7..75f04d7  main -> main
+ok 25 - push.default = matching success in central workflows
 
-Switched to a new branch 'no-shallow'
-[no-shallow (root-commit) 20d88d1] no-shallow
+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 tracked
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-	)
+ create mode 100644 commit-for-current-triangular.t
+To repo2
+   ac06b97..533b416  main -> main
+ok 26 - push.default = current success in triangular workflows
 
-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
+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(+), 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/*
+ 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/a-submodule/.git/
-[main (root-commit) ddd63c9] foo
+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 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/repo-with-sub/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/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
+ create mode 100644 commit-for-simple-triangular.t
+To repo2
+   533b416..1e888ee  main -> main
+ok 28 - push.default = simple success in triangular workflows
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/repo-with-sub/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/repo-with-sub/a-submodule'...
-done.
-[main (root-commit) 56fa32c] added submodule
+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>
- 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
+ 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 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
-	)
+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
 
-Already on 'main'
-Your branch is ahead of 'origin/main' by 3 commits.
-  (use "git push" to publish your local commits)
-[main a02f4de] 8
+[main d645001] default-main-main
  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 &&
+ 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
 
-	git -C shallow-server branch branch-orig $d &&
-	git -C shallow-client fetch --prune --depth=2 \
-		origin "+refs/heads/*:refs/remotes/origin/*"
+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 ""
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+[main 4b5e552] default-main-foo
  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.45.2/t/trash directory.t5537-fetch-shallow/shallow-server
- - [deleted]         (none)     -> origin/branch
-fatal: Needed a single revision
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/shallow-server
- * [new branch]      branch-orig -> origin/branch-orig
-ok 15 - .git/shallow is edited by repack
+ 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
 
-checking prerequisite: NOT_ROOT
+    git push parent1 HEAD:foo
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+To push to the branch of the same name on the remote, use
 
-)
-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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5541-http-push-smart.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5541-http-push-smart/.git/
-checking prerequisite: NOT_ROOT
+    git push parent1 HEAD
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+To choose either option permanently, see push.default in 'git help config'.
+
+To avoid automatically configuring an upstream branch when its name
+won't match the local branch, see option 'simple' of branch.autoSetupMerge
+in 'git help config'.
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5542-push-http-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5542-push-http-shallow/.git/
-checking prerequisite: NOT_ROOT
+ok 31 - default behavior rejects non-simple push
 
-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 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
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
+[main daf1bc1] default-triangular
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 default-triangular.t
+To repo2
+   d27b2db..daf1bc1  main -> main
+ok 32 - default triangular behavior acts like "current"
+
+# still have 1 known breakage(s)
+# passed all remaining 31 test(s)
+1..32
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5510-fetch.sh ***
@@ -353089,1703 +350089,1924 @@
 1..186
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5544-pack-objects-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5544-pack-objects-hook/.git/
-expecting success of 5544.1 'create some history to fetch': 
-	test_commit one &&
-	test_commit two
+*** t5532-fetch-proxy.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5532-fetch-proxy/.git/
+expecting success of 5532.1 'setup remote repo': 
+	git init remote &&
+	(cd remote &&
+	 echo content >file &&
+	 git add file &&
+	 git commit -m one
+	)
 
-[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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5532-fetch-proxy/remote/.git/
+[master (root-commit) f39a923] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 1 - create some history to fetch
+ create mode 100644 file
+ok 1 - setup remote repo
 
-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
+expecting success of 5532.2 'setup proxy script': 
+	write_script proxy-get-cmd "$PERL_PATH" <<-\EOF &&
+	read(STDIN, $buf, 4);
+	my $n = hex($buf) - 4;
+	read(STDIN, $buf, $n);
+	my ($cmd, $other) = split /\0/, $buf;
+	# drop absolute-path on repo name
+	$cmd =~ s{ /}{ };
+	print $cmd;
 	EOF
 
-ok 2 - create debugging hook script
+	write_script proxy <<-\EOF
+	echo >&2 "proxying for $*"
+	cmd=$(./proxy-get-cmd)
+	echo >&2 "Running $cmd"
+	exec $cmd
+	EOF
 
-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
+ok 2 - setup proxy script
 
-remote: hook running        
-ok 3 - hook runs via global config
+expecting success of 5532.3 'setup local repo': 
+	git remote add fake git://example.com/remote &&
+	git config core.gitproxy ./proxy
 
-expecting success of 5544.4 'hook outputs are sane': 
-	# check that we recorded a usable pack
-	git index-pack --stdin <.git/hook.stdout &&
+ok 3 - setup local repo
 
-	# 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
+expecting success of 5532.4 'fetch through proxy works': 
+	git fetch fake &&
+	echo one >expect &&
+	git log -1 --format=%s FETCH_HEAD >actual &&
+	test_cmp expect actual
 
-pack	2a0b62213eae197db6150718d99ad9a6e24df950
-git pack-objects --revs --thin --stdout --delta-base-offset
-ok 4 - hook outputs are sane
+proxying for example.com 9418
+Running git-upload-pack remote
+From git://example.com/remote
+ * [new branch]      master     -> fake/master
+ok 4 - fetch through proxy works
 
-expecting success of 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
+expecting success of 5532.5 'funny hostnames are rejected before running proxy': 
+	test_must_fail git fetch git://-remote/repo.git 2>stderr &&
+	! grep "proxying for" stderr
 
-remote: hook running        
-ok 5 - hook runs from -c config
+ok 5 - funny hostnames are rejected before running proxy
 
-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 &&
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5534-push-signed.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/.git/
+expecting success of 5534.1 'setup': 
+	# main, ff and noff branches pointing at the same commit
+	test_tick &&
+	git commit --allow-empty -m initial &&
 
-	# 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
+	git checkout -b noop &&
+	git checkout -b ff &&
+	git checkout -b noff &&
 
-remote: hook running        
-ok 6 - hook does not run from repo config
+	# noop stays the same, ff advances, noff rewrites
+	test_tick &&
+	git commit --allow-empty --amend -m rewritten &&
+	git checkout ff &&
 
-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
+	test_tick &&
+	git commit --allow-empty -m second
 
-Cloning into bare repository 'dst.git'...
-remote: hook running        
-ok 7 - hook works with partial clone
+[main (root-commit) 66fe8b3] initial
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'noop'
+Switched to a new branch 'ff'
+Switched to a new branch 'noff'
+[noff 6391b7f] rewritten
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+Switched to branch 'ff'
+[ff 566fbd3] second
+ Author: A U Thor <author@example.com>
+ok 1 - setup
 
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5546-receive-limits.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/.git/
-expecting success of 5546.1 'create known-size (1024 bytes) commit': 
-	test-tool genrandom foo 1024 >one-k &&
-	git add one-k &&
-	test_commit one-k
+expecting success of 5534.2 'unsigned push does not send push certificate': 
+	prepare_dst &&
+	test_hook -C dst post-receive <<-\EOF &&
+	# discard the update list
+	cat >/dev/null
+	# record the push certificate
+	if test -n "${GIT_PUSH_CERT-}"
+	then
+		git cat-file blob $GIT_PUSH_CERT >../push-cert
+	fi
+	EOF
 
-[master (root-commit) cba7046] one-k
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 one-k
- create mode 100644 one-k.t
-ok 1 - create known-size (1024 bytes) commit
+	git push dst noop ff +noff &&
+	! test -f dst/push-cert
 
-expecting success of 5546.2 'prepare destination repository': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
-ok 2 - prepare destination repository
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/dst/.git/
+To dst
+ * [new branch]      main -> noop
+ * [new branch]      main -> ff
+ * [new branch]      main -> noff
+To dst
+   66fe8b3..566fbd3  ff -> ff
+ + 66fe8b3...6391b7f noff -> noff (forced update)
+ok 2 - unsigned push does not send push certificate
 
-expecting success of 5546.3 'set unpacklimit to 1': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
-	
-ok 3 - set unpacklimit to 1
+expecting success of 5534.3 'talking with a receiver without push certificate support': 
+	prepare_dst &&
+	test_hook -C dst post-receive <<-\EOF &&
+	# discard the update list
+	cat >/dev/null
+	# record the push certificate
+	if test -n "${GIT_PUSH_CERT-}"
+	then
+		git cat-file blob $GIT_PUSH_CERT >../push-cert
+	fi
+	EOF
 
-expecting success of 5546.4 'setting receive.maxInputSize to 512 rejects push': 
-		git --git-dir=dest config receive.maxInputSize 512 &&
-		test_must_fail git push dest HEAD
-	
-remote: fatal: pack exceeds maximum allowed size (512 bytes)        
-error: remote unpack failed: index-pack abnormal exit
-To dest
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dest'
-ok 4 - setting receive.maxInputSize to 512 rejects push
+	git push dst noop ff +noff &&
+	! test -f dst/push-cert
 
-expecting success of 5546.5 'bumping limit to 4k allows push': 
-		git --git-dir=dest config receive.maxInputSize 4k &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 5 - bumping limit to 4k allows push
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/dst/.git/
+To dst
+ * [new branch]      main -> noop
+ * [new branch]      main -> ff
+ * [new branch]      main -> noff
+To dst
+   66fe8b3..566fbd3  ff -> ff
+ + 66fe8b3...6391b7f noff -> noff (forced update)
+ok 3 - talking with a receiver without push certificate support
 
-expecting success of 5546.6 'prepare destination repository (again)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
-ok 6 - prepare destination repository (again)
+expecting success of 5534.4 'push --signed fails with a receiver without push certificate support': 
+	prepare_dst &&
+	test_must_fail git push --signed dst noop ff +noff 2>err &&
+	test_grep "the receiving end does not support" err
 
-expecting success of 5546.7 'lifting the limit allows push': 
-		git --git-dir=dest config receive.maxInputSize 0 &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 7 - lifting the limit allows push
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/dst/.git/
+To dst
+ * [new branch]      main -> noop
+ * [new branch]      main -> ff
+ * [new branch]      main -> noff
+fatal: the receiving end does not support --signed push
+ok 4 - push --signed fails with a receiver without push certificate support
 
-expecting success of 5546.8 'prepare destination repository (once more)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
-ok 8 - prepare destination repository (once more)
+expecting success of 5534.5 'push --signed=1 is accepted': 
+	prepare_dst &&
+	test_must_fail git push --signed=1 dst noop ff +noff 2>err &&
+	test_grep "the receiving end does not support" err
 
-expecting success of 5546.9 'receive trumps transfer': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
-		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
-		git push dest HEAD &&
-		validate_store_type
-	
-To dest
- * [new branch]      HEAD -> master
-count: 0
-ok 9 - receive trumps transfer
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5534-push-signed/dst/.git/
+To dst
+ * [new branch]      main -> noop
+ * [new branch]      main -> ff
+ * [new branch]      main -> noff
+fatal: the receiving end does not support --signed push
+ok 5 - push --signed=1 is accepted
 
-expecting success of 5546.10 'prepare destination repository': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
-ok 10 - prepare destination repository
+checking prerequisite: GPG
 
-expecting success of 5546.11 'set unpacklimit to 10000': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
-	
-ok 11 - set unpacklimit to 10000
+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 5546.12 'setting receive.maxInputSize to 512 rejects push': 
-		git --git-dir=dest config receive.maxInputSize 512 &&
-		test_must_fail git push dest HEAD
-	
-remote: fatal: pack exceeds maximum allowed size        
-error: remote unpack failed: unpack-objects abnormal exit
-To dest
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dest'
-ok 12 - setting receive.maxInputSize to 512 rejects push
+	# 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 5546.13 'bumping limit to 4k allows push': 
-		git --git-dir=dest config receive.maxInputSize 4k &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 13 - bumping limit to 4k allows push
+)
+prerequisite GPG not satisfied
+ok 6 # skip no certificate for a signed push with no update (missing GPG)
 
-expecting success of 5546.14 'prepare destination repository (again)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
-ok 14 - prepare destination repository (again)
+ok 7 # skip signed push sends push certificate (missing GPG)
 
-expecting success of 5546.15 'lifting the limit allows push': 
-		git --git-dir=dest config receive.maxInputSize 0 &&
-		git push dest HEAD
-	
-To dest
- * [new branch]      HEAD -> master
-ok 15 - lifting the limit allows push
+checking prerequisite: GPGSSH
 
-expecting success of 5546.16 'prepare destination repository (once more)': 
-		rm -fr dest &&
-		git --bare init dest
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
-ok 16 - prepare destination repository (once more)
+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;
 
-expecting success of 5546.17 'receive trumps transfer': 
-		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
-		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
-		git push dest HEAD &&
-		validate_store_type
-	
-To dest
- * [new branch]      HEAD -> master
-packs: 0
-ok 17 - receive trumps transfer
+	# 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 &&
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5547-push-quarantine.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5547-push-quarantine/.git/
-expecting success of 5547.1 'create picky dest repo': 
-	git init --bare dest.git &&
-	test_hook --setup -C dest.git pre-receive <<-\EOF
-	while read old new ref; do
-		test "$(git log -1 --format=%s $new)" = reject && exit 1
-	done
-	exit 0
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5547-push-quarantine/dest.git/
-ok 1 - create picky dest repo
+	# 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 5547.2 'accepted objects work': 
-	test_commit ok &&
-	git push dest.git HEAD &&
-	commit=$(git rev-parse HEAD) &&
-	git --git-dir=dest.git cat-file commit $commit
+)
+prerequisite GPGSSH not satisfied
+ok 8 # skip ssh signed push sends push certificate (missing GPGSSH)
 
-[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 9 # skip inconsistent push options in signed push not allowed (missing GPG)
 
-ok
-ok 2 - accepted objects work
+ok 10 # skip fail without key and heed user.signingkey (missing GPG)
 
-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
+checking prerequisite: GPGSM
 
-[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
+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 &&
 
-expecting success of 5547.4 'rejected objects are removed': 
-	echo "incoming-*" >expect &&
-	(cd dest.git/objects && echo incoming-*) >actual &&
-	test_cmp expect actual
+	gpgsm --homedir "${GNUPGHOME}" -K --with-colons |
+	awk -F ":" "/^fpr:/ {printf \"%s S relax\\n\", \$10}" \
+		>"${GNUPGHOME}/trustlist.txt" &&
+	(gpgconf --reload all || : ) &&
 
-ok 4 - rejected objects are removed
+	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
+	       -u committer@example.com -o /dev/null --sign -
 
-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.
+)
+prerequisite GPGSM not satisfied
+ok 11 # skip fail without key and heed user.signingkey x509 (missing GPGSM)
 
-	test-tool genrandom foo 4096 >file.bin &&
-	git add file.bin &&
-	git commit -m bin &&
+ok 12 # skip fail without key and heed user.signingkey ssh (missing GPGSSH)
 
-	if test_have_prereq MINGW
-	then
-		pathsep=";"
-	else
-		pathsep=":"
-	fi &&
-	git clone --bare . "xxx${pathsep}yyy.git" &&
+ok 13 # skip failed atomic push does not execute GPG (missing GPG)
 
-	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
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5535-fetch-push-symref.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 f56dd63] bin
+[master (root-commit) d79ce16] one
  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 one.t
+Cloning into 'src'...
 done.
-[master 0343f66] change
+Cloning into 'dst1'...
+done.
+Cloning into 'dst2'...
+done.
+[master 139b20d] two
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-To /build/reproducible-path/git-2.45.2/t/trash directory.t5547-push-quarantine/xxx:yyy.git
-   f56dd63..0343f66  HEAD -> master
-ok 5 - push to repo path with path separator (colon)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+From /build/reproducible-path/git-2.45.2/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 5547.6 'updating a ref from quarantine is forbidden': 
-	git init --bare update.git &&
-	test_hook -C update.git pre-receive <<-\EOF &&
-	read old new refname
-	git update-ref refs/heads/unrelated $new
-	exit 1
-	EOF
-	test_must_fail git push update.git HEAD &&
-	git -C update.git fsck
+expecting success of 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5547-push-quarantine/update.git/
-remote: fatal: update_ref failed for ref 'refs/heads/unrelated': ref updates forbidden inside quarantine environment        
-To update.git
- ! [remote rejected] HEAD -> master (pre-receive hook declined)
-error: failed to push some refs to 'update.git'
-notice: HEAD points to an unborn branch (master)
-notice: No default references
-ok 6 - updating a ref from quarantine is forbidden
+To ../dst1
+   d79ce16..139b20d  origin/HEAD -> origin/HEAD
+   d79ce16..139b20d  origin/master -> origin/master
+ok 2 - push
 
-# passed all 6 test(s)
-1..6
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5548-push-porcelain.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5548-push-porcelain/.git/
-expecting success of 5548.1 'setup upstream repository and workbench': 
-		rm -rf upstream.git workbench &&
-		git init --bare upstream.git &&
-		git init workbench &&
-		create_commits_in workbench A B &&
+*** t5531-deep-submodule-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 remote add origin ../upstream.git &&
-			git update-ref refs/heads/main $A &&
-			git push origin \
-				$B:refs/heads/main \
-				$A:refs/heads/foo \
-				$A:refs/heads/bar \
-				$A:refs/heads/baz
+			cd gar/bage &&
+			git init &&
+			git config push.default matching &&
+			>junk &&
+			git add junk &&
+			git commit -m "Initial junk"
 		) &&
-		git -C "workbench" config advice.pushUpdateRejected false &&
-		upstream=upstream.git
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5548-push-porcelain/upstream.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5548-push-porcelain/workbench/.git/
-[master (root-commit) 0ddfaf1] A
+		git add gar/bage &&
+		git commit -m "Initial superproject"
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/pub.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/work/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
+ 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 advice.addEmbeddedRepo false"
+[main (root-commit) 38ca8a3] Initial superproject
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-To ../upstream.git
- * [new branch]      d9df4505cb3522088b9e29d6051ac16f1564154a -> main
- * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> foo
- * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> bar
- * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> baz
-ok 1 - setup upstream repository and workbench
+ create mode 160000 gar/bage
+ok 1 - setup
 
-expecting success of 5548.2 'porcelain output of successful git-push (builtin protocol)': 
-		(
-			cd workbench &&
-			git update-ref refs/heads/main $A &&
-			git update-ref refs/heads/baz $A &&
-			git update-ref refs/heads/next $A &&
-			git push --porcelain --force origin \
-				main \
-				:refs/heads/foo \
-				$B:bar \
-				baz \
-				next
-		) >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		> To <URL/of/upstream.git>
-		> =	refs/heads/baz:refs/heads/baz	[up to date]
-		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
-		> -	:refs/heads/foo	[deleted]
-		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
-		> *	refs/heads/next:refs/heads/next	[new branch]
-		> Done
-		EOF
-		test_cmp expect actual &&
+expecting success of 5531.2 'push works with recorded gitlink': 
+	(
+		cd work &&
+		git push ../pub.git main
+	)
 
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-B> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/main
-		<COMMIT-A> refs/heads/next
-		EOF
-		test_cmp expect actual
-	
-ok 2 - porcelain output of successful git-push (builtin protocol)
+To ../pub.git
+ * [new branch]      main -> main
+ok 2 - push works with recorded gitlink
 
-expecting success of 5548.3 'atomic push failed (builtin protocol)': 
-		(
-			cd workbench &&
-			git update-ref refs/heads/main $B &&
-			git update-ref refs/heads/bar $A &&
-			test_must_fail git push --atomic --porcelain origin \
-				main \
-				bar \
-				:baz \
-				next
-		) >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		To <URL/of/upstream.git>
-		> =	refs/heads/next:refs/heads/next	[up to date]
-		> !	refs/heads/bar:refs/heads/bar	[rejected] (non-fast-forward)
-		> !	(delete):refs/heads/baz	[rejected] (atomic push failed)
-		> !	refs/heads/main:refs/heads/main	[rejected] (atomic push failed)
-		Done
-		EOF
-		test_cmp expect actual &&
+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
+	)
 
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-B> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/main
-		<COMMIT-A> refs/heads/next
-		EOF
-		test_cmp expect actual
-	
-error: atomic push failed for ref refs/heads/bar. status: 2
+[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
 
-fatal: the remote end hung up unexpectedly
-error: failed to push some refs to '../upstream.git'
-ok 3 - atomic push failed (builtin protocol)
+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 5548.4 'prepare pre-receive hook (builtin protocol)': 
-		test_hook --setup -C "$upstream" pre-receive <<-EOF
-		exit 1
-		EOF
-	
-ok 4 - prepare pre-receive hook (builtin protocol)
+		# ...or if specified in the configuration..
+		test_must_fail git -c push.recurseSubmodules=check push ../pub.git main
+	)
 
-expecting success of 5548.5 'pre-receive hook declined (builtin protocol)': 
-		(
-			cd workbench &&
-			git update-ref refs/heads/main $B &&
-			git update-ref refs/heads/bar $A &&
-			test_must_fail git push --porcelain --force origin \
-				main \
-				bar \
-				:baz \
-				next
-		) >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		To <URL/of/upstream.git>
-		> =	refs/heads/next:refs/heads/next	[up to date]
-		> !	refs/heads/bar:refs/heads/bar	[remote rejected] (pre-receive hook declined)
-		> !	:refs/heads/baz	[remote rejected] (pre-receive hook declined)
-		> !	refs/heads/main:refs/heads/main	[remote rejected] (pre-receive hook declined)
-		Done
-		EOF
-		test_cmp expect actual &&
+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
 
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-B> refs/heads/bar
-		<COMMIT-A> refs/heads/baz
-		<COMMIT-A> refs/heads/main
-		<COMMIT-A> refs/heads/next
-		EOF
-		test_cmp expect actual
-	
-error: failed to push some refs to '../upstream.git'
-ok 5 - pre-receive hook declined (builtin protocol)
+Please try
 
-expecting success of 5548.6 'remove pre-receive hook (builtin protocol)': 
-		rm "$upstream/hooks/pre-receive"
-	
-ok 6 - remove pre-receive hook (builtin protocol)
+	git push --recurse-submodules=on-demand
 
-expecting success of 5548.7 'non-fastforward push (builtin protocol)': 
-		(
-			cd workbench &&
-			test_must_fail git push --porcelain origin \
-				main \
-				bar \
-				:baz \
-				next
-		) >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		format_and_save_expect <<-EOF &&
-		To <URL/of/upstream.git>
-		> =	refs/heads/next:refs/heads/next	[up to date]
-		> -	:refs/heads/baz	[deleted]
-		>  	refs/heads/main:refs/heads/main	<COMMIT-A>..<COMMIT-B>
-		> !	refs/heads/bar:refs/heads/bar	[rejected] (non-fast-forward)
-		Done
-		EOF
-		test_cmp expect actual &&
+or cd to the path and use
 
-		git -C "$upstream" show-ref >out &&
-		make_user_friendly_and_stable_output <out >actual &&
-		cat >expect <<-EOF &&
-		<COMMIT-B> refs/heads/bar
-		<COMMIT-B> refs/heads/main
-		<COMMIT-A> refs/heads/next
-		EOF
-		test_cmp expect actual
-	
-error: failed to push some refs to '../upstream.git'
-ok 7 - non-fastforward push (builtin protocol)
+	git push
 
-checking prerequisite: NOT_ROOT
+to push them to a remote.
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+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
 
-)
-prerequisite NOT_ROOT ok
-# passed all 7 test(s)
-# SKIP no web server found at ''
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5549-fetch-push-http.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5549-fetch-push-http/.git/
-checking prerequisite: NOT_ROOT
+Please try
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+	git push --recurse-submodules=on-demand
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5543-atomic-push.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/.git/
-expecting success of 5543.1 'atomic push works for a single branch': 
-	mk_repo_pair &&
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+ok 4 - push fails if submodule commit not on remote
+
+fatal: the remote end hung up unexpectedly
+expecting success of 5531.5 'push succeeds after commit was pushed to remote': 
 	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git push --atomic up main
+		cd work/gar/bage &&
+		git push origin main
 	) &&
-	test_refs main main
+	(
+		cd work &&
+		git push --recurse-submodules=check ../pub.git main
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
+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, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
+ 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(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..139b20d  main -> main
-ok 1 - atomic push works for a single branch
+ 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 5543.2 'atomic push works for two branches': 
-	mk_repo_pair &&
+expecting success of 5531.7 'push succeeds if submodule commit not on remote but using on-demand from config': 
 	(
-		cd workbench &&
-		test_commit one &&
-		git branch second &&
-		git push --mirror up &&
-		test_commit two &&
-		git checkout second &&
-		test_commit three &&
-		git push --atomic up main second
+		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"
 	) &&
-	test_refs main main &&
-	test_refs second second
+	(
+		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
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         one -> one
-[main 139b20d] two
+[main cc28292] Recurse on-demand from config junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-Switched to branch 'second'
-[second 897c206] three
+ 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(+)
- create mode 100644 three.t
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..139b20d  main -> main
-   d79ce16..897c206  second -> second
-ok 2 - atomic push works for two branches
+ 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 5543.3 'atomic push works in combination with --mirror': 
-	mk_repo_pair &&
+expecting success of 5531.8 'push succeeds if submodule commit not on remote but using auto-on-demand via submodule.recurse config': 
 	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second &&
-		test_commit two &&
-		git push --atomic --mirror up
+		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"
 	) &&
-	test_refs main main &&
-	test_refs second second
+	(
+		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
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
+[main f05bcc4] Recurse submodule.recurse from config junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Switched to a new branch 'second'
-[second 139b20d] two
+ 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(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         one -> one
- * [new tag]         two -> two
-ok 3 - atomic push works in combination with --mirror
+ 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 5543.4 'atomic push works in combination with --force': 
-	mk_repo_pair &&
+expecting success of 5531.9 'push recurse-submodules on command line overrides config': 
 	(
-		cd workbench &&
-		test_commit one &&
-		git branch second main &&
-		test_commit two_a &&
-		git checkout second &&
-		test_commit two_b &&
-		test_commit three_b &&
-		test_commit four &&
-		git push --mirror up &&
-		# The actual test is below
-		git checkout main &&
-		test_commit three_a &&
-		git checkout second &&
-		git reset --hard HEAD^ &&
-		git push --force --atomic up main second
+		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"
 	) &&
-	test_refs main main &&
-	test_refs second second
+	(
+		cd work &&
+		git add gar/bage &&
+		git commit -m "Recurse on command-line overriding config for gar/bage" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
+		# 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, 1 insertion(+)
- create mode 100644 one.t
-[main 0fd3f08] two_a
+ 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(+)
- create mode 100644 two_a.t
-Switched to branch 'second'
-[second 476acd6] two_b
+ 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 overridiing 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 5786194] Recurse on command-line overridiing earlier command-line junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two_b.t
-[second 04c72ee] three_b
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-check-on-command-line-overriding-earlier-command-line
+[main 24751d1] Recurse on command-line overriding earlier command-line for gar/bage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three_b.t
-[second f7b7ae4] four
+ 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..24751d1  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Everything up-to-date
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   b5bd2c4..5786194  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 1e38ba1] Recurse on-demand on command-line overriding config junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         four -> four
- * [new tag]         one -> one
- * [new tag]         three_b -> three_b
- * [new tag]         two_a -> two_a
- * [new tag]         two_b -> two_b
-Switched to branch 'main'
-[main 6413866] three_a
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-on-demand-on-command-line-overriding-config
+[main e6b601f] Recurse on-demand on command-line overriding config for gar/bage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three_a.t
-Switched to branch 'second'
-HEAD is now at 04c72ee three_b
-remote: warning: updating the current branch        
-To ../upstream
-   0fd3f08..6413866  main -> main
- + f7b7ae4...04c72ee second -> second (forced update)
-ok 4 - atomic push works in combination with --force
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   5786194..1e38ba1  main -> main
+To ../pub.git
+   24751d1..e6b601f  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 5543.5 'atomic push fails if one branch fails': 
-	mk_repo_pair &&
+expecting success of 5531.12 'push succeeds if submodule commit disabling recursion from cmdline overriding config': 
 	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second main &&
-		test_commit two &&
-		test_commit three &&
-		test_commit four &&
-		git push --mirror up &&
-		git reset --hard HEAD~2 &&
-		test_commit five &&
-		git checkout main &&
-		test_commit six &&
-		test_must_fail git push --atomic --all up >output-all 2>&1 &&
-		# --all and --branches have the same behavior when be combined with --atomic
-		test_must_fail git push --atomic --branches up >output-branches 2>&1 &&
-		test_cmp output-all output-branches
+		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"
 	) &&
-	test_refs main HEAD@{7} &&
-	test_refs second HEAD@{4}
+	(
+		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
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Switched to a new branch 'second'
-[second 139b20d] two
+[main 0ec5589] Recurse disable on command-line overriding config junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[second 7c7cd71] three
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-disable-on-command-line-overriding-config
+[main 87771bd] Recurse disable on command-line overriding config for gar/bage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[second fd8d77e] four
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   e6b601f..87771bd  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   1e38ba1..0ec5589  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 8a95ebc] Recurse disable on command-line alternative overriding config junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         four -> four
- * [new tag]         one -> one
- * [new tag]         three -> three
- * [new tag]         two -> two
-HEAD is now at 139b20d two
-[second a9f66f4] five
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 recurse-disable-on-command-line-alt-overriding-config
+[main 58db74b] Recurse disable on command-line alternative overriding config for gar/bage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 five.t
-Switched to branch 'main'
-[main 29c9ea2] six
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   87771bd..58db74b  main -> main
+From ../pub
+ * branch            HEAD       -> FETCH_HEAD
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   0ec5589..8a95ebc  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 58d58de] bad commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 six.t
-ok 5 - atomic push fails if one branch fails
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: submodule entry 'gar/bage' (158eaa063541ac49203e71fb5012f43df9559cf6) is a tag, not a commit
+HEAD is now at 58db74b Recurse disable on command-line alternative overriding config for gar/bage
+ok 14 - submodule entry pointing at a tag is error
 
-expecting success of 5543.6 'atomic push fails if one tag fails remotely': 
-	# prepare the repo
-	mk_repo_pair &&
+expecting success of 5531.15 'push fails if recurse submodules option passed as yes': 
 	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second main &&
-		test_commit two &&
-		git push --mirror up
+		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"
 	) &&
-	# a third party modifies the server side:
 	(
-		cd upstream &&
-		git checkout second &&
-		git tag test_tag second
-	) &&
-	# see if we can now push both branches.
+		cd 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 631ecb2] 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 8ffc817] 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
+   8a95ebc..631ecb2  main -> main
+To ../pub.git
+   58db74b..8ffc817  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 workbench &&
-		git checkout main &&
-		test_commit three &&
-		git checkout second &&
-		test_commit four &&
-		git tag test_tag &&
-		test_must_fail git push --tags --atomic up main second
+		cd work/gar/bage &&
+		>junk4 &&
+		git add junk4 &&
+		git commit -m "Fourth junk"
 	) &&
-	test_refs main HEAD@{3} &&
-	test_refs second HEAD@{1}
+	(
+		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
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-Switched to a new branch 'second'
-[second 139b20d] two
+[main c5a29bf] Fourth junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         one -> one
- * [new tag]         two -> two
-Switched to branch 'second'
-Switched to branch 'main'
-[main 846d065] three
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk4
+[main 357d056] Fourth commit for gar/bage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Switched to branch 'second'
-[second b6d6c1f] four
+ 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 631ecb2 Recurse push fails if recurse submodules option passed as yes
+[branch2 c7025c9] First junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-error: atomic push failed for ref refs/tags/test_tag. status: 3
+ 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
 
-fatal: the remote end hung up unexpectedly
-To ../upstream
- ! [rejected]        main -> main (atomic push failed)
- ! [rejected]        second -> second (atomic push failed)
- ! [rejected]        test_tag -> test_tag (already exists)
- ! [rejected]        four -> four (atomic push failed)
- ! [rejected]        three -> three (atomic push failed)
-error: failed to push some refs to '../upstream'
-hint: Updates were rejected because the tag already exists in the remote.
-ok 6 - atomic push fails if one tag fails remotely
+Please try
 
-expecting success of 5543.7 'atomic push obeys update hook preventing a branch to be pushed': 
-	mk_repo_pair &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git checkout -b second main &&
-		test_commit two &&
-		git push --mirror up
-	) &&
-	test_hook -C upstream update <<-\EOF &&
-	# only allow update to main from now on
-	test "$1" = "refs/heads/main"
-	EOF
+	git push --recurse-submodules=on-demand
+
+or cd to the path and use
+
+	git push
+
+to push them to a remote.
+
+fatal: Aborting.
+ok 16 - push fails when commit on multiple branches if one branch has no remote
+
+fatal: the remote end hung up unexpectedly
+expecting success of 5531.17 'push succeeds if submodule has no remote and is on the first superproject commit': 
+	git init --bare a &&
+	git clone a a1 &&
 	(
-		cd workbench &&
-		git checkout main &&
-		test_commit three &&
-		git checkout second &&
-		test_commit four &&
-		test_must_fail git push --atomic up main second
-	) &&
-	test_refs main HEAD@{3} &&
-	test_refs second HEAD@{1}
+		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.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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, 1 insertion(+)
- create mode 100644 one.t
-Switched to a new branch 'second'
-[second 139b20d] two
+ 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 advice.addEmbeddedRepo false"
+[main (root-commit) c2121a0] added submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
+ create mode 160000 b
+To /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/a
  * [new branch]      main -> main
- * [new branch]      second -> second
- * [new tag]         one -> one
- * [new tag]         two -> two
-Switched to branch 'main'
-[main 846d065] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Switched to branch 'second'
-[second b6d6c1f] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-remote: warning: updating the current branch        
-remote: error: hook declined to update refs/heads/second        
-To ../upstream
- ! [remote rejected] main -> main (atomic push failure)
- ! [remote rejected] second -> second (hook declined)
-error: failed to push some refs to '../upstream'
-ok 7 - atomic push obeys update hook preventing a branch to be pushed
+ok 17 - push succeeds if submodule has no remote and is on the first superproject commit
 
-expecting success of 5543.8 'atomic push is not advertised if configured': 
-	mk_repo_pair &&
+expecting success of 5531.18 'push unpushed submodules when not needed': 
 	(
-		cd upstream &&
-		git config receive.advertiseatomic 0
+		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 workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		test_must_fail git push --atomic up main
+		cd submodule.git &&
+		git rev-parse main >../actual
 	) &&
-	test_refs main HEAD@{1}
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
+Previous HEAD position was 631ecb2 Recurse push fails if recurse submodules option passed as yes
+Switched to branch 'main'
+[main 1c18247] Fifth junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk5
+To ../../../submodule.git
+   631ecb2..1c18247  main -> main
+Switched to branch 'main'
+M	gar/bage
+[main 7c1f605] Fifth commit for gar/bage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-fatal: the receiving end does not support --atomic push
-fatal: the remote end hung up unexpectedly
-ok 8 - atomic push is not advertised if configured
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To ../pub.git
+   8ffc817..7c1f605  main -> main
+ok 18 - push unpushed submodules when not needed
 
-expecting success of 5543.9 'atomic push reports (reject by update hook)': 
-	mk_repo_pair &&
+expecting success of 5531.19 'push unpushed submodules when not needed 2': 
 	(
-		cd workbench &&
-		test_commit one &&
-		git branch foo &&
-		git push up main one foo &&
-		git tag -d one
+		cd submodule.git &&
+		git rev-parse main >../expected
 	) &&
 	(
-		mkdir -p upstream/.git/hooks &&
-		cat >upstream/.git/hooks/update <<-EOF &&
-		#!/bin/sh
-
-		if test "\$1" = "refs/heads/bar"
-		then
-			echo >&2 "Pusing to branch bar is prohibited"
-			exit 1
-		fi
-		EOF
-		chmod a+x upstream/.git/hooks/update
+		cd 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 workbench &&
-		test_commit two &&
-		git branch bar
+		cd submodule.git &&
+		git rev-parse main >../actual
 	) &&
-	test_must_fail git -C workbench \
-		push --atomic up main two bar >out 2>&1 &&
-	fmt_status_report <out >actual &&
-	cat >expect <<-EOF &&
-	To ../upstream
-	 ! [remote rejected] main -> main (atomic push failure)
-	 ! [remote rejected] two -> two (atomic push failure)
-	 ! [remote rejected] bar -> bar (hook declined)
-	EOF
-	test_cmp expect actual
+	test_cmp expected actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
-[main (root-commit) d79ce16] one
+[main bf3a7b7] Sixth junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
- * [new branch]      foo -> foo
-Deleted tag 'one' (was d79ce16)
-[main 51ba0d2] two
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk6
+[main 4df5b78] Second junk for work
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 9 - atomic push reports (reject by update hook)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk2
+To ../pub.git
+   7c1f605..4df5b78  main -> main
+ok 19 - push unpushed submodules when not needed 2
 
-expecting success of 5543.10 'atomic push reports (mirror, but reject by update hook)': 
+expecting success of 5531.20 'push unpushed submodules recursively': 
 	(
-		cd workbench &&
-		git remote remove up &&
-		git remote add up ../upstream
+		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
 	) &&
-	test_must_fail git -C workbench \
-		push --atomic --mirror up >out 2>&1 &&
-	fmt_status_report <out >actual &&
-	cat >expect <<-EOF &&
-	To ../upstream
-	 ! [remote rejected] main -> main (atomic push failure)
-	 ! [remote rejected] one (atomic push failure)
-	 ! [remote rejected] bar -> bar (hook declined)
-	 ! [remote rejected] two -> two (atomic push failure)
-	EOF
-	test_cmp expect actual
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_cmp expected actual
 
-ok 10 - atomic push reports (mirror, but reject by update hook)
+Already on 'main'
+[main e687a1f] 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 e7bbb73] 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
+   1c18247..e687a1f  main -> main
+To ../pub.git
+   4df5b78..e7bbb73  main -> main
+ok 20 - push unpushed submodules recursively
 
-expecting success of 5543.11 'atomic push reports (reject by non-ff)': 
-	rm upstream/.git/hooks/update &&
+expecting success of 5531.21 'push unpushable submodule recursively fails': 
 	(
-		cd workbench &&
-		git push up main &&
-		git reset --hard HEAD^
+		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
 	) &&
-	test_must_fail git -C workbench \
-		push --atomic up main foo bar >out 2>&1 &&
-	fmt_status_report <out >actual &&
-	cat >expect <<-EOF &&
-	To ../upstream
-	 ! [rejected] main -> main (non-fast-forward)
-	 ! [rejected] bar -> bar (atomic push failed)
-	EOF
-	test_cmp expect actual
+	(
+		cd submodule.git &&
+		git rev-parse main >../actual
+	) &&
+	test_when_finished git -C work reset --hard main^ &&
+	test_cmp expected actual
 
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..51ba0d2  main -> main
-HEAD is now at d79ce16 one
-ok 11 - atomic push reports (reject by non-ff)
+Note: switching to 'main~0'.
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5550-http-fetch-dumb.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5550-http-fetch-dumb/.git/
-checking prerequisite: NOT_ROOT
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 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:
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5551-http-fetch-smart.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5551-http-fetch-smart/.git/
-checking prerequisite: NOT_ROOT
+  git switch -c <new-branch-name>
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+Or undo this operation with:
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5545-push-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/.git/
-expecting success of 5545.1 'one push option works for a single branch': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git push --push-option=asdf up main
-	) &&
-	test_refs main main &&
-	echo "asdf" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
+  git switch -
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) d79ce16] one
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at e687a1f Seventh junk
+[detached HEAD 9c6181e] Eighth junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk8
+[main 55d30e4] Eighth commit for gar/bage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..139b20d  main -> main
-ok 1 - one push option works for a single branch
+ 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
 
-expecting success of 5545.2 'push option denied by remote': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions false &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		test_must_fail git push --push-option=asdf up main
-	) &&
-	test_refs main HEAD@{1}
+Please try
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-fatal: the receiving end does not support push options
+	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 2 - push option denied by remote
+HEAD is now at e7bbb73 Seventh commit for gar/bage
+ok 21 - push unpushable submodule recursively fails
 
-expecting success of 5545.3 'two push options work': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
+expecting success of 5531.22 'push --dry-run does not recursively update submodules': 
 	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git push --push-option=asdf --push-option="more structured text" up main
+		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
 	) &&
-	test_refs main main &&
-	printf "asdf\nmore structured text\n" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) d79ce16] one
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  9c6181e 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> 9c6181e
+
+Switched to branch 'main'
+[main 98997b9] Ninth junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 139b20d] two
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk9
+Already on 'main'
+M	gar/bage
+[main abf9a2f] Ninth commit for gar/bage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   d79ce16..139b20d  main -> main
-ok 3 - two push options work
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   e687a1f..98997b9  main -> main
+To ../pub.git
+   e7bbb73..abf9a2f  main -> main
+ok 22 - push --dry-run does not recursively update submodules
 
-expecting success of 5545.4 'push options and submodules': 
-	test_when_finished "rm -rf parent" &&
-	test_when_finished "rm -rf parent_upstream" &&
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	cp -r upstream parent_upstream &&
-	test_commit -C upstream one &&
+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 &&
 
-	test_create_repo parent &&
-	git -C parent remote add up ../parent_upstream &&
-	test_commit -C parent one &&
-	git -C parent push --mirror up &&
+	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
 
-	test_config_global protocol.file.allow always &&
-	git -C parent submodule add ../upstream workbench &&
-	git -C parent/workbench remote add up ../../upstream &&
-	git -C parent commit -m "add submodule" &&
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   e687a1f..98997b9  main -> main
+Everything up-to-date
+ok 23 - push --dry-run does not recursively update submodules
 
-	test_commit -C parent/workbench two &&
-	git -C parent add workbench &&
-	git -C parent commit -m "update workbench" &&
+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 parent push \
-		--push-option=asdf --push-option="more structured text" \
-		--recurse-submodules=on-demand up main &&
+	git -C work push --recurse-submodules=only ../pub.git main &&
 
-	git -C upstream rev-parse --verify main >expect &&
-	git -C parent/workbench rev-parse --verify main >actual &&
-	test_cmp expect actual &&
+	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
 
-	git -C parent_upstream rev-parse --verify main >expect &&
-	git -C parent rev-parse --verify main >actual &&
-	test_cmp expect actual &&
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   e687a1f..98997b9  main -> main
+Everything up-to-date
+ok 24 - push only unpushed submodules recursively
 
-	printf "asdf\nmore structured text\n" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options &&
-	test_cmp expect parent_upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect parent_upstream/.git/hooks/post-receive.push_options
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) d79ce16] one
+	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.45.2/t/trash directory.t5531-deep-submodule-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 one.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/parent/.git/
-[main (root-commit) b838542] one
+ 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>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../parent_upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/parent/workbench'...
-done.
-[main 8b5c571] add submodule
+ 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 workbench
-[main 8f1d4ef] two
+ create mode 160000 sub
+Cloning into 'downstream'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
+done.
+Submodule path 'sub': checked out '368641e94e5de2829cfae22976de19274d54c11a'
+Submodule 'deepsub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
+Cloning into '/build/reproducible-path/git-2.45.2/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 two.t
-[main 2417cbb] update workbench
+ 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(-)
-Pushing submodule 'workbench'
-remote: warning: updating the current branch        
-To ../../upstream
-   d79ce16..8f1d4ef  main -> main
-remote: warning: updating the current branch        
-To ../parent_upstream
-   b838542..2417cbb  main -> main
-ok 4 - push options and submodules
+[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.45.2/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 5545.5 'default push option': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git -c push.pushOption=default push up main
-	) &&
-	test_refs main main &&
-	echo "default" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
+	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.45.2/t/trash directory.t5531-deep-submodule-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
+ 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>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   af0b45c..1dd7f79  main -> main
-ok 5 - default push option
-
-expecting success of 5545.6 'two default push options': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git -c push.pushOption=default1 -c push.pushOption=default2 push up main
-	) &&
-	test_refs main main &&
-	printf "default1\ndefault2\n" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
+ 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>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Cloning into 'downstream'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/downstream/sub'...
+done.
+Submodule path 'sub': checked out '14913541b28e52bad23119683708fc45d9376bed'
+Submodule 'deepsub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5531-deep-submodule-push/upstream/sub/deepsub) registered for path 'sub/deepsub'
+Cloning into '/build/reproducible-path/git-2.45.2/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 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   af0b45c..1dd7f79  main -> main
-ok 6 - two default push options
-
-expecting success of 5545.7 'push option from command line overrides from-config push option': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git -c push.pushOption=default push --push-option=manual up main
-	) &&
-	test_refs main main &&
-	echo "manual" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
+ create mode 100644 new-innermost.t
+[downstream-branch 6cfd390] new-middle
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[downstream-branch bc3808e] new-outermost
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   af0b45c..1dd7f79  main -> main
-ok 7 - push option from command line overrides from-config push option
+ 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 5545.8 'empty value of push.pushOption in config clears the list': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		git -c push.pushOption=default1 -c push.pushOption= -c push.pushOption=default2 push up main
-	) &&
-	test_refs main main &&
-	echo "default2" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
-	test_cmp expect upstream/.git/hooks/post-receive.push_options
+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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-remote: warning: updating the current branch        
-To ../upstream
-   af0b45c..1dd7f79  main -> main
-ok 8 - empty value of push.pushOption in config clears the list
+	> 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" &&
 
-expecting success of 5545.9 'invalid push option in config': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	(
-		cd workbench &&
-		test_commit one &&
-		git push --mirror up &&
-		test_commit two &&
-		test_must_fail git -c push.pushOption push up main
-	) &&
-	test_refs main HEAD@{1}
+	# 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 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
+	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 ba83752] Tenth junk
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
- * [new tag]         one -> one
-[main 1dd7f79] two
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk10
+[main 9ea36f0] Tenth junk added to gar/bage
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-error: missing value for 'push.pushoption'
-fatal: unable to parse 'push.pushoption' from command-line config
-ok 9 - invalid push option in config
+ 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
+   98997b9..ba83752  main -> main
+To ../pub.git
+   e7bbb73..9ea36f0  main -> main
+ok 27 - push propagating the remotes name to a submodule
 
-expecting success of 5545.10 'push options keep quoted characters intact (direct)': 
-	mk_repo_pair &&
-	git -C upstream config receive.advertisePushOptions true &&
-	test_commit -C workbench one &&
-	git -C workbench push --push-option="\"embedded quotes\"" up main &&
-	echo "\"embedded quotes\"" >expect &&
-	test_cmp expect upstream/.git/hooks/pre-receive.push_options
+expecting success of 5531.28 'push propagating refspec to a submodule': 
+	> work/gar/bage/junk11 &&
+	git -C work/gar/bage add junk11 &&
+	git -C work/gar/bage commit -m "Eleventh junk" &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-remote: warning: updating the current branch        
-To ../upstream
- * [new branch]      main -> main
-ok 10 - push options keep quoted characters intact (direct)
+	git -C work checkout branch2 &&
+	git -C work add gar/bage &&
+	git -C work commit -m "updating gar/bage in branch2" &&
 
-checking prerequisite: NOT_ROOT
+	# Fails when submodule does not have a matching branch
+	test_must_fail git -C work push --recurse-submodules=on-demand origin branch2 &&
+	# Fails when refspec includes an object id
+	test_must_fail git -C work push --recurse-submodules=on-demand origin \
+		"$(git -C work rev-parse branch2):refs/heads/branch2" &&
+	# Fails when refspec includes HEAD and parent and submodule do not
+	# have the same named branch checked out
+	test_must_fail git -C work push --recurse-submodules=on-demand origin \
+		HEAD:refs/heads/branch2 &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+	git -C work/gar/bage branch branch2 main &&
+	git -C work push --recurse-submodules=on-demand origin branch2 &&
 
-)
-prerequisite NOT_ROOT ok
-# passed all 10 test(s)
-# SKIP no web server found at ''
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5554-noop-fetch-negotiator.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5554-noop-fetch-negotiator/.git/
-expecting success of 5554.1 'noop negotiator does not emit any "have"': 
-	rm -f trace &&
+	git -C submodule.git rev-parse branch2 >actual_submodule &&
+	git -C pub.git rev-parse branch2 >actual_pub &&
+	git -C work/gar/bage rev-parse branch2 >expected_submodule &&
+	git -C work rev-parse branch2 >expected_pub &&
+	test_cmp expected_submodule actual_submodule &&
+	test_cmp expected_pub actual_pub
 
-	test_create_repo server &&
-	test_commit -C server to_fetch &&
+[main f5bf038] 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 e90f65a] 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 'e90f65a59e381ada484131b40a354ef272b4fe2d' 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
 
-	test_create_repo client &&
-	test_commit -C client we_have &&
+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" &&
 
-	test_config -C client fetch.negotiationalgorithm noop &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "$(pwd)/server" &&
+	git -C work checkout branch2 &&
+	git -C work add gar/bage &&
+	git -C work commit -m "updating gar/bage in branch2" &&
 
-	! grep "fetch> have" trace &&
-	grep "fetch> done" trace
+	# 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.45.2/t/trash directory.t5554-noop-fetch-negotiator/server/.git/
-[master (root-commit) 92dc17d] to_fetch
+	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 70ffd3e] Twelfth junk
  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.45.2/t/trash directory.t5554-noop-fetch-negotiator/client/.git/
-[master (root-commit) c20e644] we_have
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 junk12
+Already on 'branch2'
+M	gar/bage
+[branch2 0c08f34] updating gar/bage in branch2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 we_have.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5554-noop-fetch-negotiator/server
- * branch            HEAD       -> FETCH_HEAD
-packet:        fetch> done
-ok 1 - noop negotiator does not emit any "have"
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Pushing submodule 'gar/bage'
+To ../../../submodule.git
+   f5bf038..70ffd3e  HEAD -> branch2
+To ../pub.git
+   e90f65a..0c08f34  HEAD -> branch2
+ok 29 - push propagating HEAD refspec to a submodule
 
-# passed all 1 test(s)
-1..1
+# passed all 29 test(s)
+1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5555-http-smart-common.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5555-http-smart-common/.git/
-expecting success of 5555.1 'setup': 
-	test_commit --no-tag initial
+*** t5536-fetch-conflicts.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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) 24b24cf] initial
+[master (root-commit) d31adcd] Initial
+ Author: A U Thor <author@example.com>
+[master 1a200fb] First
  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
+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.45.2/t/trash directory.t5536-fetch-conflicts/ok/.git/
+From /build/reproducible-path/git-2.45.2/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
 
-ok 5 - git upload-pack --advertise-refs: v0
+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
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-	git receive-pack --advertise-refs . >out 2>err &&
-	test-tool pkt-line unpack <out >actual &&
-	test_must_be_empty err &&
-	test_cmp actual expect &&
+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
+	)
 
-	# 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5536-fetch-conflicts/dcc/.git/
+From /build/reproducible-path/git-2.45.2/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
+	)
 
-ok 6 - git receive-pack --advertise-refs: v0
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5536-fetch-conflicts/aoc/.git/
+From /build/reproducible-path/git-2.45.2/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 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
+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
+	)
 
-	GIT_PROTOCOL=version=1 \
-	git upload-pack --advertise-refs . >out &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-	test-tool pkt-line unpack <out >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp actual expect
+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
+	)
 
-ok 7 - git upload-pack --advertise-refs: v1
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-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
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5538-push-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-	GIT_PROTOCOL=version=1 \
-	git receive-pack --advertise-refs . >out &&
+[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.45.2/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
 
-	test-tool pkt-line unpack <out >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp actual expect
+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
 
-ok 8 - git receive-pack --advertise-refs: v1
+[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 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
+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
 
-	GIT_PROTOCOL=version=2 \
-	GIT_USER_AGENT=FAKE \
-	git upload-pack --advertise-refs . >out 2>err &&
+ ! [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
 
-	test-tool pkt-line unpack <out >actual &&
-	test_must_be_empty err &&
-	test_cmp actual expect
+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
 
-ok 9 - git upload-pack --advertise-refs: v2
+To ../.git
+ * [new reference]   main -> shallow2/main
+ok 4 - add new shallow root with receive.updateshallow on
 
-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
+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
+	)
 
-	GIT_PROTOCOL=version=2 \
-	git receive-pack --advertise-refs . >out 2>err &&
+To ../shallow2/.git
+ * [new reference]   main -> shallow/main
+ok 5 - push from shallow to shallow
 
-	test-tool pkt-line unpack <out >actual &&
-	test_must_be_empty err &&
-	test_cmp actual expect
+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
+	)
 
-ok 10 - git receive-pack --advertise-refs: v2
+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 10 test(s)
-1..10
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5557-http-get.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5557-http-get/.git/
+*** t5539-fetch-http-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5539-fetch-http-shallow/.git/
 checking prerequisite: NOT_ROOT
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
@@ -354799,326 +352020,459 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5553-set-upstream.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream/.git/
-expecting success of 5553.1 'setup bare parent fetch': 
-	ensure_fresh_upstream &&
-	git remote add upstream parent
+*** t5540-http-push-webdav.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5540-http-push-webdav/.git/
+checking prerequisite: NOT_ROOT
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream/parent/
-ok 1 - setup bare parent fetch
+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 5553.2 'setup commit on main and other fetch': 
-	test_commit one &&
-	git push upstream main &&
-	git checkout -b other &&
-	test_commit two &&
-	git push upstream other
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5537-fetch-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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) d79ce16] one
+[main (root-commit) 866032c] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 one.t
-To parent
- * [new branch]      main -> main
-Switched to a new branch 'other'
-[other 139b20d] two
+ create mode 100644 tracked
+[main 5c48a96] 2
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-To parent
- * [new branch]      other -> other
-ok 2 - setup commit on main and other fetch
-
-expecting success of 5553.3 'fetch --set-upstream does not set upstream w/o branch': 
-	clear_config main other &&
-	git checkout main &&
-	git fetch --set-upstream upstream &&
-	check_config_missing main &&
-	check_config_missing other
-
-Switched to branch 'main'
-warning: no source branch found;
-you need to specify exactly one branch with the --set-upstream option
-ok 3 - fetch --set-upstream does not set upstream w/o branch
+ 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 5553.4 'fetch --set-upstream upstream main sets branch main but not other': 
-	clear_config main other &&
-	git fetch --set-upstream upstream main &&
-	check_config main upstream refs/heads/main &&
-	check_config_missing other
+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
 
-From parent
- * branch            main       -> FETCH_HEAD
-ok 4 - fetch --set-upstream upstream main sets branch main but not other
+Cloning into 'shallow'...
+ok 2 - setup shallow clone
 
-expecting success of 5553.5 'fetch --set-upstream upstream other sets branch other': 
-	clear_config main other &&
-	git fetch --set-upstream upstream other &&
-	check_config main upstream refs/heads/other &&
-	check_config_missing other
+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
+	)
 
-From parent
- * branch            other      -> FETCH_HEAD
-ok 5 - fetch --set-upstream upstream other sets branch other
+Cloning into 'shallow2'...
+ok 3 - clone from shallow clone
 
-expecting success of 5553.6 'fetch --set-upstream main:other does not set the branch other2': 
-	clear_config other2 &&
-	git fetch --set-upstream upstream main:other2 &&
-	check_config_missing other2
+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
+	)
 
-From parent
- * [new branch]      main       -> other2
-warning: no source branch found;
-you need to specify exactly one branch with the --set-upstream option
-ok 6 - fetch --set-upstream main:other does not set the branch other2
+[main a94059e] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/shallow
+   9c53269..a94059e  main       -> origin/main
+ok 4 - fetch from shallow clone
 
-expecting success of 5553.7 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url': 
-	# main explicitly not cleared, we check that it is not touched from previous value
-	clear_config other other2 &&
-	test_must_fail git fetch --set-upstream http://nosuchdomain.example.com &&
-	check_config main upstream refs/heads/other &&
-	check_config_missing other &&
-	check_config_missing other2
+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
+	)
 
-fatal: unable to access 'http://nosuchdomain.example.com/': Could not resolve host: nosuchdomain.example.com
-ok 7 - fetch --set-upstream http://nosuchdomain.example.com fails with invalid url
+[main 27db150] 6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/shallow
+   a94059e..27db150  main       -> origin/main
+ok 5 - fetch --depth from shallow clone
 
-expecting success of 5553.8 'fetch --set-upstream with valid URL sets upstream to URL': 
-	clear_config other other2 &&
-	url="file://$PWD" &&
-	git fetch --set-upstream "$url" &&
-	check_config main "$url" HEAD &&
-	check_config_missing other &&
-	check_config_missing other2
+expecting success of 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
+	)
 
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream
- * branch            HEAD       -> FETCH_HEAD
-ok 8 - fetch --set-upstream with valid URL sets upstream to URL
+ok 6 - fetch --unshallow from shallow clone
 
-expecting success of 5553.9 'fetch --set-upstream with a detached HEAD': 
-	git checkout HEAD^0 &&
-	test_when_finished "git checkout -" &&
-	cat >expect <<-\EOF &&
-	warning: could not set upstream of HEAD to 'main' from 'upstream' when it does not point to any branch.
-	EOF
-	git fetch --set-upstream upstream main 2>actual.raw &&
-	grep ^warning: actual.raw >actual &&
+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
+	)
 
-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.
+Cloning into 'shallow3'...
+ok 7 - fetch --unshallow from a full clone
 
-If you want to 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 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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
+	)
 
-  git switch -
+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.45.2/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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
+	)
 
-HEAD is now at d79ce16 one
 Switched to branch 'main'
-ok 9 - fetch --set-upstream with a detached HEAD
+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 5553.10 'setup bare parent pull': 
-	git remote rm upstream &&
-	ensure_fresh_upstream &&
-	git remote add upstream parent
+expecting success of 5537.11 'fetch --update-shallow into a repo with submodules': 
+	test_config_global protocol.file.allow always &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream/parent/
-ok 10 - setup bare parent pull
+	git init a-submodule &&
+	test_commit -C a-submodule foo &&
 
-expecting success of 5553.11 'setup commit on main and other pull': 
-	test_commit three &&
-	git push --tags upstream main &&
-	test_commit four &&
-	git push upstream other
+	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/*
 
-[main 897c206] three
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 three.t
-To parent
- * [new branch]      main -> main
- * [new tag]         one -> one
- * [new tag]         three -> three
- * [new tag]         two -> two
-[main 6f2ec4d] four
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/repo-with-sub/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/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>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-To parent
- * [new branch]      other -> other
-ok 11 - setup commit on main and other pull
-
-expecting success of 5553.12 'pull --set-upstream upstream main sets branch main but not other': 
-	clear_config main other &&
-	git pull --no-rebase --set-upstream upstream main &&
-	check_config main upstream refs/heads/main &&
-	check_config_missing other
-
-From parent
- * branch            main       -> FETCH_HEAD
-Already up to date.
-ok 12 - pull --set-upstream upstream main sets branch main but not other
-
-expecting success of 5553.13 'pull --set-upstream main:other2 does not set the branch other2': 
-	clear_config other2 &&
-	git pull --no-rebase --set-upstream upstream main:other2 &&
-	check_config_missing other2
-
-From parent
-   d79ce16..897c206  main       -> other2
-warning: no source branch found;
-you need to specify exactly one branch with the --set-upstream option
-Already up to date.
-ok 13 - pull --set-upstream main:other2 does not set the branch other2
-
-expecting success of 5553.14 'pull --set-upstream upstream other sets branch main': 
-	clear_config main other &&
-	git pull --no-rebase --set-upstream upstream other &&
-	check_config main upstream refs/heads/other &&
-	check_config_missing other
-
-From parent
- * branch            other      -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- two.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-ok 14 - pull --set-upstream upstream other sets branch main
+ 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 5553.15 'pull --set-upstream upstream tag does not set the tag': 
-	clear_config three &&
-	git pull --no-rebase --tags --set-upstream upstream three &&
-	check_config_missing three
+expecting success of 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" &&
 
-From parent
- * tag               three      -> FETCH_HEAD
-warning: not setting upstream for a remote tag
-Already up to date.
-ok 15 - pull --set-upstream upstream tag does not set the tag
+	SHALLOW=$(cat shallow/.git/shallow) &&
+	git -C repo-with-sub fetch --update-shallow ../shallow/.git "$SHALLOW":refs/heads/a-shallow
 
-expecting success of 5553.16 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url': 
-	# main explicitly not cleared, we check that it is not touched from previous value
-	clear_config other other2 three &&
-	test_must_fail git pull --set-upstream http://nosuchdomain.example.com &&
-	check_config main upstream refs/heads/other &&
-	check_config_missing other &&
-	check_config_missing other2 &&
-	check_config_missing three
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/repo-with-sub/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-fatal: unable to access 'http://nosuchdomain.example.com/': Could not resolve host: nosuchdomain.example.com
-ok 16 - pull --set-upstream http://nosuchdomain.example.com fails with invalid url
+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
+	)
 
-expecting success of 5553.17 'pull --set-upstream upstream HEAD sets branch HEAD': 
-	clear_config main other &&
-	git pull --no-rebase --set-upstream upstream HEAD &&
-	check_config main upstream HEAD &&
-	git checkout other &&
-	git pull --no-rebase --set-upstream upstream HEAD &&
-	check_config other upstream HEAD
+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)
 
-From parent
- * branch            HEAD       -> FETCH_HEAD
-Already up to date.
-Switched to branch 'other'
-From parent
- * branch            HEAD       -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- three.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 17 - pull --set-upstream upstream HEAD sets branch HEAD
+checking prerequisite: SANITY
 
-expecting success of 5553.18 'pull --set-upstream upstream with more than one branch does nothing': 
-	clear_config main three &&
-	git pull --no-rebase --set-upstream upstream main three &&
-	check_config_missing main &&
-	check_config_missing three
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+	mkdir SANETESTD.1 SANETESTD.2 &&
 
-From parent
- * branch            main       -> FETCH_HEAD
- * tag               three      -> FETCH_HEAD
-warning: multiple branches detected, incompatible with --set-upstream
-Already up to date.
-ok 18 - pull --set-upstream upstream with more than one branch does nothing
+	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 5553.19 'pull --set-upstream with valid URL sets upstream to URL': 
-	clear_config main other other2 &&
-	git checkout main &&
-	url="file://$PWD" &&
-	git pull --set-upstream "$url" &&
-	check_config main "$url" HEAD &&
-	check_config_missing other &&
-	check_config_missing other2
+	! test -r SANETESTD.1/x &&
+	! rm SANETESTD.1/x && ! test -f SANETESTD.2/x
+	status=$?
 
-Switched to branch 'main'
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream
- * branch            HEAD       -> FETCH_HEAD
-Already up to date.
-ok 19 - pull --set-upstream with valid URL sets upstream to URL
+	chmod +rwx SANETESTD.1 SANETESTD.2 &&
+	rm -rf SANETESTD.1 SANETESTD.2 ||
+	BUG "cannot clean SANETESTD"
+	return $status
 
-expecting success of 5553.20 'pull --set-upstream with valid URL and branch sets branch': 
-	clear_config main other other2 &&
-	git checkout main &&
-	url="file://$PWD" &&
-	git pull --set-upstream "$url" main &&
-	check_config main "$url" refs/heads/main &&
-	check_config_missing other &&
-	check_config_missing other2
+)
+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
 
-Already on 'main'
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream
- * branch            main       -> FETCH_HEAD
-Already up to date.
-ok 20 - pull --set-upstream with valid URL and branch sets branch
+Cloning into 'from-read-only'...
+ok 14 - shallow fetch from a read-only repo
 
-expecting success of 5553.21 'pull --set-upstream with a detached HEAD': 
-	git checkout HEAD^0 &&
-	test_when_finished "git checkout -" &&
-	cat >expect <<-\EOF &&
-	warning: could not set upstream of HEAD to 'main' from 'upstream' when it does not point to any branch.
-	EOF
-	git pull --no-rebase --set-upstream upstream main 2>actual.raw &&
-	grep ^warning: actual.raw >actual &&
-	test_cmp expect actual
+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 &&
 
-Note: switching to 'HEAD^0'.
+	git clone --depth=1 --no-tags --no-single-branch \
+		"file://$PWD/shallow-server" shallow-client &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	: 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 &&
 
-If you want to create 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 shallow-server branch branch-orig $d &&
+	git -C shallow-client fetch --prune --depth=2 \
+		origin "+refs/heads/*:refs/remotes/origin/*"
 
-  git switch -c <new-branch-name>
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5537-fetch-shallow/shallow-server
+ - [deleted]         (none)     -> origin/branch
+fatal: Needed a single revision
+From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5537-fetch-shallow/shallow-server
+ * [new branch]      branch-orig -> origin/branch-orig
+ok 15 - .git/shallow is edited by repack
 
-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 15 test(s)
+# SKIP no web server found at ''
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5542-push-http-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5542-push-http-shallow/.git/
+checking prerequisite: NOT_ROOT
 
-HEAD is now at 066b1d4 Merge branch 'other' of parent
-Already up to date.
-Switched to branch 'main'
-ok 21 - pull --set-upstream with a detached HEAD
+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 21 test(s)
-1..21
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5559-http-fetch-smart-http2.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5559-http-fetch-smart-http2/.git/
+*** t5541-http-push-smart.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5541-http-push-smart/.git/
 checking prerequisite: NOT_ROOT
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
@@ -355132,6 +352486,101 @@
 1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5544-pack-objects-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5516-fetch-push.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5516-fetch-push/.git/
 expecting success of 5516.1 'setup': 
@@ -355279,7 +352728,7 @@
  create mode 100644 unrelated_commit.t
 To testrepo
  * [new reference]   main -> origin/main
-{"event":"data","sid":"20251218T013640.036760Z-Hfbad846e-P00001900/20251218T013640.042022Z-Hfbad846e-P00001908","thread":"main","time":"2025-12-18T01:36:40.044236Z","file":"builtin/pack-objects.c","line":1392,"repo":1,"t_abs":0.002349,"t_rel":0.000774,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"5"}
+{"event":"data","sid":"20241114T193730.611920Z-H5c947e1c-P000008af/20241114T193730.630583Z-H5c947e1c-P000008b7","thread":"main","time":"2024-11-14T19:37:30.633673Z","file":"builtin/pack-objects.c","line":1392,"repo":1,"t_abs":0.003294,"t_rel":0.000599,"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': 
@@ -355303,8 +352752,8 @@
  create mode 100644 unrelated_commit.t
 To testrepo
  * [new reference]   main -> origin/main
-{"event":"data","sid":"20251218T013640.154834Z-Hfbad846e-P0000199d/20251218T013640.159886Z-Hfbad846e-P000019a7","thread":"main","time":"2025-12-18T01:36:40.165586Z","file":"fetch-pack.c","line":2220,"repo":1,"t_abs":0.005839,"t_rel":0.005839,"nesting":1,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
-{"event":"data","sid":"20251218T013640.154834Z-Hfbad846e-P0000199d/20251218T013640.168026Z-Hfbad846e-P000019b7","thread":"main","time":"2025-12-18T01:36:40.169857Z","file":"builtin/pack-objects.c","line":1392,"repo":1,"t_abs":0.001982,"t_rel":0.000448,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"2"}
+{"event":"data","sid":"20241114T193730.816251Z-H5c947e1c-P0000092a/20241114T193730.836287Z-H5c947e1c-P00000930","thread":"main","time":"2024-11-14T19:37:30.847618Z","file":"fetch-pack.c","line":2220,"repo":1,"t_abs":0.011457,"t_rel":0.011457,"nesting":1,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
+{"event":"data","sid":"20241114T193730.816251Z-H5c947e1c-P0000092a/20241114T193730.849768Z-H5c947e1c-P00000940","thread":"main","time":"2024-11-14T19:37:30.865656Z","file":"builtin/pack-objects.c","line":1392,"repo":1,"t_abs":0.016017,"t_rel":0.000413,"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': 
@@ -355325,7 +352774,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 unrelated_commit.t
-{"event":"data","sid":"20251218T013640.315168Z-Hfbad846e-P00001a7c/20251218T013640.331837Z-Hfbad846e-P00001a97","thread":"main","time":"2025-12-18T01:36:40.336278Z","file":"builtin/pack-objects.c","line":1392,"repo":1,"t_abs":0.004704,"t_rel":0.000809,"nesting":2,"category":"pack-objects","key":"write_pack_file/wrote","value":"5"}
+{"event":"data","sid":"20241114T193731.127229Z-H5c947e1c-P000009e6/20241114T193731.172876Z-H5c947e1c-P000009f9","thread":"main","time":"2024-11-14T19:37:31.175770Z","file":"builtin/pack-objects.c","line":1392,"repo":1,"t_abs":0.003019,"t_rel":0.000901,"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
 
@@ -355358,7 +352807,7 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 unrelated_commit.t
-{"event":"data","sid":"20251218T013640.872075Z-Hfbad846e-P00001cbe/20251218T013640.879817Z-Hfbad846e-P00001cc8","thread":"main","time":"2025-12-18T01:36:40.885503Z","file":"fetch-pack.c","line":2220,"repo":1,"t_abs":0.005905,"t_rel":0.005905,"nesting":1,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
+{"event":"data","sid":"20241114T193731.827430Z-H5c947e1c-P00000b58/20241114T193731.834165Z-H5c947e1c-P00000b5e","thread":"main","time":"2024-11-14T19:37:31.843142Z","file":"fetch-pack.c","line":2220,"repo":1,"t_abs":0.009145,"t_rel":0.009145,"nesting":1,"category":"negotiate_using_fetch","key":"total_rounds","value":"1"}
 ok 13 - push with negotiation does not attempt to fetch submodules
 
 expecting success of 5516.14 'push without wildcard': 
@@ -355539,8 +352988,8 @@
 remote: warning: updating the current branch        
 To testrepo
  + 9ad36e1...935970f main -> main (forced update)
---- expect	2025-12-18 01:36:42.246773267 +0000
-+++ actual	2025-12-18 01:36:42.250773267 +0000
+--- expect	2024-11-14 19:37:34.278603745 +0000
++++ actual	2024-11-14 19:37:34.286603827 +0000
 @@ -1 +1 @@
 -9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
 +935970ff2fd2257ae1a73d15652c0ac6f837cf17
@@ -355572,8 +353021,8 @@
 remote: warning: updating the current branch        
 To testrepo
  + 9ad36e1...935970f main -> main (forced update)
---- expect	2025-12-18 01:36:42.458773267 +0000
-+++ actual	2025-12-18 01:36:42.462773267 +0000
+--- expect	2024-11-14 19:37:34.738608429 +0000
++++ actual	2024-11-14 19:37:34.742608469 +0000
 @@ -1 +1 @@
 -9ad36e1e54b2130a20d55abb4f0f3ca8494ead3f
 +935970ff2fd2257ae1a73d15652c0ac6f837cf17
@@ -358557,640 +356006,699 @@
  create mode 100644 banana.t
 fatal: refusing to fetch into branch 'refs/heads/wt' checked out at '/build/reproducible-path/git-2.45.2/t/trash directory.t5516-fetch-push/bare.git/wt'
 From ..
-   d190886..35a3221  HEAD       -> wt
- * [new tag]         banana     -> banana
-ok 117 - refuse fetch to current branch of bare repository worktree
-
-expecting success of 5516.118 'refuse to push a hidden ref, and make sure do not pollute the repository': 
-	mk_empty testrepo &&
-	git -C testrepo config receive.hiderefs refs/hidden &&
-	git -C testrepo config receive.unpackLimit 1 &&
-	test_must_fail git push testrepo HEAD:refs/hidden/foo &&
-	test_dir_is_empty testrepo/.git/objects/pack
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-To testrepo
- ! [remote rejected] HEAD -> refs/hidden/foo (deny updating a hidden ref)
-error: failed to push some refs to 'testrepo'
-ok 118 - refuse to push a hidden ref, and make sure do not pollute the repository
-
-expecting success of 5516.119 'push with config push.useBitmaps': 
-	mk_test testrepo heads/main &&
-	git checkout main &&
-	test_unconfig push.useBitmaps &&
-	GIT_TRACE2_EVENT="$PWD/default" \
-	git push --quiet testrepo main:test &&
-	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
-		--thin --delta-base-offset -q <default &&
-
-	test_config push.useBitmaps true &&
-	GIT_TRACE2_EVENT="$PWD/true" \
-	git push --quiet testrepo main:test2 &&
-	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
-		--thin --delta-base-offset -q <true &&
-
-	test_config push.useBitmaps false &&
-	GIT_TRACE2_EVENT="$PWD/false" \
-	git push --quiet testrepo main:test3 &&
-	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
-		--thin --delta-base-offset -q --no-use-bitmap-index <false
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5516-fetch-push/testrepo/.git/
-remote: warning: updating the current branch        
-To testrepo
- * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
-Already on 'main'
-{"event":"child_start","sid":"20251218T013709.453971Z-Hfbad846e-P000034a4","thread":"main","time":"2025-12-18T01:37:09.458127Z","file":"run-command.c","line":724,"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":"20251218T013709.527746Z-Hfbad846e-P000034f6","thread":"main","time":"2025-12-18T01:37:09.534247Z","file":"run-command.c","line":724,"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":"20251218T013709.587983Z-Hfbad846e-P00003536","thread":"main","time":"2025-12-18T01:37:09.597427Z","file":"run-command.c","line":724,"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 119 - push with config push.useBitmaps
-
-# passed all 119 test(s)
-1..119
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5561-http-backend.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5561-http-backend/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5562-http-backend-content-length.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5562-http-backend-content-length/.git/
-expecting success of 5562.1 'setup': 
-	HTTP_CONTENT_ENCODING="identity" &&
-	export HTTP_CONTENT_ENCODING &&
-	git config http.receivepack true &&
-	test_commit c0 &&
-	test_commit c1 &&
-	hash_head=$(git rev-parse HEAD) &&
-	hash_prev=$(git rev-parse HEAD~1) &&
-	{
-		packetize "want $hash_head" &&
-		printf 0000 &&
-		packetize "have $hash_prev" &&
-		packetize "done"
-	} >fetch_body &&
-	test_copy_bytes 10 <fetch_body >fetch_body.trunc &&
-	hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) &&
-	{
-		printf "%s %s refs/heads/newbranch\\0report-status object-format=%s\\n" \
-			"$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw &&
-		printf 0000 &&
-		echo "$hash_next" | git pack-objects --stdout
-	} >push_body &&
-	test_copy_bytes 10 <push_body >push_body.trunc &&
-	: >empty_body
-
-[master (root-commit) a44f171] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.t
-[master 989de5e] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.t
-ok 1 - setup
-
-checking prerequisite: GZIP
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&gzip --version
-)
-gzip 1.12
-Copyright (C) 2018 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
+   d190886..35a3221  HEAD       -> wt
+ * [new tag]         banana     -> banana
+ok 117 - refuse fetch to current branch of bare repository worktree
 
-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"
+expecting success of 5516.118 'refuse to push a hidden ref, and make sure do not pollute the repository': 
+	mk_empty testrepo &&
+	git -C testrepo config receive.hiderefs refs/hidden &&
+	git -C testrepo config receive.unpackLimit 1 &&
+	test_must_fail git push testrepo HEAD:refs/hidden/foo &&
+	test_dir_is_empty testrepo/.git/objects/pack
 
-fatal: request ended in the middle of the gzip stream
-ok 14 - push gzipped empty
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+To testrepo
+ ! [remote rejected] HEAD -> refs/hidden/foo (deny updating a hidden ref)
+error: failed to push some refs to 'testrepo'
+ok 118 - refuse to push a hidden ref, and make sure do not pollute the repository
 
-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
+expecting success of 5516.119 'push with config push.useBitmaps': 
+	mk_test testrepo heads/main &&
+	git checkout main &&
+	test_unconfig push.useBitmaps &&
+	GIT_TRACE2_EVENT="$PWD/default" \
+	git push --quiet testrepo main:test &&
+	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
+		--thin --delta-base-offset -q <default &&
 
-fatal: failed to parse CONTENT_LENGTH: 2147483648
-ok 15 - CONTENT_LENGTH overflow ssite_t
+	test_config push.useBitmaps true &&
+	GIT_TRACE2_EVENT="$PWD/true" \
+	git push --quiet testrepo main:test2 &&
+	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
+		--thin --delta-base-offset -q <true &&
 
-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"
+	test_config push.useBitmaps false &&
+	GIT_TRACE2_EVENT="$PWD/false" \
+	git push --quiet testrepo main:test3 &&
+	test_subcommand git pack-objects --all-progress-implied --revs --stdout \
+		--thin --delta-base-offset -q --no-use-bitmap-index <false
 
-ok 16 - empty CONTENT_LENGTH
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5516-fetch-push/testrepo/.git/
+remote: warning: updating the current branch        
+To testrepo
+ * [new branch]      b9c09d6cc74d3857142fb7c082dca65b88254c6d -> main
+Already on 'main'
+{"event":"child_start","sid":"20241114T193820.864120Z-H5c947e1c-P00006fd0","thread":"main","time":"2024-11-14T19:38:20.879816Z","file":"run-command.c","line":724,"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":"20241114T193821.050119Z-H5c947e1c-P00007022","thread":"main","time":"2024-11-14T19:38:21.068634Z","file":"run-command.c","line":724,"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":"20241114T193821.204233Z-H5c947e1c-P0000707c","thread":"main","time":"2024-11-14T19:38:21.225308Z","file":"run-command.c","line":724,"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 119 - push with config push.useBitmaps
 
-# passed all 16 test(s)
-1..16
+# passed all 119 test(s)
+1..119
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5558-clone-bundle-uri.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/.git/
-expecting success of 5558.1 'fail to clone from non-existent file': 
-	test_when_finished rm -rf test &&
-	git clone --bundle-uri="$(pwd)/does-not-exist" . test 2>err &&
-	grep "failed to download bundle from URI" err
-
-warning: failed to download bundle from URI '/build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/does-not-exist'
-ok 1 - fail to clone from non-existent file
-
-expecting success of 5558.2 'fail to clone from non-bundle file': 
-	test_when_finished rm -rf test &&
-	echo bogus >bogus &&
-	git clone --bundle-uri="$(pwd)/bogus" . test 2>err &&
-	grep "is not a bundle" err
-
-warning: file at URI '/build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/bogus' is not a bundle or bundle list
-ok 2 - fail to clone from non-bundle file
-
-expecting success of 5558.3 'create bundle': 
-	git init clone-from &&
-	git -C clone-from checkout -b topic &&
-	test_commit -C clone-from A &&
-	test_commit -C clone-from B &&
-	git -C clone-from bundle create B.bundle topic
+*** t5543-atomic-push.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/.git/
+expecting success of 5543.1 'atomic push works for a single branch': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git push --atomic up main
+	) &&
+	test_refs main main
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/.git/
-Switched to a new branch 'topic'
-[topic (root-commit) 0ddfaf1] A
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[topic d9df450] B
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 139b20d] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ok 3 - create bundle
-
-expecting success of 5558.4 'clone with path bundle': 
-	git clone --bundle-uri="clone-from/B.bundle" \
-		clone-from clone-path &&
-	git -C clone-path rev-parse refs/bundles/topic >actual &&
-	git -C clone-from rev-parse topic >expect &&
-	test_cmp expect actual
-
-Cloning into 'clone-path'...
-done.
-ok 4 - clone with path bundle
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..139b20d  main -> main
+ok 1 - atomic push works for a single branch
 
-expecting success of 5558.5 'clone with path bundle and non-default hash': 
-	test_when_finished "rm -rf clone-path-non-default-hash" &&
-	GIT_DEFAULT_HASH=sha256 git clone --bundle-uri="clone-from/B.bundle" \
-		clone-from clone-path-non-default-hash &&
-	git -C clone-path-non-default-hash rev-parse refs/bundles/topic >actual &&
-	git -C clone-from rev-parse topic >expect &&
-	test_cmp expect actual
+expecting success of 5543.2 'atomic push works for two branches': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git branch second &&
+		git push --mirror up &&
+		test_commit two &&
+		git checkout second &&
+		test_commit three &&
+		git push --atomic up main second
+	) &&
+	test_refs main main &&
+	test_refs second second
 
-Cloning into 'clone-path-non-default-hash'...
-done.
-ok 5 - clone with path bundle and non-default hash
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Switched to branch 'second'
+[second 897c206] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..139b20d  main -> main
+   d79ce16..897c206  second -> second
+ok 2 - atomic push works for two branches
 
-expecting success of 5558.6 'clone with file:// bundle': 
-	git clone --bundle-uri="file://$(pwd)/clone-from/B.bundle" \
-		clone-from clone-file &&
-	git -C clone-file rev-parse refs/bundles/topic >actual &&
-	git -C clone-from rev-parse topic >expect &&
-	test_cmp expect actual
+expecting success of 5543.3 'atomic push works in combination with --mirror': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second &&
+		test_commit two &&
+		git push --atomic --mirror up
+	) &&
+	test_refs main main &&
+	test_refs second second
 
-Cloning into 'clone-file'...
-done.
-ok 6 - clone with file:// bundle
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Switched to a new branch 'second'
+[second 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+ * [new tag]         two -> two
+ok 3 - atomic push works in combination with --mirror
 
-expecting success of 5558.7 'construct incremental bundle list': 
+expecting success of 5543.4 'atomic push works in combination with --force': 
+	mk_repo_pair &&
 	(
-		cd clone-from &&
-		git checkout -b base &&
-		test_commit 1 &&
-		git checkout -b left &&
-		test_commit 2 &&
-		git checkout -b right base &&
-		test_commit 3 &&
-		git checkout -b merge left &&
-		git merge right -m "4" &&
-
-		git bundle create bundle-1.bundle base &&
-		git bundle create bundle-2.bundle base..left &&
-		git bundle create bundle-3.bundle base..right &&
-		git bundle create bundle-4.bundle merge --not left right
-	)
+		cd workbench &&
+		test_commit one &&
+		git branch second main &&
+		test_commit two_a &&
+		git checkout second &&
+		test_commit two_b &&
+		test_commit three_b &&
+		test_commit four &&
+		git push --mirror up &&
+		# The actual test is below
+		git checkout main &&
+		test_commit three_a &&
+		git checkout second &&
+		git reset --hard HEAD^ &&
+		git push --force --atomic up main second
+	) &&
+	test_refs main main &&
+	test_refs second second
 
-Switched to a new branch 'base'
-[base 65d47d5] 1
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Switched to a new branch 'left'
-[left 918de9f] 2
+ create mode 100644 one.t
+[main 0fd3f08] two_a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Switched to a new branch 'right'
-[right d1bc9f9] 3
+ create mode 100644 two_a.t
+Switched to branch 'second'
+[second 476acd6] two_b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Switched to a new branch 'merge'
-Merge made by the 'ort' strategy.
- 3.t | 1 +
+ create mode 100644 two_b.t
+[second 04c72ee] three_b
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 3.t
-ok 7 - construct incremental bundle list
-
-expecting success of 5558.8 'clone bundle list (file, no heuristic)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-
-	[bundle "bundle-1"]
-		uri = file://$(pwd)/clone-from/bundle-1.bundle
+ create mode 100644 three_b.t
+[second f7b7ae4] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         four -> four
+ * [new tag]         one -> one
+ * [new tag]         three_b -> three_b
+ * [new tag]         two_a -> two_a
+ * [new tag]         two_b -> two_b
+Switched to branch 'main'
+[main 6413866] three_a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three_a.t
+Switched to branch 'second'
+HEAD is now at 04c72ee three_b
+remote: warning: updating the current branch        
+To ../upstream
+   0fd3f08..6413866  main -> main
+ + f7b7ae4...04c72ee second -> second (forced update)
+ok 4 - atomic push works in combination with --force
 
-	[bundle "bundle-2"]
-		uri = file://$(pwd)/clone-from/bundle-2.bundle
+expecting success of 5543.5 'atomic push fails if one branch fails': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second main &&
+		test_commit two &&
+		test_commit three &&
+		test_commit four &&
+		git push --mirror up &&
+		git reset --hard HEAD~2 &&
+		test_commit five &&
+		git checkout main &&
+		test_commit six &&
+		test_must_fail git push --atomic --all up >output-all 2>&1 &&
+		# --all and --branches have the same behavior when be combined with --atomic
+		test_must_fail git push --atomic --branches up >output-branches 2>&1 &&
+		test_cmp output-all output-branches
+	) &&
+	test_refs main HEAD@{7} &&
+	test_refs second HEAD@{4}
 
-	[bundle "bundle-3"]
-		uri = file://$(pwd)/clone-from/bundle-3.bundle
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Switched to a new branch 'second'
+[second 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[second 7c7cd71] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[second fd8d77e] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         four -> four
+ * [new tag]         one -> one
+ * [new tag]         three -> three
+ * [new tag]         two -> two
+HEAD is now at 139b20d two
+[second a9f66f4] five
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+Switched to branch 'main'
+[main 29c9ea2] six
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 six.t
+ok 5 - atomic push fails if one branch fails
 
-	[bundle "bundle-4"]
-		uri = file://$(pwd)/clone-from/bundle-4.bundle
-	EOF
+expecting success of 5543.6 'atomic push fails if one tag fails remotely': 
+	# prepare the repo
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second main &&
+		test_commit two &&
+		git push --mirror up
+	) &&
+	# a third party modifies the server side:
+	(
+		cd upstream &&
+		git checkout second &&
+		git tag test_tag second
+	) &&
+	# see if we can now push both branches.
+	(
+		cd workbench &&
+		git checkout main &&
+		test_commit three &&
+		git checkout second &&
+		test_commit four &&
+		git tag test_tag &&
+		test_must_fail git push --tags --atomic up main second
+	) &&
+	test_refs main HEAD@{3} &&
+	test_refs second HEAD@{1}
 
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-list-file 2>err &&
-	! grep "Repository lacks these prerequisite commits" err &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Switched to a new branch 'second'
+[second 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+ * [new tag]         two -> two
+Switched to branch 'second'
+Switched to branch 'main'
+[main 846d065] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Switched to branch 'second'
+[second b6d6c1f] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+error: atomic push failed for ref refs/tags/test_tag. status: 3
 
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-list-file cat-file --batch-check <oids &&
+fatal: the remote end hung up unexpectedly
+To ../upstream
+ ! [rejected]        main -> main (atomic push failed)
+ ! [rejected]        second -> second (atomic push failed)
+ ! [rejected]        test_tag -> test_tag (already exists)
+ ! [rejected]        four -> four (atomic push failed)
+ ! [rejected]        three -> three (atomic push failed)
+error: failed to push some refs to '../upstream'
+hint: Updates were rejected because the tag already exists in the remote.
+ok 6 - atomic push fails if one tag fails remotely
 
-	git -C clone-list-file for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/" refs >actual &&
-	cat >expect <<-\EOF &&
-	refs/bundles/base
-	refs/bundles/left
-	refs/bundles/merge
-	refs/bundles/right
+expecting success of 5543.7 'atomic push obeys update hook preventing a branch to be pushed': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git checkout -b second main &&
+		test_commit two &&
+		git push --mirror up
+	) &&
+	test_hook -C upstream update <<-\EOF &&
+	# only allow update to main from now on
+	test "$1" = "refs/heads/main"
 	EOF
-	test_cmp expect actual
-
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-475812ed564e3085586d0b0acc392cec0a90c18e commit 261
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 8 - clone bundle list (file, no heuristic)
-
-expecting success of 5558.9 'clone bundle list (file, all mode, some failures)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-0"]
-		uri = file://$(pwd)/clone-from/bundle-0.bundle
+	(
+		cd workbench &&
+		git checkout main &&
+		test_commit three &&
+		git checkout second &&
+		test_commit four &&
+		test_must_fail git push --atomic up main second
+	) &&
+	test_refs main HEAD@{3} &&
+	test_refs second HEAD@{1}
 
-	[bundle "bundle-1"]
-		uri = file://$(pwd)/clone-from/bundle-1.bundle
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Switched to a new branch 'second'
+[second 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new branch]      second -> second
+ * [new tag]         one -> one
+ * [new tag]         two -> two
+Switched to branch 'main'
+[main 846d065] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Switched to branch 'second'
+[second b6d6c1f] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+remote: warning: updating the current branch        
+remote: error: hook declined to update refs/heads/second        
+To ../upstream
+ ! [remote rejected] main -> main (atomic push failure)
+ ! [remote rejected] second -> second (hook declined)
+error: failed to push some refs to '../upstream'
+ok 7 - atomic push obeys update hook preventing a branch to be pushed
 
-	[bundle "bundle-2"]
-		uri = file://$(pwd)/clone-from/bundle-2.bundle
+expecting success of 5543.8 'atomic push is not advertised if configured': 
+	mk_repo_pair &&
+	(
+		cd upstream &&
+		git config receive.advertiseatomic 0
+	) &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		test_must_fail git push --atomic up main
+	) &&
+	test_refs main HEAD@{1}
 
-	# No bundle-3 means bundle-4 will not apply.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+fatal: the receiving end does not support --atomic push
+fatal: the remote end hung up unexpectedly
+ok 8 - atomic push is not advertised if configured
 
-	[bundle "bundle-4"]
-		uri = file://$(pwd)/clone-from/bundle-4.bundle
+expecting success of 5543.9 'atomic push reports (reject by update hook)': 
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git branch foo &&
+		git push up main one foo &&
+		git tag -d one
+	) &&
+	(
+		mkdir -p upstream/.git/hooks &&
+		cat >upstream/.git/hooks/update <<-EOF &&
+		#!/bin/sh
 
-	# Does not exist. Should be skipped.
-	[bundle "bundle-5"]
-		uri = file://$(pwd)/clone-from/bundle-5.bundle
+		if test "\$1" = "refs/heads/bar"
+		then
+			echo >&2 "Pusing to branch bar is prohibited"
+			exit 1
+		fi
+		EOF
+		chmod a+x upstream/.git/hooks/update
+	) &&
+	(
+		cd workbench &&
+		test_commit two &&
+		git branch bar
+	) &&
+	test_must_fail git -C workbench \
+		push --atomic up main two bar >out 2>&1 &&
+	fmt_status_report <out >actual &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 ! [remote rejected] main -> main (atomic push failure)
+	 ! [remote rejected] two -> two (atomic push failure)
+	 ! [remote rejected] bar -> bar (hook declined)
 	EOF
+	test_cmp expect actual
 
-	GIT_TRACE2_PERF=1 \
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-all-some 2>err &&
-	! grep "Repository lacks these prerequisite commits" err &&
-	! grep "fatal" err &&
-	grep "warning: failed to download bundle from URI" err &&
-
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-all-some cat-file --batch-check <oids &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5543-atomic-push/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+ * [new branch]      foo -> foo
+Deleted tag 'one' (was d79ce16)
+[main 51ba0d2] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 9 - atomic push reports (reject by update hook)
 
-	git -C clone-all-some for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/" refs >actual &&
-	cat >expect <<-\EOF &&
-	refs/bundles/base
-	refs/bundles/left
+expecting success of 5543.10 'atomic push reports (mirror, but reject by update hook)': 
+	(
+		cd workbench &&
+		git remote remove up &&
+		git remote add up ../upstream
+	) &&
+	test_must_fail git -C workbench \
+		push --atomic --mirror up >out 2>&1 &&
+	fmt_status_report <out >actual &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 ! [remote rejected] main -> main (atomic push failure)
+	 ! [remote rejected] one (atomic push failure)
+	 ! [remote rejected] bar -> bar (hook declined)
+	 ! [remote rejected] two -> two (atomic push failure)
 	EOF
 	test_cmp expect actual
 
-warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-5.bundle'
-warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-0.bundle'
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-475812ed564e3085586d0b0acc392cec0a90c18e commit 261
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 9 - clone bundle list (file, all mode, some failures)
-
-expecting success of 5558.10 'clone bundle list (file, all mode, all failures)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = all
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-0"]
-		uri = file://$(pwd)/clone-from/bundle-0.bundle
+ok 10 - atomic push reports (mirror, but reject by update hook)
 
-	# Does not exist. Should be skipped.
-	[bundle "bundle-5"]
-		uri = file://$(pwd)/clone-from/bundle-5.bundle
+expecting success of 5543.11 'atomic push reports (reject by non-ff)': 
+	rm upstream/.git/hooks/update &&
+	(
+		cd workbench &&
+		git push up main &&
+		git reset --hard HEAD^
+	) &&
+	test_must_fail git -C workbench \
+		push --atomic up main foo bar >out 2>&1 &&
+	fmt_status_report <out >actual &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 ! [rejected] main -> main (non-fast-forward)
+	 ! [rejected] bar -> bar (atomic push failed)
 	EOF
+	test_cmp expect actual
 
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-all-fail 2>err &&
-	! grep "Repository lacks these prerequisite commits" err &&
-	! grep "fatal" err &&
-	grep "warning: failed to download bundle from URI" err &&
-
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-all-fail cat-file --batch-check <oids &&
-
-	git -C clone-all-fail for-each-ref --format="%(refname)" >refs &&
-	! grep "refs/bundles/" refs
-
-warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-5.bundle'
-warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-0.bundle'
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-475812ed564e3085586d0b0acc392cec0a90c18e commit 261
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 10 - clone bundle list (file, all mode, all failures)
-
-expecting success of 5558.11 'clone bundle list (file, any mode)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = any
-
-	# Does not exist. Should be skipped.
-	[bundle "bundle-0"]
-		uri = file://$(pwd)/clone-from/bundle-0.bundle
-
-	[bundle "bundle-1"]
-		uri = file://$(pwd)/clone-from/bundle-1.bundle
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..51ba0d2  main -> main
+HEAD is now at d79ce16 one
+ok 11 - atomic push reports (reject by non-ff)
 
-	# Does not exist. Should be skipped.
-	[bundle "bundle-5"]
-		uri = file://$(pwd)/clone-from/bundle-5.bundle
-	EOF
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5546-receive-limits.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/.git/
+expecting success of 5546.1 'create known-size (1024 bytes) commit': 
+	test-tool genrandom foo 1024 >one-k &&
+	git add one-k &&
+	test_commit one-k
 
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-any-file 2>err &&
-	! grep "Repository lacks these prerequisite commits" err &&
+[master (root-commit) cba7046] one-k
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 one-k
+ create mode 100644 one-k.t
+ok 1 - create known-size (1024 bytes) commit
 
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-any-file cat-file --batch-check <oids &&
+expecting success of 5546.2 'prepare destination repository': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
+ok 2 - prepare destination repository
 
-	git -C clone-any-file for-each-ref --format="%(refname)" >refs &&
-	grep "refs/bundles/" refs >actual &&
-	cat >expect <<-\EOF &&
-	refs/bundles/base
-	EOF
-	test_cmp expect actual
+expecting success of 5546.3 'set unpacklimit to 1': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
+	
+ok 3 - set unpacklimit to 1
 
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-475812ed564e3085586d0b0acc392cec0a90c18e commit 261
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 11 - clone bundle list (file, any mode)
+expecting success of 5546.4 'setting receive.maxInputSize to 512 rejects push': 
+		git --git-dir=dest config receive.maxInputSize 512 &&
+		test_must_fail git push dest HEAD
+	
+remote: fatal: pack exceeds maximum allowed size (512 bytes)        
+error: remote unpack failed: index-pack abnormal exit
+To dest
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dest'
+ok 4 - setting receive.maxInputSize to 512 rejects push
 
-expecting success of 5558.12 'clone bundle list (file, any mode, all failures)': 
-	cat >bundle-list <<-EOF &&
-	[bundle]
-		version = 1
-		mode = any
+expecting success of 5546.5 'bumping limit to 4k allows push': 
+		git --git-dir=dest config receive.maxInputSize 4k &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 5 - bumping limit to 4k allows push
 
-	# Does not exist. Should be skipped.
-	[bundle "bundle-0"]
-		uri = $HTTPD_URL/bundle-0.bundle
+expecting success of 5546.6 'prepare destination repository (again)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
+ok 6 - prepare destination repository (again)
 
-	# Does not exist. Should be skipped.
-	[bundle "bundle-5"]
-		uri = $HTTPD_URL/bundle-5.bundle
-	EOF
+expecting success of 5546.7 'lifting the limit allows push': 
+		git --git-dir=dest config receive.maxInputSize 0 &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 7 - lifting the limit allows push
 
-	git clone --bundle-uri="file://$(pwd)/bundle-list" \
-		clone-from clone-any-fail 2>err &&
-	! grep "fatal" err &&
-	grep "warning: failed to download bundle from URI" err &&
+expecting success of 5546.8 'prepare destination repository (once more)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
+ok 8 - prepare destination repository (once more)
 
-	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
-	git -C clone-any-fail cat-file --batch-check <oids &&
+expecting success of 5546.9 'receive trumps transfer': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
+		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
+		git push dest HEAD &&
+		validate_store_type
+	
+To dest
+ * [new branch]      HEAD -> master
+count: 0
+ok 9 - receive trumps transfer
 
-	git -C clone-any-fail for-each-ref --format="%(refname)" >refs &&
-	! grep "refs/bundles/" refs
+expecting success of 5546.10 'prepare destination repository': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
+ok 10 - prepare destination repository
 
-warning: failed to download bundle from URI '/bundle-5.bundle'
-warning: failed to download bundle from URI '/bundle-0.bundle'
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-475812ed564e3085586d0b0acc392cec0a90c18e commit 261
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
-918de9f3988f29866b94f657626edb7247c7ddbd commit 213
-d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
-0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
-d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
-ok 12 - clone bundle list (file, any mode, all failures)
+expecting success of 5546.11 'set unpacklimit to 10000': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit"
+	
+ok 11 - set unpacklimit to 10000
 
-checking prerequisite: NOT_ROOT
+expecting success of 5546.12 'setting receive.maxInputSize to 512 rejects push': 
+		git --git-dir=dest config receive.maxInputSize 512 &&
+		test_must_fail git push dest HEAD
+	
+remote: fatal: pack exceeds maximum allowed size        
+error: remote unpack failed: unpack-objects abnormal exit
+To dest
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dest'
+ok 12 - setting receive.maxInputSize to 512 rejects push
 
-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 5546.13 'bumping limit to 4k allows push': 
+		git --git-dir=dest config receive.maxInputSize 4k &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 13 - bumping limit to 4k allows push
 
-)
-prerequisite NOT_ROOT ok
-# passed all 12 test(s)
-# SKIP no web server found at ''
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5563-simple-http-auth.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5563-simple-http-auth/.git/
-checking prerequisite: NOT_ROOT
+expecting success of 5546.14 'prepare destination repository (again)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
+ok 14 - prepare destination repository (again)
 
-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 5546.15 'lifting the limit allows push': 
+		git --git-dir=dest config receive.maxInputSize 0 &&
+		git push dest HEAD
+	
+To dest
+ * [new branch]      HEAD -> master
+ok 15 - lifting the limit allows push
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5564-http-proxy.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5564-http-proxy/.git/
-checking prerequisite: NOT_ROOT
+expecting success of 5546.16 'prepare destination repository (once more)': 
+		rm -fr dest &&
+		git --bare init dest
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5546-receive-limits/dest/
+ok 16 - prepare destination repository (once more)
 
-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 5546.17 'receive trumps transfer': 
+		git --git-dir=dest config receive.unpacklimit "$unpack_limit" &&
+		git --git-dir=dest config transfer.unpacklimit "$other_limit" &&
+		git push dest HEAD &&
+		validate_store_type
+	
+To dest
+ * [new branch]      HEAD -> master
+packs: 0
+ok 17 - receive trumps transfer
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
+# passed all 17 test(s)
+1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5533-push-cas.sh ***
@@ -360461,174 +357969,1324 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5560-http-backend-noserver.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/.git/
-expecting success of 5560.1 'setup repository': 
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
+*** t5549-fetch-push-http.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5549-fetch-push-http/.git/
+checking prerequisite: NOT_ROOT
 
-	mkdir "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	 git --bare init &&
-	 : >objects/info/alternates &&
-	 : >objects/info/http-alternates
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5547-push-quarantine.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5547-push-quarantine/.git/
+expecting success of 5547.1 'create picky dest repo': 
+	git init --bare dest.git &&
+	test_hook --setup -C dest.git pre-receive <<-\EOF
+	while read old new ref; do
+		test "$(git log -1 --format=%s $new)" = reject && exit 1
+	done
+	exit 0
+	EOF
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5547-push-quarantine/dest.git/
+ok 1 - create picky dest repo
+
+expecting success of 5547.2 'accepted objects work': 
+	test_commit ok &&
+	git push dest.git HEAD &&
+	commit=$(git rev-parse HEAD) &&
+	git --git-dir=dest.git cat-file commit $commit
+
+[master (root-commit) c6ea792] ok
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ok.t
+To dest.git
+ * [new branch]      HEAD -> master
+tree b75e7563b6e3ea344e3d7eff513fde4da0914ed6
+author A U Thor <author@example.com> 1112911993 -0700
+committer C O Mitter <committer@example.com> 1112911993 -0700
+
+ok
+ok 2 - accepted objects work
+
+expecting success of 5547.3 'rejected objects are not installed': 
+	test_commit reject &&
+	commit=$(git rev-parse HEAD) &&
+	test_must_fail git push dest.git reject &&
+	test_must_fail git --git-dir=dest.git cat-file commit $commit
+
+[master d08c8eb] reject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 reject.t
+To dest.git
+ ! [remote rejected] reject -> reject (pre-receive hook declined)
+error: failed to push some refs to 'dest.git'
+fatal: git cat-file d08c8eba97f4e683ece08654c7c8d2ba0c03b129: bad file
+ok 3 - rejected objects are not installed
+
+expecting success of 5547.4 'rejected objects are removed': 
+	echo "incoming-*" >expect &&
+	(cd dest.git/objects && echo incoming-*) >actual &&
+	test_cmp expect actual
+
+ok 4 - rejected objects are removed
+
+expecting success of 5547.5 'push to repo path with path separator (colon)': 
+	# The interesting failure case here is when the
+	# receiving end cannot access its original object directory,
+	# so make it likely for us to generate a delta by having
+	# a non-trivial file with multiple versions.
+
+	test-tool genrandom foo 4096 >file.bin &&
+	git add file.bin &&
+	git commit -m bin &&
+
+	if test_have_prereq MINGW
+	then
+		pathsep=";"
+	else
+		pathsep=":"
+	fi &&
+	git clone --bare . "xxx${pathsep}yyy.git" &&
+
+	echo change >>file.bin &&
+	git commit -am change &&
+	# Note that we have to use the full path here, or it gets confused
+	# with the ssh host:path syntax.
+	git push "$(pwd)/xxx${pathsep}yyy.git" HEAD
+
+[master f56dd63] bin
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file.bin
+Cloning into bare repository 'xxx:yyy.git'...
+done.
+[master 0343f66] change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+To /build/reproducible-path/git-2.45.2/t/trash directory.t5547-push-quarantine/xxx:yyy.git
+   f56dd63..0343f66  HEAD -> master
+ok 5 - push to repo path with path separator (colon)
+
+expecting success of 5547.6 'updating a ref from quarantine is forbidden': 
+	git init --bare update.git &&
+	test_hook -C update.git pre-receive <<-\EOF &&
+	read old new refname
+	git update-ref refs/heads/unrelated $new
+	exit 1
+	EOF
+	test_must_fail git push update.git HEAD &&
+	git -C update.git fsck
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5547-push-quarantine/update.git/
+remote: fatal: update_ref failed for ref 'refs/heads/unrelated': ref updates forbidden inside quarantine environment        
+To update.git
+ ! [remote rejected] HEAD -> master (pre-receive hook declined)
+error: failed to push some refs to 'update.git'
+notice: HEAD points to an unborn branch (master)
+notice: No default references
+ok 6 - updating a ref from quarantine is forbidden
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5550-http-fetch-dumb.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5548-push-porcelain.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5548-push-porcelain/.git/
+expecting success of 5548.1 'setup upstream repository and workbench': 
+		rm -rf upstream.git 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 remote add origin ../upstream.git &&
+			git update-ref refs/heads/main $A &&
+			git push origin \
+				$B:refs/heads/main \
+				$A:refs/heads/foo \
+				$A:refs/heads/bar \
+				$A:refs/heads/baz
+		) &&
+		git -C "workbench" config advice.pushUpdateRejected false &&
+		upstream=upstream.git
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5548-push-porcelain/upstream.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5548-push-porcelain/workbench/.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
+To ../upstream.git
+ * [new branch]      d9df4505cb3522088b9e29d6051ac16f1564154a -> main
+ * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> foo
+ * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> bar
+ * [new branch]      0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 -> baz
+ok 1 - setup upstream repository and workbench
+
+expecting success of 5548.2 'porcelain output of successful git-push (builtin protocol)': 
+		(
+			cd workbench &&
+			git update-ref refs/heads/main $A &&
+			git update-ref refs/heads/baz $A &&
+			git update-ref refs/heads/next $A &&
+			git push --porcelain --force origin \
+				main \
+				:refs/heads/foo \
+				$B:bar \
+				baz \
+				next
+		) >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+		> -	:refs/heads/foo	[deleted]
+		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+		> *	refs/heads/next:refs/heads/next	[new branch]
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	
+ok 2 - porcelain output of successful git-push (builtin protocol)
+
+expecting success of 5548.3 'atomic push failed (builtin protocol)': 
+		(
+			cd workbench &&
+			git update-ref refs/heads/main $B &&
+			git update-ref refs/heads/bar $A &&
+			test_must_fail git push --atomic --porcelain origin \
+				main \
+				bar \
+				:baz \
+				next
+		) >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		To <URL/of/upstream.git>
+		> =	refs/heads/next:refs/heads/next	[up to date]
+		> !	refs/heads/bar:refs/heads/bar	[rejected] (non-fast-forward)
+		> !	(delete):refs/heads/baz	[rejected] (atomic push failed)
+		> !	refs/heads/main:refs/heads/main	[rejected] (atomic push failed)
+		Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	
+error: atomic push failed for ref refs/heads/bar. status: 2
+
+fatal: the remote end hung up unexpectedly
+error: failed to push some refs to '../upstream.git'
+ok 3 - atomic push failed (builtin protocol)
+
+expecting success of 5548.4 'prepare pre-receive hook (builtin protocol)': 
+		test_hook --setup -C "$upstream" pre-receive <<-EOF
+		exit 1
+		EOF
+	
+ok 4 - prepare pre-receive hook (builtin protocol)
+
+expecting success of 5548.5 'pre-receive hook declined (builtin protocol)': 
+		(
+			cd workbench &&
+			git update-ref refs/heads/main $B &&
+			git update-ref refs/heads/bar $A &&
+			test_must_fail git push --porcelain --force origin \
+				main \
+				bar \
+				:baz \
+				next
+		) >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		To <URL/of/upstream.git>
+		> =	refs/heads/next:refs/heads/next	[up to date]
+		> !	refs/heads/bar:refs/heads/bar	[remote rejected] (pre-receive hook declined)
+		> !	:refs/heads/baz	[remote rejected] (pre-receive hook declined)
+		> !	refs/heads/main:refs/heads/main	[remote rejected] (pre-receive hook declined)
+		Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	
+error: failed to push some refs to '../upstream.git'
+ok 5 - pre-receive hook declined (builtin protocol)
+
+expecting success of 5548.6 'remove pre-receive hook (builtin protocol)': 
+		rm "$upstream/hooks/pre-receive"
+	
+ok 6 - remove pre-receive hook (builtin protocol)
+
+expecting success of 5548.7 'non-fastforward push (builtin protocol)': 
+		(
+			cd workbench &&
+			test_must_fail git push --porcelain origin \
+				main \
+				bar \
+				:baz \
+				next
+		) >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		To <URL/of/upstream.git>
+		> =	refs/heads/next:refs/heads/next	[up to date]
+		> -	:refs/heads/baz	[deleted]
+		>  	refs/heads/main:refs/heads/main	<COMMIT-A>..<COMMIT-B>
+		> !	refs/heads/bar:refs/heads/bar	[rejected] (non-fast-forward)
+		Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-B> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	
+error: failed to push some refs to '../upstream.git'
+ok 7 - non-fastforward push (builtin protocol)
+
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+# passed all 7 test(s)
+# SKIP no web server found at ''
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5551-http-fetch-smart.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5545-push-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/.git/
+expecting success of 5545.1 'one push option works for a single branch': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git push --push-option=asdf up main
 	) &&
-	git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	git push public main:main &&
+	test_refs main main &&
+	echo "asdf" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-	(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	 git repack -a -d
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..139b20d  main -> main
+ok 1 - one push option works for a single branch
+
+expecting success of 5545.2 'push option denied by remote': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions false &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		test_must_fail git push --push-option=asdf up main
 	) &&
+	test_refs main HEAD@{1}
 
-	echo other >file &&
-	git add file &&
-	git commit -m two &&
-	git push public main:main &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+fatal: the receiving end does not support push options
+fatal: the remote end hung up unexpectedly
+ok 2 - push option denied by remote
 
-	LOOSE_URL=$(find_file objects/??) &&
-	PACK_URL=$(find_file objects/pack/*.pack) &&
-	IDX_URL=$(find_file objects/pack/*.idx)
+expecting success of 5545.3 'two push options work': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git push --push-option=asdf --push-option="more structured text" up main
+	) &&
+	test_refs main main &&
+	printf "asdf\nmore structured text\n" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-[main (root-commit) f39a923] one
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) d79ce16] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/repo.git/
-To /build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/repo.git
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
  * [new branch]      main -> main
-[main 0149442] two
+ * [new tag]         one -> one
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   d79ce16..139b20d  main -> main
+ok 3 - two push options work
+
+expecting success of 5545.4 'push options and submodules': 
+	test_when_finished "rm -rf parent" &&
+	test_when_finished "rm -rf parent_upstream" &&
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	cp -r upstream parent_upstream &&
+	test_commit -C upstream one &&
+
+	test_create_repo parent &&
+	git -C parent remote add up ../parent_upstream &&
+	test_commit -C parent one &&
+	git -C parent push --mirror up &&
+
+	test_config_global protocol.file.allow always &&
+	git -C parent submodule add ../upstream workbench &&
+	git -C parent/workbench remote add up ../../upstream &&
+	git -C parent commit -m "add submodule" &&
+
+	test_commit -C parent/workbench two &&
+	git -C parent add workbench &&
+	git -C parent commit -m "update workbench" &&
+
+	git -C parent push \
+		--push-option=asdf --push-option="more structured text" \
+		--recurse-submodules=on-demand up main &&
+
+	git -C upstream rev-parse --verify main >expect &&
+	git -C parent/workbench rev-parse --verify main >actual &&
+	test_cmp expect actual &&
+
+	git -C parent_upstream rev-parse --verify main >expect &&
+	git -C parent rev-parse --verify main >actual &&
+	test_cmp expect actual &&
+
+	printf "asdf\nmore structured text\n" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options &&
+	test_cmp expect parent_upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect parent_upstream/.git/hooks/post-receive.push_options
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/parent/.git/
+[main (root-commit) b838542] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../parent_upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/parent/workbench'...
+done.
+[main 8b5c571] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 workbench
+[main 8f1d4ef] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[main 2417cbb] update workbench
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-To /build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/repo.git
-   f39a923..0149442  main -> main
-ok 1 - setup repository
+Pushing submodule 'workbench'
+remote: warning: updating the current branch        
+To ../../upstream
+   d79ce16..8f1d4ef  main -> main
+remote: warning: updating the current branch        
+To ../parent_upstream
+   b838542..2417cbb  main -> main
+ok 4 - push options and submodules
 
-expecting success of 5560.2 'direct refs/heads/main not found': 
-	GET refs/heads/main "404 Not Found"
+expecting success of 5545.5 'default push option': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git -c push.pushOption=default push up main
+	) &&
+	test_refs main main &&
+	echo "default" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-ok 2 - direct refs/heads/main not found
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   af0b45c..1dd7f79  main -> main
+ok 5 - default push option
 
-expecting success of 5560.3 'static file is ok': 
-	get_static_files "200 OK"
+expecting success of 5545.6 'two default push options': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git -c push.pushOption=default1 -c push.pushOption=default2 push up main
+	) &&
+	test_refs main main &&
+	printf "default1\ndefault2\n" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-ok 3 - static file is ok
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   af0b45c..1dd7f79  main -> main
+ok 6 - two default push options
 
-expecting success of 5560.4 'no export by default': 
-	get_static_files "404 Not Found"
+expecting success of 5545.7 'push option from command line overrides from-config push option': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git -c push.pushOption=default push --push-option=manual up main
+	) &&
+	test_refs main main &&
+	echo "manual" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-ok 4 - no export by default
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   af0b45c..1dd7f79  main -> main
+ok 7 - push option from command line overrides from-config push option
 
-expecting success of 5560.5 'export if git-daemon-export-ok': 
-        (cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	 touch git-daemon-export-ok
+expecting success of 5545.8 'empty value of push.pushOption in config clears the list': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		git -c push.pushOption=default1 -c push.pushOption= -c push.pushOption=default2 push up main
 	) &&
-        get_static_files "200 OK"
+	test_refs main main &&
+	echo "default2" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+	test_cmp expect upstream/.git/hooks/post-receive.push_options
 
-ok 5 - export if git-daemon-export-ok
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+remote: warning: updating the current branch        
+To ../upstream
+   af0b45c..1dd7f79  main -> main
+ok 8 - empty value of push.pushOption in config clears the list
 
-expecting success of 5560.6 'static file if http.getanyfile true is ok': 
-	config http.getanyfile true &&
-	get_static_files "200 OK"
+expecting success of 5545.9 'invalid push option in config': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git push --mirror up &&
+		test_commit two &&
+		test_must_fail git -c push.pushOption push up main
+	) &&
+	test_refs main HEAD@{1}
 
-ok 6 - static file if http.getanyfile true is ok
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+[main 1dd7f79] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+error: missing value for 'push.pushoption'
+fatal: unable to parse 'push.pushoption' from command-line config
+ok 9 - invalid push option in config
 
-expecting success of 5560.7 'static file if http.getanyfile false fails': 
-	config http.getanyfile false &&
-	get_static_files "403 Forbidden"
+expecting success of 5545.10 'push options keep quoted characters intact (direct)': 
+	mk_repo_pair &&
+	git -C upstream config receive.advertisePushOptions true &&
+	test_commit -C workbench one &&
+	git -C workbench push --push-option="\"embedded quotes\"" up main &&
+	echo "\"embedded quotes\"" >expect &&
+	test_cmp expect upstream/.git/hooks/pre-receive.push_options
 
-ok 7 - static file if http.getanyfile false fails
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5545-push-options/workbench/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+remote: warning: updating the current branch        
+To ../upstream
+ * [new branch]      main -> main
+ok 10 - push options keep quoted characters intact (direct)
 
-expecting success of 5560.8 'http.uploadpack default enabled': 
-	GET info/refs?service=git-upload-pack "200 OK"  &&
-	POST git-upload-pack 0000 "200 OK"
+checking prerequisite: NOT_ROOT
 
-ok 8 - http.uploadpack default enabled
+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 5560.9 'http.uploadpack true': 
-	config http.uploadpack true &&
-	GET info/refs?service=git-upload-pack "200 OK" &&
-	POST git-upload-pack 0000 "200 OK"
+)
+prerequisite NOT_ROOT ok
+# passed all 10 test(s)
+# SKIP no web server found at ''
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5554-noop-fetch-negotiator.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5554-noop-fetch-negotiator/.git/
+expecting success of 5554.1 'noop negotiator does not emit any "have"': 
+	rm -f trace &&
 
-ok 9 - http.uploadpack true
+	test_create_repo server &&
+	test_commit -C server to_fetch &&
 
-expecting success of 5560.10 'http.uploadpack false': 
-	config http.uploadpack false &&
-	GET info/refs?service=git-upload-pack "403 Forbidden" &&
-	POST git-upload-pack 0000 "403 Forbidden"
+	test_create_repo client &&
+	test_commit -C client we_have &&
 
-ok 10 - http.uploadpack false
+	test_config -C client fetch.negotiationalgorithm noop &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "$(pwd)/server" &&
 
-expecting success of 5560.11 'http.receivepack default disabled': 
-	GET info/refs?service=git-receive-pack "403 Forbidden"  &&
-	POST git-receive-pack 0000 "403 Forbidden"
+	! grep "fetch> have" trace &&
+	grep "fetch> done" trace
 
-ok 11 - http.receivepack default disabled
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t/trash directory.t5554-noop-fetch-negotiator/server
+ * branch            HEAD       -> FETCH_HEAD
+packet:        fetch> done
+ok 1 - noop negotiator does not emit any "have"
 
-expecting success of 5560.12 'http.receivepack true': 
-	config http.receivepack true &&
-	GET info/refs?service=git-receive-pack "200 OK" &&
-	POST git-receive-pack 0000 "200 OK"
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5557-http-get.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5557-http-get/.git/
+checking prerequisite: NOT_ROOT
 
-ok 12 - http.receivepack true
+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 5560.13 'http.receivepack false': 
-	config http.receivepack false &&
-	GET info/refs?service=git-receive-pack "403 Forbidden" &&
-	POST git-receive-pack 0000 "403 Forbidden"
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5555-http-smart-common.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5555-http-smart-common/.git/
+expecting success of 5555.1 'setup': 
+	test_commit --no-tag initial
 
-ok 13 - http.receivepack false
+[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 5560.14 'http-backend blocks bad PATH_INFO': 
-	config http.getanyfile true &&
+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
 
-	expect_aliased 0 /repo.git/HEAD &&
+ok 2 - git upload-pack --http-backend-info-refs and --advertise-refs are aliased
 
-	expect_aliased 1 /repo.git/../HEAD &&
-	expect_aliased 1 /../etc/passwd &&
-	expect_aliased 1 ../etc/passwd &&
-	expect_aliased 1 /etc//passwd &&
-	expect_aliased 1 /etc/./passwd &&
-	expect_aliased 1 //domain/data.txt
+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
 
---- exp.err	2025-12-18 01:37:11.426773267 +0000
-+++ act.err	2025-12-18 01:37:11.414773267 +0000
-@@ -1 +0,0 @@
--fatal: '/repo.git/../HEAD': aliased
---- exp.err	2025-12-18 01:37:11.438773267 +0000
-+++ act.err	2025-12-18 01:37:11.438773267 +0000
-@@ -1 +1 @@
--fatal: '/../etc/passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver//../etc/passwd'
-\ No newline at end of file
---- exp.err	2025-12-18 01:37:11.458773267 +0000
-+++ act.err	2025-12-18 01:37:11.458773267 +0000
-@@ -1 +1 @@
--fatal: '../etc/passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/../etc/passwd'
-\ No newline at end of file
---- exp.err	2025-12-18 01:37:11.478773267 +0000
-+++ act.err	2025-12-18 01:37:11.478773267 +0000
-@@ -1 +1 @@
--fatal: '/etc//passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver//etc//passwd'
-\ No newline at end of file
---- exp.err	2025-12-18 01:37:11.494773267 +0000
-+++ act.err	2025-12-18 01:37:11.490773267 +0000
-@@ -1 +1 @@
--fatal: '/etc/./passwd': aliased
-+Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver//etc/./passwd'
-\ No newline at end of file
---- exp.err	2025-12-18 01:37:11.502773267 +0000
-+++ act.err	2025-12-18 01:37:11.502773267 +0000
-@@ -1 +1 @@
--fatal: '//domain/data.txt': aliased
-+Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver///domain/data.txt'
-\ No newline at end of file
-ok 14 - http-backend blocks bad PATH_INFO
+ok 3 - git receive-pack --http-backend-info-refs and --advertise-refs are aliased
 
-# passed all 14 test(s)
-1..14
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5559-http-fetch-smart-http2.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5553-set-upstream.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream/.git/
+expecting success of 5553.1 'setup bare parent fetch': 
+	ensure_fresh_upstream &&
+	git remote add upstream parent
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream/parent/
+ok 1 - setup bare parent fetch
+
+expecting success of 5553.2 'setup commit on main and other fetch': 
+	test_commit one &&
+	git push upstream main &&
+	git checkout -b other &&
+	test_commit two &&
+	git push upstream other
+
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+To parent
+ * [new branch]      main -> main
+Switched to a new branch 'other'
+[other 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+To parent
+ * [new branch]      other -> other
+ok 2 - setup commit on main and other fetch
+
+expecting success of 5553.3 'fetch --set-upstream does not set upstream w/o branch': 
+	clear_config main other &&
+	git checkout main &&
+	git fetch --set-upstream upstream &&
+	check_config_missing main &&
+	check_config_missing other
+
+Switched to branch 'main'
+warning: no source branch found;
+you need to specify exactly one branch with the --set-upstream option
+ok 3 - fetch --set-upstream does not set upstream w/o branch
+
+expecting success of 5553.4 'fetch --set-upstream upstream main sets branch main but not other': 
+	clear_config main other &&
+	git fetch --set-upstream upstream main &&
+	check_config main upstream refs/heads/main &&
+	check_config_missing other
+
+From parent
+ * branch            main       -> FETCH_HEAD
+ok 4 - fetch --set-upstream upstream main sets branch main but not other
+
+expecting success of 5553.5 'fetch --set-upstream upstream other sets branch other': 
+	clear_config main other &&
+	git fetch --set-upstream upstream other &&
+	check_config main upstream refs/heads/other &&
+	check_config_missing other
+
+From parent
+ * branch            other      -> FETCH_HEAD
+ok 5 - fetch --set-upstream upstream other sets branch other
+
+expecting success of 5553.6 'fetch --set-upstream main:other does not set the branch other2': 
+	clear_config other2 &&
+	git fetch --set-upstream upstream main:other2 &&
+	check_config_missing other2
+
+From parent
+ * [new branch]      main       -> other2
+warning: no source branch found;
+you need to specify exactly one branch with the --set-upstream option
+ok 6 - fetch --set-upstream main:other does not set the branch other2
+
+expecting success of 5553.7 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url': 
+	# main explicitly not cleared, we check that it is not touched from previous value
+	clear_config other other2 &&
+	test_must_fail git fetch --set-upstream http://nosuchdomain.example.com &&
+	check_config main upstream refs/heads/other &&
+	check_config_missing other &&
+	check_config_missing other2
+
+fatal: unable to access 'http://nosuchdomain.example.com/': Could not resolve host: nosuchdomain.example.com
+ok 7 - fetch --set-upstream http://nosuchdomain.example.com fails with invalid url
+
+expecting success of 5553.8 'fetch --set-upstream with valid URL sets upstream to URL': 
+	clear_config other other2 &&
+	url="file://$PWD" &&
+	git fetch --set-upstream "$url" &&
+	check_config main "$url" HEAD &&
+	check_config_missing other &&
+	check_config_missing other2
+
+From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream
+ * branch            HEAD       -> FETCH_HEAD
+ok 8 - fetch --set-upstream with valid URL sets upstream to URL
+
+expecting success of 5553.9 'fetch --set-upstream with a detached HEAD': 
+	git checkout HEAD^0 &&
+	test_when_finished "git checkout -" &&
+	cat >expect <<-\EOF &&
+	warning: could not set upstream of HEAD to 'main' from 'upstream' when it does not point to any branch.
+	EOF
+	git fetch --set-upstream upstream main 2>actual.raw &&
+	grep ^warning: actual.raw >actual &&
+	test_cmp expect actual
+
+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 d79ce16 one
+Switched to branch 'main'
+ok 9 - fetch --set-upstream with a detached HEAD
+
+expecting success of 5553.10 'setup bare parent pull': 
+	git remote rm upstream &&
+	ensure_fresh_upstream &&
+	git remote add upstream parent
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream/parent/
+ok 10 - setup bare parent pull
+
+expecting success of 5553.11 'setup commit on main and other pull': 
+	test_commit three &&
+	git push --tags upstream main &&
+	test_commit four &&
+	git push upstream other
+
+[main 897c206] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+To parent
+ * [new branch]      main -> main
+ * [new tag]         one -> one
+ * [new tag]         three -> three
+ * [new tag]         two -> two
+[main 6f2ec4d] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+To parent
+ * [new branch]      other -> other
+ok 11 - setup commit on main and other pull
+
+expecting success of 5553.12 'pull --set-upstream upstream main sets branch main but not other': 
+	clear_config main other &&
+	git pull --no-rebase --set-upstream upstream main &&
+	check_config main upstream refs/heads/main &&
+	check_config_missing other
+
+From parent
+ * branch            main       -> FETCH_HEAD
+Already up to date.
+ok 12 - pull --set-upstream upstream main sets branch main but not other
+
+expecting success of 5553.13 'pull --set-upstream main:other2 does not set the branch other2': 
+	clear_config other2 &&
+	git pull --no-rebase --set-upstream upstream main:other2 &&
+	check_config_missing other2
+
+From parent
+   d79ce16..897c206  main       -> other2
+warning: no source branch found;
+you need to specify exactly one branch with the --set-upstream option
+Already up to date.
+ok 13 - pull --set-upstream main:other2 does not set the branch other2
+
+expecting success of 5553.14 'pull --set-upstream upstream other sets branch main': 
+	clear_config main other &&
+	git pull --no-rebase --set-upstream upstream other &&
+	check_config main upstream refs/heads/other &&
+	check_config_missing other
+
+From parent
+ * branch            other      -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ two.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+ok 14 - pull --set-upstream upstream other sets branch main
+
+expecting success of 5553.15 'pull --set-upstream upstream tag does not set the tag': 
+	clear_config three &&
+	git pull --no-rebase --tags --set-upstream upstream three &&
+	check_config_missing three
+
+From parent
+ * tag               three      -> FETCH_HEAD
+warning: not setting upstream for a remote tag
+Already up to date.
+ok 15 - pull --set-upstream upstream tag does not set the tag
+
+expecting success of 5553.16 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url': 
+	# main explicitly not cleared, we check that it is not touched from previous value
+	clear_config other other2 three &&
+	test_must_fail git pull --set-upstream http://nosuchdomain.example.com &&
+	check_config main upstream refs/heads/other &&
+	check_config_missing other &&
+	check_config_missing other2 &&
+	check_config_missing three
+
+fatal: unable to access 'http://nosuchdomain.example.com/': Could not resolve host: nosuchdomain.example.com
+ok 16 - pull --set-upstream http://nosuchdomain.example.com fails with invalid url
+
+expecting success of 5553.17 'pull --set-upstream upstream HEAD sets branch HEAD': 
+	clear_config main other &&
+	git pull --no-rebase --set-upstream upstream HEAD &&
+	check_config main upstream HEAD &&
+	git checkout other &&
+	git pull --no-rebase --set-upstream upstream HEAD &&
+	check_config other upstream HEAD
+
+From parent
+ * branch            HEAD       -> FETCH_HEAD
+Already up to date.
+Switched to branch 'other'
+From parent
+ * branch            HEAD       -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ three.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 17 - pull --set-upstream upstream HEAD sets branch HEAD
+
+expecting success of 5553.18 'pull --set-upstream upstream with more than one branch does nothing': 
+	clear_config main three &&
+	git pull --no-rebase --set-upstream upstream main three &&
+	check_config_missing main &&
+	check_config_missing three
+
+From parent
+ * branch            main       -> FETCH_HEAD
+ * tag               three      -> FETCH_HEAD
+warning: multiple branches detected, incompatible with --set-upstream
+Already up to date.
+ok 18 - pull --set-upstream upstream with more than one branch does nothing
+
+expecting success of 5553.19 'pull --set-upstream with valid URL sets upstream to URL': 
+	clear_config main other other2 &&
+	git checkout main &&
+	url="file://$PWD" &&
+	git pull --set-upstream "$url" &&
+	check_config main "$url" HEAD &&
+	check_config_missing other &&
+	check_config_missing other2
+
+Switched to branch 'main'
+From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream
+ * branch            HEAD       -> FETCH_HEAD
+Already up to date.
+ok 19 - pull --set-upstream with valid URL sets upstream to URL
+
+expecting success of 5553.20 'pull --set-upstream with valid URL and branch sets branch': 
+	clear_config main other other2 &&
+	git checkout main &&
+	url="file://$PWD" &&
+	git pull --set-upstream "$url" main &&
+	check_config main "$url" refs/heads/main &&
+	check_config_missing other &&
+	check_config_missing other2
+
+Already on 'main'
+From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5553-set-upstream
+ * branch            main       -> FETCH_HEAD
+Already up to date.
+ok 20 - pull --set-upstream with valid URL and branch sets branch
+
+expecting success of 5553.21 'pull --set-upstream with a detached HEAD': 
+	git checkout HEAD^0 &&
+	test_when_finished "git checkout -" &&
+	cat >expect <<-\EOF &&
+	warning: could not set upstream of HEAD to 'main' from 'upstream' when it does not point to any branch.
+	EOF
+	git pull --no-rebase --set-upstream upstream main 2>actual.raw &&
+	grep ^warning: actual.raw >actual &&
+	test_cmp expect actual
+
+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 066b1d4 Merge branch 'other' of parent
+Already up to date.
+Switched to branch 'main'
+ok 21 - pull --set-upstream with a detached HEAD
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5561-http-backend.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5561-http-backend/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5526-fetch-submodules.sh ***
@@ -361804,12 +360462,12 @@
 Fetching submodule submodule/subdir/deepsubmodule
 From /build/reproducible-path/git-2.45.2/t/trash directory.t5526-fetch-submodules/deepsubmodule
    0db4bc6..557536f  deep       -> origin/deep
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5526-fetch-submodules/./sub1
- * branch            92073dd6b2360add6ef20b512341f098186afc68 -> FETCH_HEAD
-Fetching submodule sub1/subdir/deepsubmodule
 From /build/reproducible-path/git-2.45.2/t/trash directory.t5526-fetch-submodules/submodule
  * branch            eca88a5bf34657042ae27a00f1a10a87abb0d58f -> FETCH_HEAD
 Fetching submodule submodule/subdir/deepsubmodule
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5526-fetch-submodules/./sub1
+ * branch            92073dd6b2360add6ef20b512341f098186afc68 -> FETCH_HEAD
+Fetching submodule sub1/subdir/deepsubmodule
 commit
 commit
 Note: switching to 'FETCH_HEAD'.
@@ -362494,99 +361152,560 @@
 1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5573-pull-verify-signatures.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5573-pull-verify-signatures/.git/
-checking prerequisite: GPG
+*** t5563-simple-http-auth.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5563-simple-http-auth/.git/
+checking prerequisite: NOT_ROOT
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
 (
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
-	# 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 NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5564-http-proxy.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5564-http-proxy/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
 
 )
-prerequisite GPG not satisfied
-ok 1 # skip create repositories with signed commits (missing GPG)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5562-http-backend-content-length.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5562-http-backend-content-length/.git/
+expecting success of 5562.1 'setup': 
+	HTTP_CONTENT_ENCODING="identity" &&
+	export HTTP_CONTENT_ENCODING &&
+	git config http.receivepack true &&
+	test_commit c0 &&
+	test_commit c1 &&
+	hash_head=$(git rev-parse HEAD) &&
+	hash_prev=$(git rev-parse HEAD~1) &&
+	{
+		packetize "want $hash_head" &&
+		printf 0000 &&
+		packetize "have $hash_prev" &&
+		packetize "done"
+	} >fetch_body &&
+	test_copy_bytes 10 <fetch_body >fetch_body.trunc &&
+	hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) &&
+	{
+		printf "%s %s refs/heads/newbranch\\0report-status object-format=%s\\n" \
+			"$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw &&
+		printf 0000 &&
+		echo "$hash_next" | git pack-objects --stdout
+	} >push_body &&
+	test_copy_bytes 10 <push_body >push_body.trunc &&
+	: >empty_body
 
-ok 2 # skip pull unsigned commit with --verify-signatures (missing GPG)
+[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
 
-ok 3 # skip pull commit with bad signature with --verify-signatures (missing GPG)
+checking prerequisite: GZIP
 
-ok 4 # skip pull commit with untrusted signature with --verify-signatures (missing GPG)
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GZIP" &&gzip --version
+)
+gzip 1.12
+Copyright (C) 2018 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.
 
-ok 5 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate (missing GPG)
+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 6 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal (missing GPG)
+ok 2 - setup, compression related
 
-ok 7 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined (missing GPG)
+expecting success of 5562.3 'fetch plain': 
+	test_http_env upload fetch_body &&
+	verify_http_result "200 OK"
 
-ok 8 # skip pull signed commit with --verify-signatures (missing GPG)
+ok 3 - fetch plain
 
-ok 9 # skip pull commit with bad signature without verification (missing GPG)
+expecting success of 5562.4 'fetch plain truncated': 
+	test_http_env upload fetch_body.trunc &&
+	! verify_http_result "200 OK"
 
-ok 10 # skip pull commit with bad signature with --no-verify-signatures (missing GPG)
+fatal: the remote end hung up unexpectedly
+ok 4 - fetch plain truncated
 
-ok 11 # skip pull unsigned commit into unborn branch (missing GPG)
+expecting success of 5562.5 'fetch plain empty': 
+	test_http_env upload empty_body &&
+	! verify_http_result "200 OK"
 
-ok 12 # skip pull commit into unborn branch with bad signature and --verify-signatures (missing GPG)
+fatal: the remote end hung up unexpectedly
+ok 5 - fetch plain empty
 
-ok 13 # skip pull commit into unborn branch with untrusted signature and --verify-signatures (missing GPG)
+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 14 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate (missing GPG)
+ok 6 - fetch gzipped
 
-ok 15 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal (missing GPG)
+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"
 
-ok 16 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined (missing GPG)
+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: 2147483648
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5580-unc-paths.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5580-unc-paths/.git/
-1..0 # SKIP skipping Windows-only path tests
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5581-http-curl-verbose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5581-http-curl-verbose/.git/
+*** t5558-clone-bundle-uri.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/.git/
+expecting success of 5558.1 'fail to clone from non-existent file': 
+	test_when_finished rm -rf test &&
+	git clone --bundle-uri="$(pwd)/does-not-exist" . test 2>err &&
+	grep "failed to download bundle from URI" err
+
+warning: failed to download bundle from URI '/build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/does-not-exist'
+ok 1 - fail to clone from non-existent file
+
+expecting success of 5558.2 'fail to clone from non-bundle file': 
+	test_when_finished rm -rf test &&
+	echo bogus >bogus &&
+	git clone --bundle-uri="$(pwd)/bogus" . test 2>err &&
+	grep "is not a bundle" err
+
+warning: file at URI '/build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/bogus' is not a bundle or bundle list
+ok 2 - fail to clone from non-bundle file
+
+expecting success of 5558.3 'create bundle': 
+	git init clone-from &&
+	git -C clone-from checkout -b topic &&
+	test_commit -C clone-from A &&
+	test_commit -C clone-from B &&
+	git -C clone-from bundle create B.bundle topic
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/.git/
+Switched to a new branch 'topic'
+[topic (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[topic d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ok 3 - create bundle
+
+expecting success of 5558.4 'clone with path bundle': 
+	git clone --bundle-uri="clone-from/B.bundle" \
+		clone-from clone-path &&
+	git -C clone-path rev-parse refs/bundles/topic >actual &&
+	git -C clone-from rev-parse topic >expect &&
+	test_cmp expect actual
+
+Cloning into 'clone-path'...
+done.
+ok 4 - clone with path bundle
+
+expecting success of 5558.5 'clone with path bundle and non-default hash': 
+	test_when_finished "rm -rf clone-path-non-default-hash" &&
+	GIT_DEFAULT_HASH=sha256 git clone --bundle-uri="clone-from/B.bundle" \
+		clone-from clone-path-non-default-hash &&
+	git -C clone-path-non-default-hash rev-parse refs/bundles/topic >actual &&
+	git -C clone-from rev-parse topic >expect &&
+	test_cmp expect actual
+
+Cloning into 'clone-path-non-default-hash'...
+done.
+ok 5 - clone with path bundle and non-default hash
+
+expecting success of 5558.6 'clone with file:// bundle': 
+	git clone --bundle-uri="file://$(pwd)/clone-from/B.bundle" \
+		clone-from clone-file &&
+	git -C clone-file rev-parse refs/bundles/topic >actual &&
+	git -C clone-from rev-parse topic >expect &&
+	test_cmp expect actual
+
+Cloning into 'clone-file'...
+done.
+ok 6 - clone with file:// bundle
+
+expecting success of 5558.7 'construct incremental bundle list': 
+	(
+		cd clone-from &&
+		git checkout -b base &&
+		test_commit 1 &&
+		git checkout -b left &&
+		test_commit 2 &&
+		git checkout -b right base &&
+		test_commit 3 &&
+		git checkout -b merge left &&
+		git merge right -m "4" &&
+
+		git bundle create bundle-1.bundle base &&
+		git bundle create bundle-2.bundle base..left &&
+		git bundle create bundle-3.bundle base..right &&
+		git bundle create bundle-4.bundle merge --not left right
+	)
+
+Switched to a new branch 'base'
+[base 65d47d5] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+Switched to a new branch 'left'
+[left 918de9f] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+Switched to a new branch 'right'
+[right d1bc9f9] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+Switched to a new branch 'merge'
+Merge made by the 'ort' strategy.
+ 3.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+ok 7 - construct incremental bundle list
+
+expecting success of 5558.8 'clone bundle list (file, no heuristic)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+
+	[bundle "bundle-1"]
+		uri = file://$(pwd)/clone-from/bundle-1.bundle
+
+	[bundle "bundle-2"]
+		uri = file://$(pwd)/clone-from/bundle-2.bundle
+
+	[bundle "bundle-3"]
+		uri = file://$(pwd)/clone-from/bundle-3.bundle
+
+	[bundle "bundle-4"]
+		uri = file://$(pwd)/clone-from/bundle-4.bundle
+	EOF
+
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-list-file 2>err &&
+	! grep "Repository lacks these prerequisite commits" err &&
+
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-list-file cat-file --batch-check <oids &&
+
+	git -C clone-list-file for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/" refs >actual &&
+	cat >expect <<-\EOF &&
+	refs/bundles/base
+	refs/bundles/left
+	refs/bundles/merge
+	refs/bundles/right
+	EOF
+	test_cmp expect actual
+
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+475812ed564e3085586d0b0acc392cec0a90c18e commit 261
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 8 - clone bundle list (file, no heuristic)
+
+expecting success of 5558.9 'clone bundle list (file, all mode, some failures)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+
+	# Does not exist. Should be skipped.
+	[bundle "bundle-0"]
+		uri = file://$(pwd)/clone-from/bundle-0.bundle
+
+	[bundle "bundle-1"]
+		uri = file://$(pwd)/clone-from/bundle-1.bundle
+
+	[bundle "bundle-2"]
+		uri = file://$(pwd)/clone-from/bundle-2.bundle
+
+	# No bundle-3 means bundle-4 will not apply.
+
+	[bundle "bundle-4"]
+		uri = file://$(pwd)/clone-from/bundle-4.bundle
+
+	# Does not exist. Should be skipped.
+	[bundle "bundle-5"]
+		uri = file://$(pwd)/clone-from/bundle-5.bundle
+	EOF
+
+	GIT_TRACE2_PERF=1 \
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-all-some 2>err &&
+	! grep "Repository lacks these prerequisite commits" err &&
+	! grep "fatal" err &&
+	grep "warning: failed to download bundle from URI" err &&
+
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-all-some cat-file --batch-check <oids &&
+
+	git -C clone-all-some for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/" refs >actual &&
+	cat >expect <<-\EOF &&
+	refs/bundles/base
+	refs/bundles/left
+	EOF
+	test_cmp expect actual
+
+warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-5.bundle'
+warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-0.bundle'
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+475812ed564e3085586d0b0acc392cec0a90c18e commit 261
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 9 - clone bundle list (file, all mode, some failures)
+
+expecting success of 5558.10 'clone bundle list (file, all mode, all failures)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = all
+
+	# Does not exist. Should be skipped.
+	[bundle "bundle-0"]
+		uri = file://$(pwd)/clone-from/bundle-0.bundle
+
+	# Does not exist. Should be skipped.
+	[bundle "bundle-5"]
+		uri = file://$(pwd)/clone-from/bundle-5.bundle
+	EOF
+
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-all-fail 2>err &&
+	! grep "Repository lacks these prerequisite commits" err &&
+	! grep "fatal" err &&
+	grep "warning: failed to download bundle from URI" err &&
+
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-all-fail cat-file --batch-check <oids &&
+
+	git -C clone-all-fail for-each-ref --format="%(refname)" >refs &&
+	! grep "refs/bundles/" refs
+
+warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-5.bundle'
+warning: failed to download bundle from URI 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t5558-clone-bundle-uri/clone-from/bundle-0.bundle'
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+475812ed564e3085586d0b0acc392cec0a90c18e commit 261
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 10 - clone bundle list (file, all mode, all failures)
+
+expecting success of 5558.11 'clone bundle list (file, any mode)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = any
+
+	# Does not exist. Should be skipped.
+	[bundle "bundle-0"]
+		uri = file://$(pwd)/clone-from/bundle-0.bundle
+
+	[bundle "bundle-1"]
+		uri = file://$(pwd)/clone-from/bundle-1.bundle
+
+	# Does not exist. Should be skipped.
+	[bundle "bundle-5"]
+		uri = file://$(pwd)/clone-from/bundle-5.bundle
+	EOF
+
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-any-file 2>err &&
+	! grep "Repository lacks these prerequisite commits" err &&
+
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-any-file cat-file --batch-check <oids &&
+
+	git -C clone-any-file for-each-ref --format="%(refname)" >refs &&
+	grep "refs/bundles/" refs >actual &&
+	cat >expect <<-\EOF &&
+	refs/bundles/base
+	EOF
+	test_cmp expect actual
+
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+475812ed564e3085586d0b0acc392cec0a90c18e commit 261
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 11 - clone bundle list (file, any mode)
+
+expecting success of 5558.12 'clone bundle list (file, any mode, all failures)': 
+	cat >bundle-list <<-EOF &&
+	[bundle]
+		version = 1
+		mode = any
+
+	# Does not exist. Should be skipped.
+	[bundle "bundle-0"]
+		uri = $HTTPD_URL/bundle-0.bundle
+
+	# Does not exist. Should be skipped.
+	[bundle "bundle-5"]
+		uri = $HTTPD_URL/bundle-5.bundle
+	EOF
+
+	git clone --bundle-uri="file://$(pwd)/bundle-list" \
+		clone-from clone-any-fail 2>err &&
+	! grep "fatal" err &&
+	grep "warning: failed to download bundle from URI" err &&
+
+	git -C clone-from for-each-ref --format="%(objectname)" >oids &&
+	git -C clone-any-fail cat-file --batch-check <oids &&
+
+	git -C clone-any-fail for-each-ref --format="%(refname)" >refs &&
+	! grep "refs/bundles/" refs
+
+warning: failed to download bundle from URI '/bundle-5.bundle'
+warning: failed to download bundle from URI '/bundle-0.bundle'
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+475812ed564e3085586d0b0acc392cec0a90c18e commit 261
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+65d47d507bde981075d2f2532bb104e4b58b9170 commit 213
+918de9f3988f29866b94f657626edb7247c7ddbd commit 213
+d1bc9f9c222df7b7de791db57cdf7e8ba0627c3e commit 213
+0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 commit 165
+d9df4505cb3522088b9e29d6051ac16f1564154a commit 213
+ok 12 - clone bundle list (file, any mode, all failures)
+
 checking prerequisite: NOT_ROOT
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
@@ -362597,7 +361716,179 @@
 
 )
 prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
+# passed all 12 test(s)
+# SKIP no web server found at ''
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5560-http-backend-noserver.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/.git/
+expecting success of 5560.1 'setup repository': 
+	echo content >file &&
+	git add file &&
+	git commit -m one &&
+
+	mkdir "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	 git --bare init &&
+	 : >objects/info/alternates &&
+	 : >objects/info/http-alternates
+	) &&
+	git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	git push public main:main &&
+
+	(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	 git repack -a -d
+	) &&
+
+	echo other >file &&
+	git add file &&
+	git commit -m two &&
+	git push public main:main &&
+
+	LOOSE_URL=$(find_file objects/??) &&
+	PACK_URL=$(find_file objects/pack/*.pack) &&
+	IDX_URL=$(find_file objects/pack/*.idx)
+
+[main (root-commit) f39a923] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/repo.git/
+To /build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/repo.git
+ * [new branch]      main -> main
+[main 0149442] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To /build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/repo.git
+   f39a923..0149442  main -> main
+ok 1 - setup repository
+
+expecting success of 5560.2 'direct refs/heads/main not found': 
+	GET refs/heads/main "404 Not Found"
+
+ok 2 - direct refs/heads/main not found
+
+expecting success of 5560.3 'static file is ok': 
+	get_static_files "200 OK"
+
+ok 3 - static file is ok
+
+expecting success of 5560.4 'no export by default': 
+	get_static_files "404 Not Found"
+
+ok 4 - no export by default
+
+expecting success of 5560.5 'export if git-daemon-export-ok': 
+        (cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	 touch git-daemon-export-ok
+	) &&
+        get_static_files "200 OK"
+
+ok 5 - export if git-daemon-export-ok
+
+expecting success of 5560.6 'static file if http.getanyfile true is ok': 
+	config http.getanyfile true &&
+	get_static_files "200 OK"
+
+ok 6 - static file if http.getanyfile true is ok
+
+expecting success of 5560.7 'static file if http.getanyfile false fails': 
+	config http.getanyfile false &&
+	get_static_files "403 Forbidden"
+
+ok 7 - static file if http.getanyfile false fails
+
+expecting success of 5560.8 'http.uploadpack default enabled': 
+	GET info/refs?service=git-upload-pack "200 OK"  &&
+	POST git-upload-pack 0000 "200 OK"
+
+ok 8 - http.uploadpack default enabled
+
+expecting success of 5560.9 'http.uploadpack true': 
+	config http.uploadpack true &&
+	GET info/refs?service=git-upload-pack "200 OK" &&
+	POST git-upload-pack 0000 "200 OK"
+
+ok 9 - http.uploadpack true
+
+expecting success of 5560.10 'http.uploadpack false': 
+	config http.uploadpack false &&
+	GET info/refs?service=git-upload-pack "403 Forbidden" &&
+	POST git-upload-pack 0000 "403 Forbidden"
+
+ok 10 - http.uploadpack false
+
+expecting success of 5560.11 'http.receivepack default disabled': 
+	GET info/refs?service=git-receive-pack "403 Forbidden"  &&
+	POST git-receive-pack 0000 "403 Forbidden"
+
+ok 11 - http.receivepack default disabled
+
+expecting success of 5560.12 'http.receivepack true': 
+	config http.receivepack true &&
+	GET info/refs?service=git-receive-pack "200 OK" &&
+	POST git-receive-pack 0000 "200 OK"
+
+ok 12 - http.receivepack true
+
+expecting success of 5560.13 'http.receivepack false': 
+	config http.receivepack false &&
+	GET info/refs?service=git-receive-pack "403 Forbidden" &&
+	POST git-receive-pack 0000 "403 Forbidden"
+
+ok 13 - http.receivepack false
+
+expecting success of 5560.14 'http-backend blocks bad PATH_INFO': 
+	config http.getanyfile true &&
+
+	expect_aliased 0 /repo.git/HEAD &&
+
+	expect_aliased 1 /repo.git/../HEAD &&
+	expect_aliased 1 /../etc/passwd &&
+	expect_aliased 1 ../etc/passwd &&
+	expect_aliased 1 /etc//passwd &&
+	expect_aliased 1 /etc/./passwd &&
+	expect_aliased 1 //domain/data.txt
+
+--- exp.err	2024-11-14 19:38:42.139301410 +0000
++++ act.err	2024-11-14 19:38:42.135301369 +0000
+@@ -1 +0,0 @@
+-fatal: '/repo.git/../HEAD': aliased
+--- exp.err	2024-11-14 19:38:42.155301575 +0000
++++ act.err	2024-11-14 19:38:42.151301534 +0000
+@@ -1 +1 @@
+-fatal: '/../etc/passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver//../etc/passwd'
+\ No newline at end of file
+--- exp.err	2024-11-14 19:38:42.187301904 +0000
++++ act.err	2024-11-14 19:38:42.187301904 +0000
+@@ -1 +1 @@
+-fatal: '../etc/passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver/../etc/passwd'
+\ No newline at end of file
+--- exp.err	2024-11-14 19:38:42.235302399 +0000
++++ act.err	2024-11-14 19:38:42.231302357 +0000
+@@ -1 +1 @@
+-fatal: '/etc//passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver//etc//passwd'
+\ No newline at end of file
+--- exp.err	2024-11-14 19:38:42.267302728 +0000
++++ act.err	2024-11-14 19:38:42.263302687 +0000
+@@ -1 +1 @@
+-fatal: '/etc/./passwd': aliased
++Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver//etc/./passwd'
+\ No newline at end of file
+--- exp.err	2024-11-14 19:38:42.315303222 +0000
++++ act.err	2024-11-14 19:38:42.307303140 +0000
+@@ -1 +1 @@
+-fatal: '//domain/data.txt': aliased
++Request not supported: '/build/reproducible-path/git-2.45.2/t/trash directory.t5560-http-backend-noserver///domain/data.txt'
+\ No newline at end of file
+ok 14 - http-backend blocks bad PATH_INFO
+
+# passed all 14 test(s)
+1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5571-pre-push-hook.sh ***
@@ -363772,6 +363063,97 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5573-pull-verify-signatures.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5573-pull-verify-signatures/.git/
+checking prerequisite: GPG
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
+
+	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
+	# that version, creation of signed tags using the generated key fails.
+	case "$gpg_version" in
+	"gpg (GnuPG) 1.0.6"*)
+		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
+		;;
+	*)
+		# Available key info:
+		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
+		#   name and email: C O Mitter <committer@example.com>
+		# * Type RSA, size 2048 bits, no expiration date,
+		#   name and email: Eris Discordia <discord@example.net>
+		# No password given, to enable non-interactive operation.
+		# To generate new key:
+		#	gpg --homedir /tmp/gpghome --gen-key
+		# To write armored exported key to keyring:
+		#	gpg --homedir /tmp/gpghome --export-secret-keys \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		#	gpg --homedir /tmp/gpghome --export \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		# To export ownertrust:
+		#	gpg --homedir /tmp/gpghome --export-ownertrust \
+		#		> lib-gpg/ownertrust
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
+
+)
+prerequisite GPG not satisfied
+ok 1 # skip create repositories with signed commits (missing GPG)
+
+ok 2 # skip pull unsigned commit with --verify-signatures (missing GPG)
+
+ok 3 # skip pull commit with bad signature with --verify-signatures (missing GPG)
+
+ok 4 # skip pull commit with untrusted signature with --verify-signatures (missing GPG)
+
+ok 5 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate (missing GPG)
+
+ok 6 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal (missing GPG)
+
+ok 7 # skip pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined (missing GPG)
+
+ok 8 # skip pull signed commit with --verify-signatures (missing GPG)
+
+ok 9 # skip pull commit with bad signature without verification (missing GPG)
+
+ok 10 # skip pull commit with bad signature with --no-verify-signatures (missing GPG)
+
+ok 11 # skip pull unsigned commit into unborn branch (missing GPG)
+
+ok 12 # skip pull commit into unborn branch with bad signature and --verify-signatures (missing GPG)
+
+ok 13 # skip pull commit into unborn branch with untrusted signature and --verify-signatures (missing GPG)
+
+ok 14 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate (missing GPG)
+
+ok 15 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal (missing GPG)
+
+ok 16 # skip pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined (missing GPG)
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5580-unc-paths.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5580-unc-paths/.git/
+1..0 # SKIP skipping Windows-only path tests
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5570-git-daemon.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/.git/
 checking prerequisite: PIPE
@@ -363786,7 +363168,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[15536] Ready to rumble
+[3686] Ready to rumble
 expecting success of 5570.1 'setup repository': 
 	git config push.default matching &&
 	echo content >file &&
@@ -363818,11 +363200,11 @@
 	check_verbose_connect &&
 	test_cmp file clone/file
 
-[15835] Connection from 127.0.0.1:43248
-[15835] Extended attribute "host": 127.0.0.1:5570
-[15835] Extended attribute "protocol": version=2
-[15835] Request upload-pack for '/repo.git'
-[15536] [15835] Disconnected
+[4016] Connection from 127.0.0.1:53876
+[4016] Extended attribute "host": 127.0.0.1:5570
+[4016] Extended attribute "protocol": version=2
+[4016] Request upload-pack for '/repo.git'
+[3686] [4016] 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.
@@ -363842,11 +363224,11 @@
  1 file changed, 1 insertion(+)
 To /build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git
    f39a923..5647d5f  main -> main
-[16139] Connection from 127.0.0.1:43258
-[16139] Extended attribute "host": 127.0.0.1:5570
-[16139] Extended attribute "protocol": version=2
-[16139] Request upload-pack for '/repo.git'
-[15536] [16139] Disconnected
+[4345] Connection from 127.0.0.1:53878
+[4345] Extended attribute "host": 127.0.0.1:5570
+[4345] Extended attribute "protocol": version=2
+[4345] Request upload-pack for '/repo.git'
+[3686] [4345] Disconnected
 Updating f39a923..5647d5f
 Fast-forward
  file | 1 +
@@ -363861,12 +363243,12 @@
 	(cd clone && git fetch -v) 2>stderr &&
 	check_verbose_connect
 
-[16305] Connection from 127.0.0.1:43264
-[16305] Extended attribute "host": 127.0.0.1:5570
-[16305] Extended attribute "protocol": version=2
-[16305] Request upload-pack for '/repo.git'
-[15536] [16305] Disconnected
+[4463] Connection from 127.0.0.1:53888
+[4463] Extended attribute "host": 127.0.0.1:5570
+[4463] Extended attribute "protocol": version=2
+[4463] Request upload-pack for '/repo.git'
 Looking up 127.0.0.1 ... done.
+[3686] [4463] Disconnected
 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.
@@ -363876,11 +363258,11 @@
 	(cd clone && git fetch 2>../stderr) &&
 	test_must_be_empty stderr
 
-[16431] Connection from 127.0.0.1:43280
-[16431] Extended attribute "host": 127.0.0.1:5570
-[16431] Extended attribute "protocol": version=2
-[16431] Request upload-pack for '/repo.git'
-[15536] [16431] Disconnected
+[4540] Connection from 127.0.0.1:53890
+[4540] Extended attribute "host": 127.0.0.1:5570
+[4540] Extended attribute "protocol": version=2
+[4540] Request upload-pack for '/repo.git'
+[3686] [4540] Disconnected
 ok 6 - no-op fetch without "-v" is quiet
 
 expecting success of 5570.7 'remote detects correct HEAD': 
@@ -363895,14 +363277,14 @@
 
 To /build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git
  * [new branch]      main -> other
-[16598] Connection from 127.0.0.1:43294
-[16598] Extended attribute "host": 127.0.0.1:5570
-[16598] Extended attribute "protocol": version=2
-[16598] Request upload-pack for '/repo.git'
+[4692] Connection from 127.0.0.1:53900
+[4692] Extended attribute "host": 127.0.0.1:5570
+[4692] Extended attribute "protocol": version=2
+[4692] Request upload-pack for '/repo.git'
 origin/HEAD set to main
+[3686] [4692] Disconnected
 ok 7 - remote detects correct HEAD
 
-[15536] [16598] Disconnected
 expecting success of 5570.8 '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 &&
@@ -363927,23 +363309,23 @@
 
 1+0 records in
 1+0 records out
-256 bytes copied, 3.8638e-05 s, 6.6 MB/s
+256 bytes copied, 0.000285949 s, 895 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo_bad1.git/
-[16829] Connection from 127.0.0.1:43304
-[16829] Extended attribute "host": 127.0.0.1:5570
-[16829] Extended attribute "protocol": version=2
-[16829] Request upload-pack for '/repo_bad1.git'
+[4819] Connection from 127.0.0.1:53912
+[4819] Extended attribute "host": 127.0.0.1:5570
+[4819] Extended attribute "protocol": version=2
+[4819] Request upload-pack for '/repo_bad1.git'
+[4819] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[4819] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[4819] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[4819] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[4819] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[4819] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[4819] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[4819] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
+[4819] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[3686] [4819] Disconnected (with error)
 fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[16829] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[16829] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[16829] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[16829] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[16829] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[16829] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[16829] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[16829] error: packfile ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.pack does not match index
-[16829] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[15536] [16829] Disconnected (with error)
 ls: cannot access 'objects/pack/pack-*.pack': No such file or directory
 ok 9 - fetch notices corrupt pack
 
@@ -363964,23 +363346,23 @@
 
 1+0 records in
 1+0 records out
-256 bytes copied, 3.1226e-05 s, 8.2 MB/s
+256 bytes copied, 0.000352915 s, 725 kB/s
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo_bad2.git/
-[16995] Connection from 127.0.0.1:43310
-[16995] Extended attribute "host": 127.0.0.1:5570
-[16995] Extended attribute "protocol": version=2
-[16995] Request upload-pack for '/repo_bad2.git'
-[16995] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[16995] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[16995] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[16995] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[16995] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[16995] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[16995] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
-[16995] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[4917] Connection from 127.0.0.1:53918
+[4917] Extended attribute "host": 127.0.0.1:5570
+[4917] Extended attribute "protocol": version=2
+[4917] Request upload-pack for '/repo_bad2.git'
+[4917] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[4917] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[4917] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[4917] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[4917] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[4917] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[4917] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[4917] error: non-monotonic index ./objects/pack/pack-fab4bc85cf5cdc274f77111178e0d6d25aa0c504.idx
+[4917] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
+[3686] [4917] Disconnected (with error)
 fatal: remote error: upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[16995] fatal: git upload-pack: not our ref 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d
-[15536] [16995] Disconnected (with error)
 ok 10 - fetch notices corrupt idx
 
 expecting success of 5570.11 'client refuses to ask for repo with newline': 
@@ -363991,90 +363373,89 @@
 ok 11 - client refuses to ask for repo with newline
 
 expecting success of 5570.12 'clone non-existent': test_remote_error    'access denied or repository not exported' clone nowhere.git
-[17188] Connection from 127.0.0.1:43324
-[17188] Extended attribute "host": 127.0.0.1:5570
-[17188] Extended attribute "protocol": version=2
-[17188] Request upload-pack for '/nowhere.git'
-[17188] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[15536] [17188] Disconnected (with error)
+[5008] Connection from 127.0.0.1:53934
+[5008] Extended attribute "host": 127.0.0.1:5570
+[5008] Extended attribute "protocol": version=2
+[5008] Request upload-pack for '/nowhere.git'
+[5008] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[3686] [5008] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /nowhere.git
 ok 12 - clone non-existent
 
 expecting success of 5570.13 'push disabled': test_remote_error    'access denied or repository not exported' push  repo.git main
+[5033] Connection from 127.0.0.1:53936
+[5033] Extended attribute "host": 127.0.0.1:5570
+[5033] Request receive-pack for '/repo.git'
+[5033] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git'
+[3686] [5033] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
-[17227] Connection from 127.0.0.1:43332
-[17227] Extended attribute "host": 127.0.0.1:5570
-[17227] Request receive-pack for '/repo.git'
-[17227] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git'
-[15536] [17227] Disconnected (with error)
 ok 13 - push disabled
 
 expecting success of 5570.14 'read access denied': test_remote_error -x 'access denied or repository not exported' fetch repo.git
-[17281] Connection from 127.0.0.1:43342
-[17281] Extended attribute "host": 127.0.0.1:5570
-[17281] Extended attribute "protocol": version=2
-[17281] Request upload-pack for '/repo.git'
-[17281] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[15536] [17281] Disconnected (with error)
+[5106] Connection from 127.0.0.1:53944
+[5106] Extended attribute "host": 127.0.0.1:5570
+[5106] Extended attribute "protocol": version=2
+[5106] Request upload-pack for '/repo.git'
+[5106] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[3686] [5106] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 14 - read access denied
 
 expecting success of 5570.15 'not exported': test_remote_error -n 'access denied or repository not exported' fetch repo.git
-[17303] Connection from 127.0.0.1:43348
-[17303] Extended attribute "host": 127.0.0.1:5570
-[17303] Extended attribute "protocol": version=2
-[17303] Request upload-pack for '/repo.git'
-[17303] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[15536] [17303] Disconnected (with error)
+[5159] Connection from 127.0.0.1:53950
+[5159] Extended attribute "host": 127.0.0.1:5570
+[5159] Extended attribute "protocol": version=2
+[5159] Request upload-pack for '/repo.git'
+[5159] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[3686] [5159] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /repo.git
 ok 15 - not exported
 
 Stopping git daemon ...
 Starting git daemon ...
-[17325] Ready to rumble
+[5200] Ready to rumble
 expecting success of 5570.16 'clone non-existent': test_remote_error    'no such repository'      clone nowhere.git
-[17356] Connection from 127.0.0.1:43364
-[17356] Extended attribute "host": 127.0.0.1:5570
-[17356] Extended attribute "protocol": version=2
-[17356] Request upload-pack for '/nowhere.git'
-[17356] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
-[17325] [17356] Disconnected (with error)
+[5230] Connection from 127.0.0.1:53966
+[5230] Extended attribute "host": 127.0.0.1:5570
+[5230] Extended attribute "protocol": version=2
+[5230] Request upload-pack for '/nowhere.git'
+[5230] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/nowhere.git' does not appear to be a git repository
+[5200] [5230] Disconnected (with error)
 fatal: remote error: no such repository: /nowhere.git
 ok 16 - clone non-existent
 
 expecting success of 5570.17 'push disabled': test_remote_error    'service not enabled'     push  repo.git main
-[17414] Connection from 127.0.0.1:43380
-[17414] Extended attribute "host": 127.0.0.1:5570
-[17414] Request receive-pack for '/repo.git'
-[17414] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git'
-[17325] [17414] Disconnected (with error)
+[5268] Connection from 127.0.0.1:53970
+[5268] Extended attribute "host": 127.0.0.1:5570
+[5268] Request receive-pack for '/repo.git'
+[5268] 'receive-pack': service not enabled for '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git'
+[5200] [5268] Disconnected (with error)
 fatal: remote error: service not enabled: /repo.git
 ok 17 - push disabled
 
 expecting success of 5570.18 'read access denied': test_remote_error -x 'no such repository'      fetch repo.git
-[17460] Connection from 127.0.0.1:43388
-[17460] Extended attribute "host": 127.0.0.1:5570
-[17460] Extended attribute "protocol": version=2
-[17460] Request upload-pack for '/repo.git'
-[17460] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
-[17325] [17460] Disconnected (with error)
+[5333] Connection from 127.0.0.1:53980
+[5333] Extended attribute "host": 127.0.0.1:5570
+[5333] Extended attribute "protocol": version=2
+[5333] Request upload-pack for '/repo.git'
+[5333] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git' does not appear to be a git repository
+[5200] [5333] Disconnected (with error)
 fatal: remote error: no such repository: /repo.git
 ok 18 - read access denied
 
 expecting success of 5570.19 'not exported': test_remote_error -n 'repository not exported' fetch repo.git
-[17493] Connection from 127.0.0.1:43390
-[17493] Extended attribute "host": 127.0.0.1:5570
-[17493] Extended attribute "protocol": version=2
-[17493] Request upload-pack for '/repo.git'
-[17493] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
-[17325] [17493] Disconnected (with error)
+[5375] Connection from 127.0.0.1:53982
+[5375] Extended attribute "host": 127.0.0.1:5570
+[5375] Extended attribute "protocol": version=2
+[5375] Request upload-pack for '/repo.git'
+[5375] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/repo.git': repository not exported.
+[5200] [5375] Disconnected (with error)
 fatal: remote error: repository not exported: /repo.git
 ok 19 - not exported
 
 Stopping git daemon ...
-Terminated
 Starting git daemon ...
-[17526] Ready to rumble
+[5450] Ready to rumble
 expecting success of 5570.20 'access repo via interpolated hostname': 
 	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/localhost/interp.git" &&
 	git init --bare "$repo" &&
@@ -364088,23 +363469,24 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git/
 To /build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git
  * [new branch]      HEAD -> main
-[17638] Connection from 127.0.0.1:43398
-[17638] Extended attribute "host": localhost
-[17638] Extended attribute "protocol": version=2
-[17638] Request upload-pack for '/interp.git'
-[17638] Interpolated dir '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[5598] Connection from 127.0.0.1:53988
+[5598] Extended attribute "host": localhost
+[5598] Extended attribute "protocol": version=2
+[5598] Request upload-pack for '/interp.git'
+[5598] Interpolated dir '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
-[17526] [17638] Disconnected
-[17752] Connection from 127.0.0.1:43402
-[17752] Extended attribute "host": LOCALHOST
-[17752] Extended attribute "protocol": version=2
-[17752] Request upload-pack for '/interp.git'
-[17752] Interpolated dir '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[5450] [5598] Disconnected
+[5630] Connection from 127.0.0.1:54000
+[5630] Extended attribute "host": LOCALHOST
+[5630] Extended attribute "protocol": version=2
+[5630] Request upload-pack for '/interp.git'
+[5630] Interpolated dir '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	HEAD
 5647d5f1af3705f88c3fb89c9c7dd2cbbedd716d	refs/heads/main
 ok 20 - access repo via interpolated hostname
 
+[5450] [5630] Disconnected
 expecting success of 5570.21 'hostname cannot break out of directory': 
 	repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/../escape.git" &&
 	git init --bare "$repo" &&
@@ -364114,20 +363496,19 @@
 		env GIT_OVERRIDE_VIRTUAL_HOST=.. \
 		git ls-remote "$GIT_DAEMON_URL/escape.git"
 
-[17526] [17752] Disconnected
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/escape.git/
 To /build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/../escape.git
  * [new branch]      HEAD -> main
-[17949] Connection from 127.0.0.1:43404
-[17949] Extended attribute "host": ..
-[17949] Extended attribute "protocol": version=2
-[17949] Request upload-pack for '/escape.git'
-[17949] Interpolated dir '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo//escape.git'
-[17949] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
+[5750] Connection from 127.0.0.1:54010
+[5750] Extended attribute "host": ..
+[5750] Extended attribute "protocol": version=2
+[5750] Request upload-pack for '/escape.git'
+[5750] Interpolated dir '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo//escape.git'
+[5750] '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo//escape.git' does not appear to be a git repository
+[5450] [5750] Disconnected (with error)
 fatal: remote error: access denied or repository not exported: /escape.git
 ok 21 - hostname cannot break out of directory
 
-[17526] [17949] Disconnected (with error)
 checking prerequisite: FAKENC
 
 mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FAKENC" &&
@@ -364151,11 +363532,11 @@
 	git -C "$repo" rev-parse main >expect &&
 	test_cmp expect actual
 
-[18031] Connection from 127.0.0.1:43418
-[18031] Extended attribute "host": localhost
-[18031] Request upload-pack for '/interp.git'
-[18031] Interpolated dir '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
-[17526] [18031] Disconnected
+[5830] Connection from 127.0.0.1:54026
+[5830] Extended attribute "host": localhost
+[5830] Request upload-pack for '/interp.git'
+[5830] Interpolated dir '/build/reproducible-path/git-2.45.2/t/trash directory.t5570-git-daemon/repo/localhost/interp.git'
+[5450] [5830] Disconnected
 ok 22 - hostname interpolation works after LF-stripping
 
 Stopping git daemon ...
@@ -364163,6 +363544,21 @@
 1..22
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5581-http-curl-verbose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5581-http-curl-verbose/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5583-push-branches.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5583-push-branches/.git/
 expecting success of 5583.1 'setup bare remote': 
@@ -364297,196 +363693,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5600-clone-fail-cleanup.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5602-clone-remote-exec.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5582-fetch-negative-refspec.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5582-fetch-negative-refspec/.git/
 expecting success of 5582.1 'setup': 
@@ -364910,6 +364116,157 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5600-clone-fail-cleanup.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5574-fetch-output.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5574-fetch-output/.git/
 expecting success of 5574.1 'fetch with invalid output format configuration': 
@@ -365373,264 +364730,475 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5605-clone-local.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/.git/
-expecting success of 5605.1 'preparing origin repository': 
-	: >file && git add . && git commit -m1 &&
-	git clone --bare . a.git &&
-	git clone --bare . x &&
-	echo true >expect &&
-	git -C a.git config --bool core.bare >actual &&
-	test_cmp expect actual &&
-	echo true >expect &&
-	git -C x config --bool core.bare >actual &&
-	test_cmp expect actual &&
-	git bundle create b1.bundle --all &&
-	git bundle create b2.bundle main &&
-	mkdir dir &&
-	cp b1.bundle dir/b3 &&
-	cp b1.bundle b4 &&
-	git branch not-main main &&
-	git bundle create b5.bundle not-main
+*** t5602-clone-remote-exec.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-[main (root-commit) a4ae174] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-Cloning into bare repository 'a.git'...
-done.
-Cloning into bare repository 'x'...
-done.
-ok 1 - preparing origin repository
+ok 1 - setup
 
-expecting success of 5605.2 'local clone without .git suffix': 
-	git clone -l -s a b &&
-	(cd b &&
-	echo false >expect &&
-	git config --bool core.bare >actual &&
-	test_cmp expect actual &&
-	git fetch)
+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 'b'...
-done.
-ok 2 - local clone without .git suffix
+Cloning into 'junk'...
+fatal: Could not read from remote repository.
 
-expecting success of 5605.3 'local clone with .git suffix': 
-	git clone -l -s a.git c &&
-	(cd c && git fetch)
+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
 
-Cloning into 'c'...
-done.
-ok 3 - local clone with .git suffix
+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
 
-expecting success of 5605.4 'local clone from x': 
-	git clone -l -s x y &&
-	(cd y && git fetch)
+Cloning into 'junk'...
+fatal: Could not read from remote repository.
 
-Cloning into 'y'...
-done.
-ok 4 - local clone from x
+Please make sure you have the correct access rights
+and the repository exists.
+ok 3 - clone calls specified git upload-pack with -u option
 
-expecting success of 5605.5 'local clone from x.git that does not exist': 
-	test_must_fail git clone -l -s x.git z
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5603-clone-dirname.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-fatal: repository 'x.git' does not exist
-ok 5 - local clone from x.git that does not exist
+ok 1 - setup ssh wrapper
 
-expecting success of 5605.6 'With -no-hardlinks, local will make a copy': 
-	git clone --bare --no-hardlinks x w &&
-	! repo_is_hardlinked w
+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)
 
-Cloning into bare repository 'w'...
-done.
-test_line_count: line count for output != 0
-w/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
-w/objects/a4/ae174c9759876c669998f2c8e401fcb298b8d6
-w/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078
-ok 6 - With -no-hardlinks, local will make a copy
+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 5605.7 'Even without -l, local will make a hardlink': 
-	rm -fr w &&
-	git clone -l --bare x w &&
-	repo_is_hardlinked w
+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)
 
-Cloning into bare repository 'w'...
-done.
-ok 7 - Even without -l, local will make a hardlink
+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 5605.8 'local clone of repo with nonexistent ref in HEAD': 
-	git -C a.git symbolic-ref HEAD refs/heads/nonexistent &&
-	git clone a d &&
-	(cd d &&
-	git fetch &&
-	test_ref_missing refs/remotes/origin/HEAD)
+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)
 
-Cloning into 'd'...
-done.
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-error: reference does not exist
-ok 8 - local clone of repo with nonexistent ref in HEAD
+expecting success of 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 5605.9 'bundle clone without .bundle suffix': 
-	git clone dir/b3 &&
-	(cd b3 && git fetch)
+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)
 
-Cloning into 'b3'...
-ok 9 - bundle clone without .bundle suffix
+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 5605.10 'bundle clone with .bundle suffix': 
-	git clone b1.bundle &&
-	(cd b1 && git fetch)
+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)
 
-Cloning into 'b1'...
-ok 10 - bundle clone with .bundle suffix
+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 5605.11 'bundle clone from b4': 
-	git clone b4 bdl &&
-	(cd bdl && git fetch)
+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)
 
-Cloning into 'bdl'...
-ok 11 - bundle clone from b4
+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 5605.12 'bundle clone from b4.bundle that does not exist': 
-	test_must_fail git clone b4.bundle bb
+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)
 
-fatal: repository 'b4.bundle' does not exist
-ok 12 - bundle clone from b4.bundle that does not exist
+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 5605.13 'bundle clone with nonexistent HEAD (match default)': 
-	git clone b2.bundle b2 &&
-	(cd b2 &&
-	git fetch &&
-	git rev-parse --verify refs/heads/main)
+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)
 
-Cloning into 'b2'...
-a4ae174c9759876c669998f2c8e401fcb298b8d6
-ok 13 - bundle clone with nonexistent HEAD (match default)
+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 5605.14 'bundle clone with nonexistent HEAD (no match default)': 
-	git clone b5.bundle b5 &&
-	(cd b5 &&
-	git fetch &&
-	test_must_fail git rev-parse --verify refs/heads/main &&
-	test_must_fail git rev-parse --verify refs/heads/not-main)
+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)
 
-Cloning into 'b5'...
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-fatal: Needed a single revision
-fatal: Needed a single revision
-ok 14 - bundle clone with nonexistent HEAD (no match default)
+expecting success of 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 5605.15 'clone empty repository': 
-	mkdir empty &&
-	(cd empty &&
-	 git init &&
-	 git config receive.denyCurrentBranch warn) &&
-	git clone empty empty-clone &&
-	test_tick &&
-	(cd empty-clone &&
-	 echo "content" >> foo &&
-	 git add foo &&
-	 git commit -m "Initial commit" &&
-	 git push origin main &&
-	 expected=$(git rev-parse main) &&
-	 actual=$(git --git-dir=../empty/.git rev-parse main) &&
-	 test $actual = $expected)
+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)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/empty/.git/
-Cloning into 'empty-clone'...
+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.
-done.
-[main (root-commit) b8e7dd3] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-remote: warning: updating the current branch        
-To /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/empty
- * [new branch]      main -> main
-ok 15 - clone empty repository
+ok 21 - clone of host:foo/ goes to foo (non-bare)
 
-expecting success of 5605.16 'clone empty repository, and then push should not segfault.': 
-	rm -fr empty/ empty-clone/ &&
-	mkdir empty &&
-	(cd empty && git init) &&
-	git clone empty empty-clone &&
-	(cd empty-clone &&
-	test_must_fail git push)
+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)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/empty/.git/
-Cloning into 'empty-clone'...
+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.
-done.
-error: src refspec refs/heads/main does not match any
-error: failed to push some refs to '/build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/empty'
-ok 16 - clone empty repository, and then push should not segfault.
+ok 23 - clone of host:foo.git/ goes to foo (non-bare)
 
-expecting success of 5605.17 'cloning non-existent directory fails': 
-	rm -rf does-not-exist &&
-	test_must_fail git clone does-not-exist
+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)
 
-fatal: repository 'does-not-exist' does not exist
-ok 17 - cloning non-existent directory fails
+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 5605.18 'cloning non-git directory fails': 
-	rm -rf not-a-git-repo not-a-git-repo-clone &&
-	mkdir not-a-git-repo &&
-	test_must_fail git clone not-a-git-repo not-a-git-repo-clone
+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)
 
-fatal: repository 'not-a-git-repo' does not exist
-ok 18 - cloning non-git directory fails
+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 5605.19 'cloning file:// does not hardlink': 
-	git clone --bare file://"$(pwd)"/a non-local &&
-	! repo_is_hardlinked non-local
+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)
 
-Cloning into bare repository 'non-local'...
-test_line_count: line count for output != 0
-non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.rev
-non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.idx
-non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.pack
-ok 19 - cloning file:// does not hardlink
+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 5605.20 'cloning a local path with --no-local does not hardlink': 
-	git clone --bare --no-local a force-nonlocal &&
-	! repo_is_hardlinked force-nonlocal
+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)
 
-Cloning into bare repository 'force-nonlocal'...
-test_line_count: line count for output != 0
-force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.rev
-force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.idx
-force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.pack
-ok 20 - cloning a local path with --no-local does not hardlink
+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 5605.21 'cloning locally respects "-u" for fetching refs': 
-	test_must_fail git clone --bare -u false a should_not_work.git
+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)
 
-Cloning into bare repository 'should_not_work.git'...
-fatal: Could not read from remote repository.
+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)
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 21 - cloning locally respects "-u" for fetching refs
+expecting success of 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 5605.22 'local clone from repo with corrupt refs fails gracefully': 
-	git init corrupt &&
-	test_commit -C corrupt one &&
-	echo a >corrupt/.git/refs/heads/topic &&
+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)
 
-	test_must_fail git clone corrupt working 2>err &&
-	grep "has a null OID" err
+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)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/corrupt/.git/
-[main (root-commit) b838542] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-fatal: 'refs/remotes/origin/topic' has a null OID
-ok 22 - local clone from repo with corrupt refs fails gracefully
+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 22 test(s)
-1..22
+# passed all 47 test(s)
+1..47
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5552-skipping-fetch-negotiator.sh ***
@@ -367487,9 +367055,9 @@
 	test_cmp expected-files T--shared.objects-files.raw &&
 	test_must_be_empty T--shared.objects-symlinks.raw
 
-fatal: symlink 'pack' exists, refusing to clone with --local
-fatal: symlink 'pack' exists, refusing to clone with --local
-fatal: symlink 'pack' exists, refusing to clone with --local
+fatal: symlink 'd9' exists, refusing to clone with --local
+fatal: symlink 'd9' exists, refusing to clone with --local
+fatal: symlink 'd9' exists, refusing to clone with --local
 Cloning into 'T--shared'...
 done.
 ok 33 - clone repo with symlinked or unknown files at objects/
@@ -367517,11 +367085,559 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5605-clone-local.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/.git/
+expecting success of 5605.1 'preparing origin repository': 
+	: >file && git add . && git commit -m1 &&
+	git clone --bare . a.git &&
+	git clone --bare . x &&
+	echo true >expect &&
+	git -C a.git config --bool core.bare >actual &&
+	test_cmp expect actual &&
+	echo true >expect &&
+	git -C x config --bool core.bare >actual &&
+	test_cmp expect actual &&
+	git bundle create b1.bundle --all &&
+	git bundle create b2.bundle main &&
+	mkdir dir &&
+	cp b1.bundle dir/b3 &&
+	cp b1.bundle b4 &&
+	git branch not-main main &&
+	git bundle create b5.bundle not-main
+
+[main (root-commit) a4ae174] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+Cloning into bare repository 'a.git'...
+done.
+Cloning into bare repository 'x'...
+done.
+ok 1 - preparing origin repository
+
+expecting success of 5605.2 'local clone without .git suffix': 
+	git clone -l -s a b &&
+	(cd b &&
+	echo false >expect &&
+	git config --bool core.bare >actual &&
+	test_cmp expect actual &&
+	git fetch)
+
+Cloning into 'b'...
+done.
+ok 2 - local clone without .git suffix
+
+expecting success of 5605.3 'local clone with .git suffix': 
+	git clone -l -s a.git c &&
+	(cd c && git fetch)
+
+Cloning into 'c'...
+done.
+ok 3 - local clone with .git suffix
+
+expecting success of 5605.4 'local clone from x': 
+	git clone -l -s x y &&
+	(cd y && git fetch)
+
+Cloning into 'y'...
+done.
+ok 4 - local clone from x
+
+expecting success of 5605.5 'local clone from x.git that does not exist': 
+	test_must_fail git clone -l -s x.git z
+
+fatal: repository 'x.git' does not exist
+ok 5 - local clone from x.git that does not exist
+
+expecting success of 5605.6 'With -no-hardlinks, local will make a copy': 
+	git clone --bare --no-hardlinks x w &&
+	! repo_is_hardlinked w
+
+Cloning into bare repository 'w'...
+done.
+test_line_count: line count for output != 0
+w/objects/a4/ae174c9759876c669998f2c8e401fcb298b8d6
+w/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
+w/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078
+ok 6 - With -no-hardlinks, local will make a copy
+
+expecting success of 5605.7 'Even without -l, local will make a hardlink': 
+	rm -fr w &&
+	git clone -l --bare x w &&
+	repo_is_hardlinked w
+
+Cloning into bare repository 'w'...
+done.
+ok 7 - Even without -l, local will make a hardlink
+
+expecting success of 5605.8 'local clone of repo with nonexistent ref in HEAD': 
+	git -C a.git symbolic-ref HEAD refs/heads/nonexistent &&
+	git clone a d &&
+	(cd d &&
+	git fetch &&
+	test_ref_missing refs/remotes/origin/HEAD)
+
+Cloning into 'd'...
+done.
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+error: reference does not exist
+ok 8 - local clone of repo with nonexistent ref in HEAD
+
+expecting success of 5605.9 'bundle clone without .bundle suffix': 
+	git clone dir/b3 &&
+	(cd b3 && git fetch)
+
+Cloning into 'b3'...
+ok 9 - bundle clone without .bundle suffix
+
+expecting success of 5605.10 'bundle clone with .bundle suffix': 
+	git clone b1.bundle &&
+	(cd b1 && git fetch)
+
+Cloning into 'b1'...
+ok 10 - bundle clone with .bundle suffix
+
+expecting success of 5605.11 'bundle clone from b4': 
+	git clone b4 bdl &&
+	(cd bdl && git fetch)
+
+Cloning into 'bdl'...
+ok 11 - bundle clone from b4
+
+expecting success of 5605.12 'bundle clone from b4.bundle that does not exist': 
+	test_must_fail git clone b4.bundle bb
+
+fatal: repository 'b4.bundle' does not exist
+ok 12 - bundle clone from b4.bundle that does not exist
+
+expecting success of 5605.13 'bundle clone with nonexistent HEAD (match default)': 
+	git clone b2.bundle b2 &&
+	(cd b2 &&
+	git fetch &&
+	git rev-parse --verify refs/heads/main)
+
+Cloning into 'b2'...
+a4ae174c9759876c669998f2c8e401fcb298b8d6
+ok 13 - bundle clone with nonexistent HEAD (match default)
+
+expecting success of 5605.14 'bundle clone with nonexistent HEAD (no match default)': 
+	git clone b5.bundle b5 &&
+	(cd b5 &&
+	git fetch &&
+	test_must_fail git rev-parse --verify refs/heads/main &&
+	test_must_fail git rev-parse --verify refs/heads/not-main)
+
+Cloning into 'b5'...
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+fatal: Needed a single revision
+fatal: Needed a single revision
+ok 14 - bundle clone with nonexistent HEAD (no match default)
+
+expecting success of 5605.15 'clone empty repository': 
+	mkdir empty &&
+	(cd empty &&
+	 git init &&
+	 git config receive.denyCurrentBranch warn) &&
+	git clone empty empty-clone &&
+	test_tick &&
+	(cd empty-clone &&
+	 echo "content" >> foo &&
+	 git add foo &&
+	 git commit -m "Initial commit" &&
+	 git push origin main &&
+	 expected=$(git rev-parse main) &&
+	 actual=$(git --git-dir=../empty/.git rev-parse main) &&
+	 test $actual = $expected)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/empty/.git/
+Cloning into 'empty-clone'...
+warning: You appear to have cloned an empty repository.
+done.
+[main (root-commit) b8e7dd3] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+remote: warning: updating the current branch        
+To /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/empty
+ * [new branch]      main -> main
+ok 15 - clone empty repository
+
+expecting success of 5605.16 'clone empty repository, and then push should not segfault.': 
+	rm -fr empty/ empty-clone/ &&
+	mkdir empty &&
+	(cd empty && git init) &&
+	git clone empty empty-clone &&
+	(cd empty-clone &&
+	test_must_fail git push)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/empty/.git/
+Cloning into 'empty-clone'...
+warning: You appear to have cloned an empty repository.
+done.
+error: src refspec refs/heads/main does not match any
+error: failed to push some refs to '/build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/empty'
+ok 16 - clone empty repository, and then push should not segfault.
+
+expecting success of 5605.17 'cloning non-existent directory fails': 
+	rm -rf does-not-exist &&
+	test_must_fail git clone does-not-exist
+
+fatal: repository 'does-not-exist' does not exist
+ok 17 - cloning non-existent directory fails
+
+expecting success of 5605.18 'cloning non-git directory fails': 
+	rm -rf not-a-git-repo not-a-git-repo-clone &&
+	mkdir not-a-git-repo &&
+	test_must_fail git clone not-a-git-repo not-a-git-repo-clone
+
+fatal: repository 'not-a-git-repo' does not exist
+ok 18 - cloning non-git directory fails
+
+expecting success of 5605.19 'cloning file:// does not hardlink': 
+	git clone --bare file://"$(pwd)"/a non-local &&
+	! repo_is_hardlinked non-local
+
+Cloning into bare repository 'non-local'...
+test_line_count: line count for output != 0
+non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.rev
+non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.idx
+non-local/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.pack
+ok 19 - cloning file:// does not hardlink
+
+expecting success of 5605.20 'cloning a local path with --no-local does not hardlink': 
+	git clone --bare --no-local a force-nonlocal &&
+	! repo_is_hardlinked force-nonlocal
+
+Cloning into bare repository 'force-nonlocal'...
+test_line_count: line count for output != 0
+force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.rev
+force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.idx
+force-nonlocal/objects/pack/pack-f472b77358cba3f40ca4c0fa18efd9530a353a0b.pack
+ok 20 - cloning a local path with --no-local does not hardlink
+
+expecting success of 5605.21 'cloning locally respects "-u" for fetching refs': 
+	test_must_fail git clone --bare -u false a should_not_work.git
+
+Cloning into bare repository 'should_not_work.git'...
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 21 - cloning locally respects "-u" for fetching refs
+
+expecting success of 5605.22 'local clone from repo with corrupt refs fails gracefully': 
+	git init corrupt &&
+	test_commit -C corrupt one &&
+	echo a >corrupt/.git/refs/heads/topic &&
+
+	test_must_fail git clone corrupt working 2>err &&
+	grep "has a null OID" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5605-clone-local/corrupt/.git/
+[main (root-commit) b838542] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+fatal: 'refs/remotes/origin/topic' has a null OID
+ok 22 - local clone from repo with corrupt refs fails gracefully
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5608-clone-2gb.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5608-clone-2gb/.git/
 1..0 # SKIP expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5606-clone-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/.git/
+expecting success of 5606.1 'setup': 
+
+	mkdir parent &&
+	(cd parent && git init &&
+	 echo one >file && git add file &&
+	 git commit -m one) &&
+	git clone --depth=1 --no-local parent shallow-repo
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/parent/.git/
+[main (root-commit) 1993c08] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into 'shallow-repo'...
+ok 1 - setup
+
+expecting success of 5606.2 'submodule.stickyRecursiveClone flag manipulates submodule.recurse value': 
+
+	test_config_global submodule.stickyRecursiveClone true &&
+	git clone --recurse-submodules parent clone_recurse_true &&
+	test_cmp_config -C clone_recurse_true true submodule.recurse &&
+
+	test_config_global submodule.stickyRecursiveClone false &&
+	git clone --recurse-submodules parent clone_recurse_false &&
+	test_expect_code 1 git -C clone_recurse_false config --get submodule.recurse
+
+
+Cloning into 'clone_recurse_true'...
+done.
+Cloning into 'clone_recurse_false'...
+done.
+ok 2 - submodule.stickyRecursiveClone flag manipulates submodule.recurse value
+
+expecting success of 5606.3 'clone -o': 
+
+	git clone -o foo parent clone-o &&
+	git -C clone-o rev-parse --verify refs/remotes/foo/main
+
+
+Cloning into 'clone-o'...
+done.
+1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
+ok 3 - clone -o
+
+expecting success of 5606.4 'rejects invalid -o/--origin': 
+
+	test_must_fail git clone -o "bad...name" parent clone-bad-name 2>err &&
+	test_grep "'bad...name' is not a valid remote name" err
+
+
+fatal: 'bad...name' is not a valid remote name
+ok 4 - rejects invalid -o/--origin
+
+expecting success of 5606.5 'clone --bare -o': 
+
+	git clone -o foo --bare parent clone-bare-o &&
+	(cd parent && pwd) >expect &&
+	git -C clone-bare-o config remote.foo.url >actual &&
+	test_cmp expect actual
+
+
+Cloning into bare repository 'clone-bare-o'...
+done.
+ok 5 - clone --bare -o
+
+expecting success of 5606.6 'disallows --bare with --separate-git-dir': 
+
+	test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
+	test_debug "cat err" &&
+	test_grep -e "options .--bare. and .--separate-git-dir. cannot be used together" err
+
+
+fatal: options '--bare' and '--separate-git-dir' cannot be used together
+ok 6 - disallows --bare with --separate-git-dir
+
+expecting success of 5606.7 'disallows --bundle-uri with shallow options': 
+	for option in --depth=1 --shallow-since=01-01-2000 --shallow-exclude=HEAD
+	do
+		test_must_fail git clone --bundle-uri=bundle $option from to 2>err &&
+		grep "bundle-uri.* cannot be used together" err || return 1
+	done
+
+fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
+fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
+fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
+ok 7 - disallows --bundle-uri with shallow options
+
+expecting success of 5606.8 'reject cloning shallow repository': 
+	test_when_finished "rm -rf repo" &&
+	test_must_fail git clone --reject-shallow shallow-repo out 2>err &&
+	test_grep -e "source repository is shallow, reject to clone." err &&
+
+	git clone --no-reject-shallow shallow-repo repo
+
+fatal: source repository is shallow, reject to clone.
+Cloning into 'repo'...
+ok 8 - reject cloning shallow repository
+
+expecting success of 5606.9 'reject cloning non-local shallow repository': 
+	test_when_finished "rm -rf repo" &&
+	test_must_fail git clone --reject-shallow --no-local shallow-repo out 2>err &&
+	test_grep -e "source repository is shallow, reject to clone." err &&
+
+	git clone --no-reject-shallow --no-local shallow-repo repo
+
+fatal: source repository is shallow, reject to clone.
+Cloning into 'repo'...
+ok 9 - reject cloning non-local shallow repository
+
+expecting success of 5606.10 'succeed cloning normal repository': 
+	test_when_finished "rm -rf chilad1 child2 child3 child4 " &&
+	git clone --reject-shallow parent child1 &&
+	git clone --reject-shallow --no-local parent child2 &&
+	git clone --no-reject-shallow parent child3 &&
+	git clone --no-reject-shallow --no-local parent child4
+
+Cloning into 'child1'...
+done.
+Cloning into 'child2'...
+Cloning into 'child3'...
+done.
+Cloning into 'child4'...
+ok 10 - succeed cloning normal repository
+
+expecting success of 5606.11 'uses "origin" for default remote name': 
+
+	git clone parent clone-default-origin &&
+	git -C clone-default-origin rev-parse --verify refs/remotes/origin/main
+
+
+Cloning into 'clone-default-origin'...
+done.
+1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
+ok 11 - uses "origin" for default remote name
+
+expecting success of 5606.12 'prefers --template config over normal config': 
+
+	template="$TRASH_DIRECTORY/template-with-config" &&
+	mkdir "$template" &&
+	git config --file "$template/config" foo.bar from_template &&
+	test_config_global foo.bar from_global &&
+	git clone "--template=$template" parent clone-template-config &&
+	test "$(git -C clone-template-config config --local foo.bar)" = "from_template"
+
+
+Cloning into 'clone-template-config'...
+done.
+ok 12 - prefers --template config over normal config
+
+expecting success of 5606.13 'prefers -c config over --template config': 
+
+	template="$TRASH_DIRECTORY/template-with-ignored-config" &&
+	mkdir "$template" &&
+	git config --file "$template/config" foo.bar from_template &&
+	git clone "--template=$template" -c foo.bar=inline parent clone-template-inline-config &&
+	test "$(git -C clone-template-inline-config config --local foo.bar)" = "inline"
+
+
+Cloning into 'clone-template-inline-config'...
+done.
+ok 13 - prefers -c config over --template config
+
+expecting success of 5606.14 'ignore --template config for core.bare': 
+
+	template="$TRASH_DIRECTORY/template-with-bare-config" &&
+	mkdir "$template" &&
+	git config --file "$template/config" core.bare true &&
+	git clone "--template=$template" parent clone-bare-config &&
+	test "$(git -C clone-bare-config config --local core.bare)" = "false" &&
+	test_path_is_missing clone-bare-config/HEAD
+
+Cloning into 'clone-bare-config'...
+done.
+ok 14 - ignore --template config for core.bare
+
+expecting success of 5606.15 'prefers config "clone.defaultRemoteName" over default': 
+
+	test_config_global clone.defaultRemoteName from_config &&
+	git clone parent clone-config-origin &&
+	git -C clone-config-origin rev-parse --verify refs/remotes/from_config/main
+
+
+Cloning into 'clone-config-origin'...
+done.
+1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
+ok 15 - prefers config "clone.defaultRemoteName" over default
+
+expecting success of 5606.16 'prefers --origin over -c config': 
+
+	git clone -c clone.defaultRemoteName=inline --origin from_option parent clone-o-and-inline-config &&
+	git -C clone-o-and-inline-config rev-parse --verify refs/remotes/from_option/main
+
+
+Cloning into 'clone-o-and-inline-config'...
+done.
+1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
+ok 16 - prefers --origin over -c config
+
+expecting success of 5606.17 'redirected clone does not show progress': 
+
+	git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
+	! grep % err &&
+	test_grep ! "Checking connectivity" err
+
+
+ok 17 - redirected clone does not show progress
+
+expecting success of 5606.18 'redirected clone -v does show progress': 
+
+	git clone --progress "file://$(pwd)/parent" clone-redirected-progress \
+		>out 2>err &&
+	grep % err
+
+
+remote: Counting objects:  33% (1/3)        
remote: Counting objects:  66% (2/3)        
remote: Counting objects: 100% (3/3)        
remote: Counting objects: 100% (3/3), done.        
+Receiving objects:  33% (1/3)
Receiving objects:  66% (2/3)
Receiving objects: 100% (3/3)
Receiving objects: 100% (3/3), done.
+ok 18 - redirected clone -v does show progress
+
+expecting success of 5606.19 'clone does not segfault with --bare and core.bare=false': 
+	test_config_global core.bare false &&
+	git clone --bare parent clone-bare &&
+	echo true >expect &&
+	git -C clone-bare rev-parse --is-bare-repository >actual &&
+	test_cmp expect actual
+
+Cloning into bare repository 'clone-bare'...
+done.
+ok 19 - clone does not segfault with --bare and core.bare=false
+
+expecting success of 5606.20 'chooses correct default initial branch name': 
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=foo init --bare empty &&
+	test_config -C empty lsrefs.unborn advertise &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=up -c protocol.version=2 clone empty whats-up &&
+	test refs/heads/foo = $(git -C whats-up symbolic-ref HEAD) &&
+	test refs/heads/foo = $(git -C whats-up config branch.foo.merge)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/empty/
+Cloning into 'whats-up'...
+warning: You appear to have cloned an empty repository.
+done.
+ok 20 - chooses correct default initial branch name
+
+expecting success of 5606.21 'guesses initial branch name correctly': 
+	git init --initial-branch=guess initial-branch &&
+	test_commit -C initial-branch no-spoilers &&
+	git -C initial-branch branch abc guess &&
+	git clone initial-branch is-it &&
+	test refs/heads/guess = $(git -C is-it symbolic-ref HEAD) &&
+
+	git -c init.defaultBranch=none init --bare no-head &&
+	git -C initial-branch push ../no-head guess abc &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git clone no-head is-it2 &&
+	test_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD &&
+	git -C no-head update-ref --no-deref HEAD refs/heads/guess &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=guess clone no-head is-it3 &&
+	test refs/remotes/origin/guess = \
+		$(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/initial-branch/.git/
+[guess (root-commit) d4c6c35] no-spoilers
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 no-spoilers.t
+Cloning into 'is-it'...
+done.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/no-head/
+To ../no-head
+ * [new branch]      guess -> guess
+ * [new branch]      abc -> abc
+Cloning into 'is-it2'...
+done.
+warning: remote HEAD refers to nonexistent ref, unable to checkout
+fatal: ref refs/remotes/origin/HEAD is not a symbolic ref
+Cloning into 'is-it3'...
+done.
+ok 21 - guesses initial branch name correctly
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5607-clone-bundle.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5607-clone-bundle/.git/
 expecting success of 5607.1 'setup': 
@@ -367764,438 +367880,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5603-clone-dirname.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5609-clone-branch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5609-clone-branch/.git/
 expecting success of 5609.1 'setup': 
@@ -368475,292 +368159,168 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5606-clone-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/.git/
-expecting success of 5606.1 'setup': 
-
-	mkdir parent &&
-	(cd parent && git init &&
-	 echo one >file && git add file &&
-	 git commit -m one) &&
-	git clone --depth=1 --no-local parent shallow-repo
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/parent/.git/
-[main (root-commit) 1993c08] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'shallow-repo'...
-ok 1 - setup
-
-expecting success of 5606.2 'submodule.stickyRecursiveClone flag manipulates submodule.recurse value': 
-
-	test_config_global submodule.stickyRecursiveClone true &&
-	git clone --recurse-submodules parent clone_recurse_true &&
-	test_cmp_config -C clone_recurse_true true submodule.recurse &&
-
-	test_config_global submodule.stickyRecursiveClone false &&
-	git clone --recurse-submodules parent clone_recurse_false &&
-	test_expect_code 1 git -C clone_recurse_false config --get submodule.recurse
-
-
-Cloning into 'clone_recurse_true'...
-done.
-Cloning into 'clone_recurse_false'...
-done.
-ok 2 - submodule.stickyRecursiveClone flag manipulates submodule.recurse value
-
-expecting success of 5606.3 'clone -o': 
-
-	git clone -o foo parent clone-o &&
-	git -C clone-o rev-parse --verify refs/remotes/foo/main
-
-
-Cloning into 'clone-o'...
-done.
-1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
-ok 3 - clone -o
-
-expecting success of 5606.4 'rejects invalid -o/--origin': 
-
-	test_must_fail git clone -o "bad...name" parent clone-bad-name 2>err &&
-	test_grep "'bad...name' is not a valid remote name" err
-
-
-fatal: 'bad...name' is not a valid remote name
-ok 4 - rejects invalid -o/--origin
-
-expecting success of 5606.5 'clone --bare -o': 
-
-	git clone -o foo --bare parent clone-bare-o &&
-	(cd parent && pwd) >expect &&
-	git -C clone-bare-o config remote.foo.url >actual &&
+*** t5611-clone-config.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5611-clone-config/.git/
+expecting success of 5611.1 'clone -c sets config in cloned repo': 
+	rm -rf child &&
+	git clone -c core.foo=bar . child &&
+	echo bar >expect &&
+	git --git-dir=child/.git config core.foo >actual &&
 	test_cmp expect actual
 
-
-Cloning into bare repository 'clone-bare-o'...
+Cloning into 'child'...
+warning: You appear to have cloned an empty repository.
 done.
-ok 5 - clone --bare -o
-
-expecting success of 5606.6 'disallows --bare with --separate-git-dir': 
-
-	test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
-	test_debug "cat err" &&
-	test_grep -e "options .--bare. and .--separate-git-dir. cannot be used together" err
-
-
-fatal: options '--bare' and '--separate-git-dir' cannot be used together
-ok 6 - disallows --bare with --separate-git-dir
-
-expecting success of 5606.7 'disallows --bundle-uri with shallow options': 
-	for option in --depth=1 --shallow-since=01-01-2000 --shallow-exclude=HEAD
-	do
-		test_must_fail git clone --bundle-uri=bundle $option from to 2>err &&
-		grep "bundle-uri.* cannot be used together" err || return 1
-	done
-
-fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
-fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
-fatal: options '--bundle-uri' and '--depth/--shallow-since/--shallow-exclude' cannot be used together
-ok 7 - disallows --bundle-uri with shallow options
-
-expecting success of 5606.8 'reject cloning shallow repository': 
-	test_when_finished "rm -rf repo" &&
-	test_must_fail git clone --reject-shallow shallow-repo out 2>err &&
-	test_grep -e "source repository is shallow, reject to clone." err &&
-
-	git clone --no-reject-shallow shallow-repo repo
-
-fatal: source repository is shallow, reject to clone.
-Cloning into 'repo'...
-ok 8 - reject cloning shallow repository
-
-expecting success of 5606.9 'reject cloning non-local shallow repository': 
-	test_when_finished "rm -rf repo" &&
-	test_must_fail git clone --reject-shallow --no-local shallow-repo out 2>err &&
-	test_grep -e "source repository is shallow, reject to clone." err &&
-
-	git clone --no-reject-shallow --no-local shallow-repo repo
-
-fatal: source repository is shallow, reject to clone.
-Cloning into 'repo'...
-ok 9 - reject cloning non-local shallow repository
+ok 1 - clone -c sets config in cloned repo
 
-expecting success of 5606.10 'succeed cloning normal repository': 
-	test_when_finished "rm -rf chilad1 child2 child3 child4 " &&
-	git clone --reject-shallow parent child1 &&
-	git clone --reject-shallow --no-local parent child2 &&
-	git clone --no-reject-shallow parent child3 &&
-	git clone --no-reject-shallow --no-local parent child4
+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 'child1'...
-done.
-Cloning into 'child2'...
-Cloning into 'child3'...
+Cloning into 'child'...
+warning: You appear to have cloned an empty repository.
 done.
-Cloning into 'child4'...
-ok 10 - succeed cloning normal repository
-
-expecting success of 5606.11 'uses "origin" for default remote name': 
-
-	git clone parent clone-default-origin &&
-	git -C clone-default-origin rev-parse --verify refs/remotes/origin/main
+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 'clone-default-origin'...
+Cloning into 'child'...
+warning: You appear to have cloned an empty repository.
 done.
-1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
-ok 11 - uses "origin" for default remote name
-
-expecting success of 5606.12 'prefers --template config over normal config': 
-
-	template="$TRASH_DIRECTORY/template-with-config" &&
-	mkdir "$template" &&
-	git config --file "$template/config" foo.bar from_template &&
-	test_config_global foo.bar from_global &&
-	git clone "--template=$template" parent clone-template-config &&
-	test "$(git -C clone-template-config config --local foo.bar)" = "from_template"
+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 'clone-template-config'...
+Cloning into 'child'...
+warning: You appear to have cloned an empty repository.
 done.
-ok 12 - prefers --template config over normal config
-
-expecting success of 5606.13 'prefers -c config over --template config': 
-
-	template="$TRASH_DIRECTORY/template-with-ignored-config" &&
-	mkdir "$template" &&
-	git config --file "$template/config" foo.bar from_template &&
-	git clone "--template=$template" -c foo.bar=inline parent clone-template-inline-config &&
-	test "$(git -C clone-template-inline-config config --local foo.bar)" = "inline"
+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
 
-Cloning into 'clone-template-inline-config'...
+[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 13 - prefers -c config over --template config
+ok 5 - clone -c config is available during clone
 
-expecting success of 5606.14 'ignore --template config for core.bare': 
+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 &&
 
-	template="$TRASH_DIRECTORY/template-with-bare-config" &&
-	mkdir "$template" &&
-	git config --file "$template/config" core.bare true &&
-	git clone "--template=$template" parent clone-bare-config &&
-	test "$(git -C clone-bare-config config --local core.bare)" = "false" &&
-	test_path_is_missing clone-bare-config/HEAD
+	cat >expect <<-\EOF &&
+	refs/grab/it
+	refs/heads/main
+	refs/remotes/origin/HEAD
+	refs/remotes/origin/main
+	EOF
+	test_cmp expect actual
 
-Cloning into 'clone-bare-config'...
+Cloning into 'child'...
 done.
-ok 14 - ignore --template config for core.bare
-
-expecting success of 5606.15 'prefers config "clone.defaultRemoteName" over default': 
+ok 6 - clone -c remote.origin.fetch=<refspec> works
 
-	test_config_global clone.defaultRemoteName from_config &&
-	git clone parent clone-config-origin &&
-	git -C clone-config-origin rev-parse --verify refs/remotes/from_config/main
+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 'clone-config-origin'...
+Cloning into 'child'...
 done.
-1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
-ok 15 - prefers config "clone.defaultRemoteName" over default
-
-expecting success of 5606.16 'prefers --origin over -c config': 
+ok 7 - git -c remote.origin.fetch=<refspec> clone works
 
-	git clone -c clone.defaultRemoteName=inline --origin from_option parent clone-o-and-inline-config &&
-	git -C clone-o-and-inline-config rev-parse --verify refs/remotes/from_option/main
+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 'clone-o-and-inline-config'...
+Cloning into 'child'...
 done.
-1993c08d5743a2c4719f8ed3b8cc9b60d54d741e
-ok 16 - prefers --origin over -c config
-
-expecting success of 5606.17 'redirected clone does not show progress': 
-
-	git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
-	! grep % err &&
-	test_grep ! "Checking connectivity" err
-
-
-ok 17 - redirected clone does not show progress
+ok 8 - clone -c remote.<remote>.fetch=<refspec> --origin=<name>
 
-expecting success of 5606.18 'redirected clone -v does show progress': 
+expecting success of 5611.9 'set up shallow repository': 
+	git clone --depth=1 --no-local . shallow-repo
 
-	git clone --progress "file://$(pwd)/parent" clone-redirected-progress \
-		>out 2>err &&
-	grep % err
+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 &&
 
-remote: Counting objects:  33% (1/3)        
remote: Counting objects:  66% (2/3)        
remote: Counting objects: 100% (3/3)        
remote: Counting objects: 100% (3/3), done.        
-Receiving objects:  33% (1/3)
Receiving objects:  66% (2/3)
Receiving objects: 100% (3/3)
Receiving objects: 100% (3/3), done.
-ok 18 - redirected clone -v does show progress
+	git -c clone.rejectshallow=false clone --no-local shallow-repo out
 
-expecting success of 5606.19 'clone does not segfault with --bare and core.bare=false': 
-	test_config_global core.bare false &&
-	git clone --bare parent clone-bare &&
-	echo true >expect &&
-	git -C clone-bare rev-parse --is-bare-repository >actual &&
-	test_cmp expect actual
+fatal: source repository is shallow, reject to clone.
+Cloning into 'out'...
+ok 10 - clone.rejectshallow=true should reject cloning shallow repo
 
-Cloning into bare repository 'clone-bare'...
-done.
-ok 19 - clone does not segfault with --bare and core.bare=false
+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 5606.20 'chooses correct default initial branch name': 
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=foo init --bare empty &&
-	test_config -C empty lsrefs.unborn advertise &&
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=up -c protocol.version=2 clone empty whats-up &&
-	test refs/heads/foo = $(git -C whats-up symbolic-ref HEAD) &&
-	test refs/heads/foo = $(git -C whats-up config branch.foo.merge)
+	git -c clone.rejectshallow=true clone --no-reject-shallow --no-local shallow-repo out
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/empty/
-Cloning into 'whats-up'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 20 - chooses correct default initial branch name
+fatal: source repository is shallow, reject to clone.
+Cloning into 'out'...
+ok 11 - option --[no-]reject-shallow override clone.rejectshallow config
 
-expecting success of 5606.21 'guesses initial branch name correctly': 
-	git init --initial-branch=guess initial-branch &&
-	test_commit -C initial-branch no-spoilers &&
-	git -C initial-branch branch abc guess &&
-	git clone initial-branch is-it &&
-	test refs/heads/guess = $(git -C is-it symbolic-ref HEAD) &&
+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
 
-	git -c init.defaultBranch=none init --bare no-head &&
-	git -C initial-branch push ../no-head guess abc &&
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git clone no-head is-it2 &&
-	test_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD &&
-	git -C no-head update-ref --no-deref HEAD refs/heads/guess &&
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
-	git -c init.defaultBranch=guess clone no-head is-it3 &&
-	test refs/remotes/origin/guess = \
-		$(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD)
+Cloning into 'out'...
+ok 12 - clone.rejectshallow=true should succeed cloning normal repo
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/initial-branch/.git/
-[guess (root-commit) d4c6c35] no-spoilers
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 no-spoilers.t
-Cloning into 'is-it'...
-done.
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5606-clone-options/no-head/
-To ../no-head
- * [new branch]      guess -> guess
- * [new branch]      abc -> abc
-Cloning into 'is-it2'...
-done.
-warning: remote HEAD refers to nonexistent ref, unable to checkout
-fatal: ref refs/remotes/origin/HEAD is not a symbolic ref
-Cloning into 'is-it3'...
-done.
-ok 21 - guesses initial branch name correctly
+ok 13 # skip clone -c core.hideDotFiles (missing MINGW)
 
-# passed all 21 test(s)
-1..21
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5613-info-alternate.sh ***
@@ -368946,170 +368506,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5611-clone-config.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5611-clone-config/.git/
-expecting success of 5611.1 'clone -c sets config in cloned repo': 
-	rm -rf child &&
-	git clone -c core.foo=bar . child &&
-	echo bar >expect &&
-	git --git-dir=child/.git config core.foo >actual &&
-	test_cmp expect actual
-
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 1 - clone -c sets config in cloned repo
-
-expecting success of 5611.2 'clone -c can set multi-keys': 
-	rm -rf child &&
-	git clone -c core.foo=bar -c core.foo=baz . child &&
-	test_write_lines bar baz >expect &&
-	git --git-dir=child/.git config --get-all core.foo >actual &&
-	test_cmp expect actual
-
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 2 - clone -c can set multi-keys
-
-expecting success of 5611.3 'clone -c can set multi-keys, including some empty': 
-	rm -rf child &&
-	git clone -c credential.helper= -c credential.helper=hi . child &&
-	printf "%s\n" "" hi >expect &&
-	git --git-dir=child/.git config --get-all credential.helper >actual &&
-	test_cmp expect actual
-
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 3 - clone -c can set multi-keys, including some empty
-
-expecting success of 5611.4 'clone -c without a value is boolean true': 
-	rm -rf child &&
-	git clone -c core.foo . child &&
-	echo true >expect &&
-	git --git-dir=child/.git config --bool core.foo >actual &&
-	test_cmp expect actual
-
-Cloning into 'child'...
-warning: You appear to have cloned an empty repository.
-done.
-ok 4 - clone -c without a value is boolean true
-
-expecting success of 5611.5 'clone -c config is available during clone': 
-	echo content >file &&
-	git add file &&
-	git commit -m one &&
-	rm -rf child &&
-	git clone -c core.autocrlf . child &&
-	printf "content\\r\\n" >expect &&
-	test_cmp expect child/file
-
-[main (root-commit) f39a923] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into 'child'...
-done.
-ok 5 - clone -c config is available during clone
-
-expecting success of 5611.6 'clone -c remote.origin.fetch=<refspec> works': 
-	rm -rf child &&
-	git update-ref refs/grab/it refs/heads/main &&
-	git update-ref refs/leave/out refs/heads/main &&
-	git clone -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" . child &&
-	git -C child for-each-ref --format="%(refname)" >actual &&
-
-	cat >expect <<-\EOF &&
-	refs/grab/it
-	refs/heads/main
-	refs/remotes/origin/HEAD
-	refs/remotes/origin/main
-	EOF
-	test_cmp expect actual
-
-Cloning into 'child'...
-done.
-ok 6 - clone -c remote.origin.fetch=<refspec> works
-
-expecting success of 5611.7 'git -c remote.origin.fetch=<refspec> clone works': 
-	rm -rf child &&
-	git -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" clone . child &&
-	git -C child for-each-ref --format="%(refname)" >actual &&
-
-	cat >expect <<-\EOF &&
-	refs/grab/it
-	refs/heads/main
-	refs/remotes/origin/HEAD
-	refs/remotes/origin/main
-	EOF
-	test_cmp expect actual
-
-Cloning into 'child'...
-done.
-ok 7 - git -c remote.origin.fetch=<refspec> clone works
-
-expecting success of 5611.8 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>': 
-	rm -rf child &&
-	git clone --origin=upstream \
-		  -c "remote.upstream.fetch=+refs/grab/*:refs/grab/*" \
-		  -c "remote.origin.fetch=+refs/leave/*:refs/leave/*" \
-		  . child &&
-	git -C child for-each-ref --format="%(refname)" >actual &&
-
-	cat >expect <<-\EOF &&
-	refs/grab/it
-	refs/heads/main
-	refs/remotes/upstream/HEAD
-	refs/remotes/upstream/main
-	EOF
-	test_cmp expect actual
-
-Cloning into 'child'...
-done.
-ok 8 - clone -c remote.<remote>.fetch=<refspec> --origin=<name>
-
-expecting success of 5611.9 'set up shallow repository': 
-	git clone --depth=1 --no-local . shallow-repo
-
-Cloning into 'shallow-repo'...
-ok 9 - set up shallow repository
-
-expecting success of 5611.10 'clone.rejectshallow=true should reject cloning shallow repo': 
-	test_when_finished "rm -rf out" &&
-	test_must_fail git -c clone.rejectshallow=true clone --no-local shallow-repo out 2>err &&
-	test_grep -e "source repository is shallow, reject to clone." err &&
-
-	git -c clone.rejectshallow=false clone --no-local shallow-repo out
-
-fatal: source repository is shallow, reject to clone.
-Cloning into 'out'...
-ok 10 - clone.rejectshallow=true should reject cloning shallow repo
-
-expecting success of 5611.11 'option --[no-]reject-shallow override clone.rejectshallow config': 
-	test_when_finished "rm -rf out" &&
-	test_must_fail git -c clone.rejectshallow=false clone --reject-shallow --no-local shallow-repo out 2>err &&
-	test_grep -e "source repository is shallow, reject to clone." err &&
-
-	git -c clone.rejectshallow=true clone --no-reject-shallow --no-local shallow-repo out
-
-fatal: source repository is shallow, reject to clone.
-Cloning into 'out'...
-ok 11 - option --[no-]reject-shallow override clone.rejectshallow config
-
-expecting success of 5611.12 'clone.rejectshallow=true should succeed cloning normal repo': 
-	test_when_finished "rm -rf out" &&
-	git -c clone.rejectshallow=true clone --no-local . out
-
-Cloning into 'out'...
-ok 12 - clone.rejectshallow=true should succeed cloning normal repo
-
-ok 13 # skip clone -c core.hideDotFiles (missing MINGW)
-
-# passed all 13 test(s)
-1..13
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5615-alternate-env.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5615-alternate-env/.git/
 expecting success of 5615.1 'create alternate repositories': 
@@ -369404,8 +368800,8 @@
 	! test_cmp expect actual &&
 	test_line_count = 2 actual
 
---- expect	2025-12-18 01:37:26.898773267 +0000
-+++ actual	2025-12-18 01:37:26.894773267 +0000
+--- expect	2024-11-14 19:39:00.163486918 +0000
++++ actual	2024-11-14 19:39:00.151486794 +0000
 @@ -1,2 +1,2 @@
  0c9f2ac7142a96473515181c5d9c2ce77c5ea4ed commit	refs/tags/five
 -5efd04f7018dafa5c97b7431a71f14902ebbdf7e commit	refs/tags/two
@@ -369598,1264 +368994,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5618-alternate-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5618-alternate-refs/.git/
-expecting success of 5618.1 'set up local refs': 
-	git checkout -b one &&
-	test_tick &&
-	git commit --allow-empty -m base &&
-	test_tick &&
-	git commit --allow-empty -m one &&
-	git checkout -b two HEAD^ &&
-	test_tick &&
-	git commit --allow-empty -m two
-
-Switched to a new branch 'one'
-[one (root-commit) 00f38a4] base
- Author: A U Thor <author@example.com>
-[one eae7140] one
- Author: A U Thor <author@example.com>
-Switched to a new branch 'two'
-[two e9067a7] two
- Author: A U Thor <author@example.com>
-ok 1 - set up local refs
-
-expecting success of 5618.2 'set up shared clone': 
-	git clone -s . child &&
-	cd child &&
-	git merge origin/one
-
-Cloning into 'child'...
-done.
-Merge made by the 'ort' strategy.
-ok 2 - set up shared clone
-
-expecting success of 5618.3 'rev-list --alternate-refs': 
-	git rev-list --remotes=origin >expect &&
-	git rev-list --alternate-refs >actual &&
-	test_cmp expect actual
-
-ok 3 - rev-list --alternate-refs
-
-expecting success of 5618.4 'rev-list --not --alternate-refs': 
-	git rev-parse HEAD >expect &&
-	git rev-list HEAD --not --alternate-refs >actual &&
-	test_cmp expect actual
-
-ok 4 - rev-list --not --alternate-refs
-
-expecting success of 5618.5 'limiting with alternateRefsPrefixes': 
-	test_config core.alternateRefsPrefixes refs/heads/one &&
-	git rev-list origin/one >expect &&
-	git rev-list --alternate-refs >actual &&
-	test_cmp expect actual
-
-ok 5 - limiting with alternateRefsPrefixes
-
-expecting success of 5618.6 'log --source shows .alternate marker': 
-	git log --oneline --source --remotes=origin >expect.orig &&
-	sed "s/origin.* /.alternate /" <expect.orig >expect &&
-	git log --oneline --source --alternate-refs >actual &&
-	test_cmp expect actual
-
-ok 6 - log --source shows .alternate marker
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5619-clone-local-ambiguous-transport.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5619-clone-local-ambiguous-transport/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5614-clone-submodules-shallow.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/.git/
-expecting success of 5614.1 'setup': 
-	git checkout -b main &&
-	test_commit commit1 &&
-	test_commit commit2 &&
-	mkdir sub &&
-	(
-		cd sub &&
-		git init &&
-		test_commit subcommit1 &&
-		test_commit subcommit2 &&
-		test_commit subcommit3
-	) &&
-	git submodule add "file://$pwd/sub" sub &&
-	git commit -m "add submodule"
-
-Switched to a new branch 'main'
-[main (root-commit) ef004cf] commit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit1.t
-[main 94955c5] commit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit2.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub/.git/
-[master (root-commit) 6a80c79] subcommit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subcommit1.t
-[master f6b6be8] subcommit2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subcommit2.t
-[master 5334747] subcommit3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subcommit3.t
-Adding existing repo at 'sub' to the index
-[main a3fdbc7] 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.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 2 - nonshallow clone implies nonshallow submodule
-
-expecting success of 5614.3 'shallow clone with shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone &&
-	git -C super_clone log --oneline >lines &&
-	test_line_count = 2 lines &&
-	git -C super_clone/sub log --oneline >lines &&
-	test_line_count = 1 lines
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 3 - shallow clone with shallow submodule
-
-expecting success of 5614.4 'shallow clone does not imply shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone &&
-	git -C super_clone log --oneline >lines &&
-	test_line_count = 2 lines &&
-	git -C super_clone/sub log --oneline >lines &&
-	test_line_count = 3 lines
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 4 - shallow clone does not imply shallow submodule
-
-expecting success of 5614.5 'shallow clone with non shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone &&
-	git -C super_clone log --oneline >lines &&
-	test_line_count = 2 lines &&
-	git -C super_clone/sub log --oneline >lines &&
-	test_line_count = 3 lines
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 5 - shallow clone with non shallow submodule
-
-expecting success of 5614.6 'non shallow clone with shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
-	git -C super_clone log --oneline >lines &&
-	test_line_count = 3 lines &&
-	git -C super_clone/sub log --oneline >lines &&
-	test_line_count = 1 lines
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 6 - non shallow clone with shallow submodule
-
-expecting success of 5614.7 'clone follows shallow recommendation': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git config -f .gitmodules submodule.sub.shallow true &&
-	git add .gitmodules &&
-	git commit -m "recommend shallow for sub" &&
-	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
-	(
-		cd super_clone &&
-		git log --oneline >lines &&
-		test_line_count = 4 lines
-	) &&
-	(
-		cd super_clone/sub &&
-		git log --oneline >lines &&
-		test_line_count = 1 lines
-	)
-
-[main e3fd3ec] 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.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 7 - clone follows shallow recommendation
-
-expecting success of 5614.8 'get unshallow recommended shallow submodule': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git clone --no-local "file://$pwd/." super_clone &&
-	(
-		cd super_clone &&
-		git submodule update --init --no-recommend-shallow &&
-		git log --oneline >lines &&
-		test_line_count = 4 lines
-	) &&
-	(
-		cd super_clone/sub &&
-		git log --oneline >lines &&
-		test_line_count = 3 lines
-	)
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 8 - get unshallow recommended shallow submodule
-
-expecting success of 5614.9 'clone follows non shallow recommendation': 
-	test_when_finished "rm -rf super_clone" &&
-	test_config_global protocol.file.allow always &&
-	git config -f .gitmodules submodule.sub.shallow false &&
-	git add .gitmodules &&
-	git commit -m "recommend non shallow for sub" &&
-	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
-	(
-		cd super_clone &&
-		git log --oneline >lines &&
-		test_line_count = 5 lines
-	) &&
-	(
-		cd super_clone/sub &&
-		git log --oneline >lines &&
-		test_line_count = 3 lines
-	)
-
-[main 400fe1a] 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.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
-Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
-ok 9 - clone follows non shallow recommendation
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5617-clone-submodules-remote.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/.git/
-expecting success of 5617.1 'setup': 
-	git config --global protocol.file.allow always &&
-	git checkout -b main &&
-	test_commit commit1 &&
-	mkdir sub &&
-	(
-		cd sub &&
-		git init &&
-		test_commit subcommit1 &&
-		git tag sub_when_added_to_super &&
-		git branch other
-	) &&
-	git submodule add "file://$pwd/sub" sub &&
-	git commit -m "add submodule" &&
-	(
-		cd sub &&
-		test_commit subcommit2
-	)
-
-Switched to a new branch 'main'
-[main (root-commit) ef004cf] commit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 commit1.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub/.git/
-[main (root-commit) 5110c63] subcommit1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subcommit1.t
-Adding existing repo at 'sub' to the index
-[main 09e0522] 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.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 3 - clone with --no-remote-submodules
-
-expecting success of 5617.4 'clone with --remote-submodules': 
-	test_when_finished "rm -rf super_clone" &&
-	git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone &&
-	(
-		cd super_clone/sub &&
-		git diff --exit-code remotes/origin/main
-	)
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-Submodule path 'sub': checked out 'c24f10ee4103ccdd16360092dcb618ad35ca1288'
-ok 4 - clone with --remote-submodules
-
-expecting success of 5617.5 'check the default is --no-remote-submodules': 
-	test_when_finished "rm -rf super_clone" &&
-	git clone --recurse-submodules "file://$pwd/." super_clone &&
-	(
-		cd super_clone/sub &&
-		git diff --exit-code sub_when_added_to_super
-	)
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 5 - check the default is --no-remote-submodules
-
-expecting success of 5617.6 'clone with --single-branch': 
-	test_when_finished "rm -rf super_clone" &&
-	git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
-	(
-		cd super_clone/sub &&
-		git rev-parse --verify origin/main &&
-		test_must_fail git rev-parse --verify origin/other
-	)
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-c24f10ee4103ccdd16360092dcb618ad35ca1288
-fatal: Needed a single revision
-ok 6 - clone with --single-branch
-
-expecting success of 5617.7 'clone with --filter': 
-	git clone --recurse-submodules \
-		--filter blob:none --also-filter-submodules \
-		"file://$pwd/srv.bare" super_clone &&
-	test_cmp_config -C super_clone true remote.origin.promisor &&
-	test_cmp_config -C super_clone blob:none remote.origin.partialclonefilter &&
-	test_cmp_config -C super_clone/sub true remote.origin.promisor &&
-	test_cmp_config -C super_clone/sub blob:none remote.origin.partialclonefilter
-
-Cloning into 'super_clone'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
-warning: filtering not recognized by server, ignoring
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 7 - clone with --filter
-
-expecting success of 5617.8 'filters applied with clone.filterSubmodules': 
-	test_config_global clone.filterSubmodules true &&
-	git clone --recurse-submodules --filter blob:none \
-		"file://$pwd/srv.bare" super_clone2 &&
-	test_cmp_config -C super_clone2 true remote.origin.promisor &&
-	test_cmp_config -C super_clone2 blob:none remote.origin.partialclonefilter &&
-	test_cmp_config -C super_clone2/sub true remote.origin.promisor &&
-	test_cmp_config -C super_clone2/sub blob:none remote.origin.partialclonefilter
-
-Cloning into 'super_clone2'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone2/sub'...
-warning: filtering not recognized by server, ignoring
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 8 - filters applied with clone.filterSubmodules
-
-expecting success of 5617.9 '--no-also-filter-submodules overrides clone.filterSubmodules=true': 
-	test_config_global clone.filterSubmodules true &&
-	git clone --recurse-submodules --filter blob:none \
-		--no-also-filter-submodules \
-		"file://$pwd/srv.bare" super_clone3 &&
-	test_cmp_config -C super_clone3 true remote.origin.promisor &&
-	test_cmp_config -C super_clone3 blob:none remote.origin.partialclonefilter &&
-	test_cmp_config -C super_clone3/sub false --default false remote.origin.promisor
-
-Cloning into 'super_clone3'...
-Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone3/sub'...
-Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
-ok 9 - --no-also-filter-submodules overrides clone.filterSubmodules=true
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/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 ...
-[31143] 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.45.2/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
-
-[31237] Connection from 127.0.0.1:36374
-[31237] Extended attribute "host": 127.0.0.1:5700
-[31237] Extended attribute "protocol": version=1
-[31237] Request upload-pack for '/parent'
-[31143] [31237] 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
-[31490] Connection from 127.0.0.1:36382
-[31490] Extended attribute "host": 127.0.0.1:5700
-[31490] Extended attribute "protocol": version=1
-[31490] Request upload-pack for '/parent'
-[31143] [31490] 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
-
-[31586] Connection from 127.0.0.1:36386
-[31586] Extended attribute "host": 127.0.0.1:5700
-[31586] Extended attribute "protocol": version=1
-[31586] Request upload-pack for '/parent'
-[31143] [31586] 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
-[31672] Connection from 127.0.0.1:36402
-[31672] Extended attribute "host": 127.0.0.1:5700
-[31672] Extended attribute "protocol": version=1
-[31672] Request receive-pack for '/parent'
-[31143] [31672] 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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5701-git-serve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5601-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/.git/
 expecting success of 5601.1 'setup': 
@@ -371685,690 +369823,1947 @@
 expecting success of 5601.59 'clone c:temp is ssl': 
 	test_clone_url c:temp c temp
 
-Cloning into 'tmp1'...
-fatal: 'temp' does not appear to be a git repository
-fatal: Could not read from remote repository.
+Cloning into 'tmp1'...
+fatal: 'temp' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 59 - clone c:temp is ssl
+
+ok 60 # skip clone c:temp is dos drive (missing MINGW)
+
+expecting success of 5601.61 'clone host:rep': 
+		test_clone_url host:$repo host $repo
+	
+Cloning into 'tmp2'...
+fatal: 'rep' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 61 - clone host:rep
+
+expecting success of 5601.62 'clone host:rep/home/project': 
+		test_clone_url host:$repo host $repo
+	
+Cloning into 'tmp3'...
+fatal: 'rep/home/project' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 62 - clone host:rep/home/project
+
+expecting success of 5601.63 'clone host:123': 
+		test_clone_url host:$repo host $repo
+	
+Cloning into 'tmp4'...
+fatal: '123' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 63 - clone host:123
+
+expecting success of 5601.64 'clone [::1]:rep': 
+		test_clone_url [::1]:$repo ::1 "$repo"
+	
+Cloning into 'tmp5'...
+fatal: 'rep' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 64 - clone [::1]:rep
+
+expecting success of 5601.65 'clone [::1]:rep/home/project': 
+		test_clone_url [::1]:$repo ::1 "$repo"
+	
+Cloning into 'tmp6'...
+fatal: 'rep/home/project' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 65 - clone [::1]:rep/home/project
+
+expecting success of 5601.66 'clone [::1]:123': 
+		test_clone_url [::1]:$repo ::1 "$repo"
+	
+Cloning into 'tmp7'...
+fatal: '123' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 66 - clone [::1]:123
+
+expecting success of 5601.67 'clone host:/~repo': 
+	test_clone_url host:/~repo host "~repo"
+
+Cloning into 'tmp8'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 67 - clone host:/~repo
+
+expecting success of 5601.68 'clone [::1]:/~repo': 
+	test_clone_url [::1]:/~repo ::1 "~repo"
+
+Cloning into 'tmp9'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 68 - clone [::1]:/~repo
+
+expecting success of 5601.69 'clone foo/bar:baz is not ssh': 
+		test_clone_url $url none
+	
+Cloning into 'tmp10'...
+fatal: 'foo/bar:baz' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 69 - clone foo/bar:baz is not ssh
+
+expecting success of 5601.70 'clone [foo]bar/baz:qux is not ssh': 
+		test_clone_url $url none
+	
+Cloning into 'tmp11'...
+fatal: ']bar/baz:qux' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 70 - clone [foo]bar/baz:qux is not ssh
+
+expecting success of 5601.71 'clone [foo/bar]:baz is not ssh': 
+		test_clone_url $url none
+	
+Cloning into 'tmp12'...
+fatal: ']:baz' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 71 - clone [foo/bar]:baz is not ssh
+
+expecting success of 5601.72 'clone ssh://host.xz/home/user/repo': 
+		test_clone_url "ssh://host.xz$tcol/home/user/repo" host.xz /home/user/repo
+	
+Cloning into 'tmp13'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 72 - clone ssh://host.xz/home/user/repo
+
+expecting success of 5601.73 'clone ssh://host.xz/~repo': 
+	test_clone_url "ssh://host.xz$tcol/~repo" host.xz "~repo"
+
+Cloning into 'tmp14'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 73 - clone ssh://host.xz/~repo
+
+expecting success of 5601.74 'clone ssh://host.xz:/home/user/repo': 
+		test_clone_url "ssh://host.xz$tcol/home/user/repo" host.xz /home/user/repo
+	
+Cloning into 'tmp15'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 74 - clone ssh://host.xz:/home/user/repo
+
+expecting success of 5601.75 'clone ssh://host.xz:/~repo': 
+	test_clone_url "ssh://host.xz$tcol/~repo" host.xz "~repo"
+
+Cloning into 'tmp16'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 75 - clone ssh://host.xz:/~repo
+
+expecting success of 5601.76 'clone ssh://host.xz:22/home/user/repo': 
+	test_clone_url "ssh://host.xz:22/home/user/repo" "-p 22 host.xz" "/home/user/repo"
+
+Cloning into 'tmp17'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 76 - clone ssh://host.xz:22/home/user/repo
+
+expecting success of 5601.77 'clone ssh://host.xz:22/~repo': 
+	test_clone_url "ssh://host.xz:22/~repo" "-p 22 host.xz" "~repo"
+
+Cloning into 'tmp18'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 77 - clone ssh://host.xz:22/~repo
+
+expecting success of 5601.78 'clone ssh://::1/home/user/repo': 
+	  test_clone_url ssh://::1/home/user/repo ::1 /home/user/repo
+	
+Cloning into 'tmp19'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 78 - clone ssh://::1/home/user/repo
+
+expecting success of 5601.79 'clone ssh://[::1]/home/user/repo': 
+	  test_clone_url ssh://[::1]/home/user/repo ::1 /home/user/repo
+	
+Cloning into 'tmp20'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 79 - clone ssh://[::1]/home/user/repo
+
+expecting success of 5601.80 'clone ssh://[::1]:/home/user/repo': 
+	  test_clone_url ssh://[::1]:/home/user/repo ::1 /home/user/repo
+	
+Cloning into 'tmp21'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 80 - clone ssh://[::1]:/home/user/repo
+
+expecting success of 5601.81 'clone ssh://user@::1/home/user/repo': 
+	  test_clone_url ssh://user@::1/home/user/repo user@::1 /home/user/repo
+	
+Cloning into 'tmp22'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 81 - clone ssh://user@::1/home/user/repo
+
+expecting success of 5601.82 'clone ssh://user@[::1]/home/user/repo': 
+	  test_clone_url ssh://user@[::1]/home/user/repo user@::1 /home/user/repo
+	
+Cloning into 'tmp23'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 82 - clone ssh://user@[::1]/home/user/repo
+
+expecting success of 5601.83 'clone ssh://user@[::1]:/home/user/repo': 
+	  test_clone_url ssh://user@[::1]:/home/user/repo user@::1 /home/user/repo
+	
+Cloning into 'tmp24'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 83 - clone ssh://user@[::1]:/home/user/repo
+
+expecting success of 5601.84 'clone ssh://[user@::1]/home/user/repo': 
+	  test_clone_url ssh://[user@::1]/home/user/repo user@::1 /home/user/repo
+	
+Cloning into 'tmp25'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 84 - clone ssh://[user@::1]/home/user/repo
+
+expecting success of 5601.85 'clone ssh://[user@::1]:/home/user/repo': 
+	  test_clone_url ssh://[user@::1]:/home/user/repo user@::1 /home/user/repo
+	
+Cloning into 'tmp26'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 85 - clone ssh://[user@::1]:/home/user/repo
+
+expecting success of 5601.86 'clone ssh://::1/~repo': 
+	  test_clone_url ssh://::1/~repo ::1 '~repo'
+	
+Cloning into 'tmp27'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 86 - clone ssh://::1/~repo
+
+expecting success of 5601.87 'clone ssh://[::1]/~repo': 
+	  test_clone_url ssh://[::1]/~repo ::1 '~repo'
+	
+Cloning into 'tmp28'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 87 - clone ssh://[::1]/~repo
+
+expecting success of 5601.88 'clone ssh://user@::1/~repo': 
+	  test_clone_url ssh://user@::1/~repo user@::1 '~repo'
+	
+Cloning into 'tmp29'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 88 - clone ssh://user@::1/~repo
+
+expecting success of 5601.89 'clone ssh://user@[::1]/~repo': 
+	  test_clone_url ssh://user@[::1]/~repo user@::1 '~repo'
+	
+Cloning into 'tmp30'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 89 - clone ssh://user@[::1]/~repo
+
+expecting success of 5601.90 'clone ssh://[user@::1]/~repo': 
+	  test_clone_url ssh://[user@::1]/~repo user@::1 '~repo'
+	
+Cloning into 'tmp31'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 90 - clone ssh://[user@::1]/~repo
+
+expecting success of 5601.91 'clone ssh://[::1]:22/home/user/repo': 
+	  test_clone_url ssh://[::1]:22/home/user/repo '-p 22' ::1 /home/user/repo
+	
+Cloning into 'tmp32'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 91 - clone ssh://[::1]:22/home/user/repo
+
+expecting success of 5601.92 'clone ssh://user@[::1]:22/home/user/repo': 
+	  test_clone_url ssh://user@[::1]:22/home/user/repo '-p 22' user@::1 /home/user/repo
+	
+Cloning into 'tmp33'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 92 - clone ssh://user@[::1]:22/home/user/repo
+
+expecting success of 5601.93 'clone ssh://[user@::1]:22/home/user/repo': 
+	  test_clone_url ssh://[user@::1]:22/home/user/repo '-p 22' user@::1 /home/user/repo
+	
+Cloning into 'tmp34'...
+fatal: '/home/user/repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 93 - clone ssh://[user@::1]:22/home/user/repo
+
+expecting success of 5601.94 'clone ssh://[::1]:22/~repo': 
+	  test_clone_url ssh://[::1]:22/~repo '-p 22' ::1 '~repo'
+	
+Cloning into 'tmp35'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 94 - clone ssh://[::1]:22/~repo
+
+expecting success of 5601.95 'clone ssh://user@[::1]:22/~repo': 
+	  test_clone_url ssh://user@[::1]:22/~repo '-p 22' user@::1 '~repo'
+	
+Cloning into 'tmp36'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 95 - clone ssh://user@[::1]:22/~repo
+
+expecting success of 5601.96 'clone ssh://[user@::1]:22/~repo': 
+	  test_clone_url ssh://[user@::1]:22/~repo '-p 22' user@::1 '~repo'
+	
+Cloning into 'tmp37'...
+fatal: '~repo' does not appear to be a git repository
+fatal: Could not read from remote repository.
+
+Please make sure you have the correct access rights
+and the repository exists.
+ok 96 - clone ssh://[user@::1]:22/~repo
+
+expecting success of 5601.97 'clone from a repository with two identical branches': 
+
+	(
+		cd src &&
+		git checkout -b another main
+	) &&
+	git clone src target-11 &&
+	test "z$( cd target-11 && git symbolic-ref HEAD )" = zrefs/heads/another
+
+
+Switched to a new branch 'another'
+Cloning into 'target-11'...
+done.
+ok 97 - clone from a repository with two identical branches
+
+expecting success of 5601.98 'shallow clone locally': 
+	git clone --depth=1 --no-local src ssrrcc &&
+	git clone ssrrcc ddsstt &&
+	test_cmp ssrrcc/.git/shallow ddsstt/.git/shallow &&
+	( cd ddsstt && git fsck )
+
+Cloning into 'ssrrcc'...
+Cloning into 'ddsstt'...
+ok 98 - shallow clone locally
+
+expecting success of 5601.99 'GIT_TRACE_PACKFILE produces a usable pack': 
+	rm -rf dst.git &&
+	GIT_TRACE_PACKFILE=$PWD/tmp.pack git clone --no-local --bare src dst.git &&
+	git init --bare replay.git &&
+	git -C replay.git index-pack -v --stdin <tmp.pack
+
+Cloning into bare repository 'dst.git'...
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/replay.git/
+Receiving objects:  16% (1/6)
Receiving objects:  33% (2/6)
Receiving objects:  50% (3/6)
Receiving objects:  66% (4/6)
Receiving objects:  83% (5/6)
Receiving objects: 100% (6/6)
Receiving objects: 100% (6/6), done.
+pack	f67ec21158687048e0e289c72917fdb6bffcc50d
+ok 99 - GIT_TRACE_PACKFILE produces a usable pack
+
+expecting success of 5601.100 'clone on case-insensitive fs': 
+	git init icasefs &&
+	(
+		cd icasefs &&
+		o=$(git hash-object -w --stdin </dev/null | hex2oct) &&
+		t=$(printf "100644 X\0${o}100644 x\0${o}" |
+			git hash-object -w -t tree --stdin) &&
+		c=$(git commit-tree -m bogus $t) &&
+		git update-ref refs/heads/bogus $c &&
+		git clone -b bogus . bogus 2>warning
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/icasefs/.git/
+ok 100 - clone on case-insensitive fs
+
+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 101 # skip colliding file detection (missing CASE_INSENSITIVE_FS)
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+ok 102 # skip colliding symlink/directory keeps directory (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
+
+expecting success of 5601.103 'clone with GIT_DEFAULT_HASH': 
+	(
+		sane_unset GIT_DEFAULT_HASH &&
+		git init --object-format=sha1 test-sha1 &&
+		git init --object-format=sha256 test-sha256
+	) &&
+	test_commit -C test-sha1 foo &&
+	test_commit -C test-sha256 foo &&
+	GIT_DEFAULT_HASH=sha1 git clone test-sha256 test-clone-sha256 &&
+	GIT_DEFAULT_HASH=sha256 git clone test-sha1 test-clone-sha1 &&
+	git -C test-clone-sha1 status &&
+	git -C test-clone-sha256 status
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/test-sha1/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/test-sha256/.git/
+[main (root-commit) 946e985] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[main (root-commit) ff872d8] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into 'test-clone-sha256'...
+done.
+Cloning into 'test-clone-sha1'...
+done.
+On branch main
+Your branch is up to date with 'origin/main'.
+
+nothing to commit, working tree clean
+On branch main
+Your branch is up to date with 'origin/main'.
+
+nothing to commit, working tree clean
+ok 103 - clone with GIT_DEFAULT_HASH
+
+expecting success of 5601.104 'partial clone': 
+	partial_clone server "file://$(pwd)/server"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/.git/
+[main (root-commit) af0b45c] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 9d84c42] Revert "one"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:16:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 one.t
+[main 3b7317f] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Cloning into 'client'...
+ok 104 - partial clone
+
+expecting success of 5601.105 'partial clone with -o': 
+	partial_clone_server server &&
+	git clone -o blah --filter=blob:limit=0 "file://$(pwd)/server" client &&
+	test_cmp_config -C client "blob:limit=0" --get-all remote.blah.partialclonefilter
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/.git/
+[main (root-commit) 26cc6ba] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main b29d30d] Revert "one"
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:18:13 2005 -0700
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 one.t
+[main dc14270] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Cloning into 'client'...
+ok 105 - partial clone with -o
+
+expecting success of 5601.106 'partial clone: warn if server does not support object filtering': 
+	rm -rf server client &&
+	test_create_repo server &&
+	test_commit -C server one &&
+
+	git clone --filter=blob:limit=0 "file://$(pwd)/server" client 2> err &&
+
+	test_grep "filtering not recognized by server" err
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/.git/
+[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
+ok 106 - partial clone: warn if server does not support object filtering
+
+expecting success of 5601.107 'batch missing blob request during checkout': 
+	rm -rf server client &&
+
+	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 aa >server/a &&
+	echo bb >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 --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure that there is only one negotiation by checking that there is
+	# only "done" line sent. ("done" marks the end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" \
+		GIT_TRACE2_EVENT="$(pwd)/trace2_event" \
+		git -C client -c trace2.eventNesting=5 checkout HEAD^ &&
+	grep \"key\":\"total_rounds\",\"value\":\"1\" trace2_event >trace_lines &&
+	test_line_count = 1 trace_lines &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/.git/
+[main (root-commit) 4824756] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+[main 145eb5d] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Cloning into 'client'...
+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 4824756 x
+ok 107 - batch missing blob request during checkout
+
+expecting success of 5601.108 'batch missing blob request does not inadvertently try to fetch gitlinks': 
+	rm -rf server client &&
+
+	test_create_repo repo_for_submodule &&
+	test_commit -C repo_for_submodule x &&
+
+	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 aa >server/a &&
+	echo bb >server/b &&
+	# Also add a gitlink pointing to an arbitrary repository
+	test_config_global protocol.file.allow always &&
+	git -C server submodule add "$(pwd)/repo_for_submodule" c &&
+	git -C server add a b c &&
+	git -C server commit -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+
+	# Make sure that it succeeds
+	git clone --filter=blob:limit=0 "file://$(pwd)/server" client
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/repo_for_submodule/.git/
+[main (root-commit) 1c117dc] x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 x.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/.git/
+[main (root-commit) afe4671] x
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a
+ create mode 100644 b
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/c'...
+done.
+[main 6980805] x
+ Author: A U Thor <author@example.com>
+ 4 files changed, 6 insertions(+), 2 deletions(-)
+ create mode 100644 .gitmodules
+ create mode 160000 c
+Cloning into 'client'...
+ok 108 - batch missing blob request does not inadvertently try to fetch gitlinks
+
+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 108 test(s)
+# SKIP no web server found at ''
+1..108
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5618-alternate-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5618-alternate-refs/.git/
+expecting success of 5618.1 'set up local refs': 
+	git checkout -b one &&
+	test_tick &&
+	git commit --allow-empty -m base &&
+	test_tick &&
+	git commit --allow-empty -m one &&
+	git checkout -b two HEAD^ &&
+	test_tick &&
+	git commit --allow-empty -m two
+
+Switched to a new branch 'one'
+[one (root-commit) 00f38a4] base
+ Author: A U Thor <author@example.com>
+[one eae7140] one
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'two'
+[two e9067a7] two
+ Author: A U Thor <author@example.com>
+ok 1 - set up local refs
+
+expecting success of 5618.2 'set up shared clone': 
+	git clone -s . child &&
+	cd child &&
+	git merge origin/one
+
+Cloning into 'child'...
+done.
+Merge made by the 'ort' strategy.
+ok 2 - set up shared clone
+
+expecting success of 5618.3 'rev-list --alternate-refs': 
+	git rev-list --remotes=origin >expect &&
+	git rev-list --alternate-refs >actual &&
+	test_cmp expect actual
+
+ok 3 - rev-list --alternate-refs
+
+expecting success of 5618.4 'rev-list --not --alternate-refs': 
+	git rev-parse HEAD >expect &&
+	git rev-list HEAD --not --alternate-refs >actual &&
+	test_cmp expect actual
+
+ok 4 - rev-list --not --alternate-refs
+
+expecting success of 5618.5 'limiting with alternateRefsPrefixes': 
+	test_config core.alternateRefsPrefixes refs/heads/one &&
+	git rev-list origin/one >expect &&
+	git rev-list --alternate-refs >actual &&
+	test_cmp expect actual
+
+ok 5 - limiting with alternateRefsPrefixes
+
+expecting success of 5618.6 'log --source shows .alternate marker': 
+	git log --oneline --source --remotes=origin >expect.orig &&
+	sed "s/origin.* /.alternate /" <expect.orig >expect &&
+	git log --oneline --source --alternate-refs >actual &&
+	test_cmp expect actual
+
+ok 6 - log --source shows .alternate marker
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5619-clone-local-ambiguous-transport.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5619-clone-local-ambiguous-transport/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5614-clone-submodules-shallow.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/.git/
+expecting success of 5614.1 'setup': 
+	git checkout -b main &&
+	test_commit commit1 &&
+	test_commit commit2 &&
+	mkdir sub &&
+	(
+		cd sub &&
+		git init &&
+		test_commit subcommit1 &&
+		test_commit subcommit2 &&
+		test_commit subcommit3
+	) &&
+	git submodule add "file://$pwd/sub" sub &&
+	git commit -m "add submodule"
+
+Switched to a new branch 'main'
+[main (root-commit) ef004cf] commit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit1.t
+[main 94955c5] commit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit2.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub/.git/
+[master (root-commit) 6a80c79] subcommit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subcommit1.t
+[master f6b6be8] subcommit2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subcommit2.t
+[master 5334747] subcommit3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subcommit3.t
+Adding existing repo at 'sub' to the index
+[main a3fdbc7] 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.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 2 - nonshallow clone implies nonshallow submodule
+
+expecting success of 5614.3 'shallow clone with shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --recurse-submodules --depth 2 --shallow-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 2 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 1 lines
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 3 - shallow clone with shallow submodule
+
+expecting success of 5614.4 'shallow clone does not imply shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --recurse-submodules --depth 2 "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 2 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 3 lines
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 4 - shallow clone does not imply shallow submodule
+
+expecting success of 5614.5 'shallow clone with non shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --recurse-submodules --depth 2 --no-shallow-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 2 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 3 lines
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 5 - shallow clone with non shallow submodule
+
+expecting success of 5614.6 'non shallow clone with shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --recurse-submodules --no-local --shallow-submodules "file://$pwd/." super_clone &&
+	git -C super_clone log --oneline >lines &&
+	test_line_count = 3 lines &&
+	git -C super_clone/sub log --oneline >lines &&
+	test_line_count = 1 lines
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 6 - non shallow clone with shallow submodule
+
+expecting success of 5614.7 'clone follows shallow recommendation': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git config -f .gitmodules submodule.sub.shallow true &&
+	git add .gitmodules &&
+	git commit -m "recommend shallow for sub" &&
+	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
+	(
+		cd super_clone &&
+		git log --oneline >lines &&
+		test_line_count = 4 lines
+	) &&
+	(
+		cd super_clone/sub &&
+		git log --oneline >lines &&
+		test_line_count = 1 lines
+	)
+
+[main e3fd3ec] 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.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 7 - clone follows shallow recommendation
+
+expecting success of 5614.8 'get unshallow recommended shallow submodule': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git clone --no-local "file://$pwd/." super_clone &&
+	(
+		cd super_clone &&
+		git submodule update --init --no-recommend-shallow &&
+		git log --oneline >lines &&
+		test_line_count = 4 lines
+	) &&
+	(
+		cd super_clone/sub &&
+		git log --oneline >lines &&
+		test_line_count = 3 lines
+	)
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 8 - get unshallow recommended shallow submodule
+
+expecting success of 5614.9 'clone follows non shallow recommendation': 
+	test_when_finished "rm -rf super_clone" &&
+	test_config_global protocol.file.allow always &&
+	git config -f .gitmodules submodule.sub.shallow false &&
+	git add .gitmodules &&
+	git commit -m "recommend non shallow for sub" &&
+	git clone --recurse-submodules --no-local "file://$pwd/." super_clone &&
+	(
+		cd super_clone &&
+		git log --oneline >lines &&
+		test_line_count = 5 lines
+	) &&
+	(
+		cd super_clone/sub &&
+		git log --oneline >lines &&
+		test_line_count = 3 lines
+	)
+
+[main 400fe1a] 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.45.2/t/trash directory.t5614-clone-submodules-shallow/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5614-clone-submodules-shallow/super_clone/sub'...
+Submodule path 'sub': checked out '53347473137b3c7bcd36cd24d83c719151112675'
+ok 9 - clone follows non shallow recommendation
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5617-clone-submodules-remote.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/.git/
+expecting success of 5617.1 'setup': 
+	git config --global protocol.file.allow always &&
+	git checkout -b main &&
+	test_commit commit1 &&
+	mkdir sub &&
+	(
+		cd sub &&
+		git init &&
+		test_commit subcommit1 &&
+		git tag sub_when_added_to_super &&
+		git branch other
+	) &&
+	git submodule add "file://$pwd/sub" sub &&
+	git commit -m "add submodule" &&
+	(
+		cd sub &&
+		test_commit subcommit2
+	)
+
+Switched to a new branch 'main'
+[main (root-commit) ef004cf] commit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 commit1.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub/.git/
+[main (root-commit) 5110c63] subcommit1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subcommit1.t
+Adding existing repo at 'sub' to the index
+[main 09e0522] 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.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 3 - clone with --no-remote-submodules
+
+expecting success of 5617.4 'clone with --remote-submodules': 
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone &&
+	(
+		cd super_clone/sub &&
+		git diff --exit-code remotes/origin/main
+	)
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+Submodule path 'sub': checked out 'c24f10ee4103ccdd16360092dcb618ad35ca1288'
+ok 4 - clone with --remote-submodules
+
+expecting success of 5617.5 'check the default is --no-remote-submodules': 
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules "file://$pwd/." super_clone &&
+	(
+		cd super_clone/sub &&
+		git diff --exit-code sub_when_added_to_super
+	)
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 5 - check the default is --no-remote-submodules
+
+expecting success of 5617.6 'clone with --single-branch': 
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
+	(
+		cd super_clone/sub &&
+		git rev-parse --verify origin/main &&
+		test_must_fail git rev-parse --verify origin/other
+	)
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+c24f10ee4103ccdd16360092dcb618ad35ca1288
+fatal: Needed a single revision
+ok 6 - clone with --single-branch
+
+expecting success of 5617.7 'clone with --filter': 
+	git clone --recurse-submodules \
+		--filter blob:none --also-filter-submodules \
+		"file://$pwd/srv.bare" super_clone &&
+	test_cmp_config -C super_clone true remote.origin.promisor &&
+	test_cmp_config -C super_clone blob:none remote.origin.partialclonefilter &&
+	test_cmp_config -C super_clone/sub true remote.origin.promisor &&
+	test_cmp_config -C super_clone/sub blob:none remote.origin.partialclonefilter
+
+Cloning into 'super_clone'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone/sub'...
+warning: filtering not recognized by server, ignoring
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 7 - clone with --filter
+
+expecting success of 5617.8 'filters applied with clone.filterSubmodules': 
+	test_config_global clone.filterSubmodules true &&
+	git clone --recurse-submodules --filter blob:none \
+		"file://$pwd/srv.bare" super_clone2 &&
+	test_cmp_config -C super_clone2 true remote.origin.promisor &&
+	test_cmp_config -C super_clone2 blob:none remote.origin.partialclonefilter &&
+	test_cmp_config -C super_clone2/sub true remote.origin.promisor &&
+	test_cmp_config -C super_clone2/sub blob:none remote.origin.partialclonefilter
+
+Cloning into 'super_clone2'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone2/sub'...
+warning: filtering not recognized by server, ignoring
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 8 - filters applied with clone.filterSubmodules
+
+expecting success of 5617.9 '--no-also-filter-submodules overrides clone.filterSubmodules=true': 
+	test_config_global clone.filterSubmodules true &&
+	git clone --recurse-submodules --filter blob:none \
+		--no-also-filter-submodules \
+		"file://$pwd/srv.bare" super_clone3 &&
+	test_cmp_config -C super_clone3 true remote.origin.promisor &&
+	test_cmp_config -C super_clone3 blob:none remote.origin.partialclonefilter &&
+	test_cmp_config -C super_clone3/sub false --default false remote.origin.promisor
+
+Cloning into 'super_clone3'...
+Submodule 'sub' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5617-clone-submodules-remote/super_clone3/sub'...
+Submodule path 'sub': checked out '5110c633865043debe00950928ed2147ea5b8714'
+ok 9 - --no-also-filter-submodules overrides clone.filterSubmodules=true
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5701-git-serve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 59 - clone c:temp is ssl
+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
 
-ok 60 # skip clone c:temp is dos drive (missing MINGW)
+fatal: unknown capability 'fetch'
+ok 7 - request command as capability
 
-expecting success of 5601.61 'clone host:rep': 
-		test_clone_url host:$repo host $repo
-	
-Cloning into 'tmp2'...
-fatal: 'rep' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 61 - clone host:rep
+fatal: invalid command 'ls-refs=whatever'
+ok 8 - requested command is command=value
 
-expecting success of 5601.62 'clone host:rep/home/project': 
-		test_clone_url host:$repo host $repo
-	
-Cloning into 'tmp3'...
-fatal: 'rep/home/project' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 62 - clone host:rep/home/project
+fatal: mismatched object format: server sha1; client sha256
+ok 9 - wrong object-format
 
-expecting success of 5601.63 'clone host:123': 
-		test_clone_url host:$repo host $repo
-	
-Cloning into 'tmp4'...
-fatal: '123' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 63 - clone host:123
+[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 5601.64 'clone [::1]:rep': 
-		test_clone_url [::1]:$repo ::1 "$repo"
-	
-Cloning into 'tmp5'...
-fatal: 'rep' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 64 - clone [::1]:rep
+	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
 
-expecting success of 5601.65 'clone [::1]:rep/home/project': 
-		test_clone_url [::1]:$repo ::1 "$repo"
-	
-Cloning into 'tmp6'...
-fatal: 'rep/home/project' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 65 - clone [::1]:rep/home/project
+ok 11 - basics of ls-refs
 
-expecting success of 5601.66 'clone [::1]:123': 
-		test_clone_url [::1]:$repo ::1 "$repo"
-	
-Cloning into 'tmp7'...
-fatal: '123' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 66 - clone [::1]:123
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	grep unexpected.line.*no-such-arg err
 
-expecting success of 5601.67 'clone host:/~repo': 
-	test_clone_url host:/~repo host "~repo"
+fatal: unexpected line: 'no-such-arg'
+ok 12 - ls-refs complains about unknown options
 
-Cloning into 'tmp8'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 67 - clone host:/~repo
+	cat >expect <<-EOF &&
+	$(git rev-parse refs/heads/main) refs/heads/main
+	$(git rev-parse refs/tags/one) refs/tags/one
+	0000
+	EOF
 
-expecting success of 5601.68 'clone [::1]:/~repo': 
-	test_clone_url [::1]:/~repo ::1 "~repo"
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
 
-Cloning into 'tmp9'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+ok 13 - basic ref-prefixes
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 68 - clone [::1]:/~repo
+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
 
-expecting success of 5601.69 'clone foo/bar:baz is not ssh': 
-		test_clone_url $url none
-	
-Cloning into 'tmp10'...
-fatal: 'foo/bar:baz' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 69 - clone foo/bar:baz is not ssh
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
 
-expecting success of 5601.70 'clone [foo]bar/baz:qux is not ssh': 
-		test_clone_url $url none
-	
-Cloning into 'tmp11'...
-fatal: ']bar/baz:qux' does not appear to be a git repository
-fatal: Could not read from remote repository.
+ok 14 - refs/heads prefix
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 70 - clone [foo]bar/baz:qux is not ssh
+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 &&
 
-expecting success of 5601.71 'clone [foo/bar]:baz is not ssh': 
-		test_clone_url $url none
-	
-Cloning into 'tmp12'...
-fatal: ']:baz' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	# 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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 71 - clone [foo/bar]:baz is not ssh
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
 
-expecting success of 5601.72 'clone ssh://host.xz/home/user/repo': 
-		test_clone_url "ssh://host.xz$tcol/home/user/repo" host.xz /home/user/repo
-	
-Cloning into 'tmp13'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+ok 15 - ignore very large set of prefixes
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 72 - clone ssh://host.xz/home/user/repo
+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
 
-expecting success of 5601.73 'clone ssh://host.xz/~repo': 
-	test_clone_url "ssh://host.xz$tcol/~repo" host.xz "~repo"
+	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
 
-Cloning into 'tmp14'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 73 - clone ssh://host.xz/~repo
+ok 16 - peel parameter
 
-expecting success of 5601.74 'clone ssh://host.xz:/home/user/repo': 
-		test_clone_url "ssh://host.xz$tcol/home/user/repo" host.xz /home/user/repo
-	
-Cloning into 'tmp15'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 74 - clone ssh://host.xz:/home/user/repo
+	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
 
-expecting success of 5601.75 'clone ssh://host.xz:/~repo': 
-	test_clone_url "ssh://host.xz$tcol/~repo" host.xz "~repo"
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
 
-Cloning into 'tmp16'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+ok 17 - symrefs parameter
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 75 - clone ssh://host.xz:/~repo
+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
 
-expecting success of 5601.76 'clone ssh://host.xz:22/home/user/repo': 
-	test_clone_url "ssh://host.xz:22/home/user/repo" "-p 22 host.xz" "/home/user/repo"
+	cat >expect <<-EOF &&
+	$(git rev-parse HEAD) HEAD
+	0000
+	EOF
 
-Cloning into 'tmp17'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 76 - clone ssh://host.xz:22/home/user/repo
+ok 18 - sending server-options
 
-expecting success of 5601.77 'clone ssh://host.xz:22/~repo': 
-	test_clone_url "ssh://host.xz:22/~repo" "-p 22 host.xz" "~repo"
+expecting success of 5701.19 'unexpected lines are not allowed in fetch request': 
+	git init server &&
 
-Cloning into 'tmp18'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	test-tool pkt-line pack >in <<-EOF &&
+	command=fetch
+	object-format=$(test_oid algo)
+	0001
+	this-is-not-a-command
+	0000
+	EOF
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 77 - clone ssh://host.xz:22/~repo
+	(
+		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
 
-expecting success of 5601.78 'clone ssh://::1/home/user/repo': 
-	  test_clone_url ssh://::1/home/user/repo ::1 /home/user/repo
-	
-Cloning into 'tmp19'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 78 - clone ssh://::1/home/user/repo
+expecting success of 5701.20 'basics of object-info': 
+	test_config transfer.advertiseObjectInfo true &&
 
-expecting success of 5601.79 'clone ssh://[::1]/home/user/repo': 
-	  test_clone_url ssh://[::1]/home/user/repo ::1 /home/user/repo
-	
-Cloning into 'tmp20'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 79 - clone ssh://[::1]/home/user/repo
+	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
 
-expecting success of 5601.80 'clone ssh://[::1]:/home/user/repo': 
-	  test_clone_url ssh://[::1]:/home/user/repo ::1 /home/user/repo
-	
-Cloning into 'tmp21'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 80 - clone ssh://[::1]:/home/user/repo
+ok 20 - basics of object-info
 
-expecting success of 5601.81 'clone ssh://user@::1/home/user/repo': 
-	  test_clone_url ssh://user@::1/home/user/repo user@::1 /home/user/repo
-	
-Cloning into 'tmp22'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+expecting success of 5701.21 'test capability advertisement with uploadpack.advertiseBundleURIs': 
+	test_config uploadpack.advertiseBundleURIs true &&
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 81 - clone ssh://user@::1/home/user/repo
+	cat >expect.extra <<-EOF &&
+	bundle-uri
+	EOF
+	cat expect.base \
+	    expect.extra \
+	    expect.trailer >expect &&
 
-expecting success of 5601.82 'clone ssh://user@[::1]/home/user/repo': 
-	  test_clone_url ssh://user@[::1]/home/user/repo user@::1 /home/user/repo
-	
-Cloning into 'tmp23'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
+		--advertise-capabilities >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 82 - clone ssh://user@[::1]/home/user/repo
+ok 21 - test capability advertisement with uploadpack.advertiseBundleURIs
 
-expecting success of 5601.83 'clone ssh://user@[::1]:/home/user/repo': 
-	  test_clone_url ssh://user@[::1]:/home/user/repo user@::1 /home/user/repo
-	
-Cloning into 'tmp24'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 83 - clone ssh://user@[::1]:/home/user/repo
+	cat >err.expect <<-\EOF &&
+	fatal: invalid command 'bundle-uri'
+	EOF
 
-expecting success of 5601.84 'clone ssh://[user@::1]/home/user/repo': 
-	  test_clone_url ssh://[user@::1]/home/user/repo user@::1 /home/user/repo
-	
-Cloning into 'tmp25'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	cat >expect <<-\EOF &&
+	ERR serve: invalid command 'bundle-uri'
+	EOF
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 84 - clone ssh://[user@::1]/home/user/repo
+	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
 
-expecting success of 5601.85 'clone ssh://[user@::1]:/home/user/repo': 
-	  test_clone_url ssh://[user@::1]:/home/user/repo user@::1 /home/user/repo
-	
-Cloning into 'tmp26'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+ok 22 - basics of bundle-uri: dies if not enabled
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 85 - clone ssh://[user@::1]:/home/user/repo
+expecting success of 5701.23 'object-info missing from capabilities when disabled': 
+	test_config transfer.advertiseObjectInfo false &&
 
-expecting success of 5601.86 'clone ssh://::1/~repo': 
-	  test_clone_url ssh://::1/~repo ::1 '~repo'
-	
-Cloning into 'tmp27'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	GIT_TEST_SIDEBAND_ALL=0 test-tool serve-v2 \
+		--advertise-capabilities >out &&
+	test-tool pkt-line unpack <out >actual &&
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 86 - clone ssh://::1/~repo
+	! grep object.info actual
 
-expecting success of 5601.87 'clone ssh://[::1]/~repo': 
-	  test_clone_url ssh://[::1]/~repo ::1 '~repo'
-	
-Cloning into 'tmp28'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+ok 23 - object-info missing from capabilities when disabled
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 87 - clone ssh://[::1]/~repo
+expecting success of 5701.24 'object-info commands rejected when disabled': 
+	test_config transfer.advertiseObjectInfo false &&
 
-expecting success of 5601.88 'clone ssh://user@::1/~repo': 
-	  test_clone_url ssh://user@::1/~repo user@::1 '~repo'
-	
-Cloning into 'tmp29'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	test-tool pkt-line pack >in <<-EOF &&
+	command=object-info
+	EOF
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 88 - clone ssh://user@::1/~repo
+	test_must_fail test-tool serve-v2 --stateless-rpc <in 2>err &&
+	grep invalid.command err
 
-expecting success of 5601.89 'clone ssh://user@[::1]/~repo': 
-	  test_clone_url ssh://user@[::1]/~repo user@::1 '~repo'
-	
-Cloning into 'tmp30'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+fatal: invalid command 'object-info'
+ok 24 - object-info commands rejected when disabled
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 89 - clone ssh://user@[::1]/~repo
+# passed all 24 test(s)
+1..24
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5700-protocol-v1.sh ***
+checking prerequisite: PIPE
 
-expecting success of 5601.90 'clone ssh://[user@::1]/~repo': 
-	  test_clone_url ssh://[user@::1]/~repo user@::1 '~repo'
-	
-Cloning into 'tmp31'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 90 - clone ssh://[user@::1]/~repo
+)
+prerequisite PIPE ok
+Starting git daemon ...
+[21200] Ready to rumble
+expecting success of 5700.1 'create repo to be served by git-daemon': 
+	git init "$daemon_parent" &&
+	test_commit -C "$daemon_parent" one
 
-expecting success of 5601.91 'clone ssh://[::1]:22/home/user/repo': 
-	  test_clone_url ssh://[::1]:22/home/user/repo '-p 22' ::1 /home/user/repo
-	
-Cloning into 'tmp32'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 91 - clone ssh://[::1]:22/home/user/repo
+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 &&
 
-expecting success of 5601.92 'clone ssh://user@[::1]:22/home/user/repo': 
-	  test_clone_url ssh://user@[::1]:22/home/user/repo '-p 22' user@::1 /home/user/repo
-	
-Cloning into 'tmp33'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 92 - clone ssh://user@[::1]:22/home/user/repo
+	# Client requested to use protocol v1
+	grep "clone> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "clone< version 1" log
 
-expecting success of 5601.93 'clone ssh://[user@::1]:22/home/user/repo': 
-	  test_clone_url ssh://[user@::1]:22/home/user/repo '-p 22' user@::1 /home/user/repo
-	
-Cloning into 'tmp34'...
-fatal: '/home/user/repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+[21443] Connection from 127.0.0.1:40696
+[21443] Extended attribute "host": 127.0.0.1:5700
+[21443] Extended attribute "protocol": version=1
+[21443] Request upload-pack for '/parent'
+[21200] [21443] 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
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 93 - clone ssh://[user@::1]:22/home/user/repo
+expecting success of 5700.3 'fetch with git:// using protocol v1': 
+	test_commit -C "$daemon_parent" two &&
 
-expecting success of 5601.94 'clone ssh://[::1]:22/~repo': 
-	  test_clone_url ssh://[::1]:22/~repo '-p 22' ::1 '~repo'
-	
-Cloning into 'tmp35'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+		fetch 2>log &&
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 94 - clone ssh://[::1]:22/~repo
+	git -C daemon_child log -1 --format=%s origin/main >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-expecting success of 5601.95 'clone ssh://user@[::1]:22/~repo': 
-	  test_clone_url ssh://user@[::1]:22/~repo '-p 22' user@::1 '~repo'
-	
-Cloning into 'tmp36'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+	# Client requested to use protocol v1
+	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 95 - clone ssh://user@[::1]:22/~repo
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[21923] Connection from 127.0.0.1:34920
+[21923] Extended attribute "host": 127.0.0.1:5700
+[21923] Extended attribute "protocol": version=1
+[21923] Request upload-pack for '/parent'
+[21200] [21923] 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 5601.96 'clone ssh://[user@::1]:22/~repo': 
-	  test_clone_url ssh://[user@::1]:22/~repo '-p 22' user@::1 '~repo'
-	
-Cloning into 'tmp37'...
-fatal: '~repo' does not appear to be a git repository
-fatal: Could not read from remote repository.
+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 &&
 
-Please make sure you have the correct access rights
-and the repository exists.
-ok 96 - clone ssh://[user@::1]:22/~repo
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-expecting success of 5601.97 'clone from a repository with two identical branches': 
+	# Client requested to use protocol v1
+	grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
 
-	(
-		cd src &&
-		git checkout -b another main
-	) &&
-	git clone src target-11 &&
-	test "z$( cd target-11 && git symbolic-ref HEAD )" = zrefs/heads/another
+[22043] Connection from 127.0.0.1:34934
+[22043] Extended attribute "host": 127.0.0.1:5700
+[22043] Extended attribute "protocol": version=1
+[22043] Request upload-pack for '/parent'
+[21200] [22043] 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 &&
 
-Switched to a new branch 'another'
-Cloning into 'target-11'...
-done.
-ok 97 - clone from a repository with two identical branches
+	# 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 &&
 
-expecting success of 5601.98 'shallow clone locally': 
-	git clone --depth=1 --no-local src ssrrcc &&
-	git clone ssrrcc ddsstt &&
-	test_cmp ssrrcc/.git/shallow ddsstt/.git/shallow &&
-	( cd ddsstt && git fsck )
+	git -C daemon_child log -1 --format=%s >actual &&
+	git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
+	test_cmp expect actual &&
 
-Cloning into 'ssrrcc'...
-Cloning into 'ddsstt'...
-ok 98 - shallow clone locally
+	# Client requested to use protocol v1
+	grep "push> .*\\\0\\\0version=1\\\0$" log &&
+	# Server responded using protocol v1
+	grep "push< version 1" log
 
-expecting success of 5601.99 'GIT_TRACE_PACKFILE produces a usable pack': 
-	rm -rf dst.git &&
-	GIT_TRACE_PACKFILE=$PWD/tmp.pack git clone --no-local --bare src dst.git &&
-	git init --bare replay.git &&
-	git -C replay.git index-pack -v --stdin <tmp.pack
+[main 7c7cd71] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[22195] Connection from 127.0.0.1:34938
+[22195] Extended attribute "host": 127.0.0.1:5700
+[22195] Extended attribute "protocol": version=1
+[22195] Request receive-pack for '/parent'
+[21200] [22195] 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
 
-Cloning into bare repository 'dst.git'...
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/replay.git/
-Receiving objects:  16% (1/6)
Receiving objects:  33% (2/6)
Receiving objects:  50% (3/6)
Receiving objects:  66% (4/6)
Receiving objects:  83% (5/6)
Receiving objects: 100% (6/6)
Receiving objects: 100% (6/6), done.
-pack	f67ec21158687048e0e289c72917fdb6bffcc50d
-ok 99 - GIT_TRACE_PACKFILE produces a usable pack
+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
 
-expecting success of 5601.100 'clone on case-insensitive fs': 
-	git init icasefs &&
-	(
-		cd icasefs &&
-		o=$(git hash-object -w --stdin </dev/null | hex2oct) &&
-		t=$(printf "100644 X\0${o}100644 x\0${o}" |
-			git hash-object -w -t tree --stdin) &&
-		c=$(git commit-tree -m bogus $t) &&
-		git update-ref refs/heads/bogus $c &&
-		git clone -b bogus . bogus 2>warning
-	)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/icasefs/.git/
-ok 100 - clone on case-insensitive fs
+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 &&
 
-checking prerequisite: CASE_INSENSITIVE_FS
+	git -C file_child log -1 --format=%s >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect 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
+	# Server responded using protocol v1
+	grep "clone< version 1" log
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 101 # skip colliding file detection (missing CASE_INSENSITIVE_FS)
+packet:        clone< version 1
+ok 7 - clone with file:// using protocol v1
 
-checking prerequisite: SYMLINKS
+expecting success of 5700.8 'fetch with file:// using protocol v1': 
+	test_commit -C file_parent two &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-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_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+		fetch 2>log &&
 
-)
-prerequisite SYMLINKS ok
-ok 102 # skip colliding symlink/directory keeps directory (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
+	git -C file_child log -1 --format=%s origin/main >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-expecting success of 5601.103 'clone with GIT_DEFAULT_HASH': 
-	(
-		sane_unset GIT_DEFAULT_HASH &&
-		git init --object-format=sha1 test-sha1 &&
-		git init --object-format=sha256 test-sha256
-	) &&
-	test_commit -C test-sha1 foo &&
-	test_commit -C test-sha256 foo &&
-	GIT_DEFAULT_HASH=sha1 git clone test-sha256 test-clone-sha256 &&
-	GIT_DEFAULT_HASH=sha256 git clone test-sha1 test-clone-sha1 &&
-	git -C test-clone-sha1 status &&
-	git -C test-clone-sha256 status
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/test-sha1/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/test-sha256/.git/
-[main (root-commit) 946e985] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[main (root-commit) ff872d8] foo
+[main 1dd7f79] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into 'test-clone-sha256'...
-done.
-Cloning into 'test-clone-sha1'...
-done.
-On branch main
-Your branch is up to date with 'origin/main'.
+ create mode 100644 two.t
+packet:        fetch< version 1
+ok 8 - fetch with file:// using protocol v1
 
-nothing to commit, working tree clean
-On branch main
-Your branch is up to date with 'origin/main'.
+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 &&
 
-nothing to commit, working tree clean
-ok 103 - clone with GIT_DEFAULT_HASH
+	git -C file_child log -1 --format=%s >actual &&
+	git -C file_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-expecting success of 5601.104 'partial clone': 
-	partial_clone server "file://$(pwd)/server"
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/.git/
-[main (root-commit) af0b45c] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[main 9d84c42] Revert "one"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:16:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 one.t
-[main 3b7317f] two
- Author: A U Thor <author@example.com>
+Updating af0b45c..1dd7f79
+Fast-forward
+ two.t | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-Cloning into 'client'...
-ok 104 - partial clone
+packet:        fetch< version 1
+ok 9 - pull with file:// using protocol v1
 
-expecting success of 5601.105 'partial clone with -o': 
-	partial_clone_server server &&
-	git clone -o blah --filter=blob:limit=0 "file://$(pwd)/server" client &&
-	test_cmp_config -C client "blob:limit=0" --get-all remote.blah.partialclonefilter
+expecting success of 5700.10 'push with file:// using protocol v1': 
+	test_commit -C file_child three &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/.git/
-[main (root-commit) 26cc6ba] one
+	# 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 one.t
-[main b29d30d] Revert "one"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:18:13 2005 -0700
- 1 file changed, 1 deletion(-)
- delete mode 100644 one.t
-[main dc14270] two
+ 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.45.2/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 two.t
+ create mode 100644 foo.txt
+HEAD is now at 271cf0d message
+Deleted branch main (was 271cf0d).
 Cloning into 'client'...
-ok 105 - partial clone with -o
+warning: You appear to have cloned an empty repository.
+ok 11 - cloning branchless tagless but not refless remote
 
-expecting success of 5601.106 'partial clone: warn if server does not support object filtering': 
-	rm -rf server client &&
-	test_create_repo server &&
-	test_commit -C server one &&
+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
 
-	git clone --filter=blob:limit=0 "file://$(pwd)/server" client 2> err &&
+ok 12 - setup ssh wrapper
 
-	test_grep "filtering not recognized by server" err
+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.45.2/t/trash directory.t5601-clone/server/.git/
-[main (root-commit) d944c64] one
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-warning: filtering not recognized by server, ignoring
-ok 106 - partial clone: warn if server does not support object filtering
+ok 13 - create repo to be served by ssh:// transport
 
-expecting success of 5601.107 'batch missing blob request during checkout': 
-	rm -rf server client &&
+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 &&
 
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
+	git -C ssh_child log -1 --format=%s >actual &&
+	git -C ssh_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-	git -C server commit -m x &&
-	echo aa >server/a &&
-	echo bb >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
+	# Server responded using protocol v1
+	grep "clone< version 1" log
 
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
+packet:        clone< version 1
+ok 14 - clone with ssh:// using protocol v1
 
-	git clone --filter=blob:limit=0 "file://$(pwd)/server" client &&
+expecting success of 5700.15 'fetch with ssh:// using protocol v1': 
+	test_commit -C ssh_parent two &&
 
-	# Ensure that there is only one negotiation by checking that there is
-	# only "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" \
-		GIT_TRACE2_EVENT="$(pwd)/trace2_event" \
-		git -C client -c trace2.eventNesting=5 checkout HEAD^ &&
-	grep \"key\":\"total_rounds\",\"value\":\"1\" trace2_event >trace_lines &&
-	test_line_count = 1 trace_lines &&
-	grep "fetch> done" trace >done_lines &&
-	test_line_count = 1 done_lines
+	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+		fetch 2>log &&
+	expect_ssh git-upload-pack &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/.git/
-[main (root-commit) 4824756] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-[main 145eb5d] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
-Cloning into 'client'...
-Note: switching to 'HEAD^'.
+	git -C ssh_child log -1 --format=%s origin/main >actual &&
+	git -C ssh_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+[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
 
-  git switch -c <new-branch-name>
+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 &&
 
-Or undo this operation with:
+	git -C ssh_child log -1 --format=%s >actual &&
+	git -C ssh_parent log -1 --format=%s >expect &&
+	test_cmp expect actual &&
 
-  git switch -
+	# Server responded using protocol v1
+	grep "fetch< version 1" log
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 4824756 x
-ok 107 - batch missing blob request during checkout
+expecting success of 5700.17 'push with ssh:// using protocol v1': 
+	test_commit -C ssh_child three &&
 
-expecting success of 5601.108 'batch missing blob request does not inadvertently try to fetch gitlinks': 
-	rm -rf server client &&
+	# 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 &&
 
-	test_create_repo repo_for_submodule &&
-	test_commit -C repo_for_submodule x &&
+	git -C ssh_child log -1 --format=%s >actual &&
+	git -C ssh_parent log -1 --format=%s client_branch >expect &&
+	test_cmp expect actual &&
 
-	test_create_repo server &&
-	echo a >server/a &&
-	echo b >server/b &&
-	git -C server add a b &&
-	git -C server commit -m x &&
+	# Server responded using protocol v1
+	grep "push< version 1" log
 
-	echo aa >server/a &&
-	echo bb >server/b &&
-	# Also add a gitlink pointing to an arbitrary repository
-	test_config_global protocol.file.allow always &&
-	git -C server submodule add "$(pwd)/repo_for_submodule" c &&
-	git -C server add a b c &&
-	git -C server commit -m x &&
+[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
 
-	test_config -C server uploadpack.allowfilter 1 &&
-	test_config -C server uploadpack.allowanysha1inwant 1 &&
+expecting success of 5700.18 'clone propagates object-format from empty repo': 
+	test_when_finished "rm -fr src256 dst256" &&
 
-	# Make sure that it succeeds
-	git clone --filter=blob:limit=0 "file://$(pwd)/server" client
+	echo sha256 >expect &&
+	git init --object-format=sha256 src256 &&
+	git clone --no-local src256 dst256 &&
+	git -C dst256 rev-parse --show-object-format >actual &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/repo_for_submodule/.git/
-[main (root-commit) 1c117dc] x
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 x.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/.git/
-[main (root-commit) afe4671] x
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a
- create mode 100644 b
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5601-clone/server/c'...
-done.
-[main 6980805] x
- Author: A U Thor <author@example.com>
- 4 files changed, 6 insertions(+), 2 deletions(-)
- create mode 100644 .gitmodules
- create mode 160000 c
-Cloning into 'client'...
-ok 108 - batch missing blob request does not inadvertently try to fetch gitlinks
+	test_cmp expect actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
@@ -372380,9 +371775,9 @@
 
 )
 prerequisite NOT_ROOT ok
-# passed all 108 test(s)
+# passed all 18 test(s)
 # SKIP no web server found at ''
-1..108
+1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5704-protocol-violations.sh ***
@@ -372453,203 +371848,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5703-upload-pack-ref-in-want.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5703-upload-pack-ref-in-want/.git/
 expecting success of 5703.1 'setup repository': 
@@ -372914,7 +372112,7 @@
  * [new ref]         2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5 -> actual
  * [new tag]         d                                        -> d
  * [new tag]         b                                        -> b
-{"event":"data","sid":"20251218T013731.716626Z-Hfbad846e-P0000099f","thread":"main","time":"2025-12-18T01:37:31.730244Z","file":"fetch-pack.c","line":1757,"repo":1,"t_abs":0.013871,"t_rel":0.001903,"nesting":2,"category":"negotiation_v2","key":"total_rounds","value":"2"}
+{"event":"data","sid":"20241114T193914.594888Z-H5c947e1c-P00006330","thread":"main","time":"2024-11-14T19:39:14.623694Z","file":"fetch-pack.c","line":1757,"repo":1,"t_abs":0.029037,"t_rel":0.001745,"nesting":2,"category":"negotiation_v2","key":"total_rounds","value":"2"}
 packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
 packet:  upload-pack< want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
 packet:        fetch> want 2aa4ae04c2fc08d42ad2326101f5d3ee489ee8f5
@@ -373218,20 +372416,6 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5705-session-id-in-capabilities.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/.git/
 expecting success of 5705.1 'setup repos for session ID capability tests': 
@@ -373394,8 +372578,8 @@
 From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20251218T013732.477273Z-Hfbad846e-P00000d85","thread":"main","time":"2025-12-18T01:37:32.485954Z","file":"transport.c","line":349,"t_abs":0.008869,"t_rel":0.007600,"nesting":2,"category":"transfer","key":"server-sid","value":"20251218T013732.477273Z-Hfbad846e-P00000d85/20251218T013732.484814Z-Hfbad846e-P00000d92"}
-{"event":"data","sid":"20251218T013732.477273Z-Hfbad846e-P00000d85/20251218T013732.484814Z-Hfbad846e-P00000d92","thread":"main","time":"2025-12-18T01:37:32.494775Z","file":"upload-pack.c","line":1150,"t_abs":0.010169,"t_rel":0.010169,"nesting":1,"category":"transfer","key":"client-sid","value":"20251218T013732.477273Z-Hfbad846e-P00000d85"}
+{"event":"data","sid":"20241114T193916.366617Z-H5c947e1c-P00006849","thread":"main","time":"2024-11-14T19:39:16.377691Z","file":"transport.c","line":349,"t_abs":0.011193,"t_rel":0.010264,"nesting":2,"category":"transfer","key":"server-sid","value":"20241114T193916.366617Z-H5c947e1c-P00006849/20241114T193916.376866Z-H5c947e1c-P0000684b"}
+{"event":"data","sid":"20241114T193916.366617Z-H5c947e1c-P00006849/20241114T193916.376866Z-H5c947e1c-P0000684b","thread":"main","time":"2024-11-14T19:39:16.378096Z","file":"upload-pack.c","line":1150,"t_abs":0.001356,"t_rel":0.001356,"nesting":1,"category":"transfer","key":"client-sid","value":"20241114T193916.366617Z-H5c947e1c-P00006849"}
 ok 9 - session IDs advertised (fetch v0)
 
 expecting success of 5705.10 'session IDs advertised (push v0)': 
@@ -373420,8 +372604,8 @@
  create mode 100644 b.t
 To file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
  * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20251218T013732.676017Z-Hfbad846e-P00000e7a","thread":"main","time":"2025-12-18T01:37:32.695095Z","file":"transport.c","line":349,"t_abs":0.019258,"t_rel":0.018130,"nesting":3,"category":"transfer","key":"server-sid","value":"20251218T013732.676017Z-Hfbad846e-P00000e7a/20251218T013732.690132Z-Hfbad846e-P00000e94"}
-{"event":"data","sid":"20251218T013732.676017Z-Hfbad846e-P00000e7a/20251218T013732.690132Z-Hfbad846e-P00000e94","thread":"main","time":"2025-12-18T01:37:32.695526Z","file":"builtin/receive-pack.c","line":2112,"t_abs":0.005559,"t_rel":0.005559,"nesting":1,"category":"transfer","key":"client-sid","value":"20251218T013732.676017Z-Hfbad846e-P00000e7a"}
+{"event":"data","sid":"20241114T193916.638857Z-H5c947e1c-P00006954","thread":"main","time":"2024-11-14T19:39:16.659227Z","file":"transport.c","line":349,"t_abs":0.020529,"t_rel":0.019526,"nesting":3,"category":"transfer","key":"server-sid","value":"20241114T193916.638857Z-H5c947e1c-P00006954/20241114T193916.658288Z-H5c947e1c-P00006958"}
+{"event":"data","sid":"20241114T193916.638857Z-H5c947e1c-P00006954/20241114T193916.658288Z-H5c947e1c-P00006958","thread":"main","time":"2024-11-14T19:39:16.659732Z","file":"builtin/receive-pack.c","line":2112,"t_abs":0.001666,"t_rel":0.001666,"nesting":1,"category":"transfer","key":"client-sid","value":"20241114T193916.638857Z-H5c947e1c-P00006954"}
 To file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
  - [deleted]         new-branch
 ok 10 - session IDs advertised (push v0)
@@ -373439,8 +372623,8 @@
 From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20251218T013732.781481Z-Hfbad846e-P00000f0a","thread":"main","time":"2025-12-18T01:37:32.794992Z","file":"connect.c","line":175,"t_abs":0.013701,"t_rel":0.008534,"nesting":2,"category":"transfer","key":"negotiated-version","value":"0"}
-{"event":"data","sid":"20251218T013732.781481Z-Hfbad846e-P00000f0a/20251218T013732.793355Z-Hfbad846e-P00000f16","thread":"main","time":"2025-12-18T01:37:32.794068Z","file":"protocol.c","line":78,"t_abs":0.000959,"t_rel":0.000959,"nesting":1,"category":"transfer","key":"negotiated-version","value":"0"}
+{"event":"data","sid":"20241114T193916.762761Z-H5c947e1c-P000069c4","thread":"main","time":"2024-11-14T19:39:16.770848Z","file":"connect.c","line":175,"t_abs":0.008326,"t_rel":0.006740,"nesting":2,"category":"transfer","key":"negotiated-version","value":"0"}
+{"event":"data","sid":"20241114T193916.762761Z-H5c947e1c-P000069c4/20241114T193916.769958Z-H5c947e1c-P000069c6","thread":"main","time":"2024-11-14T19:39:16.770441Z","file":"protocol.c","line":78,"t_abs":0.000711,"t_rel":0.000711,"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)': 
@@ -373456,8 +372640,8 @@
 From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20251218T013732.895905Z-Hfbad846e-P00000f7d","thread":"main","time":"2025-12-18T01:37:32.906821Z","file":"transport.c","line":349,"t_abs":0.011140,"t_rel":0.009741,"nesting":2,"category":"transfer","key":"server-sid","value":"20251218T013732.895905Z-Hfbad846e-P00000f7d/20251218T013732.905263Z-Hfbad846e-P00000f88"}
-{"event":"data","sid":"20251218T013732.895905Z-Hfbad846e-P00000f7d/20251218T013732.905263Z-Hfbad846e-P00000f88","thread":"main","time":"2025-12-18T01:37:32.910774Z","file":"upload-pack.c","line":1150,"t_abs":0.005745,"t_rel":0.005745,"nesting":1,"category":"transfer","key":"client-sid","value":"20251218T013732.895905Z-Hfbad846e-P00000f7d"}
+{"event":"data","sid":"20241114T193916.963082Z-H5c947e1c-P00006a15","thread":"main","time":"2024-11-14T19:39:16.985567Z","file":"transport.c","line":349,"t_abs":0.022618,"t_rel":0.021538,"nesting":2,"category":"transfer","key":"server-sid","value":"20241114T193916.963082Z-H5c947e1c-P00006a15/20241114T193916.980176Z-H5c947e1c-P00006a1d"}
+{"event":"data","sid":"20241114T193916.963082Z-H5c947e1c-P00006a15/20241114T193916.980176Z-H5c947e1c-P00006a1d","thread":"main","time":"2024-11-14T19:39:16.989087Z","file":"upload-pack.c","line":1150,"t_abs":0.009238,"t_rel":0.009238,"nesting":1,"category":"transfer","key":"client-sid","value":"20241114T193916.963082Z-H5c947e1c-P00006a15"}
 ok 12 - session IDs advertised (fetch v1)
 
 expecting success of 5705.13 'session IDs advertised (push v1)': 
@@ -373482,8 +372666,8 @@
  create mode 100644 b.t
 To file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
  * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20251218T013733.034307Z-Hfbad846e-P00001036","thread":"main","time":"2025-12-18T01:37:33.044221Z","file":"transport.c","line":349,"t_abs":0.010162,"t_rel":0.008840,"nesting":3,"category":"transfer","key":"server-sid","value":"20251218T013733.034307Z-Hfbad846e-P00001036/20251218T013733.039155Z-Hfbad846e-P0000103a"}
-{"event":"data","sid":"20251218T013733.034307Z-Hfbad846e-P00001036/20251218T013733.039155Z-Hfbad846e-P0000103a","thread":"main","time":"2025-12-18T01:37:33.049047Z","file":"builtin/receive-pack.c","line":2112,"t_abs":0.010078,"t_rel":0.010078,"nesting":1,"category":"transfer","key":"client-sid","value":"20251218T013733.034307Z-Hfbad846e-P00001036"}
+{"event":"data","sid":"20241114T193917.270203Z-H5c947e1c-P00006abd","thread":"main","time":"2024-11-14T19:39:17.276771Z","file":"transport.c","line":349,"t_abs":0.006767,"t_rel":0.005790,"nesting":3,"category":"transfer","key":"server-sid","value":"20241114T193917.270203Z-H5c947e1c-P00006abd/20241114T193917.274166Z-H5c947e1c-P00006ac7"}
+{"event":"data","sid":"20241114T193917.270203Z-H5c947e1c-P00006abd/20241114T193917.274166Z-H5c947e1c-P00006ac7","thread":"main","time":"2024-11-14T19:39:17.277232Z","file":"builtin/receive-pack.c","line":2112,"t_abs":0.003248,"t_rel":0.003248,"nesting":1,"category":"transfer","key":"client-sid","value":"20241114T193917.270203Z-H5c947e1c-P00006abd"}
 To file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
  - [deleted]         new-branch
 ok 13 - session IDs advertised (push v1)
@@ -373501,8 +372685,8 @@
 From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20251218T013733.127479Z-Hfbad846e-P000010b8","thread":"main","time":"2025-12-18T01:37:33.137942Z","file":"connect.c","line":175,"t_abs":0.010647,"t_rel":0.009315,"nesting":2,"category":"transfer","key":"negotiated-version","value":"1"}
-{"event":"data","sid":"20251218T013733.127479Z-Hfbad846e-P000010b8/20251218T013733.135933Z-Hfbad846e-P000010be","thread":"main","time":"2025-12-18T01:37:33.136606Z","file":"protocol.c","line":78,"t_abs":0.000853,"t_rel":0.000853,"nesting":1,"category":"transfer","key":"negotiated-version","value":"1"}
+{"event":"data","sid":"20241114T193917.435127Z-H5c947e1c-P00006b31","thread":"main","time":"2024-11-14T19:39:17.458585Z","file":"connect.c","line":175,"t_abs":0.023656,"t_rel":0.022384,"nesting":2,"category":"transfer","key":"negotiated-version","value":"1"}
+{"event":"data","sid":"20241114T193917.435127Z-H5c947e1c-P00006b31/20241114T193917.457785Z-H5c947e1c-P00006b33","thread":"main","time":"2024-11-14T19:39:17.458244Z","file":"protocol.c","line":78,"t_abs":0.000637,"t_rel":0.000637,"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)': 
@@ -373518,8 +372702,8 @@
 From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20251218T013733.213009Z-Hfbad846e-P00001123","thread":"main","time":"2025-12-18T01:37:33.222147Z","file":"transport.c","line":332,"t_abs":0.009369,"t_rel":0.007983,"nesting":2,"category":"transfer","key":"server-sid","value":"20251218T013733.213009Z-Hfbad846e-P00001123/20251218T013733.220400Z-Hfbad846e-P0000112b"}
-{"event":"data","sid":"20251218T013733.213009Z-Hfbad846e-P00001123/20251218T013733.220400Z-Hfbad846e-P0000112b","thread":"main","time":"2025-12-18T01:37:33.223030Z","file":"serve.c","line":68,"t_abs":0.002824,"t_rel":0.002824,"nesting":1,"category":"transfer","key":"client-sid","value":"20251218T013733.213009Z-Hfbad846e-P00001123"}
+{"event":"data","sid":"20241114T193917.551529Z-H5c947e1c-P00006b7b","thread":"main","time":"2024-11-14T19:39:17.558997Z","file":"transport.c","line":332,"t_abs":0.007626,"t_rel":0.006513,"nesting":2,"category":"transfer","key":"server-sid","value":"20241114T193917.551529Z-H5c947e1c-P00006b7b/20241114T193917.558257Z-H5c947e1c-P00006b80"}
+{"event":"data","sid":"20241114T193917.551529Z-H5c947e1c-P00006b7b/20241114T193917.558257Z-H5c947e1c-P00006b80","thread":"main","time":"2024-11-14T19:39:17.559645Z","file":"serve.c","line":68,"t_abs":0.001548,"t_rel":0.001548,"nesting":1,"category":"transfer","key":"client-sid","value":"20241114T193917.551529Z-H5c947e1c-P00006b7b"}
 ok 15 - session IDs advertised (fetch v2)
 
 expecting success of 5705.16 'session IDs advertised (push v2)': 
@@ -373544,8 +372728,8 @@
  create mode 100644 b.t
 To file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
  * [new branch]      HEAD -> new-branch
-{"event":"data","sid":"20251218T013733.403523Z-Hfbad846e-P000011fb","thread":"main","time":"2025-12-18T01:37:33.410950Z","file":"transport.c","line":349,"t_abs":0.007647,"t_rel":0.006442,"nesting":3,"category":"transfer","key":"server-sid","value":"20251218T013733.403523Z-Hfbad846e-P000011fb/20251218T013733.408516Z-Hfbad846e-P00001207"}
-{"event":"data","sid":"20251218T013733.403523Z-Hfbad846e-P000011fb/20251218T013733.408516Z-Hfbad846e-P00001207","thread":"main","time":"2025-12-18T01:37:33.416873Z","file":"builtin/receive-pack.c","line":2112,"t_abs":0.008569,"t_rel":0.008569,"nesting":1,"category":"transfer","key":"client-sid","value":"20251218T013733.403523Z-Hfbad846e-P000011fb"}
+{"event":"data","sid":"20241114T193917.792168Z-H5c947e1c-P00006c37","thread":"main","time":"2024-11-14T19:39:17.814696Z","file":"transport.c","line":349,"t_abs":0.022892,"t_rel":0.017585,"nesting":3,"category":"transfer","key":"server-sid","value":"20241114T193917.792168Z-H5c947e1c-P00006c37/20241114T193917.813968Z-H5c947e1c-P00006c4b"}
+{"event":"data","sid":"20241114T193917.792168Z-H5c947e1c-P00006c37/20241114T193917.813968Z-H5c947e1c-P00006c4b","thread":"main","time":"2024-11-14T19:39:17.821095Z","file":"builtin/receive-pack.c","line":2112,"t_abs":0.007359,"t_rel":0.007359,"nesting":1,"category":"transfer","key":"client-sid","value":"20241114T193917.792168Z-H5c947e1c-P00006c37"}
 To file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
  - [deleted]         new-branch
 ok 16 - session IDs advertised (push v2)
@@ -373563,311 +372747,223 @@
 From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5705-session-id-in-capabilities/repo
    ce450c7..020ea9b  master     -> origin/master
  * [new tag]         b          -> b
-{"event":"data","sid":"20251218T013733.517112Z-Hfbad846e-P00001290","thread":"main","time":"2025-12-18T01:37:33.527190Z","file":"connect.c","line":175,"t_abs":0.010240,"t_rel":0.008977,"nesting":2,"category":"transfer","key":"negotiated-version","value":"2"}
-{"event":"data","sid":"20251218T013733.517112Z-Hfbad846e-P00001290/20251218T013733.522476Z-Hfbad846e-P00001296","thread":"main","time":"2025-12-18T01:37:33.523113Z","file":"protocol.c","line":78,"t_abs":0.000808,"t_rel":0.000808,"nesting":1,"category":"transfer","key":"negotiated-version","value":"2"}
+{"event":"data","sid":"20241114T193918.007569Z-H5c947e1c-P00006ceb","thread":"main","time":"2024-11-14T19:39:18.029102Z","file":"connect.c","line":175,"t_abs":0.021777,"t_rel":0.020584,"nesting":2,"category":"transfer","key":"negotiated-version","value":"2"}
+{"event":"data","sid":"20241114T193918.007569Z-H5c947e1c-P00006ceb/20241114T193918.023299Z-H5c947e1c-P00006cf4","thread":"main","time":"2024-11-14T19:39:18.023813Z","file":"protocol.c","line":78,"t_abs":0.000669,"t_rel":0.000669,"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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5750-bundle-uri-parse.sh ***
-expecting success of 5750.1 'bundle_uri_parse_line() just URIs': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=http://example.com/bundle.bdl
-	bundle.two.uri=https://example.com/bundle.bdl
-	bundle.three.uri=file:///usr/share/git/bundle.bdl
-	EOF
-
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-	EOF
-
-	test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp_config_output expect actual
-
-ok 1 - bundle_uri_parse_line() just URIs
-
-expecting success of 5750.2 'bundle_uri_parse_line(): relative URIs': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=bundle.bdl
-	bundle.two.uri=../bundle.bdl
-	bundle.three.uri=sub/dir/bundle.bdl
-	EOF
+*** 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
 
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = <uri>/bundle.bdl
-	[bundle "two"]
-		uri = bundle.bdl
-	[bundle "three"]
-		uri = <uri>/sub/dir/bundle.bdl
-	EOF
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-	test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp_config_output expect actual
+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 &&
 
-ok 2 - bundle_uri_parse_line(): relative URIs
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c protocol.version=2 \
+		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
+		>actual 2>err &&
 
-expecting success of 5750.3 'bundle_uri_parse_line(): relative URIs and parent paths': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=bundle.bdl
-	bundle.two.uri=../bundle.bdl
-	bundle.three.uri=../../bundle.bdl
-	EOF
+	# Server responded using protocol v2
+	grep "< version 2" log &&
 
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = <uri>/bundle.bdl
-	[bundle "two"]
-		uri = bundle.bdl
-	[bundle "three"]
-		uri = <uri>/../bundle.bdl
-	EOF
+	! grep bundle-uri log
 
-	# TODO: We would prefer if parsing a bundle list would not cause
-	# a die() and instead would give a warning and allow the rest of
-	# a Git command to continue. This test_must_fail is necessary for
-	# now until the interface for relative_url() allows for reporting
-	# an error instead of die()ing.
-	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
-	grep "fatal: cannot strip one component off url" err
+packet:    ls-remote< version 2
+ok 2 - connect with file:// using protocol v2: no bundle-uri
 
-fatal: cannot strip one component off url '.'
-ok 3 - bundle_uri_parse_line(): relative URIs and parent paths
+expecting success of 5730.3 'connect with file:// using protocol v2: have bundle-uri': 
+	test_when_finished "rm -f log" &&
 
-expecting success of 5750.4 'bundle_uri_parse_line() parsing edge cases: empty key or value': 
-	cat >in <<-\EOF &&
-	=bogus-value
-	bogus-key=
-	EOF
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c protocol.version=2 \
+		ls-remote --symref "$BUNDLE_URI_REPO_URI" \
+		>actual 2>err &&
 
-	cat >err.expect <<-EOF &&
-	error: bundle-uri: line has empty key or value
-	error: bad line: '=bogus-value'
-	error: bundle-uri: line has empty key or value
-	error: bad line: 'bogus-key='
-	EOF
+	# Server responded using protocol v2
+	grep "< version 2" log &&
 
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	EOF
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log
 
-	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_cmp err.expect err &&
-	test_cmp_config_output expect actual
+packet:    ls-remote< version 2
+packet:    ls-remote< bundle-uri
+ok 3 - connect with file:// using protocol v2: have bundle-uri
 
-ok 4 - bundle_uri_parse_line() parsing edge cases: empty key or value
+expecting success of 5730.4 'clone with file:// using protocol v2: request bundle-uris': 
+	test_when_finished "rm -rf log* cloned*" &&
 
-expecting success of 5750.5 'bundle_uri_parse_line() parsing edge cases: empty lines': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=http://example.com/bundle.bdl
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c transfer.bundleURI=false \
+		-c protocol.version=2 \
+		clone "$BUNDLE_URI_REPO_URI" cloned \
+		>actual 2>err &&
 
-	bundle.two.uri=https://example.com/bundle.bdl
+	# Server responded using protocol v2
+	grep "< version 2" log &&
 
-	bundle.three.uri=file:///usr/share/git/bundle.bdl
-	EOF
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log &&
 
-	cat >err.expect <<-\EOF &&
-	error: bundle-uri: got an empty line
-	error: bad line: ''
-	error: bundle-uri: got an empty line
-	error: bad line: ''
-	EOF
+	# Client did not issue bundle-uri command
+	! grep "> command=bundle-uri" log &&
 
-	# We fail, but try to continue parsing regardless
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-	EOF
+	GIT_TRACE_PACKET="$PWD/log" \
+	git \
+		-c transfer.bundleURI=true \
+		-c protocol.version=2 \
+		clone "$BUNDLE_URI_REPO_URI" cloned2 \
+		>actual 2>err &&
 
-	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_cmp err.expect err &&
-	test_cmp_config_output expect actual
+	# Server responded using protocol v2
+	grep "< version 2" log &&
 
-ok 5 - bundle_uri_parse_line() parsing edge cases: empty lines
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log &&
 
-expecting success of 5750.6 'bundle_uri_parse_line() parsing edge cases: duplicate lines': 
-	cat >in <<-\EOF &&
-	bundle.one.uri=http://example.com/bundle.bdl
-	bundle.two.uri=https://example.com/bundle.bdl
-	bundle.one.uri=https://example.com/bundle-2.bdl
-	bundle.three.uri=file:///usr/share/git/bundle.bdl
-	EOF
+	# Client issued bundle-uri command
+	grep "> command=bundle-uri" log &&
 
-	cat >err.expect <<-\EOF &&
-	error: bad line: 'bundle.one.uri=https://example.com/bundle-2.bdl'
-	EOF
+	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 &&
 
-	# We fail, but try to continue parsing regardless
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-	EOF
+	# Server responded using protocol v2
+	grep "< version 2" log3 &&
 
-	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
-	test_cmp err.expect err &&
-	test_cmp_config_output expect actual
+	# Server advertised bundle-uri capability
+	grep "< bundle-uri" log3 &&
 
-ok 6 - bundle_uri_parse_line() parsing edge cases: duplicate lines
+	# Client did not issue bundle-uri command (--bundle-uri override)
+	! grep "> command=bundle-uri" log3
 
-expecting success of 5750.7 'parse config format: just URIs': 
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-	EOF
+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
 
-	test-tool bundle-uri parse-config expect >actual 2>err &&
-	test_must_be_empty err &&
-	test_cmp_config_output expect actual
+expecting success of 5730.5 'enable transfer.bundleURI for remaining tests': 
+	git config --global transfer.bundleURI true
 
-ok 7 - parse config format: just URIs
+ok 5 - enable transfer.bundleURI for remaining tests
 
-expecting success of 5750.8 'parse config format: relative URIs': 
-	cat >in <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-	[bundle "one"]
-		uri = bundle.bdl
-	[bundle "two"]
-		uri = ../bundle.bdl
-	[bundle "three"]
-		uri = sub/dir/bundle.bdl
-	EOF
+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" &&
 
-	cat >expect <<-\EOF &&
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
 	[bundle]
 		version = 1
 		mode = all
-	[bundle "one"]
-		uri = <uri>/bundle.bdl
-	[bundle "two"]
-		uri = bundle.bdl
-	[bundle "three"]
-		uri = <uri>/sub/dir/bundle.bdl
+	[bundle "only"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
 	EOF
 
-	test-tool bundle-uri parse-config in >actual 2>err &&
-	test_must_be_empty err &&
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
 	test_cmp_config_output expect actual
 
-ok 8 - parse config format: relative URIs
+ok 6 - test bundle-uri with file:// using protocol v2
 
-expecting success of 5750.9 'parse config format edge cases: empty key or value': 
-	cat >in1 <<-\EOF &&
-	= bogus-value
-	EOF
+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" &&
 
-	cat >err1 <<-EOF &&
-	error: bad config line 1 in file in1
-	EOF
+	# Extra data should be ignored
+	test_config -C "$BUNDLE_URI_PARENT" bundle.only.extra bogus &&
 
-	cat >expect <<-\EOF &&
+	# All data about bundle URIs
+	cat >expect <<-EOF &&
 	[bundle]
 		version = 1
 		mode = all
+	[bundle "only"]
+		uri = $BUNDLE_URI_BUNDLE_URI_ESCAPED
 	EOF
 
-	test_must_fail test-tool bundle-uri parse-config in1 >actual 2>err &&
-	test_cmp err1 err &&
-	test_cmp_config_output expect actual &&
-
-	cat >in2 <<-\EOF &&
-	bogus-key =
-	EOF
-
-	cat >err2 <<-EOF &&
-	error: bad config line 1 in file in2
-	EOF
-
-	test_must_fail test-tool bundle-uri parse-config in2 >actual 2>err &&
-	test_cmp err2 err &&
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
 	test_cmp_config_output expect actual
 
-ok 9 - parse config format edge cases: empty key or value
+ok 7 - test bundle-uri with file:// using protocol v2 and extra data
 
-expecting success of 5750.10 'parse config format: creationToken heuristic': 
-	cat >expect <<-\EOF &&
+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
-		heuristic = creationToken
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-		creationToken = 123456
-	[bundle "two"]
-		uri = https://example.com/bundle.bdl
-		creationToken = 12345678901234567890
-	[bundle "three"]
-		uri = file:///usr/share/git/bundle.bdl
-		creationToken = 1
+	[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 parse-config expect >actual 2>err &&
-	test_must_be_empty err &&
+	test-tool bundle-uri \
+		ls-remote \
+		"$BUNDLE_URI_REPO_URI" \
+		>actual &&
 	test_cmp_config_output expect actual
 
-ok 10 - parse config format: creationToken heuristic
-
-expecting success of 5750.11 'parse config format edge cases: creationToken heuristic': 
-	cat >expect <<-\EOF &&
-	[bundle]
-		version = 1
-		mode = all
-		heuristic = creationToken
-	[bundle "one"]
-		uri = http://example.com/bundle.bdl
-		creationToken = bogus
-	EOF
+ok 8 - test bundle-uri with file:// using protocol v2 with list
 
-	test-tool bundle-uri parse-config expect >actual 2>err &&
-	grep "could not parse bundle list key creationToken with value 'bogus'" err
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5732-protocol-v2-bundle-uri-http.sh ***
+checking prerequisite: NOT_ROOT
 
-warning: could not parse bundle list key creationToken with value 'bogus'
-ok 11 - parse config format edge cases: creationToken heuristic
+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 11 test(s)
-1..11
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5731-protocol-v2-bundle-uri-git.sh ***
@@ -373883,7 +372979,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[3610] Ready to rumble
+[28688] 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 &&
@@ -373912,12 +373008,12 @@
 
 	! grep bundle-uri log
 
-[3702] Connection from 127.0.0.1:38108
-[3702] Extended attribute "host": 127.0.0.1:5731
-[3702] Extended attribute "protocol": version=2
-[3702] Request upload-pack for '/parent'
+[28809] Connection from 127.0.0.1:45242
+[28809] Extended attribute "host": 127.0.0.1:5731
+[28809] Extended attribute "protocol": version=2
+[28809] Request upload-pack for '/parent'
+[28688] [28809] Disconnected
 packet:    ls-remote< version 2
-[3610] [3702] 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': 
@@ -373935,11 +373031,11 @@
 	# Server advertised bundle-uri capability
 	grep "< bundle-uri" log
 
-[3847] Connection from 127.0.0.1:38112
-[3847] Extended attribute "host": 127.0.0.1:5731
-[3847] Extended attribute "protocol": version=2
-[3847] Request upload-pack for '/parent'
-[3610] [3847] Disconnected
+[28949] Connection from 127.0.0.1:45250
+[28949] Extended attribute "host": 127.0.0.1:5731
+[28949] Extended attribute "protocol": version=2
+[28949] Request upload-pack for '/parent'
+[28688] [28949] Disconnected
 packet:    ls-remote< version 2
 packet:    ls-remote< bundle-uri
 ok 3 - connect with git:// using protocol v2: have bundle-uri
@@ -373996,28 +373092,28 @@
 	# Client did not issue bundle-uri command (--bundle-uri override)
 	! grep "> command=bundle-uri" log3
 
-[3940] Connection from 127.0.0.1:38124
-[3940] Extended attribute "host": 127.0.0.1:5731
-[3940] Extended attribute "protocol": version=2
-[3940] Request upload-pack for '/parent'
-[3610] [3940] Disconnected
+[29015] Connection from 127.0.0.1:45258
+[29015] Extended attribute "host": 127.0.0.1:5731
+[29015] Extended attribute "protocol": version=2
+[29015] Request upload-pack for '/parent'
+[28688] [29015] Disconnected
 packet:        clone< version 2
 packet:        clone< bundle-uri
-[4124] Connection from 127.0.0.1:38130
-[4124] Extended attribute "host": 127.0.0.1:5731
-[4124] Extended attribute "protocol": version=2
-[4124] Request upload-pack for '/parent'
+[29141] Connection from 127.0.0.1:45274
+[29141] Extended attribute "host": 127.0.0.1:5731
+[29141] Extended attribute "protocol": version=2
+[29141] Request upload-pack for '/parent'
+[28688] [29141] Disconnected
 packet:        clone< version 2
 packet:        clone< version 2
-[3610] [4124] Disconnected
 packet:        clone< bundle-uri
 packet:        clone< bundle-uri
 packet:        clone> command=bundle-uri
-[4370] Connection from 127.0.0.1:38136
-[4370] Extended attribute "host": 127.0.0.1:5731
-[4370] Extended attribute "protocol": version=2
-[4370] Request upload-pack for '/parent'
-[3610] [4370] Disconnected
+[29339] Connection from 127.0.0.1:45284
+[29339] Extended attribute "host": 127.0.0.1:5731
+[29339] Extended attribute "protocol": version=2
+[29339] Request upload-pack for '/parent'
+[28688] [29339] Disconnected
 packet:        clone< version 2
 packet:        clone< bundle-uri
 ok 4 - clone with git:// using protocol v2: request bundle-uris
@@ -374046,11 +373142,11 @@
 		>actual &&
 	test_cmp_config_output expect actual
 
-[4586] Connection from 127.0.0.1:38140
-[4586] Extended attribute "host": 127.0.0.1:5731
-[4586] Extended attribute "protocol": version=2
-[4586] Request upload-pack for '/parent'
-[3610] [4586] Disconnected
+[29514] Connection from 127.0.0.1:45298
+[29514] Extended attribute "host": 127.0.0.1:5731
+[29514] Extended attribute "protocol": version=2
+[29514] Request upload-pack for '/parent'
+[28688] [29514] 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': 
@@ -374075,11 +373171,11 @@
 		>actual &&
 	test_cmp_config_output expect actual
 
-[4775] Connection from 127.0.0.1:38156
-[4775] Extended attribute "host": 127.0.0.1:5731
-[4775] Extended attribute "protocol": version=2
-[4775] Request upload-pack for '/parent'
-[3610] [4775] Disconnected
+[29649] Connection from 127.0.0.1:45300
+[29649] Extended attribute "host": 127.0.0.1:5731
+[29649] Extended attribute "protocol": version=2
+[29649] Request upload-pack for '/parent'
+[28688] [29649] 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': 
@@ -374109,11 +373205,11 @@
 		>actual &&
 	test_cmp_config_output expect actual
 
-[4998] Connection from 127.0.0.1:38164
-[4998] Extended attribute "host": 127.0.0.1:5731
-[4998] Extended attribute "protocol": version=2
-[4998] Request upload-pack for '/parent'
-[3610] [4998] Disconnected
+[29826] Connection from 127.0.0.1:45310
+[29826] Extended attribute "host": 127.0.0.1:5731
+[29826] Extended attribute "protocol": version=2
+[29826] Request upload-pack for '/parent'
+[28688] [29826] Disconnected
 ok 8 - test bundle-uri with git:// using protocol v2 with list
 
 Stopping git daemon ...
@@ -374121,637 +373217,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5802-connect-helper.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5802-connect-helper/.git/
-expecting success of 5802.1 'setup': 
-	git config --global protocol.ext.allow user &&
-	test_tick &&
-	git commit --allow-empty -m initial &&
-	test_tick &&
-	git commit --allow-empty -m second &&
-	test_tick &&
-	git commit --allow-empty -m third &&
-	test_tick &&
-	git tag -a -m "tip three" three &&
-
-	test_tick &&
-	git commit --allow-empty -m fourth
-
-[master (root-commit) 66fe8b3] initial
- Author: A U Thor <author@example.com>
-[master 5ce2b00] second
- Author: A U Thor <author@example.com>
-[master 8019b76] third
- Author: A U Thor <author@example.com>
-[master b0c6cf2] fourth
- Author: A U Thor <author@example.com>
-ok 1 - setup
-
-expecting success of 5802.2 'clone': 
-	cmd=$(echo "echo >&2 ext::sh invoked && %S .." | sed -e "s/ /% /g") &&
-	git clone "ext::sh -c %S% ." dst &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git config remote.origin.url "ext::sh -c $cmd" &&
-		git for-each-ref refs/heads/ refs/tags/
-	) >actual &&
-	test_cmp expect actual
-
-Cloning into 'dst'...
-ok 2 - clone
-
-expecting success of 5802.3 'update following tag': 
-	test_tick &&
-	git commit --allow-empty -m fifth &&
-	test_tick &&
-	git tag -a -m "tip five" five &&
-	git for-each-ref refs/heads/ refs/tags/ >expect &&
-	(
-		cd dst &&
-		git pull &&
-		git for-each-ref refs/heads/ refs/tags/ >../actual
-	) &&
-	test_cmp expect actual
-
-[master a643494] fifth
- Author: A U Thor <author@example.com>
-ext::sh invoked
-From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
-   b0c6cf2..a643494  master     -> origin/master
- * [new tag]         five       -> five
-Updating b0c6cf2..a643494
-Fast-forward
-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.45.2/t/trash directory.t5802-connect-helper/remote/one.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5802-connect-helper/remote/host/two.git/
-ok 6 - set up fake git-daemon
-
-expecting success of 5802.7 'ext command can connect to git daemon (no vhost)': 
-	rm -rf dst &&
-	git clone "ext::fake-daemon %G/one.git" dst
-
-Cloning into 'dst'...
-warning: You appear to have cloned an empty repository.
-ok 7 - ext command can connect to git daemon (no vhost)
-
-expecting success of 5802.8 'ext command can connect to git daemon (vhost)': 
-	rm -rf dst &&
-	git clone "ext::fake-daemon %G/two.git %Vhost" dst
-
-Cloning into 'dst'...
-warning: You appear to have cloned an empty repository.
-ok 8 - ext command can connect to git daemon (vhost)
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5801-remote-helpers.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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 '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 3 - create new commit on remote
-
-expecting success of 5801.4 'pulling from local repo': 
-	(cd local && git pull) &&
-	test_cmp server/file local/file
-
-From testgit::/build/reproducible-path/git-2.45.2/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 4 - pulling from local repo
-
-expecting success of 5801.5 '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.45.2/t/trash directory.t5801-remote-helpers/server
-   5647d5f..f883ace  main -> main
-ok 5 - pushing to local repo
-
-expecting success of 5801.6 '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.45.2/t/trash directory.t5801-remote-helpers/server
- * branch            new        -> FETCH_HEAD
- * [new branch]      new        -> origin/new
-ok 6 - fetch new branch
-
-expecting success of 5801.7 '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 7 - fetch multiple branches
-
-expecting success of 5801.8 '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.45.2/t/trash directory.t5801-remote-helpers/server
-   f883ace..0d4cb61  main -> main
-ok 8 - push when remote has extra refs
-
-expecting success of 5801.9 '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.45.2/t/trash directory.t5801-remote-helpers/server
- * [new branch]      new-name -> new-name
-ok 9 - push new branch by name
-
-expecting success of 5801.10 '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.45.2/t/trash directory.t5801-remote-helpers/server
- * [new branch]      new-name -> new-refspec
-ok 10 - push new branch with old:new refspec
-
-expecting success of 5801.11 '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.45.2/t/trash directory.t5801-remote-helpers/server
- * [new branch]      HEAD -> new-refspec-2
-ok 11 - push new branch with HEAD:new refspec
-
-expecting success of 5801.12 '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 12 - push delete branch
-
-expecting success of 5801.13 '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.45.2/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.45.2/t/trash directory.t5801-remote-helpers/server
-   518e3ec..b33c694  force-test -> force-test
-ok 13 - forced push
-
-expecting success of 5801.14 '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 14 - cloning without refspec
-
-expecting success of 5801.15 '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 15 - pulling without refspecs
-
-expecting success of 5801.16 '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 16 - pushing without refspecs
-
-expecting success of 5801.17 'pulling without marks': 
-	(cd local2 &&
-	GIT_REMOTE_TESTGIT_NO_MARKS=1 git pull) &&
-	compare_refs local2 HEAD server HEAD
-
-Already up to date.
-ok 17 - pulling without marks
-
-checking known breakage of 5801.18 '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	2025-12-18 01:37:34.822773267 +0000
-+++ actual	2025-12-18 01:37:34.822773267 +0000
-@@ -1 +1 @@
--899057158430267bac82448fb89f21aa89c35cb0
-+9a8e2abfa604731e07ce2fb257109eb918e2280b
-HEAD is now at 9a8e2ab five
-not ok 18 - pushing without marks # TODO known breakage
-
-expecting success of 5801.19 '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.45.2/t/trash directory.t5801-remote-helpers/server
- * [new branch]      dup2 -> dup2
-   7c93a0d..7c93a0d  new-name -> new-name
-ok 19 - push all with existing object
-
-expecting success of 5801.20 '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.45.2/t/trash directory.t5801-remote-helpers/server
- * [new branch]      dup -> dup
-ok 20 - 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 21 # skip push signed tag (missing GPG)
-
-ok 22 # skip push signed tag with signed-tags capability (missing GPG)
-
-expecting success of 5801.23 '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.45.2/t/trash directory.t5801-remote-helpers/server
- * [new branch]      update -> update
-ok 23 - push update refs
-
-expecting success of 5801.24 '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.45.2/t/trash directory.t5801-remote-helpers/server
-   900950d..297a32d  update -> update
-ok 24 - push update refs disabled by no-private-update
-
-expecting success of 5801.25 '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.45.2/t/trash directory.t5801-remote-helpers/server'
-ok 25 - push update refs failure
-
-expecting success of 5801.26 '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 26 - proper failure checks for fetching
-
-expecting success of 5801.27 '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.45.2/t/trash directory.t5801-remote-helpers/server'
-ok 27 - proper failure checks for pushing
-
-expecting success of 5801.28 '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.45.2/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 28 - push messages
-
-expecting success of 5801.29 '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.45.2/t/trash directory.t5801-remote-helpers/server
- * branch            HEAD       -> FETCH_HEAD
-ok 29 - fetch HEAD
-
-expecting success of 5801.30 '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.45.2/t/trash directory.t5801-remote-helpers/local/../server
- * branch            HEAD       -> FETCH_HEAD
-ok 30 - fetch url
-
-expecting success of 5801.31 '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.45.2/t/trash directory.t5801-remote-helpers/server
-   0d4cb61..4a80143  main          -> origin/main
- * [new tag]         v1.0          -> v1.0
-ok 31 - fetch tag
-
-# still have 1 known breakage(s)
-# passed all remaining 30 test(s)
-1..31
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5702-protocol-v2.sh ***
 checking prerequisite: PIPE
 
@@ -374765,7 +373230,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[713] Ready to rumble
+[22109] 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
@@ -374791,18 +373256,18 @@
 	git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
 	test_cmp expect actual
 
-[773] Connection from 127.0.0.1:54978
-[773] Extended attribute "host": 127.0.0.1:5702
-[773] Extended attribute "protocol": version=2
-[773] Request upload-pack for '/parent'
-[713] [773] Disconnected
+[22214] Connection from 127.0.0.1:35056
+[22214] Extended attribute "host": 127.0.0.1:5702
+[22214] Extended attribute "protocol": version=2
+[22214] Request upload-pack for '/parent'
+[22109] [22214] Disconnected
 packet:    ls-remote> git-upload-pack /parent\0host=127.0.0.1:5702\0\0version=2\0
 packet:    ls-remote< version 2
-[828] Connection from 127.0.0.1:54986
-[828] Extended attribute "host": 127.0.0.1:5702
-[828] Extended attribute "protocol": version=2
-[828] Request upload-pack for '/parent'
-[713] [828] Disconnected
+[22268] Connection from 127.0.0.1:35064
+[22268] Extended attribute "host": 127.0.0.1:5702
+[22268] Extended attribute "protocol": version=2
+[22268] Request upload-pack for '/parent'
+[22109] [22268] 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': 
@@ -374817,11 +373282,11 @@
 
 	test_cmp expect actual
 
-[898] Connection from 127.0.0.1:54992
-[898] Extended attribute "host": 127.0.0.1:5702
-[898] Extended attribute "protocol": version=2
-[898] Request upload-pack for '/parent'
-[713] [898] Disconnected
+[22310] Connection from 127.0.0.1:35068
+[22310] Extended attribute "host": 127.0.0.1:5702
+[22310] Extended attribute "protocol": version=2
+[22310] Request upload-pack for '/parent'
+[22109] [22310] Disconnected
 ok 3 - ref advertisement is filtered with ls-remote using protocol v2
 
 expecting success of 5702.4 'clone with git:// using protocol v2': 
@@ -374840,11 +373305,11 @@
 	grep "clone< version 2" log
 
 Cloning into 'daemon_child'...
-[972] Connection from 127.0.0.1:54998
-[972] Extended attribute "host": 127.0.0.1:5702
-[972] Extended attribute "protocol": version=2
-[972] Request upload-pack for '/parent'
-[713] [972] Disconnected
+[22565] Connection from 127.0.0.1:35082
+[22565] Extended attribute "host": 127.0.0.1:5702
+[22565] Extended attribute "protocol": version=2
+[22565] Request upload-pack for '/parent'
+[22109] [22565] 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
@@ -374870,11 +373335,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two.t
-[1176] Connection from 127.0.0.1:55010
-[1176] Extended attribute "host": 127.0.0.1:5702
-[1176] Extended attribute "protocol": version=2
-[1176] Request upload-pack for '/parent'
-[713] [1176] Disconnected
+[22766] Connection from 127.0.0.1:35094
+[22766] Extended attribute "host": 127.0.0.1:5702
+[22766] Extended attribute "protocol": version=2
+[22766] Request upload-pack for '/parent'
+[22109] [22766] Disconnected
 From git://127.0.0.1:5702/parent
    d79ce16..139b20d  main       -> origin/main
  * [new tag]         two        -> two
@@ -374898,11 +373363,11 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 two_a.t
-[1407] Connection from 127.0.0.1:55026
-[1407] Extended attribute "host": 127.0.0.1:5702
-[1407] Extended attribute "protocol": version=2
-[1407] Request upload-pack for '/parent'
-[713] [1407] Disconnected
+[23008] Connection from 127.0.0.1:35102
+[23008] Extended attribute "host": 127.0.0.1:5702
+[23008] Extended attribute "protocol": version=2
+[23008] Request upload-pack for '/parent'
+[22109] [23008] Disconnected
 From git://127.0.0.1:5702/parent
  * branch            7e9f7d092ed45f242659c87db76fd08923e99801 -> FETCH_HEAD
 packet:        fetch< version 2
@@ -374923,14 +373388,14 @@
 	# Server responded using protocol v2
 	grep "fetch< version 2" log
 
-[1510] Connection from 127.0.0.1:55042
-[1510] Extended attribute "host": 127.0.0.1:5702
-[1510] Extended attribute "protocol": version=2
-[1510] Request upload-pack for '/parent'
+[23237] Connection from 127.0.0.1:35118
+[23237] Extended attribute "host": 127.0.0.1:5702
+[23237] Extended attribute "protocol": version=2
+[23237] Request upload-pack for '/parent'
 From git://127.0.0.1:5702/parent
    139b20d..7e9f7d0  main       -> origin/main
  * [new tag]         two_a      -> two_a
-[713] [1510] Disconnected
+[22109] [23237] Disconnected
 Updating d79ce16..7e9f7d0
 Fast-forward
  two.t   | 1 +
@@ -374969,16 +373434,15 @@
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 three.t
-[1713] Connection from 127.0.0.1:55058
-[1713] Extended attribute "host": 127.0.0.1:5702
-[1713] Request receive-pack for '/parent'
+[23445] Connection from 127.0.0.1:35124
+[23445] Extended attribute "host": 127.0.0.1:5702
+[23445] Request receive-pack for '/parent'
 To git://127.0.0.1:5702/parent
  * [new branch]      HEAD -> client_branch
-[713] [1713] Disconnected
+[22109] [23445] 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
@@ -376023,19 +374487,446 @@
 1..50
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5812-proto-disable-http.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5812-proto-disable-http/.git/
-checking prerequisite: NOT_ROOT
+*** t5750-bundle-uri-parse.sh ***
+expecting success of 5750.1 'bundle_uri_parse_line() just URIs': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=http://example.com/bundle.bdl
+	bundle.two.uri=https://example.com/bundle.bdl
+	bundle.three.uri=file:///usr/share/git/bundle.bdl
+	EOF
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+	EOF
 
-)
-prerequisite NOT_ROOT ok
-1..0 # SKIP no web server found at ''
+	test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 1 - bundle_uri_parse_line() just URIs
+
+expecting success of 5750.2 'bundle_uri_parse_line(): relative URIs': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=bundle.bdl
+	bundle.two.uri=../bundle.bdl
+	bundle.three.uri=sub/dir/bundle.bdl
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = <uri>/bundle.bdl
+	[bundle "two"]
+		uri = bundle.bdl
+	[bundle "three"]
+		uri = <uri>/sub/dir/bundle.bdl
+	EOF
+
+	test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 2 - bundle_uri_parse_line(): relative URIs
+
+expecting success of 5750.3 'bundle_uri_parse_line(): relative URIs and parent paths': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=bundle.bdl
+	bundle.two.uri=../bundle.bdl
+	bundle.three.uri=../../bundle.bdl
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = <uri>/bundle.bdl
+	[bundle "two"]
+		uri = bundle.bdl
+	[bundle "three"]
+		uri = <uri>/../bundle.bdl
+	EOF
+
+	# TODO: We would prefer if parsing a bundle list would not cause
+	# a die() and instead would give a warning and allow the rest of
+	# a Git command to continue. This test_must_fail is necessary for
+	# now until the interface for relative_url() allows for reporting
+	# an error instead of die()ing.
+	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
+	grep "fatal: cannot strip one component off url" err
+
+fatal: cannot strip one component off url '.'
+ok 3 - bundle_uri_parse_line(): relative URIs and parent paths
+
+expecting success of 5750.4 'bundle_uri_parse_line() parsing edge cases: empty key or value': 
+	cat >in <<-\EOF &&
+	=bogus-value
+	bogus-key=
+	EOF
+
+	cat >err.expect <<-EOF &&
+	error: bundle-uri: line has empty key or value
+	error: bad line: '=bogus-value'
+	error: bundle-uri: line has empty key or value
+	error: bad line: 'bogus-key='
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_cmp err.expect err &&
+	test_cmp_config_output expect actual
+
+ok 4 - bundle_uri_parse_line() parsing edge cases: empty key or value
+
+expecting success of 5750.5 'bundle_uri_parse_line() parsing edge cases: empty lines': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=http://example.com/bundle.bdl
+
+	bundle.two.uri=https://example.com/bundle.bdl
+
+	bundle.three.uri=file:///usr/share/git/bundle.bdl
+	EOF
+
+	cat >err.expect <<-\EOF &&
+	error: bundle-uri: got an empty line
+	error: bad line: ''
+	error: bundle-uri: got an empty line
+	error: bad line: ''
+	EOF
+
+	# We fail, but try to continue parsing regardless
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_cmp err.expect err &&
+	test_cmp_config_output expect actual
+
+ok 5 - bundle_uri_parse_line() parsing edge cases: empty lines
+
+expecting success of 5750.6 'bundle_uri_parse_line() parsing edge cases: duplicate lines': 
+	cat >in <<-\EOF &&
+	bundle.one.uri=http://example.com/bundle.bdl
+	bundle.two.uri=https://example.com/bundle.bdl
+	bundle.one.uri=https://example.com/bundle-2.bdl
+	bundle.three.uri=file:///usr/share/git/bundle.bdl
+	EOF
+
+	cat >err.expect <<-\EOF &&
+	error: bad line: 'bundle.one.uri=https://example.com/bundle-2.bdl'
+	EOF
+
+	# We fail, but try to continue parsing regardless
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-key-values in >actual 2>err &&
+	test_cmp err.expect err &&
+	test_cmp_config_output expect actual
+
+ok 6 - bundle_uri_parse_line() parsing edge cases: duplicate lines
+
+expecting success of 5750.7 'parse config format: just URIs': 
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+	EOF
+
+	test-tool bundle-uri parse-config expect >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 7 - parse config format: just URIs
+
+expecting success of 5750.8 'parse config format: relative URIs': 
+	cat >in <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = bundle.bdl
+	[bundle "two"]
+		uri = ../bundle.bdl
+	[bundle "three"]
+		uri = sub/dir/bundle.bdl
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	[bundle "one"]
+		uri = <uri>/bundle.bdl
+	[bundle "two"]
+		uri = bundle.bdl
+	[bundle "three"]
+		uri = <uri>/sub/dir/bundle.bdl
+	EOF
+
+	test-tool bundle-uri parse-config in >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 8 - parse config format: relative URIs
+
+expecting success of 5750.9 'parse config format edge cases: empty key or value': 
+	cat >in1 <<-\EOF &&
+	= bogus-value
+	EOF
+
+	cat >err1 <<-EOF &&
+	error: bad config line 1 in file in1
+	EOF
+
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-config in1 >actual 2>err &&
+	test_cmp err1 err &&
+	test_cmp_config_output expect actual &&
+
+	cat >in2 <<-\EOF &&
+	bogus-key =
+	EOF
+
+	cat >err2 <<-EOF &&
+	error: bad config line 1 in file in2
+	EOF
+
+	test_must_fail test-tool bundle-uri parse-config in2 >actual 2>err &&
+	test_cmp err2 err &&
+	test_cmp_config_output expect actual
+
+ok 9 - parse config format edge cases: empty key or value
+
+expecting success of 5750.10 'parse config format: creationToken heuristic': 
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+		heuristic = creationToken
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+		creationToken = 123456
+	[bundle "two"]
+		uri = https://example.com/bundle.bdl
+		creationToken = 12345678901234567890
+	[bundle "three"]
+		uri = file:///usr/share/git/bundle.bdl
+		creationToken = 1
+	EOF
+
+	test-tool bundle-uri parse-config expect >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp_config_output expect actual
+
+ok 10 - parse config format: creationToken heuristic
+
+expecting success of 5750.11 'parse config format edge cases: creationToken heuristic': 
+	cat >expect <<-\EOF &&
+	[bundle]
+		version = 1
+		mode = all
+		heuristic = creationToken
+	[bundle "one"]
+		uri = http://example.com/bundle.bdl
+		creationToken = bogus
+	EOF
+
+	test-tool bundle-uri parse-config expect >actual 2>err &&
+	grep "could not parse bundle list key creationToken with value 'bogus'" err
+
+warning: could not parse bundle list key creationToken with value 'bogus'
+ok 11 - parse config format edge cases: creationToken heuristic
+
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5802-connect-helper.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5802-connect-helper/.git/
+expecting success of 5802.1 'setup': 
+	git config --global protocol.ext.allow user &&
+	test_tick &&
+	git commit --allow-empty -m initial &&
+	test_tick &&
+	git commit --allow-empty -m second &&
+	test_tick &&
+	git commit --allow-empty -m third &&
+	test_tick &&
+	git tag -a -m "tip three" three &&
+
+	test_tick &&
+	git commit --allow-empty -m fourth
+
+[master (root-commit) 66fe8b3] initial
+ Author: A U Thor <author@example.com>
+[master 5ce2b00] second
+ Author: A U Thor <author@example.com>
+[master 8019b76] third
+ Author: A U Thor <author@example.com>
+[master b0c6cf2] fourth
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 5802.2 'clone': 
+	cmd=$(echo "echo >&2 ext::sh invoked && %S .." | sed -e "s/ /% /g") &&
+	git clone "ext::sh -c %S% ." dst &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git config remote.origin.url "ext::sh -c $cmd" &&
+		git for-each-ref refs/heads/ refs/tags/
+	) >actual &&
+	test_cmp expect actual
+
+Cloning into 'dst'...
+ok 2 - clone
+
+expecting success of 5802.3 'update following tag': 
+	test_tick &&
+	git commit --allow-empty -m fifth &&
+	test_tick &&
+	git tag -a -m "tip five" five &&
+	git for-each-ref refs/heads/ refs/tags/ >expect &&
+	(
+		cd dst &&
+		git pull &&
+		git for-each-ref refs/heads/ refs/tags/ >../actual
+	) &&
+	test_cmp expect actual
+
+[master a643494] fifth
+ Author: A U Thor <author@example.com>
+ext::sh invoked
+From ext::sh -c echo% >&2% ext::sh% invoked% &&% %S% ..
+   b0c6cf2..a643494  master     -> origin/master
+ * [new tag]         five       -> five
+Updating b0c6cf2..a643494
+Fast-forward
+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.45.2/t/trash directory.t5802-connect-helper/remote/one.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5802-connect-helper/remote/host/two.git/
+ok 6 - set up fake git-daemon
+
+expecting success of 5802.7 'ext command can connect to git daemon (no vhost)': 
+	rm -rf dst &&
+	git clone "ext::fake-daemon %G/one.git" dst
+
+Cloning into 'dst'...
+warning: You appear to have cloned an empty repository.
+ok 7 - ext command can connect to git daemon (no vhost)
+
+expecting success of 5802.8 'ext command can connect to git daemon (vhost)': 
+	rm -rf dst &&
+	git clone "ext::fake-daemon %G/two.git %Vhost" dst
+
+Cloning into 'dst'...
+warning: You appear to have cloned an empty repository.
+ok 8 - ext command can connect to git daemon (vhost)
+
+# passed all 8 test(s)
+1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5810-proto-disable-local.sh ***
@@ -376543,7 +375434,7 @@
 )
 prerequisite PIPE ok
 Starting git daemon ...
-[6388] Ready to rumble
+[32369] Ready to rumble
 expecting success of 5811.1 'create git-accessible repo': 
 	bare="$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
 	test_commit one &&
@@ -376570,11 +375461,11 @@
 		)
 	
 Cloning into bare repository 'tmp.git'...
-[6548] Connection from 127.0.0.1:50442
-[6548] Extended attribute "host": 127.0.0.1:5811
-[6548] Extended attribute "protocol": version=2
-[6548] Request upload-pack for '/repo.git'
-[6388] [6548] Disconnected
+[32508] Connection from 127.0.0.1:60310
+[32508] Extended attribute "host": 127.0.0.1:5811
+[32508] Extended attribute "protocol": version=2
+[32508] Request upload-pack for '/repo.git'
+[32369] [32508] Disconnected
 ok 2 - clone git:// (enabled)
 
 expecting success of 5811.3 'fetch git:// (enabled)': 
@@ -376585,13 +375476,13 @@
 			git fetch
 		)
 	
-[6665] Connection from 127.0.0.1:50454
-[6665] Extended attribute "host": 127.0.0.1:5811
-[6665] Extended attribute "protocol": version=2
-[6665] Request upload-pack for '/repo.git'
+[32570] Connection from 127.0.0.1:60326
+[32570] Extended attribute "host": 127.0.0.1:5811
+[32570] Extended attribute "protocol": version=2
+[32570] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[6388] [6665] Disconnected
+[32369] [32570] Disconnected
 ok 3 - fetch git:// (enabled)
 
 expecting success of 5811.4 'push git:// (enabled)': 
@@ -376602,14 +375493,14 @@
 			git push origin HEAD:pushed
 		)
 	
-[6740] Connection from 127.0.0.1:50460
-[6740] Extended attribute "host": 127.0.0.1:5811
-[6740] Request receive-pack for '/repo.git'
+[32622] Connection from 127.0.0.1:60328
+[32622] Extended attribute "host": 127.0.0.1:5811
+[32622] Request receive-pack for '/repo.git'
 To git://127.0.0.1:5811/repo.git
  * [new branch]      HEAD -> pushed
-[6388] [6740] Disconnected
 ok 4 - push git:// (enabled)
 
+[32369] [32622] Disconnected
 expecting success of 5811.5 'push git:// (disabled)': 
 		(
 			cd tmp.git &&
@@ -376664,35 +375555,35 @@
 		git -c protocol.$proto.allow=always clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[7244] Connection from 127.0.0.1:50468
-[7244] Extended attribute "host": 127.0.0.1:5811
-[7244] Extended attribute "protocol": version=2
-[7244] Request upload-pack for '/repo.git'
-[6388] [7244] Disconnected
+[340] Connection from 127.0.0.1:60336
+[340] Extended attribute "host": 127.0.0.1:5811
+[340] Extended attribute "protocol": version=2
+[340] Request upload-pack for '/repo.git'
+[32369] [340] 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
 	
-[7373] Connection from 127.0.0.1:50480
-[7373] Extended attribute "host": 127.0.0.1:5811
-[7373] Extended attribute "protocol": version=2
-[7373] Request upload-pack for '/repo.git'
+[419] Connection from 127.0.0.1:60352
+[419] Extended attribute "host": 127.0.0.1:5811
+[419] Extended attribute "protocol": version=2
+[419] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[6388] [7373] Disconnected
+[32369] [419] 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
 	
-[7468] Connection from 127.0.0.1:50494
-[7468] Extended attribute "host": 127.0.0.1:5811
-[7468] Request receive-pack for '/repo.git'
-[6388] [7468] Disconnected
+[507] Connection from 127.0.0.1:60364
+[507] Extended attribute "host": 127.0.0.1:5811
+[507] Request receive-pack for '/repo.git'
 Everything up-to-date
 ok 11 - push git:// (enabled)
 
+[32369] [507] 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
 	
@@ -376718,35 +375609,35 @@
 		git -c protocol.$proto.allow=user clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[7676] Connection from 127.0.0.1:50506
-[7676] Extended attribute "host": 127.0.0.1:5811
-[7676] Extended attribute "protocol": version=2
-[7676] Request upload-pack for '/repo.git'
-[6388] [7676] Disconnected
+[612] Connection from 127.0.0.1:60366
+[612] Extended attribute "host": 127.0.0.1:5811
+[612] Extended attribute "protocol": version=2
+[612] Request upload-pack for '/repo.git'
+[32369] [612] Disconnected
 ok 15 - clone git:// (enabled)
 
 expecting success of 5811.16 'fetch git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user fetch
 	
-[7863] Connection from 127.0.0.1:50522
-[7863] Extended attribute "host": 127.0.0.1:5811
-[7863] Extended attribute "protocol": version=2
-[7863] Request upload-pack for '/repo.git'
+[698] Connection from 127.0.0.1:60370
+[698] Extended attribute "host": 127.0.0.1:5811
+[698] Extended attribute "protocol": version=2
+[698] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[6388] [7863] Disconnected
+[32369] [698] Disconnected
 ok 16 - fetch git:// (enabled)
 
 expecting success of 5811.17 'push git:// (enabled)': 
 		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
 	
-[7942] Connection from 127.0.0.1:50534
-[7942] Extended attribute "host": 127.0.0.1:5811
-[7942] Request receive-pack for '/repo.git'
+[790] Connection from 127.0.0.1:60378
+[790] Extended attribute "host": 127.0.0.1:5811
+[790] Request receive-pack for '/repo.git'
 Everything up-to-date
 ok 17 - push git:// (enabled)
+[32369] [790] Disconnected
 
-[6388] [7942] Disconnected
 expecting success of 5811.18 'push git:// (disabled)': 
 		(
 			cd tmp.git &&
@@ -376787,35 +375678,35 @@
 		git clone --bare "$url" tmp.git
 	
 Cloning into bare repository 'tmp.git'...
-[8106] Connection from 127.0.0.1:50538
-[8106] Extended attribute "host": 127.0.0.1:5811
-[8106] Extended attribute "protocol": version=2
-[8106] Request upload-pack for '/repo.git'
-[6388] [8106] Disconnected
+[1098] Connection from 127.0.0.1:33548
+[1098] Extended attribute "host": 127.0.0.1:5811
+[1098] Extended attribute "protocol": version=2
+[1098] Request upload-pack for '/repo.git'
+[32369] [1098] 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
 	
-[8207] Connection from 127.0.0.1:50544
-[8207] Extended attribute "host": 127.0.0.1:5811
-[8207] Extended attribute "protocol": version=2
-[8207] Request upload-pack for '/repo.git'
+[1274] Connection from 127.0.0.1:33560
+[1274] Extended attribute "host": 127.0.0.1:5811
+[1274] Extended attribute "protocol": version=2
+[1274] Request upload-pack for '/repo.git'
 From git://127.0.0.1:5811/repo
  * branch            HEAD       -> FETCH_HEAD
-[6388] [8207] Disconnected
+[32369] [1274] 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
 	
-[8308] Connection from 127.0.0.1:50546
-[8308] Extended attribute "host": 127.0.0.1:5811
-[8308] Request receive-pack for '/repo.git'
+[1317] Connection from 127.0.0.1:33570
+[1317] Extended attribute "host": 127.0.0.1:5811
+[1317] Request receive-pack for '/repo.git'
 Everything up-to-date
-[6388] [8308] Disconnected
+[32369] [1317] Disconnected
 ok 23 - push git:// (enabled)
 
 expecting success of 5811.24 'push git:// (disabled)': 
@@ -376842,11 +375733,513 @@
 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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5812-proto-disable-http.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5812-proto-disable-http/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+1..0 # SKIP no web server found at ''
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5801-remote-helpers.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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 '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 3 - create new commit on remote
+
+expecting success of 5801.4 'pulling from local repo': 
+	(cd local && git pull) &&
+	test_cmp server/file local/file
+
+From testgit::/build/reproducible-path/git-2.45.2/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 4 - pulling from local repo
+
+expecting success of 5801.5 '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.45.2/t/trash directory.t5801-remote-helpers/server
+   5647d5f..f883ace  main -> main
+ok 5 - pushing to local repo
+
+expecting success of 5801.6 '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.45.2/t/trash directory.t5801-remote-helpers/server
+ * branch            new        -> FETCH_HEAD
+ * [new branch]      new        -> origin/new
+ok 6 - fetch new branch
+
+expecting success of 5801.7 '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 7 - fetch multiple branches
+
+expecting success of 5801.8 '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.45.2/t/trash directory.t5801-remote-helpers/server
+   f883ace..0d4cb61  main -> main
+ok 8 - push when remote has extra refs
+
+expecting success of 5801.9 '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.45.2/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      new-name -> new-name
+ok 9 - push new branch by name
+
+expecting success of 5801.10 '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.45.2/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      new-name -> new-refspec
+ok 10 - push new branch with old:new refspec
+
+expecting success of 5801.11 '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.45.2/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      HEAD -> new-refspec-2
+ok 11 - push new branch with HEAD:new refspec
+
+expecting success of 5801.12 '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 12 - push delete branch
+
+expecting success of 5801.13 '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.45.2/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.45.2/t/trash directory.t5801-remote-helpers/server
+   518e3ec..b33c694  force-test -> force-test
+ok 13 - forced push
+
+expecting success of 5801.14 '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 14 - cloning without refspec
+
+expecting success of 5801.15 '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 15 - pulling without refspecs
+
+expecting success of 5801.16 '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 16 - pushing without refspecs
+
+expecting success of 5801.17 'pulling without marks': 
+	(cd local2 &&
+	GIT_REMOTE_TESTGIT_NO_MARKS=1 git pull) &&
+	compare_refs local2 HEAD server HEAD
+
+Already up to date.
+ok 17 - pulling without marks
+
+checking known breakage of 5801.18 '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	2024-11-14 19:39:27.207765237 +0000
++++ actual	2024-11-14 19:39:27.223765402 +0000
+@@ -1 +1 @@
+-899057158430267bac82448fb89f21aa89c35cb0
++9a8e2abfa604731e07ce2fb257109eb918e2280b
+HEAD is now at 9a8e2ab five
+not ok 18 - pushing without marks # TODO known breakage
+
+expecting success of 5801.19 '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.45.2/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      dup2 -> dup2
+   7c93a0d..7c93a0d  new-name -> new-name
+ok 19 - push all with existing object
+
+expecting success of 5801.20 '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.45.2/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      dup -> dup
+ok 20 - 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 21 # skip push signed tag (missing GPG)
+
+ok 22 # skip push signed tag with signed-tags capability (missing GPG)
+
+expecting success of 5801.23 '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.45.2/t/trash directory.t5801-remote-helpers/server
+ * [new branch]      update -> update
+ok 23 - push update refs
+
+expecting success of 5801.24 '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.45.2/t/trash directory.t5801-remote-helpers/server
+   900950d..297a32d  update -> update
+ok 24 - push update refs disabled by no-private-update
+
+expecting success of 5801.25 '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.45.2/t/trash directory.t5801-remote-helpers/server'
+ok 25 - push update refs failure
+
+expecting success of 5801.26 '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 26 - proper failure checks for fetching
+
+expecting success of 5801.27 '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.45.2/t/trash directory.t5801-remote-helpers/server'
+ok 27 - proper failure checks for pushing
+
+expecting success of 5801.28 '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.45.2/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 28 - push messages
+
+expecting success of 5801.29 '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.45.2/t/trash directory.t5801-remote-helpers/server
+ * branch            HEAD       -> FETCH_HEAD
+ok 29 - fetch HEAD
+
+expecting success of 5801.30 '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.45.2/t/trash directory.t5801-remote-helpers/local/../server
+ * branch            HEAD       -> FETCH_HEAD
+ok 30 - fetch url
+
+expecting success of 5801.31 '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.45.2/t/trash directory.t5801-remote-helpers/server
+   0d4cb61..4a80143  main          -> origin/main
+ * [new tag]         v1.0          -> v1.0
+ok 31 - fetch tag
+
+# still have 1 known breakage(s)
+# passed all remaining 30 test(s)
+1..31
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5814-proto-disable-ext.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5814-proto-disable-ext/.git/
 expecting success of 5814.1 'setup ext wrapper': 
@@ -376875,475 +376268,1610 @@
  * [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.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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5616-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t5616-partial-clone/srv.bare
+   3f5edd7..129c8a2  main       -> origin/main
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+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.45.2/t/trash directory.t5616-partial-clone/srv.bare'\'''
+trace: built-in: git upload-pack '/build/reproducible-path/git-2.45.2/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
+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: 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
+trace: built-in: git maintenance run --auto --no-quiet
+trace: run_command: git gc --auto --no-quiet
+trace: built-in: git gc --auto --no-quiet
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+trace: run_command: git pack-refs --all --prune --auto
+trace: built-in: git pack-refs --all --prune --auto
+trace: run_command: git reflog expire --all
+trace: built-in: git reflog expire --all
+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 <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 <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 <trace3.event &&
+	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace3.event &&
+	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"0\" trace3.event
+
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+{"event":"child_start","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb","thread":"main","time":"2024-11-14T19:39:07.356872Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet"]}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b","thread":"main","time":"2024-11-14T19:39:07.358333Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b/20241114T193907.360355Z-H5c947e1c-P0000531d","thread":"main","time":"2024-11-14T19:39:07.360885Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b/20241114T193907.360355Z-H5c947e1c-P0000531d/20241114T193907.362533Z-H5c947e1c-P00005322","thread":"main","time":"2024-11-14T19:39:07.363008Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b/20241114T193907.360355Z-H5c947e1c-P0000531d/20241114T193907.526248Z-H5c947e1c-P0000535b","thread":"main","time":"2024-11-14T19:39:07.526774Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b/20241114T193907.360355Z-H5c947e1c-P0000531d/20241114T193907.558799Z-H5c947e1c-P00005369","thread":"main","time":"2024-11-14T19:39:07.559130Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b","thread":"main","time":"2024-11-14T19:39:07.358339Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b/20241114T193907.360355Z-H5c947e1c-P0000531d","thread":"main","time":"2024-11-14T19:39:07.360896Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b/20241114T193907.360355Z-H5c947e1c-P0000531d/20241114T193907.362533Z-H5c947e1c-P00005322","thread":"main","time":"2024-11-14T19:39:07.363015Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b/20241114T193907.360355Z-H5c947e1c-P0000531d/20241114T193907.526248Z-H5c947e1c-P0000535b","thread":"main","time":"2024-11-14T19:39:07.526781Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b/20241114T193907.360355Z-H5c947e1c-P0000531d/20241114T193907.558799Z-H5c947e1c-P00005369","thread":"main","time":"2024-11-14T19:39:07.559137Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"def_param","sid":"20241114T193907.303228Z-H5c947e1c-P000052fb/20241114T193907.357915Z-H5c947e1c-P0000531b/20241114T193907.360355Z-H5c947e1c-P0000531d/20241114T193907.558799Z-H5c947e1c-P00005369/20241114T193907.574277Z-H5c947e1c-P0000536b","thread":"main","time":"2024-11-14T19:39:07.574675Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+{"event":"child_start","sid":"20241114T193907.579225Z-H5c947e1c-P00005370","thread":"main","time":"2024-11-14T19:39:07.641462Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet"]}
+{"event":"def_param","sid":"20241114T193907.579225Z-H5c947e1c-P00005370","thread":"main","time":"2024-11-14T19:39:07.579784Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20241114T193907.579225Z-H5c947e1c-P00005370/20241114T193907.637111Z-H5c947e1c-P00005383","thread":"main","time":"2024-11-14T19:39:07.637563Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20241114T193907.579225Z-H5c947e1c-P00005370/20241114T193907.642549Z-H5c947e1c-P00005388","thread":"main","time":"2024-11-14T19:39:07.642984Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
+{"event":"def_param","sid":"20241114T193907.579225Z-H5c947e1c-P00005370/20241114T193907.642549Z-H5c947e1c-P00005388","thread":"main","time":"2024-11-14T19:39:07.642995Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+{"event":"child_start","sid":"20241114T193907.651835Z-H5c947e1c-P0000538d","thread":"main","time":"2024-11-14T19:39:07.670384Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet"]}
+{"event":"def_param","sid":"20241114T193907.651835Z-H5c947e1c-P0000538d/20241114T193907.671483Z-H5c947e1c-P0000539a","thread":"main","time":"2024-11-14T19:39:07.672014Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20241114T193907.651835Z-H5c947e1c-P0000538d/20241114T193907.671483Z-H5c947e1c-P0000539a/20241114T193907.673332Z-H5c947e1c-P0000539b","thread":"main","time":"2024-11-14T19:39:07.673826Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
+{"event":"def_param","sid":"20241114T193907.651835Z-H5c947e1c-P0000538d","thread":"main","time":"2024-11-14T19:39:07.652383Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20241114T193907.651835Z-H5c947e1c-P0000538d/20241114T193907.667055Z-H5c947e1c-P00005395","thread":"main","time":"2024-11-14T19:39:07.667535Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20241114T193907.651835Z-H5c947e1c-P0000538d/20241114T193907.671483Z-H5c947e1c-P0000539a","thread":"main","time":"2024-11-14T19:39:07.672009Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+{"event":"def_param","sid":"20241114T193907.651835Z-H5c947e1c-P0000538d/20241114T193907.671483Z-H5c947e1c-P0000539a/20241114T193907.673332Z-H5c947e1c-P0000539b","thread":"main","time":"2024-11-14T19:39:07.673820Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
+ok 18 - fetch --refetch triggers repacking
+
+expecting success of 5616.19 'partial clone with transfer.fsckobjects=1 works with submodules': 
+	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.45.2/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.45.2/t/trash directory.t5616-partial-clone/src_with_sub/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/src_with_sub/mysub'...
+[main (root-commit) b4341d6] 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.45.2/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 22912 on i-capture-the-hostname' --promisor --fsck-objects
+trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 22912 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 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.45.2/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
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+Auto packing the repository in background for optimum performance.
+See "git help gc" for manual housekeeping.
+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
 
-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)
+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 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 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
 
-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)
+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 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 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
 
-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)
+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 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 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 &&
 
-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)
+	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" pc4 &&
 
-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)
+	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
 
-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)
+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 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 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 &&
 
-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)
+	# 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 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)
+	git clone --filter="blob:none" "file://$(pwd)/src" dst 2>err &&
+	! grep "does not point to a valid object" err &&
+	git -C dst fsck
 
-expecting success of 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)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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 &&
 
-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)
+	git hash-object --stdin <src/foo.t >blob &&
 
-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)
+	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
 
-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)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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 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 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"
 
-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)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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 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
+	)
 
-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)
+Cloning into bare repository 'dst.git'...
+5626abf0f72e58d7a153368ba57db4c673c0e171 one.t
+?f719efd430d52bcfc8566a43b2eb655688d38871
+ok 32 - partial clone with sparse filter succeeds
 
-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 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
 
-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)
+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 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)
+expecting success of 5616.34 'fetch lazy-fetches only to resolve deltas': 
+	setup_triangle &&
 
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6000-rev-list-misc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6000-rev-list-misc/.git/
-expecting success of 6000.1 'setup': 
-	echo content1 >wanted_file &&
-	echo content2 >unwanted_file &&
-	git add wanted_file unwanted_file &&
-	test_tick &&
-	git commit -m one
+	# 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 &&
 
-[main (root-commit) 8b046b3] one
+	# 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.45.2/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) b380020] initial
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 unwanted_file
- create mode 100644 wanted_file
-ok 1 - setup
+ 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.45.2/t/trash directory.t5616-partial-clone/promisor-remote/.git/
+From file:///build/reproducible-path/git-2.45.2/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.45.2/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 6000.2 'rev-list --objects heeds pathspecs': 
-	git rev-list --objects HEAD -- wanted_file >output &&
-	grep wanted_file output &&
-	! grep unwanted_file output
+expecting success of 5616.35 'fetch lazy-fetches only to resolve deltas, protocol v2': 
+	setup_triangle &&
 
-ac3e272b72bbf89def8657766b855d0656630ed4 wanted_file
-ok 2 - rev-list --objects heeds pathspecs
+	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 &&
 
-expecting success of 6000.3 'rev-list --objects with pathspecs and deeper paths': 
-	mkdir foo &&
-	>foo/file &&
-	git add foo/file &&
-	test_tick &&
-	git commit -m two &&
+	# 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 &&
 
-	git rev-list --objects HEAD -- foo >output &&
-	grep foo/file output &&
+	# Verify that protocol version 2 was used.
+	grep "fetch< version 2" trace &&
 
-	git rev-list --objects HEAD -- foo/file >output &&
-	grep foo/file output &&
-	! grep unwanted_file output
+	# 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
 
-[main 0045dbd] two
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) 9bc3270] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo/file
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 foo/file
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 foo/file
-ok 3 - rev-list --objects with pathspecs and deeper paths
+ 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.45.2/t/trash directory.t5616-partial-clone/promisor-remote/.git/
+From file:///build/reproducible-path/git-2.45.2/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.45.2/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 6000.4 'rev-list --objects with pathspecs and copied files': 
-	git checkout --orphan junio-testcase &&
-	git rm -rf . &&
+expecting success of 5616.36 'fetch does not lazy-fetch missing targets of its refs': 
+	rm -rf server client trace &&
 
-	mkdir two &&
-	echo frotz >one &&
-	cp one two/three &&
-	git add one two/three &&
-	test_tick &&
-	git commit -m that &&
+	test_create_repo server &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	test_commit -C server foo &&
 
-	ONE=$(git rev-parse HEAD:one) &&
-	git rev-list --objects HEAD two >output &&
-	grep "$ONE two/three" output &&
-	! grep one output
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	# Make all refs point to nothing by deleting all objects.
+	rm client/.git/objects/pack/* &&
 
-Switched to a new branch 'junio-testcase'
-rm 'foo/file'
-rm 'unwanted_file'
-rm 'wanted_file'
-[junio-testcase (root-commit) adaab4b] that
+	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.45.2/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) 92a62de] foo
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 one
- create mode 100644 two/three
-8e4020bb5a8d8c873b25de15933e75cc0fc275df two/three
-ok 4 - rev-list --objects with pathspecs and copied files
+ 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.45.2/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 6000.5 'rev-list --objects --no-object-names has no space/names': 
-	git rev-list --objects --no-object-names HEAD >output &&
-	! grep wanted_file output &&
-	! grep unwanted_file output &&
-	! grep " " output
+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
 
-ok 5 - rev-list --objects --no-object-names has no space/names
+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.45.2/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.45.2/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 6000.6 'rev-list --objects --no-object-names works with cat-file': 
-	git rev-list --objects --no-object-names --all >list-output &&
-	git cat-file --batch-check <list-output >cat-output &&
-	! grep missing cat-output
+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
 
-ok 6 - rev-list --objects --no-object-names works with cat-file
+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.45.2/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.45.2/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 6000.7 '--no-object-names and --object-names are last-one-wins': 
-	git rev-list --objects --no-object-names --object-names --all >output &&
-	grep wanted_file output &&
-	git rev-list --objects --object-names --no-object-names --all >output &&
-	! grep wanted_file output
+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
 
-637f0347d31dad180d6fc7f6720c187b05a8754c unwanted_file
-ac3e272b72bbf89def8657766b855d0656630ed4 wanted_file
-ok 7 - --no-object-names and --object-names are last-one-wins
+Cloning into 'single'...
+525529d87f8f318d404aa60b6d2b41ed0f49123b
+bc03829a3804fb49ee75372a845d1554afc2e83f
+fatal: Needed a single revision
+ok 39 - single-branch tag following respects partial clone
 
-expecting success of 6000.8 'rev-list A..B and rev-list ^A B are the same': 
-	test_tick &&
-	git commit --allow-empty -m another &&
-	git tag -a -m "annotated" v1.0 &&
-	git rev-list --objects ^v1.0^ v1.0 >expect &&
-	git rev-list --objects v1.0^..v1.0 >actual &&
-	test_cmp expect actual
+expecting success of 5616.40 'fetch from a partial clone, protocol v0': 
+	rm -rf server client trace &&
 
-[junio-testcase eefa24e] another
+	# 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.45.2/t/trash directory.t5616-partial-clone/server/.git/
+[main (root-commit) b259608] foo
  Author: A U Thor <author@example.com>
-ok 8 - rev-list A..B and rev-list ^A B are the same
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5616-partial-clone/server
+ * branch            HEAD       -> FETCH_HEAD
+ok 40 - fetch from a partial clone, protocol v0
 
-expecting success of 6000.9 'propagate uninteresting flag down correctly': 
-	git rev-list --objects ^HEAD^{tree} HEAD^{tree} >actual &&
-	test_must_be_empty actual
+expecting success of 5616.41 'fetch from a partial clone, protocol v2': 
+	rm -rf server client trace &&
 
-ok 9 - propagate uninteresting flag down correctly
+	# 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 &&
 
-expecting success of 6000.10 'symleft flag bit is propagated down from tag': 
-	git log --format="%m %s" --left-right v1.0...main >actual &&
-	cat >expect <<-\EOF &&
-	< another
-	< that
-	> two
-	> one
-	EOF
-	test_cmp expect actual
+	# 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
 
-ok 10 - symleft flag bit is propagated down from tag
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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 6000.11 'rev-list can show index objects': 
-	# Of the blobs and trees in the index, note:
-	#
-	#   - we do not show two/three, because it is the
-	#     same blob as "one", and we show objects only once
-	#
-	#   - we do show the tree "two", because it has a valid cache tree
-	#     from the last commit
-	#
-	#   - we do not show the root tree; since we updated the index, it
-	#     does not have a valid cache tree
-	#
-	echo only-in-index >only-in-index &&
-	test_when_finished "git reset --hard" &&
-	rev1=$(git rev-parse HEAD:one) &&
-	rev2=$(git rev-parse HEAD:two) &&
-	revi=$(git hash-object only-in-index) &&
-	cat >expect <<-EOF &&
-	$rev1 one
-	$revi only-in-index
-	$rev2 two
-	EOF
-	git add only-in-index &&
-	git rev-list --objects --indexed-objects >actual &&
-	test_cmp expect actual
+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
 
-HEAD is now at eefa24e another
-ok 11 - rev-list can show index objects
+Cloning into bare repository 'client'...
+19:39:35.983135 builtin/pack-objects.c:4010  | d1 | main                     | data         | r0  |  0.001216 |  0.000392 | pack-objects | ..loosen_unused_packed_objects/loosened:0
+ok 42 - repack does not loosen promisor objects
 
-expecting success of 6000.12 'rev-list can negate index objects': 
-	git rev-parse HEAD >expect &&
-	git rev-list -1 --objects HEAD --not --indexed-objects >actual &&
-	test_cmp expect actual
+expecting success of 5616.43 'lazy-fetch in submodule succeeds': 
+	# setup
+	test_config_global protocol.file.allow always &&
 
-ok 12 - rev-list can negate index objects
+	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 &&
 
-expecting success of 6000.13 '--bisect and --first-parent can be combined': 
-	git rev-list --bisect --first-parent HEAD
+	# 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) &&
 
-adaab4b805f0f10feaa65a52f3d14dfa87c675f1
-ok 13 - --bisect and --first-parent can be combined
+	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 6000.14 '--header shows a NUL after each commit': 
-	# We know that there is no Q in the true payload; names and
-	# addresses of the authors and the committers do not have
-	# any, and object names or header names do not, either.
-	git rev-list --header --max-count=2 HEAD |
-	nul_to_q |
-	grep "^Q" >actual &&
-	cat >expect <<-EOF &&
-	Q$(git rev-parse HEAD~1)
-	Q
-	EOF
-	test_cmp expect actual
+	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 &&
 
-ok 14 - --header shows a NUL after each commit
+	git -C src-super/src-sub checkout $SUB_ONE &&
+	git -C src-super add src-sub &&
+	git -C src-super commit -m "superproject one" &&
 
-expecting success of 6000.15 'rev-list --end-of-options': 
-	git update-ref refs/heads/--output=yikes HEAD &&
-	git rev-list --end-of-options --output=yikes >actual &&
-	test_path_is_missing yikes &&
-	git rev-list HEAD >expect &&
-	test_cmp expect actual
+	git -C src-super/src-sub checkout $SUB_TWO &&
+	git -C src-super add src-sub &&
+	git -C src-super commit -m "superproject two" &&
 
-ok 15 - rev-list --end-of-options
+	# 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 6000.16 'rev-list --count': 
-	count=$(git rev-list --count HEAD) &&
-	git rev-list HEAD >actual &&
-	test_line_count = $count actual
+	# Trigger lazy-fetch from the superproject
+	git -C client restore --recurse-submodules --source=HEAD^ :/
 
-ok 16 - rev-list --count
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5616-partial-clone/src-super/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/src-super/src-sub'...
+done.
+Note: switching to '801106d77b703b74d29c28581b66e9e382e71a99'.
 
-expecting success of 6000.17 'rev-list --count --objects': 
-	count=$(git rev-list --count --objects HEAD) &&
-	git rev-list --objects HEAD >actual &&
-	test_line_count = $count actual
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 - rev-list --count --objects
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 6000.18 'rev-list --unpacked': 
-	git repack -ad &&
-	test_commit unpacked &&
+  git switch -c <new-branch-name>
 
-	git rev-list --objects --no-object-names unpacked^.. >expect.raw &&
-	sort expect.raw >expect &&
+Or undo this operation with:
 
-	git rev-list --all --objects --unpacked --no-object-names >actual.raw &&
-	sort actual.raw >actual &&
+  git switch -
 
-	test_cmp expect actual
+Turn off this advice by setting config variable advice.detachedHead to false
 
-[junio-testcase 72791fe] unpacked
+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 unpacked.t
-ok 18 - rev-list --unpacked
+ 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.45.2/t/trash directory.t5616-partial-clone/src-sub) registered for path 'src-sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/client/src-sub'...
+Submodule path 'src-sub': checked out 'acdf0b16fe4ce2869af73bab3c07737b60472b68'
+ok 43 - lazy-fetch in submodule succeeds
 
-# passed all 18 test(s)
-1..18
+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 43 test(s)
+# SKIP no web server found at ''
+1..43
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5815-submodule-protos.sh ***
@@ -377462,6 +377990,150 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5900-repo-selection.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6001-rev-list-graft.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6001-rev-list-graft/.git/
 expecting success of 6001.1 'setup': 
@@ -377685,276 +378357,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5900-repo-selection.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t/trash directory.t5900-repo-selection/foo.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6004-rev-list-path-optim.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6004-rev-list-path-optim/.git/
-expecting success of 6004.1 'setup': 
-	echo Hello >a &&
-	mkdir d &&
-	echo World >d/f &&
-	echo World >d/z &&
-	git add a d &&
-	test_tick &&
-	git commit -m "Initial commit" &&
-	git rev-parse --verify HEAD &&
-	git tag initial
-
-[main (root-commit) 5c8df84] Initial commit
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 a
- create mode 100644 d/f
- create mode 100644 d/z
-5c8df8481b8e4f419cc2268f5e68a10e349bbe37
-ok 1 - setup
-
-expecting success of 6004.2 'path-optimization': 
-	test_tick &&
-	commit=$(echo "Unchanged tree" | git commit-tree "HEAD^{tree}" -p HEAD) &&
-	test $(git rev-list $commit | wc -l) = 2 &&
-	test $(git rev-list $commit -- . | wc -l) = 1
-
-ok 2 - path-optimization
-
-expecting success of 6004.3 'further setup': 
-	git checkout -b side &&
-	echo Irrelevant >c &&
-	echo Irrelevant >d/f &&
-	git add c d/f &&
-	test_tick &&
-	git commit -m "Side makes an irrelevant commit" &&
-	git tag side_c0 &&
-	echo "More Irrelevancy" >c &&
-	git add c &&
-	test_tick &&
-	git commit -m "Side makes another irrelevant commit" &&
-	echo Bye >a &&
-	git add a &&
-	test_tick &&
-	git commit -m "Side touches a" &&
-	git tag side_a1 &&
-	echo "Yet more Irrelevancy" >c &&
-	git add c &&
-	test_tick &&
-	git commit -m "Side makes yet another irrelevant commit" &&
-	git checkout main &&
-	echo Another >b &&
-	echo Munged >d/z &&
-	git add b d/z &&
-	test_tick &&
-	git commit -m "Main touches b" &&
-	git tag main_b0 &&
-	git merge side &&
-	echo Touched >b &&
-	git add b &&
-	test_tick &&
-	git commit -m "Main touches b again"
-
-Switched to a new branch 'side'
-[side d02d707] Side makes an irrelevant commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 c
-[side 381f63c] Side makes another irrelevant commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[side e8cf16f] Side touches a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[side edbc4dc] Side makes yet another irrelevant commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-[main d829b82] Main touches b
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 b
-Merge made by the 'ort' strategy.
- a   | 2 +-
- c   | 1 +
- d/f | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 c
-[main 7bf8a87] Main touches b again
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - further setup
-
-expecting success of 6004.4 'path optimization 2': 
-	git rev-parse side_a1 initial >expected &&
-	git rev-list HEAD -- a >actual &&
-	test_cmp expected actual
-
-ok 4 - path optimization 2
-
-expecting success of 6004.5 'pathspec with leading path': 
-	git rev-parse main^ main_b0 side_c0 initial >expected &&
-	git rev-list HEAD -- d >actual &&
-	test_cmp expected actual
-
-ok 5 - pathspec with leading path
-
-expecting success of 6004.6 'pathspec with glob (1)': 
-	git rev-parse main^ main_b0 side_c0 initial >expected &&
-	git rev-list HEAD -- "d/*" >actual &&
-	test_cmp expected actual
-
-ok 6 - pathspec with glob (1)
-
-expecting success of 6004.7 'pathspec with glob (2)': 
-	git rev-parse side_c0 initial >expected &&
-	git rev-list HEAD -- "d/[a-m]*" >actual &&
-	test_cmp expected actual
-
-ok 7 - pathspec with glob (2)
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t5813-proto-disable-ssh.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5813-proto-disable-ssh/.git/
 expecting success of 5813.1 'setup ssh wrapper': 
@@ -378723,6 +379125,363 @@
 1..81
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6000-rev-list-misc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6000-rev-list-misc/.git/
+expecting success of 6000.1 'setup': 
+	echo content1 >wanted_file &&
+	echo content2 >unwanted_file &&
+	git add wanted_file unwanted_file &&
+	test_tick &&
+	git commit -m one
+
+[main (root-commit) 8b046b3] one
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 unwanted_file
+ create mode 100644 wanted_file
+ok 1 - setup
+
+expecting success of 6000.2 'rev-list --objects heeds pathspecs': 
+	git rev-list --objects HEAD -- wanted_file >output &&
+	grep wanted_file output &&
+	! grep unwanted_file output
+
+ac3e272b72bbf89def8657766b855d0656630ed4 wanted_file
+ok 2 - rev-list --objects heeds pathspecs
+
+expecting success of 6000.3 'rev-list --objects with pathspecs and deeper paths': 
+	mkdir foo &&
+	>foo/file &&
+	git add foo/file &&
+	test_tick &&
+	git commit -m two &&
+
+	git rev-list --objects HEAD -- foo >output &&
+	grep foo/file output &&
+
+	git rev-list --objects HEAD -- foo/file >output &&
+	grep foo/file output &&
+	! grep unwanted_file output
+
+[main 0045dbd] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo/file
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 foo/file
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 foo/file
+ok 3 - rev-list --objects with pathspecs and deeper paths
+
+expecting success of 6000.4 'rev-list --objects with pathspecs and copied files': 
+	git checkout --orphan junio-testcase &&
+	git rm -rf . &&
+
+	mkdir two &&
+	echo frotz >one &&
+	cp one two/three &&
+	git add one two/three &&
+	test_tick &&
+	git commit -m that &&
+
+	ONE=$(git rev-parse HEAD:one) &&
+	git rev-list --objects HEAD two >output &&
+	grep "$ONE two/three" output &&
+	! grep one output
+
+Switched to a new branch 'junio-testcase'
+rm 'foo/file'
+rm 'unwanted_file'
+rm 'wanted_file'
+[junio-testcase (root-commit) adaab4b] that
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 one
+ create mode 100644 two/three
+8e4020bb5a8d8c873b25de15933e75cc0fc275df two/three
+ok 4 - rev-list --objects with pathspecs and copied files
+
+expecting success of 6000.5 'rev-list --objects --no-object-names has no space/names': 
+	git rev-list --objects --no-object-names HEAD >output &&
+	! grep wanted_file output &&
+	! grep unwanted_file output &&
+	! grep " " output
+
+ok 5 - rev-list --objects --no-object-names has no space/names
+
+expecting success of 6000.6 'rev-list --objects --no-object-names works with cat-file': 
+	git rev-list --objects --no-object-names --all >list-output &&
+	git cat-file --batch-check <list-output >cat-output &&
+	! grep missing cat-output
+
+ok 6 - rev-list --objects --no-object-names works with cat-file
+
+expecting success of 6000.7 '--no-object-names and --object-names are last-one-wins': 
+	git rev-list --objects --no-object-names --object-names --all >output &&
+	grep wanted_file output &&
+	git rev-list --objects --object-names --no-object-names --all >output &&
+	! grep wanted_file output
+
+637f0347d31dad180d6fc7f6720c187b05a8754c unwanted_file
+ac3e272b72bbf89def8657766b855d0656630ed4 wanted_file
+ok 7 - --no-object-names and --object-names are last-one-wins
+
+expecting success of 6000.8 'rev-list A..B and rev-list ^A B are the same': 
+	test_tick &&
+	git commit --allow-empty -m another &&
+	git tag -a -m "annotated" v1.0 &&
+	git rev-list --objects ^v1.0^ v1.0 >expect &&
+	git rev-list --objects v1.0^..v1.0 >actual &&
+	test_cmp expect actual
+
+[junio-testcase eefa24e] another
+ Author: A U Thor <author@example.com>
+ok 8 - rev-list A..B and rev-list ^A B are the same
+
+expecting success of 6000.9 'propagate uninteresting flag down correctly': 
+	git rev-list --objects ^HEAD^{tree} HEAD^{tree} >actual &&
+	test_must_be_empty actual
+
+ok 9 - propagate uninteresting flag down correctly
+
+expecting success of 6000.10 'symleft flag bit is propagated down from tag': 
+	git log --format="%m %s" --left-right v1.0...main >actual &&
+	cat >expect <<-\EOF &&
+	< another
+	< that
+	> two
+	> one
+	EOF
+	test_cmp expect actual
+
+ok 10 - symleft flag bit is propagated down from tag
+
+expecting success of 6000.11 'rev-list can show index objects': 
+	# Of the blobs and trees in the index, note:
+	#
+	#   - we do not show two/three, because it is the
+	#     same blob as "one", and we show objects only once
+	#
+	#   - we do show the tree "two", because it has a valid cache tree
+	#     from the last commit
+	#
+	#   - we do not show the root tree; since we updated the index, it
+	#     does not have a valid cache tree
+	#
+	echo only-in-index >only-in-index &&
+	test_when_finished "git reset --hard" &&
+	rev1=$(git rev-parse HEAD:one) &&
+	rev2=$(git rev-parse HEAD:two) &&
+	revi=$(git hash-object only-in-index) &&
+	cat >expect <<-EOF &&
+	$rev1 one
+	$revi only-in-index
+	$rev2 two
+	EOF
+	git add only-in-index &&
+	git rev-list --objects --indexed-objects >actual &&
+	test_cmp expect actual
+
+HEAD is now at eefa24e another
+ok 11 - rev-list can show index objects
+
+expecting success of 6000.12 'rev-list can negate index objects': 
+	git rev-parse HEAD >expect &&
+	git rev-list -1 --objects HEAD --not --indexed-objects >actual &&
+	test_cmp expect actual
+
+ok 12 - rev-list can negate index objects
+
+expecting success of 6000.13 '--bisect and --first-parent can be combined': 
+	git rev-list --bisect --first-parent HEAD
+
+adaab4b805f0f10feaa65a52f3d14dfa87c675f1
+ok 13 - --bisect and --first-parent can be combined
+
+expecting success of 6000.14 '--header shows a NUL after each commit': 
+	# We know that there is no Q in the true payload; names and
+	# addresses of the authors and the committers do not have
+	# any, and object names or header names do not, either.
+	git rev-list --header --max-count=2 HEAD |
+	nul_to_q |
+	grep "^Q" >actual &&
+	cat >expect <<-EOF &&
+	Q$(git rev-parse HEAD~1)
+	Q
+	EOF
+	test_cmp expect actual
+
+ok 14 - --header shows a NUL after each commit
+
+expecting success of 6000.15 'rev-list --end-of-options': 
+	git update-ref refs/heads/--output=yikes HEAD &&
+	git rev-list --end-of-options --output=yikes >actual &&
+	test_path_is_missing yikes &&
+	git rev-list HEAD >expect &&
+	test_cmp expect actual
+
+ok 15 - rev-list --end-of-options
+
+expecting success of 6000.16 'rev-list --count': 
+	count=$(git rev-list --count HEAD) &&
+	git rev-list HEAD >actual &&
+	test_line_count = $count actual
+
+ok 16 - rev-list --count
+
+expecting success of 6000.17 'rev-list --count --objects': 
+	count=$(git rev-list --count --objects HEAD) &&
+	git rev-list --objects HEAD >actual &&
+	test_line_count = $count actual
+
+ok 17 - rev-list --count --objects
+
+expecting success of 6000.18 'rev-list --unpacked': 
+	git repack -ad &&
+	test_commit unpacked &&
+
+	git rev-list --objects --no-object-names unpacked^.. >expect.raw &&
+	sort expect.raw >expect &&
+
+	git rev-list --all --objects --unpacked --no-object-names >actual.raw &&
+	sort actual.raw >actual &&
+
+	test_cmp expect actual
+
+[junio-testcase 72791fe] unpacked
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unpacked.t
+ok 18 - rev-list --unpacked
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6004-rev-list-path-optim.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6004-rev-list-path-optim/.git/
+expecting success of 6004.1 'setup': 
+	echo Hello >a &&
+	mkdir d &&
+	echo World >d/f &&
+	echo World >d/z &&
+	git add a d &&
+	test_tick &&
+	git commit -m "Initial commit" &&
+	git rev-parse --verify HEAD &&
+	git tag initial
+
+[main (root-commit) 5c8df84] Initial commit
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 a
+ create mode 100644 d/f
+ create mode 100644 d/z
+5c8df8481b8e4f419cc2268f5e68a10e349bbe37
+ok 1 - setup
+
+expecting success of 6004.2 'path-optimization': 
+	test_tick &&
+	commit=$(echo "Unchanged tree" | git commit-tree "HEAD^{tree}" -p HEAD) &&
+	test $(git rev-list $commit | wc -l) = 2 &&
+	test $(git rev-list $commit -- . | wc -l) = 1
+
+ok 2 - path-optimization
+
+expecting success of 6004.3 'further setup': 
+	git checkout -b side &&
+	echo Irrelevant >c &&
+	echo Irrelevant >d/f &&
+	git add c d/f &&
+	test_tick &&
+	git commit -m "Side makes an irrelevant commit" &&
+	git tag side_c0 &&
+	echo "More Irrelevancy" >c &&
+	git add c &&
+	test_tick &&
+	git commit -m "Side makes another irrelevant commit" &&
+	echo Bye >a &&
+	git add a &&
+	test_tick &&
+	git commit -m "Side touches a" &&
+	git tag side_a1 &&
+	echo "Yet more Irrelevancy" >c &&
+	git add c &&
+	test_tick &&
+	git commit -m "Side makes yet another irrelevant commit" &&
+	git checkout main &&
+	echo Another >b &&
+	echo Munged >d/z &&
+	git add b d/z &&
+	test_tick &&
+	git commit -m "Main touches b" &&
+	git tag main_b0 &&
+	git merge side &&
+	echo Touched >b &&
+	git add b &&
+	test_tick &&
+	git commit -m "Main touches b again"
+
+Switched to a new branch 'side'
+[side d02d707] Side makes an irrelevant commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 c
+[side 381f63c] Side makes another irrelevant commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[side e8cf16f] Side touches a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[side edbc4dc] Side makes yet another irrelevant commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+[main d829b82] Main touches b
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 b
+Merge made by the 'ort' strategy.
+ a   | 2 +-
+ c   | 1 +
+ d/f | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 c
+[main 7bf8a87] Main touches b again
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - further setup
+
+expecting success of 6004.4 'path optimization 2': 
+	git rev-parse side_a1 initial >expected &&
+	git rev-list HEAD -- a >actual &&
+	test_cmp expected actual
+
+ok 4 - path optimization 2
+
+expecting success of 6004.5 'pathspec with leading path': 
+	git rev-parse main^ main_b0 side_c0 initial >expected &&
+	git rev-list HEAD -- d >actual &&
+	test_cmp expected actual
+
+ok 5 - pathspec with leading path
+
+expecting success of 6004.6 'pathspec with glob (1)': 
+	git rev-parse main^ main_b0 side_c0 initial >expected &&
+	git rev-list HEAD -- "d/*" >actual &&
+	test_cmp expected actual
+
+ok 6 - pathspec with glob (1)
+
+expecting success of 6004.7 'pathspec with glob (2)': 
+	git rev-parse side_c0 initial >expected &&
+	git rev-list HEAD -- "d/[a-m]*" >actual &&
+	test_cmp expected actual
+
+ok 7 - pathspec with glob (2)
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6005-rev-list-count.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6005-rev-list-count/.git/
 expecting success of 6005.1 'setup': 
@@ -378853,319 +379612,305 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6002-rev-list-bisect.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6002-rev-list-bisect/.git/
-expecting success of 6002.1 'bisection diff --bisect l0 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 1 - bisection diff --bisect l0 ^root <= 0
-
-expecting success of 6002.2 'bisection diff --bisect l1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 2 - bisection diff --bisect l1 ^root <= 0
-
-expecting success of 6002.3 'bisection diff --bisect l2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 3 - bisection diff --bisect l2 ^root <= 0
-
-expecting success of 6002.4 'bisection diff --bisect a0 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 4 - bisection diff --bisect a0 ^root <= 0
-
-expecting success of 6002.5 'bisection diff --bisect a1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 5 - bisection diff --bisect a1 ^root <= 0
-
-expecting success of 6002.6 'bisection diff --bisect a2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 6 - bisection diff --bisect a2 ^root <= 0
-
-expecting success of 6002.7 'bisection diff --bisect a3 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 7 - bisection diff --bisect a3 ^root <= 0
-
-expecting success of 6002.8 'bisection diff --bisect b1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 8 - bisection diff --bisect b1 ^root <= 0
-
-expecting success of 6002.9 'bisection diff --bisect b2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 9 - bisection diff --bisect b2 ^root <= 0
-
-expecting success of 6002.10 'bisection diff --bisect b3 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 10 - bisection diff --bisect b3 ^root <= 0
-
-expecting success of 6002.11 'bisection diff --bisect c1 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 11 - bisection diff --bisect c1 ^root <= 0
-
-expecting success of 6002.12 'bisection diff --bisect c2 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 12 - bisection diff --bisect c2 ^root <= 0
-
-expecting success of 6002.13 'bisection diff --bisect c3 ^root <= 0': test $_bisect_err -le $_max_diff
-ok 13 - bisection diff --bisect c3 ^root <= 0
-
-expecting success of 6002.14 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
-ok 14 - bisection diff --bisect E ^F <= 0
-
-expecting success of 6002.15 'bisection diff --bisect e1 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 15 - bisection diff --bisect e1 ^F <= 0
-
-expecting success of 6002.16 'bisection diff --bisect e2 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 16 - bisection diff --bisect e2 ^F <= 0
+*** t6007-rev-list-cherry-pick-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-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
+[main (root-commit) 87a5b85] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Switched to a new branch 'branch'
+[branch d81b112] C
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 bar
+[branch 50f946e] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Updated 1 path from 75417d5
+[main 9e00a87] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 9c68531] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[main 555ccf5] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
 
-expecting success of 6002.18 'bisection diff --bisect e4 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 18 - bisection diff --bisect e4 ^F <= 0
+expecting success of 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 6002.19 'bisection diff --bisect e5 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 19 - bisection diff --bisect e5 ^F <= 0
+ok 2 - --left-right
 
-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 6007.3 '--count': 
+	git rev-list --count B...C > actual &&
+	test "$(cat actual)" = 2
 
-expecting success of 6002.21 'bisection diff --bisect e7 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 21 - bisection diff --bisect e7 ^F <= 0
+ok 3 - --count
 
-expecting success of 6002.22 'bisection diff --bisect f1 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 22 - bisection diff --bisect f1 ^F <= 0
+expecting success of 6007.4 '--cherry-pick foo comes up empty': 
+	test -z "$(git rev-list --left-right --cherry-pick B...C -- 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
+ok 4 - --cherry-pick foo comes up empty
 
-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 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 6002.25 'bisection diff --bisect f4 ^F <= 0': test $_bisect_err -le $_max_diff
-ok 25 - bisection diff --bisect f4 ^F <= 0
+ok 5 - --cherry-pick bar does not come up empty
 
-expecting success of 6002.26 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
-ok 26 - bisection diff --bisect E ^F <= 0
+expecting success of 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 6002.27 'bisection diff --bisect V ^U <= 1': test $_bisect_err -le $_max_diff
-ok 27 - bisection diff --bisect V ^U <= 1
+ok 6 - bar does not come up empty
 
-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 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 6002.29 'bisection diff --bisect u1 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 29 - bisection diff --bisect u1 ^U <= 0
+ok 7 - --cherry-pick bar does not come up empty (II)
 
-expecting success of 6002.30 'bisection diff --bisect u2 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 30 - bisection diff --bisect u2 ^U <= 0
+expecting success of 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 6002.31 'bisection diff --bisect u3 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 31 - bisection diff --bisect u3 ^U <= 0
+ok 8 - name-rev multiple --refs combine inclusive
 
-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 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 6002.33 'bisection diff --bisect u5 ^U <= 0': test $_bisect_err -le $_max_diff
-ok 33 - bisection diff --bisect u5 ^U <= 0
+ok 9 - name-rev --refs excludes non-matched patterns
 
-expecting success of 6002.34 '--bisect l5 ^root': check_output bisect-l5-root "git rev-list $_bisect_option l5 ^root"
-ok 34 - --bisect l5 ^root
+expecting success of 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 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
+ok 10 - name-rev --exclude excludes matched patterns
 
-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 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 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
+ok 11 - name-rev --no-refs clears the refs list
 
-expecting success of 6002.38 '--bisect l5 ^b3 ^a3 ^b4 ^a4': check_output bisect-l5-b3-a3-b4-a4 "git rev-list $_bisect_option l3 ^b3 ^a3 ^a4"
-ok 38 - --bisect l5 ^b3 ^a3 ^b4 ^a4
+expecting success of 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
 
-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
+ok 12 - --cherry-mark
 
-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 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
 
-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
+ok 13 - --cherry-mark --left-right
 
-expecting success of 6002.42 '--bisect a4 ^a2 ^a3 ^b4 ^c2': check_output bisect-a4-a2-a3-b4-c2 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2"
-ok 42 - --bisect a4 ^a2 ^a3 ^b4 ^c2
+expecting success of 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
 
-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
+ok 14 - --cherry-pick --right-only
 
-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 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
 
-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
+ok 15 - --cherry-pick --left-only
 
-expecting success of 6002.46 'set up fake --bisect refs': 
-	git update-ref refs/bisect/bad c3 &&
-	good=$(git rev-parse b1) &&
-	git update-ref refs/bisect/good-$good $good &&
-	good=$(git rev-parse c1) &&
-	git update-ref refs/bisect/good-$good $good
+expecting success of 6007.16 '--cherry': 
+	git rev-list --cherry F...E -- bar > actual &&
+	git name-rev --annotate-stdin --name-only --refs="*tags/*" \
+		< actual > actual.named &&
+	test_cmp expect actual.named
 
-ok 46 - set up fake --bisect refs
+ok 16 - --cherry
 
-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 &&
+expecting success of 6007.17 '--cherry --count': 
+	git rev-list --cherry --count F...E -- bar > actual &&
 	test_cmp expect actual
 
-ok 47 - rev-list --bisect can default to good/bad refs
-
-expecting success of 6002.48 'rev-parse --bisect can default to good/bad refs': 
-	git rev-parse c3 ^b1 ^c1 >expect &&
-	git rev-parse --bisect >actual &&
-
-	# output order depends on the refnames, which in turn depends on
-	# the exact sha1s. We just want to make sure we have the same set
-	# of lines in any order.
-	sort <expect >expect.sorted &&
-	sort <actual >actual.sorted &&
-	test_cmp expect.sorted actual.sorted
-
-ok 48 - rev-parse --bisect can default to good/bad refs
-
-expecting success of 6002.49 '--bisect --first-parent': check_output bisect-first-parent "git rev-list --bisect --first-parent E ^F"
-ok 49 - --bisect --first-parent
-
-expecting success of 6002.50 '--first-parent': check_output first-parent "git rev-list --first-parent E ^F"
-ok 50 - --first-parent
-
-expecting success of 6002.51 '--bisect-vars --first-parent': check_output bisect-vars-first-parent "git rev-list --bisect-vars --first-parent E ^F"
-ok 51 - --bisect-vars --first-parent
-
-expecting success of 6002.52 '--bisect-all --first-parent': 
-	cat >expect.unsorted <<-EOF &&
-	$(git rev-parse E) (tag: E, dist=0)
-	$(git rev-parse e1) (tag: e1, dist=1)
-	$(git rev-parse e2) (tag: e2, dist=2)
-	$(git rev-parse e3) (tag: e3, dist=3)
-	$(git rev-parse e4) (tag: e4, dist=4)
-	$(git rev-parse e5) (tag: e5, dist=4)
-	$(git rev-parse e6) (tag: e6, dist=3)
-	$(git rev-parse e7) (tag: e7, dist=2)
-	$(git rev-parse e8) (tag: e8, dist=1)
-	EOF
+ok 17 - --cherry --count
 
-	# 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 &&
+expecting success of 6007.18 '--cherry-mark --count': 
+	git rev-list --cherry-mark --count F...E -- bar > actual &&
 	test_cmp expect actual
 
-ok 52 - --bisect-all --first-parent
-
-# passed all 52 test(s)
-1..52
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6003-rev-list-topo-order.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6003-rev-list-topo-order/.git/
-expecting success of 6003.1 'rev-list has correct number of entries': check_output rev-list-has-correct-number-of-entries "git rev-list HEAD | wc -l | tr -d \" \""
-ok 1 - rev-list has correct number of entries
-
-expecting success of 6003.2 'simple topo order': check_output simple-topo-order "git rev-list --topo-order  HEAD"
-ok 2 - simple topo order
-
-expecting success of 6003.3 'simple date order': check_output simple-date-order "git rev-list --date-order  HEAD"
-ok 3 - simple date order
-
-expecting success of 6003.4 'simple author-date order': check_output simple-author-date-order "git rev-list --author-date-order  HEAD"
-ok 4 - simple author-date order
-
-expecting success of 6003.5 'two diamonds topo order (g6)': check_output two-diamonds-topo-order-g6 "git rev-list --topo-order  g4"
-ok 5 - two diamonds topo order (g6)
-
-expecting success of 6003.6 'multiple heads': check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
-ok 6 - multiple heads
-
-expecting success of 6003.7 'multiple heads, prune at a1': check_output multiple-heads-prune-at-a1 "git rev-list --topo-order a3 b3 c3 ^a1"
-ok 7 - multiple heads, prune at a1
-
-expecting success of 6003.8 'multiple heads, prune at l1': check_output multiple-heads-prune-at-l1 "git rev-list --topo-order a3 b3 c3 ^l1"
-ok 8 - multiple heads, prune at l1
-
-expecting success of 6003.9 'cross-epoch, head at l5, prune at l1': check_output cross-epoch-head-at-l5-prune-at-l1 "git rev-list --topo-order l5 ^l1"
-ok 9 - cross-epoch, head at l5, prune at l1
-
-expecting success of 6003.10 'duplicated head arguments': check_output duplicated-head-arguments "git rev-list --topo-order l5 l5 ^l1"
-ok 10 - duplicated head arguments
-
-expecting success of 6003.11 'prune near topo': check_output prune-near-topo "git rev-list --topo-order a4 ^c3"
-ok 11 - prune near topo
-
-expecting success of 6003.12 'head has no parent': check_output head-has-no-parent "git rev-list --topo-order  root"
-ok 12 - head has no parent
-
-expecting success of 6003.13 'two nodes - one head, one base': check_output two-nodes-one-head-one-base "git rev-list --topo-order  l0"
-ok 13 - two nodes - one head, one base
-
-expecting success of 6003.14 'three nodes one head, one internal, one base': check_output three-nodes-one-head-one-internal-one-base "git rev-list --topo-order  l1"
-ok 14 - three nodes one head, one internal, one base
-
-expecting success of 6003.15 'linear prune l2 ^root': check_output linear-prune-l2-root "git rev-list --topo-order  l2 ^root"
-ok 15 - linear prune l2 ^root
-
-expecting success of 6003.16 'linear prune l2 ^l0': check_output linear-prune-l2-l0 "git rev-list --topo-order  l2 ^l0"
-ok 16 - linear prune l2 ^l0
-
-expecting success of 6003.17 'linear prune l2 ^l1': check_output linear-prune-l2-l1 "git rev-list --topo-order  l2 ^l1"
-ok 17 - linear prune l2 ^l1
-
-expecting success of 6003.18 'linear prune l5 ^a4': check_output linear-prune-l5-a4 "git rev-list --topo-order  l5 ^a4"
-ok 18 - linear prune l5 ^a4
-
-expecting success of 6003.19 'linear prune l5 ^l3': check_output linear-prune-l5-l3 "git rev-list --topo-order  l5 ^l3"
-ok 19 - linear prune l5 ^l3
-
-expecting success of 6003.20 'linear prune l5 ^l4': check_output linear-prune-l5-l4 "git rev-list --topo-order  l5 ^l4"
-ok 20 - linear prune l5 ^l4
-
-expecting success of 6003.21 'max-count 10 - topo order': check_output max-count-10-topo-order "git rev-list --topo-order  --max-count=10 l5"
-ok 21 - max-count 10 - topo order
-
-expecting success of 6003.22 'max-count 10 - non topo order': check_output max-count-10-non-topo-order "git rev-list --max-count=10 l5"
-ok 22 - max-count 10 - non topo order
-
-expecting success of 6003.23 '--max-age=c3, no --topo-order': check_output max-age-c3-no-topo-order "git rev-list --max-age=51148811 l5"
-ok 23 - --max-age=c3, no --topo-order
-
-expecting success of 6003.24 '--max-age=c3, --topo-order': check_output max-age-c3-topo-order "git rev-list --topo-order --max-age=51148811 l5"
-ok 24 - --max-age=c3, --topo-order
-
-expecting success of 6003.25 'one specified head reachable from another a4, c3, --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-topo-order "list_duplicates git rev-list --topo-order a4 c3"
-ok 25 - one specified head reachable from another a4, c3, --topo-order
-
-expecting success of 6003.26 'one specified head reachable from another c3, a4, --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-topo-order "list_duplicates git rev-list --topo-order c3 a4"
-ok 26 - one specified head reachable from another c3, a4, --topo-order
+ok 18 - --cherry-mark --count
 
-expecting success of 6003.27 'one specified head reachable from another a4, c3, no --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-no-topo-order "list_duplicates git rev-list a4 c3"
-ok 27 - one specified head reachable from another a4, c3, no --topo-order
+expecting success of 6007.19 '--cherry-mark --left-right --count': 
+	git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
+	test_cmp expect actual
 
-expecting success of 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
+ok 19 - --cherry-mark --left-right --count
 
-expecting success of 6003.29 'graph with c3 and a4 parents of head': check_output graph-with-c3-and-a4-parents-of-head "list_duplicates git rev-list m1"
-ok 29 - graph with c3 and a4 parents of head
+expecting success of 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)"
 
-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
+[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 6003.31 'head ^head --topo-order': git rev-list --topo-order  a3 ^a3
-ok 31 - head ^head --topo-order
+expecting success of 6007.21 '--count --left-right': 
+	git rev-list --count --left-right C...D > actual &&
+	test_cmp expect actual
 
-expecting success of 6003.32 'head ^head no --topo-order': git rev-list a3 ^a3
-ok 32 - head ^head no --topo-order
+ok 21 - --count --left-right
 
-expecting success of 6003.33 'simple topo order (l5r1)': check_output simple-topo-order-l5r1 "git rev-list --topo-order  l5r1"
-ok 33 - simple topo order (l5r1)
+expecting success of 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
 
-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)
+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 6003.35 'don't print things unreachable from one branch': check_output don-t-print-things-unreachable-from-one-branch "git rev-list a3 ^b3 --topo-order"
-ok 35 - don't print things unreachable from one branch
+expecting success of 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
 
-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
+Switched to a new branch 'shy-diff'
+[shy-diff 694eab7] dont-look-at-me
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dont-look-at-me.t
+[shy-diff 065751b] tip
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'mainline'
+[mainline edb671e] to-cherry-pick
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to-cherry-pick.t
+edb671edd4843042c1e4b762a9eb9a82125402aa
+065751bb4ac05081d62425d3a9670d9d9102f001
+ok 23 - --cherry-pick avoids looking at full diffs
 
-# passed all 36 test(s)
-1..36
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6008-rev-list-submodule.sh ***
@@ -379467,6 +380212,7 @@
 		sh -c "test -t 1 && test -t 2"
 
 )
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 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 &&
@@ -379773,8 +380519,8 @@
 	test_cmp expect3 fuzzy3 &&
 	! test_cmp actual1 actual2
 
---- actual1	2025-12-18 01:37:39.510773267 +0000
-+++ actual2	2025-12-18 01:37:39.514773267 +0000
+--- actual1	2024-11-14 19:39:47.171970675 +0000
++++ actual2	2024-11-14 19:39:47.191970881 +0000
 @@ -1 +1 @@
 -79c1a11 79c1a11 79c1a11
 +79c1a 79c1a 79c1a
@@ -379865,305 +380611,319 @@
 1..80
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6007-rev-list-cherry-pick-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t6002-rev-list-bisect.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-[main (root-commit) 87a5b85] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-Switched to a new branch 'branch'
-[branch d81b112] C
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 bar
-[branch 50f946e] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
-Updated 1 path from 75417d5
-[main 9e00a87] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 9c68531] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main 555ccf5] F
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+expecting success of 6002.2 'bisection diff --bisect l1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 2 - bisection diff --bisect l1 ^root <= 0
 
-expecting success of 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 6002.3 'bisection diff --bisect l2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 3 - bisection diff --bisect l2 ^root <= 0
 
-ok 2 - --left-right
+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 6007.3 '--count': 
-	git rev-list --count B...C > actual &&
-	test "$(cat actual)" = 2
+expecting success of 6002.5 'bisection diff --bisect a1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 5 - bisection diff --bisect a1 ^root <= 0
 
-ok 3 - --count
+expecting success of 6002.6 'bisection diff --bisect a2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 6 - bisection diff --bisect a2 ^root <= 0
 
-expecting success of 6007.4 '--cherry-pick foo comes up empty': 
-	test -z "$(git rev-list --left-right --cherry-pick B...C -- foo)"
+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
 
-ok 4 - --cherry-pick foo comes up empty
+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 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 6002.9 'bisection diff --bisect b2 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 9 - bisection diff --bisect b2 ^root <= 0
 
-ok 5 - --cherry-pick bar does not come up empty
+expecting success of 6002.10 'bisection diff --bisect b3 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 10 - bisection diff --bisect b3 ^root <= 0
 
-expecting success of 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 6002.11 'bisection diff --bisect c1 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 11 - bisection diff --bisect c1 ^root <= 0
 
-ok 6 - bar does not come up empty
+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 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 6002.13 'bisection diff --bisect c3 ^root <= 0': test $_bisect_err -le $_max_diff
+ok 13 - bisection diff --bisect c3 ^root <= 0
 
-ok 7 - --cherry-pick bar does not come up empty (II)
+expecting success of 6002.14 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
+ok 14 - bisection diff --bisect E ^F <= 0
 
-expecting success of 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 6002.15 'bisection diff --bisect e1 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 15 - bisection diff --bisect e1 ^F <= 0
 
-ok 8 - name-rev multiple --refs combine inclusive
+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 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 6002.17 'bisection diff --bisect e3 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 17 - bisection diff --bisect e3 ^F <= 0
 
-ok 9 - name-rev --refs excludes non-matched patterns
+expecting success of 6002.18 'bisection diff --bisect e4 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 18 - bisection diff --bisect e4 ^F <= 0
 
-expecting success of 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 6002.19 'bisection diff --bisect e5 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 19 - bisection diff --bisect e5 ^F <= 0
 
-ok 10 - name-rev --exclude excludes matched patterns
+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 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 6002.21 'bisection diff --bisect e7 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 21 - bisection diff --bisect e7 ^F <= 0
 
-ok 11 - name-rev --no-refs clears the refs list
+expecting success of 6002.22 'bisection diff --bisect f1 ^F <= 0': test $_bisect_err -le $_max_diff
+ok 22 - bisection diff --bisect f1 ^F <= 0
 
-expecting success of 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
+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
 
-ok 12 - --cherry-mark
+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 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
+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
 
-ok 13 - --cherry-mark --left-right
+expecting success of 6002.26 'bisection diff --bisect E ^F <= 0': test $_bisect_err -le $_max_diff
+ok 26 - bisection diff --bisect E ^F <= 0
 
-expecting success of 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
+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
 
-ok 14 - --cherry-pick --right-only
+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 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
+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
 
-ok 15 - --cherry-pick --left-only
+expecting success of 6002.30 'bisection diff --bisect u2 ^U <= 0': test $_bisect_err -le $_max_diff
+ok 30 - bisection diff --bisect u2 ^U <= 0
 
-expecting success of 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
+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
 
-ok 16 - --cherry
+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 6007.17 '--cherry --count': 
-	git rev-list --cherry --count F...E -- bar > actual &&
-	test_cmp expect actual
+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
 
-ok 17 - --cherry --count
+expecting success of 6002.34 '--bisect l5 ^root': check_output bisect-l5-root "git rev-list $_bisect_option l5 ^root"
+ok 34 - --bisect l5 ^root
 
-expecting success of 6007.18 '--cherry-mark --count': 
-	git rev-list --cherry-mark --count F...E -- bar > actual &&
-	test_cmp expect actual
+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
 
-ok 18 - --cherry-mark --count
+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 6007.19 '--cherry-mark --left-right --count': 
-	git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
+expecting success of 6002.37 '--bisect l3 ^root ^c3 ^b4': check_output bisect-l3-root-c3-b4 "git rev-list $_bisect_option l3 ^root ^c3 ^b4"
+ok 37 - --bisect l3 ^root ^c3 ^b4
+
+expecting success of 6002.38 '--bisect l5 ^b3 ^a3 ^b4 ^a4': check_output bisect-l5-b3-a3-b4-a4 "git rev-list $_bisect_option l3 ^b3 ^a3 ^a4"
+ok 38 - --bisect l5 ^b3 ^a3 ^b4 ^a4
+
+expecting success of 6002.39 '--bisect l4 ^a2 ^a3 ^b ^a4': check_output bisect-l4-a2-a3-b-a4 "git rev-list $_bisect_option l4 ^a2 ^a3 ^a4"
+ok 39 - --bisect l4 ^a2 ^a3 ^b ^a4
+
+expecting success of 6002.40 '--bisect l3 ^a2 ^a3 ^b ^a4': check_output bisect-l3-a2-a3-b-a4 "git rev-list $_bisect_option l3 ^a2 ^a3 ^a4"
+ok 40 - --bisect l3 ^a2 ^a3 ^b ^a4
+
+expecting success of 6002.41 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
+ok 41 - --bisect a4 ^a2 ^a3 ^b4
+
+expecting success of 6002.42 '--bisect a4 ^a2 ^a3 ^b4 ^c2': check_output bisect-a4-a2-a3-b4-c2 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2"
+ok 42 - --bisect a4 ^a2 ^a3 ^b4 ^c2
+
+expecting success of 6002.43 '--bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3': check_output bisect-a4-a2-a3-b4-c2-c3 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4 ^c2 ^c3"
+ok 43 - --bisect a4 ^a2 ^a3 ^b4 ^c2 ^c3
+
+expecting success of 6002.44 '--bisect a4 ^a2 ^a3 ^b4': check_output bisect-a4-a2-a3-b4 "git rev-list $_bisect_option a4 ^a2 ^a3 ^b4"
+ok 44 - --bisect a4 ^a2 ^a3 ^b4
+
+expecting success of 6002.45 '--bisect c3 ^a2 ^a3 ^b4 ^c2': check_output bisect-c3-a2-a3-b4-c2 "git rev-list $_bisect_option c3 ^a2 ^a3 ^b4 ^c2"
+ok 45 - --bisect c3 ^a2 ^a3 ^b4 ^c2
+
+expecting success of 6002.46 'set up fake --bisect refs': 
+	git update-ref refs/bisect/bad c3 &&
+	good=$(git rev-parse b1) &&
+	git update-ref refs/bisect/good-$good $good &&
+	good=$(git rev-parse c1) &&
+	git update-ref refs/bisect/good-$good $good
+
+ok 46 - set up fake --bisect refs
+
+expecting success of 6002.47 'rev-list --bisect can default to good/bad refs': 
+	# the only thing between c3 and c1 is c2
+	git rev-parse c2 >expect &&
+	git rev-list --bisect >actual &&
 	test_cmp expect actual
 
-ok 19 - --cherry-mark --left-right --count
+ok 47 - rev-list --bisect can default to good/bad refs
 
-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)"
+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 &&
 
-[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
+	# 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
 
-expecting success of 6007.21 '--count --left-right': 
-	git rev-list --count --left-right C...D > actual &&
+ok 48 - rev-parse --bisect can default to good/bad refs
+
+expecting success of 6002.49 '--bisect --first-parent': check_output bisect-first-parent "git rev-list --bisect --first-parent E ^F"
+ok 49 - --bisect --first-parent
+
+expecting success of 6002.50 '--first-parent': check_output first-parent "git rev-list --first-parent E ^F"
+ok 50 - --first-parent
+
+expecting success of 6002.51 '--bisect-vars --first-parent': check_output bisect-vars-first-parent "git rev-list --bisect-vars --first-parent E ^F"
+ok 51 - --bisect-vars --first-parent
+
+expecting success of 6002.52 '--bisect-all --first-parent': 
+	cat >expect.unsorted <<-EOF &&
+	$(git rev-parse E) (tag: E, dist=0)
+	$(git rev-parse e1) (tag: e1, dist=1)
+	$(git rev-parse e2) (tag: e2, dist=2)
+	$(git rev-parse e3) (tag: e3, dist=3)
+	$(git rev-parse e4) (tag: e4, dist=4)
+	$(git rev-parse e5) (tag: e5, dist=4)
+	$(git rev-parse e6) (tag: e6, dist=3)
+	$(git rev-parse e7) (tag: e7, dist=2)
+	$(git rev-parse e8) (tag: e8, dist=1)
+	EOF
+
+	# expect results to be ordered by distance (descending),
+	# commit hash (ascending)
+	sort -k4,4r -k1,1 expect.unsorted >expect &&
+	git rev-list --bisect-all --first-parent E ^F >actual &&
 	test_cmp expect actual
 
-ok 21 - --count --left-right
+ok 52 - --bisect-all --first-parent
 
-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
+# passed all 52 test(s)
+1..52
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6003-rev-list-topo-order.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6003-rev-list-topo-order/.git/
+expecting success of 6003.1 'rev-list has correct number of entries': check_output rev-list-has-correct-number-of-entries "git rev-list HEAD | wc -l | tr -d \" \""
+ok 1 - rev-list has correct number of entries
 
-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 6003.2 'simple topo order': check_output simple-topo-order "git rev-list --topo-order  HEAD"
+ok 2 - simple topo order
 
-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
+expecting success of 6003.3 'simple date order': check_output simple-date-order "git rev-list --date-order  HEAD"
+ok 3 - simple date order
 
-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
+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
 
-# passed all 23 test(s)
-1..23
+expecting success of 6003.5 'two diamonds topo order (g6)': check_output two-diamonds-topo-order-g6 "git rev-list --topo-order  g4"
+ok 5 - two diamonds topo order (g6)
+
+expecting success of 6003.6 'multiple heads': check_output multiple-heads "git rev-list --topo-order a3 b3 c3"
+ok 6 - multiple heads
+
+expecting success of 6003.7 'multiple heads, prune at a1': check_output multiple-heads-prune-at-a1 "git rev-list --topo-order a3 b3 c3 ^a1"
+ok 7 - multiple heads, prune at a1
+
+expecting success of 6003.8 'multiple heads, prune at l1': check_output multiple-heads-prune-at-l1 "git rev-list --topo-order a3 b3 c3 ^l1"
+ok 8 - multiple heads, prune at l1
+
+expecting success of 6003.9 'cross-epoch, head at l5, prune at l1': check_output cross-epoch-head-at-l5-prune-at-l1 "git rev-list --topo-order l5 ^l1"
+ok 9 - cross-epoch, head at l5, prune at l1
+
+expecting success of 6003.10 'duplicated head arguments': check_output duplicated-head-arguments "git rev-list --topo-order l5 l5 ^l1"
+ok 10 - duplicated head arguments
+
+expecting success of 6003.11 'prune near topo': check_output prune-near-topo "git rev-list --topo-order a4 ^c3"
+ok 11 - prune near topo
+
+expecting success of 6003.12 'head has no parent': check_output head-has-no-parent "git rev-list --topo-order  root"
+ok 12 - head has no parent
+
+expecting success of 6003.13 'two nodes - one head, one base': check_output two-nodes-one-head-one-base "git rev-list --topo-order  l0"
+ok 13 - two nodes - one head, one base
+
+expecting success of 6003.14 'three nodes one head, one internal, one base': check_output three-nodes-one-head-one-internal-one-base "git rev-list --topo-order  l1"
+ok 14 - three nodes one head, one internal, one base
+
+expecting success of 6003.15 'linear prune l2 ^root': check_output linear-prune-l2-root "git rev-list --topo-order  l2 ^root"
+ok 15 - linear prune l2 ^root
+
+expecting success of 6003.16 'linear prune l2 ^l0': check_output linear-prune-l2-l0 "git rev-list --topo-order  l2 ^l0"
+ok 16 - linear prune l2 ^l0
+
+expecting success of 6003.17 'linear prune l2 ^l1': check_output linear-prune-l2-l1 "git rev-list --topo-order  l2 ^l1"
+ok 17 - linear prune l2 ^l1
+
+expecting success of 6003.18 'linear prune l5 ^a4': check_output linear-prune-l5-a4 "git rev-list --topo-order  l5 ^a4"
+ok 18 - linear prune l5 ^a4
+
+expecting success of 6003.19 'linear prune l5 ^l3': check_output linear-prune-l5-l3 "git rev-list --topo-order  l5 ^l3"
+ok 19 - linear prune l5 ^l3
+
+expecting success of 6003.20 'linear prune l5 ^l4': check_output linear-prune-l5-l4 "git rev-list --topo-order  l5 ^l4"
+ok 20 - linear prune l5 ^l4
+
+expecting success of 6003.21 'max-count 10 - topo order': check_output max-count-10-topo-order "git rev-list --topo-order  --max-count=10 l5"
+ok 21 - max-count 10 - topo order
+
+expecting success of 6003.22 'max-count 10 - non topo order': check_output max-count-10-non-topo-order "git rev-list --max-count=10 l5"
+ok 22 - max-count 10 - non topo order
+
+expecting success of 6003.23 '--max-age=c3, no --topo-order': check_output max-age-c3-no-topo-order "git rev-list --max-age=51148811 l5"
+ok 23 - --max-age=c3, no --topo-order
+
+expecting success of 6003.24 '--max-age=c3, --topo-order': check_output max-age-c3-topo-order "git rev-list --topo-order --max-age=51148811 l5"
+ok 24 - --max-age=c3, --topo-order
+
+expecting success of 6003.25 'one specified head reachable from another a4, c3, --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-topo-order "list_duplicates git rev-list --topo-order a4 c3"
+ok 25 - one specified head reachable from another a4, c3, --topo-order
+
+expecting success of 6003.26 'one specified head reachable from another c3, a4, --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-topo-order "list_duplicates git rev-list --topo-order c3 a4"
+ok 26 - one specified head reachable from another c3, a4, --topo-order
+
+expecting success of 6003.27 'one specified head reachable from another a4, c3, no --topo-order': check_output one-specified-head-reachable-from-another-a4-c3-no-topo-order "list_duplicates git rev-list a4 c3"
+ok 27 - one specified head reachable from another a4, c3, no --topo-order
+
+expecting success of 6003.28 'one specified head reachable from another c3, a4, no --topo-order': check_output one-specified-head-reachable-from-another-c3-a4-no-topo-order "list_duplicates git rev-list c3 a4"
+ok 28 - one specified head reachable from another c3, a4, no --topo-order
+
+expecting success of 6003.29 'graph with c3 and a4 parents of head': check_output graph-with-c3-and-a4-parents-of-head "list_duplicates git rev-list m1"
+ok 29 - graph with c3 and a4 parents of head
+
+expecting success of 6003.30 'graph with a4 and c3 parents of head': check_output graph-with-a4-and-c3-parents-of-head "list_duplicates git rev-list m2"
+ok 30 - graph with a4 and c3 parents of head
+
+expecting success of 6003.31 'head ^head --topo-order': git rev-list --topo-order  a3 ^a3
+ok 31 - head ^head --topo-order
+
+expecting success of 6003.32 'head ^head no --topo-order': git rev-list a3 ^a3
+ok 32 - head ^head no --topo-order
+
+expecting success of 6003.33 'simple topo order (l5r1)': check_output simple-topo-order-l5r1 "git rev-list --topo-order  l5r1"
+ok 33 - simple topo order (l5r1)
+
+expecting success of 6003.34 'simple topo order (r1l5)': check_output simple-topo-order-r1l5 "git rev-list --topo-order  r1l5"
+ok 34 - simple topo order (r1l5)
+
+expecting success of 6003.35 'don't print things unreachable from one branch': check_output don-t-print-things-unreachable-from-one-branch "git rev-list a3 ^b3 --topo-order"
+ok 35 - don't print things unreachable from one branch
+
+expecting success of 6003.36 '--topo-order a4 l3': check_output topo-order-a4-l3 "git rev-list --topo-order a4 l3"
+ok 36 - --topo-order a4 l3
+
+# passed all 36 test(s)
+1..36
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6011-rev-list-with-bad-commit.sh ***
@@ -380305,1405 +381065,862 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6014-rev-list-all.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6014-rev-list-all/.git/
-expecting success of 6014.1 'setup': 
-
-	commit one &&
-	commit two &&
-	git checkout HEAD^ &&
-	commit detached
-
-
-[master (root-commit) 86412ff] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 4931c53] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Note: switching to 'HEAD^'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 86412ff one
-[detached HEAD 13d8fe0] detached
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
-
-expecting success of 6014.2 'rev-list --all lists detached HEAD': 
-
-	test 3 = $(git rev-list --all | wc -l)
-
-
-ok 2 - rev-list --all lists detached HEAD
-
-expecting success of 6014.3 'repack does not lose detached HEAD': 
-
-	git gc &&
-	git prune --expire=now &&
-	git show HEAD
-
-
-commit 13d8fe0bae4079d4dedb755a88319ddebda9a07b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    detached
-
-diff --git a/foo b/foo
-index 5626abf..9aa4e2b 100644
---- a/foo
-+++ b/foo
-@@ -1 +1 @@
--one
-+detached
-ok 3 - repack does not lose detached HEAD
-
-expecting success of 6014.4 'rev-list --graph --no-walk is forbidden': 
-	test_must_fail git rev-list --graph --no-walk HEAD
-
-fatal: options '--no-walk' and '--graph' cannot be used together
-ok 4 - rev-list --graph --no-walk is forbidden
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5616-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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
+*** t6009-rev-list-parent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6009-rev-list-parent/.git/
+expecting success of 6009.1 'setup': 
 
-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)
+	touch file &&
+	git add file &&
 
-aeb0144502699ac86da4c2c98d4cd3b741c6c645 HEAD
-aeb0144502699ac86da4c2c98d4cd3b741c6c645 refs/heads/main
-ok 5 - verify that .promisor file contains refs fetched
+	test_commit one &&
 
-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
+	test_tick=$(($test_tick - 2400)) &&
 
-Already on 'main'
-Your branch is up to date with 'origin/main'.
-ok 6 - verify checkout with dynamic object fetch
+	test_commit two &&
+	test_commit three &&
+	test_commit four &&
 
-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
+	git log --pretty=oneline --abbrev-commit
 
-[main b4a5c87] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 2260bed] mod b
+[main (root-commit) e622cea] one
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 85d45de] mod c
+ 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(+)
-[main f571048] mod d
+ create mode 100644 two.t
+[main ecfa770] three
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[main d0edb11] mod e
+ create mode 100644 three.t
+[main 0906875] four
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.45.2/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.45.2/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
+ create mode 100644 four.t
+0906875 four
+ecfa770 three
+bfa07e2 two
+e622cea one
+ok 1 - setup
 
-ok 10 - verify blame causes dynamic object fetch
+expecting success of 6009.2 'one is ancestor of others and should not be shown': 
 
-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
+	git rev-list one --not four >result &&
+	test_must_be_empty result
 
-[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.45.2/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
+ok 2 - one is ancestor of others and should not be shown
 
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/srv.bare
-   d0edb11..03262f2  main       -> origin/main
-ok 12 - override inherited filter-spec using --no-filter
+expecting success of 6009.3 'setup roots, merges and octopuses': 
 
-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
+	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
 
-[main 2456429] mod a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main f359f06] mod b
+Switched to a new branch 'newroot'
+[newroot (root-commit) 04238a1] five
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main ed3a9d1] mod c
+ 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(+)
-[main 42a1e60] mod d
+ 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(+)
-[main 2827aa8] mod e
+ 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(+)
-[main 3f5edd7] mod f
- Author: A U Thor <author@example.com>
+ create mode 100644 eight.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ five.t | 1 +
  1 file changed, 1 insertion(+)
-To file:///build/reproducible-path/git-2.45.2/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.45.2/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
+ 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 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 6009.4 'parse --max-parents & --min-parents': 
+	test_must_fail git rev-list --max-parents=1q HEAD 2>error &&
+	grep "not an integer" error &&
 
-[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.45.2/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
+	test_must_fail git rev-list --min-parents=1q HEAD 2>error &&
+	grep "not an integer" error &&
 
-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 rev-list --max-parents=1 --min-parents=1 HEAD &&
+	git rev-list --max-parents=-1 --min-parents=-1 HEAD
 
-	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 &&
+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
 
-	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 6009.5 'rev-list roots': 
 
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/srv.bare
-   3f5edd7..129c8a2  main       -> origin/main
-Auto packing the repository in background for optimum performance.
-See "git help gc" for manual housekeeping.
-Auto packing the repository in background for optimum performance.
-See "git help gc" for manual housekeeping.
-ok 16 - apply a different filter using --refetch
+	check_revlist "--max-parents=0" one five
 
-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 &&
+ok 5 - rev-list roots
 
-	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
+expecting success of 6009.6 'rev-list no merges': 
 
-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.45.2/t/trash directory.t5616-partial-clone/srv.bare'\'''
-trace: built-in: git upload-pack '/build/reproducible-path/git-2.45.2/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
-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: 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
-trace: built-in: git maintenance run --auto --no-quiet
-trace: run_command: git gc --auto --no-quiet
-trace: built-in: git gc --auto --no-quiet
-Auto packing the repository in background for optimum performance.
-See "git help gc" for manual housekeeping.
-trace: run_command: git pack-refs --all --prune --auto
-trace: built-in: git pack-refs --all --prune --auto
-trace: run_command: git reflog expire --all
-trace: built-in: git reflog expire --all
-ok 17 - fetch --refetch works with a shallow clone
+	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 5616.18 'fetch --refetch triggers repacking': 
-	GIT_TRACE2_CONFIG_PARAMS=gc.autoPackLimit,maintenance.incremental-repack.auto &&
-	export GIT_TRACE2_CONFIG_PARAMS &&
+ok 6 - rev-list no merges
 
-	GIT_TRACE2_EVENT="$PWD/trace1.event" \
-	git -C pc1 fetch --refetch origin &&
-	test_subcommand git maintenance run --auto --no-quiet <trace1.event &&
-	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace1.event &&
-	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace1.event &&
+expecting success of 6009.7 'rev-list no octopuses': 
 
-	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 <trace2.event &&
-	grep \"param\":\"gc.autopacklimit\",\"value\":\"0\" trace2.event &&
-	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"-1\" trace2.event &&
+	check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
 
-	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 <trace3.event &&
-	grep \"param\":\"gc.autopacklimit\",\"value\":\"1\" trace3.event &&
-	grep \"param\":\"maintenance.incremental-repack.auto\",\"value\":\"0\" trace3.event
+ok 7 - rev-list no octopuses
 
-Auto packing the repository in background for optimum performance.
-See "git help gc" for manual housekeeping.
-{"event":"child_start","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c","thread":"main","time":"2025-12-18T01:37:29.523511Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet"]}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36","thread":"main","time":"2025-12-18T01:37:29.528865Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36/20251218T013729.531936Z-Hfbad846e-P00007e3d","thread":"main","time":"2025-12-18T01:37:29.532622Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36/20251218T013729.531936Z-Hfbad846e-P00007e3d/20251218T013729.539659Z-Hfbad846e-P00007e40","thread":"main","time":"2025-12-18T01:37:29.540340Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36/20251218T013729.531936Z-Hfbad846e-P00007e3d/20251218T013729.545005Z-Hfbad846e-P00007e44","thread":"main","time":"2025-12-18T01:37:29.545619Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36/20251218T013729.531936Z-Hfbad846e-P00007e3d/20251218T013729.551898Z-Hfbad846e-P00007e47","thread":"main","time":"2025-12-18T01:37:29.552244Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36","thread":"main","time":"2025-12-18T01:37:29.528871Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36/20251218T013729.531936Z-Hfbad846e-P00007e3d","thread":"main","time":"2025-12-18T01:37:29.532634Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36/20251218T013729.531936Z-Hfbad846e-P00007e3d/20251218T013729.539659Z-Hfbad846e-P00007e40","thread":"main","time":"2025-12-18T01:37:29.540346Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36/20251218T013729.531936Z-Hfbad846e-P00007e3d/20251218T013729.545005Z-Hfbad846e-P00007e44","thread":"main","time":"2025-12-18T01:37:29.545625Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"def_param","sid":"20251218T013729.473543Z-Hfbad846e-P00007e0c/20251218T013729.528219Z-Hfbad846e-P00007e36/20251218T013729.531936Z-Hfbad846e-P00007e3d/20251218T013729.551898Z-Hfbad846e-P00007e47","thread":"main","time":"2025-12-18T01:37:29.552250Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-{"event":"child_start","sid":"20251218T013729.606149Z-Hfbad846e-P00007e5b","thread":"main","time":"2025-12-18T01:37:29.655397Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet"]}
-{"event":"def_param","sid":"20251218T013729.606149Z-Hfbad846e-P00007e5b","thread":"main","time":"2025-12-18T01:37:29.613893Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20251218T013729.606149Z-Hfbad846e-P00007e5b/20251218T013729.652500Z-Hfbad846e-P00007e84","thread":"main","time":"2025-12-18T01:37:29.653159Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20251218T013729.606149Z-Hfbad846e-P00007e5b/20251218T013729.659421Z-Hfbad846e-P00007e8a","thread":"main","time":"2025-12-18T01:37:29.660043Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"0"}
-{"event":"def_param","sid":"20251218T013729.606149Z-Hfbad846e-P00007e5b/20251218T013729.659421Z-Hfbad846e-P00007e8a","thread":"main","time":"2025-12-18T01:37:29.660054Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"-1"}
-Auto packing the repository in background for optimum performance.
-See "git help gc" for manual housekeeping.
-{"event":"child_start","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96","thread":"main","time":"2025-12-18T01:37:29.710586Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--no-quiet"]}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.711948Z-Hfbad846e-P00007eb5","thread":"main","time":"2025-12-18T01:37:29.712931Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.711948Z-Hfbad846e-P00007eb5/20251218T013729.715942Z-Hfbad846e-P00007eba","thread":"main","time":"2025-12-18T01:37:29.716623Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.711948Z-Hfbad846e-P00007eb5/20251218T013729.715942Z-Hfbad846e-P00007eba/20251218T013729.718465Z-Hfbad846e-P00007ebf","thread":"main","time":"2025-12-18T01:37:29.719249Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.711948Z-Hfbad846e-P00007eb5/20251218T013729.715942Z-Hfbad846e-P00007eba/20251218T013729.726402Z-Hfbad846e-P00007ed4","thread":"main","time":"2025-12-18T01:37:29.727101Z","file":"trace2.c","line":437,"scope":"command","param":"gc.autopacklimit","value":"1"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96","thread":"main","time":"2025-12-18T01:37:29.677196Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.704956Z-Hfbad846e-P00007ead","thread":"main","time":"2025-12-18T01:37:29.705627Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.711948Z-Hfbad846e-P00007eb5","thread":"main","time":"2025-12-18T01:37:29.712926Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.711948Z-Hfbad846e-P00007eb5/20251218T013729.715942Z-Hfbad846e-P00007eba","thread":"main","time":"2025-12-18T01:37:29.716616Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.711948Z-Hfbad846e-P00007eb5/20251218T013729.715942Z-Hfbad846e-P00007eba/20251218T013729.718465Z-Hfbad846e-P00007ebf","thread":"main","time":"2025-12-18T01:37:29.719244Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.711948Z-Hfbad846e-P00007eb5/20251218T013729.715942Z-Hfbad846e-P00007eba/20251218T013729.726402Z-Hfbad846e-P00007ed4","thread":"main","time":"2025-12-18T01:37:29.727096Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-{"event":"def_param","sid":"20251218T013729.676515Z-Hfbad846e-P00007e96/20251218T013729.711948Z-Hfbad846e-P00007eb5/20251218T013729.715942Z-Hfbad846e-P00007eba/20251218T013729.732001Z-Hfbad846e-P00007edd","thread":"main","time":"2025-12-18T01:37:29.732385Z","file":"trace2.c","line":437,"scope":"command","param":"maintenance.incremental-repack.auto","value":"0"}
-ok 18 - fetch --refetch triggers repacking
+expecting success of 6009.8 'rev-list no roots': 
 
-expecting success of 5616.19 'partial clone with transfer.fsckobjects=1 works with submodules': 
-	test_create_repo submodule &&
-	test_commit -C submodule mycommit &&
+	check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
 
-	test_create_repo src_with_sub &&
-	git -C src_with_sub config uploadpack.allowfilter 1 &&
-	git -C src_with_sub config uploadpack.allowanysha1inwant 1 &&
+ok 8 - rev-list no roots
 
-	test_config_global protocol.file.allow always &&
+expecting success of 6009.9 'rev-list merges': 
 
-	git -C src_with_sub submodule add "file://$(pwd)/submodule" mysub &&
-	git -C src_with_sub commit -m "commit with submodule" &&
+	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
+	check_revlist "--merges" tetrapus tripus normalmerge
 
-	git -c transfer.fsckobjects=1 \
-		clone --filter="blob:none" "file://$(pwd)/src_with_sub" dst &&
-	test_when_finished rm -rf dst
+ok 9 - rev-list merges
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5616-partial-clone/src_with_sub/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/src_with_sub/mysub'...
-[main (root-commit) b4341d6] 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 6009.10 'rev-list octopus': 
 
-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
+	check_revlist "--min-parents=3" tetrapus tripus
 
-Cloning into 'dst'...
-ok 20 - lazily fetched .gitmodules works
+ok 10 - rev-list octopus
 
-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 &&
+expecting success of 6009.11 'rev-list ordinary commits': 
 
-	GIT_TRACE="$(pwd)/trace" git -c transfer.fsckobjects=1 \
-		clone --filter="blob:none" "file://$(pwd)/src" dst &&
-	grep "git index-pack.*--fsck-objects" trace
+	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
 
-Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/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 853 on infom08-i386' --promisor --fsck-objects
-trace: built-in: git index-pack --stdin --fix-thin '--keep=fetch-pack 853 on infom08-i386' --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
+ok 11 - rev-list ordinary commits
 
-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) &&
+expecting success of 6009.12 'rev-list --merges --no-merges yields empty set': 
 
-	rm -rf dst &&
-	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" dst &&
-	git -C dst fsck &&
+	check_revlist "--min-parents=2 --no-merges" &&
+	check_revlist "--merges --no-merges" &&
+	check_revlist "--no-merges --merges"
 
-	# 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 &&
+ok 12 - rev-list --merges --no-merges yields empty set
 
-	sort -u fetched_types >unique_types.observed &&
-	echo commit >unique_types.expected &&
-	test_cmp unique_types.expected unique_types.observed &&
+expecting success of 6009.13 'rev-list override and infinities': 
 
-	# Auto-fetch a tree with cat-file.
-	git -C dst cat-file -p $SUBTREE >tree_contents &&
-	grep file.txt tree_contents &&
+	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
 
-	# fsck still works after an auto-fetch of a tree.
-	git -C dst fsck &&
+ok 13 - rev-list override and infinities
 
-	# Auto-fetch all remaining trees and blobs with --missing=error
-	git -C dst rev-list --missing=error --objects main >fetched_objects &&
-	test_line_count = 88 fetched_objects &&
+expecting success of 6009.14 'dodecapus': 
 
-	awk -f print_1.awk fetched_objects |
-	xargs -n1 git -C dst cat-file -t >fetched_types &&
+	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 &&
 
-	sort -u fetched_types >unique_types.observed &&
-	test_write_lines blob commit tree >unique_types.expected &&
-	test_cmp unique_types.expected unique_types.observed
+	check_revlist "--min-parents=4" dodecapus tetrapus &&
+	check_revlist "--min-parents=8" dodecapus &&
+	check_revlist "--min-parents=12" dodecapus &&
+	check_revlist "--min-parents=13" &&
+	check_revlist "--min-parents=4 --max-parents=11" tetrapus
 
-[main 957c60b] file in dir
+Switched to a new branch 'root1'
+[root1 9562ee3] 1
  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.45.2/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
-Auto packing the repository in background for optimum performance.
-See "git help gc" for manual housekeeping.
-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.45.2/t/trash directory.t5616-partial-clone/src/.git/
-[main (root-commit) d63d3b7] x
+ 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 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.45.2/t/trash directory.t5616-partial-clone/src/.git/
-[main (root-commit) f80cabb] foo
+ 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 foo.t
-Cloning into bare repository 'dst.git'...
-?257cc5642cb1a054f08cc83f2d943e56fd3ebe99
-From file:///build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t5616-partial-clone/sparse-src/.git/
-[main (root-commit) 6f4b17f] one
+ 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 one.t
-[main 5c4888c] two
+ 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 two.t
-[main cc88d32] add sparse checkout files
+ 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 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.45.2/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
+ 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(+)
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/promisor-remote/.git/
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/server
- * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
-count: 0
-in-pack: 2
-[main (root-commit) 06e07da] one
+ 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 one.t
-warning: filtering not recognized by server, ignoring
-From file:///build/reproducible-path/git-2.45.2/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.45.2/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
+ 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(+)
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/promisor-remote/.git/
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/server
- * branch            57347849e08bc08f191614c886e54d309cb293da -> FETCH_HEAD
-count: 0
-in-pack: 2
-[main (root-commit) d944c64] one
+ 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 one.t
-warning: filtering not recognized by server, ignoring
-From file:///build/reproducible-path/git-2.45.2/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 &&
+ 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
 
-	git clone --filter=blob:none "file://$(pwd)/server" client &&
-	# Make all refs point to nothing by deleting all objects.
-	rm client/.git/objects/pack/* &&
+expecting success of 6009.15 'ancestors with the same commit time': 
 
-	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
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) 92a62de] foo
+[main 1bc0b48] t1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into 'client'...
-[main 92e3d69] bar
+ create mode 100644 t1.t
+[main 145e5ab] t2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-From file:///build/reproducible-path/git-2.45.2/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
+ create mode 100644 t2.t
+[main 17e63bf] t3
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 I.t
-[main a03a6a6] J
+ create mode 100644 t3.t
+[main 47d7b66] t4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 J.t
-[main 367cc8f] K
+ create mode 100644 t4.t
+[main a42aaab] t5
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 K.t
-From file:///build/reproducible-path/git-2.45.2/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.45.2/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
+ create mode 100644 t5.t
+[main aebfe15] t6
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main 525529d] B
+ create mode 100644 t6.t
+[main 7cfb595] t7
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main 66f5bb0] C
+ create mode 100644 t7.t
+[main fea5200] t8
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-From file:///build/reproducible-path/git-2.45.2/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.45.2/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
+ create mode 100644 t8.t
+ok 15 - ancestors with the same commit time
 
-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
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6010-merge-base.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6010-merge-base/.git/
+expecting success of 6010.1 'setup': 
+	T=$(git mktree </dev/null)
 
-Cloning into 'single'...
-525529d87f8f318d404aa60b6d2b41ed0f49123b
-bc03829a3804fb49ee75372a845d1554afc2e83f
-fatal: Needed a single revision
-ok 39 - single-branch tag following respects partial clone
+ok 1 - setup
 
-expecting success of 5616.40 'fetch from a partial clone, protocol v0': 
-	rm -rf server client trace &&
+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)
 
-	# 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 &&
+ok 2 - set up G and H
 
-	# 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
+expecting success of 6010.3 'merge-base G H': 
+	git name-rev $B >expected &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) b259608] foo
- Author: A U Thor <author@example.com>
+	MB=$(git merge-base G H) &&
+	git name-rev "$MB" >actual.single &&
+
+	MB=$(git merge-base --all G H) &&
+	git name-rev "$MB" >actual.all &&
+
+	MB=$(git show-branch --merge-base G H) &&
+	git name-rev "$MB" >actual.sb &&
+
+	test_cmp expected actual.single &&
+	test_cmp expected actual.all &&
+	test_cmp expected actual.sb
+
+ok 3 - merge-base G H
+
+expecting success of 6010.4 'merge-base/show-branch --independent': 
+	git name-rev "$H" >expected1 &&
+	git name-rev "$H" "$G" >expected2 &&
+
+	parents=$(git merge-base --independent H) &&
+	git name-rev $parents >actual1.mb &&
+	parents=$(git merge-base --independent A H G) &&
+	git name-rev $parents >actual2.mb &&
+
+	parents=$(git show-branch --independent H) &&
+	git name-rev $parents >actual1.sb &&
+	parents=$(git show-branch --independent A H G) &&
+	git name-rev $parents >actual2.sb &&
+
+	test_cmp expected1 actual1.mb &&
+	test_cmp expected2 actual2.mb &&
+	test_cmp expected1 actual1.sb &&
+	test_cmp expected2 actual2.sb
+
+ok 4 - merge-base/show-branch --independent
+
+expecting success of 6010.5 'unsynchronized clocks': 
+	# This test is to demonstrate that relying on timestamps in a distributed
+	# SCM to provide a _consistent_ partial ordering of commits leads to
+	# insanity.
+	#
+	#               Relative
+	# Structure     timestamps
+	#
+	#   PL  PR        +4  +4
+	#  /  \/  \      /  \/  \
+	# L2  C2  R2    +3  -1  +3
+	# |   |   |     |   |   |
+	# L1  C1  R1    +2  -2  +2
+	# |   |   |     |   |   |
+	# L0  C0  R0    +1  -3  +1
+	#   \ |  /        \ |  /
+	#     S             0
+	#
+	# The left and right chains of commits can be of any length and complexity as
+	# long as all of the timestamps are greater than that of S.
+
+	S=$(doit  0 S) &&
+
+	C0=$(doit -3 C0 $S) &&
+	C1=$(doit -2 C1 $C0) &&
+	C2=$(doit -1 C2 $C1) &&
+
+	L0=$(doit  1 L0 $S) &&
+	L1=$(doit  2 L1 $L0) &&
+	L2=$(doit  3 L2 $L1) &&
+
+	R0=$(doit  1 R0 $S) &&
+	R1=$(doit  2 R1 $R0) &&
+	R2=$(doit  3 R2 $R1) &&
+
+	PL=$(doit  4 PL $L2 $C2) &&
+	PR=$(doit  4 PR $C2 $R2) &&
+
+	git name-rev $C2 >expected &&
+
+	MB=$(git merge-base PL PR) &&
+	git name-rev "$MB" >actual.single &&
+
+	MB=$(git merge-base --all PL PR) &&
+	git name-rev "$MB" >actual.all &&
+
+	test_cmp expected actual.single &&
+	test_cmp expected actual.all
+
+ok 5 - unsynchronized clocks
+
+expecting success of 6010.6 '--independent with unsynchronized clocks': 
+	IB=$(doit 0 IB) &&
+	I1=$(doit -10 I1 $IB) &&
+	I2=$(doit  -9 I2 $I1) &&
+	I3=$(doit  -8 I3 $I2) &&
+	I4=$(doit  -7 I4 $I3) &&
+	I5=$(doit  -6 I5 $I4) &&
+	I6=$(doit  -5 I6 $I5) &&
+	I7=$(doit  -4 I7 $I6) &&
+	I8=$(doit  -3 I8 $I7) &&
+	IH=$(doit  -2 IH $I8) &&
+
+	echo $IH >expected &&
+	git merge-base --independent IB IH >actual &&
+	test_cmp expected actual
+
+ok 6 - --independent with unsynchronized clocks
+
+expecting success of 6010.7 'merge-base for octopus-step (setup)': 
+	# Another set to demonstrate base between one commit and a merge
+	# in the documentation.
+	#
+	# * C (MMC) * B (MMB) * A  (MMA)
+	# * o       * o       * o
+	# * o       * o       * o
+	# * o       * o       * o
+	# * o       | _______/
+	# |         |/
+	# |         * 1 (MM1)
+	# | _______/
+	# |/
+	# * root (MMR)
+
+	test_commit MMR &&
+	test_commit MM1 &&
+	test_commit MM-o &&
+	test_commit MM-p &&
+	test_commit MM-q &&
+	test_commit MMA &&
+	git checkout MM1 &&
+	test_commit MM-r &&
+	test_commit MM-s &&
+	test_commit MM-t &&
+	test_commit MMB &&
+	git checkout MMR &&
+	test_commit MM-u &&
+	test_commit MM-v &&
+	test_commit MM-w &&
+	test_commit MM-x &&
+	test_commit MMC
+
+[master (root-commit) 0075405] MMR
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/client/.git/
-[main (root-commit) 76913b4] bar
- Author: A U Thor <author@example.com>
+ create mode 100644 MMR.t
+[master 91243c1] MM1
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-warning: no common commits
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/server
- * branch            HEAD       -> FETCH_HEAD
-ok 40 - fetch from a partial clone, protocol v0
+ create mode 100644 MM1.t
+[master 4d5fde5] MM-o
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-o.t
+[master ca22c18] MM-p
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-p.t
+[master 2659ed6] MM-q
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-q.t
+[master fdb9a8f] MMA
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MMA.t
+Note: switching to 'MM1'.
 
-expecting success of 5616.41 'fetch from a partial clone, protocol v2': 
-	rm -rf server client trace &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	# 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 &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	# 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
+  git switch -c <new-branch-name>
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/server/.git/
-[main (root-commit) bbef54c] foo
- Author: A U Thor <author@example.com>
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 91243c1 MM1
+[detached HEAD c35e31c] MM-r
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/client/.git/
-[main (root-commit) 10dc217] bar
- Author: A U Thor <author@example.com>
+ create mode 100644 MM-r.t
+[detached HEAD 44e361c] MM-s
+ Author: A U Thor <git@au.thor.xz>
  1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-From file:///build/reproducible-path/git-2.45.2/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
+ create mode 100644 MM-s.t
+[detached HEAD a5daa7f] MM-t
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-t.t
+[detached HEAD bca1425] MMB
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MMB.t
+Previous HEAD position was bca1425 MMB
+HEAD is now at 0075405 MMR
+[detached HEAD 174b4d1] MM-u
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-u.t
+[detached HEAD c171a6c] MM-v
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-v.t
+[detached HEAD c25d00b] MM-w
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-w.t
+[detached HEAD 610cc22] MM-x
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MM-x.t
+[detached HEAD 03ab457] MMC
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 MMC.t
+ok 7 - merge-base for octopus-step (setup)
 
-expecting success of 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
+expecting success of 6010.8 'merge-base A B C': 
+	git rev-parse --verify MM1 >expected &&
+	git rev-parse --verify MMR >expected.sb &&
 
-Cloning into bare repository 'client'...
-01:37:40.356422 builtin/pack-objects.c:4010  | d1 | main                     | data         | r0  |  0.001508 |  0.000481 | pack-objects | ..loosen_unused_packed_objects/loosened:0
-ok 42 - repack does not loosen promisor objects
+	git merge-base --all MMA MMB MMC >actual &&
+	git merge-base --all --octopus MMA MMB MMC >actual.common &&
+	git show-branch --merge-base MMA MMB MMC >actual.sb &&
 
-expecting success of 5616.43 'lazy-fetch in submodule succeeds': 
-	# setup
-	test_config_global protocol.file.allow always &&
+	test_cmp expected actual &&
+	test_cmp expected.sb actual.common &&
+	test_cmp expected.sb actual.sb
 
-	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 &&
+ok 8 - merge-base A B C
 
-	# 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) &&
+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 &&
 
-	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) &&
+	git rev-parse CC1 CC2 >expected &&
+	git merge-base --all CCB CCA^^ CCA^^2 >actual &&
 
-	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 &&
+	sort expected >expected.sorted &&
+	sort actual >actual.sorted &&
+	test_cmp expected.sorted actual.sorted
 
-	git -C src-super/src-sub checkout $SUB_ONE &&
-	git -C src-super add src-sub &&
-	git -C src-super commit -m "superproject one" &&
+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
 
-	git -C src-super/src-sub checkout $SUB_TWO &&
-	git -C src-super add src-sub &&
-	git -C src-super commit -m "superproject two" &&
+expecting success of 6010.10 'using reflog to find the fork point': 
+	git reset --hard &&
+	git checkout -b base $E &&
 
-	# the fetch
-	test_when_finished "rm -rf client" &&
-	git clone --filter=blob:none --also-filter-submodules \
-		--recurse-submodules "file://$(pwd)/src-super" client &&
+	(
+		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 &&
 
-	# Trigger lazy-fetch from the superproject
-	git -C client restore --recurse-submodules --source=HEAD^ :/
+		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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/src-sub/.git/
-[main (root-commit) 801106d] submodule one
+	) &&
+	# check that we correctly default to HEAD
+	git checkout derived &&
+	git merge-base --fork-point base >actual &&
+	test_cmp expect3 actual
+
+HEAD is now at 6d30b69 CCA
+Previous HEAD position was 6d30b69 CCA
+Switched to a new branch 'base'
+[base 58b1909] Base commit #1
+ Author: A U Thor <git@au.thor.xz>
+Switched to a new branch 'derived'
+[derived 8ef5ddb] Derived #1
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'base'
+[base 9ef36f6] Base commit #2
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'derived'
+[derived 6c4d828] Derived #2
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'base'
+[base d6c9a6e] Base commit #3
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'derived'
+[derived 3768cdc] Derived #3
+ Author: A U Thor <git@au.thor.xz>
+Switched to and reset branch 'base'
+Switched to branch 'derived'
+ok 10 - using reflog to find the fork point
+
+expecting success of 6010.11 '--fork-point works with empty reflog': 
+	git -c core.logallrefupdates=false branch no-reflog base &&
+	git merge-base --fork-point no-reflog derived &&
+	test_cmp expect3 actual
+
+e34970abbab4461223052769885c56a229ee9299
+ok 11 - --fork-point works with empty reflog
+
+expecting success of 6010.12 'merge-base --octopus --all for complex tree': 
+	# Best common ancestor for JE, JAA and JDD is JC
+	#             JE
+	#            / |
+	#           /  |
+	#          /   |
+	#  JAA    /    |
+	#   |\   /     |
+	#   | \  | JDD |
+	#   |  \ |/ |  |
+	#   |   JC JD  |
+	#   |    | /|  |
+	#   |    |/ |  |
+	#  JA    |  |  |
+	#   |\  /|  |  |
+	#   X JB |  X  X
+	#   \  \ | /   /
+	#    \__\|/___/
+	#        J
+	test_commit J &&
+	test_commit JB &&
+	git reset --hard J &&
+	test_commit JC &&
+	git reset --hard J &&
+	test_commit JTEMP1 &&
+	test_merge JA JB &&
+	test_merge JAA JC &&
+	git reset --hard J &&
+	test_commit JTEMP2 &&
+	test_merge JD JB &&
+	test_merge JDD JC &&
+	git reset --hard J &&
+	test_commit JTEMP3 &&
+	test_merge JE JC &&
+	git rev-parse JC >expected &&
+	git merge-base --all --octopus JAA JDD JE >actual &&
+	test_cmp expected actual
+
+[derived 3782338] J
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 J.t
+[derived 83a274f] JB
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JB.t
+HEAD is now at 3782338 J
+[derived cb75edb] JC
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JC.t
+HEAD is now at 3782338 J
+[derived e9767d0] JTEMP1
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JTEMP1.t
+Merge made by the 'ort' strategy.
+ JB.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JB.t
+Merge made by the 'ort' strategy.
+ JC.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JC.t
+HEAD is now at 3782338 J
+[derived d2ca2eb] JTEMP2
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JTEMP2.t
+Merge made by the 'ort' strategy.
+ JB.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JB.t
+Merge made by the 'ort' strategy.
+ JC.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JC.t
+HEAD is now at 3782338 J
+[derived dc142e3] JTEMP3
+ Author: A U Thor <git@au.thor.xz>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JTEMP3.t
+Merge made by the 'ort' strategy.
+ JC.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 JC.t
+ok 12 - merge-base --octopus --all for complex tree
+
+# passed all 12 test(s)
+1..12
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6014-rev-list-all.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6014-rev-list-all/.git/
+expecting success of 6014.1 'setup': 
+
+	commit one &&
+	commit two &&
+	git checkout HEAD^ &&
+	commit detached
+
+
+[master (root-commit) 86412ff] one
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-[main acdf0b1] submodule two
+ create mode 100644 foo
+[master 4931c53] 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.45.2/t/trash directory.t5616-partial-clone/src-super/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/src-super/src-sub'...
-done.
-Note: switching to '801106d77b703b74d29c28581b66e9e382e71a99'.
+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
@@ -381720,36 +381937,49 @@
 
 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
+HEAD is now at 86412ff one
+[detached HEAD 13d8fe0] detached
  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.45.2/t/trash directory.t5616-partial-clone/src-sub) registered for path 'src-sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5616-partial-clone/client/src-sub'...
-Submodule path 'src-sub': checked out 'acdf0b16fe4ce2869af73bab3c07737b60472b68'
-ok 43 - lazy-fetch in submodule succeeds
+ok 1 - setup
 
-checking prerequisite: NOT_ROOT
+expecting success of 6014.2 'rev-list --all lists detached HEAD': 
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
+	test 3 = $(git rev-list --all | wc -l)
 
-)
-prerequisite NOT_ROOT ok
-# passed all 43 test(s)
-# SKIP no web server found at ''
-1..43
+
+ok 2 - rev-list --all lists detached HEAD
+
+expecting success of 6014.3 'repack does not lose detached HEAD': 
+
+	git gc &&
+	git prune --expire=now &&
+	git show HEAD
+
+
+commit 13d8fe0bae4079d4dedb755a88319ddebda9a07b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    detached
+
+diff --git a/foo b/foo
+index 5626abf..9aa4e2b 100644
+--- a/foo
++++ b/foo
+@@ -1 +1 @@
+-one
++detached
+ok 3 - repack does not lose detached HEAD
+
+expecting success of 6014.4 'rev-list --graph --no-walk is forbidden': 
+	test_must_fail git rev-list --graph --no-walk HEAD
+
+fatal: options '--no-walk' and '--graph' cannot be used together
+ok 4 - rev-list --graph --no-walk is forbidden
+
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6016-rev-list-graph-simplify-history.sh ***
@@ -382045,1759 +382275,6452 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6009-rev-list-parent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6009-rev-list-parent/.git/
-expecting success of 6009.1 'setup': 
+*** t6012-rev-list-simplify.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6012-rev-list-simplify/.git/
+expecting success of 6012.1 'setup': 
+	echo "Hi there" >file &&
+	echo "initial" >lost &&
+	git add file lost &&
+	test_tick && git commit -m "Initial file and lost" &&
+	note A &&
 
-	touch file &&
-	git add file &&
+	git branch other-branch &&
 
-	test_commit one &&
+	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 &&
 
-	test_tick=$(($test_tick - 2400)) &&
+	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 &&
 
-	test_commit two &&
-	test_commit three &&
-	test_commit four &&
+	git checkout other-branch &&
 
-	git log --pretty=oneline --abbrev-commit
+	echo "Hello" >file &&
+	>lost &&
+	git add file lost &&
+	test_tick && git commit -m "Modified the file identically" &&
+	note C &&
 
-[main (root-commit) e622cea] one
+	echo "This is a stupid example" >another-file &&
+	git add another-file &&
+	test_tick && git commit -m "Add another file" &&
+	note D &&
+
+	test_tick &&
+	test_must_fail git merge -m "merge" main &&
+	>lost && git commit -a -m "merge" &&
+	note E &&
+
+	echo "Yet another" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Irrelevant change" &&
+	note F &&
+
+	git checkout main &&
+	echo "Yet another" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Another irrelevant change" &&
+	note G &&
+
+	test_tick && git merge -m "merge" other-branch &&
+	note H &&
+
+	echo "Final change" >file &&
+	test_tick && git commit -a -m "Final change" &&
+	note I &&
+
+	git checkout main &&
+	test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
+	note K &&
+
+	echo "Immaterial" >elif &&
+	git add elif &&
+	test_tick && git commit -m "Last" &&
+	note L
+
+[main (root-commit) 2ce5a1a] Initial file and lost
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
+ 2 files changed, 2 insertions(+)
  create mode 100644 file
- create mode 100644 one.t
-[main bfa07e2] two
+ 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 two.t
-[main ecfa770] three
+ create mode 100644 side
+Switched to branch 'main'
+[main 1a21661] Modified file and lost
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Switched to branch 'other-branch'
+[other-branch 96e46c8] Modified the file identically
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+[other-branch afa190a] Add another file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[main 0906875] four
+ create mode 100644 another-file
+Auto-merging lost
+CONFLICT (content): Merge conflict in lost
+Automatic merge failed; fix conflicts and then commit the result.
+[other-branch 87e2285] merge
+ Author: A U Thor <author@example.com>
+[other-branch f67ebfb] Irrelevant change
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 four.t
-0906875 four
-ecfa770 three
-bfa07e2 two
-e622cea one
+ create mode 100644 elif
+Switched to branch 'main'
+[main b2dce95] Another irrelevant change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 elif
+Merge made by the 'ort' strategy.
+ another-file | 1 +
+ lost         | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ create mode 100644 another-file
+[main 62ab427] Final change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Already on 'main'
+Merge made by the 'ort' strategy.
+ side | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side
+[main 1be1b21] Last
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 ok 1 - setup
 
-expecting success of 6009.2 'one is ancestor of others and should not be shown': 
+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
 
-	git rev-list one --not four >result &&
-	test_must_be_empty result
+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
 
-ok 2 - one is ancestor of others and should not be shown
+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 6009.3 'setup roots, merges and octopuses': 
+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
 
-	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 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
 
-Switched to a new branch 'newroot'
-[newroot (root-commit) 04238a1] five
+expecting success of 6012.8 'log --full-history --date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 8 - log --full-history --date-order -- file
+
+expecting success of 6012.9 'log --full-history --author-date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 9 - log --full-history --author-date-order -- file
+
+expecting success of 6012.10 'log --simplify-merges -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 10 - log --simplify-merges -- file
+
+expecting success of 6012.11 'log --simplify-merges --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 11 - log --simplify-merges --topo-order -- file
+
+expecting success of 6012.12 'log --simplify-merges --date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 12 - log --simplify-merges --date-order -- file
+
+expecting success of 6012.13 'log --simplify-merges --author-date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 13 - log --simplify-merges --author-date-order -- file
+
+expecting success of 6012.14 'log -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 14 - log -- file
+
+expecting success of 6012.15 'log --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 15 - log --topo-order -- file
+
+expecting success of 6012.16 'log --date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 16 - log --date-order -- file
+
+expecting success of 6012.17 'log --author-date-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 17 - log --author-date-order -- file
+
+expecting success of 6012.18 'log --first-parent -- another-file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 18 - log --first-parent -- another-file
+
+expecting success of 6012.19 'log --first-parent --topo-order -- another-file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 19 - log --first-parent --topo-order -- another-file
+
+expecting success of 6012.20 'log --first-parent L': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 20 - log --first-parent L
+
+expecting success of 6012.21 'log --exclude-first-parent-only F ^L': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 21 - log --exclude-first-parent-only F ^L
+
+expecting success of 6012.22 'log F ^L': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 22 - log F ^L
+
+expecting success of 6012.23 'log L ^F': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 23 - log L ^F
+
+expecting success of 6012.24 'log --exclude-first-parent-only L ^F': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 24 - log --exclude-first-parent-only L ^F
+
+expecting success of 6012.25 'log --exclude-first-parent-only --first-parent L ^F': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 25 - log --exclude-first-parent-only --first-parent L ^F
+
+expecting success of 6012.26 'log --full-history E -- lost': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 26 - log --full-history E -- lost
+
+expecting success of 6012.27 'full history simplification without parent': 
+	printf "%s\n" E C B A >expect &&
+	git log --pretty="$FMT" --full-history E -- lost >out &&
+	unnote >actual <out &&
+	sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+	test_cmp expect check
+
+ok 27 - full history simplification without parent
+
+expecting success of 6012.28 '--full-diff is not affected by --parents': 
+	git log -p --pretty="%H" --full-diff -- file >expected &&
+	git log -p --pretty="%H" --full-diff --parents -- file >actual &&
+	test_cmp expected actual
+
+ok 28 - --full-diff is not affected by --parents
+
+expecting success of 6012.29 'setup rebuild repo': 
+	rm -rf .git * &&
+	git init &&
+	git switch -c topic &&
+
+	echo base >file &&
+	git add file &&
+	test_commit I &&
+
+	echo A >file &&
+	git add file &&
+	test_commit A &&
+
+	git switch -c branchB I &&
+	echo B >file &&
+	git add file &&
+	test_commit B &&
+
+	git switch topic &&
+	test_must_fail git merge -m "M" B &&
+	echo A >file &&
+	echo B >>file &&
+	git add file &&
+	git merge --continue &&
+	note M &&
+
+	echo C >other &&
+	git add other &&
+	test_commit C &&
+
+	git switch -c branchX I &&
+	echo X >file &&
+	git add file &&
+	test_commit X &&
+
+	git switch -c branchR M &&
+	git merge -m R -Xtheirs X &&
+	note R &&
+
+	git switch topic &&
+	git merge -m N R &&
+	note N &&
+
+	git switch -c branchY M &&
+	echo Y >y &&
+	git add y &&
+	test_commit Y &&
+
+	git switch -c branchZ C &&
+	echo Z >z &&
+	git add z &&
+	test_commit Z &&
+
+	git switch topic &&
+	git merge -m O Z &&
+	note O &&
+
+	git merge -m P Y &&
+	note P
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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>
- 6 files changed, 5 insertions(+)
+ 2 files changed, 2 insertions(+)
+ create mode 100644 I.t
  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
+[topic 93fcd66] A
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 A.t
+Switched to a new branch 'branchB'
+[branchB 2bc7954] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 B.t
+Switched to branch 'topic'
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+[topic 58a754c] M
+ Author: A U Thor <author@example.com>
+[topic f73bd6d] C
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 C.t
+ create mode 100644 other
+Switched to a new branch 'branchX'
+[branchX a2f4788] X
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 X.t
+Switched to a new branch 'branchR'
+Auto-merging file
+Merge made by the 'ort' strategy.
+ X.t  | 1 +
+ file | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 X.t
+Switched to branch 'topic'
+Merge made by the 'ort' strategy.
+ X.t  | 1 +
+ file | 3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 X.t
+Switched to a new branch 'branchY'
+[branchY 85e7a8e] Y
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Y.t
+ create mode 100644 y
+Switched to a new branch 'branchZ'
+[branchZ 35501c2] Z
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Z.t
+ create mode 100644 z
+Switched to branch 'topic'
+Merge made by the 'ort' strategy.
+ Z.t | 1 +
+ z   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Z.t
+ create mode 100644 z
+Merge made by the 'ort' strategy.
+ Y.t | 1 +
+ y   | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 Y.t
+ create mode 100644 y
+ok 29 - setup rebuild repo
+
+expecting success of 6012.30 'log -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 30 - log -- file
+
+expecting success of 6012.31 'log --show-pulls -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 31 - log --show-pulls -- file
+
+expecting success of 6012.32 'log --full-history --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 32 - log --full-history --topo-order -- file
+
+expecting success of 6012.33 'log --simplify-merges --topo-order --show-pulls -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 33 - log --simplify-merges --topo-order --show-pulls -- file
+
+expecting success of 6012.34 'log --simplify-merges --topo-order -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 34 - log --simplify-merges --topo-order -- file
+
+expecting success of 6012.35 'log --first-parent -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 35 - log --first-parent -- file
+
+expecting success of 6012.36 'log --first-parent --show-pulls -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 36 - log --first-parent --show-pulls -- file
+
+expecting success of 6012.37 'log --topo-order --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 37 - log --topo-order --ancestry-path A..HEAD -- file
+
+expecting success of 6012.38 'log --topo-order --show-pulls --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 38 - log --topo-order --show-pulls --ancestry-path A..HEAD -- file
+
+expecting success of 6012.39 'log --topo-order --full-history --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 39 - log --topo-order --full-history --ancestry-path A..HEAD -- file
+
+expecting success of 6012.40 'log --topo-order --simplify-merges --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 40 - log --topo-order --simplify-merges --ancestry-path A..HEAD -- file
+
+expecting success of 6012.41 'log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file': 
+		git log --pretty="$FMT" --parents $param >out &&
+		unnote >actual <out &&
+		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
+		test_cmp expect check
+	
+ok 41 - log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file
+
+expecting success of 6012.42 'log --graph --simplify-merges --show-pulls': 
+	cat >expect <<-\EOF &&
+	* N
+	*   R
+	|\  
+	| * X
+	* |   M
+	|\ \  
+	| * | B
+	| |/  
+	* / A
+	|/  
+	* I
+	EOF
+	git log --graph --pretty="%s" \
+		--simplify-merges --show-pulls \
+		-- file >actual &&
+	test_cmp expect actual
+
+ok 42 - log --graph --simplify-merges --show-pulls
+
+# passed all 42 test(s)
+1..42
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6019-rev-list-ancestry-path.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6019-rev-list-ancestry-path/.git/
+expecting success of 6019.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	test_commit C &&
+	test_commit D &&
+	test_commit E &&
+	test_commit F &&
+	git reset --hard C &&
+	test_commit G &&
+	test_merge E H &&
+	test_commit I &&
+	test_merge F J &&
+	git reset --hard A &&
+	test_commit K &&
+	test_merge J L &&
+	test_commit M
+
+[main (root-commit) 0ddfaf1] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 six.t
-Switched to a new branch 'anotherbranch'
-[anotherbranch f863663] seven
+ create mode 100644 A.t
+[main d9df450] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 seven.t
-Switched to a new branch 'yetanotherbranch'
-[yetanotherbranch 3e13a02] eight
+ create mode 100644 B.t
+[main 35a8500] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 eight.t
-Switched to branch 'main'
+ create mode 100644 C.t
+[main be8f64f] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[main ee2ad00] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+[main 5374d8c] F
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F.t
+HEAD is now at 35a8500 C
+[main fa55005] G
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 G.t
+Merge made by the 'ours' strategy.
+[main 4e719b9] I
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 I.t
+Merge made by the 'ours' strategy.
+HEAD is now at 0ddfaf1 A
+[main 0f470b0] K
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 K.t
+Merge made by the 'ours' strategy.
+[main bcafe1b] M
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 M.t
+ok 1 - setup
+
+expecting success of 6019.2 'log D..M': 
+		test_write_lines E F G H I J K L M >expect &&
+		git log --format=%s D..M >raw &&
+
+		if test -n "E F G H I J K L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 2 - log D..M
+
+expecting success of 6019.3 'log --ancestry-path D..M': 
+		test_write_lines E F H I J L M >expect &&
+		git log --format=%s --ancestry-path D..M >raw &&
+
+		if test -n "E F H I J L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 3 - log --ancestry-path D..M
+
+expecting success of 6019.4 'log --ancestry-path=F D..M': 
+		test_write_lines E F J L M >expect &&
+		git log --format=%s --ancestry-path=F D..M >raw &&
+
+		if test -n "E F J L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 4 - log --ancestry-path=F D..M
+
+expecting success of 6019.5 'log --ancestry-path=G D..M': 
+		test_write_lines G H I J L M >expect &&
+		git log --format=%s --ancestry-path=G D..M >raw &&
+
+		if test -n "G H I J L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 5 - log --ancestry-path=G D..M
+
+expecting success of 6019.6 'log --ancestry-path=H D..M': 
+		test_write_lines E G H I J L M >expect &&
+		git log --format=%s --ancestry-path=H D..M >raw &&
+
+		if test -n "E G H I J L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 6 - log --ancestry-path=H D..M
+
+expecting success of 6019.7 'log --ancestry-path=K D..M': 
+		test_write_lines K L M >expect &&
+		git log --format=%s --ancestry-path=K D..M >raw &&
+
+		if test -n "K L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 7 - log --ancestry-path=K D..M
+
+expecting success of 6019.8 'log --ancestry-path=F --ancestry-path=K D..M': 
+		test_write_lines E F J K L M >expect &&
+		git log --format=%s --ancestry-path=F --ancestry-path=K D..M >raw &&
+
+		if test -n "E F J K L M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 8 - log --ancestry-path=F --ancestry-path=K D..M
+
+expecting success of 6019.9 'log D..M -- M.t': 
+		test_write_lines M >expect &&
+		git log --format=%s D..M -- M.t >raw &&
+
+		if test -n "M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 9 - log D..M -- M.t
+
+expecting success of 6019.10 'log --ancestry-path D..M -- M.t': 
+		test_write_lines M >expect &&
+		git log --format=%s --ancestry-path D..M -- M.t >raw &&
+
+		if test -n "M"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 10 - log --ancestry-path D..M -- M.t
+
+expecting success of 6019.11 'log F...I': 
+		test_write_lines F G H I >expect &&
+		git log --format=%s F...I >raw &&
+
+		if test -n "F G H I"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 11 - log F...I
+
+expecting success of 6019.12 'log --ancestry-path F...I': 
+		test_write_lines F H I >expect &&
+		git log --format=%s --ancestry-path F...I >raw &&
+
+		if test -n "F H I"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 12 - log --ancestry-path F...I
+
+expecting success of 6019.13 'log G..M -- G.t': 
+		test_write_lines  >expect &&
+		git log --format=%s G..M -- G.t >raw &&
+
+		if test -n ""
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 13 - log G..M -- G.t
+
+expecting success of 6019.14 'log --ancestry-path G..M -- G.t': 
+		test_write_lines L >expect &&
+		git log --format=%s --ancestry-path G..M -- G.t >raw &&
+
+		if test -n "L"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 14 - log --ancestry-path G..M -- G.t
+
+expecting success of 6019.15 'log --ancestry-path --simplify-merges G^..M -- G.t': 
+		test_write_lines G L >expect &&
+		git log --format=%s --ancestry-path --simplify-merges G^..M -- G.t >raw &&
+
+		if test -n "G L"
+		then
+			sort raw >actual &&
+			test_cmp expect actual
+		else
+			test_must_be_empty raw
+		fi
+	
+ok 15 - log --ancestry-path --simplify-merges G^..M -- G.t
+
+expecting success of 6019.16 'setup criss-cross': 
+	mkdir criss-cross &&
+	(cd criss-cross &&
+	 git init &&
+	 test_commit A &&
+	 git checkout -b xb main &&
+	 test_commit B &&
+	 git checkout -b xc main &&
+	 test_commit C &&
+	 git checkout -b xbc xb -- &&
+	 git merge xc &&
+	 git checkout -b xcb xc -- &&
+	 git merge xb &&
+	 git checkout main)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6019-rev-list-ancestry-path/criss-cross/.git/
+[main (root-commit) 617a709] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Switched to a new branch 'xb'
+[xb 7dfaf8e] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'xc'
+[xc cf5ea0b] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to a new branch 'xbc'
 Merge made by the 'ort' strategy.
- five.t | 1 +
+ C.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
+ 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 3 - setup roots, merges and octopuses
+ok 16 - setup criss-cross
+
+expecting success of 6019.17 'criss-cross: rev-list --ancestry-path cb..bc': 
+	(cd criss-cross &&
+	 git rev-list --ancestry-path xcb..xbc > actual &&
+	 test_must_be_empty actual)
+
+ok 17 - criss-cross: rev-list --ancestry-path cb..bc
+
+expecting success of 6019.18 'criss-cross: rev-list --ancestry-path --all ^cb': 
+	(cd criss-cross &&
+	 git rev-list --ancestry-path --all ^xcb > actual &&
+	 test_must_be_empty actual)
+
+ok 18 - criss-cross: rev-list --ancestry-path --all ^cb
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6017-rev-list-stdin.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6017-rev-list-stdin/.git/
+expecting success of 6017.1 'setup': 
+	(
+		for i in 0 $them
+		do
+			for j in $them
+			do
+				echo $i.$j >file-$j &&
+				git add file-$j || exit
+			done &&
+			test_tick &&
+			git commit -m $i || exit
+		done &&
+		for i in $them
+		do
+			git checkout -b side-$i main~$i &&
+			echo updated $i >file-$i &&
+			git add file-$i &&
+			test_tick &&
+			git commit -m side-$i || exit
+		done &&
+
+		git update-ref refs/heads/-dashed-branch HEAD
+	)
+
+[main (root-commit) b2718df] 0
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ create mode 100644 file-1
+ create mode 100644 file-2
+ create mode 100644 file-3
+ create mode 100644 file-4
+ create mode 100644 file-5
+ create mode 100644 file-6
+ create mode 100644 file-7
+[main 4c7c799] 1
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main a24e200] 2
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main 72c7eca] 3
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main 680e5c3] 4
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main 496e2a9] 5
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main c5757f4] 6
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+[main a21e804] 7
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+Switched to a new branch 'side-1'
+[side-1 c52bcff] side-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-2'
+[side-2 fe893aa] side-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-3'
+[side-3 48694b2] side-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-4'
+[side-4 e31c210] side-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-5'
+[side-5 5786a4a] side-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-6'
+[side-6 6879e94] side-6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'side-7'
+[side-7 a65952b] side-7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6017.2 'check rev-list main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input main
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 2 - check rev-list main
+
+expecting success of 6017.3 'check log --stat main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input main
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 3 - check log --stat main
+
+expecting success of 6017.4 'check rev-list side-1 ^side-4': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+ok 4 - check rev-list side-1 ^side-4
+
+expecting success of 6017.5 'check log --stat side-1 ^side-4': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-4
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+ok 5 - check log --stat side-1 ^side-4
+
+expecting success of 6017.6 'check rev-list side-1 ^side-7 --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+ok 6 - check rev-list side-1 ^side-7 --
+
+expecting success of 6017.7 'check log --stat side-1 ^side-7 --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+ok 7 - check log --stat side-1 ^side-7 --
+
+expecting success of 6017.8 'check rev-list side-1 ^side-7 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-1
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+ok 8 - check rev-list side-1 ^side-7 -- file-1
+
+expecting success of 6017.9 'check log --stat side-1 ^side-7 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-1
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 9 - check log --stat side-1 ^side-7 -- file-1
+
+expecting success of 6017.10 'check rev-list side-1 ^side-7 -- file-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-2
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+ok 10 - check rev-list side-1 ^side-7 -- file-2
+
+expecting success of 6017.11 'check log --stat side-1 ^side-7 -- file-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-1
+input ^side-7
+input --
+input file-2
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 11 - check log --stat side-1 ^side-7 -- file-2
+
+expecting success of 6017.12 'check rev-list side-3 ^side-4 -- file-3': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-4
+input --
+input file-3
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+ok 12 - check rev-list side-3 ^side-4 -- file-3
+
+expecting success of 6017.13 'check log --stat side-3 ^side-4 -- file-3': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-4
+input --
+input file-3
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - check log --stat side-3 ^side-4 -- file-3
+
+expecting success of 6017.14 'check rev-list side-3 ^side-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+ok 14 - check rev-list side-3 ^side-2
+
+expecting success of 6017.15 'check log --stat side-3 ^side-2': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 15 - check log --stat side-3 ^side-2
+
+expecting success of 6017.16 'check rev-list side-3 ^side-2 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+input --
+input file-1
+ok 16 - check rev-list side-3 ^side-2 -- file-1
+
+expecting success of 6017.17 'check log --stat side-3 ^side-2 -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input side-3
+input ^side-2
+input --
+input file-1
+ok 17 - check log --stat side-3 ^side-2 -- file-1
+
+expecting success of 6017.18 'check rev-list --all': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 18 - check rev-list --all
+
+expecting success of 6017.19 'check log --stat --all': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 19 - check log --stat --all
+
+expecting success of 6017.20 'check rev-list --all --not --branches': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input --branches
+ok 20 - check rev-list --all --not --branches
+
+expecting success of 6017.21 'check log --stat --all --not --branches': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input --branches
+ok 21 - check log --stat --all --not --branches
+
+expecting success of 6017.22 'check rev-list --glob=refs/heads': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 22 - check rev-list --glob=refs/heads
+
+expecting success of 6017.23 'check log --stat --glob=refs/heads': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 23 - check log --stat --glob=refs/heads
+
+expecting success of 6017.24 'check rev-list --glob=refs/heads --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 24 - check rev-list --glob=refs/heads --
+
+expecting success of 6017.25 'check log --stat --glob=refs/heads --': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  file-2 | 2 +-
+output  file-3 | 2 +-
+output  file-4 | 2 +-
+output  file-5 | 2 +-
+output  file-6 | 2 +-
+output  file-7 | 2 +-
+output  7 files changed, 7 insertions(+), 7 deletions(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 25 - check log --stat --glob=refs/heads --
+
+expecting success of 6017.26 'check rev-list --glob=refs/heads -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+input file-1
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output a21e80422823d665efde155c070bfdfb97c997e8
+output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output a24e2002dc3e76acd7262fac9934308ed5876528
+output 4c7c79994a10176d26cb379d2f480e705687de5f
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 26 - check rev-list --glob=refs/heads -- file-1
+
+expecting success of 6017.27 'check log --stat --glob=refs/heads -- file-1': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --glob=refs/heads
+input --
+input file-1
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a21e80422823d665efde155c070bfdfb97c997e8
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:20:13 2005 -0700
+output 
+output     7
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:19:13 2005 -0700
+output 
+output     6
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:18:13 2005 -0700
+output 
+output     5
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:17:13 2005 -0700
+output 
+output     4
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:16:13 2005 -0700
+output 
+output     3
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit a24e2002dc3e76acd7262fac9934308ed5876528
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:15:13 2005 -0700
+output 
+output     2
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 4c7c79994a10176d26cb379d2f480e705687de5f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:14:13 2005 -0700
+output 
+output     1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  1 file changed, 1 insertion(+)
+ok 27 - check log --stat --glob=refs/heads -- file-1
+
+expecting success of 6017.28 'check rev-list --end-of-options -dashed-branch': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --end-of-options
+input -dashed-branch
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output b2718dfcca09d482353ed124d94698c230076ecb
+ok 28 - check rev-list --end-of-options -dashed-branch
+
+expecting success of 6017.29 'check log --stat --end-of-options -dashed-branch': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --end-of-options
+input -dashed-branch
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit b2718dfcca09d482353ed124d94698c230076ecb
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:13:13 2005 -0700
+output 
+output     0
+output 
+output  file-1 | 1 +
+output  file-2 | 1 +
+output  file-3 | 1 +
+output  file-4 | 1 +
+output  file-5 | 1 +
+output  file-6 | 1 +
+output  file-7 | 1 +
+output  7 files changed, 7 insertions(+)
+ok 29 - check log --stat --end-of-options -dashed-branch
+
+expecting success of 6017.30 'check rev-list --all --not refs/heads/main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input refs/heads/main
+output a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output 6879e948854e907320469e4dc722cd70bd4779ad
+output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+ok 30 - check rev-list --all --not refs/heads/main
+
+expecting success of 6017.31 'check log --stat --all --not refs/heads/main': 
+			git $cmd $(cat input) >expect &&
+			git $cmd --stdin <input >actual &&
+			sed -e "s/^/input /" input &&
+			sed -e "s/^/output /" expect &&
+			test_cmp expect actual
+		
+input --all
+input --not
+input refs/heads/main
+output commit a65952bd5563825b9eb493eea4aec4b5678b8a8d
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:27:13 2005 -0700
+output 
+output     side-7
+output 
+output  file-7 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 6879e948854e907320469e4dc722cd70bd4779ad
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:26:13 2005 -0700
+output 
+output     side-6
+output 
+output  file-6 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:25:13 2005 -0700
+output 
+output     side-5
+output 
+output  file-5 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit e31c210a1d5ecfb601d46a78e8003682cb1887e9
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:24:13 2005 -0700
+output 
+output     side-4
+output 
+output  file-4 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:23:13 2005 -0700
+output 
+output     side-3
+output 
+output  file-3 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:22:13 2005 -0700
+output 
+output     side-2
+output 
+output  file-2 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+output 
+output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
+output Author: A U Thor <author@example.com>
+output Date:   Thu Apr 7 15:21:13 2005 -0700
+output 
+output     side-1
+output 
+output  file-1 | 2 +-
+output  1 file changed, 1 insertion(+), 1 deletion(-)
+ok 31 - check log --stat --all --not refs/heads/main
+
+expecting success of 6017.32 'not only --stdin': 
+	cat >expect <<-EOF &&
+	7
+
+	file-1
+	file-2
+	EOF
+	cat >input <<-EOF &&
+	^main^
+	--
+	file-2
+	EOF
+	git log --pretty=tformat:%s --name-only --stdin main -- file-1 \
+		<input >actual &&
+	test_cmp expect actual
+
+ok 32 - not only --stdin
+
+expecting success of 6017.33 'pseudo-opt with missing value': 
+	cat >input <<-EOF &&
+	--glob
+	refs/heads
+	EOF
+
+	cat >expect <<-EOF &&
+	fatal: Option ${SQ}--glob${SQ} requires a value
+	EOF
+
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
+
+ok 33 - pseudo-opt with missing value
+
+expecting success of 6017.34 'pseudo-opt with invalid value': 
+	cat >input <<-EOF &&
+	--no-walk=garbage
+	EOF
+
+	cat >expect <<-EOF &&
+	error: invalid argument to --no-walk
+	fatal: invalid option ${SQ}--no-walk=garbage${SQ} in --stdin mode
+	EOF
+
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
+
+ok 34 - pseudo-opt with invalid value
+
+expecting success of 6017.35 'unknown option without --end-of-options': 
+	cat >input <<-EOF &&
+	-dashed-branch
+	EOF
+
+	cat >expect <<-EOF &&
+	fatal: invalid option ${SQ}-dashed-branch${SQ} in --stdin mode
+	EOF
+
+	test_must_fail git rev-list --stdin <input 2>error &&
+	test_cmp expect error
+
+ok 35 - unknown option without --end-of-options
+
+expecting success of 6017.36 '--not on command line does not influence revisions read via --stdin': 
+	cat >input <<-EOF &&
+	refs/heads/main
+	EOF
+	git rev-list refs/heads/main >expect &&
+
+	git rev-list refs/heads/main --not --stdin <input >actual &&
+	test_cmp expect actual
+
+ok 36 - --not on command line does not influence revisions read via --stdin
+
+expecting success of 6017.37 '--not via stdin does not influence revisions from command line': 
+	cat >input <<-EOF &&
+	--not
+	EOF
+	git rev-list refs/heads/main >expect &&
+
+	git rev-list refs/heads/main --stdin refs/heads/main <input >actual &&
+	test_cmp expect actual
+
+ok 37 - --not via stdin does not influence revisions from command line
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6018-rev-list-glob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6018-rev-list-glob/.git/
+expecting success of 6018.1 'setup': 
+
+	commit main &&
+	git checkout -b subspace/one main &&
+	commit one &&
+	git checkout -b subspace/two main &&
+	commit two &&
+	git checkout -b subspace-x main &&
+	commit subspace-x &&
+	git checkout -b other/three main &&
+	commit three &&
+	git checkout -b someref main &&
+	commit some &&
+	git checkout main &&
+	commit topic_2 &&
+	git tag foo/bar main &&
+	commit topic_3 &&
+	git update-ref refs/remotes/foo/baz main &&
+	commit topic_4 &&
+	git update-ref refs/remotes/upstream/one subspace/one &&
+	git update-ref refs/remotes/upstream/two subspace/two &&
+	git update-ref refs/remotes/upstream/x subspace-x &&
+	git tag qux/one subspace/one &&
+	git tag qux/two subspace/two &&
+	git tag qux/x subspace-x
+
+[main (root-commit) f9b107a] main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Switched to a new branch 'subspace/one'
+[subspace/one ca90b7f] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'subspace/two'
+[subspace/two 65ee8ea] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'subspace-x'
+[subspace-x e241fee] subspace-x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'other/three'
+[other/three ec1efc4] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'someref'
+[someref dffcf3f] some
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+[main 2bdf448] topic_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 0e3b4df] topic_3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[main 88fe3d2] topic_4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup
+
+expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+
+
+ok 2 - rev-parse --glob=refs/heads/subspace/*
+
+expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
+
+
+ok 3 - rev-parse --glob=heads/subspace/*
+
+expecting success of 6018.4 'rev-parse --glob=refs/heads/subspace/': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+
+
+ok 4 - rev-parse --glob=refs/heads/subspace/
+
+expecting success of 6018.5 'rev-parse --glob=heads/subspace/': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
+
+
+ok 5 - rev-parse --glob=heads/subspace/
+
+expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
+
+
+ok 6 - rev-parse --glob=heads/subspace
+
+checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
+
+	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
+
+
+fatal: ambiguous argument 'heads/subspace': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+not ok 7 - rev-parse accepts --glob as detached option # TODO known breakage
+
+checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
+
+	compare rev-parse "main" "--glob --symbolic main"
+
+
+--- expected	2024-11-14 19:39:55.436055710 +0000
++++ actual	2024-11-14 19:39:55.456055917 +0000
+@@ -1 +1,2 @@
+-88fe3d283ae350159b6dcc1f45481c8fa40ad3d8
++--glob
++main
+not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
+
+expecting success of 6018.9 'rev-parse --branches=subspace/*': 
+
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
+
+
+ok 9 - rev-parse --branches=subspace/*
+
+expecting success of 6018.10 'rev-parse --branches=subspace/': 
+
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
+
+
+ok 10 - rev-parse --branches=subspace/
+
+expecting success of 6018.11 'rev-parse --branches=subspace': 
+
+	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
+
+
+ok 11 - rev-parse --branches=subspace
+
+expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
+
+	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+
+
+ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
+
+expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
+
+	compare rev-parse "main" "--glob=heads/someref/* main"
+
+
+ok 13 - rev-parse --glob=heads/someref/* main
+
+expecting success of 6018.14 'rev-parse --glob=heads/*': 
+
+	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+
+
+ok 14 - rev-parse --glob=heads/*
+
+expecting success of 6018.15 'rev-parse --tags=foo': 
+
+	compare rev-parse "foo/bar" "--tags=foo"
+
+
+ok 15 - rev-parse --tags=foo
+
+expecting success of 6018.16 'rev-parse --remotes=foo': 
+
+	compare rev-parse "foo/baz" "--remotes=foo"
+
+
+ok 16 - rev-parse --remotes=foo
+
+expecting success of 6018.17 'rev-parse --exclude with --branches': 
+	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
+
+ok 17 - rev-parse --exclude with --branches
+
+expecting success of 6018.18 'rev-parse --exclude with --all': 
+	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
+
+ok 18 - rev-parse --exclude with --all
+
+expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
+	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
+
+ok 19 - rev-parse accumulates multiple --exclude
+
+expecting success of 6018.20 'rev-parse --branches clears --exclude': 
+	compare rev-parse "--exclude=* --branches --branches" "--branches"
+
+ok 20 - rev-parse --branches clears --exclude
+
+expecting success of 6018.21 'rev-parse --tags clears --exclude': 
+	compare rev-parse "--exclude=* --tags --tags" "--tags"
+
+ok 21 - rev-parse --tags clears --exclude
+
+expecting success of 6018.22 'rev-parse --all clears --exclude': 
+	compare rev-parse "--exclude=* --all --all" "--all"
+
+ok 22 - rev-parse --all clears --exclude
+
+expecting success of 6018.23 'rev-parse --exclude=glob with --branches=glob': 
+	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+
+ok 23 - rev-parse --exclude=glob with --branches=glob
+
+expecting success of 6018.24 'rev-parse --exclude=glob with --tags=glob': 
+	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+
+ok 24 - rev-parse --exclude=glob with --tags=glob
+
+expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 25 - rev-parse --exclude=glob with --remotes=glob
+
+expecting success of 6018.26 'rev-parse --exclude=ref with --branches=glob': 
+	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
+
+ok 26 - rev-parse --exclude=ref with --branches=glob
+
+expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
+	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+
+ok 27 - rev-parse --exclude=ref with --tags=glob
+
+expecting success of 6018.28 'rev-parse --exclude=ref with --remotes=glob': 
+	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 28 - rev-parse --exclude=ref with --remotes=glob
+
+expecting success of 6018.29 'rev-parse --exclude-hidden=fetch with --all': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
+	
+ok 29 - rev-parse --exclude-hidden=fetch with --all
+
+expecting success of 6018.30 'rev-parse --exclude-hidden=fetch with --all': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
+	
+ok 30 - rev-parse --exclude-hidden=fetch with --all
+
+expecting success of 6018.31 'rev-parse --exclude-hidden=fetch with --glob': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
+	
+ok 31 - rev-parse --exclude-hidden=fetch with --glob
+
+expecting success of 6018.32 'rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
+	
+ok 32 - rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref
+
+expecting success of 6018.33 'rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 33 - rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref
+
+expecting success of 6018.34 'rev-parse --exclude-hidden=fetch fails with --branches': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 34 - rev-parse --exclude-hidden=fetch fails with --branches
+
+expecting success of 6018.35 'rev-parse --exclude-hidden=fetch fails with --branches=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 35 - rev-parse --exclude-hidden=fetch fails with --branches=pattern
+
+expecting success of 6018.36 'rev-parse --exclude-hidden=fetch fails with --tags': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 36 - rev-parse --exclude-hidden=fetch fails with --tags
+
+expecting success of 6018.37 'rev-parse --exclude-hidden=fetch fails with --tags=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 37 - rev-parse --exclude-hidden=fetch fails with --tags=pattern
+
+expecting success of 6018.38 'rev-parse --exclude-hidden=fetch fails with --remotes': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 38 - rev-parse --exclude-hidden=fetch fails with --remotes
+
+expecting success of 6018.39 'rev-parse --exclude-hidden=fetch fails with --remotes=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 39 - rev-parse --exclude-hidden=fetch fails with --remotes=pattern
+
+expecting success of 6018.40 'rev-parse --exclude-hidden=receive with --all': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
+	
+ok 40 - rev-parse --exclude-hidden=receive with --all
+
+expecting success of 6018.41 'rev-parse --exclude-hidden=receive with --all': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
+	
+ok 41 - rev-parse --exclude-hidden=receive with --all
+
+expecting success of 6018.42 'rev-parse --exclude-hidden=receive with --glob': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
+	
+ok 42 - rev-parse --exclude-hidden=receive with --glob
+
+expecting success of 6018.43 'rev-parse --exclude-hidden=receive can be passed once per pseudo-ref': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
+	
+ok 43 - rev-parse --exclude-hidden=receive can be passed once per pseudo-ref
+
+expecting success of 6018.44 'rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 44 - rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref
+
+expecting success of 6018.45 'rev-parse --exclude-hidden=receive fails with --branches': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 45 - rev-parse --exclude-hidden=receive fails with --branches
+
+expecting success of 6018.46 'rev-parse --exclude-hidden=receive fails with --branches=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 46 - rev-parse --exclude-hidden=receive fails with --branches=pattern
+
+expecting success of 6018.47 'rev-parse --exclude-hidden=receive fails with --tags': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 47 - rev-parse --exclude-hidden=receive fails with --tags
+
+expecting success of 6018.48 'rev-parse --exclude-hidden=receive fails with --tags=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 48 - rev-parse --exclude-hidden=receive fails with --tags=pattern
+
+expecting success of 6018.49 'rev-parse --exclude-hidden=receive fails with --remotes': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 49 - rev-parse --exclude-hidden=receive fails with --remotes
+
+expecting success of 6018.50 'rev-parse --exclude-hidden=receive fails with --remotes=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 50 - rev-parse --exclude-hidden=receive fails with --remotes=pattern
+
+expecting success of 6018.51 'rev-parse --exclude-hidden=uploadpack with --all': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
+	
+ok 51 - rev-parse --exclude-hidden=uploadpack with --all
+
+expecting success of 6018.52 'rev-parse --exclude-hidden=uploadpack with --all': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
+	
+ok 52 - rev-parse --exclude-hidden=uploadpack with --all
+
+expecting success of 6018.53 'rev-parse --exclude-hidden=uploadpack with --glob': 
+		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
+	
+ok 53 - rev-parse --exclude-hidden=uploadpack with --glob
+
+expecting success of 6018.54 'rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref': 
+		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
+	
+ok 54 - rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref
+
+expecting success of 6018.55 'rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 55 - rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref
+
+expecting success of 6018.56 'rev-parse --exclude-hidden=uploadpack fails with --branches': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 56 - rev-parse --exclude-hidden=uploadpack fails with --branches
+
+expecting success of 6018.57 'rev-parse --exclude-hidden=uploadpack fails with --branches=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 57 - rev-parse --exclude-hidden=uploadpack fails with --branches=pattern
+
+expecting success of 6018.58 'rev-parse --exclude-hidden=uploadpack fails with --tags': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 58 - rev-parse --exclude-hidden=uploadpack fails with --tags
+
+expecting success of 6018.59 'rev-parse --exclude-hidden=uploadpack fails with --tags=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 59 - rev-parse --exclude-hidden=uploadpack fails with --tags=pattern
+
+expecting success of 6018.60 'rev-parse --exclude-hidden=uploadpack fails with --remotes': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 60 - rev-parse --exclude-hidden=uploadpack fails with --remotes
+
+expecting success of 6018.61 'rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern': 
+			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 61 - rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern
+
+expecting success of 6018.62 'rev-list --exclude=glob with --branches=glob': 
+	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
+
+ok 62 - rev-list --exclude=glob with --branches=glob
+
+expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
+	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
+
+ok 63 - rev-list --exclude=glob with --tags=glob
+
+expecting success of 6018.64 'rev-list --exclude=glob with --remotes=glob': 
+	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 64 - rev-list --exclude=glob with --remotes=glob
+
+expecting success of 6018.65 'rev-list --exclude=ref with --branches=glob': 
+	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
+
+ok 65 - rev-list --exclude=ref with --branches=glob
+
+expecting success of 6018.66 'rev-list --exclude=ref with --tags=glob': 
+	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
+
+ok 66 - rev-list --exclude=ref with --tags=glob
+
+expecting success of 6018.67 'rev-list --exclude=ref with --remotes=glob': 
+	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
+
+ok 67 - rev-list --exclude=ref with --remotes=glob
+
+expecting success of 6018.68 'rev-list --glob=refs/heads/subspace/*': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
+
+
+ok 68 - rev-list --glob=refs/heads/subspace/*
+
+expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
+
+	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
+
+
+ok 69 - rev-list --glob refs/heads/subspace/*
+
+expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
+
+	compare rev-list "main" "--glob -0 main"
+
+
+ok 70 - rev-list not confused by option-like --glob arg
+
+expecting success of 6018.71 'rev-list --glob=heads/subspace/*': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
+
+
+ok 71 - rev-list --glob=heads/subspace/*
+
+expecting success of 6018.72 'rev-list --glob=refs/heads/subspace/': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
+
+
+ok 72 - rev-list --glob=refs/heads/subspace/
+
+expecting success of 6018.73 'rev-list --glob=heads/subspace/': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
+
+
+ok 73 - rev-list --glob=heads/subspace/
+
+expecting success of 6018.74 'rev-list --glob=heads/subspace': 
+
+	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
+
+
+ok 74 - rev-list --glob=heads/subspace
+
+expecting success of 6018.75 'rev-list --branches=subspace/*': 
+
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
+
+
+ok 75 - rev-list --branches=subspace/*
+
+expecting success of 6018.76 'rev-list --branches=subspace/': 
+
+	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
+
+
+ok 76 - rev-list --branches=subspace/
+
+expecting success of 6018.77 'rev-list --branches=subspace': 
+
+	compare rev-list "subspace/one subspace/two" "--branches=subspace"
+
+
+ok 77 - rev-list --branches=subspace
+
+expecting success of 6018.78 'rev-list --branches': 
+
+	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
+
+
+ok 78 - rev-list --branches
+
+expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
+
+	compare rev-list "main" "--glob=heads/someref/* main"
+
+
+ok 79 - rev-list --glob=heads/someref/* main
+
+expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
+
+	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
+
+
+ok 80 - rev-list --glob=heads/subspace/* --glob=heads/other/*
 
-expecting success of 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.81 'rev-list --glob=heads/*': 
 
-	test_must_fail git rev-list --min-parents=1q HEAD 2>error &&
-	grep "not an integer" error &&
+	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
 
-	git rev-list --max-parents=1 --min-parents=1 HEAD &&
-	git rev-list --max-parents=-1 --min-parents=-1 HEAD
 
-fatal: '1q': not an integer
-fatal: '1q': not an integer
-f8636639f2719cb5d0e52902e25dd79e31d50ebf
-e29a44f7344623c1769e6ebf2a1dff468d38b78e
-090687546dcc443852244b61eee29f6d293f6447
-ecfa7709bd4782513d04d58aeadcd786b62f6f3d
-bfa07e29ea06c68a502fde1833ec867767da4e32
-7e25eedf3aa367cb6d152df2cbc457e529654b85
-8d2f284dbf2c57c34df5b16a17e4d1ed01377311
-f8636639f2719cb5d0e52902e25dd79e31d50ebf
-e29a44f7344623c1769e6ebf2a1dff468d38b78e
-04238a19571066bf2ac4ee6374c2ec92ef588e0f
-090687546dcc443852244b61eee29f6d293f6447
-ecfa7709bd4782513d04d58aeadcd786b62f6f3d
-bfa07e29ea06c68a502fde1833ec867767da4e32
-e622cead7c16d37859f0b353313a4d83b5e9a6e5
-ok 4 - parse --max-parents & --min-parents
+ok 81 - rev-list --glob=heads/*
 
-expecting success of 6009.5 'rev-list roots': 
+expecting success of 6018.82 'rev-list --tags=foo': 
 
-	check_revlist "--max-parents=0" one five
+	compare rev-list "foo/bar" "--tags=foo"
 
-ok 5 - rev-list roots
 
-expecting success of 6009.6 'rev-list no merges': 
+ok 82 - rev-list --tags=foo
 
-	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.83 'rev-list --tags': 
 
-ok 6 - rev-list no merges
+	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
 
-expecting success of 6009.7 'rev-list no octopuses': 
 
-	check_revlist "--max-parents=2" one normalmerge eight seven six five four three two
+ok 83 - rev-list --tags
 
-ok 7 - rev-list no octopuses
+expecting success of 6018.84 'rev-list --remotes=foo': 
 
-expecting success of 6009.8 'rev-list no roots': 
+	compare rev-list "foo/baz" "--remotes=foo"
 
-	check_revlist "--min-parents=1" tetrapus tripus normalmerge eight seven six four three two
 
-ok 8 - rev-list no roots
+ok 84 - rev-list --remotes=foo
 
-expecting success of 6009.9 'rev-list merges': 
+expecting success of 6018.85 'rev-list --exclude with --branches': 
+	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
 
-	check_revlist "--min-parents=2" tetrapus tripus normalmerge &&
-	check_revlist "--merges" tetrapus tripus normalmerge
+ok 85 - rev-list --exclude with --branches
 
-ok 9 - rev-list merges
+expecting success of 6018.86 'rev-list --exclude with --all': 
+	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
 
-expecting success of 6009.10 'rev-list octopus': 
+ok 86 - rev-list --exclude with --all
 
-	check_revlist "--min-parents=3" tetrapus tripus
+expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
+	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 
-ok 10 - rev-list octopus
+ok 87 - rev-list accumulates multiple --exclude
 
-expecting success of 6009.11 'rev-list ordinary commits': 
+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
 
-	check_revlist "--min-parents=1 --max-parents=1" eight seven six four three two
+ok 88 - rev-list should succeed with empty output on empty stdin
 
-ok 11 - rev-list ordinary commits
+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 6009.12 'rev-list --merges --no-merges yields empty set': 
+ok 89 - rev-list should succeed with empty output with all refs excluded
 
-	check_revlist "--min-parents=2 --no-merges" &&
-	check_revlist "--merges --no-merges" &&
-	check_revlist "--no-merges --merges"
+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
+	)
 
-ok 12 - rev-list --merges --no-merges yields empty set
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6018-rev-list-glob/empty/.git/
+ok 90 - rev-list should succeed with empty output with empty --all
 
-expecting success of 6009.13 'rev-list override and infinities': 
+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
 
-	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 91 - rev-list should succeed with empty output with empty glob
 
-ok 13 - rev-list override and infinities
+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 6009.14 'dodecapus': 
+ok 92 - rev-list should succeed with empty output when ignoring missing
 
-	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.93 'shortlog accepts --glob/--tags/--remotes': 
 
-	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
+	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
 
-Switched to a new branch 'root1'
-[root1 9562ee3] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-Switched to a new branch 'root2'
-[root2 1779fe6] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-Switched to a new branch 'root3'
-[root3 cc9911e] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-Switched to a new branch 'root4'
-[root4 35b702f] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-Switched to a new branch 'root5'
-[root5 c532809] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-Switched to a new branch 'root6'
-[root6 f4a589f] 6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 6.t
-Switched to a new branch 'root7'
-[root7 4f77507] 7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 7.t
-Switched to a new branch 'root8'
-[root8 e4dbc7d] 8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 8.t
-Switched to a new branch 'root9'
-[root9 446b36e] 9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 9.t
-Switched to a new branch 'root10'
-[root10 120147b] 10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 10.t
-Switched to a new branch 'root11'
-[root11 ce99f6d] 11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 11.t
-Switched to branch 'main'
-Trying simple merge with root1
-Trying simple merge with root2
-Trying simple merge with root3
-Trying simple merge with root4
-Trying simple merge with root5
-Trying simple merge with root6
-Trying simple merge with root7
-Trying simple merge with root8
-Trying simple merge with root9
-Trying simple merge with root10
-Trying simple merge with root11
-Merge made by the 'octopus' strategy.
- 1.t  | 1 +
- 10.t | 1 +
- 11.t | 1 +
- 2.t  | 1 +
- 3.t  | 1 +
- 4.t  | 1 +
- 5.t  | 1 +
- 6.t  | 1 +
- 7.t  | 1 +
- 8.t  | 1 +
- 9.t  | 1 +
- 11 files changed, 11 insertions(+)
- create mode 100644 1.t
- create mode 100644 10.t
- create mode 100644 11.t
- create mode 100644 2.t
- create mode 100644 3.t
- create mode 100644 4.t
- create mode 100644 5.t
- create mode 100644 6.t
- create mode 100644 7.t
- create mode 100644 8.t
- create mode 100644 9.t
-ok 14 - dodecapus
 
-expecting success of 6009.15 'ancestors with the same commit time': 
+ok 93 - shortlog accepts --glob/--tags/--remotes
 
-	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
+checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
 
-[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 shortlog \
+	  "main other/three someref subspace-x subspace/one subspace/two" \
+	  "--glob heads/*"
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6010-merge-base.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6010-merge-base/.git/
-expecting success of 6010.1 'setup': 
-	T=$(git mktree </dev/null)
 
-ok 1 - setup
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-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)
+    -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
 
-ok 2 - set up G and H
+not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
 
-expecting success of 6010.3 'merge-base G H': 
-	git name-rev $B >expected &&
+checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
 
-	MB=$(git merge-base G H) &&
-	git name-rev "$MB" >actual.single &&
+	compare shortlog main "--glob -e main"
 
-	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 &&
+error: unknown option `--glob'
+usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
+   or: git log --pretty=short | git shortlog [<options>]
 
-	test_cmp expected actual.single &&
-	test_cmp expected actual.all &&
-	test_cmp expected actual.sb
+    -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
 
-ok 3 - merge-base G H
+not ok 95 - shortlog --glob is not confused by option-like argument # TODO known breakage
 
-expecting success of 6010.4 'merge-base/show-branch --independent': 
-	git name-rev "$H" >expected1 &&
-	git name-rev "$H" "$G" >expected2 &&
+# still have 4 known breakage(s)
+# passed all remaining 91 test(s)
+1..95
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6021-rev-list-exclude-hidden.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6021-rev-list-exclude-hidden/.git/
+expecting success of 6021.1 'setup': 
+	test_commit_bulk --id=commit --ref=refs/heads/branch 1 &&
+	COMMIT=$(git rev-parse refs/heads/branch) &&
+	test_commit_bulk --id=tag --ref=refs/tags/lightweight 1 &&
+	TAG=$(git rev-parse refs/tags/lightweight) &&
+	test_commit_bulk --id=hidden --ref=refs/hidden/commit 1 &&
+	HIDDEN=$(git rev-parse refs/hidden/commit) &&
+	test_commit_bulk --id=namespace --ref=refs/namespaces/namespace/refs/namespaced/commit 1 &&
+	NAMESPACE=$(git rev-parse refs/namespaces/namespace/refs/namespaced/commit)
 
-	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 &&
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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
+---------------------------------------------------------------------
 
-	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 &&
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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
+---------------------------------------------------------------------
 
-	test_cmp expected1 actual1.mb &&
-	test_cmp expected2 actual2.mb &&
-	test_cmp expected1 actual1.sb &&
-	test_cmp expected2 actual2.sb
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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
+---------------------------------------------------------------------
 
-ok 4 - merge-base/show-branch --independent
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 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.
+ok 1 - setup
 
-	S=$(doit  0 S) &&
+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
 
-	C0=$(doit -3 C0 $S) &&
-	C1=$(doit -2 C1 $C0) &&
-	C2=$(doit -1 C2 $C1) &&
+ok 2 - invalid section
 
-	L0=$(doit  1 L0 $S) &&
-	L1=$(doit  2 L1 $L0) &&
-	L2=$(doit  3 L2 $L1) &&
+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
 
-	R0=$(doit  1 R0 $S) &&
-	R1=$(doit  2 R1 $R0) &&
-	R2=$(doit  3 R2 $R1) &&
+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
 
-	PL=$(doit  4 PL $L2 $C2) &&
-	PR=$(doit  4 PR $C2 $R2) &&
+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 name-rev $C2 >expected &&
+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
 
-	MB=$(git merge-base PL PR) &&
-	git name-rev "$MB" >actual.single &&
+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
 
-	MB=$(git merge-base --all PL PR) &&
-	git name-rev "$MB" >actual.all &&
+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
 
-	test_cmp expected actual.single &&
-	test_cmp expected actual.all
+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
 
-ok 5 - unsynchronized clocks
+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 6010.6 '--independent with unsynchronized clocks': 
-	IB=$(doit 0 IB) &&
-	I1=$(doit -10 I1 $IB) &&
-	I2=$(doit  -9 I2 $I1) &&
-	I3=$(doit  -8 I3 $I2) &&
-	I4=$(doit  -7 I4 $I3) &&
-	I5=$(doit  -6 I5 $I4) &&
-	I6=$(doit  -5 I6 $I5) &&
-	I7=$(doit  -4 I7 $I6) &&
-	I8=$(doit  -3 I8 $I7) &&
-	IH=$(doit  -2 IH $I8) &&
+expecting success of 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
 
-	echo $IH >expected &&
-	git merge-base --independent IB IH >actual &&
-	test_cmp expected actual
+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
 
-ok 6 - --independent with unsynchronized clocks
+expecting success of 6021.13 'fetch: works with --glob': 
+		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
+		cat >expected <<-EOF &&
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 13 - fetch: works with --glob
 
-expecting success of 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 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
 
-	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 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
 
-[master (root-commit) 0075405] MMR
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MMR.t
-[master 91243c1] MM1
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM1.t
-[master 4d5fde5] MM-o
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-o.t
-[master ca22c18] MM-p
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-p.t
-[master 2659ed6] MM-q
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-q.t
-[master fdb9a8f] MMA
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MMA.t
-Note: switching to 'MM1'.
+expecting success of 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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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.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
 
-If you want to 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.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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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
 
-HEAD is now at 91243c1 MM1
-[detached HEAD c35e31c] MM-r
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-r.t
-[detached HEAD 44e361c] MM-s
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-s.t
-[detached HEAD a5daa7f] MM-t
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-t.t
-[detached HEAD bca1425] MMB
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MMB.t
-Previous HEAD position was bca1425 MMB
-HEAD is now at 0075405 MMR
-[detached HEAD 174b4d1] MM-u
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-u.t
-[detached HEAD c171a6c] MM-v
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-v.t
-[detached HEAD c25d00b] MM-w
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-w.t
-[detached HEAD 610cc22] MM-x
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MM-x.t
-[detached HEAD 03ab457] MMC
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 MMC.t
-ok 7 - merge-base for octopus-step (setup)
+expecting success of 6021.23 'receive: passed multiple times': 
+		echo "fatal: --exclude-hidden= passed more than once" >expected &&
+		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
+		test_cmp expected err
+	
+ok 23 - receive: passed multiple times
 
-expecting success of 6010.8 'merge-base A B C': 
-	git rev-parse --verify MM1 >expected &&
-	git rev-parse --verify MMR >expected.sb &&
+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
 
-	git merge-base --all MMA MMB MMC >actual &&
-	git merge-base --all --octopus MMA MMB MMC >actual.common &&
-	git show-branch --merge-base MMA MMB MMC >actual.sb &&
+expecting success of 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
 
-	test_cmp expected actual &&
-	test_cmp expected.sb actual.common &&
-	test_cmp expected.sb actual.sb
+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
 
-ok 8 - merge-base A B C
+expecting success of 6021.27 'receive: respects both transfer.hideRefs and receive.hideRefs': 
+		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 27 - receive: respects both transfer.hideRefs and receive.hideRefs
 
-expecting success of 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 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
 
-	git rev-parse CC1 CC2 >expected &&
-	git merge-base --all CCB CCA^^ CCA^^2 >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
 
-	sort expected >expected.sorted &&
-	sort actual >actual.sorted &&
-	test_cmp expected.sorted actual.sorted
+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
 
-HEAD is now at 0075405 MMR
-[detached HEAD 4141141] CC1
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CC1.t
-HEAD is now at e34970a E
-[detached HEAD d33e00c] CC2
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CC2.t
-Merge made by the 'ours' strategy.
-[detached HEAD 48e3312] CC-o
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CC-o.t
-[detached HEAD dda5641] CCB
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CCB.t
-HEAD is now at 4141141 CC1
-Merge made by the 'ours' strategy.
-[detached HEAD 6d30b69] CCA
- Author: A U Thor <git@au.thor.xz>
- 1 file changed, 1 insertion(+)
- create mode 100644 CCA.t
-ok 9 - criss-cross merge-base for octopus-step
+expecting success of 6021.31 'receive: excluded hidden refs get reset': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 31 - receive: excluded hidden refs get reset
 
-expecting success of 6010.10 'using reflog to find the fork point': 
-	git reset --hard &&
-	git checkout -b base $E &&
+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
 
-	(
-		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 &&
+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
 
-		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 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
 
-	) &&
-	# check that we correctly default to HEAD
-	git checkout derived &&
-	git merge-base --fork-point base >actual &&
-	test_cmp expect3 actual
+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
 
-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 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 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
+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
 
-e34970abbab4461223052769885c56a229ee9299
-ok 11 - --fork-point works with empty reflog
+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 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
+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
 
-[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 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
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6012-rev-list-simplify.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6012-rev-list-simplify/.git/
-expecting success of 6012.1 'setup': 
-	echo "Hi there" >file &&
-	echo "initial" >lost &&
-	git add file lost &&
-	test_tick && git commit -m "Initial file and lost" &&
-	note A &&
+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
 
-	git branch other-branch &&
+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
 
-	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 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
 
-	echo "Hello" >file &&
-	echo "second" >lost &&
-	git add file lost &&
-	test_tick && GIT_AUTHOR_DATE=$(($test_tick + 120)) git commit -m "Modified file and lost" &&
-	note B &&
+expecting success of 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
 
-	git checkout other-branch &&
+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
 
-	echo "Hello" >file &&
-	>lost &&
-	git add file lost &&
-	test_tick && git commit -m "Modified the file identically" &&
-	note C &&
+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
 
-	echo "This is a stupid example" >another-file &&
-	git add another-file &&
-	test_tick && git commit -m "Add another file" &&
-	note D &&
+expecting success of 6021.47 'uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs': 
+		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 47 - uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs
 
-	test_tick &&
-	test_must_fail git merge -m "merge" main &&
-	>lost && git commit -a -m "merge" &&
-	note E &&
+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
 
-	echo "Yet another" >elif &&
-	git add elif &&
-	test_tick && git commit -m "Irrelevant change" &&
-	note F &&
+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
 
-	git checkout main &&
-	echo "Yet another" >elif &&
-	git add elif &&
-	test_tick && git commit -m "Another irrelevant change" &&
-	note G &&
+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
 
-	test_tick && git merge -m "merge" other-branch &&
-	note H &&
+expecting success of 6021.51 'uploadpack: excluded hidden refs get reset': 
+		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 51 - uploadpack: excluded hidden refs get reset
 
-	echo "Final change" >file &&
-	test_tick && git commit -a -m "Final change" &&
-	note I &&
+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
 
-	git checkout main &&
-	test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
-	note K &&
+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
 
-	echo "Immaterial" >elif &&
-	git add elif &&
-	test_tick && git commit -m "Last" &&
-	note L
+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
 
-[main (root-commit) 2ce5a1a] Initial file and lost
+expecting success of 6021.55 'uploadpack: does not hide namespace by default': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$NAMESPACE
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 55 - uploadpack: does not hide namespace by default
+
+expecting success of 6021.56 'uploadpack: can operate on unstripped refs': 
+		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
+		cat >expected <<-EOF &&
+		$HIDDEN
+		$TAG
+		$COMMIT
+		EOF
+		test_cmp expected out
+	
+ok 56 - uploadpack: can operate on unstripped refs
+
+expecting success of 6021.57 'uploadpack: fails with --remotes': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 57 - uploadpack: fails with --remotes
+
+expecting success of 6021.58 'uploadpack: fails with --remotes=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--remotes' cannot be used together
+ok 58 - uploadpack: fails with --remotes=pattern
+
+expecting success of 6021.59 'uploadpack: fails with --branches': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 59 - uploadpack: fails with --branches
+
+expecting success of 6021.60 'uploadpack: fails with --branches=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--branches' cannot be used together
+ok 60 - uploadpack: fails with --branches=pattern
+
+expecting success of 6021.61 'uploadpack: fails with --tags': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 61 - uploadpack: fails with --tags
+
+expecting success of 6021.62 'uploadpack: fails with --tags=pattern': 
+			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
+			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
+		
+error: options '--exclude-hidden' and '--tags' cannot be used together
+ok 62 - uploadpack: fails with --tags=pattern
+
+# passed all 62 test(s)
+1..62
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t5572-pull-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/.git/
+expecting success of 5572.1 'git_pull: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file
- create mode 100644 lost
-rm 'file'
-rm 'lost'
-[unrelated (root-commit) efdd716] Side root
+ 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 side
-Switched to branch 'main'
-[main 1a21661] Modified file and lost
+ 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
  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
+ 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 2 deletions(-)
-[other-branch afa190a] Add another file
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- 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
+ 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>
-[other-branch f67ebfb] Irrelevant change
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 elif
-Switched to branch 'main'
-[main b2dce95] Another irrelevant change
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
  Author: A U Thor <author@example.com>
- 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
+ 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(+), 1 deletion(-)
-Already on 'main'
-Merge made by the 'ort' strategy.
- side | 1 +
  1 file changed, 1 insertion(+)
- create mode 100644 side
-[main 1be1b21] Last
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_pull: added submodule creates empty directory
 
-expecting success of 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
+expecting success of 5572.2 'git_pull: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
 	
-ok 2 - log --full-history --topo-order
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_pull: added submodule leaves existing empty directory alone
 
-expecting success of 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
+expecting success of 5572.3 'git_pull: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
 	
-ok 3 - log --full-history
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Deleted branch replace_file_with_sub1 (was 8b6fdfc).
+Switched to a new branch 'replace_file_with_sub1'
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_pull: replace tracked file with submodule creates empty directory
 
-expecting success of 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
+expecting success of 5572.4 'git_pull: 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
+		)
 	
-ok 4 - log --full-history --date-order
+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'.
+Deleted branch replace_directory_with_sub1 (was a2e65d5).
+Switched to a new branch 'replace_directory_with_sub1'
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Updating cb28587..a2e65d5
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - git_pull: replace directory with submodule
 
-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
+expecting success of 5572.5 'git_pull: 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
+		)
 	
-ok 5 - log --full-history --author-date-order
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Deleted branch remove_sub1 (was d6ba723).
+Switched to a new branch 'remove_sub1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 5 - git_pull: removed submodule leaves submodule directory and its contents in place
 
-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
+expecting success of 5572.6 'git_pull: 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
+		)
 	
-ok 6 - log --full-history -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Deleted branch remove_sub1 (was d6ba723).
+Switched to a new branch 'remove_sub1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 6 - git_pull: removed submodule leaves submodule containing a .git directory alone
 
-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
+expecting success of 5572.7 'git_pull: 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
+		)
 	
-ok 7 - log --full-history --topo-order -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_directory (was cb28587).
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 7 - git_pull: replace submodule with a directory must fail
 
-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
+expecting success of 5572.8 'git_pull: 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
+		)
 	
-ok 8 - log --full-history --date-order -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_directory (was cb28587).
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 8 - git_pull: replace submodule containing a .git directory with a directory must fail
 
-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
+checking known breakage of 5572.9 'git_pull: 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
+		)
 	
-ok 9 - log --full-history --author-date-order -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_file (was 2364f5a).
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git pull
+not ok 9 - git_pull: replace submodule with a file must fail # TODO known breakage
 
-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
+checking known breakage of 5572.10 'git_pull: 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
+		)
 	
-ok 10 - log --simplify-merges -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_file (was 2364f5a).
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git pull
+not ok 10 - git_pull: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-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
+expecting success of 5572.11 'git_pull: 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
+		)
 	
-ok 11 - log --simplify-merges --topo-order -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Deleted branch modify_sub1 (was cb2bda7).
+Switched to a new branch 'modify_sub1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Updating 09bcf53..cb2bda7
+Fast-forward
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - git_pull: modified submodule does not update submodule work tree
 
-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
+expecting success of 5572.12 'git_pull: 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 12 - log --simplify-merges --date-order -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Deleted branch invalid_sub1 (was e6169bf).
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Updating 09bcf53..e6169bf
+Fast-forward
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - git_pull: modified submodule does not update submodule work tree to invalid commit
 
-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
+expecting success of 5572.13 'git_pull: 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
+		)
 	
-ok 13 - log --simplify-merges --author-date-order -- file
+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'.
+Deleted branch valid_sub1 (was 3036e4e).
+Switched to a new branch 'valid_sub1'
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Updating e6169bf..3036e4e
+Fast-forward
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - git_pull: modified submodule does not update submodule work tree from invalid commit
 
-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
+expecting success of 5572.14 'git_pull: 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
+		)
 	
-ok 14 - log -- file
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Updating 27611a5..09bcf53
+ok 14 - git_pull: added submodule doesn't remove untracked unignored file with same name
 
-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
+expecting success of 5572.15 'git_pull_ff: 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
+		)
 	
-ok 15 - log --topo-order -- file
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 15 - git_pull_ff: added submodule creates empty directory
 
-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
+expecting success of 5572.16 'git_pull_ff: 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 16 - log --date-order -- file
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 16 - git_pull_ff: added submodule leaves existing empty directory alone
 
-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
+expecting success of 5572.17 'git_pull_ff: 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
+		)
 	
-ok 17 - log --author-date-order -- file
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Deleted branch replace_file_with_sub1 (was 8b6fdfc).
+Switched to a new branch 'replace_file_with_sub1'
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 17 - git_pull_ff: replace tracked file with submodule creates empty directory
 
-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
+expecting success of 5572.18 'git_pull_ff: 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
+		)
 	
-ok 18 - log --first-parent -- another-file
+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'.
+Deleted branch replace_directory_with_sub1 (was a2e65d5).
+Switched to a new branch 'replace_directory_with_sub1'
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Updating cb28587..a2e65d5
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 18 - git_pull_ff: replace directory with submodule
 
-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
+expecting success of 5572.19 'git_pull_ff: 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
+		)
 	
-ok 19 - log --first-parent --topo-order -- another-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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Deleted branch remove_sub1 (was d6ba723).
+Switched to a new branch 'remove_sub1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 19 - git_pull_ff: removed submodule leaves submodule directory and its contents in place
 
-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
+expecting success of 5572.20 'git_pull_ff: 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
+		)
 	
-ok 20 - log --first-parent L
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Deleted branch remove_sub1 (was d6ba723).
+Switched to a new branch 'remove_sub1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 20 - git_pull_ff: removed submodule leaves submodule containing a .git directory alone
 
-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
+expecting success of 5572.21 'git_pull_ff: 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
+		)
 	
-ok 21 - log --exclude-first-parent-only F ^L
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_directory (was cb28587).
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 21 - git_pull_ff: replace submodule with a directory must fail
 
-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
+expecting success of 5572.22 'git_pull_ff: 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
+		)
 	
-ok 22 - log F ^L
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_directory (was cb28587).
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 22 - git_pull_ff: replace submodule containing a .git directory with a directory must fail
 
-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
+checking known breakage of 5572.23 'git_pull_ff: 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
+		)
 	
-ok 23 - log L ^F
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_file (was 2364f5a).
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git pull --ff
+not ok 23 - git_pull_ff: replace submodule with a file must fail # TODO known breakage
 
-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
+checking known breakage of 5572.24 'git_pull_ff: 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
+		)
 	
-ok 24 - log --exclude-first-parent-only L ^F
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_file (was 2364f5a).
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git pull --ff
+not ok 24 - git_pull_ff: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-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
+expecting success of 5572.25 'git_pull_ff: 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
+		)
 	
-ok 25 - log --exclude-first-parent-only --first-parent L ^F
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Deleted branch modify_sub1 (was cb2bda7).
+Switched to a new branch 'modify_sub1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Updating 09bcf53..cb2bda7
+Fast-forward
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 25 - git_pull_ff: modified submodule does not update submodule work tree
 
-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
+expecting success of 5572.26 'git_pull_ff: 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 26 - log --full-history E -- lost
-
-expecting success of 6012.27 'full history simplification without parent': 
-	printf "%s\n" E C B A >expect &&
-	git log --pretty="$FMT" --full-history E -- lost >out &&
-	unnote >actual <out &&
-	sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-	test_cmp expect check
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Deleted branch invalid_sub1 (was e6169bf).
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Updating 09bcf53..e6169bf
+Fast-forward
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 26 - git_pull_ff: modified submodule does not update submodule work tree to invalid commit
 
-ok 27 - full history simplification without parent
+expecting success of 5572.27 'git_pull_ff: 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'.
+Deleted branch valid_sub1 (was 3036e4e).
+Switched to a new branch 'valid_sub1'
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Updating e6169bf..3036e4e
+Fast-forward
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 27 - git_pull_ff: modified submodule does not update submodule work tree from invalid commit
 
-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 5572.28 'git_pull_ff: 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'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Updating 27611a5..09bcf53
+ok 28 - git_pull_ff: added submodule doesn't remove untracked unignored file with same name
 
-ok 28 - --full-diff is not affected by --parents
+expecting success of 5572.29 'git_pull_ff_only: 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'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 29 - git_pull_ff_only: added submodule creates empty directory
 
-expecting success of 6012.29 'setup rebuild repo': 
-	rm -rf .git * &&
-	git init &&
-	git switch -c topic &&
+expecting success of 5572.30 'git_pull_ff_only: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 30 - git_pull_ff_only: added submodule leaves existing empty directory alone
 
-	echo base >file &&
-	git add file &&
-	test_commit I &&
+expecting success of 5572.31 'git_pull_ff_only: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Deleted branch replace_file_with_sub1 (was 8b6fdfc).
+Switched to a new branch 'replace_file_with_sub1'
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 31 - git_pull_ff_only: replace tracked file with submodule creates empty directory
 
-	echo A >file &&
-	git add file &&
-	test_commit A &&
+expecting success of 5572.32 'git_pull_ff_only: 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'.
+Deleted branch replace_directory_with_sub1 (was a2e65d5).
+Switched to a new branch 'replace_directory_with_sub1'
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Updating cb28587..a2e65d5
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 32 - git_pull_ff_only: replace directory with submodule
 
-	git switch -c branchB I &&
-	echo B >file &&
-	git add file &&
-	test_commit B &&
+expecting success of 5572.33 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Deleted branch remove_sub1 (was d6ba723).
+Switched to a new branch 'remove_sub1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 33 - git_pull_ff_only: removed submodule leaves submodule directory and its contents in place
 
-	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 5572.34 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Deleted branch remove_sub1 (was d6ba723).
+Switched to a new branch 'remove_sub1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 34 - git_pull_ff_only: removed submodule leaves submodule containing a .git directory alone
 
-	echo C >other &&
-	git add other &&
-	test_commit C &&
+expecting success of 5572.35 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_directory (was cb28587).
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 35 - git_pull_ff_only: replace submodule with a directory must fail
 
-	git switch -c branchX I &&
-	echo X >file &&
-	git add file &&
-	test_commit X &&
+expecting success of 5572.36 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_directory (was cb28587).
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 36 - git_pull_ff_only: replace submodule containing a .git directory with a directory must fail
 
-	git switch -c branchR M &&
-	git merge -m R -Xtheirs X &&
-	note R &&
+checking known breakage of 5572.37 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_file (was 2364f5a).
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git pull --ff-only
+not ok 37 - git_pull_ff_only: replace submodule with a file must fail # TODO known breakage
 
-	git switch topic &&
-	git merge -m N R &&
-	note N &&
+checking known breakage of 5572.38 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_file (was 2364f5a).
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git pull --ff-only
+not ok 38 - git_pull_ff_only: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-	git switch -c branchY M &&
-	echo Y >y &&
-	git add y &&
-	test_commit Y &&
+expecting success of 5572.39 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Deleted branch modify_sub1 (was cb2bda7).
+Switched to a new branch 'modify_sub1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Updating 09bcf53..cb2bda7
+Fast-forward
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 39 - git_pull_ff_only: modified submodule does not update submodule work tree
 
-	git switch -c branchZ C &&
-	echo Z >z &&
-	git add z &&
-	test_commit Z &&
+expecting success of 5572.40 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Deleted branch invalid_sub1 (was e6169bf).
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Updating 09bcf53..e6169bf
+Fast-forward
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 40 - git_pull_ff_only: modified submodule does not update submodule work tree to invalid commit
 
-	git switch topic &&
-	git merge -m O Z &&
-	note O &&
+expecting success of 5572.41 'git_pull_ff_only: 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'.
+Deleted branch valid_sub1 (was 3036e4e).
+Switched to a new branch 'valid_sub1'
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Updating e6169bf..3036e4e
+Fast-forward
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 41 - git_pull_ff_only: modified submodule does not update submodule work tree from invalid commit
 
-	git merge -m P Y &&
-	note P
+expecting success of 5572.42 'git_pull_ff_only: 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'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Updating 27611a5..09bcf53
+ok 42 - git_pull_ff_only: added submodule doesn't remove untracked unignored file with same name
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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'
+expecting success of 5572.43 'git_pull_noff: 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'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
 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
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 43 - git_pull_noff: added submodule creates empty directory
+
+expecting success of 5572.44 'git_pull_noff: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
 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
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 44 - git_pull_noff: added submodule leaves existing empty directory alone
 
-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
+expecting success of 5572.45 'git_pull_noff: 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
+		)
 	
-ok 30 - log -- file
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Deleted branch replace_file_with_sub1 (was 8b6fdfc).
+Switched to a new branch 'replace_file_with_sub1'
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 45 - git_pull_noff: replace tracked file with submodule creates empty directory
 
-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
+expecting success of 5572.46 'git_pull_noff: 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
+		)
 	
-ok 31 - log --show-pulls -- file
+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'.
+Deleted branch replace_directory_with_sub1 (was a2e65d5).
+Switched to a new branch 'replace_directory_with_sub1'
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 46 - git_pull_noff: replace directory with submodule
 
-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
+expecting success of 5572.47 'git_pull_noff: 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
+		)
 	
-ok 32 - log --full-history --topo-order -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Deleted branch remove_sub1 (was d6ba723).
+Switched to a new branch 'remove_sub1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 47 - git_pull_noff: removed submodule leaves submodule directory and its contents in place
 
-expecting success of 6012.33 'log --simplify-merges --topo-order --show-pulls -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5572.48 'git_pull_noff: 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
+		)
 	
-ok 33 - log --simplify-merges --topo-order --show-pulls -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Deleted branch remove_sub1 (was d6ba723).
+Switched to a new branch 'remove_sub1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 48 - git_pull_noff: removed submodule leaves submodule containing a .git directory alone
 
-expecting success of 6012.34 'log --simplify-merges --topo-order -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5572.49 'git_pull_noff: 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
+		)
 	
-ok 34 - log --simplify-merges --topo-order -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_directory (was cb28587).
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 49 - git_pull_noff: replace submodule with a directory must fail
 
-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
+expecting success of 5572.50 'git_pull_noff: 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
+		)
 	
-ok 35 - log --first-parent -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_directory (was cb28587).
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 50 - git_pull_noff: replace submodule containing a .git directory with a directory must fail
 
-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
+checking known breakage of 5572.51 'git_pull_noff: 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
+		)
 	
-ok 36 - log --first-parent --show-pulls -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_file (was 2364f5a).
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git pull --no-ff
+not ok 51 - git_pull_noff: replace submodule with a file must fail # TODO known breakage
 
-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
+checking known breakage of 5572.52 'git_pull_noff: 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
+		)
 	
-ok 37 - log --topo-order --ancestry-path A..HEAD -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
+Deleted branch replace_sub1_with_file (was 2364f5a).
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git pull --no-ff
+not ok 52 - git_pull_noff: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-expecting success of 6012.38 'log --topo-order --show-pulls --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5572.53 'git_pull_noff: 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
+		)
 	
-ok 38 - log --topo-order --show-pulls --ancestry-path A..HEAD -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Deleted branch modify_sub1 (was cb2bda7).
+Switched to a new branch 'modify_sub1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Merge made by the 'ort' strategy.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 53 - git_pull_noff: modified submodule does not update submodule work tree
 
-expecting success of 6012.39 'log --topo-order --full-history --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5572.54 'git_pull_noff: 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 39 - log --topo-order --full-history --ancestry-path A..HEAD -- 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Deleted branch invalid_sub1 (was e6169bf).
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Merge made by the 'ort' strategy.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 54 - git_pull_noff: modified submodule does not update submodule work tree to invalid commit
 
-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
+expecting success of 5572.55 'git_pull_noff: 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
+		)
 	
-ok 40 - log --topo-order --simplify-merges --ancestry-path A..HEAD -- file
+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'.
+Deleted branch valid_sub1 (was 3036e4e).
+Switched to a new branch 'valid_sub1'
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Merge made by the 'ort' strategy.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 55 - git_pull_noff: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 6012.41 'log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file': 
-		git log --pretty="$FMT" --parents $param >out &&
-		unnote >actual <out &&
-		sed -e "s/^.*	\([^ ]*\) .*/\1/" >check <actual &&
-		test_cmp expect check
+expecting success of 5572.56 'git_pull_noff: 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
+		)
 	
-ok 41 - log --topo-order --simplify-merges --show-pulls --ancestry-path A..HEAD -- file
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Deleted branch add_sub1 (was 09bcf53).
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 56 - git_pull_noff: added submodule doesn't remove untracked unignored file with same name
 
-expecting success of 6012.42 'log --graph --simplify-merges --show-pulls': 
-	cat >expect <<-\EOF &&
-	* N
-	*   R
-	|\  
-	| * X
-	* |   M
-	|\ \  
-	| * | B
-	| |/  
-	* / A
-	|/  
-	* I
-	EOF
-	git log --graph --pretty="%s" \
-		--simplify-merges --show-pulls \
-		-- file >actual &&
-	test_cmp expect actual
+expecting success of 5572.57 'setup': 
+	git config --global protocol.file.allow always
 
-ok 42 - log --graph --simplify-merges --show-pulls
+ok 57 - setup
 
-# passed all 42 test(s)
-1..42
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6019-rev-list-ancestry-path.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6019-rev-list-ancestry-path/.git/
-expecting success of 6019.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	test_commit C &&
-	test_commit D &&
-	test_commit E &&
-	test_commit F &&
-	git reset --hard C &&
-	test_commit G &&
-	test_merge E H &&
-	test_commit I &&
-	test_merge F J &&
-	git reset --hard A &&
-	test_commit K &&
-	test_merge J L &&
-	test_commit M
+expecting success of 5572.58 'pull --recurse-submodule setup': 
+	test_create_repo child &&
+	test_commit -C child bar &&
 
-[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
+	test_create_repo parent &&
+	test_commit -C child foo &&
+
+	git -C parent submodule add ../child sub &&
+	git -C parent commit -m "add submodule" &&
+
+	git clone --recurse-submodules parent super
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child/.git/
+[master (root-commit) 750fa6a] bar
  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
+ create mode 100644 bar.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent/.git/
+[master 0e8869f] foo
  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
+ create mode 100644 foo.t
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent/sub'...
+done.
+[master (root-commit) e852c8d] add submodule
  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
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+Cloning into 'super'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/super/sub'...
+done.
+Submodule path 'sub': checked out '0e8869f4b19abd4315a34385d48a89d57d29fcef'
+ok 58 - pull --recurse-submodule setup
+
+expecting success of 5572.59 'recursive pull updates working tree': 
+	test_commit -C child merge_strategy &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "update submodule" &&
+
+	git -C super pull --no-rebase --recurse-submodules &&
+	test_path_is_file super/sub/merge_strategy.t
+
+[master f5118bb] merge_strategy
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 K.t
-Merge made by the 'ours' strategy.
-[main bcafe1b] M
+ create mode 100644 merge_strategy.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   0e8869f..f5118bb  master         -> origin/master
+ * [new tag]         merge_strategy -> merge_strategy
+Submodule path 'sub': checked out 'f5118bbe31591c1754caa4ae107e90ff56cba7a2'
+[master e22797f] update submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 M.t
-ok 1 - setup
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
+   e852c8d..e22797f  master     -> origin/master
+Fetching submodule sub
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   0e8869f..f5118bb  master         -> origin/master
+ * [new tag]         merge_strategy -> merge_strategy
+Updating e852c8d..e22797f
+Fast-forward
+ sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'sub': checked out 'f5118bbe31591c1754caa4ae107e90ff56cba7a2'
+ok 59 - recursive pull updates working tree
 
-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 5572.60 'submodule.recurse option triggers recursive pull': 
+	test_commit -C child merge_strategy_2 &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "update submodule" &&
 
-		if test -n "E F G H I J K L M"
-		then
-			sort raw >actual &&
-			test_cmp expect actual
-		else
-			test_must_be_empty raw
-		fi
-	
-ok 2 - log D..M
+	git -C super -c submodule.recurse pull --no-rebase &&
+	test_path_is_file super/sub/merge_strategy_2.t
 
-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 &&
+[master 2656b36] merge_strategy_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge_strategy_2.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   f5118bb..2656b36  master           -> origin/master
+ * [new tag]         merge_strategy_2 -> merge_strategy_2
+Submodule path 'sub': checked out '2656b365d0a47009f5a9da9ec2de04ec5d400273'
+[master c804116] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
+   e22797f..c804116  master     -> origin/master
+Fetching submodule sub
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   f5118bb..2656b36  master           -> origin/master
+ * [new tag]         merge_strategy_2 -> merge_strategy_2
+Updating e22797f..c804116
+Fast-forward
+ sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Submodule path 'sub': checked out '2656b365d0a47009f5a9da9ec2de04ec5d400273'
+ok 60 - submodule.recurse option triggers recursive pull
 
-		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 5572.61 ' --[no-]recurse-submodule and submodule.recurse': 
+	test_commit -C child merge_strategy_3 &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "update submodule" &&
 
-expecting success of 6019.4 'log --ancestry-path=F D..M': 
-		test_write_lines E F J L M >expect &&
-		git log --format=%s --ancestry-path=F D..M >raw &&
+	git -C super -c submodule.recurse pull --no-recurse-submodules --no-rebase &&
+	test_path_is_missing super/sub/merge_strategy_3.t &&
+	git -C super -c submodule.recurse=false pull --recurse-submodules --no-rebase &&
+	test_path_is_file super/sub/merge_strategy_3.t &&
 
-		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
+	test_commit -C child merge_strategy_4 &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "update submodule" &&
 
-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 &&
+	git -C super -c submodule.recurse=false pull --no-recurse-submodules --no-rebase &&
+	test_path_is_missing super/sub/merge_strategy_4.t &&
+	git -C super -c submodule.recurse=true pull --recurse-submodules --no-rebase &&
+	test_path_is_file super/sub/merge_strategy_4.t
 
-		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
+[master 685538c] merge_strategy_3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge_strategy_3.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   2656b36..685538c  master           -> origin/master
+ * [new tag]         merge_strategy_3 -> merge_strategy_3
+Submodule path 'sub': checked out '685538cca6f18f91014b4629a2f9b9136c6654cf'
+[master 7995336] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
+   c804116..7995336  master     -> origin/master
+Updating c804116..7995336
+Fast-forward
+ sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Fetching submodule sub
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   2656b36..685538c  master           -> origin/master
+ * [new tag]         merge_strategy_3 -> merge_strategy_3
+Already up to date.
+Submodule path 'sub': checked out '685538cca6f18f91014b4629a2f9b9136c6654cf'
+[master c05caa7] merge_strategy_4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge_strategy_4.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   685538c..c05caa7  master           -> origin/master
+ * [new tag]         merge_strategy_4 -> merge_strategy_4
+Submodule path 'sub': checked out 'c05caa7403cd6cb57ebb9b5c078ede769845b6ac'
+[master ab7e8d7] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
+   7995336..ab7e8d7  master     -> origin/master
+Updating 7995336..ab7e8d7
+Fast-forward
+ sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Fetching submodule sub
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   685538c..c05caa7  master           -> origin/master
+ * [new tag]         merge_strategy_4 -> merge_strategy_4
+Already up to date.
+Submodule path 'sub': checked out 'c05caa7403cd6cb57ebb9b5c078ede769845b6ac'
+ok 61 -  --[no-]recurse-submodule and submodule.recurse
 
-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 5572.62 'fetch.recurseSubmodules option triggers recursive fetch (but not recursive update)': 
+	test_commit -C child merge_strategy_5 &&
+	# Omit the parent commit, otherwise this passes with the
+	# default "pull" behavior.
 
-		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
+	git -C super -c fetch.recursesubmodules=true pull --no-rebase &&
+	# Check that the submodule commit was fetched
+	sub_oid=$(git -C child rev-parse HEAD) &&
+	git -C super/sub cat-file -e $sub_oid &&
+	# Check that the submodule worktree did not update
+	test_path_is_missing super/sub/merge_strategy_5.t
 
-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 &&
+[master d4ae3d3] merge_strategy_5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge_strategy_5.t
+Fetching submodule sub
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   c05caa7..d4ae3d3  master           -> origin/master
+ * [new tag]         merge_strategy_5 -> merge_strategy_5
+Already up to date.
+ok 62 - fetch.recurseSubmodules option triggers recursive fetch (but not recursive update)
 
-		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 5572.63 'fetch.recurseSubmodules takes precedence over submodule.recurse': 
+	test_commit -C child merge_strategy_6 &&
+	# Omit the parent commit, otherwise this passes with the
+	# default "pull" behavior.
 
-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 &&
+	git -C super -c submodule.recurse=false -c fetch.recursesubmodules=true pull --no-rebase &&
+	# Check that the submodule commit was fetched
+	sub_oid=$(git -C child rev-parse HEAD) &&
+	git -C super/sub cat-file -e $sub_oid &&
+	# Check that the submodule worktree did not update
+	test_path_is_missing super/sub/merge_strategy_6.t
 
-		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
+[master 1f3a5c4] merge_strategy_6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 merge_strategy_6.t
+Fetching submodule sub
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   d4ae3d3..1f3a5c4  master           -> origin/master
+ * [new tag]         merge_strategy_6 -> merge_strategy_6
+Already up to date.
+ok 63 - fetch.recurseSubmodules takes precedence over submodule.recurse
 
-expecting success of 6019.9 'log D..M -- M.t': 
-		test_write_lines M >expect &&
-		git log --format=%s D..M -- M.t >raw &&
+expecting success of 5572.64 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)': 
+	# This tests the following scenario :
+	# - local submodule has new commits
+	# - local superproject does not have new commits
+	# - upstream superproject has new commits that change the submodule pointer
 
-		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
+	# change upstream
+	test_commit -C child rebase_strategy &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "update submodule" &&
 
-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 &&
+	# also have local commits
+	test_commit -C super/sub local_stuff &&
 
-		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
+	git -C super pull --rebase --recurse-submodules &&
+	test_path_is_file super/sub/rebase_strategy.t &&
+	test_path_is_file super/sub/local_stuff.t
 
-expecting success of 6019.11 'log F...I': 
-		test_write_lines F G H I >expect &&
-		git log --format=%s F...I >raw &&
+[master 4391f12] rebase_strategy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 rebase_strategy.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   c05caa7..4391f12  master          -> origin/master
+ * [new tag]         rebase_strategy -> rebase_strategy
+ * [new tag]         merge_strategy_5 -> merge_strategy_5
+ * [new tag]         merge_strategy_6 -> merge_strategy_6
+Submodule path 'sub': checked out '4391f120cab920b6a92bfc8c3d1803d384f7c2ab'
+[master 7a9de42] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD a12280c] local_stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 local_stuff.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
+   ab7e8d7..7a9de42  master     -> origin/master
+Fetching submodule sub
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   1f3a5c4..4391f12  master          -> origin/master
+ * [new tag]         rebase_strategy -> rebase_strategy
+Updating ab7e8d7..7a9de42
+Fast-forward
+ sub | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
+Submodule path 'sub': rebased into '4391f120cab920b6a92bfc8c3d1803d384f7c2ab'
+ok 64 - pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)
 
-		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 5572.65 'pull --rebase --recurse-submodules fails if both sides record submodule changes': 
+	# This tests the following scenario :
+	# - local superproject has new commits that change the submodule pointer
+	# - upstream superproject has new commits that change the submodule pointer
 
-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 &&
+	# local changes in submodule recorded in superproject:
+	test_commit -C super/sub local_stuff_2 &&
+	git -C super add sub &&
+	git -C super commit -m "local update submodule" &&
 
-		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
+	# and in the remote as well:
+	test_commit -C child important_upstream_work &&
+	git -C parent submodule update --remote &&
+	git -C parent add sub &&
+	git -C parent commit -m "remote update submodule" &&
 
-expecting success of 6019.13 'log G..M -- G.t': 
-		test_write_lines  >expect &&
-		git log --format=%s G..M -- G.t >raw &&
+	# Unfortunately we fail here, despite no conflict in the
+	# submodule itself, but the merge strategy in submodules
+	# does not support rebase:
+	test_must_fail git -C super pull --rebase --recurse-submodules 2>err &&
+	test_grep "locally recorded submodule modifications" err
 
-		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
+[detached HEAD 759ac20] local_stuff_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 local_stuff_2.t
+[master 9fde00a] local update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[master d4f9c29] important_upstream_work
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 important_upstream_work.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
+   4391f12..d4f9c29  master                  -> origin/master
+ * [new tag]         important_upstream_work -> important_upstream_work
+Submodule path 'sub': checked out 'd4f9c29a61c7ee3ad315fbd2b54c0e503fbceb51'
+[master 1555229] remote update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: cannot rebase with locally recorded submodule modifications
+ok 65 - pull --rebase --recurse-submodules fails if both sides record submodule changes
 
-expecting success of 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 5572.66 'pull --rebase --recurse-submodules (no submodule changes, no fork-point)': 
+	# This tests the following scenario :
+	# - local submodule does not have new commits
+	# - local superproject has new commits that *do not* change the submodule pointer
+	# - upstream superproject has new commits that *do not* change the submodule pointer
+	# - local superproject branch has no fork-point with its remote-tracking counter-part
 
-		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
+	# create upstream superproject
+	test_create_repo submodule &&
+	test_commit -C submodule first_in_sub &&
 
-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 &&
+	test_create_repo superprojet &&
+	test_commit -C superprojet first_in_super &&
+	git -C superprojet submodule add ../submodule &&
+	git -C superprojet commit -m "add submodule" &&
+	test_commit -C superprojet third_in_super &&
 
-		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
+	# clone superproject
+	git clone --recurse-submodules superprojet superclone &&
 
-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)
+	# add commits upstream
+	test_commit -C superprojet fourth_in_super &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6019-rev-list-ancestry-path/criss-cross/.git/
-[main (root-commit) 617a709] A
+	# create topic branch in clone, not based on any remote-tracking branch
+	git -C superclone checkout -b feat HEAD~1 &&
+	test_commit -C superclone first_on_feat &&
+	git -C superclone pull --rebase --recurse-submodules origin HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule/.git/
+[master (root-commit) 49dad2b] first_in_sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'xb'
-[xb 7dfaf8e] B
+ create mode 100644 first_in_sub.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/superprojet/.git/
+[master (root-commit) 71f9db3] first_in_super
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'xc'
-[xc cf5ea0b] C
+ create mode 100644 first_in_super.t
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/superprojet/submodule'...
+done.
+[master ef8874e] add submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+[master b90c0e9] third_in_super
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to a new branch 'xbc'
-Merge made by the 'ort' strategy.
- C.t | 1 +
+ create mode 100644 third_in_super.t
+Cloning into 'superclone'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/superclone/submodule'...
+done.
+Submodule path 'submodule': checked out '49dad2bf2d37043f968daefcc5bfbeb341965350'
+[master b1f89fe] fourth_in_super
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to a new branch 'xcb'
-Merge made by the 'ort' strategy.
- B.t | 1 +
+ create mode 100644 fourth_in_super.t
+Switched to a new branch 'feat'
+[feat 81a2d37] first_on_feat
+ Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'main'
-ok 16 - setup criss-cross
+ create mode 100644 first_on_feat.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/superprojet
+ * branch            HEAD       -> FETCH_HEAD
+Fetching submodule submodule
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/feat.
+ok 66 - pull --rebase --recurse-submodules (no submodule changes, no fork-point)
 
-expecting success of 6019.17 'criss-cross: rev-list --ancestry-path cb..bc': 
-	(cd criss-cross &&
-	 git rev-list --ancestry-path xcb..xbc > actual &&
-	 test_must_be_empty actual)
+expecting success of 5572.67 'branch has no merge base with remote-tracking counterpart': 
+	rm -rf parent child &&
 
-ok 17 - criss-cross: rev-list --ancestry-path cb..bc
+	test_create_repo a-submodule &&
+	test_commit -C a-submodule foo &&
 
-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)
+	test_create_repo parent &&
+	git -C parent submodule add "$(pwd)/a-submodule" &&
+	git -C parent commit -m foo &&
 
-ok 18 - criss-cross: rev-list --ancestry-path --all ^cb
+	git clone parent child &&
 
-# passed all 18 test(s)
-1..18
+	# Reset the current branch so that it has no merge base with
+	# the remote-tracking branch.
+	OTHER=$(git -C child commit-tree -m bar \
+		$(git -C child rev-parse HEAD^{tree})) &&
+	git -C child reset --hard "$OTHER" &&
+
+	git -C child pull --recurse-submodules --rebase
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/a-submodule/.git/
+[master (root-commit) a4efc16] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent/a-submodule'...
+done.
+[master (root-commit) f0a072d] foo
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 a-submodule
+Cloning into 'child'...
+done.
+HEAD is now at fecfbdf bar
+warning: skipped previously applied commit fecfbdf
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+
                                                                                
Successfully rebased and updated refs/heads/master.
+ok 67 - branch has no merge base with remote-tracking counterpart
+
+# still have 8 known breakage(s)
+# passed all remaining 59 test(s)
+1..67
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6022-rev-list-missing.sh ***
@@ -385430,3110 +390353,470 @@
 1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6017-rev-list-stdin.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6017-rev-list-stdin/.git/
-expecting success of 6017.1 'setup': 
+*** t6040-tracking-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6040-tracking-info/.git/
+expecting success of 6040.1 'setup': 
+	advance a &&
+	advance b &&
+	advance c &&
+	git clone . test &&
 	(
-		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
-	)
+		cd test &&
+		git checkout -b b1 origin &&
+		git reset --hard HEAD^ &&
+		advance d &&
+		git checkout -b b2 origin &&
+		git reset --hard b1 &&
+		git checkout -b b3 origin &&
+		git reset --hard HEAD^ &&
+		git checkout -b b4 origin &&
+		advance e &&
+		advance f &&
+		git checkout -b brokenbase origin &&
+		git checkout -b b5 --track brokenbase &&
+		advance g &&
+		git branch -d brokenbase &&
+		git checkout -b b6 origin
+	) &&
+	git checkout -b follower --track main &&
+	advance h
 
-[main (root-commit) 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
+[main (root-commit) cc33353] a
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+[main 7e1cf2d] b
  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
+ 1 file changed, 1 insertion(+)
+ create mode 100644 b
+[main ac11e55] c
  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
+ 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(+), 1 deletion(-)
-Switched to a new branch 'side-4'
-[side-4 e31c210] side-4
+ 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(+), 1 deletion(-)
-Switched to a new branch 'side-5'
-[side-5 5786a4a] side-5
+ 1 file changed, 1 insertion(+)
+ create mode 100644 e
+[b4 59ecd1d] f
  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
+ 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(+), 1 deletion(-)
-Switched to a new branch 'side-7'
-[side-7 a65952b] side-7
+ 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(+), 1 deletion(-)
+ 1 file changed, 1 insertion(+)
+ create mode 100644 h
 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 6040.2 'branch -v': 
+	(
+		cd test &&
+		git branch -v
+	) |
+	sed -n -e "$t6040_script" >actual &&
+	test_cmp expect actual
 
-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
+ok 2 - branch -v
 
-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 6040.3 'branch -vv': 
+	(
+		cd test &&
+		git branch -vv
+	) |
+	sed -n -e "$t6040_script" >actual &&
+	test_cmp expect actual
 
-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
+ok 3 - branch -vv
 
-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 6040.4 'checkout (diverged from upstream)': 
+	(
+		cd test && git checkout b1
+	) >actual &&
+	test_grep "have 1 and 1 different" actual
 
-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
+Switched to branch 'b1'
+and have 1 and 1 different commits each, respectively.
+ok 4 - checkout (diverged from upstream)
 
-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 6040.5 'checkout with local tracked branch': 
+	git checkout main &&
+	git checkout follower >actual &&
+	test_grep "is ahead of" actual
 
-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
+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 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 6040.6 'checkout (upstream is gone)': 
+	(
+		cd test &&
+		git checkout b5
+	) >actual &&
+	test_grep "is based on .*, but the upstream is gone." actual
 
-expecting success of 6017.24 'check rev-list --glob=refs/heads --': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-output a65952bd5563825b9eb493eea4aec4b5678b8a8d
-output 6879e948854e907320469e4dc722cd70bd4779ad
-output 5786a4a4adafb8e84aaee41b2ae8d3a9ab86b0e3
-output e31c210a1d5ecfb601d46a78e8003682cb1887e9
-output 48694b20de8c3a7d2a1cac0c842191d9a9f1dc4f
-output fe893aaa1a4f4a26ca786842d8bdc1b4830488a4
-output c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output a21e80422823d665efde155c070bfdfb97c997e8
-output c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output a24e2002dc3e76acd7262fac9934308ed5876528
-output 4c7c79994a10176d26cb379d2f480e705687de5f
-output b2718dfcca09d482353ed124d94698c230076ecb
-ok 24 - check rev-list --glob=refs/heads --
+Switched to branch 'b5'
+Your branch is based on 'brokenbase', but the upstream is gone.
+ok 6 - checkout (upstream is gone)
 
-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 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
 
-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
+Switched to branch 'b6'
+Your branch is up to date with 'origin/main'.
+ok 7 - checkout (up-to-date with upstream)
 
-expecting success of 6017.27 'check log --stat --glob=refs/heads -- file-1': 
-			git $cmd $(cat input) >expect &&
-			git $cmd --stdin <input >actual &&
-			sed -e "s/^/input /" input &&
-			sed -e "s/^/output /" expect &&
-			test_cmp expect actual
-		
-input --glob=refs/heads
-input --
-input file-1
-output commit c52bcff3af5ff0d662f1e767ea6739034b17f0ea
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:21:13 2005 -0700
-output 
-output     side-1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a21e80422823d665efde155c070bfdfb97c997e8
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:20:13 2005 -0700
-output 
-output     7
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit c5757f4c5b3e9d8ed81f0ef337de57e6bef4e611
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:19:13 2005 -0700
-output 
-output     6
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 496e2a9cb78c7f1f05c123ba68719cbb2850d28b
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:18:13 2005 -0700
-output 
-output     5
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 680e5c39478a7f99f59d423c9d29c54c4cf23f21
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:17:13 2005 -0700
-output 
-output     4
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 72c7ecae8123b34f77d6ec686c9dc4d38558e420
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:16:13 2005 -0700
-output 
-output     3
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit a24e2002dc3e76acd7262fac9934308ed5876528
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:15:13 2005 -0700
-output 
-output     2
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit 4c7c79994a10176d26cb379d2f480e705687de5f
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:14:13 2005 -0700
-output 
-output     1
-output 
-output  file-1 | 2 +-
-output  1 file changed, 1 insertion(+), 1 deletion(-)
-output 
-output commit b2718dfcca09d482353ed124d94698c230076ecb
-output Author: A U Thor <author@example.com>
-output Date:   Thu Apr 7 15:13:13 2005 -0700
-output 
-output     0
-output 
-output  file-1 | 1 +
-output  1 file changed, 1 insertion(+)
-ok 27 - check log --stat --glob=refs/heads -- file-1
+expecting success of 6040.8 'status (diverged from upstream)': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_grep "have 1 and 1 different" actual
 
-expecting success of 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
+Switched to branch 'b1'
+and have 1 and 1 different commits each, respectively.
+ok 8 - status (diverged from upstream)
 
-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 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
 
-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
+Switched to branch 'b5'
+Your branch is based on 'brokenbase', but the upstream is gone.
+ok 9 - status (upstream is gone)
 
-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 6040.10 'status (up-to-date with upstream)': 
+	(
+		cd test &&
+		git checkout b6 >/dev/null &&
+		# reports nothing to commit
+		test_must_fail git commit --dry-run
+	) >actual &&
+	test_grep "Your branch is up to date with .origin/main" actual
 
-expecting success of 6017.32 'not only --stdin': 
-	cat >expect <<-EOF &&
-	7
+Switched to branch 'b6'
+Your branch is up to date with 'origin/main'.
+ok 10 - status (up-to-date with upstream)
 
-	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 &&
+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
 
-ok 32 - not only --stdin
-
-expecting success of 6017.33 'pseudo-opt with missing value': 
-	cat >input <<-EOF &&
-	--glob
-	refs/heads
-	EOF
-
-	cat >expect <<-EOF &&
-	fatal: Option ${SQ}--glob${SQ} requires a value
-	EOF
-
-	test_must_fail git rev-list --stdin <input 2>error &&
-	test_cmp expect error
-
-ok 33 - pseudo-opt with missing value
-
-expecting success of 6017.34 'pseudo-opt with invalid value': 
-	cat >input <<-EOF &&
-	--no-walk=garbage
-	EOF
-
-	cat >expect <<-EOF &&
-	error: invalid argument to --no-walk
-	fatal: invalid option ${SQ}--no-walk=garbage${SQ} in --stdin mode
-	EOF
-
-	test_must_fail git rev-list --stdin <input 2>error &&
-	test_cmp expect error
-
-ok 34 - pseudo-opt with invalid value
-
-expecting success of 6017.35 'unknown option without --end-of-options': 
-	cat >input <<-EOF &&
-	-dashed-branch
-	EOF
-
-	cat >expect <<-EOF &&
-	fatal: invalid option ${SQ}-dashed-branch${SQ} in --stdin mode
-	EOF
-
-	test_must_fail git rev-list --stdin <input 2>error &&
-	test_cmp expect error
-
-ok 35 - unknown option without --end-of-options
-
-expecting success of 6017.36 '--not on command line does not influence revisions read via --stdin': 
-	cat >input <<-EOF &&
-	refs/heads/main
-	EOF
-	git rev-list refs/heads/main >expect &&
+Switched to branch 'b1'
+ok 11 - status -s -b (diverged from upstream)
 
-	git rev-list refs/heads/main --not --stdin <input >actual &&
+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
 
-ok 36 - --not on command line does not influence revisions read via --stdin
-
-expecting success of 6017.37 '--not via stdin does not influence revisions from command line': 
-	cat >input <<-EOF &&
-	--not
-	EOF
-	git rev-list refs/heads/main >expect &&
+Already on 'b1'
+ok 12 - status -s -b --no-ahead-behind (diverged from upstream)
 
-	git rev-list refs/heads/main --stdin refs/heads/main <input >actual &&
+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
 
-ok 37 - --not via stdin does not influence revisions from command line
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6021-rev-list-exclude-hidden.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6021-rev-list-exclude-hidden/.git/
-expecting success of 6021.1 'setup': 
-	test_commit_bulk --id=commit --ref=refs/heads/branch 1 &&
-	COMMIT=$(git rev-parse refs/heads/branch) &&
-	test_commit_bulk --id=tag --ref=refs/tags/lightweight 1 &&
-	TAG=$(git rev-parse refs/tags/lightweight) &&
-	test_commit_bulk --id=hidden --ref=refs/hidden/commit 1 &&
-	HIDDEN=$(git rev-parse refs/hidden/commit) &&
-	test_commit_bulk --id=namespace --ref=refs/namespaces/namespace/refs/namespaced/commit 1 &&
-	NAMESPACE=$(git rev-parse refs/namespaces/namespace/refs/namespaced/commit)
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              1
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        225 /        225
----------------------------------------------------------------------
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              1
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        220 /        220
----------------------------------------------------------------------
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              1
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        235 /        235
----------------------------------------------------------------------
-
-ok 1 - setup
-
-expecting success of 6021.2 'invalid section': 
-	echo "fatal: unsupported section for hidden refs: unsupported" >expected &&
-	test_must_fail git rev-list --exclude-hidden=unsupported 2>err &&
-	test_cmp expected err
-
-ok 2 - invalid section
-
-expecting success of 6021.3 'fetch: passed multiple times': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 3 - fetch: passed multiple times
-
-expecting success of 6021.4 'fetch: without hiddenRefs': 
-		git rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 4 - fetch: without hiddenRefs
-
-expecting success of 6021.5 'fetch: hidden via transfer.hideRefs': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 5 - fetch: hidden via transfer.hideRefs
-
-expecting success of 6021.6 'fetch: hidden via fetch.hideRefs': 
-		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 6 - fetch: hidden via fetch.hideRefs
-
-expecting success of 6021.7 'fetch: respects both transfer.hideRefs and fetch.hideRefs': 
-		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 7 - fetch: respects both transfer.hideRefs and fetch.hideRefs
-
-expecting success of 6021.8 'fetch: negation without hidden refs marks everything as uninteresting': 
-		git rev-list --all --exclude-hidden=$section --not --all >out &&
-		test_must_be_empty out
-	
-ok 8 - fetch: negation without hidden refs marks everything as uninteresting
-
-expecting success of 6021.9 'fetch: negation with hidden refs marks them as interesting': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		EOF
-		test_cmp expected out
-	
-ok 9 - fetch: negation with hidden refs marks them as interesting
-
-expecting success of 6021.10 'fetch: hidden refs and excludes work together': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 10 - fetch: hidden refs and excludes work together
-
-expecting success of 6021.11 'fetch: excluded hidden refs get reset': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 11 - fetch: excluded hidden refs get reset
-
-expecting success of 6021.12 'fetch: excluded hidden refs can be used with multiple pseudo-refs': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
-		test_must_be_empty out
-	
-ok 12 - fetch: excluded hidden refs can be used with multiple pseudo-refs
-
-expecting success of 6021.13 'fetch: works with --glob': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
-		cat >expected <<-EOF &&
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 13 - fetch: works with --glob
-
-expecting success of 6021.14 'fetch: operates on stripped refs by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 14 - fetch: operates on stripped refs by default
-
-expecting success of 6021.15 'fetch: does not hide namespace by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 15 - fetch: does not hide namespace by default
-
-expecting success of 6021.16 'fetch: can operate on unstripped refs': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 16 - fetch: can operate on unstripped refs
-
-expecting success of 6021.17 'fetch: fails with --remotes': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 17 - fetch: fails with --remotes
-
-expecting success of 6021.18 'fetch: fails with --remotes=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 18 - fetch: fails with --remotes=pattern
-
-expecting success of 6021.19 'fetch: fails with --branches': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 19 - fetch: fails with --branches
-
-expecting success of 6021.20 'fetch: fails with --branches=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 20 - fetch: fails with --branches=pattern
-
-expecting success of 6021.21 'fetch: fails with --tags': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 21 - fetch: fails with --tags
-
-expecting success of 6021.22 'fetch: fails with --tags=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 22 - fetch: fails with --tags=pattern
-
-expecting success of 6021.23 'receive: passed multiple times': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-list --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 23 - receive: passed multiple times
-
-expecting success of 6021.24 'receive: without hiddenRefs': 
-		git rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 24 - receive: without hiddenRefs
-
-expecting success of 6021.25 'receive: hidden via transfer.hideRefs': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 25 - receive: hidden via transfer.hideRefs
-
-expecting success of 6021.26 'receive: hidden via receive.hideRefs': 
-		git -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 26 - receive: hidden via receive.hideRefs
-
-expecting success of 6021.27 'receive: respects both transfer.hideRefs and receive.hideRefs': 
-		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 27 - receive: respects both transfer.hideRefs and receive.hideRefs
-
-expecting success of 6021.28 'receive: negation without hidden refs marks everything as uninteresting': 
-		git rev-list --all --exclude-hidden=$section --not --all >out &&
-		test_must_be_empty out
-	
-ok 28 - receive: negation without hidden refs marks everything as uninteresting
-
-expecting success of 6021.29 'receive: negation with hidden refs marks them as interesting': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		EOF
-		test_cmp expected out
-	
-ok 29 - receive: negation with hidden refs marks them as interesting
-
-expecting success of 6021.30 'receive: hidden refs and excludes work together': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude=refs/tags/* --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 30 - receive: hidden refs and excludes work together
-
-expecting success of 6021.31 'receive: excluded hidden refs get reset': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 31 - receive: excluded hidden refs get reset
-
-expecting success of 6021.32 'receive: excluded hidden refs can be used with multiple pseudo-refs': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --exclude-hidden=$section --all >out &&
-		test_must_be_empty out
-	
-ok 32 - receive: excluded hidden refs can be used with multiple pseudo-refs
-
-expecting success of 6021.33 'receive: works with --glob': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
-		cat >expected <<-EOF &&
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 33 - receive: works with --glob
-
-expecting success of 6021.34 'receive: operates on stripped refs by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaced/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 34 - receive: operates on stripped refs by default
-
-expecting success of 6021.35 'receive: does not hide namespace by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 35 - receive: does not hide namespace by default
-
-expecting success of 6021.36 'receive: can operate on unstripped refs': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=^refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 36 - receive: can operate on unstripped refs
-
-expecting success of 6021.37 'receive: fails with --remotes': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 37 - receive: fails with --remotes
-
-expecting success of 6021.38 'receive: fails with --remotes=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 38 - receive: fails with --remotes=pattern
-
-expecting success of 6021.39 'receive: fails with --branches': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 39 - receive: fails with --branches
-
-expecting success of 6021.40 'receive: fails with --branches=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 40 - receive: fails with --branches=pattern
-
-expecting success of 6021.41 'receive: fails with --tags': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 41 - receive: fails with --tags
-
-expecting success of 6021.42 'receive: fails with --tags=pattern': 
-			test_must_fail git rev-list --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 42 - receive: fails with --tags=pattern
+Already on 'b1'
+ok 13 - status.aheadbehind=false status -s -b (diverged from upstream)
 
-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 6040.14 'status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b | head -3
+	) >actual &&
+	test_cmp expect actual
 
-expecting success of 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
+Already on 'b1'
+ok 14 - status --long --branch
 
-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 6040.15 'status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git -c status.aheadbehind=true status --long -b | head -3
+	) >actual &&
+	test_cmp expect actual
 
-expecting success of 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
+Already on 'b1'
+ok 15 - status --long --branch
 
-expecting success of 6021.47 'uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs': 
-		git -c transfer.hideRefs=refs/tags/ -c $section.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 47 - uploadpack: respects both transfer.hideRefs and uploadpack.hideRefs
+expecting success of 6040.16 'status --long --branch --no-ahead-behind': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git status --long -b --no-ahead-behind | head -2
+	) >actual &&
+	test_cmp expect actual
 
-expecting success of 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
+Already on 'b1'
+ok 16 - status --long --branch --no-ahead-behind
 
-expecting success of 6021.49 'uploadpack: negation with hidden refs marks them as interesting': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --all --exclude-hidden=$section --not --all >out &&
-		cat >expected <<-EOF &&
-		$HIDDEN
-		EOF
-		test_cmp expected out
-	
-ok 49 - uploadpack: negation with hidden refs marks them as interesting
+expecting success of 6040.17 'status.aheadbehind=false status --long --branch': 
+	(
+		cd test &&
+		git checkout b1 >/dev/null &&
+		git -c status.aheadbehind=false status --long -b | head -2
+	) >actual &&
+	test_cmp expect actual
 
-expecting success of 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
+Already on 'b1'
+ok 17 - status.aheadbehind=false status --long --branch
 
-expecting success of 6021.51 'uploadpack: excluded hidden refs get reset': 
-		git -c transfer.hideRefs=refs/ rev-list --exclude-hidden=$section --all --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 51 - uploadpack: excluded hidden refs get reset
+expecting success of 6040.18 'status -s -b (upstream is gone)': 
+	(
+		cd test &&
+		git checkout b5 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
 
-expecting success of 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
+Switched to branch 'b5'
+ok 18 - status -s -b (upstream is gone)
 
-expecting success of 6021.53 'uploadpack: works with --glob': 
-		git -c transfer.hideRefs=refs/hidden/ rev-list --exclude-hidden=$section --glob=refs/h* >out &&
-		cat >expected <<-EOF &&
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 53 - uploadpack: works with --glob
+expecting success of 6040.19 'status -s -b (up-to-date with upstream)': 
+	(
+		cd test &&
+		git checkout b6 >/dev/null &&
+		git status -s -b | head -1
+	) >actual &&
+	test_cmp expect actual
 
-expecting success of 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
+Switched to branch 'b6'
+ok 19 - status -s -b (up-to-date with upstream)
 
-expecting success of 6021.55 'uploadpack: does not hide namespace by default': 
-		GIT_NAMESPACE=namespace git -c transfer.hideRefs=refs/namespaces/namespace/ rev-list --exclude-hidden=$section --all >out &&
-		cat >expected <<-EOF &&
-		$NAMESPACE
-		$HIDDEN
-		$TAG
-		$COMMIT
-		EOF
-		test_cmp expected out
-	
-ok 55 - uploadpack: does not hide namespace by default
+expecting success of 6040.20 'fail to track lightweight tags': 
+	git checkout main &&
+	git tag light &&
+	test_must_fail git branch --track lighttrack light >actual &&
+	test_grep ! "set up to track" actual &&
+	test_must_fail git checkout lighttrack
 
-expecting success of 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
+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 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 6040.21 'fail to track annotated tags': 
+	git checkout main &&
+	git tag -m heavy heavy &&
+	test_must_fail git branch --track heavytrack heavy >actual &&
+	test_grep ! "set up to track" actual &&
+	test_must_fail git checkout heavytrack
 
-expecting success of 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
+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 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 6040.22 '--set-upstream-to does not change branch': 
+	git branch from-main main &&
+	git branch --set-upstream-to main from-main &&
+	git branch from-topic_2 main &&
+	test_must_fail git config branch.from-topic_2.merge > actual &&
+	git rev-list from-topic_2 &&
+	git update-ref refs/heads/from-topic_2 from-topic_2^ &&
+	git rev-parse from-topic_2 >expect2 &&
+	git branch --set-upstream-to main from-topic_2 &&
+	git config branch.from-main.merge > actual &&
+	git rev-parse from-topic_2 >actual2 &&
+	grep -q "^refs/heads/main$" actual &&
+	cmp expect2 actual2
 
-expecting success of 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
+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 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 6040.23 '--set-upstream-to @{-1}': 
+	git checkout follower &&
+	git checkout from-topic_2 &&
+	git config branch.from-topic_2.merge > expect2 &&
+	git branch --set-upstream-to @{-1} from-main &&
+	git config branch.from-main.merge > actual &&
+	git config branch.from-topic_2.merge > actual2 &&
+	git branch --set-upstream-to follower from-main &&
+	git config branch.from-main.merge > expect &&
+	test_cmp expect2 actual2 &&
+	test_cmp expect actual
 
-expecting success of 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
+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 62 test(s)
-1..62
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6018-rev-list-glob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6018-rev-list-glob/.git/
-expecting success of 6018.1 'setup': 
-
-	commit main &&
-	git checkout -b subspace/one main &&
-	commit one &&
-	git checkout -b subspace/two main &&
-	commit two &&
-	git checkout -b subspace-x main &&
-	commit subspace-x &&
-	git checkout -b other/three main &&
-	commit three &&
-	git checkout -b someref main &&
-	commit some &&
-	git checkout main &&
-	commit topic_2 &&
-	git tag foo/bar main &&
-	commit topic_3 &&
-	git update-ref refs/remotes/foo/baz main &&
-	commit topic_4 &&
-	git update-ref refs/remotes/upstream/one subspace/one &&
-	git update-ref refs/remotes/upstream/two subspace/two &&
-	git update-ref refs/remotes/upstream/x subspace-x &&
-	git tag qux/one subspace/one &&
-	git tag qux/two subspace/two &&
-	git tag qux/x subspace-x
+*** t6060-merge-index.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6060-merge-index/.git/
+expecting success of 6060.1 'setup diverging branches': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
+	git add file &&
+	git commit -m base &&
+	git tag base &&
+	sed s/2/two/ <file >tmp &&
+	mv tmp file &&
+	git commit -a -m two &&
+	git tag two &&
+	git checkout -b other HEAD^ &&
+	sed s/10/ten/ <file >tmp &&
+	mv tmp file &&
+	git commit -a -m ten &&
+	git tag ten
 
-[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
+[master (root-commit) 69c42a0] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[main 0e3b4df] topic_3
+ 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(-)
-[main 88fe3d2] topic_4
+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
-
-expecting success of 6018.2 'rev-parse --glob=refs/heads/subspace/*': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
-
-
-ok 2 - rev-parse --glob=refs/heads/subspace/*
-
-expecting success of 6018.3 'rev-parse --glob=heads/subspace/*': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/*"
-
-
-ok 3 - rev-parse --glob=heads/subspace/*
-
-expecting success of 6018.4 'rev-parse --glob=refs/heads/subspace/': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=refs/heads/subspace/"
-
-
-ok 4 - rev-parse --glob=refs/heads/subspace/
-
-expecting success of 6018.5 'rev-parse --glob=heads/subspace/': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace/"
-
-
-ok 5 - rev-parse --glob=heads/subspace/
-
-expecting success of 6018.6 'rev-parse --glob=heads/subspace': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob=heads/subspace"
-
-
-ok 6 - rev-parse --glob=heads/subspace
-
-checking known breakage of 6018.7 'rev-parse accepts --glob as detached option': 
-
-	compare rev-parse "subspace/one subspace/two" "--glob heads/subspace"
-
-
-fatal: ambiguous argument 'heads/subspace': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-not ok 7 - rev-parse accepts --glob as detached option # TODO known breakage
-
-checking known breakage of 6018.8 'rev-parse is not confused by option-like glob': 
-
-	compare rev-parse "main" "--glob --symbolic main"
-
-
---- expected	2025-12-18 01:37:42.658773267 +0000
-+++ actual	2025-12-18 01:37:42.666773267 +0000
-@@ -1 +1,2 @@
--88fe3d283ae350159b6dcc1f45481c8fa40ad3d8
-+--glob
-+main
-not ok 8 - rev-parse is not confused by option-like glob # TODO known breakage
-
-expecting success of 6018.9 'rev-parse --branches=subspace/*': 
-
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/*"
-
-
-ok 9 - rev-parse --branches=subspace/*
-
-expecting success of 6018.10 'rev-parse --branches=subspace/': 
-
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace/"
-
-
-ok 10 - rev-parse --branches=subspace/
-
-expecting success of 6018.11 'rev-parse --branches=subspace': 
-
-	compare rev-parse "subspace/one subspace/two" "--branches=subspace"
-
-
-ok 11 - rev-parse --branches=subspace
-
-expecting success of 6018.12 'rev-parse --glob=heads/subspace/* --glob=heads/other/*': 
-
-	compare rev-parse "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
-
-
-ok 12 - rev-parse --glob=heads/subspace/* --glob=heads/other/*
-
-expecting success of 6018.13 'rev-parse --glob=heads/someref/* main': 
-
-	compare rev-parse "main" "--glob=heads/someref/* main"
-
-
-ok 13 - rev-parse --glob=heads/someref/* main
-
-expecting success of 6018.14 'rev-parse --glob=heads/*': 
-
-	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
-
-
-ok 14 - rev-parse --glob=heads/*
-
-expecting success of 6018.15 'rev-parse --tags=foo': 
-
-	compare rev-parse "foo/bar" "--tags=foo"
-
-
-ok 15 - rev-parse --tags=foo
-
-expecting success of 6018.16 'rev-parse --remotes=foo': 
-
-	compare rev-parse "foo/baz" "--remotes=foo"
-
-
-ok 16 - rev-parse --remotes=foo
-
-expecting success of 6018.17 'rev-parse --exclude with --branches': 
-	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
-
-ok 17 - rev-parse --exclude with --branches
-
-expecting success of 6018.18 'rev-parse --exclude with --all': 
-	compare rev-parse "--exclude=refs/remotes/* --all" "--branches --tags"
-
-ok 18 - rev-parse --exclude with --all
-
-expecting success of 6018.19 'rev-parse accumulates multiple --exclude': 
-	compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
-
-ok 19 - rev-parse accumulates multiple --exclude
-
-expecting success of 6018.20 'rev-parse --branches clears --exclude': 
-	compare rev-parse "--exclude=* --branches --branches" "--branches"
-
-ok 20 - rev-parse --branches clears --exclude
-
-expecting success of 6018.21 'rev-parse --tags clears --exclude': 
-	compare rev-parse "--exclude=* --tags --tags" "--tags"
-
-ok 21 - rev-parse --tags clears --exclude
-
-expecting success of 6018.22 'rev-parse --all clears --exclude': 
-	compare rev-parse "--exclude=* --all --all" "--all"
-
-ok 22 - rev-parse --all clears --exclude
-
-expecting success of 6018.23 'rev-parse --exclude=glob with --branches=glob': 
-	compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
-
-ok 23 - rev-parse --exclude=glob with --branches=glob
-
-expecting success of 6018.24 'rev-parse --exclude=glob with --tags=glob': 
-	compare rev-parse "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
-
-ok 24 - rev-parse --exclude=glob with --tags=glob
-
-expecting success of 6018.25 'rev-parse --exclude=glob with --remotes=glob': 
-	compare rev-parse "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 25 - rev-parse --exclude=glob with --remotes=glob
-
-expecting success of 6018.26 'rev-parse --exclude=ref with --branches=glob': 
-	compare rev-parse "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
-
-ok 26 - rev-parse --exclude=ref with --branches=glob
-
-expecting success of 6018.27 'rev-parse --exclude=ref with --tags=glob': 
-	compare rev-parse "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
-
-ok 27 - rev-parse --exclude=ref with --tags=glob
-
-expecting success of 6018.28 'rev-parse --exclude=ref with --remotes=glob': 
-	compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 28 - rev-parse --exclude=ref with --remotes=glob
-
-expecting success of 6018.29 'rev-parse --exclude-hidden=fetch with --all': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
-	
-ok 29 - rev-parse --exclude-hidden=fetch with --all
-
-expecting success of 6018.30 'rev-parse --exclude-hidden=fetch with --all': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
-	
-ok 30 - rev-parse --exclude-hidden=fetch with --all
-
-expecting success of 6018.31 'rev-parse --exclude-hidden=fetch with --glob': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
-	
-ok 31 - rev-parse --exclude-hidden=fetch with --glob
-
-expecting success of 6018.32 'rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
-	
-ok 32 - rev-parse --exclude-hidden=fetch can be passed once per pseudo-ref
-
-expecting success of 6018.33 'rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 33 - rev-parse --exclude-hidden=fetch can only be passed once per pseudo-ref
-
-expecting success of 6018.34 'rev-parse --exclude-hidden=fetch fails with --branches': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 34 - rev-parse --exclude-hidden=fetch fails with --branches
-
-expecting success of 6018.35 'rev-parse --exclude-hidden=fetch fails with --branches=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 35 - rev-parse --exclude-hidden=fetch fails with --branches=pattern
-
-expecting success of 6018.36 'rev-parse --exclude-hidden=fetch fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 36 - rev-parse --exclude-hidden=fetch fails with --tags
-
-expecting success of 6018.37 'rev-parse --exclude-hidden=fetch fails with --tags=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 37 - rev-parse --exclude-hidden=fetch fails with --tags=pattern
-
-expecting success of 6018.38 'rev-parse --exclude-hidden=fetch fails with --remotes': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 38 - rev-parse --exclude-hidden=fetch fails with --remotes
-
-expecting success of 6018.39 'rev-parse --exclude-hidden=fetch fails with --remotes=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 39 - rev-parse --exclude-hidden=fetch fails with --remotes=pattern
-
-expecting success of 6018.40 'rev-parse --exclude-hidden=receive with --all': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
-	
-ok 40 - rev-parse --exclude-hidden=receive with --all
-
-expecting success of 6018.41 'rev-parse --exclude-hidden=receive with --all': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
-	
-ok 41 - rev-parse --exclude-hidden=receive with --all
-
-expecting success of 6018.42 'rev-parse --exclude-hidden=receive with --glob': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
-	
-ok 42 - rev-parse --exclude-hidden=receive with --glob
-
-expecting success of 6018.43 'rev-parse --exclude-hidden=receive can be passed once per pseudo-ref': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
-	
-ok 43 - rev-parse --exclude-hidden=receive can be passed once per pseudo-ref
-
-expecting success of 6018.44 'rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 44 - rev-parse --exclude-hidden=receive can only be passed once per pseudo-ref
-
-expecting success of 6018.45 'rev-parse --exclude-hidden=receive fails with --branches': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 45 - rev-parse --exclude-hidden=receive fails with --branches
-
-expecting success of 6018.46 'rev-parse --exclude-hidden=receive fails with --branches=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 46 - rev-parse --exclude-hidden=receive fails with --branches=pattern
-
-expecting success of 6018.47 'rev-parse --exclude-hidden=receive fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 47 - rev-parse --exclude-hidden=receive fails with --tags
-
-expecting success of 6018.48 'rev-parse --exclude-hidden=receive fails with --tags=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 48 - rev-parse --exclude-hidden=receive fails with --tags=pattern
-
-expecting success of 6018.49 'rev-parse --exclude-hidden=receive fails with --remotes': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 49 - rev-parse --exclude-hidden=receive fails with --remotes
-
-expecting success of 6018.50 'rev-parse --exclude-hidden=receive fails with --remotes=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 50 - rev-parse --exclude-hidden=receive fails with --remotes=pattern
-
-expecting success of 6018.51 'rev-parse --exclude-hidden=uploadpack with --all': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all"
-	
-ok 51 - rev-parse --exclude-hidden=uploadpack with --all
-
-expecting success of 6018.52 'rev-parse --exclude-hidden=uploadpack with --all': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --all" "--exclude-hidden=$section --all"
-	
-ok 52 - rev-parse --exclude-hidden=uploadpack with --all
-
-expecting success of 6018.53 'rev-parse --exclude-hidden=uploadpack with --glob': 
-		compare "-c transfer.hideRefs=refs/heads/subspace/ rev-parse" "--exclude=refs/heads/subspace/* --glob=refs/heads/*" "--exclude-hidden=$section --glob=refs/heads/*"
-	
-ok 53 - rev-parse --exclude-hidden=uploadpack with --glob
-
-expecting success of 6018.54 'rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref': 
-		compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags --branches --tags" "--exclude-hidden=$section --all --exclude-hidden=$section --all"
-	
-ok 54 - rev-parse --exclude-hidden=uploadpack can be passed once per pseudo-ref
-
-expecting success of 6018.55 'rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref': 
-		echo "fatal: --exclude-hidden= passed more than once" >expected &&
-		test_must_fail git rev-parse --exclude-hidden=$section --exclude-hidden=$section 2>err &&
-		test_cmp expected err
-	
-ok 55 - rev-parse --exclude-hidden=uploadpack can only be passed once per pseudo-ref
-
-expecting success of 6018.56 'rev-parse --exclude-hidden=uploadpack fails with --branches': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 56 - rev-parse --exclude-hidden=uploadpack fails with --branches
-
-expecting success of 6018.57 'rev-parse --exclude-hidden=uploadpack fails with --branches=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--branches' cannot be used together
-ok 57 - rev-parse --exclude-hidden=uploadpack fails with --branches=pattern
-
-expecting success of 6018.58 'rev-parse --exclude-hidden=uploadpack fails with --tags': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 58 - rev-parse --exclude-hidden=uploadpack fails with --tags
-
-expecting success of 6018.59 'rev-parse --exclude-hidden=uploadpack fails with --tags=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--tags' cannot be used together
-ok 59 - rev-parse --exclude-hidden=uploadpack fails with --tags=pattern
-
-expecting success of 6018.60 'rev-parse --exclude-hidden=uploadpack fails with --remotes': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 60 - rev-parse --exclude-hidden=uploadpack fails with --remotes
-
-expecting success of 6018.61 'rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern': 
-			test_must_fail git rev-parse --exclude-hidden=$section --$pseudoopt=pattern 2>err &&
-			test_grep "error: options .--exclude-hidden. and .--$pseudoopt. cannot be used together" err
-		
-error: options '--exclude-hidden' and '--remotes' cannot be used together
-ok 61 - rev-parse --exclude-hidden=uploadpack fails with --remotes=pattern
-
-expecting success of 6018.62 'rev-list --exclude=glob with --branches=glob': 
-	compare rev-list "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
-
-ok 62 - rev-list --exclude=glob with --branches=glob
-
-expecting success of 6018.63 'rev-list --exclude=glob with --tags=glob': 
-	compare rev-list "--exclude=qux/? --tags=qux/*" "qux/one qux/two"
-
-ok 63 - rev-list --exclude=glob with --tags=glob
-
-expecting success of 6018.64 'rev-list --exclude=glob with --remotes=glob': 
-	compare rev-list "--exclude=upstream/? --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 64 - rev-list --exclude=glob with --remotes=glob
-
-expecting success of 6018.65 'rev-list --exclude=ref with --branches=glob': 
-	compare rev-list "--exclude=subspace-x --branches=sub*" "subspace/one subspace/two"
-
-ok 65 - rev-list --exclude=ref with --branches=glob
-
-expecting success of 6018.66 'rev-list --exclude=ref with --tags=glob': 
-	compare rev-list "--exclude=qux/x --tags=qux/*" "qux/one qux/two"
-
-ok 66 - rev-list --exclude=ref with --tags=glob
-
-expecting success of 6018.67 'rev-list --exclude=ref with --remotes=glob': 
-	compare rev-list "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two"
-
-ok 67 - rev-list --exclude=ref with --remotes=glob
-
-expecting success of 6018.68 'rev-list --glob=refs/heads/subspace/*': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/*"
-
-
-ok 68 - rev-list --glob=refs/heads/subspace/*
-
-expecting success of 6018.69 'rev-list --glob refs/heads/subspace/*': 
-
-	compare rev-list "subspace/one subspace/two" "--glob refs/heads/subspace/*"
-
-
-ok 69 - rev-list --glob refs/heads/subspace/*
-
-expecting success of 6018.70 'rev-list not confused by option-like --glob arg': 
-
-	compare rev-list "main" "--glob -0 main"
-
-
-ok 70 - rev-list not confused by option-like --glob arg
-
-expecting success of 6018.71 'rev-list --glob=heads/subspace/*': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/*"
-
-
-ok 71 - rev-list --glob=heads/subspace/*
-
-expecting success of 6018.72 'rev-list --glob=refs/heads/subspace/': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=refs/heads/subspace/"
-
-
-ok 72 - rev-list --glob=refs/heads/subspace/
-
-expecting success of 6018.73 'rev-list --glob=heads/subspace/': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace/"
-
-
-ok 73 - rev-list --glob=heads/subspace/
-
-expecting success of 6018.74 'rev-list --glob=heads/subspace': 
-
-	compare rev-list "subspace/one subspace/two" "--glob=heads/subspace"
-
-
-ok 74 - rev-list --glob=heads/subspace
-
-expecting success of 6018.75 'rev-list --branches=subspace/*': 
-
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/*"
-
-
-ok 75 - rev-list --branches=subspace/*
-
-expecting success of 6018.76 'rev-list --branches=subspace/': 
-
-	compare rev-list "subspace/one subspace/two" "--branches=subspace/"
-
-
-ok 76 - rev-list --branches=subspace/
-
-expecting success of 6018.77 'rev-list --branches=subspace': 
-
-	compare rev-list "subspace/one subspace/two" "--branches=subspace"
-
-
-ok 77 - rev-list --branches=subspace
-
-expecting success of 6018.78 'rev-list --branches': 
-
-	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
-
-
-ok 78 - rev-list --branches
-
-expecting success of 6018.79 'rev-list --glob=heads/someref/* main': 
-
-	compare rev-list "main" "--glob=heads/someref/* main"
-
-
-ok 79 - rev-list --glob=heads/someref/* main
-
-expecting success of 6018.80 'rev-list --glob=heads/subspace/* --glob=heads/other/*': 
-
-	compare rev-list "subspace/one subspace/two other/three" "--glob=heads/subspace/* --glob=heads/other/*"
-
-
-ok 80 - rev-list --glob=heads/subspace/* --glob=heads/other/*
-
-expecting success of 6018.81 'rev-list --glob=heads/*': 
-
-	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
-
-
-ok 81 - rev-list --glob=heads/*
-
-expecting success of 6018.82 'rev-list --tags=foo': 
-
-	compare rev-list "foo/bar" "--tags=foo"
-
-
-ok 82 - rev-list --tags=foo
-
-expecting success of 6018.83 'rev-list --tags': 
-
-	compare rev-list "foo/bar qux/x qux/two qux/one" "--tags"
-
-
-ok 83 - rev-list --tags
-
-expecting success of 6018.84 'rev-list --remotes=foo': 
-
-	compare rev-list "foo/baz" "--remotes=foo"
-
-
-ok 84 - rev-list --remotes=foo
-
-expecting success of 6018.85 'rev-list --exclude with --branches': 
-	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
-
-ok 85 - rev-list --exclude with --branches
-
-expecting success of 6018.86 'rev-list --exclude with --all': 
-	compare rev-list "--exclude=refs/remotes/* --all" "--branches --tags"
-
-ok 86 - rev-list --exclude with --all
-
-expecting success of 6018.87 'rev-list accumulates multiple --exclude': 
-	compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
-
-ok 87 - rev-list accumulates multiple --exclude
+ok 1 - setup diverging branches
 
-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 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 88 - rev-list should succeed with empty output on empty stdin
+ok 2 - read-tree does not resolve content merge
 
-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 6060.3 'git merge-index git-merge-one-file resolves': 
+	git merge-index git-merge-one-file -a &&
+	git diff-files --name-only --diff-filter=U >unmerged &&
+	test_must_be_empty unmerged &&
+	test_cmp expect-merged file &&
+	git cat-file blob :file >file-index &&
+	test_cmp expect-merged file-index
 
-ok 89 - rev-list should succeed with empty output with all refs excluded
+Auto-merging file
+ok 3 - git merge-index git-merge-one-file resolves
 
-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 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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6018-rev-list-glob/empty/.git/
-ok 90 - rev-list should succeed with empty output with empty --all
-
-expecting success of 6018.91 'rev-list should succeed with empty output with empty glob': 
-	git rev-list --glob=does-not-match-anything >actual &&
-	test_must_be_empty actual
-
-ok 91 - rev-list should succeed with empty output with empty glob
-
-expecting success of 6018.92 'rev-list should succeed with empty output when ignoring missing': 
-	git rev-list --ignore-missing $ZERO_OID >actual &&
-	test_must_be_empty actual
-
-ok 92 - rev-list should succeed with empty output when ignoring missing
-
-expecting success of 6018.93 'shortlog accepts --glob/--tags/--remotes': 
-
-	compare shortlog "subspace/one subspace/two" --branches=subspace &&
-	compare shortlog \
-	  "main subspace-x someref other/three subspace/one subspace/two" \
-	  --branches &&
-	compare shortlog main "--glob=heads/someref/* main" &&
-	compare shortlog "subspace/one subspace/two other/three" \
-	  "--glob=heads/subspace/* --glob=heads/other/*" &&
-	compare shortlog \
-	  "main other/three someref subspace-x subspace/one subspace/two" \
-	  "--glob=heads/*" &&
-	compare shortlog foo/bar --tags=foo &&
-	compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
-	compare shortlog foo/baz --remotes=foo
-
-
-ok 93 - shortlog accepts --glob/--tags/--remotes
-
-checking known breakage of 6018.94 'shortlog accepts --glob as detached option': 
-
-	compare shortlog \
-	  "main other/three someref subspace-x subspace/one subspace/two" \
-	  "--glob heads/*"
-
-
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
-
-    -c, --[no-]committer  group by committer rather than author
-    -n, --[no-]numbered   sort output according to the number of commits per author
-    -s, --[no-]summary    suppress commit descriptions, only provides commit count
-    -e, --[no-]email      show the email address of each author
-    -w[<w>[,<i1>[,<i2>]]] linewrap output
-    --[no-]group <field>  group by field
-
-not ok 94 - shortlog accepts --glob as detached option # TODO known breakage
+Cloning into bare repository 'bare.git'...
+done.
+ok 4 - setup bare merge
 
-checking known breakage of 6018.95 'shortlog --glob is not confused by option-like argument': 
+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
+	)
 
-	compare shortlog main "--glob -e main"
+fatal: this operation must be run in a work tree
+Cannot chdir to $cdup, the toplevel of the working tree
+fatal: merge program failed
+ok 5 - merge-one-file fails without a work tree
 
+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
 
-error: unknown option `--glob'
-usage: git shortlog [<options>] [<revision-range>] [[--] <path>...]
-   or: git log --pretty=short | git shortlog [<options>]
+Auto-merging file
+ok 6 - merge-one-file respects GIT_WORK_TREE
 
-    -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 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
 
-not ok 95 - shortlog --glob is not confused by option-like argument # TODO known breakage
+Cloning into 'subdir/child'...
+done.
+Auto-merging file
+ok 7 - merge-one-file respects core.worktree
 
-# still have 4 known breakage(s)
-# passed all remaining 91 test(s)
-1..95
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6020-bundle-misc.sh ***
@@ -389341,7 +391624,7 @@
 		git bundle create --progress out.bundle --all 2>err &&
 	grep Writing err
 
-Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 762.00 KiB/s, done.
+Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 381.00 KiB/s, done.
 ok 22 - bundle progress includes write phase
 
 checking prerequisite: TTY
@@ -389351,573 +391634,107 @@
 	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.23 '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 23 - create --quiet disables all bundle progress
-
-expecting success of 6020.24 '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 | 635.00 KiB/s, done.
-ok 24 - bundle progress with --no-quiet
-
-expecting success of 6020.25 '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 25 - read bundle over stdin
-
-expecting success of 6020.26 '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 26 - send a bundle to standard output
-
-# passed all 26 test(s)
-1..26
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6060-merge-index.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6060-merge-index/.git/
-expecting success of 6060.1 'setup diverging branches': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 10 >file &&
-	git add file &&
-	git commit -m base &&
-	git tag base &&
-	sed s/2/two/ <file >tmp &&
-	mv tmp file &&
-	git commit -a -m two &&
-	git tag two &&
-	git checkout -b other HEAD^ &&
-	sed s/10/ten/ <file >tmp &&
-	mv tmp file &&
-	git commit -a -m ten &&
-	git tag ten
-
-[master (root-commit) 69c42a0] base
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 file
-[master 6a4bad4] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'other'
-[other e88ef53] ten
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup diverging branches
-
-expecting success of 6060.2 'read-tree does not resolve content merge': 
-	git read-tree -i -m base ten two &&
-	echo file >expect &&
-	git diff-files --name-only --diff-filter=U >unmerged &&
-	test_cmp expect unmerged
-
-ok 2 - read-tree does not resolve content merge
-
-expecting success of 6060.3 'git merge-index git-merge-one-file resolves': 
-	git merge-index git-merge-one-file -a &&
-	git diff-files --name-only --diff-filter=U >unmerged &&
-	test_must_be_empty unmerged &&
-	test_cmp expect-merged file &&
-	git cat-file blob :file >file-index &&
-	test_cmp expect-merged file-index
-
-Auto-merging file
-ok 3 - git merge-index git-merge-one-file resolves
-
-expecting success of 6060.4 'setup bare merge': 
-	git clone --bare . bare.git &&
-	(cd bare.git &&
-	 GIT_INDEX_FILE=$PWD/merge.index &&
-	 export GIT_INDEX_FILE &&
-	 git read-tree -i -m base ten two
-	)
-
-Cloning into bare repository 'bare.git'...
-done.
-ok 4 - setup bare merge
-
-expecting success of 6060.5 'merge-one-file fails without a work tree': 
-	(cd bare.git &&
-	 GIT_INDEX_FILE=$PWD/merge.index &&
-	 export GIT_INDEX_FILE &&
-	 test_must_fail git merge-index git-merge-one-file -a
-	)
-
-fatal: this operation must be run in a work tree
-Cannot chdir to $cdup, the toplevel of the working tree
-fatal: merge program failed
-ok 5 - merge-one-file fails without a work tree
-
-expecting success of 6060.6 'merge-one-file respects GIT_WORK_TREE': 
-	(cd bare.git &&
-	 mkdir work &&
-	 GIT_WORK_TREE=$PWD/work &&
-	 export GIT_WORK_TREE &&
-	 GIT_INDEX_FILE=$PWD/merge.index &&
-	 export GIT_INDEX_FILE &&
-	 git merge-index git-merge-one-file -a &&
-	 git cat-file blob :file >work/file-index
-	) &&
-	test_cmp expect-merged bare.git/work/file &&
-	test_cmp expect-merged bare.git/work/file-index
-
-Auto-merging file
-ok 6 - merge-one-file respects GIT_WORK_TREE
-
-expecting success of 6060.7 'merge-one-file respects core.worktree': 
-	mkdir subdir &&
-	git clone . subdir/child &&
-	(cd subdir &&
-	 GIT_DIR=$PWD/child/.git &&
-	 export GIT_DIR &&
-	 git config core.worktree "$PWD/child" &&
-	 git read-tree -i -m base ten two &&
-	 git merge-index git-merge-one-file -a &&
-	 git cat-file blob :file >file-index
-	) &&
-	test_cmp expect-merged subdir/child/file &&
-	test_cmp expect-merged subdir/file-index
-
-Cloning into 'subdir/child'...
-done.
-Auto-merging file
-ok 7 - merge-one-file respects core.worktree
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6040-tracking-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6040-tracking-info/.git/
-expecting success of 6040.1 'setup': 
-	advance a &&
-	advance b &&
-	advance c &&
-	git clone . test &&
-	(
-		cd test &&
-		git checkout -b b1 origin &&
-		git reset --hard HEAD^ &&
-		advance d &&
-		git checkout -b b2 origin &&
-		git reset --hard b1 &&
-		git checkout -b b3 origin &&
-		git reset --hard HEAD^ &&
-		git checkout -b b4 origin &&
-		advance e &&
-		advance f &&
-		git checkout -b brokenbase origin &&
-		git checkout -b b5 --track brokenbase &&
-		advance g &&
-		git branch -d brokenbase &&
-		git checkout -b b6 origin
-	) &&
-	git checkout -b follower --track main &&
-	advance h
-
-[main (root-commit) cc33353] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-[main 7e1cf2d] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 b
-[main ac11e55] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c
-Cloning into 'test'...
-done.
-Switched to a new branch 'b1'
-branch 'b1' set up to track 'origin/main'.
-HEAD is now at 7e1cf2d b
-[b1 afc0d66] d
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 d
-Switched to a new branch 'b2'
-branch 'b2' set up to track 'origin/main'.
-HEAD is now at afc0d66 d
-Switched to a new branch 'b3'
-branch 'b3' set up to track 'origin/main'.
-HEAD is now at 7e1cf2d b
-Switched to a new branch 'b4'
-branch 'b4' set up to track 'origin/main'.
-[b4 ec9b031] e
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 e
-[b4 59ecd1d] f
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f
-Switched to a new branch 'brokenbase'
-branch 'brokenbase' set up to track 'origin/main'.
-Switched to a new branch 'b5'
-branch 'b5' set up to track 'brokenbase'.
-[b5 d8d0202] g
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 g
-Deleted branch brokenbase (was ac11e55).
-Switched to a new branch 'b6'
-branch 'b6' set up to track 'origin/main'.
-Switched to a new branch 'follower'
-branch 'follower' set up to track 'main'.
-[follower 21abfbd] h
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 h
-ok 1 - setup
-
-expecting success of 6040.2 'branch -v': 
-	(
-		cd test &&
-		git branch -v
-	) |
-	sed -n -e "$t6040_script" >actual &&
-	test_cmp expect actual
-
-ok 2 - branch -v
-
-expecting success of 6040.3 'branch -vv': 
-	(
-		cd test &&
-		git branch -vv
-	) |
-	sed -n -e "$t6040_script" >actual &&
-	test_cmp expect actual
-
-ok 3 - branch -vv
-
-expecting success of 6040.4 'checkout (diverged from upstream)': 
-	(
-		cd test && git checkout b1
-	) >actual &&
-	test_grep "have 1 and 1 different" actual
-
-Switched to branch 'b1'
-and have 1 and 1 different commits each, respectively.
-ok 4 - checkout (diverged from upstream)
-
-expecting success of 6040.5 'checkout with local tracked branch': 
-	git checkout main &&
-	git checkout follower >actual &&
-	test_grep "is ahead of" actual
-
-Switched to branch 'main'
-Switched to branch 'follower'
-Your branch is ahead of 'main' by 1 commit.
-ok 5 - checkout with local tracked branch
-
-expecting success of 6040.6 'checkout (upstream is gone)': 
-	(
-		cd test &&
-		git checkout b5
-	) >actual &&
-	test_grep "is based on .*, but the upstream is gone." actual
-
-Switched to branch 'b5'
-Your branch is based on 'brokenbase', but the upstream is gone.
-ok 6 - checkout (upstream is gone)
-
-expecting success of 6040.7 'checkout (up-to-date with upstream)': 
-	(
-		cd test && git checkout b6
-	) >actual &&
-	test_grep "Your branch is up to date with .origin/main" actual
-
-Switched to branch 'b6'
-Your branch is up to date with 'origin/main'.
-ok 7 - checkout (up-to-date with upstream)
-
-expecting success of 6040.8 'status (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_grep "have 1 and 1 different" actual
-
-Switched to branch 'b1'
-and have 1 and 1 different commits each, respectively.
-ok 8 - status (diverged from upstream)
-
-expecting success of 6040.9 'status (upstream is gone)': 
-	(
-		cd test &&
-		git checkout b5 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_grep "is based on .*, but the upstream is gone." actual
-
-Switched to branch 'b5'
-Your branch is based on 'brokenbase', but the upstream is gone.
-ok 9 - status (upstream is gone)
-
-expecting success of 6040.10 'status (up-to-date with upstream)': 
-	(
-		cd test &&
-		git checkout b6 >/dev/null &&
-		# reports nothing to commit
-		test_must_fail git commit --dry-run
-	) >actual &&
-	test_grep "Your branch is up to date with .origin/main" actual
-
-Switched to branch 'b6'
-Your branch is up to date with 'origin/main'.
-ok 10 - status (up-to-date with upstream)
-
-expecting success of 6040.11 'status -s -b (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
-
-Switched to branch 'b1'
-ok 11 - status -s -b (diverged from upstream)
-
-expecting success of 6040.12 'status -s -b --no-ahead-behind (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status -s -b --no-ahead-behind | head -1
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 12 - status -s -b --no-ahead-behind (diverged from upstream)
-
-expecting success of 6040.13 'status.aheadbehind=false status -s -b (diverged from upstream)': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git -c status.aheadbehind=false status -s -b | head -1
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 13 - status.aheadbehind=false status -s -b (diverged from upstream)
-
-expecting success of 6040.14 'status --long --branch': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status --long -b | head -3
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 14 - status --long --branch
-
-expecting success of 6040.15 'status --long --branch': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git -c status.aheadbehind=true status --long -b | head -3
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 15 - status --long --branch
-
-expecting success of 6040.16 'status --long --branch --no-ahead-behind': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git status --long -b --no-ahead-behind | head -2
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 16 - status --long --branch --no-ahead-behind
-
-expecting success of 6040.17 'status.aheadbehind=false status --long --branch': 
-	(
-		cd test &&
-		git checkout b1 >/dev/null &&
-		git -c status.aheadbehind=false status --long -b | head -2
-	) >actual &&
-	test_cmp expect actual
-
-Already on 'b1'
-ok 17 - status.aheadbehind=false status --long --branch
+	# 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 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
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
 
-Switched to branch 'b5'
-ok 18 - status -s -b (upstream is gone)
+)
+prerequisite TTY ok
+expecting success of 6020.23 '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
 
-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
+ok 23 - create --quiet disables all bundle progress
 
-Switched to branch 'b6'
-ok 19 - status -s -b (up-to-date with upstream)
+expecting success of 6020.24 'bundle progress with --no-quiet': 
+	GIT_PROGRESS_DELAY=0 \
+		git bundle create --no-quiet out.bundle --all 2>err &&
+	grep "%" err
 
-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
+Counting objects:   2% (1/47)
Counting objects:   4% (2/47)
Counting objects:   6% (3/47)
Counting objects:   8% (4/47)
Counting objects:  10% (5/47)
Counting objects:  12% (6/47)
Counting objects:  14% (7/47)
Counting objects:  17% (8/47)
Counting objects:  19% (9/47)
Counting objects:  21% (10/47)
Counting objects:  23% (11/47)
Counting objects:  25% (12/47)
Counting objects:  27% (13/47)
Counting objects:  29% (14/47)
Counting objects:  31% (15/47)
Counting objects:  34% (16/47)
Counting objects:  36% (17/47)
Counting objects:  38% (18/47)
Counting objects:  40% (19/47)
Counting objects:  42% (20/47)
Counting objects:  44% (21/47)
Counting objects:  46% (22/47)
Counting objects:  48% (23/47)
Counting objects:  51% (24/47)
Counting objects:  53% (25/47)
Counting objects:  55% (26/47)
Counting objects:  57% (27/47)
Counting objects:  59% (28/47)
Counting objects:  61% (29/47)
Counting objects:  63% (30/47)
Counting objects:  65% (31/47)
Counting objects:  68% (32/47)
Counting objects:  70% (33/47)
Counting objects:  72% (34/47)
Counting objects:  74% (35/47)
Counting objects:  76% (36/47)
Counting objects:  78% (37/47)
Counting objects:  80% (38/47)
Counting objects:  82% (39/47)
Counting objects:  85% (40/47)
Counting objects:  87% (41/47)
Counting objects:  89% (42/47)
Counting objects:  91% (43/47)
Counting objects:  93% (44/47)
Counting objects:  95% (45/47)
Counting objects:  97% (46/47)
Counting objects: 100% (47/47)
Counting objects: 100% (47/47), done.
+Compressing objects:   3% (1/31)
Compressing objects:   6% (2/31)
Compressing objects:   9% (3/31)
Compressing objects:  12% (4/31)
Compressing objects:  16% (5/31)
Compressing objects:  19% (6/31)
Compressing objects:  22% (7/31)
Compressing objects:  25% (8/31)
Compressing objects:  29% (9/31)
Compressing objects:  32% (10/31)
Compressing objects:  35% (11/31)
Compressing objects:  38% (12/31)
Compressing objects:  41% (13/31)
Compressing objects:  45% (14/31)
Compressing objects:  48% (15/31)
Compressing objects:  51% (16/31)
Compressing objects:  54% (17/31)
Compressing objects:  58% (18/31)
Compressing objects:  61% (19/31)
Compressing objects:  64% (20/31)
Compressing objects:  67% (21/31)
Compressing objects:  70% (22/31)
Compressing objects:  74% (23/31)
Compressing objects:  77% (24/31)
Compressing objects:  80% (25/31)
Compressing objects:  83% (26/31)
Compressing objects:  87% (27/31)
Compressing objects:  90% (28/31)
Compressing objects:  93% (29/31)
Compressing objects:  96% (30/31)
Compressing objects: 100% (31/31)
Compressing objects: 100% (31/31), done.
+Writing objects:   2% (1/47)
Writing objects:   4% (2/47)
Writing objects:   6% (3/47)
Writing objects:   8% (4/47)
Writing objects:  10% (5/47)
Writing objects:  12% (6/47)
Writing objects:  14% (7/47)
Writing objects:  17% (8/47)
Writing objects:  19% (9/47)
Writing objects:  21% (10/47)
Writing objects:  23% (11/47)
Writing objects:  25% (12/47)
Writing objects:  27% (13/47)
Writing objects:  29% (14/47)
Writing objects:  31% (15/47)
Writing objects:  34% (16/47)
Writing objects:  36% (17/47)
Writing objects:  38% (18/47)
Writing objects:  40% (19/47)
Writing objects:  42% (20/47)
Writing objects:  44% (21/47)
Writing objects:  46% (22/47)
Writing objects:  48% (23/47)
Writing objects:  51% (24/47)
Writing objects:  53% (25/47)
Writing objects:  55% (26/47)
Writing objects:  57% (27/47)
Writing objects:  59% (28/47)
Writing objects:  61% (29/47)
Writing objects:  63% (30/47)
Writing objects:  65% (31/47)
Writing objects:  68% (32/47)
Writing objects:  70% (33/47)
Writing objects:  72% (34/47)
Writing objects:  74% (35/47)
Writing objects:  76% (36/47)
Writing objects:  78% (37/47)
Writing objects:  80% (38/47)
Writing objects:  82% (39/47)
Writing objects:  85% (40/47)
Writing objects:  87% (41/47)
Writing objects:  89% (42/47)
Writing objects:  91% (43/47)
Writing objects:  93% (44/47)
Writing objects:  95% (45/47)
Writing objects:  97% (46/47)
Writing objects: 100% (47/47)
Writing objects: 100% (47/47), 3.72 KiB | 952.00 KiB/s, done.
+ok 24 - bundle progress with --no-quiet
 
-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 6020.25 'read bundle over stdin': 
+	git bundle create some.bundle HEAD &&
 
-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
+	git bundle verify - <some.bundle 2>err &&
+	grep "<stdin> is okay" err &&
 
-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
+	git bundle list-heads some.bundle >expect &&
+	git bundle list-heads - <some.bundle >actual &&
+	test_cmp expect actual &&
 
-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
+	git bundle unbundle some.bundle >expect &&
+	git bundle unbundle - <some.bundle >actual &&
+	test_cmp expect actual
 
-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
+The bundle contains this ref:
+da43db66582d34cbfc17b239b8fcbf1431323fb5 HEAD
+The bundle records a complete history.
+The bundle uses this hash algorithm: sha1
+<stdin> is okay
+ok 25 - read bundle over stdin
 
-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 &&
+expecting success of 6020.26 '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
 
-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}
+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 26 - send a bundle to standard output
 
-# passed all 23 test(s)
-1..23
+# passed all 26 test(s)
+1..26
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6100-rev-list-in-order.sh ***
@@ -390025,182 +391842,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6102-rev-list-unexpected-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6050-replace.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6050-replace/.git/
 expecting success of 6050.1 'set up buggy branch': 
@@ -390970,6 +392611,182 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6102-rev-list-unexpected-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6110-rev-list-sparse.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6110-rev-list-sparse/.git/
 expecting success of 6110.1 'setup': 
@@ -392937,905 +394754,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6114-keep-packs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6114-keep-packs/.git/
-expecting success of 6114.1 'setup': 
-	test_commit loose &&
-	test_commit packed &&
-	test_commit kept &&
-
-	KEPT_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
-	refs/tags/kept
-	^refs/tags/packed
-	EOF
-	) &&
-	MISC_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
-	refs/tags/packed
-	^refs/tags/loose
-	EOF
-	) &&
-
-	touch .git/objects/pack/pack-$KEPT_PACK.keep
-
-[master (root-commit) c1488ad] loose
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 loose.t
-[master 84721bd] packed
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 packed.t
-[master fb0b3cd] kept
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 kept.t
-ok 1 - setup
-
-expecting success of 6114.2 '--no-kept-objects excludes trees and blobs in .keep packs': 
-	rev_list_objects --objects --all --no-object-names >kept &&
-	rev_list_objects --objects --all --no-object-names --no-kept-objects >no-kept &&
-
-	idx_objects .git/objects/pack/pack-$KEPT_PACK.idx >expect &&
-	comm -3 kept no-kept >actual &&
-
-	test_cmp expect actual
-
-ok 2 - --no-kept-objects excludes trees and blobs in .keep packs
-
-expecting success of 6114.3 '--no-kept-objects excludes kept non-MIDX object': 
-	test_config core.multiPackIndex true &&
-
-	# Create a pack with just the commit object in pack, and do not mark it
-	# as kept (even though it appears in $KEPT_PACK, which does have a .keep
-	# file).
-	MIDX_PACK=$(git pack-objects .git/objects/pack/pack <<-EOF
-	$(git rev-parse kept)
-	EOF
-	) &&
-
-	# Write a MIDX containing all packs, but use the version of the commit
-	# at "kept" in a non-kept pack by touching $MIDX_PACK.
-	touch .git/objects/pack/pack-$MIDX_PACK.pack &&
-	git multi-pack-index write &&
-
-	rev_list_objects --objects --no-object-names --no-kept-objects HEAD >actual &&
-	(
-		idx_objects .git/objects/pack/pack-$MISC_PACK.idx &&
-		git rev-list --objects --no-object-names refs/tags/loose
-	) | sort >expect &&
-	test_cmp expect actual
-
-ok 3 - --no-kept-objects excludes kept non-MIDX object
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6112-rev-list-filters-objects.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/.git/
-expecting success of 6112.1 'setup r1': 
-	echo "{print \$1}" >print_1.awk &&
-	echo "{print \$2}" >print_2.awk &&
-
-	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.45.2/t/trash directory.t6112-rev-list-filters-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 6112.2 'verify blob:none omits all 5 blobs': 
-	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-		>ls_files_result &&
-	awk -f print_2.awk ls_files_result |
-	sort >expected &&
-
-	git -C r1 rev-list --quiet --objects --filter-print-omitted \
-		--filter=blob:none HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 2 - verify blob:none omits all 5 blobs
-
-expecting success of 6112.3 'specify blob explicitly prevents filtering': 
-	file_3=$(git -C r1 ls-files -s file.3 |
-		 awk -f print_2.awk) &&
-
-	file_4=$(git -C r1 ls-files -s file.4 |
-		 awk -f print_2.awk) &&
-
-	git -C r1 rev-list --objects --filter=blob:none HEAD $file_3 >observed &&
-	grep "$file_3" observed &&
-	! grep "$file_4" observed
-
-d2c9288bc745d46e9af90d26e0a3b6e03c099dff 
-ok 3 - specify blob explicitly prevents filtering
-
-expecting success of 6112.4 'verify emitted+omitted == all': 
-	git -C r1 rev-list --objects HEAD >revs &&
-	awk -f print_1.awk revs |
-	sort >expected &&
-
-	git -C r1 rev-list --objects --filter-print-omitted --filter=blob:none \
-		HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 4 - verify emitted+omitted == all
-
-expecting success of 6112.5 '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.45.2/t/trash directory.t6112-rev-list-filters-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 5 - setup r2
-
-expecting success of 6112.6 'verify blob:limit=500 omits all blobs': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
-	sort >expected &&
-
-	git -C r2 rev-list --quiet --objects --filter-print-omitted \
-		--filter=blob:limit=500 HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 6 - verify blob:limit=500 omits all blobs
-
-expecting success of 6112.7 'verify emitted+omitted == all': 
-	git -C r2 rev-list --objects HEAD >revs &&
-	awk -f print_1.awk revs |
-	sort >expected &&
-
-	git -C r2 rev-list --objects --filter-print-omitted \
-		--filter=blob:limit=500 HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 7 - verify emitted+omitted == all
-
-expecting success of 6112.8 'verify blob:limit=1000': 
-	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
-	sort >expected &&
-
-	git -C r2 rev-list --quiet --objects --filter-print-omitted \
-		--filter=blob:limit=1000 HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 8 - verify blob:limit=1000
-
-expecting success of 6112.9 'verify blob:limit=1001': 
-	git -C r2 ls-files -s large.10000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
-	sort >expected &&
-
-	git -C r2 rev-list --quiet --objects --filter-print-omitted \
-		--filter=blob:limit=1001 HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 9 - verify blob:limit=1001
-
-expecting success of 6112.10 'verify blob:limit=1k': 
-	git -C r2 ls-files -s large.10000 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
-	sort >expected &&
-
-	git -C r2 rev-list --quiet --objects --filter-print-omitted \
-		--filter=blob:limit=1k HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 10 - verify blob:limit=1k
-
-expecting success of 6112.11 'verify blob:limit=1m': 
-	git -C r2 rev-list --quiet --objects --filter-print-omitted \
-		--filter=blob:limit=1m HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_must_be_empty observed
-
-ok 11 - verify blob:limit=1m
-
-expecting success of 6112.12 'setup object-type': 
-	test_create_repo object-type &&
-	test_commit --no-tag -C object-type message blob &&
-	git -C object-type tag tag -m tag-message
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/object-type/.git/
-[main (root-commit) 667f9c5] message
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 blob
-ok 12 - setup object-type
-
-expecting success of 6112.13 'verify object:type= fails with invalid type': 
-	test_must_fail git -C object-type rev-list --objects --filter=object:type= HEAD &&
-	test_must_fail git -C object-type rev-list --objects --filter=object:type=invalid HEAD
-
-fatal: '' for 'object:type=<type>' is not a valid object type
-fatal: 'invalid' for 'object:type=<type>' is not a valid object type
-ok 13 - verify object:type= fails with invalid type
-
-expecting success of 6112.14 'verify object:type=blob prints blob and commit': 
-	git -C object-type rev-parse HEAD >expected &&
-	printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob) >>expected &&
-	git -C object-type rev-list --objects --filter=object:type=blob HEAD >actual &&
-	test_cmp expected actual
-
-ok 14 - verify object:type=blob prints blob and commit
-
-expecting success of 6112.15 'verify object:type=tree prints tree and commit': 
-	(
-		git -C object-type rev-parse HEAD &&
-		printf "%s \n" $(git -C object-type rev-parse HEAD^{tree})
-	) >expected &&
-	git -C object-type rev-list --objects --filter=object:type=tree HEAD >actual &&
-	test_cmp expected actual
-
-ok 15 - verify object:type=tree prints tree and commit
-
-expecting success of 6112.16 'verify object:type=commit prints commit': 
-	git -C object-type rev-parse HEAD >expected &&
-	git -C object-type rev-list --objects --filter=object:type=commit HEAD >actual &&
-	test_cmp expected actual
-
-ok 16 - verify object:type=commit prints commit
-
-expecting success of 6112.17 'verify object:type=tag prints tag': 
-	(
-		git -C object-type rev-parse HEAD &&
-		printf "%s tag\n" $(git -C object-type rev-parse tag)
-	) >expected &&
-	git -C object-type rev-list --objects --filter=object:type=tag tag >actual &&
-	test_cmp expected actual
-
-ok 17 - verify object:type=tag prints tag
-
-expecting success of 6112.18 'verify object:type=blob prints only blob with --filter-provided-objects': 
-	printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob) >expected &&
-	git -C object-type rev-list --objects \
-		--filter=object:type=blob --filter-provided-objects HEAD >actual &&
-	test_cmp expected actual
-
-ok 18 - verify object:type=blob prints only blob with --filter-provided-objects
-
-expecting success of 6112.19 'verify object:type=tree prints only tree with --filter-provided-objects': 
-	printf "%s \n" $(git -C object-type rev-parse HEAD^{tree}) >expected &&
-	git -C object-type rev-list --objects \
-		--filter=object:type=tree HEAD --filter-provided-objects >actual &&
-	test_cmp expected actual
-
-ok 19 - verify object:type=tree prints only tree with --filter-provided-objects
-
-expecting success of 6112.20 'verify object:type=commit prints only commit with --filter-provided-objects': 
-	git -C object-type rev-parse HEAD >expected &&
-	git -C object-type rev-list --objects \
-		--filter=object:type=commit --filter-provided-objects HEAD >actual &&
-	test_cmp expected actual
-
-ok 20 - verify object:type=commit prints only commit with --filter-provided-objects
-
-expecting success of 6112.21 'verify object:type=tag prints only tag with --filter-provided-objects': 
-	printf "%s tag\n" $(git -C object-type rev-parse tag) >expected &&
-	git -C object-type rev-list --objects \
-		--filter=object:type=tag --filter-provided-objects tag >actual &&
-	test_cmp expected actual
-
-ok 21 - verify object:type=tag prints only tag with --filter-provided-objects
-
-expecting success of 6112.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.45.2/t/trash directory.t6112-rev-list-filters-objects/r3/.git/
-[main (root-commit) c6d9eba] 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 6112.23 'verify sparse:path=pattern1 fails': 
-	test_must_fail git -C r3 rev-list --quiet --objects \
-		--filter-print-omitted --filter=sparse:path=../pattern1 HEAD
-
-fatal: sparse:path filters support has been dropped
-ok 23 - verify sparse:path=pattern1 fails
-
-expecting success of 6112.24 'verify sparse:path=pattern2 fails': 
-	test_must_fail git -C r3 rev-list --quiet --objects \
-		--filter-print-omitted --filter=sparse:path=../pattern2 HEAD
-
-fatal: sparse:path filters support has been dropped
-ok 24 - verify sparse:path=pattern2 fails
-
-expecting success of 6112.25 'setup r3 part 2': 
-	echo dir1/ >r3/pattern &&
-	git -C r3 add pattern &&
-	git -C r3 commit -m "pattern"
-
-[main 819b47c] pattern
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 pattern
-ok 25 - setup r3 part 2
-
-expecting success of 6112.26 'verify sparse:oid=OID omits top-level files': 
-	git -C r3 ls-files -s pattern sparse1 sparse2 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
-	sort >expected &&
-
-	oid=$(git -C r3 ls-files -s pattern | awk -f print_2.awk) &&
-
-	git -C r3 rev-list --quiet --objects --filter-print-omitted \
-		--filter=sparse:oid=$oid HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 26 - verify sparse:oid=OID omits top-level files
-
-expecting success of 6112.27 'verify sparse:oid=oid-ish omits top-level files': 
-	git -C r3 ls-files -s pattern sparse1 sparse2 >ls_files_result &&
-	awk -f print_2.awk ls_files_result |
-	sort >expected &&
-
-	git -C r3 rev-list --quiet --objects --filter-print-omitted \
-		--filter=sparse:oid=main:pattern HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/~//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 27 - verify sparse:oid=oid-ish omits top-level files
-
-expecting success of 6112.28 'rev-list W/ --missing=print and --missing=allow-any for trees': 
-	TREE=$(git -C r3 rev-parse HEAD:dir1) &&
-
-	# Create a spare repo because we will be deleting objects from this one.
-	git clone r3 r3.b &&
-
-	rm r3.b/.git/objects/$(echo $TREE | sed "s|^..|&/|") &&
-
-	git -C r3.b rev-list --quiet --missing=print --objects HEAD \
-		>missing_objs 2>rev_list_err &&
-	echo "?$TREE" >expected &&
-	test_cmp expected missing_objs &&
-
-	# do not complain when a missing tree cannot be parsed
-	test_must_be_empty rev_list_err &&
-
-	git -C r3.b rev-list --missing=allow-any --objects HEAD \
-		>objs 2>rev_list_err &&
-	! grep $TREE objs &&
-	test_must_be_empty rev_list_err
-
-Cloning into 'r3.b'...
-done.
-ok 28 - rev-list W/ --missing=print and --missing=allow-any for trees
-
-expecting success of 6112.29 'verify tree:0 includes trees in "filtered" output': 
-	git -C r3 rev-list --quiet --objects --filter-print-omitted \
-		--filter=tree:0 HEAD >revs &&
-
-	awk -f print_1.awk revs |
-	sed s/~// |
-	xargs -n1 git -C r3 cat-file -t >unsorted_filtered_types &&
-
-	sort -u unsorted_filtered_types >filtered_types &&
-	test_write_lines blob tree >expected &&
-	test_cmp expected filtered_types
-
-ok 29 - verify tree:0 includes trees in "filtered" output
-
-expecting success of 6112.30 'verify skipping tree iteration when not collecting omits': 
-	GIT_TRACE=1 git -C r3 rev-list \
-		--objects --filter=tree:0 HEAD 2>filter_trace &&
-	grep "Skipping contents of tree [.][.][.]" filter_trace >actual &&
-	# One line for each commit traversed.
-	test_line_count = 2 actual &&
-
-	# Make sure no other trees were considered besides the root.
-	! grep "Skipping contents of tree [^.]" filter_trace &&
-
-	# Try this again with "combine:". If both sub-filters are skipping
-	# trees, the composite filter should also skip trees. This is not
-	# important unless the user does combine:tree:X+tree:Y or another filter
-	# besides "tree:" is implemented in the future which can skip trees.
-	GIT_TRACE=1 git -C r3 rev-list \
-		--objects --filter=combine:tree:1+tree:3 HEAD 2>filter_trace &&
-
-	# Only skip the dir1/ tree, which is shared between the two commits.
-	grep "Skipping contents of tree " filter_trace >actual &&
-	test_write_lines "Skipping contents of tree dir1/..." >expected &&
-	test_cmp expected actual
-
-819b47c296d74a3901e11da74f4dce17d7857650
-c6d9eba8e5d370e16f4d49d7e6e58da52c1f73a8
-819b47c296d74a3901e11da74f4dce17d7857650
-c6d9eba8e5d370e16f4d49d7e6e58da52c1f73a8
-c87d0a60ab3e9c39852baa3d603a61217d40e22d 
-3893fc5e03af47544851c43293284679cd419b5b 
-ok 30 - verify skipping tree iteration when not collecting omits
-
-expecting success of 6112.31 'verify tree:1 includes root trees': 
-	git -C r3 rev-list --objects --filter=tree:1 HEAD >actual &&
-
-	# We should get two root directories and two commits.
-	expect_has HEAD "" &&
-	expect_has HEAD~1 ""  &&
-	test_line_count = 4 actual
-
-c87d0a60ab3e9c39852baa3d603a61217d40e22d 
-3893fc5e03af47544851c43293284679cd419b5b 
-ok 31 - verify tree:1 includes root trees
-
-expecting success of 6112.32 'verify tree:2 includes root trees and immediate children': 
-	git -C r3 rev-list --objects --filter=tree:2 HEAD >actual &&
-
-	expect_has HEAD "" &&
-	expect_has HEAD~1 "" &&
-	expect_has HEAD dir1 &&
-	expect_has HEAD pattern &&
-	expect_has HEAD sparse1 &&
-	expect_has HEAD sparse2 &&
-
-	# There are also 2 commit objects
-	test_line_count = 8 actual
-
-c87d0a60ab3e9c39852baa3d603a61217d40e22d 
-3893fc5e03af47544851c43293284679cd419b5b 
-7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
-09b067cf80607fe0e4fa713babca9fd9939077dd pattern
-0b432f4900db0d72f719347ebf446d97a8de793b sparse1
-2cc3ed6c8b26d9cf6e92fdbef61b61f26068a554 sparse2
-ok 32 - verify tree:2 includes root trees and immediate children
-
-expecting success of 6112.33 'verify tree:3 includes everything expected': 
-	git -C r3 rev-list --objects --filter=tree:3 HEAD >actual &&
-
-	expect_has HEAD "" &&
-	expect_has HEAD~1 "" &&
-	expect_has HEAD dir1 &&
-	expect_has HEAD dir1/sparse1 &&
-	expect_has HEAD dir1/sparse2 &&
-	expect_has HEAD pattern &&
-	expect_has HEAD sparse1 &&
-	expect_has HEAD sparse2 &&
-
-	# There are also 2 commit objects
-	test_line_count = 10 actual
-
-c87d0a60ab3e9c39852baa3d603a61217d40e22d 
-3893fc5e03af47544851c43293284679cd419b5b 
-7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
-40dffed725389f7a2be11e2a3ac34f878d767cdf dir1/sparse1
-b1d6d0f3744cb998a08e4bbbd93b4e20aaf8fbe3 dir1/sparse2
-09b067cf80607fe0e4fa713babca9fd9939077dd pattern
-0b432f4900db0d72f719347ebf446d97a8de793b sparse1
-2cc3ed6c8b26d9cf6e92fdbef61b61f26068a554 sparse2
-ok 33 - verify tree:3 includes everything expected
-
-expecting success of 6112.34 'combine:... for a simple combination': 
-	git -C r3 rev-list --objects --filter=combine:tree:2+blob:none HEAD \
-		>actual &&
-
-	expect_has HEAD "" &&
-	expect_has HEAD~1 "" &&
-	expect_has HEAD dir1 &&
-
-	# There are also 2 commit objects
-	test_line_count = 5 actual &&
-
-	cp actual expected &&
-
-	# Try again using repeated --filter - this is equivalent to a manual
-	# combine with "combine:...+..."
-	git -C r3 rev-list --objects --filter=combine:tree:2 \
-		--filter=blob:none HEAD >actual &&
-
-	test_cmp expected actual
-
-c87d0a60ab3e9c39852baa3d603a61217d40e22d 
-3893fc5e03af47544851c43293284679cd419b5b 
-7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
-ok 34 - combine:... for a simple combination
-
-expecting success of 6112.35 'combine:... with URL encoding': 
-	git -C r3 rev-list --objects \
-		--filter=combine:tree%3a2+blob:%6Eon%65 HEAD >actual &&
-
-	expect_has HEAD "" &&
-	expect_has HEAD~1 "" &&
-	expect_has HEAD dir1 &&
-
-	# There are also 2 commit objects
-	test_line_count = 5 actual
-
-c87d0a60ab3e9c39852baa3d603a61217d40e22d 
-3893fc5e03af47544851c43293284679cd419b5b 
-7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
-ok 35 - combine:... with URL encoding
-
-expecting success of 6112.36 'combine:... while URL-encoding things that should not be': 
-	expect_invalid_filter_spec combine%3Atree:2+blob:none \
-		"invalid filter-spec"
-
-fatal: invalid filter-spec 'combine%3Atree:2+blob:none'
-ok 36 - combine:... while URL-encoding things that should not be
-
-expecting success of 6112.37 'combine: with nothing after the :': 
-	expect_invalid_filter_spec combine: "expected something after combine:"
-
-fatal: expected something after combine:
-ok 37 - combine: with nothing after the :
-
-expecting success of 6112.38 'parse error in first sub-filter in combine:': 
-	expect_invalid_filter_spec combine:tree:asdf+blob:none \
-		"expected .tree:<depth>."
-
-fatal: expected 'tree:<depth>'
-ok 38 - parse error in first sub-filter in combine:
-
-expecting success of 6112.39 'combine:... with non-encoded reserved chars': 
-	expect_invalid_filter_spec combine:tree:2+sparse:@xyz \
-		"must escape char in sub-filter-spec: .@." &&
-	expect_invalid_filter_spec combine:tree:2+sparse:\` \
-		"must escape char in sub-filter-spec: .\`." &&
-	expect_invalid_filter_spec combine:tree:2+sparse:~abc \
-		"must escape char in sub-filter-spec: .\~."
-
-fatal: must escape char in sub-filter-spec: '@'
-fatal: must escape char in sub-filter-spec: '`'
-fatal: must escape char in sub-filter-spec: '~'
-ok 39 - combine:... with non-encoded reserved chars
-
-expecting success of 6112.40 'validate err msg for "combine:<valid-filter>+"': 
-	expect_invalid_filter_spec combine:tree:2+ "expected .tree:<depth>."
-
-fatal: expected 'tree:<depth>'
-ok 40 - validate err msg for "combine:<valid-filter>+"
-
-expecting success of 6112.41 'combine:... with edge-case hex digits: Ff Aa 0 9': 
-	git -C r3 rev-list --objects --filter="combine:tree:2+bl%6Fb:n%6fne" \
-		HEAD >actual &&
-	test_line_count = 5 actual &&
-	git -C r3 rev-list --objects --filter="combine:tree%3A2+blob%3anone" \
-		HEAD >actual &&
-	test_line_count = 5 actual &&
-	git -C r3 rev-list --objects --filter="combine:tree:%30" HEAD >actual &&
-	test_line_count = 2 actual &&
-	git -C r3 rev-list --objects --filter="combine:tree:%39+blob:none" \
-		HEAD >actual &&
-	test_line_count = 5 actual
-
-ok 41 - combine:... with edge-case hex digits: Ff Aa 0 9
-
-expecting success of 6112.42 'add sparse pattern blobs whose paths have reserved chars': 
-	cp r3/pattern r3/pattern1+renamed% &&
-	cp r3/pattern "r3/p;at%ter+n" &&
-	cp r3/pattern r3/^~pattern &&
-	git -C r3 add pattern1+renamed% "p;at%ter+n" ^~pattern &&
-	git -C r3 commit -m "add sparse pattern files with reserved chars"
-
-[main 5962055] add sparse pattern files with reserved chars
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 ^~pattern
- create mode 100644 p;at%ter+n
- create mode 100644 pattern1+renamed%
-ok 42 - add sparse pattern blobs whose paths have reserved chars
-
-expecting success of 6112.43 'combine:... with more than two sub-filters': 
-	git -C r3 rev-list --objects \
-		--filter=combine:tree:3+blob:limit=40+sparse:oid=main:pattern \
-		HEAD >actual &&
-
-	expect_has HEAD "" &&
-	expect_has HEAD~1 "" &&
-	expect_has HEAD~2 "" &&
-	expect_has HEAD dir1 &&
-	expect_has HEAD dir1/sparse1 &&
-	expect_has HEAD dir1/sparse2 &&
-
-	# Should also have 3 commits
-	test_line_count = 9 actual &&
-
-	# Try again, this time making sure the last sub-filter is only
-	# URL-decoded once.
-	cp actual expect &&
-
-	git -C r3 rev-list --objects \
-		--filter=combine:tree:3+blob:limit=40+sparse:oid=main:pattern1%2brenamed%25 \
-		HEAD >actual &&
-	test_cmp expect actual &&
-
-	# Use the same composite filter again, but with a pattern file name that
-	# requires encoding multiple characters, and use implicit filter
-	# combining.
-	test_when_finished "rm -f trace1" &&
-	GIT_TRACE=$(pwd)/trace1 git -C r3 rev-list --objects \
-		--filter=tree:3 --filter=blob:limit=40 \
-		--filter=sparse:oid="main:p;at%ter+n" \
-		HEAD >actual &&
-
-	test_cmp expect actual &&
-	grep "Add to combine filter-spec: sparse:oid=main:p%3bat%25ter%2bn" \
-		trace1 &&
-
-	# Repeat the above test, but this time, the characters to encode are in
-	# the LHS of the combined filter.
-	test_when_finished "rm -f trace2" &&
-	GIT_TRACE=$(pwd)/trace2 git -C r3 rev-list --objects \
-		--filter=sparse:oid=main:^~pattern \
-		--filter=tree:3 --filter=blob:limit=40 \
-		HEAD >actual &&
-
-	test_cmp expect actual &&
-	grep "Add to combine filter-spec: sparse:oid=main:%5e%7epattern" \
-		trace2
-
-9e0b8354abd113bca99cb72fa47c8e22018f84cf 
-c87d0a60ab3e9c39852baa3d603a61217d40e22d 
-3893fc5e03af47544851c43293284679cd419b5b 
-7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
-40dffed725389f7a2be11e2a3ac34f878d767cdf dir1/sparse1
-b1d6d0f3744cb998a08e4bbbd93b4e20aaf8fbe3 dir1/sparse2
-Add to combine filter-spec: sparse:oid=main:p%3bat%25ter%2bn
-Add to combine filter-spec: sparse:oid=main:%5e%7epattern
-ok 43 - combine:... with more than two sub-filters
-
-expecting success of 6112.44 'setup r4': 
-	git init r4 &&
-
-	echo foo > r4/foo &&
-	mkdir r4/subdir &&
-	echo bar > r4/subdir/bar &&
-
-	mkdir r4/filt &&
-	cp -r r4/foo r4/subdir r4/filt &&
-
-	git -C r4 add foo subdir filt &&
-	git -C r4 commit -m "commit msg"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/r4/.git/
-[main (root-commit) cde7f52] commit msg
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 filt/foo
- create mode 100644 filt/subdir/bar
- create mode 100644 foo
- create mode 100644 subdir/bar
-ok 44 - setup r4
-
-expecting success of 6112.45 'test tree:# filter provisional omit for blob and tree': 
-	git -C r4 rev-list --objects --filter-print-omitted --filter=tree:2 \
-		HEAD >actual &&
-	expect_has_with_different_name r4 filt/foo &&
-	expect_has_with_different_name r4 filt/subdir
-
-257cc5642cb1a054f08cc83f2d943e56fd3ebe99 foo
-ee314a31b622b027c10981acaed7903a3607dbd4 subdir
-ok 45 - test tree:# filter provisional omit for blob and tree
-
-expecting success of 6112.46 'verify skipping tree iteration when collecting omits': 
-	GIT_TRACE=1 git -C r4 rev-list --filter-print-omitted \
-		--objects --filter=tree:0 HEAD 2>filter_trace &&
-	grep "^Skipping contents of tree " filter_trace >actual &&
-
-	echo "Skipping contents of tree subdir/..." >expect &&
-	test_cmp expect actual
-
-cde7f52c36fbf3baf928c2af5ef7f98c0289d8bb
-~d78556fc6f1bfbd95227fadba9ed6515b2e10d55
-~5716ca5987cbf97d6bb54920bea6adde242d87e6
-~ee314a31b622b027c10981acaed7903a3607dbd4
-~efb93ecccaaa415ab7f4a10a9de4acb792b002d0
-~257cc5642cb1a054f08cc83f2d943e56fd3ebe99
-ok 46 - verify skipping tree iteration when collecting omits
-
-expecting success of 6112.47 'setup r5': 
-	git init r5 &&
-	mkdir -p r5/subdir &&
-
-	echo 1     >r5/short-root          &&
-	echo 12345 >r5/long-root           &&
-	echo a     >r5/subdir/short-subdir &&
-	echo abcde >r5/subdir/long-subdir  &&
-
-	git -C r5 add short-root long-root subdir &&
-	git -C r5 commit -m "commit msg"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/r5/.git/
-[main (root-commit) ff8baac] commit msg
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 long-root
- create mode 100644 short-root
- create mode 100644 subdir/long-subdir
- create mode 100644 subdir/short-subdir
-ok 47 - setup r5
-
-expecting success of 6112.48 'verify collecting omits in combined: filter': 
-	# Note that this test guards against the naive implementation of simply
-	# giving both filters the same "omits" set and expecting it to
-	# automatically merge them.
-	git -C r5 rev-list --objects --quiet --filter-print-omitted \
-		--filter=combine:tree:2+blob:limit=3 HEAD >actual &&
-
-	# Expect 0 trees/commits, 3 blobs omitted (all blobs except short-root)
-	omitted_1=$(echo 12345 | git hash-object --stdin) &&
-	omitted_2=$(echo a     | git hash-object --stdin) &&
-	omitted_3=$(echo abcde | git hash-object --stdin) &&
-
-	grep ~$omitted_1 actual &&
-	grep ~$omitted_2 actual &&
-	grep ~$omitted_3 actual &&
-	test_line_count = 3 actual
-
-~e56e15bb7ddb6bd0b6d924b18fcee53d8713d7ea
-~78981922613b2afb6025042ff6bd878ac1994e85
-~00dedf6bd5f3e493ce8b03c889912f47b01297d4
-ok 48 - verify collecting omits in combined: filter
-
-expecting success of 6112.49 'tree:<depth> where we iterate over tree at two levels': 
-	git init r5 &&
-
-	mkdir -p r5/a/subdir/b &&
-	echo foo > r5/a/subdir/b/foo &&
-
-	mkdir -p r5/subdir/b &&
-	echo foo > r5/subdir/b/foo &&
-
-	git -C r5 add a subdir &&
-	git -C r5 commit -m "commit msg" &&
-
-	git -C r5 rev-list --objects --filter=tree:4 HEAD >actual &&
-	expect_has_with_different_name r5 a/subdir/b/foo
-
-Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/r5/.git/
-[main 8968c2f] commit msg
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 a/subdir/b/foo
- create mode 100644 subdir/b/foo
-257cc5642cb1a054f08cc83f2d943e56fd3ebe99 subdir/b/foo
-ok 49 - tree:<depth> where we iterate over tree at two levels
-
-expecting success of 6112.50 'tree:<depth> which filters out blob but given as arg': 
-	blob_hash=$(git -C r4 rev-parse HEAD:subdir/bar) &&
-
-	git -C r4 rev-list --objects --filter=tree:1 HEAD $blob_hash >actual &&
-	grep ^$blob_hash actual
-
-5716ca5987cbf97d6bb54920bea6adde242d87e6 
-ok 50 - tree:<depth> which filters out blob but given as arg
-
-expecting success of 6112.51 'rev-list W/ --missing=print': 
-	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-		>ls_files_result &&
-	awk -f print_2.awk ls_files_result |
-	sort >expected &&
-
-	for id in `sed "s|..|&/|" expected`
-	do
-		rm r1/.git/objects/$id || return 1
-	done &&
-
-	git -C r1 rev-list --quiet --missing=print --objects HEAD >revs &&
-	awk -f print_1.awk revs |
-	sed "s/?//" |
-	sort >observed &&
-
-	test_cmp expected observed
-
-ok 51 - rev-list W/ --missing=print
-
-expecting success of 6112.52 'rev-list W/O --missing fails': 
-	test_must_fail git -C r1 rev-list --quiet --objects HEAD
-
-fatal: missing blob object '54ff69bde100bd29db945c2fc62010675d3b5b14'
-ok 52 - rev-list W/O --missing fails
-
-expecting success of 6112.53 'rev-list W/ missing=allow-any': 
-	git -C r1 rev-list --quiet --missing=allow-any --objects HEAD
-
-ok 53 - rev-list W/ missing=allow-any
-
-expecting success of 6112.54 'expand blob limit in protocol': 
-	git -C r2 config --local uploadpack.allowfilter 1 &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 clone \
-		--filter=blob:limit=1k "file://$(pwd)/r2" limit &&
-	! grep "blob:limit=1k" trace &&
-	grep "blob:limit=1024" trace
-
-Cloning into 'limit'...
-packet:        clone> filter blob:limit=1024
-packet:  upload-pack< filter blob:limit=1024
-ok 54 - expand blob limit in protocol
-
-# passed all 54 test(s)
-1..54
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6111-rev-list-treesame.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6111-rev-list-treesame/.git/
 expecting success of 6111.1 'setup': 
@@ -394450,580 +395368,78 @@
 1..65
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6115-rev-list-du.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6115-rev-list-du/.git/
-expecting success of 6115.1 'set up repository': 
-	test_commit --no-tag one &&
-	test_commit --no-tag two &&
-	git repack -adb &&
-	git reset --hard HEAD^ &&
-	test_commit --no-tag three &&
-	test_commit --no-tag four &&
-	git reset --hard HEAD^
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-HEAD is now at d79ce16 one
-[master 897c206] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-[master 6f2ec4d] four
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 four.t
-HEAD is now at 897c206 three
-ok 1 - set up repository
-
-expecting success of 6115.2 'generate expected size (HEAD)': 
-		disk_usage_slow HEAD >expect
-	
-ok 2 - generate expected size (HEAD)
-
-expecting success of 6115.3 'rev-list --disk-usage without bitmaps (HEAD)': 
-		git rev-list --disk-usage HEAD >actual &&
-		test_cmp expect actual
-	
-ok 3 - rev-list --disk-usage without bitmaps (HEAD)
-
-expecting success of 6115.4 'rev-list --disk-usage with bitmaps (HEAD)': 
-		git rev-list --disk-usage --use-bitmap-index HEAD >actual &&
-		test_cmp expect actual
-	
-ok 4 - rev-list --disk-usage with bitmaps (HEAD)
-
-expecting success of 6115.5 'generate expected size (--objects HEAD)': 
-		disk_usage_slow --objects HEAD >expect
-	
-ok 5 - generate expected size (--objects HEAD)
-
-expecting success of 6115.6 'rev-list --disk-usage without bitmaps (--objects HEAD)': 
-		git rev-list --disk-usage --objects HEAD >actual &&
-		test_cmp expect actual
-	
-ok 6 - rev-list --disk-usage without bitmaps (--objects HEAD)
-
-expecting success of 6115.7 'rev-list --disk-usage with bitmaps (--objects HEAD)': 
-		git rev-list --disk-usage --use-bitmap-index --objects HEAD >actual &&
-		test_cmp expect actual
-	
-ok 7 - rev-list --disk-usage with bitmaps (--objects HEAD)
-
-expecting success of 6115.8 'generate expected size (--objects HEAD^..HEAD)': 
-		disk_usage_slow --objects HEAD^..HEAD >expect
-	
-ok 8 - generate expected size (--objects HEAD^..HEAD)
-
-expecting success of 6115.9 'rev-list --disk-usage without bitmaps (--objects HEAD^..HEAD)': 
-		git rev-list --disk-usage --objects HEAD^..HEAD >actual &&
-		test_cmp expect actual
-	
-ok 9 - rev-list --disk-usage without bitmaps (--objects HEAD^..HEAD)
-
-expecting success of 6115.10 'rev-list --disk-usage with bitmaps (--objects HEAD^..HEAD)': 
-		git rev-list --disk-usage --use-bitmap-index --objects HEAD^..HEAD >actual &&
-		test_cmp expect actual
-	
-ok 10 - rev-list --disk-usage with bitmaps (--objects HEAD^..HEAD)
-
-expecting success of 6115.11 'setup for --unpacked tests': 
-	git repack -adb &&
-	test_commit unpacked
-
-[master 76e469a] unpacked
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 unpacked.t
-ok 11 - setup for --unpacked tests
-
-expecting success of 6115.12 'generate expected size (--all --objects --unpacked)': 
-		disk_usage_slow --all --objects --unpacked >expect
-	
-ok 12 - generate expected size (--all --objects --unpacked)
-
-expecting success of 6115.13 'rev-list --disk-usage without bitmaps (--all --objects --unpacked)': 
-		git rev-list --disk-usage --all --objects --unpacked >actual &&
-		test_cmp expect actual
-	
-ok 13 - rev-list --disk-usage without bitmaps (--all --objects --unpacked)
-
-expecting success of 6115.14 'rev-list --disk-usage with bitmaps (--all --objects --unpacked)': 
-		git rev-list --disk-usage --use-bitmap-index --all --objects --unpacked >actual &&
-		test_cmp expect actual
-	
-ok 14 - rev-list --disk-usage with bitmaps (--all --objects --unpacked)
-
-expecting success of 6115.15 'rev-list --disk-usage=human': 
-	git rev-list --objects HEAD --disk-usage=human >actual &&
-	disk_usage_slow --objects HEAD >actual_size &&
-	grep "$(cat actual_size) bytes" actual
-
-733 bytes
-ok 15 - rev-list --disk-usage=human
-
-expecting success of 6115.16 'rev-list --disk-usage=human with bitmaps': 
-	git rev-list --objects HEAD --use-bitmap-index --disk-usage=human >actual &&
-	disk_usage_slow --objects HEAD >actual_size &&
-	grep "$(cat actual_size) bytes" actual
-
-733 bytes
-ok 16 - rev-list --disk-usage=human with bitmaps
-
-expecting success of 6115.17 'rev-list use --disk-usage unproperly': 
-	test_must_fail git rev-list --objects HEAD --disk-usage=typo 2>err &&
-	cat >expect <<-\EOF &&
-	fatal: invalid value for '--disk-usage=<format>': 'typo', the only allowed format is 'human'
-	EOF
-	test_cmp err expect
-
-ok 17 - rev-list use --disk-usage unproperly
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6130-pathspec-noglob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6130-pathspec-noglob/.git/
-expecting success of 6130.1 'create commits with glob characters': 
-	test_commit unrelated bar &&
-	test_commit vanilla foo &&
-	# insert file "f*" in the commit, but in a way that avoids
-	# the name "f*" in the worktree, because it is not allowed
-	# on Windows (the tests below do not depend on the presence
-	# of the file in the worktree)
-	git config core.protectNTFS false &&
-	git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
-	test_tick &&
-	git commit -m star &&
-	test_commit bracket "f[o][o]"
-
-[master (root-commit) f600089] unrelated
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[master 065b8fa] vanilla
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[master 306e39a] star
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f*
-[master 48b9afb] bracket
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 f[o][o]
-ok 1 - create commits with glob characters
-
-expecting success of 6130.2 'vanilla pathspec matches literally': 
-	echo vanilla >expect &&
-	git log --format=%s -- foo >actual &&
-	test_cmp expect actual
-
-ok 2 - vanilla pathspec matches literally
-
-expecting success of 6130.3 'star pathspec globs': 
-	cat >expect <<-\EOF &&
-	bracket
-	star
-	vanilla
-	EOF
-	git log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 3 - star pathspec globs
-
-expecting success of 6130.4 'star pathspec globs': 
-	cat >expect <<-\EOF &&
-	bracket
-	star
-	vanilla
-	EOF
-	git log --format=%s -- ":(glob)f*" >actual &&
-	test_cmp expect actual
-
-ok 4 - star pathspec globs
-
-expecting success of 6130.5 'bracket pathspec globs and matches literal brackets': 
-	cat >expect <<-\EOF &&
-	bracket
-	vanilla
-	EOF
-	git log --format=%s -- "f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 5 - bracket pathspec globs and matches literal brackets
-
-expecting success of 6130.6 'bracket pathspec globs and matches literal brackets': 
-	cat >expect <<-\EOF &&
-	bracket
-	vanilla
-	EOF
-	git log --format=%s -- ":(glob)f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 6 - bracket pathspec globs and matches literal brackets
-
-expecting success of 6130.7 'no-glob option matches literally (vanilla)': 
-	echo vanilla >expect &&
-	git --literal-pathspecs log --format=%s -- foo >actual &&
-	test_cmp expect actual
-
-ok 7 - no-glob option matches literally (vanilla)
-
-expecting success of 6130.8 'no-glob option matches literally (vanilla)': 
-	echo vanilla >expect &&
-	git log --format=%s -- ":(literal)foo" >actual &&
-	test_cmp expect actual
-
-ok 8 - no-glob option matches literally (vanilla)
-
-expecting success of 6130.9 'no-glob option matches literally (star)': 
-	echo star >expect &&
-	git --literal-pathspecs log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 9 - no-glob option matches literally (star)
-
-expecting success of 6130.10 'no-glob option matches literally (star)': 
-	echo star >expect &&
-	git log --format=%s -- ":(literal)f*" >actual &&
-	test_cmp expect actual
-
-ok 10 - no-glob option matches literally (star)
-
-expecting success of 6130.11 'no-glob option matches literally (bracket)': 
-	echo bracket >expect &&
-	git --literal-pathspecs log --format=%s -- "f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 11 - no-glob option matches literally (bracket)
-
-expecting success of 6130.12 'no-glob option matches literally (bracket)': 
-	echo bracket >expect &&
-	git log --format=%s -- ":(literal)f[o][o]" >actual &&
-	test_cmp expect actual
-
-ok 12 - no-glob option matches literally (bracket)
-
-expecting success of 6130.13 'no-glob option disables :(literal)': 
-	git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
-	test_must_be_empty actual
-
-ok 13 - no-glob option disables :(literal)
-
-expecting success of 6130.14 'no-glob environment variable works': 
-	echo star >expect &&
-	GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
-	test_cmp expect actual
-
-ok 14 - no-glob environment variable works
-
-expecting success of 6130.15 'blame takes global pathspec flags': 
-	git --literal-pathspecs blame -- foo &&
-	git --icase-pathspecs   blame -- foo &&
-	git --glob-pathspecs    blame -- foo &&
-	git --noglob-pathspecs  blame -- foo
-
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
-ok 15 - blame takes global pathspec flags
-
-expecting success of 6130.16 'setup xxx/bar': 
-	mkdir xxx &&
-	test_commit xxx xxx/bar
-
-[master 7cd4d15] xxx
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 xxx/bar
-ok 16 - setup xxx/bar
-
-expecting success of 6130.17 '**/ works with :(glob)': 
-	cat >expect <<-\EOF &&
-	xxx
-	unrelated
-	EOF
-	git log --format=%s -- ":(glob)**/bar" >actual &&
-	test_cmp expect actual
-
-ok 17 - **/ works with :(glob)
-
-expecting success of 6130.18 '**/ does not work with --noglob-pathspecs': 
-	git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
-	test_must_be_empty actual
-
-ok 18 - **/ does not work with --noglob-pathspecs
+*** t6114-keep-packs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6114-keep-packs/.git/
+expecting success of 6114.1 'setup': 
+	test_commit loose &&
+	test_commit packed &&
+	test_commit kept &&
 
-expecting success of 6130.19 '**/ works with :(glob) and --noglob-pathspecs': 
-	cat >expect <<-\EOF &&
-	xxx
-	unrelated
+	KEPT_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
+	refs/tags/kept
+	^refs/tags/packed
 	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
+	) &&
+	MISC_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
+	refs/tags/packed
+	^refs/tags/loose
 	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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6131-pathspec-icase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6131-pathspec-icase/.git/
-checking prerequisite: CASE_INSENSITIVE_FS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-	echo good >CamelCase &&
-	echo bad >camelcase &&
-	test "$(cat CamelCase)" != good
+	) &&
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-expecting success of 6131.1 'create commits with glob characters': 
-	test_commit bar bar &&
-	test_commit bAr bAr &&
-	test_commit BAR BAR &&
-	mkdir foo &&
-	test_commit foo/bar foo/bar &&
-	test_commit foo/bAr foo/bAr &&
-	test_commit foo/BAR foo/BAR &&
-	mkdir fOo &&
-	test_commit fOo/bar fOo/bar &&
-	test_commit fOo/bAr fOo/bAr &&
-	test_commit fOo/BAR fOo/BAR &&
-	mkdir FOO &&
-	test_commit FOO/bar FOO/bar &&
-	test_commit FOO/bAr FOO/bAr &&
-	test_commit FOO/BAR FOO/BAR
+	touch .git/objects/pack/pack-$KEPT_PACK.keep
 
-[master (root-commit) b257e7a] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[master 09d2e74] bAr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bAr
-[master ae27bbe] BAR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 BAR
-[master 016d22a] foo/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bar
-[master f3c37ed] foo/bAr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/bAr
-[master 98eb41e] foo/BAR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo/BAR
-[master edcb5cb] fOo/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fOo/bar
-[master ed5b100] fOo/bAr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fOo/bAr
-[master 2f49636] fOo/BAR
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fOo/BAR
-[master c65ab92] FOO/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 FOO/bar
-[master cd48380] FOO/bAr
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 FOO/bAr
-[master 4e818f3] FOO/BAR
+[master (root-commit) c1488ad] loose
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 FOO/BAR
-ok 1 - create commits with glob characters
-
-expecting success of 6131.2 'tree_entry_interesting matches bar': 
-	echo bar >expect &&
-	git log --format=%s -- "bar" >actual &&
-	test_cmp expect actual
-
-ok 2 - tree_entry_interesting matches bar
-
-expecting success of 6131.3 'tree_entry_interesting matches :(icase)bar': 
-	cat <<-EOF >expect &&
-	BAR
-	bAr
-	bar
-	EOF
-	git log --format=%s -- ":(icase)bar" >actual &&
-	test_cmp expect actual
-
-ok 3 - tree_entry_interesting matches :(icase)bar
-
-expecting success of 6131.4 'tree_entry_interesting matches :(icase)bar with prefix': 
-	cat <<-EOF >expect &&
-	fOo/BAR
-	fOo/bAr
-	fOo/bar
-	EOF
-	( cd fOo && git log --format=%s -- ":(icase)bar" ) >actual &&
-	test_cmp expect actual
-
-ok 4 - tree_entry_interesting matches :(icase)bar with prefix
-
-expecting success of 6131.5 'tree_entry_interesting matches :(icase)bar with empty prefix': 
-	cat <<-EOF >expect &&
-	FOO/BAR
-	FOO/bAr
-	FOO/bar
-	fOo/BAR
-	fOo/bAr
-	fOo/bar
-	foo/BAR
-	foo/bAr
-	foo/bar
-	EOF
-	( cd fOo && git log --format=%s -- ":(icase)../foo/bar" ) >actual &&
-	test_cmp expect actual
-
-ok 5 - tree_entry_interesting matches :(icase)bar with empty prefix
-
-expecting success of 6131.6 'match_pathspec matches :(icase)bar': 
-	cat <<-EOF >expect &&
-	BAR
-	bAr
-	bar
-	EOF
-	git ls-files ":(icase)bar" >actual &&
-	test_cmp expect actual
-
-ok 6 - match_pathspec matches :(icase)bar
-
-expecting success of 6131.7 'match_pathspec matches :(icase)bar with prefix': 
-	cat <<-EOF >expect &&
-	fOo/BAR
-	fOo/bAr
-	fOo/bar
-	EOF
-	( cd fOo && git ls-files --full-name ":(icase)bar" ) >actual &&
-	test_cmp expect actual
-
-ok 7 - match_pathspec matches :(icase)bar with prefix
-
-expecting success of 6131.8 'match_pathspec matches :(icase)bar with empty prefix': 
-	cat <<-EOF >expect &&
-	bar
-	fOo/BAR
-	fOo/bAr
-	fOo/bar
-	EOF
-	( cd fOo && git ls-files --full-name ":(icase)bar" ../bar ) >actual &&
-	test_cmp expect actual
-
-ok 8 - match_pathspec matches :(icase)bar with empty prefix
-
-expecting success of 6131.9 '"git diff" can take magic :(icase) pathspec': 
-	echo FOO/BAR >expect &&
-	git diff --name-only HEAD^ HEAD -- ":(icase)foo/bar" >actual &&
-	test_cmp expect actual
-
-ok 9 - "git diff" can take magic :(icase) pathspec
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6133-pathspec-rev-dwim.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6133-pathspec-rev-dwim/.git/
-expecting success of 6133.1 'setup': 
-	test_commit base &&
-	echo content >"br[ack]ets" &&
-	git add . &&
-	test_tick &&
-	git commit -m brackets
-
-[master (root-commit) d1ff1c9] base
+ create mode 100644 loose.t
+[master 84721bd] packed
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 261aa52] brackets
+ create mode 100644 packed.t
+[master fb0b3cd] kept
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 br[ack]ets
+ create mode 100644 kept.t
 ok 1 - setup
 
-expecting success of 6133.2 'non-rev wildcard dwims to pathspec': 
-	git log -- "*.t" >expect &&
-	git log    "*.t" >actual &&
-	test_cmp expect actual
+expecting success of 6114.2 '--no-kept-objects excludes trees and blobs in .keep packs': 
+	rev_list_objects --objects --all --no-object-names >kept &&
+	rev_list_objects --objects --all --no-object-names --no-kept-objects >no-kept &&
 
-ok 2 - non-rev wildcard dwims to pathspec
+	idx_objects .git/objects/pack/pack-$KEPT_PACK.idx >expect &&
+	comm -3 kept no-kept >actual &&
 
-expecting success of 6133.3 'tree:path with metacharacters dwims to rev': 
-	git show "HEAD:br[ack]ets" -- >expect &&
-	git show "HEAD:br[ack]ets"    >actual &&
 	test_cmp expect actual
 
-ok 3 - tree:path with metacharacters dwims to rev
-
-expecting success of 6133.4 '^{foo} with metacharacters dwims to rev': 
-	git log "HEAD^{/b.*}" -- >expect &&
-	git log "HEAD^{/b.*}"    >actual &&
-	test_cmp expect actual
+ok 2 - --no-kept-objects excludes trees and blobs in .keep packs
 
-ok 4 - ^{foo} with metacharacters dwims to rev
+expecting success of 6114.3 '--no-kept-objects excludes kept non-MIDX object': 
+	test_config core.multiPackIndex true &&
 
-expecting success of 6133.5 '@{foo} with metacharacters dwims to rev': 
-	git log "HEAD@{now [or thereabouts]}" -- >expect &&
-	git log "HEAD@{now [or thereabouts]}"    >actual &&
-	test_cmp expect actual
+	# Create a pack with just the commit object in pack, and do not mark it
+	# as kept (even though it appears in $KEPT_PACK, which does have a .keep
+	# file).
+	MIDX_PACK=$(git pack-objects .git/objects/pack/pack <<-EOF
+	$(git rev-parse kept)
+	EOF
+	) &&
 
-ok 5 - @{foo} with metacharacters dwims to rev
+	# Write a MIDX containing all packs, but use the version of the commit
+	# at "kept" in a non-kept pack by touching $MIDX_PACK.
+	touch .git/objects/pack/pack-$MIDX_PACK.pack &&
+	git multi-pack-index write &&
 
-expecting success of 6133.6 ':/*.t from a subdir dwims to a pathspec': 
-	mkdir subdir &&
+	rev_list_objects --objects --no-object-names --no-kept-objects HEAD >actual &&
 	(
-		cd subdir &&
-		git log -- ":/*.t" >expect &&
-		git log    ":/*.t" >actual &&
-		test_cmp expect actual
-	)
+		idx_objects .git/objects/pack/pack-$MISC_PACK.idx &&
+		git rev-list --objects --no-object-names refs/tags/loose
+	) | sort >expect &&
+	test_cmp expect actual
 
-ok 6 - :/*.t from a subdir dwims to a pathspec
+ok 3 - --no-kept-objects excludes kept non-MIDX object
 
-# passed all 6 test(s)
-1..6
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6030-bisect-porcelain.sh ***
@@ -395697,8 +396113,8 @@
 status: waiting for bad commit, 1 good commit known
 Bisecting: 0 revisions left to test after this (roughly 1 step)
 [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-'./not-executable.sh': 1: ./not-executable.sh: Permission denied
-'./not-executable.sh': 1: ./not-executable.sh: Permission denied
+'./not-executable.sh': line 1: ./not-executable.sh: Permission denied
+'./not-executable.sh': line 1: ./not-executable.sh: Permission denied
 error: bogus exit code 126 for good revision
 Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
 Switched to branch 'other'
@@ -395737,8 +396153,8 @@
 status: waiting for bad commit, 1 good commit known
 Bisecting: 0 revisions left to test after this (roughly 1 step)
 [3de952f2416b6084f557ec417709eac740c6818c] Add <3: Another new day for git> into <hello>.
-'./does-not-exist.sh': 1: ./does-not-exist.sh: not found
-'./does-not-exist.sh': 1: ./does-not-exist.sh: not found
+'./does-not-exist.sh': line 1: ./does-not-exist.sh: No such file or directory
+'./does-not-exist.sh': line 1: ./does-not-exist.sh: No such file or directory
 error: bogus exit code 127 for good revision
 Previous HEAD position was 3de952f Add <3: Another new day for git> into <hello>.
 Switched to branch 'other'
@@ -397001,6 +397417,1407 @@
 1..96
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6112-rev-list-filters-objects.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/.git/
+expecting success of 6112.1 'setup r1': 
+	echo "{print \$1}" >print_1.awk &&
+	echo "{print \$2}" >print_2.awk &&
+
+	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.45.2/t/trash directory.t6112-rev-list-filters-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 6112.2 'verify blob:none omits all 5 blobs': 
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+		>ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
+
+	git -C r1 rev-list --quiet --objects --filter-print-omitted \
+		--filter=blob:none HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 2 - verify blob:none omits all 5 blobs
+
+expecting success of 6112.3 'specify blob explicitly prevents filtering': 
+	file_3=$(git -C r1 ls-files -s file.3 |
+		 awk -f print_2.awk) &&
+
+	file_4=$(git -C r1 ls-files -s file.4 |
+		 awk -f print_2.awk) &&
+
+	git -C r1 rev-list --objects --filter=blob:none HEAD $file_3 >observed &&
+	grep "$file_3" observed &&
+	! grep "$file_4" observed
+
+d2c9288bc745d46e9af90d26e0a3b6e03c099dff 
+ok 3 - specify blob explicitly prevents filtering
+
+expecting success of 6112.4 'verify emitted+omitted == all': 
+	git -C r1 rev-list --objects HEAD >revs &&
+	awk -f print_1.awk revs |
+	sort >expected &&
+
+	git -C r1 rev-list --objects --filter-print-omitted --filter=blob:none \
+		HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 4 - verify emitted+omitted == all
+
+expecting success of 6112.5 '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.45.2/t/trash directory.t6112-rev-list-filters-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 5 - setup r2
+
+expecting success of 6112.6 'verify blob:limit=500 omits all blobs': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
+
+	git -C r2 rev-list --quiet --objects --filter-print-omitted \
+		--filter=blob:limit=500 HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 6 - verify blob:limit=500 omits all blobs
+
+expecting success of 6112.7 'verify emitted+omitted == all': 
+	git -C r2 rev-list --objects HEAD >revs &&
+	awk -f print_1.awk revs |
+	sort >expected &&
+
+	git -C r2 rev-list --objects --filter-print-omitted \
+		--filter=blob:limit=500 HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 7 - verify emitted+omitted == all
+
+expecting success of 6112.8 'verify blob:limit=1000': 
+	git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
+
+	git -C r2 rev-list --quiet --objects --filter-print-omitted \
+		--filter=blob:limit=1000 HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 8 - verify blob:limit=1000
+
+expecting success of 6112.9 'verify blob:limit=1001': 
+	git -C r2 ls-files -s large.10000 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
+
+	git -C r2 rev-list --quiet --objects --filter-print-omitted \
+		--filter=blob:limit=1001 HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 9 - verify blob:limit=1001
+
+expecting success of 6112.10 'verify blob:limit=1k': 
+	git -C r2 ls-files -s large.10000 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
+
+	git -C r2 rev-list --quiet --objects --filter-print-omitted \
+		--filter=blob:limit=1k HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 10 - verify blob:limit=1k
+
+expecting success of 6112.11 'verify blob:limit=1m': 
+	git -C r2 rev-list --quiet --objects --filter-print-omitted \
+		--filter=blob:limit=1m HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_must_be_empty observed
+
+ok 11 - verify blob:limit=1m
+
+expecting success of 6112.12 'setup object-type': 
+	test_create_repo object-type &&
+	test_commit --no-tag -C object-type message blob &&
+	git -C object-type tag tag -m tag-message
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/object-type/.git/
+[main (root-commit) 667f9c5] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 blob
+ok 12 - setup object-type
+
+expecting success of 6112.13 'verify object:type= fails with invalid type': 
+	test_must_fail git -C object-type rev-list --objects --filter=object:type= HEAD &&
+	test_must_fail git -C object-type rev-list --objects --filter=object:type=invalid HEAD
+
+fatal: '' for 'object:type=<type>' is not a valid object type
+fatal: 'invalid' for 'object:type=<type>' is not a valid object type
+ok 13 - verify object:type= fails with invalid type
+
+expecting success of 6112.14 'verify object:type=blob prints blob and commit': 
+	git -C object-type rev-parse HEAD >expected &&
+	printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob) >>expected &&
+	git -C object-type rev-list --objects --filter=object:type=blob HEAD >actual &&
+	test_cmp expected actual
+
+ok 14 - verify object:type=blob prints blob and commit
+
+expecting success of 6112.15 'verify object:type=tree prints tree and commit': 
+	(
+		git -C object-type rev-parse HEAD &&
+		printf "%s \n" $(git -C object-type rev-parse HEAD^{tree})
+	) >expected &&
+	git -C object-type rev-list --objects --filter=object:type=tree HEAD >actual &&
+	test_cmp expected actual
+
+ok 15 - verify object:type=tree prints tree and commit
+
+expecting success of 6112.16 'verify object:type=commit prints commit': 
+	git -C object-type rev-parse HEAD >expected &&
+	git -C object-type rev-list --objects --filter=object:type=commit HEAD >actual &&
+	test_cmp expected actual
+
+ok 16 - verify object:type=commit prints commit
+
+expecting success of 6112.17 'verify object:type=tag prints tag': 
+	(
+		git -C object-type rev-parse HEAD &&
+		printf "%s tag\n" $(git -C object-type rev-parse tag)
+	) >expected &&
+	git -C object-type rev-list --objects --filter=object:type=tag tag >actual &&
+	test_cmp expected actual
+
+ok 17 - verify object:type=tag prints tag
+
+expecting success of 6112.18 'verify object:type=blob prints only blob with --filter-provided-objects': 
+	printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob) >expected &&
+	git -C object-type rev-list --objects \
+		--filter=object:type=blob --filter-provided-objects HEAD >actual &&
+	test_cmp expected actual
+
+ok 18 - verify object:type=blob prints only blob with --filter-provided-objects
+
+expecting success of 6112.19 'verify object:type=tree prints only tree with --filter-provided-objects': 
+	printf "%s \n" $(git -C object-type rev-parse HEAD^{tree}) >expected &&
+	git -C object-type rev-list --objects \
+		--filter=object:type=tree HEAD --filter-provided-objects >actual &&
+	test_cmp expected actual
+
+ok 19 - verify object:type=tree prints only tree with --filter-provided-objects
+
+expecting success of 6112.20 'verify object:type=commit prints only commit with --filter-provided-objects': 
+	git -C object-type rev-parse HEAD >expected &&
+	git -C object-type rev-list --objects \
+		--filter=object:type=commit --filter-provided-objects HEAD >actual &&
+	test_cmp expected actual
+
+ok 20 - verify object:type=commit prints only commit with --filter-provided-objects
+
+expecting success of 6112.21 'verify object:type=tag prints only tag with --filter-provided-objects': 
+	printf "%s tag\n" $(git -C object-type rev-parse tag) >expected &&
+	git -C object-type rev-list --objects \
+		--filter=object:type=tag --filter-provided-objects tag >actual &&
+	test_cmp expected actual
+
+ok 21 - verify object:type=tag prints only tag with --filter-provided-objects
+
+expecting success of 6112.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.45.2/t/trash directory.t6112-rev-list-filters-objects/r3/.git/
+[main (root-commit) c6d9eba] 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 6112.23 'verify sparse:path=pattern1 fails': 
+	test_must_fail git -C r3 rev-list --quiet --objects \
+		--filter-print-omitted --filter=sparse:path=../pattern1 HEAD
+
+fatal: sparse:path filters support has been dropped
+ok 23 - verify sparse:path=pattern1 fails
+
+expecting success of 6112.24 'verify sparse:path=pattern2 fails': 
+	test_must_fail git -C r3 rev-list --quiet --objects \
+		--filter-print-omitted --filter=sparse:path=../pattern2 HEAD
+
+fatal: sparse:path filters support has been dropped
+ok 24 - verify sparse:path=pattern2 fails
+
+expecting success of 6112.25 'setup r3 part 2': 
+	echo dir1/ >r3/pattern &&
+	git -C r3 add pattern &&
+	git -C r3 commit -m "pattern"
+
+[main 819b47c] pattern
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pattern
+ok 25 - setup r3 part 2
+
+expecting success of 6112.26 'verify sparse:oid=OID omits top-level files': 
+	git -C r3 ls-files -s pattern sparse1 sparse2 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
+
+	oid=$(git -C r3 ls-files -s pattern | awk -f print_2.awk) &&
+
+	git -C r3 rev-list --quiet --objects --filter-print-omitted \
+		--filter=sparse:oid=$oid HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 26 - verify sparse:oid=OID omits top-level files
+
+expecting success of 6112.27 'verify sparse:oid=oid-ish omits top-level files': 
+	git -C r3 ls-files -s pattern sparse1 sparse2 >ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
+
+	git -C r3 rev-list --quiet --objects --filter-print-omitted \
+		--filter=sparse:oid=main:pattern HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/~//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 27 - verify sparse:oid=oid-ish omits top-level files
+
+expecting success of 6112.28 'rev-list W/ --missing=print and --missing=allow-any for trees': 
+	TREE=$(git -C r3 rev-parse HEAD:dir1) &&
+
+	# Create a spare repo because we will be deleting objects from this one.
+	git clone r3 r3.b &&
+
+	rm r3.b/.git/objects/$(echo $TREE | sed "s|^..|&/|") &&
+
+	git -C r3.b rev-list --quiet --missing=print --objects HEAD \
+		>missing_objs 2>rev_list_err &&
+	echo "?$TREE" >expected &&
+	test_cmp expected missing_objs &&
+
+	# do not complain when a missing tree cannot be parsed
+	test_must_be_empty rev_list_err &&
+
+	git -C r3.b rev-list --missing=allow-any --objects HEAD \
+		>objs 2>rev_list_err &&
+	! grep $TREE objs &&
+	test_must_be_empty rev_list_err
+
+Cloning into 'r3.b'...
+done.
+ok 28 - rev-list W/ --missing=print and --missing=allow-any for trees
+
+expecting success of 6112.29 'verify tree:0 includes trees in "filtered" output': 
+	git -C r3 rev-list --quiet --objects --filter-print-omitted \
+		--filter=tree:0 HEAD >revs &&
+
+	awk -f print_1.awk revs |
+	sed s/~// |
+	xargs -n1 git -C r3 cat-file -t >unsorted_filtered_types &&
+
+	sort -u unsorted_filtered_types >filtered_types &&
+	test_write_lines blob tree >expected &&
+	test_cmp expected filtered_types
+
+ok 29 - verify tree:0 includes trees in "filtered" output
+
+expecting success of 6112.30 'verify skipping tree iteration when not collecting omits': 
+	GIT_TRACE=1 git -C r3 rev-list \
+		--objects --filter=tree:0 HEAD 2>filter_trace &&
+	grep "Skipping contents of tree [.][.][.]" filter_trace >actual &&
+	# One line for each commit traversed.
+	test_line_count = 2 actual &&
+
+	# Make sure no other trees were considered besides the root.
+	! grep "Skipping contents of tree [^.]" filter_trace &&
+
+	# Try this again with "combine:". If both sub-filters are skipping
+	# trees, the composite filter should also skip trees. This is not
+	# important unless the user does combine:tree:X+tree:Y or another filter
+	# besides "tree:" is implemented in the future which can skip trees.
+	GIT_TRACE=1 git -C r3 rev-list \
+		--objects --filter=combine:tree:1+tree:3 HEAD 2>filter_trace &&
+
+	# Only skip the dir1/ tree, which is shared between the two commits.
+	grep "Skipping contents of tree " filter_trace >actual &&
+	test_write_lines "Skipping contents of tree dir1/..." >expected &&
+	test_cmp expected actual
+
+819b47c296d74a3901e11da74f4dce17d7857650
+c6d9eba8e5d370e16f4d49d7e6e58da52c1f73a8
+819b47c296d74a3901e11da74f4dce17d7857650
+c6d9eba8e5d370e16f4d49d7e6e58da52c1f73a8
+c87d0a60ab3e9c39852baa3d603a61217d40e22d 
+3893fc5e03af47544851c43293284679cd419b5b 
+ok 30 - verify skipping tree iteration when not collecting omits
+
+expecting success of 6112.31 'verify tree:1 includes root trees': 
+	git -C r3 rev-list --objects --filter=tree:1 HEAD >actual &&
+
+	# We should get two root directories and two commits.
+	expect_has HEAD "" &&
+	expect_has HEAD~1 ""  &&
+	test_line_count = 4 actual
+
+c87d0a60ab3e9c39852baa3d603a61217d40e22d 
+3893fc5e03af47544851c43293284679cd419b5b 
+ok 31 - verify tree:1 includes root trees
+
+expecting success of 6112.32 'verify tree:2 includes root trees and immediate children': 
+	git -C r3 rev-list --objects --filter=tree:2 HEAD >actual &&
+
+	expect_has HEAD "" &&
+	expect_has HEAD~1 "" &&
+	expect_has HEAD dir1 &&
+	expect_has HEAD pattern &&
+	expect_has HEAD sparse1 &&
+	expect_has HEAD sparse2 &&
+
+	# There are also 2 commit objects
+	test_line_count = 8 actual
+
+c87d0a60ab3e9c39852baa3d603a61217d40e22d 
+3893fc5e03af47544851c43293284679cd419b5b 
+7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
+09b067cf80607fe0e4fa713babca9fd9939077dd pattern
+0b432f4900db0d72f719347ebf446d97a8de793b sparse1
+2cc3ed6c8b26d9cf6e92fdbef61b61f26068a554 sparse2
+ok 32 - verify tree:2 includes root trees and immediate children
+
+expecting success of 6112.33 'verify tree:3 includes everything expected': 
+	git -C r3 rev-list --objects --filter=tree:3 HEAD >actual &&
+
+	expect_has HEAD "" &&
+	expect_has HEAD~1 "" &&
+	expect_has HEAD dir1 &&
+	expect_has HEAD dir1/sparse1 &&
+	expect_has HEAD dir1/sparse2 &&
+	expect_has HEAD pattern &&
+	expect_has HEAD sparse1 &&
+	expect_has HEAD sparse2 &&
+
+	# There are also 2 commit objects
+	test_line_count = 10 actual
+
+c87d0a60ab3e9c39852baa3d603a61217d40e22d 
+3893fc5e03af47544851c43293284679cd419b5b 
+7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
+40dffed725389f7a2be11e2a3ac34f878d767cdf dir1/sparse1
+b1d6d0f3744cb998a08e4bbbd93b4e20aaf8fbe3 dir1/sparse2
+09b067cf80607fe0e4fa713babca9fd9939077dd pattern
+0b432f4900db0d72f719347ebf446d97a8de793b sparse1
+2cc3ed6c8b26d9cf6e92fdbef61b61f26068a554 sparse2
+ok 33 - verify tree:3 includes everything expected
+
+expecting success of 6112.34 'combine:... for a simple combination': 
+	git -C r3 rev-list --objects --filter=combine:tree:2+blob:none HEAD \
+		>actual &&
+
+	expect_has HEAD "" &&
+	expect_has HEAD~1 "" &&
+	expect_has HEAD dir1 &&
+
+	# There are also 2 commit objects
+	test_line_count = 5 actual &&
+
+	cp actual expected &&
+
+	# Try again using repeated --filter - this is equivalent to a manual
+	# combine with "combine:...+..."
+	git -C r3 rev-list --objects --filter=combine:tree:2 \
+		--filter=blob:none HEAD >actual &&
+
+	test_cmp expected actual
+
+c87d0a60ab3e9c39852baa3d603a61217d40e22d 
+3893fc5e03af47544851c43293284679cd419b5b 
+7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
+ok 34 - combine:... for a simple combination
+
+expecting success of 6112.35 'combine:... with URL encoding': 
+	git -C r3 rev-list --objects \
+		--filter=combine:tree%3a2+blob:%6Eon%65 HEAD >actual &&
+
+	expect_has HEAD "" &&
+	expect_has HEAD~1 "" &&
+	expect_has HEAD dir1 &&
+
+	# There are also 2 commit objects
+	test_line_count = 5 actual
+
+c87d0a60ab3e9c39852baa3d603a61217d40e22d 
+3893fc5e03af47544851c43293284679cd419b5b 
+7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
+ok 35 - combine:... with URL encoding
+
+expecting success of 6112.36 'combine:... while URL-encoding things that should not be': 
+	expect_invalid_filter_spec combine%3Atree:2+blob:none \
+		"invalid filter-spec"
+
+fatal: invalid filter-spec 'combine%3Atree:2+blob:none'
+ok 36 - combine:... while URL-encoding things that should not be
+
+expecting success of 6112.37 'combine: with nothing after the :': 
+	expect_invalid_filter_spec combine: "expected something after combine:"
+
+fatal: expected something after combine:
+ok 37 - combine: with nothing after the :
+
+expecting success of 6112.38 'parse error in first sub-filter in combine:': 
+	expect_invalid_filter_spec combine:tree:asdf+blob:none \
+		"expected .tree:<depth>."
+
+fatal: expected 'tree:<depth>'
+ok 38 - parse error in first sub-filter in combine:
+
+expecting success of 6112.39 'combine:... with non-encoded reserved chars': 
+	expect_invalid_filter_spec combine:tree:2+sparse:@xyz \
+		"must escape char in sub-filter-spec: .@." &&
+	expect_invalid_filter_spec combine:tree:2+sparse:\` \
+		"must escape char in sub-filter-spec: .\`." &&
+	expect_invalid_filter_spec combine:tree:2+sparse:~abc \
+		"must escape char in sub-filter-spec: .\~."
+
+fatal: must escape char in sub-filter-spec: '@'
+fatal: must escape char in sub-filter-spec: '`'
+fatal: must escape char in sub-filter-spec: '~'
+ok 39 - combine:... with non-encoded reserved chars
+
+expecting success of 6112.40 'validate err msg for "combine:<valid-filter>+"': 
+	expect_invalid_filter_spec combine:tree:2+ "expected .tree:<depth>."
+
+fatal: expected 'tree:<depth>'
+ok 40 - validate err msg for "combine:<valid-filter>+"
+
+expecting success of 6112.41 'combine:... with edge-case hex digits: Ff Aa 0 9': 
+	git -C r3 rev-list --objects --filter="combine:tree:2+bl%6Fb:n%6fne" \
+		HEAD >actual &&
+	test_line_count = 5 actual &&
+	git -C r3 rev-list --objects --filter="combine:tree%3A2+blob%3anone" \
+		HEAD >actual &&
+	test_line_count = 5 actual &&
+	git -C r3 rev-list --objects --filter="combine:tree:%30" HEAD >actual &&
+	test_line_count = 2 actual &&
+	git -C r3 rev-list --objects --filter="combine:tree:%39+blob:none" \
+		HEAD >actual &&
+	test_line_count = 5 actual
+
+ok 41 - combine:... with edge-case hex digits: Ff Aa 0 9
+
+expecting success of 6112.42 'add sparse pattern blobs whose paths have reserved chars': 
+	cp r3/pattern r3/pattern1+renamed% &&
+	cp r3/pattern "r3/p;at%ter+n" &&
+	cp r3/pattern r3/^~pattern &&
+	git -C r3 add pattern1+renamed% "p;at%ter+n" ^~pattern &&
+	git -C r3 commit -m "add sparse pattern files with reserved chars"
+
+[main 5962055] add sparse pattern files with reserved chars
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 ^~pattern
+ create mode 100644 p;at%ter+n
+ create mode 100644 pattern1+renamed%
+ok 42 - add sparse pattern blobs whose paths have reserved chars
+
+expecting success of 6112.43 'combine:... with more than two sub-filters': 
+	git -C r3 rev-list --objects \
+		--filter=combine:tree:3+blob:limit=40+sparse:oid=main:pattern \
+		HEAD >actual &&
+
+	expect_has HEAD "" &&
+	expect_has HEAD~1 "" &&
+	expect_has HEAD~2 "" &&
+	expect_has HEAD dir1 &&
+	expect_has HEAD dir1/sparse1 &&
+	expect_has HEAD dir1/sparse2 &&
+
+	# Should also have 3 commits
+	test_line_count = 9 actual &&
+
+	# Try again, this time making sure the last sub-filter is only
+	# URL-decoded once.
+	cp actual expect &&
+
+	git -C r3 rev-list --objects \
+		--filter=combine:tree:3+blob:limit=40+sparse:oid=main:pattern1%2brenamed%25 \
+		HEAD >actual &&
+	test_cmp expect actual &&
+
+	# Use the same composite filter again, but with a pattern file name that
+	# requires encoding multiple characters, and use implicit filter
+	# combining.
+	test_when_finished "rm -f trace1" &&
+	GIT_TRACE=$(pwd)/trace1 git -C r3 rev-list --objects \
+		--filter=tree:3 --filter=blob:limit=40 \
+		--filter=sparse:oid="main:p;at%ter+n" \
+		HEAD >actual &&
+
+	test_cmp expect actual &&
+	grep "Add to combine filter-spec: sparse:oid=main:p%3bat%25ter%2bn" \
+		trace1 &&
+
+	# Repeat the above test, but this time, the characters to encode are in
+	# the LHS of the combined filter.
+	test_when_finished "rm -f trace2" &&
+	GIT_TRACE=$(pwd)/trace2 git -C r3 rev-list --objects \
+		--filter=sparse:oid=main:^~pattern \
+		--filter=tree:3 --filter=blob:limit=40 \
+		HEAD >actual &&
+
+	test_cmp expect actual &&
+	grep "Add to combine filter-spec: sparse:oid=main:%5e%7epattern" \
+		trace2
+
+9e0b8354abd113bca99cb72fa47c8e22018f84cf 
+c87d0a60ab3e9c39852baa3d603a61217d40e22d 
+3893fc5e03af47544851c43293284679cd419b5b 
+7fb8905c4b5f7b3f55b0b3fc90d88bec9f49eab1 dir1
+40dffed725389f7a2be11e2a3ac34f878d767cdf dir1/sparse1
+b1d6d0f3744cb998a08e4bbbd93b4e20aaf8fbe3 dir1/sparse2
+Add to combine filter-spec: sparse:oid=main:p%3bat%25ter%2bn
+Add to combine filter-spec: sparse:oid=main:%5e%7epattern
+ok 43 - combine:... with more than two sub-filters
+
+expecting success of 6112.44 'setup r4': 
+	git init r4 &&
+
+	echo foo > r4/foo &&
+	mkdir r4/subdir &&
+	echo bar > r4/subdir/bar &&
+
+	mkdir r4/filt &&
+	cp -r r4/foo r4/subdir r4/filt &&
+
+	git -C r4 add foo subdir filt &&
+	git -C r4 commit -m "commit msg"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/r4/.git/
+[main (root-commit) cde7f52] commit msg
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 filt/foo
+ create mode 100644 filt/subdir/bar
+ create mode 100644 foo
+ create mode 100644 subdir/bar
+ok 44 - setup r4
+
+expecting success of 6112.45 'test tree:# filter provisional omit for blob and tree': 
+	git -C r4 rev-list --objects --filter-print-omitted --filter=tree:2 \
+		HEAD >actual &&
+	expect_has_with_different_name r4 filt/foo &&
+	expect_has_with_different_name r4 filt/subdir
+
+257cc5642cb1a054f08cc83f2d943e56fd3ebe99 foo
+ee314a31b622b027c10981acaed7903a3607dbd4 subdir
+ok 45 - test tree:# filter provisional omit for blob and tree
+
+expecting success of 6112.46 'verify skipping tree iteration when collecting omits': 
+	GIT_TRACE=1 git -C r4 rev-list --filter-print-omitted \
+		--objects --filter=tree:0 HEAD 2>filter_trace &&
+	grep "^Skipping contents of tree " filter_trace >actual &&
+
+	echo "Skipping contents of tree subdir/..." >expect &&
+	test_cmp expect actual
+
+cde7f52c36fbf3baf928c2af5ef7f98c0289d8bb
+~d78556fc6f1bfbd95227fadba9ed6515b2e10d55
+~5716ca5987cbf97d6bb54920bea6adde242d87e6
+~ee314a31b622b027c10981acaed7903a3607dbd4
+~efb93ecccaaa415ab7f4a10a9de4acb792b002d0
+~257cc5642cb1a054f08cc83f2d943e56fd3ebe99
+ok 46 - verify skipping tree iteration when collecting omits
+
+expecting success of 6112.47 'setup r5': 
+	git init r5 &&
+	mkdir -p r5/subdir &&
+
+	echo 1     >r5/short-root          &&
+	echo 12345 >r5/long-root           &&
+	echo a     >r5/subdir/short-subdir &&
+	echo abcde >r5/subdir/long-subdir  &&
+
+	git -C r5 add short-root long-root subdir &&
+	git -C r5 commit -m "commit msg"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/r5/.git/
+[main (root-commit) ff8baac] commit msg
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 long-root
+ create mode 100644 short-root
+ create mode 100644 subdir/long-subdir
+ create mode 100644 subdir/short-subdir
+ok 47 - setup r5
+
+expecting success of 6112.48 'verify collecting omits in combined: filter': 
+	# Note that this test guards against the naive implementation of simply
+	# giving both filters the same "omits" set and expecting it to
+	# automatically merge them.
+	git -C r5 rev-list --objects --quiet --filter-print-omitted \
+		--filter=combine:tree:2+blob:limit=3 HEAD >actual &&
+
+	# Expect 0 trees/commits, 3 blobs omitted (all blobs except short-root)
+	omitted_1=$(echo 12345 | git hash-object --stdin) &&
+	omitted_2=$(echo a     | git hash-object --stdin) &&
+	omitted_3=$(echo abcde | git hash-object --stdin) &&
+
+	grep ~$omitted_1 actual &&
+	grep ~$omitted_2 actual &&
+	grep ~$omitted_3 actual &&
+	test_line_count = 3 actual
+
+~e56e15bb7ddb6bd0b6d924b18fcee53d8713d7ea
+~78981922613b2afb6025042ff6bd878ac1994e85
+~00dedf6bd5f3e493ce8b03c889912f47b01297d4
+ok 48 - verify collecting omits in combined: filter
+
+expecting success of 6112.49 'tree:<depth> where we iterate over tree at two levels': 
+	git init r5 &&
+
+	mkdir -p r5/a/subdir/b &&
+	echo foo > r5/a/subdir/b/foo &&
+
+	mkdir -p r5/subdir/b &&
+	echo foo > r5/subdir/b/foo &&
+
+	git -C r5 add a subdir &&
+	git -C r5 commit -m "commit msg" &&
+
+	git -C r5 rev-list --objects --filter=tree:4 HEAD >actual &&
+	expect_has_with_different_name r5 a/subdir/b/foo
+
+Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6112-rev-list-filters-objects/r5/.git/
+[main 8968c2f] commit msg
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 a/subdir/b/foo
+ create mode 100644 subdir/b/foo
+257cc5642cb1a054f08cc83f2d943e56fd3ebe99 subdir/b/foo
+ok 49 - tree:<depth> where we iterate over tree at two levels
+
+expecting success of 6112.50 'tree:<depth> which filters out blob but given as arg': 
+	blob_hash=$(git -C r4 rev-parse HEAD:subdir/bar) &&
+
+	git -C r4 rev-list --objects --filter=tree:1 HEAD $blob_hash >actual &&
+	grep ^$blob_hash actual
+
+5716ca5987cbf97d6bb54920bea6adde242d87e6 
+ok 50 - tree:<depth> which filters out blob but given as arg
+
+expecting success of 6112.51 'rev-list W/ --missing=print': 
+	git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+		>ls_files_result &&
+	awk -f print_2.awk ls_files_result |
+	sort >expected &&
+
+	for id in `sed "s|..|&/|" expected`
+	do
+		rm r1/.git/objects/$id || return 1
+	done &&
+
+	git -C r1 rev-list --quiet --missing=print --objects HEAD >revs &&
+	awk -f print_1.awk revs |
+	sed "s/?//" |
+	sort >observed &&
+
+	test_cmp expected observed
+
+ok 51 - rev-list W/ --missing=print
+
+expecting success of 6112.52 'rev-list W/O --missing fails': 
+	test_must_fail git -C r1 rev-list --quiet --objects HEAD
+
+fatal: missing blob object '54ff69bde100bd29db945c2fc62010675d3b5b14'
+ok 52 - rev-list W/O --missing fails
+
+expecting success of 6112.53 'rev-list W/ missing=allow-any': 
+	git -C r1 rev-list --quiet --missing=allow-any --objects HEAD
+
+ok 53 - rev-list W/ missing=allow-any
+
+expecting success of 6112.54 'expand blob limit in protocol': 
+	git -C r2 config --local uploadpack.allowfilter 1 &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 clone \
+		--filter=blob:limit=1k "file://$(pwd)/r2" limit &&
+	! grep "blob:limit=1k" trace &&
+	grep "blob:limit=1024" trace
+
+Cloning into 'limit'...
+packet:        clone> filter blob:limit=1024
+packet:  upload-pack< filter blob:limit=1024
+ok 54 - expand blob limit in protocol
+
+# passed all 54 test(s)
+1..54
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6115-rev-list-du.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6115-rev-list-du/.git/
+expecting success of 6115.1 'set up repository': 
+	test_commit --no-tag one &&
+	test_commit --no-tag two &&
+	git repack -adb &&
+	git reset --hard HEAD^ &&
+	test_commit --no-tag three &&
+	test_commit --no-tag four &&
+	git reset --hard HEAD^
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+HEAD is now at d79ce16 one
+[master 897c206] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+[master 6f2ec4d] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+HEAD is now at 897c206 three
+ok 1 - set up repository
+
+expecting success of 6115.2 'generate expected size (HEAD)': 
+		disk_usage_slow HEAD >expect
+	
+ok 2 - generate expected size (HEAD)
+
+expecting success of 6115.3 'rev-list --disk-usage without bitmaps (HEAD)': 
+		git rev-list --disk-usage HEAD >actual &&
+		test_cmp expect actual
+	
+ok 3 - rev-list --disk-usage without bitmaps (HEAD)
+
+expecting success of 6115.4 'rev-list --disk-usage with bitmaps (HEAD)': 
+		git rev-list --disk-usage --use-bitmap-index HEAD >actual &&
+		test_cmp expect actual
+	
+ok 4 - rev-list --disk-usage with bitmaps (HEAD)
+
+expecting success of 6115.5 'generate expected size (--objects HEAD)': 
+		disk_usage_slow --objects HEAD >expect
+	
+ok 5 - generate expected size (--objects HEAD)
+
+expecting success of 6115.6 'rev-list --disk-usage without bitmaps (--objects HEAD)': 
+		git rev-list --disk-usage --objects HEAD >actual &&
+		test_cmp expect actual
+	
+ok 6 - rev-list --disk-usage without bitmaps (--objects HEAD)
+
+expecting success of 6115.7 'rev-list --disk-usage with bitmaps (--objects HEAD)': 
+		git rev-list --disk-usage --use-bitmap-index --objects HEAD >actual &&
+		test_cmp expect actual
+	
+ok 7 - rev-list --disk-usage with bitmaps (--objects HEAD)
+
+expecting success of 6115.8 'generate expected size (--objects HEAD^..HEAD)': 
+		disk_usage_slow --objects HEAD^..HEAD >expect
+	
+ok 8 - generate expected size (--objects HEAD^..HEAD)
+
+expecting success of 6115.9 'rev-list --disk-usage without bitmaps (--objects HEAD^..HEAD)': 
+		git rev-list --disk-usage --objects HEAD^..HEAD >actual &&
+		test_cmp expect actual
+	
+ok 9 - rev-list --disk-usage without bitmaps (--objects HEAD^..HEAD)
+
+expecting success of 6115.10 'rev-list --disk-usage with bitmaps (--objects HEAD^..HEAD)': 
+		git rev-list --disk-usage --use-bitmap-index --objects HEAD^..HEAD >actual &&
+		test_cmp expect actual
+	
+ok 10 - rev-list --disk-usage with bitmaps (--objects HEAD^..HEAD)
+
+expecting success of 6115.11 'setup for --unpacked tests': 
+	git repack -adb &&
+	test_commit unpacked
+
+[master 76e469a] unpacked
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unpacked.t
+ok 11 - setup for --unpacked tests
+
+expecting success of 6115.12 'generate expected size (--all --objects --unpacked)': 
+		disk_usage_slow --all --objects --unpacked >expect
+	
+ok 12 - generate expected size (--all --objects --unpacked)
+
+expecting success of 6115.13 'rev-list --disk-usage without bitmaps (--all --objects --unpacked)': 
+		git rev-list --disk-usage --all --objects --unpacked >actual &&
+		test_cmp expect actual
+	
+ok 13 - rev-list --disk-usage without bitmaps (--all --objects --unpacked)
+
+expecting success of 6115.14 'rev-list --disk-usage with bitmaps (--all --objects --unpacked)': 
+		git rev-list --disk-usage --use-bitmap-index --all --objects --unpacked >actual &&
+		test_cmp expect actual
+	
+ok 14 - rev-list --disk-usage with bitmaps (--all --objects --unpacked)
+
+expecting success of 6115.15 'rev-list --disk-usage=human': 
+	git rev-list --objects HEAD --disk-usage=human >actual &&
+	disk_usage_slow --objects HEAD >actual_size &&
+	grep "$(cat actual_size) bytes" actual
+
+733 bytes
+ok 15 - rev-list --disk-usage=human
+
+expecting success of 6115.16 'rev-list --disk-usage=human with bitmaps': 
+	git rev-list --objects HEAD --use-bitmap-index --disk-usage=human >actual &&
+	disk_usage_slow --objects HEAD >actual_size &&
+	grep "$(cat actual_size) bytes" actual
+
+733 bytes
+ok 16 - rev-list --disk-usage=human with bitmaps
+
+expecting success of 6115.17 'rev-list use --disk-usage unproperly': 
+	test_must_fail git rev-list --objects HEAD --disk-usage=typo 2>err &&
+	cat >expect <<-\EOF &&
+	fatal: invalid value for '--disk-usage=<format>': 'typo', the only allowed format is 'human'
+	EOF
+	test_cmp err expect
+
+ok 17 - rev-list use --disk-usage unproperly
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6130-pathspec-noglob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6130-pathspec-noglob/.git/
+expecting success of 6130.1 'create commits with glob characters': 
+	test_commit unrelated bar &&
+	test_commit vanilla foo &&
+	# insert file "f*" in the commit, but in a way that avoids
+	# the name "f*" in the worktree, because it is not allowed
+	# on Windows (the tests below do not depend on the presence
+	# of the file in the worktree)
+	git config core.protectNTFS false &&
+	git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
+	test_tick &&
+	git commit -m star &&
+	test_commit bracket "f[o][o]"
+
+[master (root-commit) f600089] unrelated
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[master 065b8fa] vanilla
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+[master 306e39a] star
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f*
+[master 48b9afb] bracket
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 f[o][o]
+ok 1 - create commits with glob characters
+
+expecting success of 6130.2 'vanilla pathspec matches literally': 
+	echo vanilla >expect &&
+	git log --format=%s -- foo >actual &&
+	test_cmp expect actual
+
+ok 2 - vanilla pathspec matches literally
+
+expecting success of 6130.3 'star pathspec globs': 
+	cat >expect <<-\EOF &&
+	bracket
+	star
+	vanilla
+	EOF
+	git log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
+
+ok 3 - star pathspec globs
+
+expecting success of 6130.4 'star pathspec globs': 
+	cat >expect <<-\EOF &&
+	bracket
+	star
+	vanilla
+	EOF
+	git log --format=%s -- ":(glob)f*" >actual &&
+	test_cmp expect actual
+
+ok 4 - star pathspec globs
+
+expecting success of 6130.5 'bracket pathspec globs and matches literal brackets': 
+	cat >expect <<-\EOF &&
+	bracket
+	vanilla
+	EOF
+	git log --format=%s -- "f[o][o]" >actual &&
+	test_cmp expect actual
+
+ok 5 - bracket pathspec globs and matches literal brackets
+
+expecting success of 6130.6 'bracket pathspec globs and matches literal brackets': 
+	cat >expect <<-\EOF &&
+	bracket
+	vanilla
+	EOF
+	git log --format=%s -- ":(glob)f[o][o]" >actual &&
+	test_cmp expect actual
+
+ok 6 - bracket pathspec globs and matches literal brackets
+
+expecting success of 6130.7 'no-glob option matches literally (vanilla)': 
+	echo vanilla >expect &&
+	git --literal-pathspecs log --format=%s -- foo >actual &&
+	test_cmp expect actual
+
+ok 7 - no-glob option matches literally (vanilla)
+
+expecting success of 6130.8 'no-glob option matches literally (vanilla)': 
+	echo vanilla >expect &&
+	git log --format=%s -- ":(literal)foo" >actual &&
+	test_cmp expect actual
+
+ok 8 - no-glob option matches literally (vanilla)
+
+expecting success of 6130.9 'no-glob option matches literally (star)': 
+	echo star >expect &&
+	git --literal-pathspecs log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
+
+ok 9 - no-glob option matches literally (star)
+
+expecting success of 6130.10 'no-glob option matches literally (star)': 
+	echo star >expect &&
+	git log --format=%s -- ":(literal)f*" >actual &&
+	test_cmp expect actual
+
+ok 10 - no-glob option matches literally (star)
+
+expecting success of 6130.11 'no-glob option matches literally (bracket)': 
+	echo bracket >expect &&
+	git --literal-pathspecs log --format=%s -- "f[o][o]" >actual &&
+	test_cmp expect actual
+
+ok 11 - no-glob option matches literally (bracket)
+
+expecting success of 6130.12 'no-glob option matches literally (bracket)': 
+	echo bracket >expect &&
+	git log --format=%s -- ":(literal)f[o][o]" >actual &&
+	test_cmp expect actual
+
+ok 12 - no-glob option matches literally (bracket)
+
+expecting success of 6130.13 'no-glob option disables :(literal)': 
+	git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
+	test_must_be_empty actual
+
+ok 13 - no-glob option disables :(literal)
+
+expecting success of 6130.14 'no-glob environment variable works': 
+	echo star >expect &&
+	GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
+	test_cmp expect actual
+
+ok 14 - no-glob environment variable works
+
+expecting success of 6130.15 'blame takes global pathspec flags': 
+	git --literal-pathspecs blame -- foo &&
+	git --icase-pathspecs   blame -- foo &&
+	git --glob-pathspecs    blame -- foo &&
+	git --noglob-pathspecs  blame -- foo
+
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+065b8faf (A U Thor 2005-04-07 15:14:13 -0700 1) vanilla
+ok 15 - blame takes global pathspec flags
+
+expecting success of 6130.16 'setup xxx/bar': 
+	mkdir xxx &&
+	test_commit xxx xxx/bar
+
+[master 7cd4d15] xxx
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 xxx/bar
+ok 16 - setup xxx/bar
+
+expecting success of 6130.17 '**/ works with :(glob)': 
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git log --format=%s -- ":(glob)**/bar" >actual &&
+	test_cmp expect actual
+
+ok 17 - **/ works with :(glob)
+
+expecting success of 6130.18 '**/ does not work with --noglob-pathspecs': 
+	git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
+	test_must_be_empty actual
+
+ok 18 - **/ does not work with --noglob-pathspecs
+
+expecting success of 6130.19 '**/ works with :(glob) and --noglob-pathspecs': 
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git --noglob-pathspecs log --format=%s -- ":(glob)**/bar" >actual &&
+	test_cmp expect actual
+
+ok 19 - **/ works with :(glob) and --noglob-pathspecs
+
+expecting success of 6130.20 '**/ works with --glob-pathspecs': 
+	cat >expect <<-\EOF &&
+	xxx
+	unrelated
+	EOF
+	git --glob-pathspecs log --format=%s -- "**/bar" >actual &&
+	test_cmp expect actual
+
+ok 20 - **/ works with --glob-pathspecs
+
+expecting success of 6130.21 '**/ does not work with :(literal) and --glob-pathspecs': 
+	git --glob-pathspecs log --format=%s -- ":(literal)**/bar" >actual &&
+	test_must_be_empty actual
+
+ok 21 - **/ does not work with :(literal) and --glob-pathspecs
+
+# passed all 21 test(s)
+1..21
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6133-pathspec-rev-dwim.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6133-pathspec-rev-dwim/.git/
+expecting success of 6133.1 'setup': 
+	test_commit base &&
+	echo content >"br[ack]ets" &&
+	git add . &&
+	test_tick &&
+	git commit -m brackets
+
+[master (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[master 261aa52] brackets
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 br[ack]ets
+ok 1 - setup
+
+expecting success of 6133.2 'non-rev wildcard dwims to pathspec': 
+	git log -- "*.t" >expect &&
+	git log    "*.t" >actual &&
+	test_cmp expect actual
+
+ok 2 - non-rev wildcard dwims to pathspec
+
+expecting success of 6133.3 'tree:path with metacharacters dwims to rev': 
+	git show "HEAD:br[ack]ets" -- >expect &&
+	git show "HEAD:br[ack]ets"    >actual &&
+	test_cmp expect actual
+
+ok 3 - tree:path with metacharacters dwims to rev
+
+expecting success of 6133.4 '^{foo} with metacharacters dwims to rev': 
+	git log "HEAD^{/b.*}" -- >expect &&
+	git log "HEAD^{/b.*}"    >actual &&
+	test_cmp expect actual
+
+ok 4 - ^{foo} with metacharacters dwims to rev
+
+expecting success of 6133.5 '@{foo} with metacharacters dwims to rev': 
+	git log "HEAD@{now [or thereabouts]}" -- >expect &&
+	git log "HEAD@{now [or thereabouts]}"    >actual &&
+	test_cmp expect actual
+
+ok 5 - @{foo} with metacharacters dwims to rev
+
+expecting success of 6133.6 ':/*.t from a subdir dwims to a pathspec': 
+	mkdir subdir &&
+	(
+		cd subdir &&
+		git log -- ":/*.t" >expect &&
+		git log    ":/*.t" >actual &&
+		test_cmp expect actual
+	)
+
+ok 6 - :/*.t from a subdir dwims to a pathspec
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6131-pathspec-icase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6131-pathspec-icase/.git/
+checking prerequisite: CASE_INSENSITIVE_FS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+	echo good >CamelCase &&
+	echo bad >camelcase &&
+	test "$(cat CamelCase)" != good
+
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+expecting success of 6131.1 'create commits with glob characters': 
+	test_commit bar bar &&
+	test_commit bAr bAr &&
+	test_commit BAR BAR &&
+	mkdir foo &&
+	test_commit foo/bar foo/bar &&
+	test_commit foo/bAr foo/bAr &&
+	test_commit foo/BAR foo/BAR &&
+	mkdir fOo &&
+	test_commit fOo/bar fOo/bar &&
+	test_commit fOo/bAr fOo/bAr &&
+	test_commit fOo/BAR fOo/BAR &&
+	mkdir FOO &&
+	test_commit FOO/bar FOO/bar &&
+	test_commit FOO/bAr FOO/bAr &&
+	test_commit FOO/BAR FOO/BAR
+
+[master (root-commit) b257e7a] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[master 09d2e74] bAr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bAr
+[master ae27bbe] BAR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 BAR
+[master 016d22a] foo/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bar
+[master f3c37ed] foo/bAr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/bAr
+[master 98eb41e] foo/BAR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo/BAR
+[master edcb5cb] fOo/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fOo/bar
+[master ed5b100] fOo/bAr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fOo/bAr
+[master 2f49636] fOo/BAR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fOo/BAR
+[master c65ab92] FOO/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 FOO/bar
+[master cd48380] FOO/bAr
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 FOO/bAr
+[master 4e818f3] FOO/BAR
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 FOO/BAR
+ok 1 - create commits with glob characters
+
+expecting success of 6131.2 'tree_entry_interesting matches bar': 
+	echo bar >expect &&
+	git log --format=%s -- "bar" >actual &&
+	test_cmp expect actual
+
+ok 2 - tree_entry_interesting matches bar
+
+expecting success of 6131.3 'tree_entry_interesting matches :(icase)bar': 
+	cat <<-EOF >expect &&
+	BAR
+	bAr
+	bar
+	EOF
+	git log --format=%s -- ":(icase)bar" >actual &&
+	test_cmp expect actual
+
+ok 3 - tree_entry_interesting matches :(icase)bar
+
+expecting success of 6131.4 'tree_entry_interesting matches :(icase)bar with prefix': 
+	cat <<-EOF >expect &&
+	fOo/BAR
+	fOo/bAr
+	fOo/bar
+	EOF
+	( cd fOo && git log --format=%s -- ":(icase)bar" ) >actual &&
+	test_cmp expect actual
+
+ok 4 - tree_entry_interesting matches :(icase)bar with prefix
+
+expecting success of 6131.5 'tree_entry_interesting matches :(icase)bar with empty prefix': 
+	cat <<-EOF >expect &&
+	FOO/BAR
+	FOO/bAr
+	FOO/bar
+	fOo/BAR
+	fOo/bAr
+	fOo/bar
+	foo/BAR
+	foo/bAr
+	foo/bar
+	EOF
+	( cd fOo && git log --format=%s -- ":(icase)../foo/bar" ) >actual &&
+	test_cmp expect actual
+
+ok 5 - tree_entry_interesting matches :(icase)bar with empty prefix
+
+expecting success of 6131.6 'match_pathspec matches :(icase)bar': 
+	cat <<-EOF >expect &&
+	BAR
+	bAr
+	bar
+	EOF
+	git ls-files ":(icase)bar" >actual &&
+	test_cmp expect actual
+
+ok 6 - match_pathspec matches :(icase)bar
+
+expecting success of 6131.7 'match_pathspec matches :(icase)bar with prefix': 
+	cat <<-EOF >expect &&
+	fOo/BAR
+	fOo/bAr
+	fOo/bar
+	EOF
+	( cd fOo && git ls-files --full-name ":(icase)bar" ) >actual &&
+	test_cmp expect actual
+
+ok 7 - match_pathspec matches :(icase)bar with prefix
+
+expecting success of 6131.8 'match_pathspec matches :(icase)bar with empty prefix': 
+	cat <<-EOF >expect &&
+	bar
+	fOo/BAR
+	fOo/bAr
+	fOo/bar
+	EOF
+	( cd fOo && git ls-files --full-name ":(icase)bar" ../bar ) >actual &&
+	test_cmp expect actual
+
+ok 8 - match_pathspec matches :(icase)bar with empty prefix
+
+expecting success of 6131.9 '"git diff" can take magic :(icase) pathspec': 
+	echo FOO/BAR >expect &&
+	git diff --name-only HEAD^ HEAD -- ":(icase)foo/bar" >actual &&
+	test_cmp expect actual
+
+ok 9 - "git diff" can take magic :(icase) pathspec
+
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6134-pathspec-in-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6134-pathspec-in-submodule/.git/
 expecting success of 6134.1 'setup a submodule': 
@@ -398015,282 +399832,1157 @@
 label☺ is not a valid attribute name: .gitattributes:10
 ok 22 - check that attr magic works for git stash push
 
-expecting success of 6135.23 'check that attr magic works for git add --all': 
-	cat <<-\EOF >expect &&
-	sub/newFileA-foo
-	EOF
-	>sub/newFileA-foo &&
-	>sub/newFileB-foo &&
-	git add --all ":(exclude,attr:labelB)" &&
-	git diff --name-only --cached >actual &&
-	git restore -W -S . &&
-	test_cmp expect actual
+expecting success of 6135.23 'check that attr magic works for git add --all': 
+	cat <<-\EOF >expect &&
+	sub/newFileA-foo
+	EOF
+	>sub/newFileA-foo &&
+	>sub/newFileB-foo &&
+	git add --all ":(exclude,attr:labelB)" &&
+	git diff --name-only --cached >actual &&
+	git restore -W -S . &&
+	test_cmp expect actual
+
+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': 
+	cat <<-\EOF >expect &&
+	sub/fileA
+	EOF
+	>sub/newFileA-foo &&
+	>sub/newFileB-foo &&
+	>sub/fileA &&
+	>sub/fileB &&
+	git add -u ":(exclude,attr:labelB)" &&
+	git diff --name-only --cached  >actual &&
+	git restore -S -W . && rm sub/new* &&
+	test_cmp expect actual
+
+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 24 - check that attr magic works for git add -u
+
+expecting success of 6135.25 'check that attr magic works for git add <path>': 
+	cat <<-\EOF >expect &&
+	fileA
+	fileB
+	sub/fileA
+	EOF
+	>fileA &&
+	>fileB &&
+	>sub/fileA &&
+	>sub/fileB &&
+	git add ":(exclude,attr:labelB)sub/*" &&
+	git diff --name-only --cached >actual &&
+	git restore -S -W . &&
+	test_cmp expect actual
+
+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 25 - check that attr magic works for git add <path>
+
+expecting success of 6135.26 'check that attr magic works for git -add .': 
+	cat <<-\EOF >expect &&
+	sub/fileA
+	EOF
+	>fileA &&
+	>fileB &&
+	>sub/fileA &&
+	>sub/fileB &&
+	cd sub &&
+	git add . ":(exclude,attr:labelB)" &&
+	cd .. &&
+	git diff --name-only --cached >actual &&
+	git restore -S -W . &&
+	test_cmp expect actual
+
+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 26 - check that attr magic works for git -add .
+
+expecting success of 6135.27 'check that attr magic works for git add --pathspec-from-file': 
+	cat <<-\EOF >pathspec_file &&
+	:(exclude,attr:labelB)
+	EOF
+	cat <<-\EOF >expect &&
+	sub/newFileA-foo
+	EOF
+	>sub/newFileA-foo &&
+	>sub/newFileB-foo &&
+	git add --all --pathspec-from-file=pathspec_file &&
+	git diff --name-only --cached >actual &&
+	test_cmp expect actual
+
+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 27 - check that attr magic works for git add --pathspec-from-file
+
+expecting success of 6135.28 'abort on giving invalid label on the command line': 
+	test_must_fail git ls-files . ":(attr:☺)"
+
+fatal: invalid attribute name ☺
+ok 28 - abort on giving invalid label on the command line
+
+expecting success of 6135.29 'abort on asking for wrong magic': 
+	test_must_fail git ls-files . ":(attr:-label=foo)" &&
+	test_must_fail git ls-files . ":(attr:!label=foo)"
+
+fatal: invalid attribute name label=foo
+fatal: invalid attribute name label=foo
+ok 29 - abort on asking for wrong magic
+
+expecting success of 6135.30 'check attribute list': 
+	cat <<-EOF >>.gitattributes &&
+	* whitespace=indent,trail,space
+	EOF
+	git ls-files ":(attr:whitespace=indent\,trail\,space)" >actual &&
+	git ls-files >expect &&
+	test_cmp expect actual
+
+label☺ is not a valid attribute name: .gitattributes:10
+ok 30 - check attribute list
+
+expecting success of 6135.31 'backslash cannot be the last character': 
+	test_must_fail git ls-files ":(attr:label=foo\\ labelA=bar)" 2>actual &&
+	test_grep "not allowed as last character in attr value" actual
+
+fatal: Escape character '\' not allowed as last character in attr value
+ok 31 - backslash cannot be the last character
+
+expecting success of 6135.32 'backslash cannot be used as a value': 
+	test_must_fail git ls-files ":(attr:label=f\\\oo)" 2>actual &&
+	test_grep "for value matching" actual
+
+fatal: cannot use '\' for value matching
+ok 32 - backslash cannot be used as a value
+
+expecting success of 6135.33 'reading from .gitattributes in a subdirectory (1)': 
+	git ls-files ":(attr:label1)" >actual &&
+	test_write_lines "sub/fileSetLabel" >expect &&
+	test_cmp expect actual
+
+label☺ is not a valid attribute name: .gitattributes:10
+ok 33 - reading from .gitattributes in a subdirectory (1)
+
+expecting success of 6135.34 'reading from .gitattributes in a subdirectory (2)': 
+	git ls-files ":(attr:label1)sub" >actual &&
+	test_write_lines "sub/fileSetLabel" >expect &&
+	test_cmp expect actual
+
+label☺ is not a valid attribute name: .gitattributes:10
+ok 34 - reading from .gitattributes in a subdirectory (2)
+
+expecting success of 6135.35 'reading from .gitattributes in a subdirectory (3)': 
+	git ls-files ":(attr:label1)sub/" >actual &&
+	test_write_lines "sub/fileSetLabel" >expect &&
+	test_cmp expect actual
+
+label☺ is not a valid attribute name: .gitattributes:10
+ok 35 - reading from .gitattributes in a subdirectory (3)
+
+expecting success of 6135.36 'pathspec with builtin_objectmode attr can be used': 
+	>mode_exec_file_1 &&
+
+	git status -s ":(attr:builtin_objectmode=100644)mode_exec_*" >actual &&
+	echo ?? mode_exec_file_1 >expect &&
+	test_cmp expect actual &&
+
+	git add mode_exec_file_1 &&
+	chmod +x mode_exec_file_1 &&
+	git status -s ":(attr:builtin_objectmode=100755)mode_exec_*" >actual &&
+	echo AM mode_exec_file_1 >expect &&
+	test_cmp expect actual
+
+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
+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
+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': 
+	>mode_1_regular &&
+	>mode_1_exec  &&
+	chmod +x mode_1_exec &&
+	git status -s ":(exclude,attr:builtin_objectmode=100644)" "mode_1_*" >actual &&
+	echo ?? mode_1_exec >expect &&
+	test_cmp expect actual &&
+
+	git status -s ":(exclude,attr:builtin_objectmode=100755)" "mode_1_*" >actual &&
+	echo ?? mode_1_regular >expect &&
+	test_cmp expect actual
+
+label☺ is not a valid attribute name: .gitattributes:10
+label☺ is not a valid attribute name: .gitattributes:10
+label☺ is not a valid attribute name: .gitattributes:10
+label☺ is not a valid attribute name: .gitattributes:10
+ok 37 - builtin_objectmode attr can be excluded
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6301-for-each-ref-errors.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6301-for-each-ref-errors/.git/
+expecting success of 6301.1 'setup': 
+	MISSING=$(test_oid deadbeef) &&
+	git commit --allow-empty -m "Initial" &&
+	git tag testtag &&
+	git for-each-ref >full-list &&
+	git for-each-ref --format="%(objectname) %(refname)" >brief-list
+
+[master (root-commit) d31adcd] Initial
+ Author: A U Thor <author@example.com>
+ok 1 - setup
+
+expecting success of 6301.2 'Broken refs are reported correctly': 
+	r=refs/heads/bogus &&
+	: >.git/$r &&
+	test_when_finished "rm -f .git/$r" &&
+	echo "warning: ignoring broken ref $r" >broken-err &&
+	git for-each-ref >out 2>err &&
+	test_cmp full-list out &&
+	test_cmp broken-err err
+
+ok 2 - Broken refs are reported correctly
+
+expecting success of 6301.3 'NULL_SHA1 refs are reported correctly': 
+	r=refs/heads/zeros &&
+	echo $ZEROS >.git/$r &&
+	test_when_finished "rm -f .git/$r" &&
+	echo "warning: ignoring broken ref $r" >zeros-err &&
+	git for-each-ref >out 2>err &&
+	test_cmp full-list out &&
+	test_cmp zeros-err err &&
+	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
+	test_cmp brief-list brief-out &&
+	test_cmp zeros-err brief-err
+
+ok 3 - NULL_SHA1 refs are reported correctly
+
+expecting success of 6301.4 'Missing objects are reported correctly': 
+	test_when_finished "git update-ref -d refs/heads/missing" &&
+	test-tool ref-store main update-ref msg refs/heads/missing "$MISSING" "$ZERO_OID" REF_SKIP_OID_VERIFICATION &&
+	echo "fatal: missing object $MISSING for refs/heads/missing" >missing-err &&
+	test_must_fail git for-each-ref 2>err &&
+	test_cmp missing-err err &&
+	(
+		cat brief-list &&
+		echo "$MISSING refs/heads/missing"
+	) | sort -k 2 >missing-brief-expected &&
+	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
+	test_cmp missing-brief-expected brief-out &&
+	test_must_be_empty brief-err
+
+ok 4 - Missing objects are reported correctly
+
+expecting success of 6301.5 'ahead-behind requires an argument': 
+	test_must_fail git for-each-ref \
+		--format="%(ahead-behind)" 2>err &&
+	echo "fatal: expected format: %(ahead-behind:<committish>)" >expect &&
+	test_cmp expect err
+
+ok 5 - ahead-behind requires an argument
+
+expecting success of 6301.6 'missing ahead-behind base': 
+	test_must_fail git for-each-ref \
+		--format="%(ahead-behind:refs/heads/missing)" 2>err &&
+	echo "fatal: failed to find 'refs/heads/missing'" >expect &&
+	test_cmp expect err
+
+ok 6 - missing ahead-behind base
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6041-bisect-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/.git/
+expecting success of 6041.1 'git_bisect: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 3f6af83] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 27611a5 Base
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[09bcf53b0522b9fb95c5988105da6608927c3e4b] Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_bisect: added submodule creates empty directory
+
+expecting success of 6041.2 'git_bisect: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Switched to branch 'add_sub1'
+Your branch is up to date with 'origin/add_sub1'.
+[add_sub1 3f6af83] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 27611a5 Base
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[09bcf53b0522b9fb95c5988105da6608927c3e4b] Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_bisect: added submodule leaves existing empty directory alone
+
+expecting success of 6041.3 'git_bisect: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Switched to branch 'replace_file_with_sub1'
+Your branch is up to date with 'origin/replace_file_with_sub1'.
+[replace_file_with_sub1 3ac086b] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 2364f5a Replace sub1 with file
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[8b6fdfce32c1964fe2bd8ab0e22d81c1a2bb0726] Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_bisect: replace tracked file with submodule creates empty directory
+
+expecting success of 6041.4 'git_bisect: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Switched to branch 'replace_directory_with_sub1'
+Your branch is up to date with 'origin/replace_directory_with_sub1'.
+[replace_directory_with_sub1 d02a28b] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at cb28587 Replace sub1 with directory
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[a2e65d520c4d6151077c503b94e88a2b0fc27137] Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - git_bisect: replace directory with submodule
+
+expecting success of 6041.5 'git_bisect: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+[remove_sub1 62c9c0e] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 09bcf53 Add sub1
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+warning: unable to rmdir 'sub1': Directory not empty
+[d6ba72308524467d7c42cc82695a9efb51c0c608] Revert "Add sub1"
+ok 5 - git_bisect: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 6041.6 'git_bisect: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Switched to branch 'remove_sub1'
+Your branch is up to date with 'origin/remove_sub1'.
+[remove_sub1 62c9c0e] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 09bcf53 Add sub1
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+warning: unable to rmdir 'sub1': Directory not empty
+[d6ba72308524467d7c42cc82695a9efb51c0c608] Revert "Add sub1"
+ok 6 - git_bisect: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 6041.7 'git_bisect: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+ok 7 - git_bisect: replace submodule with a directory must fail
+
+expecting success of 6041.8 'git_bisect: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by checkout:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you switch branches.
+Aborting
+ok 8 - git_bisect: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 6041.9 'git_bisect: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git checkout replace_sub1_with_file
+not ok 9 - git_bisect: replace submodule with a file must fail # TODO known breakage
 
-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
+checking known breakage of 6041.10 'git_bisect: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Switched to branch 'replace_sub1_with_file'
+Your branch is up to date with 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git checkout replace_sub1_with_file
+not ok 10 - git_bisect: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-expecting success of 6135.24 'check that attr magic works for git add -u': 
-	cat <<-\EOF >expect &&
-	sub/fileA
-	EOF
-	>sub/newFileA-foo &&
-	>sub/newFileB-foo &&
-	>sub/fileA &&
-	>sub/fileB &&
-	git add -u ":(exclude,attr:labelB)" &&
-	git diff --name-only --cached  >actual &&
-	git restore -S -W . && rm sub/new* &&
-	test_cmp expect actual
+expecting success of 6041.11 'git_bisect: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Switched to branch 'modify_sub1'
+Your branch is up to date with 'origin/modify_sub1'.
+[modify_sub1 bff37bb] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 09bcf53 Add sub1
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[cb2bda782feaa487c31d26515559b87318263154] Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - git_bisect: modified submodule does not update submodule work tree
 
-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 24 - check that attr magic works for git add -u
+expecting success of 6041.12 'git_bisect: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Switched to branch 'invalid_sub1'
+Your branch is up to date with 'origin/invalid_sub1'.
+[invalid_sub1 78d784c] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at 09bcf53 Add sub1
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[e6169bf97522b7a7bdecb08ccbc816ccd15c6742] Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - git_bisect: modified submodule does not update submodule work tree to invalid commit
 
-expecting success of 6135.25 'check that attr magic works for git add <path>': 
-	cat <<-\EOF >expect &&
-	fileA
-	fileB
-	sub/fileA
-	EOF
-	>fileA &&
-	>fileB &&
-	>sub/fileA &&
-	>sub/fileB &&
-	git add ":(exclude,attr:labelB)sub/*" &&
-	git diff --name-only --cached >actual &&
-	git restore -S -W . &&
-	test_cmp expect actual
+expecting success of 6041.13 'git_bisect: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Switched to branch 'valid_sub1'
+Your branch is up to date with 'origin/valid_sub1'.
+[valid_sub1 f880729] bisect bad
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+HEAD is now at e6169bf Invalid sub1 commit
+status: waiting for both good and bad commits
+status: waiting for bad commit, 1 good commit known
+Bisecting: 0 revisions left to test after this (roughly 0 steps)
+[3036e4e7a6b640ae42492f70ab2e4608d629980b] Revert "Invalid sub1 commit"
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - git_bisect: modified submodule does not update submodule work tree from invalid commit
 
-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 25 - check that attr magic works for git add <path>
+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
 
-expecting success of 6135.26 'check that attr magic works for git -add .': 
-	cat <<-\EOF >expect &&
-	sub/fileA
-	EOF
-	>fileA &&
-	>fileB &&
-	>sub/fileA &&
-	>sub/fileB &&
-	cd sub &&
-	git add . ":(exclude,attr:labelB)" &&
-	cd .. &&
-	git diff --name-only --cached >actual &&
-	git restore -S -W . &&
-	test_cmp expect actual
+# still have 2 known breakage(s)
+# passed all remaining 12 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6400-merge-df.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6400-merge-df/.git/
+expecting success of 6400.1 'prepare repository': 
+	echo Hello >init &&
+	git add init &&
+	git commit -m initial &&
 
-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 26 - check that attr magic works for git -add .
+	git branch B &&
+	mkdir dir &&
+	echo foo >dir/foo &&
+	git add dir/foo &&
+	git commit -m "File: dir/foo" &&
 
-expecting success of 6135.27 'check that attr magic works for git add --pathspec-from-file': 
-	cat <<-\EOF >pathspec_file &&
-	:(exclude,attr:labelB)
-	EOF
-	cat <<-\EOF >expect &&
-	sub/newFileA-foo
-	EOF
-	>sub/newFileA-foo &&
-	>sub/newFileB-foo &&
-	git add --all --pathspec-from-file=pathspec_file &&
-	git diff --name-only --cached >actual &&
-	test_cmp expect actual
+	git checkout B &&
+	echo file dir >dir &&
+	git add dir &&
+	git commit -m "File: dir"
 
-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 27 - check that attr magic works for git add --pathspec-from-file
+[main (root-commit) 9403789] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init
+[main ea63978] File: dir/foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir/foo
+Switched to branch 'B'
+[B 998507a] File: dir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 dir
+ok 1 - prepare repository
 
-expecting success of 6135.28 'abort on giving invalid label on the command line': 
-	test_must_fail git ls-files . ":(attr:☺)"
+expecting success of 6400.2 'Merge with d/f conflicts': 
+	test_expect_code 1 git merge -m "merge msg" main
 
-fatal: invalid attribute name ☺
-ok 28 - abort on giving invalid label on the command line
+CONFLICT (file/directory): directory in the way of dir from HEAD; moving it to dir~HEAD instead.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - Merge with d/f conflicts
 
-expecting success of 6135.29 'abort on asking for wrong magic': 
-	test_must_fail git ls-files . ":(attr:-label=foo)" &&
-	test_must_fail git ls-files . ":(attr:!label=foo)"
+expecting success of 6400.3 'F/D conflict': 
+	git reset --hard &&
+	git checkout main &&
+	rm .git/index &&
 
-fatal: invalid attribute name label=foo
-fatal: invalid attribute name label=foo
-ok 29 - abort on asking for wrong magic
+	mkdir before &&
+	echo FILE >before/one &&
+	echo FILE >after &&
+	git add . &&
+	git commit -m first &&
 
-expecting success of 6135.30 'check attribute list': 
-	cat <<-EOF >>.gitattributes &&
-	* whitespace=indent,trail,space
-	EOF
-	git ls-files ":(attr:whitespace=indent\,trail\,space)" >actual &&
-	git ls-files >expect &&
-	test_cmp expect actual
+	rm -f after &&
+	git mv before after &&
+	git commit -m move &&
 
-label☺ is not a valid attribute name: .gitattributes:10
-ok 30 - check attribute list
+	git checkout -b para HEAD^ &&
+	echo COMPLETELY ANOTHER FILE >another &&
+	git add . &&
+	git commit -m para &&
 
-expecting success of 6135.31 'backslash cannot be the last character': 
-	test_must_fail git ls-files ":(attr:label=foo\\ labelA=bar)" 2>actual &&
-	test_grep "not allowed as last character in attr value" actual
+	git merge main
 
-fatal: Escape character '\' not allowed as last character in attr value
-ok 31 - backslash cannot be the last character
+HEAD is now at 998507a File: dir
+Switched to branch 'main'
+[main 982e047] first
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 after
+ create mode 100644 before/one
+[main deef361] move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 deletion(-)
+ delete mode 100644 after
+ rename {before => after}/one (100%)
+Switched to a new branch 'para'
+[para c1294cb] para
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 another
+Merge made by the 'ort' strategy.
+ after                 | 1 -
+ {before => after}/one | 0
+ 2 files changed, 1 deletion(-)
+ delete mode 100644 after
+ rename {before => after}/one (100%)
+ok 3 - F/D conflict
 
-expecting success of 6135.32 'backslash cannot be used as a value': 
-	test_must_fail git ls-files ":(attr:label=f\\\oo)" 2>actual &&
-	test_grep "for value matching" actual
+expecting success of 6400.4 'setup modify/delete + directory/file conflict': 
+	git checkout --orphan modify &&
+	git rm -rf . &&
+	git clean -fdqx &&
 
-fatal: cannot use '\' for value matching
-ok 32 - backslash cannot be used as a value
+	printf "a\nb\nc\nd\ne\nf\ng\nh\n" >letters &&
+	git add letters &&
+	git commit -m initial &&
 
-expecting success of 6135.33 'reading from .gitattributes in a subdirectory (1)': 
-	git ls-files ":(attr:label1)" >actual &&
-	test_write_lines "sub/fileSetLabel" >expect &&
-	test_cmp expect actual
+	# 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 &&
 
-label☺ is not a valid attribute name: .gitattributes:10
-ok 33 - reading from .gitattributes in a subdirectory (1)
+	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
 
-expecting success of 6135.34 'reading from .gitattributes in a subdirectory (2)': 
-	git ls-files ":(attr:label1)sub" >actual &&
-	test_write_lines "sub/fileSetLabel" >expect &&
-	test_cmp expect actual
+Switched to a new branch 'modify'
+rm 'after/one'
+rm 'another'
+rm 'dir/foo'
+rm 'init'
+[modify (root-commit) 461649b] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 8 insertions(+)
+ create mode 100644 letters
+[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 4 - setup modify/delete + directory/file conflict
 
-label☺ is not a valid attribute name: .gitattributes:10
-ok 34 - reading from .gitattributes in a subdirectory (2)
+expecting success of 6400.5 'modify/delete + directory/file conflict': 
+	git checkout delete^0 &&
+	test_must_fail git merge modify &&
 
-expecting success of 6135.35 'reading from .gitattributes in a subdirectory (3)': 
-	git ls-files ":(attr:label1)sub/" >actual &&
-	test_write_lines "sub/fileSetLabel" >expect &&
-	test_cmp expect actual
+	test_stdout_line_count = 5 git ls-files -s &&
+	test_stdout_line_count = 4 git ls-files -u &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 0 git ls-files -o
+	else
+		test_stdout_line_count = 1 git ls-files -o
+	fi &&
 
-label☺ is not a valid attribute name: .gitattributes:10
-ok 35 - reading from .gitattributes in a subdirectory (3)
+	test_path_is_file letters/file &&
+	test_path_is_file letters.txt &&
+	test_path_is_file letters~modify
 
-expecting success of 6135.36 'pathspec with builtin_objectmode attr can be used': 
-	>mode_exec_file_1 &&
+Note: switching to 'delete^0'.
 
-	git status -s ":(attr:builtin_objectmode=100644)mode_exec_*" >actual &&
-	echo ?? mode_exec_file_1 >expect &&
-	test_cmp expect actual &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-	git add mode_exec_file_1 &&
-	chmod +x mode_exec_file_1 &&
-	git status -s ":(attr:builtin_objectmode=100755)mode_exec_*" >actual &&
-	echo AM mode_exec_file_1 >expect &&
-	test_cmp expect actual
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-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
-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
-label☺ is not a valid attribute name: .gitattributes:10
-ok 36 - pathspec with builtin_objectmode attr can be used
+  git switch -c <new-branch-name>
 
-expecting success of 6135.37 'builtin_objectmode attr can be excluded': 
-	>mode_1_regular &&
-	>mode_1_exec  &&
-	chmod +x mode_1_exec &&
-	git status -s ":(exclude,attr:builtin_objectmode=100644)" "mode_1_*" >actual &&
-	echo ?? mode_1_exec >expect &&
-	test_cmp expect actual &&
+Or undo this operation with:
 
-	git status -s ":(exclude,attr:builtin_objectmode=100755)" "mode_1_*" >actual &&
-	echo ?? mode_1_regular >expect &&
-	test_cmp expect actual
+  git switch -
 
-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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6301-for-each-ref-errors.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6301-for-each-ref-errors/.git/
-expecting success of 6301.1 'setup': 
-	MISSING=$(test_oid deadbeef) &&
-	git commit --allow-empty -m "Initial" &&
-	git tag testtag &&
-	git for-each-ref >full-list &&
-	git for-each-ref --format="%(objectname) %(refname)" >brief-list
+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.
+ok 5 - modify/delete + directory/file conflict
 
-[master (root-commit) d31adcd] Initial
- Author: A U Thor <author@example.com>
-ok 1 - setup
+expecting success of 6400.6 'modify/delete + directory/file conflict; other way': 
+	git reset --hard &&
+	git clean -f &&
+	git checkout modify^0 &&
 
-expecting success of 6301.2 'Broken refs are reported correctly': 
-	r=refs/heads/bogus &&
-	: >.git/$r &&
-	test_when_finished "rm -f .git/$r" &&
-	echo "warning: ignoring broken ref $r" >broken-err &&
-	git for-each-ref >out 2>err &&
-	test_cmp full-list out &&
-	test_cmp broken-err err
+	test_must_fail git merge delete &&
 
-ok 2 - Broken refs are reported correctly
+	test_stdout_line_count = 5 git ls-files -s &&
+	test_stdout_line_count = 4 git ls-files -u &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 0 git ls-files -o
+	else
+		test_stdout_line_count = 1 git ls-files -o
+	fi &&
 
-expecting success of 6301.3 'NULL_SHA1 refs are reported correctly': 
-	r=refs/heads/zeros &&
-	echo $ZEROS >.git/$r &&
-	test_when_finished "rm -f .git/$r" &&
-	echo "warning: ignoring broken ref $r" >zeros-err &&
-	git for-each-ref >out 2>err &&
-	test_cmp full-list out &&
-	test_cmp zeros-err err &&
-	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
-	test_cmp brief-list brief-out &&
-	test_cmp zeros-err brief-err
+	test_path_is_file letters/file &&
+	test_path_is_file letters.txt &&
+	test_path_is_file letters~HEAD
 
-ok 3 - NULL_SHA1 refs are reported correctly
+HEAD is now at 380ce95 deleted
+Previous HEAD position was 380ce95 deleted
+HEAD is now at 4e26d91 modified
+Auto-merging letters.txt
+CONFLICT (add/add): Merge conflict in letters.txt
+CONFLICT (file/directory): directory in the way of letters from HEAD; moving it to letters~HEAD instead.
+CONFLICT (modify/delete): letters~HEAD deleted in delete and modified in HEAD.  Version HEAD of letters~HEAD left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - modify/delete + directory/file conflict; other way
 
-expecting success of 6301.4 'Missing objects are reported correctly': 
-	test_when_finished "git update-ref -d refs/heads/missing" &&
-	test-tool ref-store main update-ref msg refs/heads/missing "$MISSING" "$ZERO_OID" REF_SKIP_OID_VERIFICATION &&
-	echo "fatal: missing object $MISSING for refs/heads/missing" >missing-err &&
-	test_must_fail git for-each-ref 2>err &&
-	test_cmp missing-err err &&
+expecting success of 6400.7 'Simple merge in repo with interesting pathnames': 
+	# Simple lexicographic ordering of files and directories would be:
+	#     foo
+	#     foo/bar
+	#     foo/bar-2
+	#     foo/bar/baz
+	#     foo/bar-2/baz
+	# The fact that foo/bar-2 appears between foo/bar and foo/bar/baz
+	# can trip up some codepaths, and is the point of this test.
+	git init name-ordering &&
 	(
-		cat brief-list &&
-		echo "$MISSING refs/heads/missing"
-	) | sort -k 2 >missing-brief-expected &&
-	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
-	test_cmp missing-brief-expected brief-out &&
-	test_must_be_empty brief-err
+		cd name-ordering &&
 
-ok 4 - Missing objects are reported correctly
+		mkdir -p foo/bar &&
+		mkdir -p foo/bar-2 &&
+		>foo/bar/baz &&
+		>foo/bar-2/baz &&
+		git add . &&
+		git commit -m initial &&
 
-expecting success of 6301.5 'ahead-behind requires an argument': 
-	test_must_fail git for-each-ref \
-		--format="%(ahead-behind)" 2>err &&
-	echo "fatal: expected format: %(ahead-behind:<committish>)" >expect &&
-	test_cmp expect err
+		git branch topic &&
+		git branch other &&
 
-ok 5 - ahead-behind requires an argument
+		git checkout other &&
+		echo other >foo/bar-2/baz &&
+		git add -u &&
+		git commit -m other &&
 
-expecting success of 6301.6 'missing ahead-behind base': 
-	test_must_fail git for-each-ref \
-		--format="%(ahead-behind:refs/heads/missing)" 2>err &&
-	echo "fatal: failed to find 'refs/heads/missing'" >expect &&
-	test_cmp expect err
+		git checkout topic &&
+		echo topic >foo/bar/baz &&
+		git add -u &&
+		git commit -m topic &&
 
-ok 6 - missing ahead-behind base
+		git merge other &&
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git rev-parse :0:foo/bar/baz :0:foo/bar-2/baz >actual &&
+		git rev-parse HEAD~1:foo/bar/baz other:foo/bar-2/baz >expect &&
+		test_cmp expect actual
+	)
 
-# passed all 6 test(s)
-1..6
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6400-merge-df/name-ordering/.git/
+[main (root-commit) 7254293] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo/bar-2/baz
+ create mode 100644 foo/bar/baz
+Switched to branch 'other'
+[other 73bbd97] other
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'topic'
+[topic 7b6c4f9] topic
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Merge made by the 'ort' strategy.
+ foo/bar-2/baz | 1 +
+ 1 file changed, 1 insertion(+)
+ok 7 - Simple merge in repo with interesting pathnames
+
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6200-fmt-merge-msg.sh ***
@@ -399270,6 +401962,109 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6401-merge-criss-cross.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6401-merge-criss-cross/.git/
+expecting success of 6401.1 'prepare repository': 
+	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
+	git add file &&
+	git commit -m "Initial commit" file &&
+
+	git branch A &&
+	git branch B &&
+	git checkout A &&
+
+	test_write_lines 1 2 3 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
+	git commit -m "B8" file &&
+	git checkout B &&
+
+	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 8 9 >file &&
+	git commit -m "C3" file &&
+	git branch C3 &&
+
+	git merge -m "pre E3 merge" A &&
+
+	test_write_lines 1 2 "3 changed in E3, branch B. New file size" 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
+	git commit -m "E3" file &&
+
+	git checkout A &&
+	git merge -m "pre D8 merge" C3 &&
+	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 "8 changed in D8, branch A. New file size 2" 9 >file &&
+
+	git commit -m D8 file
+
+[master (root-commit) 40a1fcc] Initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 9 insertions(+)
+ create mode 100644 file
+Switched to branch 'A'
+[A 3e86c96] B8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'B'
+[B 039abf7] C3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[B 4628fbc] E3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'A'
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[A 1f51d3d] D8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - prepare repository
+
+expecting success of 6401.2 'Criss-cross merge': 
+	git merge -m "final merge" B
+
+  From inner merge:  Auto-merging file
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 2 - Criss-cross merge
+
+expecting success of 6401.3 'Criss-cross merge result': 
+	cat <<-\EOF >file-expect &&
+	1
+	2
+	3 changed in E3, branch B. New file size
+	4
+	5
+	6
+	7
+	8 changed in D8, branch A. New file size 2
+	9
+	EOF
+
+	test_cmp file-expect file
+
+ok 3 - Criss-cross merge result
+
+expecting success of 6401.4 'Criss-cross merge fails (-s resolve)': 
+	git reset --hard A^ &&
+	test_must_fail git merge -s resolve -m "final merge" B
+
+HEAD is now at 1f51d3d D8
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging file
+ERROR: content conflict in file
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - Criss-cross merge fails (-s resolve)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6302-for-each-ref-filter.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6302-for-each-ref-filter/.git/
 expecting success of 6302.1 'setup some history and refs': 
@@ -400265,4330 +403060,1233 @@
 
 expecting success of 6120.29 'abbrev=0 will not break misplaced tag (1)': 
 	description=$(git describe --abbrev=0 Q^0) &&
-	expr "$description" : "A-0-g[0-9a-f]*$"
-
-warning: tag 'Q' is externally known as 'A'
-45
-ok 29 - abbrev=0 will not break misplaced tag (1)
-
-expecting success of 6120.30 'abbrev=0 will not break misplaced tag (2)': 
-	description=$(git describe --abbrev=0 c^0) &&
-	expr "$description" : "A-1-g[0-9a-f]*$"
-
-warning: tag 'Q' is externally known as 'A'
-45
-ok 30 - abbrev=0 will not break misplaced tag (2)
-
-expecting success of 6120.31 'rename tag Q back to A': 
-	git update-ref refs/tags/A $(git rev-parse refs/tags/Q) &&
-	git update-ref -d refs/tags/Q
-
-ok 31 - rename tag Q back to A
-
-expecting success of 6120.32 'pack tag refs': git pack-refs
-ok 32 - pack tag refs
-
-expecting success of 6120.33 'describe HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 33 - describe HEAD
-
-expecting success of 6120.34 'describe works from outside repo using --git-dir': 
-	git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
-	git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
-	grep -E "^A-8-g[0-9a-f]+$" out
-
-Cloning into bare repository '/build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/bare'...
-done.
-A-8-g8348027
-ok 34 - describe works from outside repo using --git-dir
-
-expecting success of 6120.35 'describe --dirty': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 35 - describe --dirty
-
-expecting success of 6120.36 'describe --dirty with --work-tree': 
-	(
-		cd "$TEST_DIRECTORY" &&
-		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
-	) &&
-	grep -E "^A-8-g[0-9a-f]+$" out
-
-A-8-g8348027
-ok 36 - describe --dirty with --work-tree
-
-expecting success of 6120.37 'set-up dirty work tree': 
-	echo >>file
-
-ok 37 - set-up dirty work tree
-
-expecting success of 6120.38 'describe --dirty with --work-tree (dirty)': 
-	git describe --dirty >expected &&
-	(
-		cd "$TEST_DIRECTORY" &&
-		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
-	) &&
-	grep -E "^A-8-g[0-9a-f]+-dirty$" out &&
-	test_cmp expected out
-
-A-8-g8348027-dirty
-ok 38 - describe --dirty with --work-tree (dirty)
-
-expecting success of 6120.39 'describe --dirty=.mod with --work-tree (dirty)': 
-	git describe --dirty=.mod >expected &&
-	(
-		cd "$TEST_DIRECTORY" &&
-		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
-	) &&
-	grep -E "^A-8-g[0-9a-f]+.mod$" out &&
-	test_cmp expected out
-
-A-8-g8348027.mod
-ok 39 - describe --dirty=.mod with --work-tree (dirty)
-
-expecting success of 6120.40 'describe --dirty HEAD': 
-	test_must_fail git describe --dirty HEAD
-
-fatal: option '--dirty' and commit-ishes cannot be used together
-ok 40 - describe --dirty HEAD
-
-expecting success of 6120.41 'set-up matching pattern tests': 
-	git tag -a -m test-annotated test-annotated &&
-	echo >>file &&
-	test_tick &&
-	git commit -a -m "one more" &&
-	git tag test1-lightweight &&
-	echo >>file &&
-	test_tick &&
-	git commit -a -m "yet another" &&
-	git tag test2-lightweight &&
-	echo >>file &&
-	test_tick &&
-	git commit -a -m "even more"
-
-
-[main 56c7540] one more
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[main 06348ff] yet another
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 481b98d] even more
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 41 - set-up matching pattern tests
-
-expecting success of 6120.42 'describe --match=test-*': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 42 - describe --match=test-*
-
-expecting success of 6120.43 'describe --tags --match=test1-*': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 43 - describe --tags --match=test1-*
-
-expecting success of 6120.44 'describe --tags --match=test2-*': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 44 - describe --tags --match=test2-*
-
-expecting success of 6120.45 'describe --long --tags --match=test2-* HEAD^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 45 - describe --long --tags --match=test2-* HEAD^
-
-expecting success of 6120.46 'describe --long --tags --match=test1-* --match=test2-* HEAD^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 46 - describe --long --tags --match=test1-* --match=test2-* HEAD^
-
-expecting success of 6120.47 'describe --long --tags --match=test1-* --no-match --match=test2-* HEAD^': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 47 - describe --long --tags --match=test1-* --no-match --match=test2-* HEAD^
-
-expecting success of 6120.48 'describe --long --tags --match=test1-* --match=test3-* HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 48 - describe --long --tags --match=test1-* --match=test3-* HEAD
-
-expecting success of 6120.49 'describe --long --tags --match=test3-* --match=test1-* HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 49 - describe --long --tags --match=test3-* --match=test1-* HEAD
-
-expecting success of 6120.50 'set-up branches': 
-	git branch branch_A A &&
-	git branch branch_C c &&
-	git update-ref refs/remotes/origin/remote_branch_A "A^{commit}" &&
-	git update-ref refs/remotes/origin/remote_branch_C "c^{commit}" &&
-	git update-ref refs/original/original_branch_A test-annotated~2
-
-ok 50 - set-up branches
-
-expecting success of 6120.51 'describe --all --match=branch_* --exclude=branch_C HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 51 - describe --all --match=branch_* --exclude=branch_C HEAD
-
-expecting success of 6120.52 'describe --all --match=origin/remote_branch_* --exclude=origin/remote_branch_C HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 52 - describe --all --match=origin/remote_branch_* --exclude=origin/remote_branch_C HEAD
-
-expecting success of 6120.53 'describe --all test-annotated~1': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 53 - describe --all test-annotated~1
-
-expecting success of 6120.54 '--match does not work for other types': 
-	test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
-
-fatal: No names found, cannot describe anything.
-ok 54 - --match does not work for other types
-
-expecting success of 6120.55 '--exclude does not work for other types': 
-	R=$(git describe --all --exclude="any_pattern_even_not_matching" test-annotated~1) &&
-	case "$R" in
-	*original_branch_A*) echo "fail: Found unknown reference $R with --exclude"
-		false;;
-	*) echo ok: Found some known type;;
-	esac
-
-ok: Found some known type
-ok 55 - --exclude does not work for other types
-
-expecting success of 6120.56 'name-rev with exact tags': 
-	echo A >expect &&
-	tag_object=$(git rev-parse refs/tags/A) &&
-	git name-rev --tags --name-only $tag_object >actual &&
-	test_cmp expect actual &&
-
-	echo "A^0" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	git name-rev --tags --name-only $tagged_commit >actual &&
-	test_cmp expect actual
-
-ok 56 - name-rev with exact tags
-
-expecting success of 6120.57 'name-rev --all': 
-	>expect.unsorted &&
-	for rev in $(git rev-list --all)
-	do
-		git name-rev $rev >>expect.unsorted || return 1
-	done &&
-	sort <expect.unsorted >expect &&
-	git name-rev --all >actual.unsorted &&
-	sort <actual.unsorted >actual &&
-	test_cmp expect actual
-
-ok 57 - name-rev --all
-
-expecting success of 6120.58 'name-rev --annotate-stdin': 
-	>expect.unsorted &&
-	for rev in $(git rev-list --all)
-	do
-		name=$(git name-rev --name-only $rev) &&
-		echo "$rev ($name)" >>expect.unsorted || return 1
-	done &&
-	sort <expect.unsorted >expect &&
-	git rev-list --all | git name-rev --annotate-stdin >actual.unsorted &&
-	sort <actual.unsorted >actual &&
-	test_cmp expect actual
-
-ok 58 - name-rev --annotate-stdin
-
-expecting success of 6120.59 'name-rev --stdin deprecated': 
-	git rev-list --all | git name-rev --stdin 2>actual &&
-	grep -E 'warning: --stdin is deprecated' actual
-
-481b98dc759b7c93b0c387163557c00de8889c23 (main)
-06348ffaa4ae1477d2839b428def58f191cf82dd (tags/test2-lightweight)
-56c75406622118002f72e47fa889e63b9ce7eef5 (tags/test1-lightweight)
-834802700a921cf3a66bf0094ec2bbb84f556491 (tags/test-annotated^0)
-f543096ac7562240dea61e024b2aded42890e6e4 (tags/test-annotated~1)
-2976a872ebe86c6743c0b22cc2effc6b6690d35d (tags/test-annotated~2)
-d7863c725e80ded9952135c05aa8e5d6f3c7d5eb (tags/e)
-de803f50907ae7b3a6f342dc5237b17cf363824e (tags/R^0)
-d761ce166f3234debb123d4ccd0429d0122850c8 (tags/test-annotated~1^2)
-ab2da115f9a280ba80846007dce6cde8c8becad6 (tags/B^0)
-2ad58678aa2bf02a72a408d80a6166d995d1108d (tags/c)
-4185ee1c25ca8fa52bf846677e8fb33c39a38326 (tags/A^0)
-c48449d08f67c820485130658d6d4199237173e6 (tags/third)
-612fe8f0dd0c85a77a1743b12ad30b34d52c638a (tags/second)
-50b0198675f2d86e1a5851d6a22cb3f904980f03 (tags/initial)
-warning: --stdin is deprecated. Please use --annotate-stdin instead, which is functionally equivalent.
-ok 59 - name-rev --stdin deprecated
-
-expecting success of 6120.60 'describe --contains with the exact tags': 
-	echo "A^0" >expect &&
-	tag_object=$(git rev-parse refs/tags/A) &&
-	git describe --contains $tag_object >actual &&
-	test_cmp expect actual &&
-
-	echo "A^0" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	git describe --contains $tagged_commit >actual &&
-	test_cmp expect actual
-
-ok 60 - describe --contains with the exact tags
-
-expecting success of 6120.61 'describe --contains and --match': 
-	echo "A^0" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	test_must_fail git describe --contains --match="B" $tagged_commit &&
-	git describe --contains --match="B" --match="A" $tagged_commit >actual &&
-	test_cmp expect actual
-
-fatal: cannot describe '4185ee1c25ca8fa52bf846677e8fb33c39a38326'
-ok 61 - describe --contains and --match
-
-expecting success of 6120.62 'describe --exclude': 
-	echo "c~1" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	test_must_fail git describe --contains --match="B" $tagged_commit &&
-	git describe --contains --match="?" --exclude="A" $tagged_commit >actual &&
-	test_cmp expect actual
-
-fatal: cannot describe '4185ee1c25ca8fa52bf846677e8fb33c39a38326'
-ok 62 - describe --exclude
-
-expecting success of 6120.63 'describe --contains and --no-match': 
-	echo "A^0" >expect &&
-	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
-	git describe --contains --match="B" --no-match $tagged_commit >actual &&
-	test_cmp expect actual
-
-ok 63 - describe --contains and --no-match
-
-expecting success of 6120.64 'setup and absorb a submodule': 
-	test_create_repo sub1 &&
-	test_commit -C sub1 initial &&
-	git submodule add ./sub1 &&
-	git submodule absorbgitdirs &&
-	git commit -a -m "add submodule" &&
-	git describe --dirty >expect &&
-	git describe --broken >out &&
-	test_cmp expect out
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/sub1/.git/
-[main (root-commit) d8072fd] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Adding existing repo at 'sub1' to the index
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/.git/modules/sub1'
-[main b120bfb] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
-ok 64 - setup and absorb a submodule
-
-expecting success of 6120.65 'describe chokes on severely broken submodules': 
-	mv .git/modules/sub1/ .git/modules/sub_moved &&
-	test_must_fail git describe --dirty
-
-fatal: not a git repository: sub1/../.git/modules/sub1
-ok 65 - describe chokes on severely broken submodules
-
-expecting success of 6120.66 'describe ignoring a broken submodule': 
-	git describe --broken >out &&
-	grep broken out
-
-fatal: not a git repository: sub1/../.git/modules/sub1
-test-annotated-4-gb120bfb-broken
-ok 66 - describe ignoring a broken submodule
-
-expecting success of 6120.67 'describe with --work-tree ignoring a broken submodule': 
-	(
-		cd "$TEST_DIRECTORY" &&
-		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --broken >"$TRASH_DIRECTORY/out"
-	) &&
-	test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
-	grep broken out
-
-fatal: not a git repository: sub1/../.git/modules/sub1
-test-annotated-4-gb120bfb-broken
-ok 67 - describe with --work-tree ignoring a broken submodule
-
-expecting success of 6120.68 'describe a blob at a directly tagged commit': 
-	echo "make it a unique blob" >file &&
-	git add file && git commit -m "content in file" &&
-	git tag -a -m "latest annotated tag" unique-file &&
-	git describe HEAD:file >actual &&
-	echo "unique-file:file" >expect &&
-	test_cmp expect actual
-
-[main 0327ce2] content in file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 5 deletions(-)
-ok 68 - describe a blob at a directly tagged commit
-
-expecting success of 6120.69 'describe a blob with its first introduction': 
-	git commit --allow-empty -m "empty commit" &&
-	git rm file &&
-	git commit -m "delete blob" &&
-	git revert HEAD &&
-	git commit --allow-empty -m "empty commit" &&
-	git describe HEAD:file >actual &&
-	echo "unique-file:file" >expect &&
-	test_cmp expect actual
-
-[main d56ff78] empty commit
- Author: A U Thor <author@example.com>
-rm 'file'
-[main c9d39a6] delete blob
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 file
-[main 3aa223e] Revert "delete blob"
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:31:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 5b2edfd] empty commit
- Author: A U Thor <author@example.com>
-ok 69 - describe a blob with its first introduction
-
-expecting success of 6120.70 'describe directly tagged blob': 
-	git tag test-blob unique-file:file &&
-	git describe test-blob >actual &&
-	echo "unique-file:file" >expect &&
-	# suboptimal: we rather want to see "test-blob"
-	test_cmp expect actual
-
-ok 70 - describe directly tagged blob
-
-expecting success of 6120.71 'describe tag object': 
-	git tag test-blob-1 -a -m msg unique-file:file &&
-	test_must_fail git describe test-blob-1 2>actual &&
-	test_grep "fatal: test-blob-1 is neither a commit nor blob" actual
-
-fatal: test-blob-1 is neither a commit nor blob
-ok 71 - describe tag object
-
-checking prerequisite: ULIMIT_STACK_SIZE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_STACK_SIZE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_STACK_SIZE" &&
-	test_have_prereq !HPPA,!MINGW,!CYGWIN &&
-	run_with_limited_stack true
-
-)
-prerequisite ULIMIT_STACK_SIZE ok
-expecting success of 6120.72 'name-rev works in a deep repo': 
-	i=1 &&
-	while test $i -lt 8000
-	do
-		echo "commit refs/heads/main
-committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
-data <<EOF
-commit #$i
-EOF" &&
-		if test $i = 1
-		then
-			echo "from refs/heads/main^0"
-		fi &&
-		i=$(($i + 1)) || return 1
-	done | git fast-import &&
-	git checkout main &&
-	git tag far-far-away HEAD^ &&
-	echo "HEAD~4000 tags/far-far-away~3999" >expect &&
-	git name-rev HEAD~4000 >actual &&
-	test_cmp expect actual &&
-	run_with_limited_stack git name-rev HEAD~4000 >actual &&
-	test_cmp expect actual
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:      10000
-Total objects:         7999 (         0 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:         7999 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              5
-Memory total:          2719 KiB
-       pools:          2133 KiB
-     objects:           585 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =       8000
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =    1172067 /    1172067
----------------------------------------------------------------------
-
-Already on 'main'
-ok 72 - name-rev works in a deep repo
-
-expecting success of 6120.73 'describe works in a deep repo': 
-	git tag -f far-far-away HEAD~7999 &&
-	echo "far-far-away" >expect &&
-	git describe --tags --abbrev=0 HEAD~4000 >actual &&
-	test_cmp expect actual &&
-	run_with_limited_stack git describe --tags --abbrev=0 HEAD~4000 >actual &&
-	test_cmp expect actual
-
-Updated tag 'far-far-away' (was 92d391b)
-ok 73 - describe works in a deep repo
-
-expecting success of 6120.74 'describe --all A': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 74 - describe --all A
-
-expecting success of 6120.75 'describe --all c': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 75 - describe --all c
-
-expecting success of 6120.76 'describe --all --match=branch_* branch_A': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 76 - describe --all --match=branch_* branch_A
-
-expecting success of 6120.77 'describe complains about tree object': 
-	test_must_fail git describe HEAD^{tree}
-
-fatal: HEAD^{tree} is neither a commit nor blob
-ok 77 - describe complains about tree object
-
-expecting success of 6120.78 'describe complains about missing object': 
-	test_must_fail git describe $ZERO_OID
-
-fatal: 0000000000000000000000000000000000000000 is neither a commit nor blob
-ok 78 - describe complains about missing object
-
-expecting success of 6120.79 'name-rev a rev shortly after epoch': 
-	test_when_finished "git checkout main" &&
-
-	git checkout --orphan no-timestamp-underflow &&
-	# Any date closer to epoch than the CUTOFF_DATE_SLOP constant
-	# in builtin/name-rev.c.
-	GIT_COMMITTER_DATE="@1234 +0000" \
-	git commit -m "committer date shortly after epoch" &&
-	old_commit_oid=$(git rev-parse HEAD) &&
-
-	echo "$old_commit_oid no-timestamp-underflow" >expect &&
-	git name-rev $old_commit_oid >actual &&
-	test_cmp expect actual
-
-Switched to a new branch 'no-timestamp-underflow'
-[no-timestamp-underflow (root-commit) c282cde] committer date shortly after epoch
- Author: A U Thor <author@example.com>
- 5 files changed, 7 insertions(+)
- create mode 100644 .gitmodules
- create mode 100644 another
- create mode 100644 file
- create mode 100644 side
- create mode 160000 sub1
-Switched to branch 'main'
-ok 79 - name-rev a rev shortly after epoch
-
-expecting success of 6120.80 'name-rev covers all conditions while looking at parents': 
-	git init repo &&
-	(
-		cd repo &&
-
-		echo A >file &&
-		git add file &&
-		git commit -m A &&
-		A=$(git rev-parse HEAD) &&
-
-		git checkout --detach &&
-		echo B >file &&
-		git commit -m B file &&
-		B=$(git rev-parse HEAD) &&
-
-		git checkout $A &&
-		git merge --no-ff $B &&  # M1
-
-		echo C >file &&
-		git commit -m C file &&
-
-		git checkout $A &&
-		git merge --no-ff HEAD@{1} && # M2
-
-		git checkout main &&
-		git merge --no-ff HEAD@{1} &&
-
-		echo "$B main^2^2~1^2" >expect &&
-		git name-rev $B >actual &&
-
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/repo/.git/
-[main (root-commit) 78654cc] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-HEAD is now at 78654cc A
-[detached HEAD 6b45b22] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
-
-  6b45b22 B
-
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> 6b45b22
-
-HEAD is now at 78654cc A
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD ea0b3e9] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: you are leaving 3 commits behind, not connected to
-any of your branches:
-
-  ea0b3e9 C
-  212ac67 Merge commit '6b45b22f510f60512eeb67085e7ac91c21fef10c' into HEAD
-  6b45b22 B
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> ea0b3e9
-
-HEAD is now at 78654cc A
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Warning: you are leaving 4 commits behind, not connected to
-any of your branches:
-
-  d9d7e13 Merge commit 'HEAD@{1}' into HEAD
-  ea0b3e9 C
-  212ac67 Merge commit '6b45b22f510f60512eeb67085e7ac91c21fef10c' into HEAD
-  6b45b22 B
-
-If you want to keep them by creating a new branch, this may be a good time
-to do so with:
-
- git branch <new-branch-name> d9d7e13
-
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 80 - name-rev covers all conditions while looking at parents
-
-expecting success of 6120.81 'non-monotonic commit dates setup': 
-	UNIX_EPOCH_ZERO="@0 +0000" &&
-	git init non-monotonic &&
-	test_commit -C non-monotonic A &&
-	test_commit -C non-monotonic --no-tag B &&
-	test_commit -C non-monotonic --no-tag --date "$UNIX_EPOCH_ZERO" C &&
-	test_commit -C non-monotonic D &&
-	test_commit -C non-monotonic E
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/non-monotonic/.git/
-[main (root-commit) 818c4b4] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[main 350dc83] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-[main f348e82] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main cc61a00] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-[main 4bc3eeb] E
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 E.t
-ok 81 - non-monotonic commit dates setup
-
-expecting success of 6120.82 'name-rev with commitGraph handles non-monotonic timestamps': 
-	test_config -C non-monotonic core.commitGraph true &&
-	(
-		cd non-monotonic &&
-
-		git commit-graph write --reachable &&
-
-		echo "main~3 tags/D~2" >expect &&
-		git name-rev --tags main~3 >actual &&
-
-		test_cmp expect actual
-	)
-
-ok 82 - name-rev with commitGraph handles non-monotonic timestamps
-
-expecting success of 6120.83 'name-rev --all works with non-monotonic timestamps': 
-	test_config -C non-monotonic core.commitGraph false &&
-	(
-		cd non-monotonic &&
-
-		rm -rf .git/info/commit-graph* &&
-
-		cat >tags <<-\EOF &&
-		tags/E
-		tags/D
-		tags/D~1
-		tags/D~2
-		tags/A
-		EOF
-
-		git log --pretty=%H >revs &&
-
-		paste -d" " revs tags | sort >expect &&
-
-		git name-rev --tags --all | sort >actual &&
-		test_cmp expect actual
-	)
-
-ok 83 - name-rev --all works with non-monotonic timestamps
-
-expecting success of 6120.84 'name-rev --annotate-stdin works with non-monotonic timestamps': 
-	test_config -C non-monotonic core.commitGraph false &&
-	(
-		cd non-monotonic &&
-
-		rm -rf .git/info/commit-graph* &&
-
-		cat >expect <<-\EOF &&
-		E
-		D
-		D~1
-		D~2
-		A
-		EOF
-
-		git log --pretty=%H >revs &&
-		git name-rev --tags --annotate-stdin --name-only <revs >actual &&
-		test_cmp expect actual
-	)
-
-ok 84 - name-rev --annotate-stdin works with non-monotonic timestamps
-
-expecting success of 6120.85 'name-rev --all works with commitGraph': 
-	test_config -C non-monotonic core.commitGraph true &&
-	(
-		cd non-monotonic &&
-
-		git commit-graph write --reachable &&
-
-		cat >tags <<-\EOF &&
-		tags/E
-		tags/D
-		tags/D~1
-		tags/D~2
-		tags/A
-		EOF
-
-		git log --pretty=%H >revs &&
-
-		paste -d" " revs tags | sort >expect &&
-
-		git name-rev --tags --all | sort >actual &&
-		test_cmp expect actual
-	)
-
-ok 85 - name-rev --all works with commitGraph
-
-expecting success of 6120.86 'name-rev --annotate-stdin works with commitGraph': 
-	test_config -C non-monotonic core.commitGraph true &&
-	(
-		cd non-monotonic &&
-
-		git commit-graph write --reachable &&
-
-		cat >expect <<-\EOF &&
-		E
-		D
-		D~1
-		D~2
-		A
-		EOF
-
-		git log --pretty=%H >revs &&
-		git name-rev --tags --annotate-stdin --name-only <revs >actual &&
-		test_cmp expect actual
-	)
-
-ok 86 - name-rev --annotate-stdin works with commitGraph
-
-expecting success of 6120.87 'setup: describe commits with disjoint bases': 
-	git init disjoint1 &&
-	(
-		cd disjoint1 &&
-
-		echo o >> file && git add file && git commit -m o &&
-		echo A >> file && git add file && git commit -m A &&
-		git tag A -a -m A &&
-		echo o >> file && git add file && git commit -m o &&
-
-		git checkout --orphan branch && rm file &&
-		echo B > file2 && git add file2 && git commit -m B &&
-		git tag B -a -m B &&
-		git merge --no-ff --allow-unrelated-histories main -m x
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/disjoint1/.git/
-[main (root-commit) b0940a9] o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 5301387] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 04035f9] o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'branch'
-[branch (root-commit) 38a9f24] B
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 file
- create mode 100644 file2
-Merge made by the 'ort' strategy.
-ok 87 - setup: describe commits with disjoint bases
-
-expecting success of 6120.88 'describe HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 88 - describe HEAD
-
-expecting success of 6120.89 'setup: describe commits with disjoint bases 2': 
-	git init disjoint2 &&
-	(
-		cd disjoint2 &&
-
-		echo A >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:00" git commit -m A &&
-		git tag A -a -m A &&
-		echo o >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:01" git commit -m o &&
-
-		git checkout --orphan branch &&
-		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:00" git commit -m o &&
-		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o &&
-		echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B &&
-		git tag B -a -m B &&
-		git merge --no-ff --allow-unrelated-histories main -m x
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/disjoint2/.git/
-[main (root-commit) baf66fb] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[main 36e11f3] o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to a new branch 'branch'
-[branch (root-commit) 191fdf7] o
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 file
- create mode 100644 file2
-[branch f10239c] o
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[branch 7ece6d3] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Merge made by the 'ort' strategy.
-ok 89 - setup: describe commits with disjoint bases 2
-
-expecting success of 6120.90 'describe HEAD': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 90 - describe HEAD
-
-expecting success of 6120.91 'setup misleading taggerdates': 
-	GIT_COMMITTER_DATE="2006-12-12 12:31" git tag -a -m "another tag" newer-tag-older-commit unique-file~1
-
-ok 91 - setup misleading taggerdates
-
-expecting success of 6120.92 'describe --contains unique-file~2': 
-		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
-		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
-		echo "$expect" >expect &&
-		test_cmp expect actual
-	
-ok 92 - describe --contains unique-file~2
-
-# passed all 92 test(s)
-1..92
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6400-merge-df.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6400-merge-df/.git/
-expecting success of 6400.1 'prepare repository': 
-	echo Hello >init &&
-	git add init &&
-	git commit -m initial &&
-
-	git branch B &&
-	mkdir dir &&
-	echo foo >dir/foo &&
-	git add dir/foo &&
-	git commit -m "File: dir/foo" &&
-
-	git checkout B &&
-	echo file dir >dir &&
-	git add dir &&
-	git commit -m "File: dir"
-
-[main (root-commit) 9403789] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init
-[main ea63978] File: dir/foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir/foo
-Switched to branch 'B'
-[B 998507a] File: dir
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 dir
-ok 1 - prepare repository
-
-expecting success of 6400.2 'Merge with d/f conflicts': 
-	test_expect_code 1 git merge -m "merge msg" main
-
-CONFLICT (file/directory): directory in the way of dir from HEAD; moving it to dir~HEAD instead.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - Merge with d/f conflicts
-
-expecting success of 6400.3 'F/D conflict': 
-	git reset --hard &&
-	git checkout main &&
-	rm .git/index &&
-
-	mkdir before &&
-	echo FILE >before/one &&
-	echo FILE >after &&
-	git add . &&
-	git commit -m first &&
-
-	rm -f after &&
-	git mv before after &&
-	git commit -m move &&
-
-	git checkout -b para HEAD^ &&
-	echo COMPLETELY ANOTHER FILE >another &&
-	git add . &&
-	git commit -m para &&
-
-	git merge main
-
-HEAD is now at 998507a File: dir
-Switched to branch 'main'
-[main 982e047] first
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 after
- create mode 100644 before/one
-[main deef361] move
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- delete mode 100644 after
- rename {before => after}/one (100%)
-Switched to a new branch 'para'
-[para c1294cb] para
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 another
-Merge made by the 'ort' strategy.
- after                 | 1 -
- {before => after}/one | 0
- 2 files changed, 1 deletion(-)
- delete mode 100644 after
- rename {before => after}/one (100%)
-ok 3 - F/D conflict
-
-expecting success of 6400.4 'setup modify/delete + directory/file conflict': 
-	git checkout --orphan modify &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	printf "a\nb\nc\nd\ne\nf\ng\nh\n" >letters &&
-	git add letters &&
-	git commit -m initial &&
-
-	# 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
-
-Switched to a new branch 'modify'
-rm 'after/one'
-rm 'another'
-rm 'dir/foo'
-rm 'init'
-[modify (root-commit) 461649b] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 letters
-[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 4 - setup modify/delete + directory/file conflict
-
-expecting success of 6400.5 'modify/delete + directory/file conflict': 
-	git checkout delete^0 &&
-	test_must_fail git merge modify &&
-
-	test_stdout_line_count = 5 git ls-files -s &&
-	test_stdout_line_count = 4 git ls-files -u &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_stdout_line_count = 0 git ls-files -o
-	else
-		test_stdout_line_count = 1 git ls-files -o
-	fi &&
-
-	test_path_is_file letters/file &&
-	test_path_is_file letters.txt &&
-	test_path_is_file letters~modify
-
-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.
-ok 5 - modify/delete + directory/file conflict
-
-expecting success of 6400.6 'modify/delete + directory/file conflict; other way': 
-	git reset --hard &&
-	git clean -f &&
-	git checkout modify^0 &&
-
-	test_must_fail git merge delete &&
-
-	test_stdout_line_count = 5 git ls-files -s &&
-	test_stdout_line_count = 4 git ls-files -u &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_stdout_line_count = 0 git ls-files -o
-	else
-		test_stdout_line_count = 1 git ls-files -o
-	fi &&
-
-	test_path_is_file letters/file &&
-	test_path_is_file letters.txt &&
-	test_path_is_file letters~HEAD
-
-HEAD is now at 380ce95 deleted
-Previous HEAD position was 380ce95 deleted
-HEAD is now at 4e26d91 modified
-Auto-merging letters.txt
-CONFLICT (add/add): Merge conflict in letters.txt
-CONFLICT (file/directory): directory in the way of letters from HEAD; moving it to letters~HEAD instead.
-CONFLICT (modify/delete): letters~HEAD deleted in delete and modified in HEAD.  Version HEAD of letters~HEAD left in tree.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - modify/delete + directory/file conflict; other way
-
-expecting success of 6400.7 'Simple merge in repo with interesting pathnames': 
-	# Simple lexicographic ordering of files and directories would be:
-	#     foo
-	#     foo/bar
-	#     foo/bar-2
-	#     foo/bar/baz
-	#     foo/bar-2/baz
-	# The fact that foo/bar-2 appears between foo/bar and foo/bar/baz
-	# can trip up some codepaths, and is the point of this test.
-	git init name-ordering &&
-	(
-		cd name-ordering &&
-
-		mkdir -p foo/bar &&
-		mkdir -p foo/bar-2 &&
-		>foo/bar/baz &&
-		>foo/bar-2/baz &&
-		git add . &&
-		git commit -m initial &&
-
-		git branch topic &&
-		git branch other &&
-
-		git checkout other &&
-		echo other >foo/bar-2/baz &&
-		git add -u &&
-		git commit -m other &&
-
-		git checkout topic &&
-		echo topic >foo/bar/baz &&
-		git add -u &&
-		git commit -m topic &&
-
-		git merge other &&
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git rev-parse :0:foo/bar/baz :0:foo/bar-2/baz >actual &&
-		git rev-parse HEAD~1:foo/bar/baz other:foo/bar-2/baz >expect &&
-		test_cmp expect actual
-	)
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6400-merge-df/name-ordering/.git/
-[main (root-commit) 7254293] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo/bar-2/baz
- create mode 100644 foo/bar/baz
-Switched to branch 'other'
-[other 73bbd97] other
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'topic'
-[topic 7b6c4f9] topic
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Merge made by the 'ort' strategy.
- foo/bar-2/baz | 1 +
- 1 file changed, 1 insertion(+)
-ok 7 - Simple merge in repo with interesting pathnames
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6401-merge-criss-cross.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6401-merge-criss-cross/.git/
-expecting success of 6401.1 'prepare repository': 
-	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
-	git add file &&
-	git commit -m "Initial commit" file &&
-
-	git branch A &&
-	git branch B &&
-	git checkout A &&
-
-	test_write_lines 1 2 3 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
-	git commit -m "B8" file &&
-	git checkout B &&
-
-	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 8 9 >file &&
-	git commit -m "C3" file &&
-	git branch C3 &&
-
-	git merge -m "pre E3 merge" A &&
-
-	test_write_lines 1 2 "3 changed in E3, branch B. New file size" 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
-	git commit -m "E3" file &&
-
-	git checkout A &&
-	git merge -m "pre D8 merge" C3 &&
-	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 "8 changed in D8, branch A. New file size 2" 9 >file &&
-
-	git commit -m D8 file
-
-[master (root-commit) 40a1fcc] Initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 9 insertions(+)
- create mode 100644 file
-Switched to branch 'A'
-[A 3e86c96] B8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'B'
-[B 039abf7] C3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[B 4628fbc] E3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'A'
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[A 1f51d3d] D8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - prepare repository
-
-expecting success of 6401.2 'Criss-cross merge': 
-	git merge -m "final merge" B
-
-  From inner merge:  Auto-merging file
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 2 - Criss-cross merge
-
-expecting success of 6401.3 'Criss-cross merge result': 
-	cat <<-\EOF >file-expect &&
-	1
-	2
-	3 changed in E3, branch B. New file size
-	4
-	5
-	6
-	7
-	8 changed in D8, branch A. New file size 2
-	9
-	EOF
-
-	test_cmp file-expect file
-
-ok 3 - Criss-cross merge result
-
-expecting success of 6401.4 'Criss-cross merge fails (-s resolve)': 
-	git reset --hard A^ &&
-	test_must_fail git merge -s resolve -m "final merge" B
-
-HEAD is now at 1f51d3d D8
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging file
-ERROR: content conflict in file
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - Criss-cross merge fails (-s resolve)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6041-bisect-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/.git/
-expecting success of 6041.1 'git_bisect: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 3f6af83] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 27611a5 Base
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[09bcf53b0522b9fb95c5988105da6608927c3e4b] Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_bisect: added submodule creates empty directory
-
-expecting success of 6041.2 'git_bisect: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Switched to branch 'add_sub1'
-Your branch is up to date with 'origin/add_sub1'.
-[add_sub1 3f6af83] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 27611a5 Base
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[09bcf53b0522b9fb95c5988105da6608927c3e4b] Add sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_bisect: added submodule leaves existing empty directory alone
-
-expecting success of 6041.3 'git_bisect: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Switched to branch 'replace_file_with_sub1'
-Your branch is up to date with 'origin/replace_file_with_sub1'.
-[replace_file_with_sub1 3ac086b] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 2364f5a Replace sub1 with file
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[8b6fdfce32c1964fe2bd8ab0e22d81c1a2bb0726] Revert "Replace sub1 with file"
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_bisect: replace tracked file with submodule creates empty directory
-
-expecting success of 6041.4 'git_bisect: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Switched to branch 'replace_directory_with_sub1'
-Your branch is up to date with 'origin/replace_directory_with_sub1'.
-[replace_directory_with_sub1 d02a28b] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at cb28587 Replace sub1 with directory
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[a2e65d520c4d6151077c503b94e88a2b0fc27137] Revert "Replace sub1 with directory"
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_bisect: replace directory with submodule
-
-expecting success of 6041.5 'git_bisect: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-[remove_sub1 62c9c0e] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 09bcf53 Add sub1
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-warning: unable to rmdir 'sub1': Directory not empty
-[d6ba72308524467d7c42cc82695a9efb51c0c608] Revert "Add sub1"
-ok 5 - git_bisect: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 6041.6 'git_bisect: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Switched to branch 'remove_sub1'
-Your branch is up to date with 'origin/remove_sub1'.
-[remove_sub1 62c9c0e] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 09bcf53 Add sub1
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-warning: unable to rmdir 'sub1': Directory not empty
-[d6ba72308524467d7c42cc82695a9efb51c0c608] Revert "Add sub1"
-ok 6 - git_bisect: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 6041.7 'git_bisect: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you switch branches.
-Aborting
-ok 7 - git_bisect: replace submodule with a directory must fail
-
-expecting success of 6041.8 'git_bisect: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you switch branches.
-Aborting
-ok 8 - git_bisect: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 6041.9 'git_bisect: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git checkout replace_sub1_with_file
-not ok 9 - git_bisect: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 6041.10 'git_bisect: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Switched to branch 'replace_sub1_with_file'
-Your branch is up to date with 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git checkout replace_sub1_with_file
-not ok 10 - git_bisect: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 6041.11 'git_bisect: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Switched to branch 'modify_sub1'
-Your branch is up to date with 'origin/modify_sub1'.
-[modify_sub1 bff37bb] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 09bcf53 Add sub1
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[cb2bda782feaa487c31d26515559b87318263154] Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_bisect: modified submodule does not update submodule work tree
-
-expecting success of 6041.12 'git_bisect: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Switched to branch 'invalid_sub1'
-Your branch is up to date with 'origin/invalid_sub1'.
-[invalid_sub1 78d784c] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at 09bcf53 Add sub1
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[e6169bf97522b7a7bdecb08ccbc816ccd15c6742] Invalid sub1 commit
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git_bisect: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 6041.13 'git_bisect: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Switched to branch 'valid_sub1'
-Your branch is up to date with 'origin/valid_sub1'.
-[valid_sub1 f880729] bisect bad
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-HEAD is now at e6169bf Invalid sub1 commit
-status: waiting for both good and bad commits
-status: waiting for bad commit, 1 good commit known
-Bisecting: 0 revisions left to test after this (roughly 0 steps)
-[3036e4e7a6b640ae42492f70ab2e4608d629980b] Revert "Invalid sub1 commit"
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6041-bisect-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_bisect: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 6041.14 'git_bisect: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by checkout:
-	sub1
-Please move or remove them before you switch branches.
-Aborting
-ok 14 - git_bisect: added submodule doesn't remove untracked unignored file with same name
-
-# still have 2 known breakage(s)
-# passed all remaining 12 test(s)
-1..14
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t5572-pull-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/.git/
-expecting success of 5572.1 'git_pull: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_pull: added submodule creates empty directory
-
-expecting success of 5572.2 'git_pull: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_pull: added submodule leaves existing empty directory alone
-
-expecting success of 5572.3 'git_pull: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Deleted branch replace_file_with_sub1 (was 8b6fdfc).
-Switched to a new branch 'replace_file_with_sub1'
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_pull: replace tracked file with submodule creates empty directory
-
-expecting success of 5572.4 'git_pull: replace directory with submodule': 
-		prolog &&
-		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'.
-Deleted branch replace_directory_with_sub1 (was a2e65d5).
-Switched to a new branch 'replace_directory_with_sub1'
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Updating cb28587..a2e65d5
-Fast-forward
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_pull: replace directory with submodule
-
-expecting success of 5572.5 'git_pull: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Deleted branch remove_sub1 (was d6ba723).
-Switched to a new branch 'remove_sub1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 5 - git_pull: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 5572.6 'git_pull: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Deleted branch remove_sub1 (was d6ba723).
-Switched to a new branch 'remove_sub1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 6 - git_pull: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 5572.7 'git_pull: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_directory (was cb28587).
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 7 - git_pull: replace submodule with a directory must fail
-
-expecting success of 5572.8 'git_pull: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_directory (was cb28587).
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 8 - git_pull: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 5572.9 'git_pull: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_file (was 2364f5a).
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git pull
-not ok 9 - git_pull: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 5572.10 'git_pull: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_file (was 2364f5a).
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git pull
-not ok 10 - git_pull: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 5572.11 'git_pull: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Deleted branch modify_sub1 (was cb2bda7).
-Switched to a new branch 'modify_sub1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Updating 09bcf53..cb2bda7
-Fast-forward
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_pull: modified submodule does not update submodule work tree
-
-expecting success of 5572.12 'git_pull: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Deleted branch invalid_sub1 (was e6169bf).
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Updating 09bcf53..e6169bf
-Fast-forward
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git_pull: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 5572.13 'git_pull: 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'.
-Deleted branch valid_sub1 (was 3036e4e).
-Switched to a new branch 'valid_sub1'
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Updating e6169bf..3036e4e
-Fast-forward
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_pull: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 5572.14 'git_pull: 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'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Updating 27611a5..09bcf53
-ok 14 - git_pull: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 5572.15 'git_pull_ff: 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'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 15 - git_pull_ff: added submodule creates empty directory
-
-expecting success of 5572.16 'git_pull_ff: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 16 - git_pull_ff: added submodule leaves existing empty directory alone
-
-expecting success of 5572.17 'git_pull_ff: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Deleted branch replace_file_with_sub1 (was 8b6fdfc).
-Switched to a new branch 'replace_file_with_sub1'
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 17 - git_pull_ff: replace tracked file with submodule creates empty directory
-
-expecting success of 5572.18 'git_pull_ff: 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'.
-Deleted branch replace_directory_with_sub1 (was a2e65d5).
-Switched to a new branch 'replace_directory_with_sub1'
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Updating cb28587..a2e65d5
-Fast-forward
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 18 - git_pull_ff: replace directory with submodule
-
-expecting success of 5572.19 'git_pull_ff: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Deleted branch remove_sub1 (was d6ba723).
-Switched to a new branch 'remove_sub1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 19 - git_pull_ff: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 5572.20 'git_pull_ff: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Deleted branch remove_sub1 (was d6ba723).
-Switched to a new branch 'remove_sub1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 20 - git_pull_ff: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 5572.21 'git_pull_ff: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_directory (was cb28587).
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 21 - git_pull_ff: replace submodule with a directory must fail
-
-expecting success of 5572.22 'git_pull_ff: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_directory (was cb28587).
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 22 - git_pull_ff: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 5572.23 'git_pull_ff: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_file (was 2364f5a).
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git pull --ff
-not ok 23 - git_pull_ff: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 5572.24 'git_pull_ff: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_file (was 2364f5a).
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git pull --ff
-not ok 24 - git_pull_ff: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 5572.25 'git_pull_ff: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Deleted branch modify_sub1 (was cb2bda7).
-Switched to a new branch 'modify_sub1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Updating 09bcf53..cb2bda7
-Fast-forward
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 25 - git_pull_ff: modified submodule does not update submodule work tree
-
-expecting success of 5572.26 'git_pull_ff: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Deleted branch invalid_sub1 (was e6169bf).
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Updating 09bcf53..e6169bf
-Fast-forward
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-ok 26 - git_pull_ff: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 5572.27 'git_pull_ff: modified submodule does not update submodule work tree from invalid commit': 
-		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'.
-Deleted branch valid_sub1 (was 3036e4e).
-Switched to a new branch 'valid_sub1'
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Updating e6169bf..3036e4e
-Fast-forward
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 27 - git_pull_ff: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 5572.28 'git_pull_ff: 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'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Updating 27611a5..09bcf53
-ok 28 - git_pull_ff: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 5572.29 'git_pull_ff_only: 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'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 29 - git_pull_ff_only: added submodule creates empty directory
-
-expecting success of 5572.30 'git_pull_ff_only: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 30 - git_pull_ff_only: added submodule leaves existing empty directory alone
-
-expecting success of 5572.31 'git_pull_ff_only: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Deleted branch replace_file_with_sub1 (was 8b6fdfc).
-Switched to a new branch 'replace_file_with_sub1'
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 31 - git_pull_ff_only: replace tracked file with submodule creates empty directory
-
-expecting success of 5572.32 'git_pull_ff_only: 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'.
-Deleted branch replace_directory_with_sub1 (was a2e65d5).
-Switched to a new branch 'replace_directory_with_sub1'
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Updating cb28587..a2e65d5
-Fast-forward
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 32 - git_pull_ff_only: replace directory with submodule
-
-expecting success of 5572.33 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Deleted branch remove_sub1 (was d6ba723).
-Switched to a new branch 'remove_sub1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 33 - git_pull_ff_only: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 5572.34 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Deleted branch remove_sub1 (was d6ba723).
-Switched to a new branch 'remove_sub1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 34 - git_pull_ff_only: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 5572.35 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_directory (was cb28587).
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 35 - git_pull_ff_only: replace submodule with a directory must fail
-
-expecting success of 5572.36 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_directory (was cb28587).
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 36 - git_pull_ff_only: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 5572.37 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_file (was 2364f5a).
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git pull --ff-only
-not ok 37 - git_pull_ff_only: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 5572.38 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_file (was 2364f5a).
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git pull --ff-only
-not ok 38 - git_pull_ff_only: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 5572.39 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Deleted branch modify_sub1 (was cb2bda7).
-Switched to a new branch 'modify_sub1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Updating 09bcf53..cb2bda7
-Fast-forward
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 39 - git_pull_ff_only: modified submodule does not update submodule work tree
+	expr "$description" : "A-0-g[0-9a-f]*$"
 
-expecting success of 5572.40 'git_pull_ff_only: 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.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Deleted branch invalid_sub1 (was e6169bf).
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Updating 09bcf53..e6169bf
-Fast-forward
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 40 - git_pull_ff_only: modified submodule does not update submodule work tree to invalid commit
+warning: tag 'Q' is externally known as 'A'
+45
+ok 29 - abbrev=0 will not break misplaced tag (1)
 
-expecting success of 5572.41 'git_pull_ff_only: 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'.
-Deleted branch valid_sub1 (was 3036e4e).
-Switched to a new branch 'valid_sub1'
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Updating e6169bf..3036e4e
-Fast-forward
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 41 - git_pull_ff_only: modified submodule does not update submodule work tree from invalid commit
+expecting success of 6120.30 'abbrev=0 will not break misplaced tag (2)': 
+	description=$(git describe --abbrev=0 c^0) &&
+	expr "$description" : "A-1-g[0-9a-f]*$"
 
-expecting success of 5572.42 'git_pull_ff_only: 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'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Updating 27611a5..09bcf53
-ok 42 - git_pull_ff_only: added submodule doesn't remove untracked unignored file with same name
+warning: tag 'Q' is externally known as 'A'
+45
+ok 30 - abbrev=0 will not break misplaced tag (2)
 
-expecting success of 5572.43 'git_pull_noff: 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'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 43 - git_pull_noff: added submodule creates empty directory
+expecting success of 6120.31 'rename tag Q back to A': 
+	git update-ref refs/tags/A $(git rev-parse refs/tags/Q) &&
+	git update-ref -d refs/tags/Q
 
-expecting success of 5572.44 'git_pull_noff: 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 31 - rename tag Q back to A
+
+expecting success of 6120.32 'pack tag refs': git pack-refs
+ok 32 - pack tag refs
+
+expecting success of 6120.33 'describe HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
+ok 33 - describe HEAD
+
+expecting success of 6120.34 'describe works from outside repo using --git-dir': 
+	git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
+	git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
+	grep -E "^A-8-g[0-9a-f]+$" out
+
+Cloning into bare repository '/build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/bare'...
 done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 44 - git_pull_noff: added submodule leaves existing empty directory alone
+A-8-g8348027
+ok 34 - describe works from outside repo using --git-dir
 
-expecting success of 5572.45 'git_pull_noff: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
+expecting success of 6120.35 'describe --dirty': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Deleted branch replace_file_with_sub1 (was 8b6fdfc).
-Switched to a new branch 'replace_file_with_sub1'
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 45 - git_pull_noff: replace tracked file with submodule creates empty directory
+ok 35 - describe --dirty
 
-expecting success of 5572.46 'git_pull_noff: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
+expecting success of 6120.36 'describe --dirty with --work-tree': 
+	(
+		cd "$TEST_DIRECTORY" &&
+		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
+	) &&
+	grep -E "^A-8-g[0-9a-f]+$" out
+
+A-8-g8348027
+ok 36 - describe --dirty with --work-tree
+
+expecting success of 6120.37 'set-up dirty work tree': 
+	echo >>file
+
+ok 37 - set-up dirty work tree
+
+expecting success of 6120.38 'describe --dirty with --work-tree (dirty)': 
+	git describe --dirty >expected &&
+	(
+		cd "$TEST_DIRECTORY" &&
+		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
+	) &&
+	grep -E "^A-8-g[0-9a-f]+-dirty$" out &&
+	test_cmp expected out
+
+A-8-g8348027-dirty
+ok 38 - describe --dirty with --work-tree (dirty)
+
+expecting success of 6120.39 'describe --dirty=.mod with --work-tree (dirty)': 
+	git describe --dirty=.mod >expected &&
+	(
+		cd "$TEST_DIRECTORY" &&
+		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
+	) &&
+	grep -E "^A-8-g[0-9a-f]+.mod$" out &&
+	test_cmp expected out
+
+A-8-g8348027.mod
+ok 39 - describe --dirty=.mod with --work-tree (dirty)
+
+expecting success of 6120.40 'describe --dirty HEAD': 
+	test_must_fail git describe --dirty HEAD
+
+fatal: option '--dirty' and commit-ishes cannot be used together
+ok 40 - describe --dirty HEAD
+
+expecting success of 6120.41 'set-up matching pattern tests': 
+	git tag -a -m test-annotated test-annotated &&
+	echo >>file &&
+	test_tick &&
+	git commit -a -m "one more" &&
+	git tag test1-lightweight &&
+	echo >>file &&
+	test_tick &&
+	git commit -a -m "yet another" &&
+	git tag test2-lightweight &&
+	echo >>file &&
+	test_tick &&
+	git commit -a -m "even more"
+
+
+[main 56c7540] one more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+[main 06348ff] yet another
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 481b98d] even more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 41 - set-up matching pattern tests
+
+expecting success of 6120.42 'describe --match=test-*': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-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'.
-Deleted branch replace_directory_with_sub1 (was a2e65d5).
-Switched to a new branch 'replace_directory_with_sub1'
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 46 - git_pull_noff: replace directory with submodule
+ok 42 - describe --match=test-*
 
-expecting success of 5572.47 'git_pull_noff: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 6120.43 'describe --tags --match=test1-*': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Deleted branch remove_sub1 (was d6ba723).
-Switched to a new branch 'remove_sub1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Merge made by the 'ort' strategy.
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 47 - git_pull_noff: removed submodule leaves submodule directory and its contents in place
+ok 43 - describe --tags --match=test1-*
 
-expecting success of 5572.48 'git_pull_noff: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 6120.44 'describe --tags --match=test2-*': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Deleted branch remove_sub1 (was d6ba723).
-Switched to a new branch 'remove_sub1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Merge made by the 'ort' strategy.
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 48 - git_pull_noff: removed submodule leaves submodule containing a .git directory alone
+ok 44 - describe --tags --match=test2-*
 
-expecting success of 5572.49 'git_pull_noff: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 6120.45 'describe --long --tags --match=test2-* HEAD^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_directory (was cb28587).
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 49 - git_pull_noff: replace submodule with a directory must fail
+ok 45 - describe --long --tags --match=test2-* HEAD^
 
-expecting success of 5572.50 'git_pull_noff: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 6120.46 'describe --long --tags --match=test1-* --match=test2-* HEAD^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_directory (was cb28587).
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 50 - git_pull_noff: replace submodule containing a .git directory with a directory must fail
+ok 46 - describe --long --tags --match=test1-* --match=test2-* HEAD^
 
-checking known breakage of 5572.51 'git_pull_noff: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 6120.47 'describe --long --tags --match=test1-* --no-match --match=test2-* HEAD^': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_file (was 2364f5a).
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git pull --no-ff
-not ok 51 - git_pull_noff: replace submodule with a file must fail # TODO known breakage
+ok 47 - describe --long --tags --match=test1-* --no-match --match=test2-* HEAD^
 
-checking known breakage of 5572.52 'git_pull_noff: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 6120.48 'describe --long --tags --match=test1-* --match=test3-* HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-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'.
-Deleted branch replace_sub1_with_file (was 2364f5a).
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git pull --no-ff
-not ok 52 - git_pull_noff: replace submodule containing a .git directory with a file must fail # TODO known breakage
+ok 48 - describe --long --tags --match=test1-* --match=test3-* HEAD
 
-expecting success of 5572.53 'git_pull_noff: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
+expecting success of 6120.49 'describe --long --tags --match=test3-* --match=test1-* HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Deleted branch modify_sub1 (was cb2bda7).
-Switched to a new branch 'modify_sub1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Merge made by the 'ort' strategy.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 53 - git_pull_noff: modified submodule does not update submodule work tree
+ok 49 - describe --long --tags --match=test3-* --match=test1-* HEAD
 
-expecting success of 5572.54 'git_pull_noff: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
+expecting success of 6120.50 'set-up branches': 
+	git branch branch_A A &&
+	git branch branch_C c &&
+	git update-ref refs/remotes/origin/remote_branch_A "A^{commit}" &&
+	git update-ref refs/remotes/origin/remote_branch_C "c^{commit}" &&
+	git update-ref refs/original/original_branch_A test-annotated~2
+
+ok 50 - set-up branches
+
+expecting success of 6120.51 'describe --all --match=branch_* --exclude=branch_C HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Deleted branch invalid_sub1 (was e6169bf).
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Merge made by the 'ort' strategy.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 54 - git_pull_noff: modified submodule does not update submodule work tree to invalid commit
+ok 51 - describe --all --match=branch_* --exclude=branch_C HEAD
 
-expecting success of 5572.55 'git_pull_noff: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
+expecting success of 6120.52 'describe --all --match=origin/remote_branch_* --exclude=origin/remote_branch_C HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-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'.
-Deleted branch valid_sub1 (was 3036e4e).
-Switched to a new branch 'valid_sub1'
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Merge made by the 'ort' strategy.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 55 - git_pull_noff: modified submodule does not update submodule work tree from invalid commit
+ok 52 - describe --all --match=origin/remote_branch_* --exclude=origin/remote_branch_C HEAD
 
-expecting success of 5572.56 'git_pull_noff: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
+expecting success of 6120.53 'describe --all test-annotated~1': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Deleted branch add_sub1 (was 09bcf53).
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 56 - git_pull_noff: added submodule doesn't remove untracked unignored file with same name
+ok 53 - describe --all test-annotated~1
 
-expecting success of 5572.57 'setup': 
-	git config --global protocol.file.allow always
+expecting success of 6120.54 '--match does not work for other types': 
+	test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
 
-ok 57 - setup
+fatal: No names found, cannot describe anything.
+ok 54 - --match does not work for other types
 
-expecting success of 5572.58 'pull --recurse-submodule setup': 
-	test_create_repo child &&
-	test_commit -C child bar &&
+expecting success of 6120.55 '--exclude does not work for other types': 
+	R=$(git describe --all --exclude="any_pattern_even_not_matching" test-annotated~1) &&
+	case "$R" in
+	*original_branch_A*) echo "fail: Found unknown reference $R with --exclude"
+		false;;
+	*) echo ok: Found some known type;;
+	esac
 
-	test_create_repo parent &&
-	test_commit -C child foo &&
+ok: Found some known type
+ok 55 - --exclude does not work for other types
 
-	git -C parent submodule add ../child sub &&
-	git -C parent commit -m "add submodule" &&
+expecting success of 6120.56 'name-rev with exact tags': 
+	echo A >expect &&
+	tag_object=$(git rev-parse refs/tags/A) &&
+	git name-rev --tags --name-only $tag_object >actual &&
+	test_cmp expect actual &&
 
-	git clone --recurse-submodules parent super
+	echo "A^0" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	git name-rev --tags --name-only $tagged_commit >actual &&
+	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child/.git/
-[master (root-commit) 750fa6a] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent/.git/
-[master 0e8869f] foo
+ok 56 - name-rev with exact tags
+
+expecting success of 6120.57 'name-rev --all': 
+	>expect.unsorted &&
+	for rev in $(git rev-list --all)
+	do
+		git name-rev $rev >>expect.unsorted || return 1
+	done &&
+	sort <expect.unsorted >expect &&
+	git name-rev --all >actual.unsorted &&
+	sort <actual.unsorted >actual &&
+	test_cmp expect actual
+
+ok 57 - name-rev --all
+
+expecting success of 6120.58 'name-rev --annotate-stdin': 
+	>expect.unsorted &&
+	for rev in $(git rev-list --all)
+	do
+		name=$(git name-rev --name-only $rev) &&
+		echo "$rev ($name)" >>expect.unsorted || return 1
+	done &&
+	sort <expect.unsorted >expect &&
+	git rev-list --all | git name-rev --annotate-stdin >actual.unsorted &&
+	sort <actual.unsorted >actual &&
+	test_cmp expect actual
+
+ok 58 - name-rev --annotate-stdin
+
+expecting success of 6120.59 'name-rev --stdin deprecated': 
+	git rev-list --all | git name-rev --stdin 2>actual &&
+	grep -E 'warning: --stdin is deprecated' actual
+
+481b98dc759b7c93b0c387163557c00de8889c23 (main)
+06348ffaa4ae1477d2839b428def58f191cf82dd (tags/test2-lightweight)
+56c75406622118002f72e47fa889e63b9ce7eef5 (tags/test1-lightweight)
+834802700a921cf3a66bf0094ec2bbb84f556491 (tags/test-annotated^0)
+f543096ac7562240dea61e024b2aded42890e6e4 (tags/test-annotated~1)
+2976a872ebe86c6743c0b22cc2effc6b6690d35d (tags/test-annotated~2)
+d7863c725e80ded9952135c05aa8e5d6f3c7d5eb (tags/e)
+de803f50907ae7b3a6f342dc5237b17cf363824e (tags/R^0)
+d761ce166f3234debb123d4ccd0429d0122850c8 (tags/test-annotated~1^2)
+ab2da115f9a280ba80846007dce6cde8c8becad6 (tags/B^0)
+2ad58678aa2bf02a72a408d80a6166d995d1108d (tags/c)
+4185ee1c25ca8fa52bf846677e8fb33c39a38326 (tags/A^0)
+c48449d08f67c820485130658d6d4199237173e6 (tags/third)
+612fe8f0dd0c85a77a1743b12ad30b34d52c638a (tags/second)
+50b0198675f2d86e1a5851d6a22cb3f904980f03 (tags/initial)
+warning: --stdin is deprecated. Please use --annotate-stdin instead, which is functionally equivalent.
+ok 59 - name-rev --stdin deprecated
+
+expecting success of 6120.60 'describe --contains with the exact tags': 
+	echo "A^0" >expect &&
+	tag_object=$(git rev-parse refs/tags/A) &&
+	git describe --contains $tag_object >actual &&
+	test_cmp expect actual &&
+
+	echo "A^0" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	git describe --contains $tagged_commit >actual &&
+	test_cmp expect actual
+
+ok 60 - describe --contains with the exact tags
+
+expecting success of 6120.61 'describe --contains and --match': 
+	echo "A^0" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	test_must_fail git describe --contains --match="B" $tagged_commit &&
+	git describe --contains --match="B" --match="A" $tagged_commit >actual &&
+	test_cmp expect actual
+
+fatal: cannot describe '4185ee1c25ca8fa52bf846677e8fb33c39a38326'
+ok 61 - describe --contains and --match
+
+expecting success of 6120.62 'describe --exclude': 
+	echo "c~1" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	test_must_fail git describe --contains --match="B" $tagged_commit &&
+	git describe --contains --match="?" --exclude="A" $tagged_commit >actual &&
+	test_cmp expect actual
+
+fatal: cannot describe '4185ee1c25ca8fa52bf846677e8fb33c39a38326'
+ok 62 - describe --exclude
+
+expecting success of 6120.63 'describe --contains and --no-match': 
+	echo "A^0" >expect &&
+	tagged_commit=$(git rev-parse "refs/tags/A^0") &&
+	git describe --contains --match="B" --no-match $tagged_commit >actual &&
+	test_cmp expect actual
+
+ok 63 - describe --contains and --no-match
+
+expecting success of 6120.64 'setup and absorb a submodule': 
+	test_create_repo sub1 &&
+	test_commit -C sub1 initial &&
+	git submodule add ./sub1 &&
+	git submodule absorbgitdirs &&
+	git commit -a -m "add submodule" &&
+	git describe --dirty >expect &&
+	git describe --broken >out &&
+	test_cmp expect out
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/sub1/.git/
+[main (root-commit) d8072fd] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent/sub'...
-done.
-[master (root-commit) e852c8d] add submodule
+ create mode 100644 initial.t
+Adding existing repo at 'sub1' to the index
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/.git/modules/sub1'
+[main b120bfb] add submodule
  Author: A U Thor <author@example.com>
  2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub
-Cloning into 'super'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/super/sub'...
-done.
-Submodule path 'sub': checked out '0e8869f4b19abd4315a34385d48a89d57d29fcef'
-ok 58 - pull --recurse-submodule setup
+ create mode 160000 sub1
+ok 64 - setup and absorb a submodule
 
-expecting success of 5572.59 'recursive pull updates working tree': 
-	test_commit -C child merge_strategy &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "update submodule" &&
+expecting success of 6120.65 'describe chokes on severely broken submodules': 
+	mv .git/modules/sub1/ .git/modules/sub_moved &&
+	test_must_fail git describe --dirty
 
-	git -C super pull --no-rebase --recurse-submodules &&
-	test_path_is_file super/sub/merge_strategy.t
+fatal: not a git repository: sub1/../.git/modules/sub1
+ok 65 - describe chokes on severely broken submodules
 
-[master f5118bb] merge_strategy
+expecting success of 6120.66 'describe ignoring a broken submodule': 
+	git describe --broken >out &&
+	grep broken out
+
+fatal: not a git repository: sub1/../.git/modules/sub1
+test-annotated-4-gb120bfb-broken
+ok 66 - describe ignoring a broken submodule
+
+expecting success of 6120.67 'describe with --work-tree ignoring a broken submodule': 
+	(
+		cd "$TEST_DIRECTORY" &&
+		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --broken >"$TRASH_DIRECTORY/out"
+	) &&
+	test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
+	grep broken out
+
+fatal: not a git repository: sub1/../.git/modules/sub1
+test-annotated-4-gb120bfb-broken
+ok 67 - describe with --work-tree ignoring a broken submodule
+
+expecting success of 6120.68 'describe a blob at a directly tagged commit': 
+	echo "make it a unique blob" >file &&
+	git add file && git commit -m "content in file" &&
+	git tag -a -m "latest annotated tag" unique-file &&
+	git describe HEAD:file >actual &&
+	echo "unique-file:file" >expect &&
+	test_cmp expect actual
+
+[main 0327ce2] content in file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+ok 68 - describe a blob at a directly tagged commit
+
+expecting success of 6120.69 'describe a blob with its first introduction': 
+	git commit --allow-empty -m "empty commit" &&
+	git rm file &&
+	git commit -m "delete blob" &&
+	git revert HEAD &&
+	git commit --allow-empty -m "empty commit" &&
+	git describe HEAD:file >actual &&
+	echo "unique-file:file" >expect &&
+	test_cmp expect actual
+
+[main d56ff78] empty commit
+ Author: A U Thor <author@example.com>
+rm 'file'
+[main c9d39a6] delete blob
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 file
+[main 3aa223e] Revert "delete blob"
  Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:31:13 2005 -0700
  1 file changed, 1 insertion(+)
- create mode 100644 merge_strategy.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   0e8869f..f5118bb  master         -> origin/master
- * [new tag]         merge_strategy -> merge_strategy
-Submodule path 'sub': checked out 'f5118bbe31591c1754caa4ae107e90ff56cba7a2'
-[master e22797f] update submodule
+ create mode 100644 file
+[main 5b2edfd] empty commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
-   e852c8d..e22797f  master     -> origin/master
-Fetching submodule sub
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   0e8869f..f5118bb  master         -> origin/master
- * [new tag]         merge_strategy -> merge_strategy
-Updating e852c8d..e22797f
-Fast-forward
- sub | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'sub': checked out 'f5118bbe31591c1754caa4ae107e90ff56cba7a2'
-ok 59 - recursive pull updates working tree
+ok 69 - describe a blob with its first introduction
 
-expecting success of 5572.60 'submodule.recurse option triggers recursive pull': 
-	test_commit -C child merge_strategy_2 &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "update submodule" &&
+expecting success of 6120.70 'describe directly tagged blob': 
+	git tag test-blob unique-file:file &&
+	git describe test-blob >actual &&
+	echo "unique-file:file" >expect &&
+	# suboptimal: we rather want to see "test-blob"
+	test_cmp expect actual
 
-	git -C super -c submodule.recurse pull --no-rebase &&
-	test_path_is_file super/sub/merge_strategy_2.t
+ok 70 - describe directly tagged blob
 
-[master 2656b36] merge_strategy_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 merge_strategy_2.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   f5118bb..2656b36  master           -> origin/master
- * [new tag]         merge_strategy_2 -> merge_strategy_2
-Submodule path 'sub': checked out '2656b365d0a47009f5a9da9ec2de04ec5d400273'
-[master c804116] update submodule
+expecting success of 6120.71 'describe tag object': 
+	git tag test-blob-1 -a -m msg unique-file:file &&
+	test_must_fail git describe test-blob-1 2>actual &&
+	test_grep "fatal: test-blob-1 is neither a commit nor blob" actual
+
+fatal: test-blob-1 is neither a commit nor blob
+ok 71 - describe tag object
+
+checking prerequisite: ULIMIT_STACK_SIZE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_STACK_SIZE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-ULIMIT_STACK_SIZE" &&
+	test_have_prereq !HPPA,!MINGW,!CYGWIN &&
+	run_with_limited_stack true
+
+)
+prerequisite ULIMIT_STACK_SIZE ok
+expecting success of 6120.72 'name-rev works in a deep repo': 
+	i=1 &&
+	while test $i -lt 8000
+	do
+		echo "commit refs/heads/main
+committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
+data <<EOF
+commit #$i
+EOF" &&
+		if test $i = 1
+		then
+			echo "from refs/heads/main^0"
+		fi &&
+		i=$(($i + 1)) || return 1
+	done | git fast-import &&
+	git checkout main &&
+	git tag far-far-away HEAD^ &&
+	echo "HEAD~4000 tags/far-far-away~3999" >expect &&
+	git name-rev HEAD~4000 >actual &&
+	test_cmp expect actual &&
+	run_with_limited_stack git name-rev HEAD~4000 >actual &&
+	test_cmp expect actual
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:      10000
+Total objects:         7999 (         0 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:         7999 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              5
+Memory total:          2719 KiB
+       pools:          2133 KiB
+     objects:           585 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =       8000
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =    1172067 /    1172067
+---------------------------------------------------------------------
+
+Already on 'main'
+ok 72 - name-rev works in a deep repo
+
+expecting success of 6120.73 'describe works in a deep repo': 
+	git tag -f far-far-away HEAD~7999 &&
+	echo "far-far-away" >expect &&
+	git describe --tags --abbrev=0 HEAD~4000 >actual &&
+	test_cmp expect actual &&
+	run_with_limited_stack git describe --tags --abbrev=0 HEAD~4000 >actual &&
+	test_cmp expect actual
+
+Updated tag 'far-far-away' (was 92d391b)
+ok 73 - describe works in a deep repo
+
+expecting success of 6120.74 'describe --all A': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 74 - describe --all A
+
+expecting success of 6120.75 'describe --all c': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 75 - describe --all c
+
+expecting success of 6120.76 'describe --all --match=branch_* branch_A': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 76 - describe --all --match=branch_* branch_A
+
+expecting success of 6120.77 'describe complains about tree object': 
+	test_must_fail git describe HEAD^{tree}
+
+fatal: HEAD^{tree} is neither a commit nor blob
+ok 77 - describe complains about tree object
+
+expecting success of 6120.78 'describe complains about missing object': 
+	test_must_fail git describe $ZERO_OID
+
+fatal: 0000000000000000000000000000000000000000 is neither a commit nor blob
+ok 78 - describe complains about missing object
+
+expecting success of 6120.79 'name-rev a rev shortly after epoch': 
+	test_when_finished "git checkout main" &&
+
+	git checkout --orphan no-timestamp-underflow &&
+	# Any date closer to epoch than the CUTOFF_DATE_SLOP constant
+	# in builtin/name-rev.c.
+	GIT_COMMITTER_DATE="@1234 +0000" \
+	git commit -m "committer date shortly after epoch" &&
+	old_commit_oid=$(git rev-parse HEAD) &&
+
+	echo "$old_commit_oid no-timestamp-underflow" >expect &&
+	git name-rev $old_commit_oid >actual &&
+	test_cmp expect actual
+
+Switched to a new branch 'no-timestamp-underflow'
+[no-timestamp-underflow (root-commit) c282cde] committer date shortly after epoch
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
-   e22797f..c804116  master     -> origin/master
-Fetching submodule sub
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   f5118bb..2656b36  master           -> origin/master
- * [new tag]         merge_strategy_2 -> merge_strategy_2
-Updating e22797f..c804116
-Fast-forward
- sub | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Submodule path 'sub': checked out '2656b365d0a47009f5a9da9ec2de04ec5d400273'
-ok 60 - submodule.recurse option triggers recursive pull
+ 5 files changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 another
+ create mode 100644 file
+ create mode 100644 side
+ create mode 160000 sub1
+Switched to branch 'main'
+ok 79 - name-rev a rev shortly after epoch
 
-expecting success of 5572.61 ' --[no-]recurse-submodule and submodule.recurse': 
-	test_commit -C child merge_strategy_3 &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "update submodule" &&
+expecting success of 6120.80 'name-rev covers all conditions while looking at parents': 
+	git init repo &&
+	(
+		cd repo &&
 
-	git -C super -c submodule.recurse pull --no-recurse-submodules --no-rebase &&
-	test_path_is_missing super/sub/merge_strategy_3.t &&
-	git -C super -c submodule.recurse=false pull --recurse-submodules --no-rebase &&
-	test_path_is_file super/sub/merge_strategy_3.t &&
+		echo A >file &&
+		git add file &&
+		git commit -m A &&
+		A=$(git rev-parse HEAD) &&
 
-	test_commit -C child merge_strategy_4 &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "update submodule" &&
+		git checkout --detach &&
+		echo B >file &&
+		git commit -m B file &&
+		B=$(git rev-parse HEAD) &&
 
-	git -C super -c submodule.recurse=false pull --no-recurse-submodules --no-rebase &&
-	test_path_is_missing super/sub/merge_strategy_4.t &&
-	git -C super -c submodule.recurse=true pull --recurse-submodules --no-rebase &&
-	test_path_is_file super/sub/merge_strategy_4.t
+		git checkout $A &&
+		git merge --no-ff $B &&  # M1
 
-[master 685538c] merge_strategy_3
+		echo C >file &&
+		git commit -m C file &&
+
+		git checkout $A &&
+		git merge --no-ff HEAD@{1} && # M2
+
+		git checkout main &&
+		git merge --no-ff HEAD@{1} &&
+
+		echo "$B main^2^2~1^2" >expect &&
+		git name-rev $B >actual &&
+
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/repo/.git/
+[main (root-commit) 78654cc] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 merge_strategy_3.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   2656b36..685538c  master           -> origin/master
- * [new tag]         merge_strategy_3 -> merge_strategy_3
-Submodule path 'sub': checked out '685538cca6f18f91014b4629a2f9b9136c6654cf'
-[master 7995336] update submodule
+ create mode 100644 file
+HEAD is now at 78654cc A
+[detached HEAD 6b45b22] B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
-   c804116..7995336  master     -> origin/master
-Updating c804116..7995336
-Fast-forward
- sub | 2 +-
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  6b45b22 B
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> 6b45b22
+
+HEAD is now at 78654cc A
+Merge made by the 'ort' strategy.
+ file | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-Fetching submodule sub
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   2656b36..685538c  master           -> origin/master
- * [new tag]         merge_strategy_3 -> merge_strategy_3
-Already up to date.
-Submodule path 'sub': checked out '685538cca6f18f91014b4629a2f9b9136c6654cf'
-[master c05caa7] merge_strategy_4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 merge_strategy_4.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   685538c..c05caa7  master           -> origin/master
- * [new tag]         merge_strategy_4 -> merge_strategy_4
-Submodule path 'sub': checked out 'c05caa7403cd6cb57ebb9b5c078ede769845b6ac'
-[master ab7e8d7] update submodule
+[detached HEAD ea0b3e9] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
-   7995336..ab7e8d7  master     -> origin/master
-Updating 7995336..ab7e8d7
-Fast-forward
- sub | 2 +-
+Warning: you are leaving 3 commits behind, not connected to
+any of your branches:
+
+  ea0b3e9 C
+  212ac67 Merge commit '6b45b22f510f60512eeb67085e7ac91c21fef10c' into HEAD
+  6b45b22 B
+
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> ea0b3e9
+
+HEAD is now at 78654cc A
+Merge made by the 'ort' strategy.
+ file | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
-Fetching submodule sub
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   685538c..c05caa7  master           -> origin/master
- * [new tag]         merge_strategy_4 -> merge_strategy_4
-Already up to date.
-Submodule path 'sub': checked out 'c05caa7403cd6cb57ebb9b5c078ede769845b6ac'
-ok 61 -  --[no-]recurse-submodule and submodule.recurse
+Warning: you are leaving 4 commits behind, not connected to
+any of your branches:
 
-expecting success of 5572.62 'fetch.recurseSubmodules option triggers recursive fetch (but not recursive update)': 
-	test_commit -C child merge_strategy_5 &&
-	# Omit the parent commit, otherwise this passes with the
-	# default "pull" behavior.
+  d9d7e13 Merge commit 'HEAD@{1}' into HEAD
+  ea0b3e9 C
+  212ac67 Merge commit '6b45b22f510f60512eeb67085e7ac91c21fef10c' into HEAD
+  6b45b22 B
 
-	git -C super -c fetch.recursesubmodules=true pull --no-rebase &&
-	# Check that the submodule commit was fetched
-	sub_oid=$(git -C child rev-parse HEAD) &&
-	git -C super/sub cat-file -e $sub_oid &&
-	# Check that the submodule worktree did not update
-	test_path_is_missing super/sub/merge_strategy_5.t
+If you want to keep them by creating a new branch, this may be a good time
+to do so with:
 
-[master d4ae3d3] merge_strategy_5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 merge_strategy_5.t
-Fetching submodule sub
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   c05caa7..d4ae3d3  master           -> origin/master
- * [new tag]         merge_strategy_5 -> merge_strategy_5
-Already up to date.
-ok 62 - fetch.recurseSubmodules option triggers recursive fetch (but not recursive update)
+ git branch <new-branch-name> d9d7e13
 
-expecting success of 5572.63 'fetch.recurseSubmodules takes precedence over submodule.recurse': 
-	test_commit -C child merge_strategy_6 &&
-	# Omit the parent commit, otherwise this passes with the
-	# default "pull" behavior.
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 80 - name-rev covers all conditions while looking at parents
 
-	git -C super -c submodule.recurse=false -c fetch.recursesubmodules=true pull --no-rebase &&
-	# Check that the submodule commit was fetched
-	sub_oid=$(git -C child rev-parse HEAD) &&
-	git -C super/sub cat-file -e $sub_oid &&
-	# Check that the submodule worktree did not update
-	test_path_is_missing super/sub/merge_strategy_6.t
+expecting success of 6120.81 'non-monotonic commit dates setup': 
+	UNIX_EPOCH_ZERO="@0 +0000" &&
+	git init non-monotonic &&
+	test_commit -C non-monotonic A &&
+	test_commit -C non-monotonic --no-tag B &&
+	test_commit -C non-monotonic --no-tag --date "$UNIX_EPOCH_ZERO" C &&
+	test_commit -C non-monotonic D &&
+	test_commit -C non-monotonic E
 
-[master 1f3a5c4] merge_strategy_6
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/non-monotonic/.git/
+[main (root-commit) 818c4b4] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 merge_strategy_6.t
-Fetching submodule sub
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   d4ae3d3..1f3a5c4  master           -> origin/master
- * [new tag]         merge_strategy_6 -> merge_strategy_6
-Already up to date.
-ok 63 - fetch.recurseSubmodules takes precedence over submodule.recurse
+ create mode 100644 A.t
+[main 350dc83] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+[main f348e82] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[main cc61a00] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+[main 4bc3eeb] E
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 E.t
+ok 81 - non-monotonic commit dates setup
 
-expecting success of 5572.64 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)': 
-	# This tests the following scenario :
-	# - local submodule has new commits
-	# - local superproject does not have new commits
-	# - upstream superproject has new commits that change the submodule pointer
+expecting success of 6120.82 'name-rev with commitGraph handles non-monotonic timestamps': 
+	test_config -C non-monotonic core.commitGraph true &&
+	(
+		cd non-monotonic &&
 
-	# change upstream
-	test_commit -C child rebase_strategy &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "update submodule" &&
+		git commit-graph write --reachable &&
 
-	# also have local commits
-	test_commit -C super/sub local_stuff &&
+		echo "main~3 tags/D~2" >expect &&
+		git name-rev --tags main~3 >actual &&
 
-	git -C super pull --rebase --recurse-submodules &&
-	test_path_is_file super/sub/rebase_strategy.t &&
-	test_path_is_file super/sub/local_stuff.t
+		test_cmp expect actual
+	)
 
-[master 4391f12] rebase_strategy
+ok 82 - name-rev with commitGraph handles non-monotonic timestamps
+
+expecting success of 6120.83 'name-rev --all works with non-monotonic timestamps': 
+	test_config -C non-monotonic core.commitGraph false &&
+	(
+		cd non-monotonic &&
+
+		rm -rf .git/info/commit-graph* &&
+
+		cat >tags <<-\EOF &&
+		tags/E
+		tags/D
+		tags/D~1
+		tags/D~2
+		tags/A
+		EOF
+
+		git log --pretty=%H >revs &&
+
+		paste -d" " revs tags | sort >expect &&
+
+		git name-rev --tags --all | sort >actual &&
+		test_cmp expect actual
+	)
+
+ok 83 - name-rev --all works with non-monotonic timestamps
+
+expecting success of 6120.84 'name-rev --annotate-stdin works with non-monotonic timestamps': 
+	test_config -C non-monotonic core.commitGraph false &&
+	(
+		cd non-monotonic &&
+
+		rm -rf .git/info/commit-graph* &&
+
+		cat >expect <<-\EOF &&
+		E
+		D
+		D~1
+		D~2
+		A
+		EOF
+
+		git log --pretty=%H >revs &&
+		git name-rev --tags --annotate-stdin --name-only <revs >actual &&
+		test_cmp expect actual
+	)
+
+ok 84 - name-rev --annotate-stdin works with non-monotonic timestamps
+
+expecting success of 6120.85 'name-rev --all works with commitGraph': 
+	test_config -C non-monotonic core.commitGraph true &&
+	(
+		cd non-monotonic &&
+
+		git commit-graph write --reachable &&
+
+		cat >tags <<-\EOF &&
+		tags/E
+		tags/D
+		tags/D~1
+		tags/D~2
+		tags/A
+		EOF
+
+		git log --pretty=%H >revs &&
+
+		paste -d" " revs tags | sort >expect &&
+
+		git name-rev --tags --all | sort >actual &&
+		test_cmp expect actual
+	)
+
+ok 85 - name-rev --all works with commitGraph
+
+expecting success of 6120.86 'name-rev --annotate-stdin works with commitGraph': 
+	test_config -C non-monotonic core.commitGraph true &&
+	(
+		cd non-monotonic &&
+
+		git commit-graph write --reachable &&
+
+		cat >expect <<-\EOF &&
+		E
+		D
+		D~1
+		D~2
+		A
+		EOF
+
+		git log --pretty=%H >revs &&
+		git name-rev --tags --annotate-stdin --name-only <revs >actual &&
+		test_cmp expect actual
+	)
+
+ok 86 - name-rev --annotate-stdin works with commitGraph
+
+expecting success of 6120.87 'setup: describe commits with disjoint bases': 
+	git init disjoint1 &&
+	(
+		cd disjoint1 &&
+
+		echo o >> file && git add file && git commit -m o &&
+		echo A >> file && git add file && git commit -m A &&
+		git tag A -a -m A &&
+		echo o >> file && git add file && git commit -m o &&
+
+		git checkout --orphan branch && rm file &&
+		echo B > file2 && git add file2 && git commit -m B &&
+		git tag B -a -m B &&
+		git merge --no-ff --allow-unrelated-histories main -m x
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/disjoint1/.git/
+[main (root-commit) b0940a9] o
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 rebase_strategy.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   c05caa7..4391f12  master          -> origin/master
- * [new tag]         rebase_strategy -> rebase_strategy
- * [new tag]         merge_strategy_5 -> merge_strategy_5
- * [new tag]         merge_strategy_6 -> merge_strategy_6
-Submodule path 'sub': checked out '4391f120cab920b6a92bfc8c3d1803d384f7c2ab'
-[master 7a9de42] update submodule
+ create mode 100644 file
+[main 5301387] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD a12280c] local_stuff
+ 1 file changed, 1 insertion(+)
+[main 04035f9] o
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 local_stuff.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent
-   ab7e8d7..7a9de42  master     -> origin/master
-Fetching submodule sub
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   1f3a5c4..4391f12  master          -> origin/master
- * [new tag]         rebase_strategy -> rebase_strategy
-Updating ab7e8d7..7a9de42
-Fast-forward
- sub | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Rebasing (1/1)

                                                                                
Successfully rebased and updated detached HEAD.
-Submodule path 'sub': rebased into '4391f120cab920b6a92bfc8c3d1803d384f7c2ab'
-ok 64 - pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)
+Switched to a new branch 'branch'
+[branch (root-commit) 38a9f24] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 file
+ create mode 100644 file2
+Merge made by the 'ort' strategy.
+ok 87 - setup: describe commits with disjoint bases
 
-expecting success of 5572.65 'pull --rebase --recurse-submodules fails if both sides record submodule changes': 
-	# This tests the following scenario :
-	# - local superproject has new commits that change the submodule pointer
-	# - upstream superproject has new commits that change the submodule pointer
+expecting success of 6120.88 'describe HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 88 - describe HEAD
 
-	# local changes in submodule recorded in superproject:
-	test_commit -C super/sub local_stuff_2 &&
-	git -C super add sub &&
-	git -C super commit -m "local update submodule" &&
+expecting success of 6120.89 'setup: describe commits with disjoint bases 2': 
+	git init disjoint2 &&
+	(
+		cd disjoint2 &&
 
-	# and in the remote as well:
-	test_commit -C child important_upstream_work &&
-	git -C parent submodule update --remote &&
-	git -C parent add sub &&
-	git -C parent commit -m "remote update submodule" &&
+		echo A >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:00" git commit -m A &&
+		git tag A -a -m A &&
+		echo o >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:01" git commit -m o &&
 
-	# Unfortunately we fail here, despite no conflict in the
-	# submodule itself, but the merge strategy in submodules
-	# does not support rebase:
-	test_must_fail git -C super pull --rebase --recurse-submodules 2>err &&
-	test_grep "locally recorded submodule modifications" err
+		git checkout --orphan branch &&
+		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:00" git commit -m o &&
+		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o &&
+		echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B &&
+		git tag B -a -m B &&
+		git merge --no-ff --allow-unrelated-histories main -m x
+	)
 
-[detached HEAD 759ac20] local_stuff_2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6120-describe/disjoint2/.git/
+[main (root-commit) baf66fb] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 local_stuff_2.t
-[master 9fde00a] local update submodule
+ create mode 100644 file
+[main 36e11f3] o
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[master d4f9c29] important_upstream_work
+ 1 file changed, 1 insertion(+)
+Switched to a new branch 'branch'
+[branch (root-commit) 191fdf7] o
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 file
+ create mode 100644 file2
+[branch f10239c] o
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 important_upstream_work.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/child
-   4391f12..d4f9c29  master                  -> origin/master
- * [new tag]         important_upstream_work -> important_upstream_work
-Submodule path 'sub': checked out 'd4f9c29a61c7ee3ad315fbd2b54c0e503fbceb51'
-[master 1555229] remote update submodule
+[branch 7ece6d3] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: cannot rebase with locally recorded submodule modifications
-ok 65 - pull --rebase --recurse-submodules fails if both sides record submodule changes
-
-expecting success of 5572.66 'pull --rebase --recurse-submodules (no submodule changes, no fork-point)': 
-	# This tests the following scenario :
-	# - local submodule does not have new commits
-	# - local superproject has new commits that *do not* change the submodule pointer
-	# - upstream superproject has new commits that *do not* change the submodule pointer
-	# - local superproject branch has no fork-point with its remote-tracking counter-part
+ 1 file changed, 1 insertion(+)
+Merge made by the 'ort' strategy.
+ok 89 - setup: describe commits with disjoint bases 2
 
-	# create upstream superproject
-	test_create_repo submodule &&
-	test_commit -C submodule first_in_sub &&
+expecting success of 6120.90 'describe HEAD': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 90 - describe HEAD
 
-	test_create_repo superprojet &&
-	test_commit -C superprojet first_in_super &&
-	git -C superprojet submodule add ../submodule &&
-	git -C superprojet commit -m "add submodule" &&
-	test_commit -C superprojet third_in_super &&
+expecting success of 6120.91 'setup misleading taggerdates': 
+	GIT_COMMITTER_DATE="2006-12-12 12:31" git tag -a -m "another tag" newer-tag-older-commit unique-file~1
 
-	# clone superproject
-	git clone --recurse-submodules superprojet superclone &&
+ok 91 - setup misleading taggerdates
 
-	# add commits upstream
-	test_commit -C superprojet fourth_in_super &&
+expecting success of 6120.92 'describe --contains unique-file~2': 
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
+	
+ok 92 - describe --contains unique-file~2
 
-	# create topic branch in clone, not based on any remote-tracking branch
-	git -C superclone checkout -b feat HEAD~1 &&
-	test_commit -C superclone first_on_feat &&
-	git -C superclone pull --rebase --recurse-submodules origin HEAD
+# passed all 92 test(s)
+1..92
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6405-merge-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6405-merge-symlinks/.git/
+expecting success of 6405.1 'setup': 
+	git config core.symlinks false &&
+	>file &&
+	git add file &&
+	git commit -m initial &&
+	git branch b-symlink &&
+	git branch b-file &&
+	l=$(printf file | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m main &&
+	git checkout b-symlink &&
+	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m b-symlink &&
+	git checkout b-file &&
+	echo plain-file >symlink &&
+	git add symlink &&
+	git commit -m b-file
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule/.git/
-[master (root-commit) 49dad2b] first_in_sub
+[main (root-commit) 6ce5622] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first_in_sub.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/superprojet/.git/
-[master (root-commit) 71f9db3] first_in_super
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file
+[main 5fce5e3] main
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 first_in_super.t
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/superprojet/submodule'...
-done.
-[master ef8874e] add submodule
+ create mode 120000 symlink
+Switched to branch 'b-symlink'
+[b-symlink efc53db] b-symlink
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-[master b90c0e9] third_in_super
+ 1 file changed, 1 insertion(+)
+ create mode 120000 symlink
+Switched to branch 'b-file'
+[b-file 32029ee] b-file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 third_in_super.t
-Cloning into 'superclone'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/superclone/submodule'...
-done.
-Submodule path 'submodule': checked out '49dad2bf2d37043f968daefcc5bfbeb341965350'
-[master b1f89fe] fourth_in_super
+ create mode 100644 symlink
+ok 1 - setup
+
+expecting success of 6405.2 'merge main into b-symlink, which has a different symbolic link': 
+	git checkout b-symlink &&
+	test_must_fail git merge main
+
+Switched to branch 'b-symlink'
+CONFLICT (add/add): Merge conflict in symlink
+Automatic merge failed; fix conflicts and then commit the result.
+ok 2 - merge main into b-symlink, which has a different symbolic link
+
+expecting success of 6405.3 'the merge result must be a file': 
+	test_path_is_file symlink
+
+ok 3 - the merge result must be a file
+
+expecting success of 6405.4 'merge main into b-file, which has a file instead of a symbolic link': 
+	git reset --hard &&
+	git checkout b-file &&
+	test_must_fail git merge main
+
+HEAD is now at efc53db b-symlink
+Switched to branch 'b-file'
+CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - merge main into b-file, which has a file instead of a symbolic link
+
+expecting success of 6405.5 'the merge result must be a file': 
+	test_path_is_file symlink
+
+ok 5 - the merge result must be a file
+
+expecting success of 6405.6 'merge b-file, which has a file instead of a symbolic link, into main': 
+	git reset --hard &&
+	git checkout main &&
+	test_must_fail git merge b-file
+
+HEAD is now at 32029ee b-file
+Switched to branch 'main'
+CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 6 - merge b-file, which has a file instead of a symbolic link, into main
+
+expecting success of 6405.7 'the merge result must be a file': 
+	test_path_is_file symlink
+
+ok 7 - the merge result must be a file
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6404-recursive-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6404-recursive-merge/.git/
+expecting success of 6404.1 'setup tests': 
+	GIT_TEST_COMMIT_GRAPH=0 &&
+	export GIT_TEST_COMMIT_GRAPH &&
+	echo 1 >a1 &&
+	git add a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
+
+	git checkout -b A main &&
+	echo A >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
+
+	git checkout -b B main &&
+	echo B >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
+
+	git checkout -b D A &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo D >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
+
+	git symbolic-ref HEAD refs/heads/other &&
+	echo 2 >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
+
+	git checkout -b C &&
+	echo C >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
+
+	git checkout -b E C &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo E >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
+
+	git checkout -b G E &&
+	git rev-parse A >.git/MERGE_HEAD &&
+	echo G >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
+
+	git checkout -b F D &&
+	git rev-parse C >.git/MERGE_HEAD &&
+	echo F >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F &&
+
+	test_oid_cache <<-EOF
+	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
+	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
+	EOF
+
+[main (root-commit) 2cb59ab] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 fourth_in_super.t
-Switched to a new branch 'feat'
-[feat 81a2d37] first_on_feat
+ 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 first_on_feat.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/superprojet
- * branch            HEAD       -> FETCH_HEAD
-Fetching submodule submodule
-Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/feat.
-ok 66 - pull --rebase --recurse-submodules (no submodule changes, no fork-point)
+ create mode 100644 a1
+Switched to a new branch 'C'
+[C d264643] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'E'
+[E 939285a] E
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'G'
+[G 26f86b6] G
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'F'
+[F 71b2f3d] F
+ Author: A U Thor <author@example.com>
+ok 1 - setup tests
 
-expecting success of 5572.67 'branch has no merge base with remote-tracking counterpart': 
-	rm -rf parent child &&
+expecting success of 6404.2 'combined merge conflicts': 
+	test_must_fail git merge -m final G
 
-	test_create_repo a-submodule &&
-	test_commit -C a-submodule foo &&
+  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
 
-	test_create_repo parent &&
-	git -C parent submodule add "$(pwd)/a-submodule" &&
-	git -C parent commit -m foo &&
+expecting success of 6404.3 'result contains a conflict': 
+	cat >expect <<-\EOF &&
+	<<<<<<< HEAD
+	F
+	=======
+	G
+	>>>>>>> G
+	EOF
 
-	git clone parent child &&
+	test_cmp expect a1
 
-	# Reset the current branch so that it has no merge base with
-	# the remote-tracking branch.
-	OTHER=$(git -C child commit-tree -m bar \
-		$(git -C child rev-parse HEAD^{tree})) &&
-	git -C child reset --hard "$OTHER" &&
+ok 3 - result contains a conflict
 
-	git -C child pull --recurse-submodules --rebase
+expecting success of 6404.4 'virtual trees were processed': 
+	# TODO: fragile test, relies on ambigious merge-base resolution
+	git ls-files --stage >out &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/a-submodule/.git/
-[master (root-commit) a4efc16] foo
+	cat >expect <<-EOF &&
+	100644 $(test_oid idxstage1) 1	a1
+	100644 $(git rev-parse F:a1) 2	a1
+	100644 $(git rev-parse G:a1) 3	a1
+	EOF
+
+	test_cmp expect out
+
+ok 4 - virtual trees were processed
+
+expecting success of 6404.5 'refuse to merge binary files': 
+	git reset --hard &&
+	printf "\0" >binary-file &&
+	git add binary-file &&
+	git commit -m binary &&
+	git checkout G &&
+	printf "\0\0" >binary-file &&
+	git add binary-file &&
+	git commit -m binary2 &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_must_fail git merge F >merge_output
+	else
+		test_must_fail git merge F 2>merge_output
+	fi &&
+	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge_output
+
+HEAD is now at 71b2f3d F
+[F 585846d] binary
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t5572-pull-submodule/parent/a-submodule'...
-done.
-[master (root-commit) f0a072d] foo
+ 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>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 a-submodule
-Cloning into 'child'...
-done.
-HEAD is now at fecfbdf bar
-warning: skipped previously applied commit fecfbdf
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-
                                                                                
Successfully rebased and updated refs/heads/master.
-ok 67 - branch has no merge base with remote-tracking counterpart
+ 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
 
-# still have 8 known breakage(s)
-# passed all remaining 59 test(s)
-1..67
+expecting success of 6404.6 'mark rename/delete as unmerged': 
+
+	git reset --hard &&
+	git checkout -b delete &&
+	git rm a1 &&
+	test_tick &&
+	git commit -m delete &&
+	git checkout -b rename HEAD^ &&
+	git mv a1 a2 &&
+	test_tick &&
+	git commit -m rename &&
+	test_must_fail git merge delete &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test 2 = $(git ls-files --unmerged | wc -l)
+	else
+		test 1 = $(git ls-files --unmerged | wc -l)
+	fi &&
+	git rev-parse --verify :2:a2 &&
+	test_must_fail git rev-parse --verify :3:a2 &&
+	git checkout -f delete &&
+	test_must_fail git merge rename &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test 2 = $(git ls-files --unmerged | wc -l)
+	else
+		test 1 = $(git ls-files --unmerged | wc -l)
+	fi &&
+	test_must_fail git rev-parse --verify :2:a2 &&
+	git rev-parse --verify :3:a2
+
+HEAD is now at 4e36843 binary2
+Switched to a new branch 'delete'
+rm 'a1'
+[delete d263b4e] delete
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 100644 a1
+Switched to a new branch 'rename'
+[rename be2bcbd] rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename a1 => a2 (100%)
+CONFLICT (rename/delete): a1 renamed to a2 in HEAD, but deleted in delete.
+Automatic merge failed; fix conflicts and then commit the result.
+fd7923529855d0b274795ae3349c5e0438333979
+fatal: Needed a single revision
+Switched to branch 'delete'
+CONFLICT (rename/delete): a1 renamed to a2 in rename, but deleted in HEAD.
+Automatic merge failed; fix conflicts and then commit the result.
+fatal: Needed a single revision
+fd7923529855d0b274795ae3349c5e0438333979
+ok 6 - mark rename/delete as unmerged
+
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6403-merge-file.sh ***
@@ -404768,8 +404466,8 @@
 checking known breakage of 6403.10 'merge result added missing LF': 
 	test_cmp test.txt test2.txt
 
---- test.txt	2025-12-18 01:37:56.230773267 +0000
-+++ test2.txt	2025-12-18 01:37:56.238773267 +0000
+--- test.txt	2024-11-14 19:40:33.144443689 +0000
++++ test2.txt	2024-11-14 19:40:33.168443935 +0000
 @@ -3,7 +3,11 @@
  super aquam refectionis educavit me;
  animam meam convertit,
@@ -405216,312 +404914,6 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6405-merge-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6405-merge-symlinks/.git/
-expecting success of 6405.1 'setup': 
-	git config core.symlinks false &&
-	>file &&
-	git add file &&
-	git commit -m initial &&
-	git branch b-symlink &&
-	git branch b-file &&
-	l=$(printf file | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m main &&
-	git checkout b-symlink &&
-	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m b-symlink &&
-	git checkout b-file &&
-	echo plain-file >symlink &&
-	git add symlink &&
-	git commit -m b-file
-
-[main (root-commit) 6ce5622] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file
-[main 5fce5e3] main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 symlink
-Switched to branch 'b-symlink'
-[b-symlink efc53db] b-symlink
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 symlink
-Switched to branch 'b-file'
-[b-file 32029ee] b-file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 symlink
-ok 1 - setup
-
-expecting success of 6405.2 'merge main into b-symlink, which has a different symbolic link': 
-	git checkout b-symlink &&
-	test_must_fail git merge main
-
-Switched to branch 'b-symlink'
-CONFLICT (add/add): Merge conflict in symlink
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - merge main into b-symlink, which has a different symbolic link
-
-expecting success of 6405.3 'the merge result must be a file': 
-	test_path_is_file symlink
-
-ok 3 - the merge result must be a file
-
-expecting success of 6405.4 'merge main into b-file, which has a file instead of a symbolic link': 
-	git reset --hard &&
-	git checkout b-file &&
-	test_must_fail git merge main
-
-HEAD is now at efc53db b-symlink
-Switched to branch 'b-file'
-CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - merge main into b-file, which has a file instead of a symbolic link
-
-expecting success of 6405.5 'the merge result must be a file': 
-	test_path_is_file symlink
-
-ok 5 - the merge result must be a file
-
-expecting success of 6405.6 'merge b-file, which has a file instead of a symbolic link, into main': 
-	git reset --hard &&
-	git checkout main &&
-	test_must_fail git merge b-file
-
-HEAD is now at 32029ee b-file
-Switched to branch 'main'
-CONFLICT (distinct types): symlink had different types on each side; renamed one of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 6 - merge b-file, which has a file instead of a symbolic link, into main
-
-expecting success of 6405.7 'the merge result must be a file': 
-	test_path_is_file symlink
-
-ok 7 - the merge result must be a file
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6404-recursive-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6404-recursive-merge/.git/
-expecting success of 6404.1 'setup tests': 
-	GIT_TEST_COMMIT_GRAPH=0 &&
-	export GIT_TEST_COMMIT_GRAPH &&
-	echo 1 >a1 &&
-	git add a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
-
-	git checkout -b A main &&
-	echo A >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
-
-	git checkout -b B main &&
-	echo B >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
-
-	git checkout -b D A &&
-	git rev-parse B >.git/MERGE_HEAD &&
-	echo D >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
-
-	git symbolic-ref HEAD refs/heads/other &&
-	echo 2 >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
-
-	git checkout -b C &&
-	echo C >a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
-
-	git checkout -b E C &&
-	git rev-parse B >.git/MERGE_HEAD &&
-	echo E >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
-
-	git checkout -b G E &&
-	git rev-parse A >.git/MERGE_HEAD &&
-	echo G >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
-
-	git checkout -b F D &&
-	git rev-parse C >.git/MERGE_HEAD &&
-	echo F >a1 &&
-	git update-index a1 &&
-	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F &&
-
-	test_oid_cache <<-EOF
-	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
-	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
-	EOF
-
-[main (root-commit) 2cb59ab] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a1
-Switched to a new branch 'A'
-[A 9d821b5] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'B'
-[B 7082aa6] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'D'
-[D e1146db] D
- Author: A U Thor <author@example.com>
-[other (root-commit) 216d386] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a1
-Switched to a new branch 'C'
-[C d264643] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to a new branch 'E'
-[E 939285a] E
- Author: A U Thor <author@example.com>
-Switched to a new branch 'G'
-[G 26f86b6] G
- Author: A U Thor <author@example.com>
-Switched to a new branch 'F'
-[F 71b2f3d] F
- Author: A U Thor <author@example.com>
-ok 1 - setup tests
-
-expecting success of 6404.2 'combined merge conflicts': 
-	test_must_fail git merge -m final G
-
-  From inner merge:  Auto-merging a1
-  From inner merge:  CONFLICT (add/add): Merge conflict in a1
-  From inner merge:  Auto-merging a1
-  From inner merge:  CONFLICT (content): Merge conflict in a1
-Auto-merging a1
-CONFLICT (content): Merge conflict in a1
-Automatic merge failed; fix conflicts and then commit the result.
-ok 2 - combined merge conflicts
-
-expecting success of 6404.3 'result contains a conflict': 
-	cat >expect <<-\EOF &&
-	<<<<<<< HEAD
-	F
-	=======
-	G
-	>>>>>>> G
-	EOF
-
-	test_cmp expect a1
-
-ok 3 - result contains a conflict
-
-expecting success of 6404.4 'virtual trees were processed': 
-	# TODO: fragile test, relies on ambigious merge-base resolution
-	git ls-files --stage >out &&
-
-	cat >expect <<-EOF &&
-	100644 $(test_oid idxstage1) 1	a1
-	100644 $(git rev-parse F:a1) 2	a1
-	100644 $(git rev-parse G:a1) 3	a1
-	EOF
-
-	test_cmp expect out
-
-ok 4 - virtual trees were processed
-
-expecting success of 6404.5 'refuse to merge binary files': 
-	git reset --hard &&
-	printf "\0" >binary-file &&
-	git add binary-file &&
-	git commit -m binary &&
-	git checkout G &&
-	printf "\0\0" >binary-file &&
-	git add binary-file &&
-	git commit -m binary2 &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test_must_fail git merge F >merge_output
-	else
-		test_must_fail git merge F 2>merge_output
-	fi &&
-	grep "Cannot merge binary files: binary-file (HEAD vs. F)" merge_output
-
-HEAD is now at 71b2f3d F
-[F 585846d] binary
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binary-file
-Switched to branch 'G'
-[G 4e36843] binary2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 binary-file
-warning: Cannot merge binary files: binary-file (HEAD vs. F)
-ok 5 - refuse to merge binary files
-
-expecting success of 6404.6 'mark rename/delete as unmerged': 
-
-	git reset --hard &&
-	git checkout -b delete &&
-	git rm a1 &&
-	test_tick &&
-	git commit -m delete &&
-	git checkout -b rename HEAD^ &&
-	git mv a1 a2 &&
-	test_tick &&
-	git commit -m rename &&
-	test_must_fail git merge delete &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test 2 = $(git ls-files --unmerged | wc -l)
-	else
-		test 1 = $(git ls-files --unmerged | wc -l)
-	fi &&
-	git rev-parse --verify :2:a2 &&
-	test_must_fail git rev-parse --verify :3:a2 &&
-	git checkout -f delete &&
-	test_must_fail git merge rename &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		test 2 = $(git ls-files --unmerged | wc -l)
-	else
-		test 1 = $(git ls-files --unmerged | wc -l)
-	fi &&
-	test_must_fail git rev-parse --verify :2:a2 &&
-	git rev-parse --verify :3:a2
-
-HEAD is now at 4e36843 binary2
-Switched to a new branch 'delete'
-rm 'a1'
-[delete d263b4e] delete
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 100644 a1
-Switched to a new branch 'rename'
-[rename be2bcbd] rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename a1 => a2 (100%)
-CONFLICT (rename/delete): a1 renamed to a2 in HEAD, but deleted in delete.
-Automatic merge failed; fix conflicts and then commit the result.
-fd7923529855d0b274795ae3349c5e0438333979
-fatal: Needed a single revision
-Switched to branch 'delete'
-CONFLICT (rename/delete): a1 renamed to a2 in rename, but deleted in HEAD.
-Automatic merge failed; fix conflicts and then commit the result.
-fatal: Needed a single revision
-fd7923529855d0b274795ae3349c5e0438333979
-ok 6 - mark rename/delete as unmerged
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6407-merge-binary.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6407-merge-binary/.git/
 expecting success of 6407.1 'setup': 
@@ -405583,7 +404975,7 @@
 Trying simple merge.
 Simple merge failed, trying Automatic merge.
 Auto-merging m
-error: Cannot merge binary files: .merge_file_JqFzOz
+error: Cannot merge binary files: .merge_file_oSZGXE
 ERROR: content conflict in m
 fatal: merge program failed
 Automatic merge failed; fix conflicts and then commit the result.
@@ -405609,132 +405001,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6408-merge-up-to-date.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-
-[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"
-
-
-HEAD is now at e042178 second
-Already up to date.
-ok 2 - merge -s recursive up-to-date
-
-expecting success of 6408.3 'merge -s recursive fast-forward': 
-
-	git reset --hard c0 &&
-	test_tick &&
-	git merge -s recursive c1 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
-
-
-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 6408.4 'merge -s ours up-to-date': 
-
-	git reset --hard c1 &&
-	test_tick &&
-	git merge -s ours c0 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
-
-
-HEAD is now at e042178 second
-Already up to date.
-ok 4 - merge -s ours up-to-date
-
-expecting success of 6408.5 'merge -s ours fast-forward': 
-
-	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"
-
-
-HEAD is now at 1bd44cb initial
-Merge made by the 'ours' strategy.
-ok 5 - merge -s ours fast-forward
-
-expecting success of 6408.6 'merge -s subtree up-to-date': 
-
-	git reset --hard c1 &&
-	test_tick &&
-	git merge -s subtree c0 &&
-	expect=$(git rev-parse c1) &&
-	current=$(git rev-parse HEAD) &&
-	test "$expect" = "$current"
-
-
-HEAD is now at e042178 second
-Already up to date.
-ok 6 - merge -s subtree up-to-date
-
-expecting success of 6408.7 'merge fast-forward octopus': 
-
-	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 1bd44cb initial
-Updating 1bd44cb..52cad15
-Fast-forward
- file | 1 +
- 1 file changed, 1 insertion(+)
-ok 7 - merge fast-forward octopus
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6406-merge-attr.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6406-merge-attr/.git/
 expecting success of 6406.1 'setup': 
@@ -406084,62 +405350,130 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6413-merge-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6413-merge-crlf/.git/
-expecting success of 6413.1 'setup': 
-	git config core.autocrlf true &&
-	echo foo | append_cr >file &&
+*** t6408-merge-up-to-date.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6408-merge-up-to-date/.git/
+expecting success of 6408.1 'setup': 
+	>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
+	test_tick &&
+	git commit -m initial &&
+	git tag c0 &&
 
-[main (root-commit) e0f7379] Initial
+	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
+
+[master (root-commit) 1bd44cb] initial
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
+ 1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 file
-[main 8798c05] add line from a
+[master e042178] second
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'side'
-[side 5296996] add line from b
+ 1 file changed, 1 insertion(+)
+[master 52cad15] third
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 6413.2 'Check "ours" is CRLF': 
-	git reset --hard initial &&
-	git merge side -s ours &&
-	remove_cr <file | append_cr >file.temp &&
-	test_cmp file file.temp
+expecting success of 6408.2 'merge -s recursive up-to-date': 
 
-HEAD is now at e0f7379 Initial
+	git reset --hard c1 &&
+	test_tick &&
+	git merge -s recursive c0 &&
+	expect=$(git rev-parse c1) &&
+	current=$(git rev-parse HEAD) &&
+	test "$expect" = "$current"
+
+
+HEAD is now at e042178 second
+Already up to date.
+ok 2 - merge -s recursive up-to-date
+
+expecting success of 6408.3 'merge -s recursive fast-forward': 
+
+	git reset --hard c0 &&
+	test_tick &&
+	git merge -s recursive c1 &&
+	expect=$(git rev-parse c1) &&
+	current=$(git rev-parse HEAD) &&
+	test "$expect" = "$current"
+
+
+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 6408.4 'merge -s ours up-to-date': 
+
+	git reset --hard c1 &&
+	test_tick &&
+	git merge -s ours c0 &&
+	expect=$(git rev-parse c1) &&
+	current=$(git rev-parse HEAD) &&
+	test "$expect" = "$current"
+
+
+HEAD is now at e042178 second
+Already up to date.
+ok 4 - merge -s ours up-to-date
+
+expecting success of 6408.5 'merge -s ours fast-forward': 
+
+	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"
+
+
+HEAD is now at 1bd44cb initial
 Merge made by the 'ours' strategy.
-ok 2 - Check "ours" is CRLF
+ok 5 - merge -s ours fast-forward
 
-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
+expecting success of 6408.6 'merge -s subtree up-to-date': 
 
-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
+	git reset --hard c1 &&
+	test_tick &&
+	git merge -s subtree c0 &&
+	expect=$(git rev-parse c1) &&
+	current=$(git rev-parse HEAD) &&
+	test "$expect" = "$current"
 
-# passed all 3 test(s)
-1..3
+
+HEAD is now at e042178 second
+Already up to date.
+ok 6 - merge -s subtree up-to-date
+
+expecting success of 6408.7 'merge fast-forward octopus': 
+
+	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 1bd44cb initial
+Updating 1bd44cb..52cad15
+Fast-forward
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+ok 7 - merge fast-forward octopus
+
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6409-merge-subtree.sh ***
@@ -406403,134 +405737,59 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6414-merge-rename-nocruft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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" &&
-
+*** t6413-merge-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6413-merge-crlf/.git/
+expecting success of 6413.1 'setup': 
+	git config core.autocrlf true &&
+	echo foo | append_cr >file &&
+	git add file &&
+	git commit -m "Initial" &&
+	git tag initial &&
+	git branch side &&
+	echo line from a | append_cr >file &&
+	git commit -m "add line from a" file &&
+	git tag a &&
+	git checkout side &&
+	echo line from b | append_cr >file &&
+	git commit -m "add line from b" file &&
+	git tag b &&
 	git checkout main
 
-[main (root-commit) 7bbb60a] initial has A and M
- Author: A U Thor <author@example.com>
- 2 files changed, 30 insertions(+)
- create mode 100644 A
- create mode 100644 M
-Switched to branch 'white'
-[white 72f28f0] white renames A->B, M->N
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 2 deletions(-)
- rename A => B (93%)
- rename M => N (93%)
-Switched to branch 'red'
-[red f4afd94] red creates R
+[main (root-commit) e0f7379] Initial
  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
+ create mode 100644 file
+[main 8798c05] add line from a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'side'
+[side 5296996] add line from b
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Switched to branch 'main'
 ok 1 - setup
 
-expecting success of 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 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
 
-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)
+HEAD is now at e0f7379 Initial
+Merge made by the 'ours' strategy.
+ok 2 - Check "ours" is CRLF
 
-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
+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
 
-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)
+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
@@ -407605,6 +406864,139 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6414-merge-rename-nocruft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6414-merge-rename-nocruft/.git/
+expecting success of 6414.1 'setup': 
+	cat >A <<-\EOF &&
+	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	c cccccccccccccccccccccccccccccccccccccccccccccccc
+	d dddddddddddddddddddddddddddddddddddddddddddddddd
+	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+	f ffffffffffffffffffffffffffffffffffffffffffffffff
+	g gggggggggggggggggggggggggggggggggggggggggggggggg
+	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+	l llllllllllllllllllllllllllllllllllllllllllllllll
+	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+	o oooooooooooooooooooooooooooooooooooooooooooooooo
+	EOF
+
+	cat >M <<-\EOF &&
+	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
+	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
+	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
+	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+	EOF
+
+	git add A M &&
+	git commit -m "initial has A and M" &&
+	git branch white &&
+	git branch red &&
+	git branch blue &&
+
+	git checkout white &&
+	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "white renames A->B, M->N" &&
+
+	git checkout red &&
+	echo created by red >R &&
+	git update-index --add R &&
+	git commit -m "red creates R" &&
+
+	git checkout blue &&
+	sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
+	rm -f A &&
+	mv B A &&
+	git update-index A &&
+	git commit -m "blue modify A" &&
+
+	git checkout main
+
+[main (root-commit) 7bbb60a] initial has A and M
+ Author: A U Thor <author@example.com>
+ 2 files changed, 30 insertions(+)
+ create mode 100644 A
+ create mode 100644 M
+Switched to branch 'white'
+[white 72f28f0] white renames A->B, M->N
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => B (93%)
+ rename M => N (93%)
+Switched to branch 'red'
+[red f4afd94] red creates R
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 R
+Switched to branch 'blue'
+[blue ea35213] blue modify A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 6414.2 'merge white into red (A->B,M->N)': 
+	git checkout -b red-white red &&
+	git merge white &&
+	git write-tree &&
+	test_path_is_file B &&
+	test_path_is_file N &&
+	test_path_is_file R &&
+	test_path_is_missing A &&
+	test_path_is_missing M
+
+Switched to a new branch 'red-white'
+Merge made by the 'ort' strategy.
+ A => B | 2 +-
+ M => N | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ rename A => B (93%)
+ rename M => N (93%)
+2f1341e5f32ecb7f45a35d122e62999a76d463cf
+ok 2 - merge white into red (A->B,M->N)
+
+expecting success of 6414.3 'merge blue into white (A->B, mod A, A untracked)': 
+	git checkout -b white-blue white &&
+	echo dirty >A &&
+	git merge blue &&
+	git write-tree &&
+	test_path_is_file A &&
+	echo dirty >expect &&
+	test_cmp expect A &&
+	test_path_is_file B &&
+	test_path_is_file N &&
+	test_path_is_missing M
+
+Switched to a new branch 'white-blue'
+Auto-merging B
+Merge made by the 'ort' strategy.
+ B | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+1db6abaa095ec16043333967f8d0dbaa01cdf029
+ok 3 - merge blue into white (A->B, mod A, A untracked)
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6417-merge-ours-theirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6417-merge-ours-theirs/.git/
 expecting success of 6417.1 'setup': 
@@ -407862,22 +407254,6 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6419-merge-ignorecase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6415-merge-dir-to-symlink.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6415-merge-dir-to-symlink/.git/
 expecting success of 6415.1 'create a commit where dir a/b changed to symlink': 
@@ -408332,758 +407708,6 @@
 1..24
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6418-merge-text-auto.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6421-merge-partial-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6421-merge-partial-clone/.git/
-expecting success of 6421.1 'Objects downloaded for single relevant rename': 
-	test_setup_repo &&
-	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-single &&
-	(
-		cd objects-single &&
-
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-before &&
-
-		git checkout -q origin/A &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
-			-c merge.directoryRenames=true merge --no-stat \
-			--no-progress origin/B-single &&
-
-		# Check the number of objects we reported we would fetch
-		cat >expect <<-EOF &&
-		fetch_count:2
-		fetch_count:1
-		EOF
-		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
-		test_cmp expect actual &&
-
-		# Check the number of fetch commands exec-ed
-		grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
-		test_line_count = 2 fetches &&
-
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-after &&
-		comm -2 -3 missing-objects-before missing-objects-after >old &&
-		comm -1 -3 missing-objects-before missing-objects-after >new &&
-		# No new missing objects
-		test_must_be_empty new &&
-		# Fetched 2 + 1 = 3 objects
-		test_line_count = 3 old
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6421-merge-partial-clone/server/.git/
-[master (root-commit) fb87a8e] O
- Author: A U Thor <author@example.com>
- 103 files changed, 150 insertions(+)
- create mode 100644 basename/numbers
- create mode 100644 basename/sequence
- create mode 100644 basename/values
- create mode 100644 dir/subdir/Makefile
- create mode 100644 dir/subdir/a
- create mode 100644 dir/subdir/b
- create mode 100644 dir/subdir/c
- create mode 100644 dir/subdir/d
- create mode 100644 dir/subdir/e
- create mode 100644 dir/subdir/tweaked/Makefile
- create mode 100644 dir/subdir/tweaked/f
- create mode 100644 dir/subdir/tweaked/g
- create mode 100644 dir/subdir/tweaked/h
- create mode 100644 dir/unchanged/file_1
- create mode 100644 dir/unchanged/file_10
- create mode 100644 dir/unchanged/file_11
- create mode 100644 dir/unchanged/file_12
- create mode 100644 dir/unchanged/file_13
- create mode 100644 dir/unchanged/file_14
- create mode 100644 dir/unchanged/file_15
- create mode 100644 dir/unchanged/file_16
- create mode 100644 dir/unchanged/file_17
- create mode 100644 dir/unchanged/file_18
- create mode 100644 dir/unchanged/file_19
- create mode 100644 dir/unchanged/file_2
- create mode 100644 dir/unchanged/file_20
- create mode 100644 dir/unchanged/file_21
- create mode 100644 dir/unchanged/file_22
- create mode 100644 dir/unchanged/file_23
- create mode 100644 dir/unchanged/file_24
- create mode 100644 dir/unchanged/file_25
- create mode 100644 dir/unchanged/file_26
- create mode 100644 dir/unchanged/file_27
- create mode 100644 dir/unchanged/file_28
- create mode 100644 dir/unchanged/file_29
- create mode 100644 dir/unchanged/file_3
- create mode 100644 dir/unchanged/file_30
- create mode 100644 dir/unchanged/file_31
- create mode 100644 dir/unchanged/file_32
- create mode 100644 dir/unchanged/file_33
- create mode 100644 dir/unchanged/file_34
- create mode 100644 dir/unchanged/file_35
- create mode 100644 dir/unchanged/file_36
- create mode 100644 dir/unchanged/file_37
- create mode 100644 dir/unchanged/file_38
- create mode 100644 dir/unchanged/file_39
- create mode 100644 dir/unchanged/file_4
- create mode 100644 dir/unchanged/file_40
- create mode 100644 dir/unchanged/file_41
- create mode 100644 dir/unchanged/file_42
- create mode 100644 dir/unchanged/file_43
- create mode 100644 dir/unchanged/file_44
- create mode 100644 dir/unchanged/file_45
- create mode 100644 dir/unchanged/file_46
- create mode 100644 dir/unchanged/file_47
- create mode 100644 dir/unchanged/file_48
- create mode 100644 dir/unchanged/file_49
- create mode 100644 dir/unchanged/file_5
- create mode 100644 dir/unchanged/file_50
- create mode 100644 dir/unchanged/file_51
- create mode 100644 dir/unchanged/file_52
- create mode 100644 dir/unchanged/file_53
- create mode 100644 dir/unchanged/file_54
- create mode 100644 dir/unchanged/file_55
- create mode 100644 dir/unchanged/file_56
- create mode 100644 dir/unchanged/file_57
- create mode 100644 dir/unchanged/file_58
- create mode 100644 dir/unchanged/file_59
- create mode 100644 dir/unchanged/file_6
- create mode 100644 dir/unchanged/file_60
- create mode 100644 dir/unchanged/file_61
- create mode 100644 dir/unchanged/file_62
- create mode 100644 dir/unchanged/file_63
- create mode 100644 dir/unchanged/file_64
- create mode 100644 dir/unchanged/file_65
- create mode 100644 dir/unchanged/file_66
- create mode 100644 dir/unchanged/file_67
- create mode 100644 dir/unchanged/file_68
- create mode 100644 dir/unchanged/file_69
- create mode 100644 dir/unchanged/file_7
- create mode 100644 dir/unchanged/file_70
- create mode 100644 dir/unchanged/file_71
- create mode 100644 dir/unchanged/file_72
- create mode 100644 dir/unchanged/file_73
- create mode 100644 dir/unchanged/file_74
- create mode 100644 dir/unchanged/file_75
- create mode 100644 dir/unchanged/file_76
- create mode 100644 dir/unchanged/file_77
- create mode 100644 dir/unchanged/file_78
- create mode 100644 dir/unchanged/file_79
- create mode 100644 dir/unchanged/file_8
- create mode 100644 dir/unchanged/file_80
- create mode 100644 dir/unchanged/file_81
- create mode 100644 dir/unchanged/file_82
- create mode 100644 dir/unchanged/file_83
- create mode 100644 dir/unchanged/file_84
- create mode 100644 dir/unchanged/file_85
- create mode 100644 dir/unchanged/file_86
- create mode 100644 dir/unchanged/file_87
- create mode 100644 dir/unchanged/file_88
- create mode 100644 dir/unchanged/file_9
- create mode 100644 general/leap1
- create mode 100644 general/leap2
-Switched to branch 'A'
-rm 'general/leap1'
-rm 'general/leap2'
-rm 'dir/subdir/tweaked/f'
-[A b0c40f6] A
- Author: A U Thor <author@example.com>
- 105 files changed, 10 insertions(+), 2 deletions(-)
- rename basename/{ => subdir}/numbers (92%)
- rename basename/{ => subdir}/sequence (92%)
- rename basename/{ => subdir}/values (92%)
- delete mode 100644 dir/subdir/e
- delete mode 100644 dir/subdir/tweaked/f
- rename {dir => folder}/subdir/Makefile (87%)
- rename {dir => folder}/subdir/a (100%)
- rename {dir => folder}/subdir/b (100%)
- rename {dir => folder}/subdir/c (100%)
- rename {dir => folder}/subdir/d (100%)
- create mode 100644 folder/subdir/newsubdir/e
- create mode 100644 folder/subdir/newsubdir/newfile.rs
- rename {dir => folder}/subdir/tweaked/Makefile (81%)
- rename {dir => folder}/subdir/tweaked/g (100%)
- rename {dir => folder}/subdir/tweaked/h (100%)
- rename {dir => folder}/unchanged/file_1 (100%)
- rename {dir => folder}/unchanged/file_10 (100%)
- rename {dir => folder}/unchanged/file_11 (100%)
- rename {dir => folder}/unchanged/file_12 (100%)
- rename {dir => folder}/unchanged/file_13 (100%)
- rename {dir => folder}/unchanged/file_14 (100%)
- rename {dir => folder}/unchanged/file_15 (100%)
- rename {dir => folder}/unchanged/file_16 (100%)
- rename {dir => folder}/unchanged/file_17 (100%)
- rename {dir => folder}/unchanged/file_18 (100%)
- rename {dir => folder}/unchanged/file_19 (100%)
- rename {dir => folder}/unchanged/file_2 (100%)
- rename {dir => folder}/unchanged/file_20 (100%)
- rename {dir => folder}/unchanged/file_21 (100%)
- rename {dir => folder}/unchanged/file_22 (100%)
- rename {dir => folder}/unchanged/file_23 (100%)
- rename {dir => folder}/unchanged/file_24 (100%)
- rename {dir => folder}/unchanged/file_25 (100%)
- rename {dir => folder}/unchanged/file_26 (100%)
- rename {dir => folder}/unchanged/file_27 (100%)
- rename {dir => folder}/unchanged/file_28 (100%)
- rename {dir => folder}/unchanged/file_29 (100%)
- rename {dir => folder}/unchanged/file_3 (100%)
- rename {dir => folder}/unchanged/file_30 (100%)
- rename {dir => folder}/unchanged/file_31 (100%)
- rename {dir => folder}/unchanged/file_32 (100%)
- rename {dir => folder}/unchanged/file_33 (100%)
- rename {dir => folder}/unchanged/file_34 (100%)
- rename {dir => folder}/unchanged/file_35 (100%)
- rename {dir => folder}/unchanged/file_36 (100%)
- rename {dir => folder}/unchanged/file_37 (100%)
- rename {dir => folder}/unchanged/file_38 (100%)
- rename {dir => folder}/unchanged/file_39 (100%)
- rename {dir => folder}/unchanged/file_4 (100%)
- rename {dir => folder}/unchanged/file_40 (100%)
- rename {dir => folder}/unchanged/file_41 (100%)
- rename {dir => folder}/unchanged/file_42 (100%)
- rename {dir => folder}/unchanged/file_43 (100%)
- rename {dir => folder}/unchanged/file_44 (100%)
- rename {dir => folder}/unchanged/file_45 (100%)
- rename {dir => folder}/unchanged/file_46 (100%)
- rename {dir => folder}/unchanged/file_47 (100%)
- rename {dir => folder}/unchanged/file_48 (100%)
- rename {dir => folder}/unchanged/file_49 (100%)
- rename {dir => folder}/unchanged/file_5 (100%)
- rename {dir => folder}/unchanged/file_50 (100%)
- rename {dir => folder}/unchanged/file_51 (100%)
- rename {dir => folder}/unchanged/file_52 (100%)
- rename {dir => folder}/unchanged/file_53 (100%)
- rename {dir => folder}/unchanged/file_54 (100%)
- rename {dir => folder}/unchanged/file_55 (100%)
- rename {dir => folder}/unchanged/file_56 (100%)
- rename {dir => folder}/unchanged/file_57 (100%)
- rename {dir => folder}/unchanged/file_58 (100%)
- rename {dir => folder}/unchanged/file_59 (100%)
- rename {dir => folder}/unchanged/file_6 (100%)
- rename {dir => folder}/unchanged/file_60 (100%)
- rename {dir => folder}/unchanged/file_61 (100%)
- rename {dir => folder}/unchanged/file_62 (100%)
- rename {dir => folder}/unchanged/file_63 (100%)
- rename {dir => folder}/unchanged/file_64 (100%)
- rename {dir => folder}/unchanged/file_65 (100%)
- rename {dir => folder}/unchanged/file_66 (100%)
- rename {dir => folder}/unchanged/file_67 (100%)
- rename {dir => folder}/unchanged/file_68 (100%)
- rename {dir => folder}/unchanged/file_69 (100%)
- rename {dir => folder}/unchanged/file_7 (100%)
- rename {dir => folder}/unchanged/file_70 (100%)
- rename {dir => folder}/unchanged/file_71 (100%)
- rename {dir => folder}/unchanged/file_72 (100%)
- rename {dir => folder}/unchanged/file_73 (100%)
- rename {dir => folder}/unchanged/file_74 (100%)
- rename {dir => folder}/unchanged/file_75 (100%)
- rename {dir => folder}/unchanged/file_76 (100%)
- rename {dir => folder}/unchanged/file_77 (100%)
- rename {dir => folder}/unchanged/file_78 (100%)
- rename {dir => folder}/unchanged/file_79 (100%)
- rename {dir => folder}/unchanged/file_8 (100%)
- rename {dir => folder}/unchanged/file_80 (100%)
- rename {dir => folder}/unchanged/file_81 (100%)
- rename {dir => folder}/unchanged/file_82 (100%)
- rename {dir => folder}/unchanged/file_83 (100%)
- rename {dir => folder}/unchanged/file_84 (100%)
- rename {dir => folder}/unchanged/file_85 (100%)
- rename {dir => folder}/unchanged/file_86 (100%)
- rename {dir => folder}/unchanged/file_87 (100%)
- rename {dir => folder}/unchanged/file_88 (100%)
- rename {dir => folder}/unchanged/file_9 (100%)
- rename general/{leap1 => jump1} (88%)
- rename general/{leap2 => jump2} (91%)
-Switched to branch 'B-single'
-[B-single 4be199b] B-single
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 general/newfile.pl
-Switched to branch 'B-dir'
-[B-dir 4ce2107] B-dir
- Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 dir/subdir/newfile.groovy
- create mode 100644 dir/subdir/newfile.java
- create mode 100644 dir/subdir/newfile.scala
-Switched to branch 'B-many'
-[B-many fa0fa91] B-many
- Author: A U Thor <author@example.com>
- 7 files changed, 7 insertions(+)
- rename basename/{ => subdir}/numbers (88%)
- rename basename/{ => subdir}/sequence (89%)
- rename basename/{ => subdir}/values (88%)
- create mode 100644 dir/subdir/newfile.c
- create mode 100644 dir/subdir/newsubdir/newfile.py
-Switched to branch 'A'
-Cloning into 'objects-single'...
-Auto-merging folder/subdir/Makefile
-Merge made by the 'ort' strategy.
-ok 1 - Objects downloaded for single relevant rename
-
-expecting success of 6421.2 'Objects downloaded when a directory rename triggered': 
-	test_setup_repo &&
-	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-dir &&
-	(
-		cd objects-dir &&
-
-		git rev-list --objects --all --missing=print |
-			grep "^?" | sort >missing-objects-before &&
-
-		git checkout -q origin/A &&
-
-		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
-			-c merge.directoryRenames=true merge --no-stat \
-			--no-progress origin/B-dir &&
-
-		# Check the number of objects we reported we would fetch
-		cat >expect <<-EOF &&
-		fetch_count:6
-		EOF
-		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
-		test_cmp expect actual &&
-
-		# Check the number of fetch commands exec-ed
-		grep d0.*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
-		grep d0.*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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6402-merge-rename.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6402-merge-rename/.git/
 expecting success of 6402.1 'setup': 
@@ -410718,528 +409342,772 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6425-merge-rename-delete.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t6419-merge-ignorecase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6419-merge-ignorecase/.git/
+checking prerequisite: CASE_INSENSITIVE_FS
 
-[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
+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
 
-# passed all 1 test(s)
-1..1
+)
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6424-merge-unrelated-index-changes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
+*** t6418-merge-text-auto.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6418-merge-text-auto/.git/
+expecting success of 6418.1 'setup': 
+	git config core.autocrlf false &&
 
-	git branch A &&
-	git branch B &&
-	git branch C &&
-	git branch D &&
-	git branch E &&
-	git branch F &&
+	echo first line | append_cr >file &&
+	echo first line >control_file &&
+	echo only line >inert_file &&
 
-	git checkout B &&
-	echo b >b &&
-	echo 11 >>a &&
-	git add a b &&
-	test_tick && git commit -m B &&
+	git add file control_file inert_file &&
+	test_tick &&
+	git commit -m "Initial" &&
+	git tag initial &&
+	git branch side &&
 
-	git checkout C &&
-	echo c >c &&
-	git add c &&
-	test_tick && git commit -m C &&
+	echo "* text=auto" >.gitattributes &&
+	echo first line >file &&
+	git add .gitattributes file &&
+	test_tick &&
+	git commit -m "normalize file" &&
 
-	git checkout D &&
-	test_seq 2 10 >a &&
-	echo d >d &&
-	git add a d &&
-	test_tick && git commit -m D &&
+	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 checkout E &&
-	mkdir subdir &&
-	git mv a subdir/a &&
-	echo e >subdir/e &&
-	git add subdir &&
-	test_tick && git commit -m E &&
+	git rm .gitattributes &&
+	rm file &&
+	git checkout file &&
+	test_tick &&
+	git commit -m "remove .gitattributes" &&
+	git tag c &&
 
-	git checkout F &&
-	test_tick && git commit --allow-empty -m F
+	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 &&
 
-[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
+	git checkout main
+
+[main (root-commit) 1c56df1] Initial
  Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 b
-Switched to branch 'C'
-[C 4fa59ce] C
+ 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>
- 1 file changed, 1 insertion(+)
- create mode 100644 c
-Switched to branch 'D'
-[D c3c5299] D
+ 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, 1 insertion(+), 1 deletion(-)
- create mode 100644 d
-Switched to branch 'E'
-[E b615563] E
+ 2 files changed, 2 insertions(+)
+rm '.gitattributes'
+Updated 1 path from the index
+[main 2f716ad] remove .gitattributes
  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
+ 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>
-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
+ 2 files changed, 2 insertions(+)
+Switched to branch 'main'
+ok 1 - setup
 
-expecting success of 6424.5 'resolve, non-trivial': 
-	git reset --hard &&
-	git checkout B^0 &&
+expecting success of 6418.2 'set up fuzz_conflict() helper': 
+	fuzz_conflict() {
+		sed $SED_OPTIONS -e "s/^\([<>=]......\) .*/\1/" "$@"
+	}
 
-	touch random_file && git add random_file &&
+ok 2 - set up fuzz_conflict() helper
 
-	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
+expecting success of 6418.3 'Merge after setting text=auto': 
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
 
-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
+	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
 
-expecting success of 6424.6 'resolve, trivial, related file removed': 
-	git reset --hard &&
-	git checkout B^0 &&
+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
 
-	git rm a &&
-	test_path_is_missing a &&
+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
 
-	test_must_fail git merge -s resolve C^0 &&
+	git config merge.renormalize true &&
+	git rm -fr . &&
+	rm -f .gitattributes &&
+	git reset --hard b &&
+	git merge a &&
+	compare_files  expected file
 
-	test_path_is_missing a &&
-	test_path_is_missing .git/MERGE_HEAD
+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
 
-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 6418.5 'Merge addition of text=auto eol=CRLF': 
+	git config core.eol crlf &&
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
 
-expecting success of 6424.7 'resolve, non-trivial, related file removed': 
-	git reset --hard &&
-	git checkout B^0 &&
+	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
 
-	git rm a &&
-	test_path_is_missing a &&
+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
 
-	# 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 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
 
-	test_path_is_missing a &&
-	test_path_is_missing .git/MERGE_HEAD
+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
 
-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 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
 
-expecting success of 6424.8 'recursive': 
-	git reset --hard &&
-	git checkout B^0 &&
+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
 
-	touch random_file && git add random_file &&
+expecting success of 6418.8 'checkout -m after setting text=auto': 
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
 
-	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
+	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
 
-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
+rm '.gitattributes'
+rm 'control_file'
+rm 'file'
+rm 'file'
+rm 'file'
+rm 'inert_file'
+HEAD is now at 1c56df1 Initial
+Note: switching to 'b'.
 
-expecting success of 6424.9 'recursive, when merge branch matches merge base': 
-	git reset --hard &&
-	git checkout 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.
 
-	touch random_file && git add random_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:
 
-	test_must_fail git merge -s recursive F^0 &&
-	test_path_is_missing .git/MERGE_HEAD
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-expecting success of 6424.10 'merge-recursive, when index==head but head!=HEAD': 
-	git reset --hard &&
-	git checkout C^0 &&
+  git switch -
 
-	# 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
+Turn off this advice by setting config variable advice.detachedHead to false
 
-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 0d9ffb6 add line from b
+M	file
+ok 8 - checkout -m after setting text=auto
 
-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 6418.9 'checkout -m addition of text=auto': 
+	cat <<-\EOF >expected &&
+	first line
+	same line
+	EOF
 
-	mkdir subdir &&
-	test_seq 1 10 >subdir/a &&
-	git add subdir/a &&
-	git rev-parse --verify :subdir/a >expect &&
+	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
 
-	# 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
+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
 
-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 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
 
-expecting success of 6424.12 'recursive, when file has staged changes matching what a merge would give': 
-	git reset --hard &&
-	git checkout B^0 &&
+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
 
-	mkdir subdir &&
-	test_seq 1 11 >subdir/a &&
-	git add subdir/a &&
-	git rev-parse --verify :subdir/a >expect &&
+expecting success of 6418.11 'rename/delete vs. renormalization': 
+	git init subrepo &&
+	(
+		cd subrepo &&
+		echo foo >oldfile &&
+		git add oldfile &&
+		git commit -m original &&
 
-	# 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
+		git branch rename &&
+		git branch nuke &&
 
-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
+		git checkout rename &&
+		git mv oldfile newfile &&
+		git commit -m renamed &&
 
-expecting success of 6424.13 'octopus, unrelated file touched': 
-	git reset --hard &&
-	git checkout B^0 &&
+		git checkout nuke &&
+		git rm oldfile &&
+		git commit -m deleted &&
 
-	touch random_file && git add random_file &&
+		git checkout rename^0 &&
+		test_must_fail git -c merge.renormalize=true merge nuke >out &&
 
-	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
+		grep "rename/delete" out
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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'.
 
-expecting success of 6424.14 'octopus, related file removed': 
-	git reset --hard &&
-	git checkout 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.
 
-	git rm b &&
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-	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
+  git switch -c <new-branch-name>
 
-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
+Or undo this operation with:
 
-expecting success of 6424.15 'octopus, related file modified': 
-	git reset --hard &&
-	git checkout B^0 &&
+  git switch -
 
-	echo 12 >>a && git add a &&
-	git rev-parse --verify :a >expect &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-	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 0094749 renamed
+CONFLICT (rename/delete): oldfile renamed to newfile in HEAD, but deleted in nuke.
+ok 11 - rename/delete vs. renormalization
 
-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
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6421-merge-partial-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6421-merge-partial-clone/.git/
+expecting success of 6421.1 'Objects downloaded for single relevant rename': 
+	test_setup_repo &&
+	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-single &&
+	(
+		cd objects-single &&
 
-expecting success of 6424.16 'ours': 
-	git reset --hard &&
-	git checkout B^0 &&
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-before &&
 
-	touch random_file && git add random_file &&
+		git checkout -q origin/A &&
 
-	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
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
+			-c merge.directoryRenames=true merge --no-stat \
+			--no-progress origin/B-single &&
 
-HEAD is now at ed5d5a6 B
-HEAD is now at ed5d5a6 B
-Merge with strategy ours failed.
-e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ok 16 - ours
+		# Check the number of objects we reported we would fetch
+		cat >expect <<-EOF &&
+		fetch_count:2
+		fetch_count:1
+		EOF
+		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
+		test_cmp expect actual &&
 
-expecting success of 6424.17 'subtree': 
-	git reset --hard &&
-	git checkout B^0 &&
+		# Check the number of fetch commands exec-ed
+		grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
+		test_line_count = 2 fetches &&
 
-	touch random_file && git add random_file &&
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-after &&
+		comm -2 -3 missing-objects-before missing-objects-after >old &&
+		comm -1 -3 missing-objects-before missing-objects-after >new &&
+		# No new missing objects
+		test_must_be_empty new &&
+		# Fetched 2 + 1 = 3 objects
+		test_line_count = 3 old
+	)
 
-	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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6421-merge-partial-clone/server/.git/
+[master (root-commit) fb87a8e] O
+ Author: A U Thor <author@example.com>
+ 103 files changed, 150 insertions(+)
+ create mode 100644 basename/numbers
+ create mode 100644 basename/sequence
+ create mode 100644 basename/values
+ create mode 100644 dir/subdir/Makefile
+ create mode 100644 dir/subdir/a
+ create mode 100644 dir/subdir/b
+ create mode 100644 dir/subdir/c
+ create mode 100644 dir/subdir/d
+ create mode 100644 dir/subdir/e
+ create mode 100644 dir/subdir/tweaked/Makefile
+ create mode 100644 dir/subdir/tweaked/f
+ create mode 100644 dir/subdir/tweaked/g
+ create mode 100644 dir/subdir/tweaked/h
+ create mode 100644 dir/unchanged/file_1
+ create mode 100644 dir/unchanged/file_10
+ create mode 100644 dir/unchanged/file_11
+ create mode 100644 dir/unchanged/file_12
+ create mode 100644 dir/unchanged/file_13
+ create mode 100644 dir/unchanged/file_14
+ create mode 100644 dir/unchanged/file_15
+ create mode 100644 dir/unchanged/file_16
+ create mode 100644 dir/unchanged/file_17
+ create mode 100644 dir/unchanged/file_18
+ create mode 100644 dir/unchanged/file_19
+ create mode 100644 dir/unchanged/file_2
+ create mode 100644 dir/unchanged/file_20
+ create mode 100644 dir/unchanged/file_21
+ create mode 100644 dir/unchanged/file_22
+ create mode 100644 dir/unchanged/file_23
+ create mode 100644 dir/unchanged/file_24
+ create mode 100644 dir/unchanged/file_25
+ create mode 100644 dir/unchanged/file_26
+ create mode 100644 dir/unchanged/file_27
+ create mode 100644 dir/unchanged/file_28
+ create mode 100644 dir/unchanged/file_29
+ create mode 100644 dir/unchanged/file_3
+ create mode 100644 dir/unchanged/file_30
+ create mode 100644 dir/unchanged/file_31
+ create mode 100644 dir/unchanged/file_32
+ create mode 100644 dir/unchanged/file_33
+ create mode 100644 dir/unchanged/file_34
+ create mode 100644 dir/unchanged/file_35
+ create mode 100644 dir/unchanged/file_36
+ create mode 100644 dir/unchanged/file_37
+ create mode 100644 dir/unchanged/file_38
+ create mode 100644 dir/unchanged/file_39
+ create mode 100644 dir/unchanged/file_4
+ create mode 100644 dir/unchanged/file_40
+ create mode 100644 dir/unchanged/file_41
+ create mode 100644 dir/unchanged/file_42
+ create mode 100644 dir/unchanged/file_43
+ create mode 100644 dir/unchanged/file_44
+ create mode 100644 dir/unchanged/file_45
+ create mode 100644 dir/unchanged/file_46
+ create mode 100644 dir/unchanged/file_47
+ create mode 100644 dir/unchanged/file_48
+ create mode 100644 dir/unchanged/file_49
+ create mode 100644 dir/unchanged/file_5
+ create mode 100644 dir/unchanged/file_50
+ create mode 100644 dir/unchanged/file_51
+ create mode 100644 dir/unchanged/file_52
+ create mode 100644 dir/unchanged/file_53
+ create mode 100644 dir/unchanged/file_54
+ create mode 100644 dir/unchanged/file_55
+ create mode 100644 dir/unchanged/file_56
+ create mode 100644 dir/unchanged/file_57
+ create mode 100644 dir/unchanged/file_58
+ create mode 100644 dir/unchanged/file_59
+ create mode 100644 dir/unchanged/file_6
+ create mode 100644 dir/unchanged/file_60
+ create mode 100644 dir/unchanged/file_61
+ create mode 100644 dir/unchanged/file_62
+ create mode 100644 dir/unchanged/file_63
+ create mode 100644 dir/unchanged/file_64
+ create mode 100644 dir/unchanged/file_65
+ create mode 100644 dir/unchanged/file_66
+ create mode 100644 dir/unchanged/file_67
+ create mode 100644 dir/unchanged/file_68
+ create mode 100644 dir/unchanged/file_69
+ create mode 100644 dir/unchanged/file_7
+ create mode 100644 dir/unchanged/file_70
+ create mode 100644 dir/unchanged/file_71
+ create mode 100644 dir/unchanged/file_72
+ create mode 100644 dir/unchanged/file_73
+ create mode 100644 dir/unchanged/file_74
+ create mode 100644 dir/unchanged/file_75
+ create mode 100644 dir/unchanged/file_76
+ create mode 100644 dir/unchanged/file_77
+ create mode 100644 dir/unchanged/file_78
+ create mode 100644 dir/unchanged/file_79
+ create mode 100644 dir/unchanged/file_8
+ create mode 100644 dir/unchanged/file_80
+ create mode 100644 dir/unchanged/file_81
+ create mode 100644 dir/unchanged/file_82
+ create mode 100644 dir/unchanged/file_83
+ create mode 100644 dir/unchanged/file_84
+ create mode 100644 dir/unchanged/file_85
+ create mode 100644 dir/unchanged/file_86
+ create mode 100644 dir/unchanged/file_87
+ create mode 100644 dir/unchanged/file_88
+ create mode 100644 dir/unchanged/file_9
+ create mode 100644 general/leap1
+ create mode 100644 general/leap2
+Switched to branch 'A'
+rm 'general/leap1'
+rm 'general/leap2'
+rm 'dir/subdir/tweaked/f'
+[A b0c40f6] A
+ Author: A U Thor <author@example.com>
+ 105 files changed, 10 insertions(+), 2 deletions(-)
+ rename basename/{ => subdir}/numbers (92%)
+ rename basename/{ => subdir}/sequence (92%)
+ rename basename/{ => subdir}/values (92%)
+ delete mode 100644 dir/subdir/e
+ delete mode 100644 dir/subdir/tweaked/f
+ rename {dir => folder}/subdir/Makefile (87%)
+ rename {dir => folder}/subdir/a (100%)
+ rename {dir => folder}/subdir/b (100%)
+ rename {dir => folder}/subdir/c (100%)
+ rename {dir => folder}/subdir/d (100%)
+ create mode 100644 folder/subdir/newsubdir/e
+ create mode 100644 folder/subdir/newsubdir/newfile.rs
+ rename {dir => folder}/subdir/tweaked/Makefile (81%)
+ rename {dir => folder}/subdir/tweaked/g (100%)
+ rename {dir => folder}/subdir/tweaked/h (100%)
+ rename {dir => folder}/unchanged/file_1 (100%)
+ rename {dir => folder}/unchanged/file_10 (100%)
+ rename {dir => folder}/unchanged/file_11 (100%)
+ rename {dir => folder}/unchanged/file_12 (100%)
+ rename {dir => folder}/unchanged/file_13 (100%)
+ rename {dir => folder}/unchanged/file_14 (100%)
+ rename {dir => folder}/unchanged/file_15 (100%)
+ rename {dir => folder}/unchanged/file_16 (100%)
+ rename {dir => folder}/unchanged/file_17 (100%)
+ rename {dir => folder}/unchanged/file_18 (100%)
+ rename {dir => folder}/unchanged/file_19 (100%)
+ rename {dir => folder}/unchanged/file_2 (100%)
+ rename {dir => folder}/unchanged/file_20 (100%)
+ rename {dir => folder}/unchanged/file_21 (100%)
+ rename {dir => folder}/unchanged/file_22 (100%)
+ rename {dir => folder}/unchanged/file_23 (100%)
+ rename {dir => folder}/unchanged/file_24 (100%)
+ rename {dir => folder}/unchanged/file_25 (100%)
+ rename {dir => folder}/unchanged/file_26 (100%)
+ rename {dir => folder}/unchanged/file_27 (100%)
+ rename {dir => folder}/unchanged/file_28 (100%)
+ rename {dir => folder}/unchanged/file_29 (100%)
+ rename {dir => folder}/unchanged/file_3 (100%)
+ rename {dir => folder}/unchanged/file_30 (100%)
+ rename {dir => folder}/unchanged/file_31 (100%)
+ rename {dir => folder}/unchanged/file_32 (100%)
+ rename {dir => folder}/unchanged/file_33 (100%)
+ rename {dir => folder}/unchanged/file_34 (100%)
+ rename {dir => folder}/unchanged/file_35 (100%)
+ rename {dir => folder}/unchanged/file_36 (100%)
+ rename {dir => folder}/unchanged/file_37 (100%)
+ rename {dir => folder}/unchanged/file_38 (100%)
+ rename {dir => folder}/unchanged/file_39 (100%)
+ rename {dir => folder}/unchanged/file_4 (100%)
+ rename {dir => folder}/unchanged/file_40 (100%)
+ rename {dir => folder}/unchanged/file_41 (100%)
+ rename {dir => folder}/unchanged/file_42 (100%)
+ rename {dir => folder}/unchanged/file_43 (100%)
+ rename {dir => folder}/unchanged/file_44 (100%)
+ rename {dir => folder}/unchanged/file_45 (100%)
+ rename {dir => folder}/unchanged/file_46 (100%)
+ rename {dir => folder}/unchanged/file_47 (100%)
+ rename {dir => folder}/unchanged/file_48 (100%)
+ rename {dir => folder}/unchanged/file_49 (100%)
+ rename {dir => folder}/unchanged/file_5 (100%)
+ rename {dir => folder}/unchanged/file_50 (100%)
+ rename {dir => folder}/unchanged/file_51 (100%)
+ rename {dir => folder}/unchanged/file_52 (100%)
+ rename {dir => folder}/unchanged/file_53 (100%)
+ rename {dir => folder}/unchanged/file_54 (100%)
+ rename {dir => folder}/unchanged/file_55 (100%)
+ rename {dir => folder}/unchanged/file_56 (100%)
+ rename {dir => folder}/unchanged/file_57 (100%)
+ rename {dir => folder}/unchanged/file_58 (100%)
+ rename {dir => folder}/unchanged/file_59 (100%)
+ rename {dir => folder}/unchanged/file_6 (100%)
+ rename {dir => folder}/unchanged/file_60 (100%)
+ rename {dir => folder}/unchanged/file_61 (100%)
+ rename {dir => folder}/unchanged/file_62 (100%)
+ rename {dir => folder}/unchanged/file_63 (100%)
+ rename {dir => folder}/unchanged/file_64 (100%)
+ rename {dir => folder}/unchanged/file_65 (100%)
+ rename {dir => folder}/unchanged/file_66 (100%)
+ rename {dir => folder}/unchanged/file_67 (100%)
+ rename {dir => folder}/unchanged/file_68 (100%)
+ rename {dir => folder}/unchanged/file_69 (100%)
+ rename {dir => folder}/unchanged/file_7 (100%)
+ rename {dir => folder}/unchanged/file_70 (100%)
+ rename {dir => folder}/unchanged/file_71 (100%)
+ rename {dir => folder}/unchanged/file_72 (100%)
+ rename {dir => folder}/unchanged/file_73 (100%)
+ rename {dir => folder}/unchanged/file_74 (100%)
+ rename {dir => folder}/unchanged/file_75 (100%)
+ rename {dir => folder}/unchanged/file_76 (100%)
+ rename {dir => folder}/unchanged/file_77 (100%)
+ rename {dir => folder}/unchanged/file_78 (100%)
+ rename {dir => folder}/unchanged/file_79 (100%)
+ rename {dir => folder}/unchanged/file_8 (100%)
+ rename {dir => folder}/unchanged/file_80 (100%)
+ rename {dir => folder}/unchanged/file_81 (100%)
+ rename {dir => folder}/unchanged/file_82 (100%)
+ rename {dir => folder}/unchanged/file_83 (100%)
+ rename {dir => folder}/unchanged/file_84 (100%)
+ rename {dir => folder}/unchanged/file_85 (100%)
+ rename {dir => folder}/unchanged/file_86 (100%)
+ rename {dir => folder}/unchanged/file_87 (100%)
+ rename {dir => folder}/unchanged/file_88 (100%)
+ rename {dir => folder}/unchanged/file_9 (100%)
+ rename general/{leap1 => jump1} (88%)
+ rename general/{leap2 => jump2} (91%)
+Switched to branch 'B-single'
+[B-single 4be199b] B-single
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 general/newfile.pl
+Switched to branch 'B-dir'
+[B-dir 4ce2107] B-dir
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 dir/subdir/newfile.groovy
+ create mode 100644 dir/subdir/newfile.java
+ create mode 100644 dir/subdir/newfile.scala
+Switched to branch 'B-many'
+[B-many fa0fa91] B-many
+ Author: A U Thor <author@example.com>
+ 7 files changed, 7 insertions(+)
+ rename basename/{ => subdir}/numbers (88%)
+ rename basename/{ => subdir}/sequence (89%)
+ rename basename/{ => subdir}/values (88%)
+ create mode 100644 dir/subdir/newfile.c
+ create mode 100644 dir/subdir/newsubdir/newfile.py
+Switched to branch 'A'
+Cloning into 'objects-single'...
+Auto-merging folder/subdir/Makefile
+Merge made by the 'ort' strategy.
+ok 1 - Objects downloaded for single relevant rename
 
-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 6421.2 'Objects downloaded when a directory rename triggered': 
+	test_setup_repo &&
+	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-dir &&
+	(
+		cd objects-dir &&
 
-expecting success of 6424.18 'avoid failure due to stat-dirty files': 
-	git reset --hard &&
-	git checkout B^0 &&
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-before &&
 
-	# Make "a" be stat-dirty
-	test-tool chmtime =+1 a &&
+		git checkout -q origin/A &&
 
-	# stat-dirty file should not prevent stash creation in builtin/merge.c
-	git merge -s resolve -s recursive D^0
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
+			-c merge.directoryRenames=true merge --no-stat \
+			--no-progress origin/B-dir &&
 
-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
+		# Check the number of objects we reported we would fetch
+		cat >expect <<-EOF &&
+		fetch_count:6
+		EOF
+		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
+		test_cmp expect actual &&
 
-expecting success of 6424.19 'with multiple strategies, recursive or ort failure do not early abort': 
-	git reset --hard &&
-	git checkout B^0 &&
+		# Check the number of fetch commands exec-ed
+		grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
+		test_line_count = 1 fetches &&
 
-	test_seq 0 10 >a &&
-	git add a &&
-	git rev-parse :a >expect &&
+		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
+	)
 
-	sane_unset GIT_TEST_MERGE_ALGORITHM &&
-	test_must_fail git merge -s recursive -s ort -s octopus C^0 >output 2>&1 &&
+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
 
-	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 &&
+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 &&
 
-	# Changes to "a" should remain staged
-	git rev-parse :a >actual &&
-	test_cmp expect actual
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-before &&
 
-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:
+		git checkout -q origin/A &&
 
-  c1fdbe2 Merge commit 'D^0' into HEAD
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
+			-c merge.directoryRenames=true merge --no-stat \
+			--no-progress origin/B-many &&
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+		# 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 &&
 
- git branch <new-branch-name> c1fdbe2
+		# Check the number of fetch commands exec-ed
+		grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
+		test_line_count = 4 fetches &&
 
-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
+		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
+	)
 
-# passed all 19 test(s)
-1..19
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6300-for-each-ref.sh ***
@@ -412599,7 +411467,7 @@
 	git for-each-ref --format="%(authordate:rfc2822)" refs/heads
 
 Tue Jul 4 01:18:44 2006 +0200
-19 years ago
+18 years ago
 2006-07-04
 Mon Jul 3 23:18:44 2006
 2006-07-04 01:18:44 +0200
@@ -414737,857 +413605,133 @@
 1..423
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6426-merge-skip-unneeded-updates.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/.git/
-expecting success of 6426.1 '1a-L: Modify(A)/Modify(B), change on B subset of A': 
-	test_setup_1a L &&
-	(
-		cd 1a_L &&
-
-		git checkout A^0 &&
-
-		test-tool chmtime --get -3600 b >old-mtime &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_must_be_empty err &&
-
-		# Make sure b was NOT updated
-		test-tool chmtime --get b >new-mtime &&
-		test_cmp old-mtime new-mtime &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
-
-		git rev-parse >actual HEAD:b &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
-
-		git hash-object b   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/1a_L/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A 14800cf] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'B'
-[B dfd7e13] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 14800cf A
-ok 1 - 1a-L: Modify(A)/Modify(B), change on B subset of A
-
-expecting success of 6426.2 '1a-R: Modify(A)/Modify(B), change on B subset of A': 
-	test_setup_1a R &&
-	(
-		cd 1a_R &&
-
-		git checkout B^0 &&
-
-		test-tool chmtime --get -3600 b >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		# Make sure b WAS updated
-		test-tool chmtime --get b >new-mtime &&
-		test $(cat old-mtime) -lt $(cat new-mtime) &&
-
-		test_must_be_empty err &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
-
-		git rev-parse >actual HEAD:b &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
-
-		git hash-object b   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/1a_R/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A 14800cf] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'B'
-[B dfd7e13] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'B^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at dfd7e13 B
-ok 2 - 1a-R: Modify(A)/Modify(B), change on B subset of A
-
-expecting success of 6426.3 '2a-L: Modify/rename, merge into modify side': 
-	test_setup_2a L &&
-	(
-		cd 2a_L &&
-
-		git checkout A^0 &&
-
-		test_path_is_missing c &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_path_is_file c &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+*** t6425-merge-rename-delete.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
+	git checkout -b rename &&
+	git mv A B &&
+	git commit -m "rename" &&
 
-		git hash-object c   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual &&
+	git checkout main &&
+	git rm A &&
+	git commit -m "delete" &&
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/2a_L/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A c2d59c7] A
+[main (root-commit) 6604e52] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 6283fcf] B
+ 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 b => c (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at c2d59c7 A
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 3 - 2a-L: Modify/rename, merge into modify side
-
-expecting success of 6426.4 '2a-R: Modify/rename, merge into rename side': 
-	test_setup_2a R &&
-	(
-		cd 2a_R &&
-
-		git checkout B^0 &&
-
-		test-tool chmtime --get -3600 c >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		# Make sure c WAS updated
-		test-tool chmtime --get c >new-mtime &&
-		test $(cat old-mtime) -lt $(cat new-mtime) &&
-
-		test_must_be_empty err &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
-
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
-
-		git hash-object c   >actual &&
-		git rev-parse   A:b >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+ rename A => B (100%)
+Switched to branch 'main'
+rm 'A'
+[main b4eee36] delete
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => c (100%)
-Note: switching to 'B^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 6283fcf B
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 4 - 2a-R: Modify/rename, merge into rename side
-
-expecting success of 6426.5 '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A': 
-	test_setup_2b L &&
-	(
-		cd 2b_L &&
-
-		git checkout A^0 &&
+ 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
 
-		test-tool chmtime --get -3600 c >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6424-merge-unrelated-index-changes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 
-		test_must_be_empty err &&
+	git branch A &&
+	git branch B &&
+	git branch C &&
+	git branch D &&
+	git branch E &&
+	git branch F &&
 
-		# Make sure c WAS updated
-		test-tool chmtime --get c >new-mtime &&
-		test_cmp old-mtime new-mtime &&
+	git checkout B &&
+	echo b >b &&
+	echo 11 >>a &&
+	git add a b &&
+	test_tick && git commit -m B &&
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+	git checkout C &&
+	echo c >c &&
+	git add c &&
+	test_tick && git commit -m C &&
 
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:c &&
-		test_cmp expect actual &&
+	git checkout D &&
+	test_seq 2 10 >a &&
+	echo d >d &&
+	git add a d &&
+	test_tick && git commit -m D &&
 
-		git hash-object c   >actual &&
-		git rev-parse   A:c >expect &&
-		test_cmp expect actual &&
+	git checkout E &&
+	mkdir subdir &&
+	git mv a subdir/a &&
+	echo e >subdir/e &&
+	git add subdir &&
+	test_tick && git commit -m E &&
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+	git checkout F &&
+	test_tick && git commit --allow-empty -m F
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/2b_L/.git/
-[master (root-commit) 105387b] O
+[master (root-commit) 87af29c] A
  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%)
+ create mode 100644 a
 Switched to branch 'B'
-[B dfd7e13] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at fed518a A
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 5 - 2b-L: Rename+Mod(A)/Mod(B), B mods subset of A
-
-expecting success of 6426.6 '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A': 
-	test_setup_2b R &&
-	(
-		cd 2b_R &&
-
-		git checkout B^0 &&
-
-		test_path_is_missing c &&
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
-
-		# Make sure c now present (and thus was updated)
-		test_path_is_file c &&
-
-		test_must_be_empty err &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
-
-		git rev-parse >actual HEAD:c &&
-		git rev-parse >expect A:c &&
-		test_cmp expect actual &&
-
-		git hash-object c   >actual &&
-		git rev-parse   A:c >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/2b_R/.git/
-[master (root-commit) 105387b] O
+[B ed5d5a6] B
  Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
+ 2 files changed, 2 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
+Switched to branch 'C'
+[C 4fa59ce] C
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-Note: switching to 'B^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at dfd7e13 B
-fatal: path 'b' does not exist in 'HEAD'
-HEAD:b
-ok 6 - 2b-R: Rename+Mod(A)/Mod(B), B mods subset of A
-
-expecting success of 6426.7 '2c: Modify b & add c VS rename b->c': 
-	test_setup_2c &&
-	(
-		cd 2c &&
-
-		git checkout A^0 &&
-
-		test-tool chmtime --get -3600 c >old-mtime &&
-		GIT_MERGE_VERBOSITY=3 &&
-		export GIT_MERGE_VERBOSITY &&
-		test_must_fail git merge -s recursive B^0 >out 2>err &&
-
-		test_grep "CONFLICT (.*/add):" out &&
-		test_must_be_empty err &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
-
-		# Ensure b was removed
-		test_path_is_missing b &&
-
-		# Make sure c WAS updated...
-		test-tool chmtime --get c >new-mtime &&
-		test $(cat old-mtime) -lt $(cat new-mtime) &&
-
-		# ...and has correct index entries and working tree contents
-		git rev-parse >actual :2:c :3:c &&
-		git rev-parse >expect A:c  A:b  &&
-		test_cmp expect actual &&
-
-		git cat-file -p A:b >>merge-me &&
-		git cat-file -p A:c >>merged &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "B^0" \
-			merged empty merge-me &&
-		test_cmp merged c
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/2c/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A edf631f] A
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
  create mode 100644 c
-Switched to branch 'B'
-[B 6283fcf] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename b => c (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at edf631f A
-CONFLICT (add/add): Merge conflict in c
-ok 7 - 2c: Modify b & add c VS rename b->c
-
-expecting success of 6426.8 '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3a L &&
-	(
-		cd 3a_L &&
-
-		git checkout A^0 &&
-
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-
-		test_must_be_empty err &&
-
-		test_path_is_file bar/bq &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
-
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect A:foo/bq    A:foo/whatever &&
-		test_cmp expect actual &&
-
-		git hash-object bar/bq   bar/whatever   >actual &&
-		git rev-parse   A:foo/bq A:foo/whatever >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/3a_L/.git/
-[master (root-commit) 1e2aa57] O
- Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A 5576138] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename bq => foo/bq (87%)
-Switched to branch 'B'
-[B 69c0854] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 5576138 A
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 8 - 3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success of 6426.9 '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3a R &&
-	(
-		cd 3a_R &&
-
-		git checkout B^0 &&
-
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
-
-		test_must_be_empty err &&
-
-		test_path_is_file bar/bq &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
-
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect A:foo/bq    A:foo/whatever &&
-		test_cmp expect actual &&
-
-		git hash-object bar/bq   bar/whatever   >actual &&
-		git rev-parse   A:foo/bq A:foo/whatever >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/3a_R/.git/
-[master (root-commit) 1e2aa57] O
- Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A 5576138] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- rename bq => foo/bq (87%)
-Switched to branch 'B'
-[B 69c0854] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'B^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 69c0854 B
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 9 - 3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success of 6426.10 '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3b L &&
-	(
-		cd 3b_L &&
-
-		git checkout A^0 &&
-
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-
-		test_must_be_empty err &&
-
-		test_path_is_file bar/bq &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
-
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect B:bq        A:foo/whatever &&
-		test_cmp expect actual &&
-
-		git hash-object bar/bq bar/whatever   >actual &&
-		git rev-parse   B:bq   A:foo/whatever >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/3b_L/.git/
-[master (root-commit) 1e2aa57] O
- Author: A U Thor <author@example.com>
- 2 files changed, 21 insertions(+)
- create mode 100644 bq
- create mode 100644 foo/whatever
-Switched to branch 'A'
-[A d02b71c] A
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename bq => foo/bq (100%)
-Switched to branch 'B'
-[B 2f47892] B
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- rename {foo => bar}/whatever (100%)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at d02b71c A
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 10 - 3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success of 6426.11 '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
-	test_setup_3b R &&
-	(
-		cd 3b_R &&
-
-		git checkout B^0 &&
-
-		test_path_is_missing bar/bq &&
-		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
-
-		test_must_be_empty err &&
-
-		test_path_is_file bar/bq &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 2 index_files &&
-
-		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
-		git rev-parse >expect B:bq        A:foo/whatever &&
-		test_cmp expect actual &&
-
-		git hash-object bar/bq bar/whatever   >actual &&
-		git rev-parse   B:bq   A:foo/whatever >expect &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq &&
-		test_path_is_missing foo/bq &&
-		test_path_is_missing foo/whatever
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+Switched to branch 'D'
+[D c3c5299] D
  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
+ 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 {foo => bar}/whatever (100%)
-Note: switching to 'B^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 2f47892 B
-fatal: path 'bq' does not exist in 'HEAD'
-HEAD:bq
-ok 11 - 3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B
-
-expecting success of 6426.12 '4a: Change on A, change on B subset of A, dirty mods present': 
-	test_setup_4a &&
-	(
-		cd 4a &&
-
-		git checkout A^0 &&
-		echo "File rewritten" >b &&
-
-		test-tool chmtime --get -3600 b >old-mtime &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_must_be_empty err &&
-
-		# Make sure b was NOT updated
-		test-tool chmtime --get b >new-mtime &&
-		test_cmp old-mtime new-mtime &&
-
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
-
-		git rev-parse >actual :0:b &&
-		git rev-parse >expect A:b &&
-		test_cmp expect actual &&
-
-		git hash-object b >actual &&
-		echo "File rewritten" | git hash-object --stdin >expect &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/4a/.git/
-[master (root-commit) 105387b] O
- Author: A U Thor <author@example.com>
- 1 file changed, 10 insertions(+)
- create mode 100644 b
-Switched to branch 'A'
-[A 14800cf] A
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-Switched to branch 'B'
-[B dfd7e13] B
+ rename a => subdir/a (100%)
+ create mode 100644 subdir/e
+Switched to branch 'F'
+[F 83c2e21] F
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 14800cf A
-ok 12 - 4a: Change on A, change on B subset of A, dirty mods present
-
-expecting success of 6426.13 '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present': 
-	test_setup_4b &&
-	(
-		cd 4b &&
-
-		git checkout A^0 &&
-		echo "File rewritten" >c &&
-
-		test-tool chmtime --get -3600 c >old-mtime &&
-
-		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
-
-		test_must_be_empty err &&
-
-		# Make sure c was NOT updated
-		test-tool chmtime --get c >new-mtime &&
-		test_cmp old-mtime new-mtime &&
+ok 1 - setup trivial merges
 
-		git ls-files -s >index_files &&
-		test_line_count = 1 index_files &&
+expecting success of 6424.2 'ff update': 
+	git reset --hard &&
+	git checkout A^0 &&
 
-		git rev-parse >actual :0:c &&
-		git rev-parse >expect A:c &&
-		test_cmp expect actual &&
+	touch random_file && git add random_file &&
 
-		git hash-object c >actual &&
-		echo "File rewritten" | git hash-object --stdin >expect &&
-		test_cmp expect actual &&
+	git merge E^0 &&
 
-		test_must_fail git rev-parse HEAD:b &&
-		test_path_is_missing b
-	)
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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(+)
+HEAD is now at 83c2e21 F
 Note: switching to 'A^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
@@ -415605,620 +413749,384 @@
 
 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6427-diff3-conflict-markers.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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" &&
+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
 
-		git branch L &&
-		git branch R &&
+expecting success of 6424.3 'ff update, important file modified': 
+	git reset --hard &&
+	git checkout A^0 &&
 
-		# Create L1
-		git checkout L &&
-		test_commit L1 content "0
-1
-2
-3
-4
-5" &&
+	mkdir subdir &&
+	touch subdir/e &&
+	git add subdir/e &&
 
-		# Create R1
-		git checkout R &&
-		test_commit R1 content "1
-2
-3
-4
-5
-6" &&
+	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
 
-		# Create L2
-		git checkout L &&
-		git merge R1 &&
+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
 
-		# Create R2
-		git checkout R &&
-		git merge L1 &&
+expecting success of 6424.4 'resolve, trivial': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-		# Create L3
-		git checkout L &&
-		test_commit L3 content "0
-1
-2
-3
-4
-5
-A" &&
+	touch random_file && git add random_file &&
 
-		# Create R3
-		git checkout R &&
-		git rm content &&
-		test_commit R3 renamed "0
-2
-3
-4
-5
-six"
-	)
+	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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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 6427.6 'check multiple merge bases': 
-	(
-		cd multiple_merge_bases &&
+expecting success of 6424.5 'resolve, non-trivial': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-		git checkout L^0 &&
+	touch random_file && git add random_file &&
 
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
+	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
 
-		grep "|||||| merged common ancestors:content" renamed
-	)
+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
 
-Note: switching to 'L^0'.
+expecting success of 6424.6 'resolve, trivial, related file removed': 
+	git reset --hard &&
+	git checkout 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.
+	git rm a &&
+	test_path_is_missing 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:
+	test_must_fail git merge -s resolve C^0 &&
 
-  git switch -c <new-branch-name>
+	test_path_is_missing a &&
+	test_path_is_missing .git/MERGE_HEAD
 
-Or undo this operation with:
+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
 
-  git switch -
+expecting success of 6424.7 'resolve, non-trivial, related file removed': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	git rm a &&
+	test_path_is_missing a &&
 
-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
+	# 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 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
-	)
+	test_path_is_missing a &&
+	test_path_is_missing .git/MERGE_HEAD
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 advice.mergeConflict false"
-Could not apply 748f431... side
-||||||| parent of 748f431 (side)
-ok 7 - rebase --merge describes parent of commit being picked
+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 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
-	)
+expecting success of 6424.8 'recursive': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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 advice.mergeConflict false"
-Patch failed at 0001 side
-||||||| constructed merge base
-ok 8 - rebase --apply describes fake ancestor base
+	touch random_file && git add random_file &&
 
-expecting success of 6427.9 'check zdiff3 markers': 
-	test_setup_zdiff3 &&
-	(
-		cd zdiff3 &&
+	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
 
-		git checkout left^0 &&
+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
 
-		base=$(git rev-parse --short HEAD^1) &&
-		test_must_fail git -c merge.conflictstyle=zdiff3 merge -s recursive right^0 &&
+expecting success of 6424.9 'recursive, when merge branch matches merge base': 
+	git reset --hard &&
+	git checkout B^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 &&
+	touch random_file && git add random_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 &&
+	test_must_fail git merge -s recursive F^0 &&
+	test_path_is_missing .git/MERGE_HEAD
 
-		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 &&
+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
 
-		# 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
-	)
+expecting success of 6424.10 'merge-recursive, when index==head but head!=HEAD': 
+	git reset --hard &&
+	git checkout C^0 &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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'.
+	# 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
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes 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 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
 
-If you want to 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 6424.11 'recursive, when file has staged changes not matching HEAD nor what a merge would give': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-  git switch -c <new-branch-name>
+	mkdir subdir &&
+	test_seq 1 10 >subdir/a &&
+	git add subdir/a &&
+	git rev-parse --verify :subdir/a >expect &&
 
-Or undo this operation with:
+	# 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
 
-  git switch -
+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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 6424.12 'recursive, when file has staged changes matching what a merge would give': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-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
+	mkdir subdir &&
+	test_seq 1 11 >subdir/a &&
+	git add subdir/a &&
+	git rev-parse --verify :subdir/a >expect &&
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6428-merge-conflicts-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6428-merge-conflicts-sparse/.git/
-expecting success of 6428.1 'conflicting entries written to worktree even if sparse': 
-	test_setup_numerals plain &&
-	(
-		cd numerals_plain &&
+	# 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
 
-		git checkout A^0 &&
+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
 
-		test_path_is_file README &&
-		test_path_is_file numerals &&
+expecting success of 6424.13 'octopus, unrelated file touched': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-		git sparse-checkout init &&
-		git sparse-checkout set --no-cone README &&
+	touch random_file && git add random_file &&
 
-		test_path_is_file README &&
-		test_path_is_missing numerals &&
+	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
 
-		test_must_fail git merge -s recursive B^0 &&
+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
 
-		git ls-files -t >index_files &&
-		test_cmp expected-index index_files &&
+expecting success of 6424.14 'octopus, related file removed': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-		test_path_is_file README &&
-		test_path_is_file numerals &&
+	git rm b &&
 
-		test_cmp expected-merge numerals &&
+	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
 
-		# 4 other files:
-		#   * expected-merge
-		#   * expected-index
-		#   * index_files
-		#   * others
-		git ls-files -o >others &&
-		test_line_count = 4 others
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6428-merge-conflicts-sparse/numerals_plain/.git/
-[master (root-commit) e14c99c] O
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 README
- create mode 100644 numerals
-Switched to branch 'A'
-[A 016e05e] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 5ca8904] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
+expecting success of 6424.15 'octopus, related file modified': 
+	git reset --hard &&
+	git checkout 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.
+	echo 12 >>a && git add a &&
+	git rev-parse --verify :a >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:
+	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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+expecting success of 6424.16 'ours': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-  git switch -
+	touch random_file && git add random_file &&
 
-Turn off this advice by setting config variable advice.detachedHead to false
+	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 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
+HEAD is now at ed5d5a6 B
+HEAD is now at ed5d5a6 B
+Merge with strategy ours failed.
+e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+ok 16 - ours
 
-expecting success of 6428.2 'present-despite-SKIP_WORKTREE handled reasonably': 
-	test_setup_numerals in_the_way &&
-	(
-		cd numerals_in_the_way &&
+expecting success of 6424.17 'subtree': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-		git checkout A^0 &&
+	touch random_file && git add random_file &&
 
-		test_path_is_file README &&
-		test_path_is_file numerals &&
+	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
 
-		git sparse-checkout init &&
-		git sparse-checkout set --no-cone README &&
+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
 
-		test_path_is_file README &&
-		test_path_is_missing numerals &&
+expecting success of 6424.18 'avoid failure due to stat-dirty files': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-		echo foobar >numerals &&
+	# Make "a" be stat-dirty
+	test-tool chmtime =+1 a &&
 
-		test_must_fail git merge -s recursive B^0 &&
+	# stat-dirty file should not prevent stash creation in builtin/merge.c
+	git merge -s resolve -s recursive D^0
 
-		test_path_is_missing .git/MERGE_HEAD &&
+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
 
-		test_path_is_file numerals &&
+expecting success of 6424.19 'with multiple strategies, recursive or ort failure do not early abort': 
+	git reset --hard &&
+	git checkout B^0 &&
 
-		# numerals should still have "foobar" in it
-		echo foobar >expect &&
-		test_cmp expect numerals
-	)
+	test_seq 0 10 >a &&
+	git add a &&
+	git rev-parse :a >expect &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6428-merge-conflicts-sparse/numerals_in_the_way/.git/
-[master (root-commit) e14c99c] O
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
- create mode 100644 README
- create mode 100644 numerals
-Switched to branch 'A'
-[A 016e05e] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'B'
-[B 5ca8904] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'A^0'.
+	sane_unset GIT_TEST_MERGE_ALGORITHM &&
+	test_must_fail git merge -s recursive -s ort -s octopus C^0 >output 2>&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.
+	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 &&
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+	# Changes to "a" should remain staged
+	git rev-parse :a >actual &&
+	test_cmp expect actual
 
-  git switch -c <new-branch-name>
+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:
 
-Or undo this operation with:
+  c1fdbe2 Merge commit 'D^0' into HEAD
 
-  git switch -
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
 
-Turn off this advice by setting config variable advice.detachedHead to false
+ git branch <new-branch-name> c1fdbe2
 
-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
+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 2 test(s)
-1..2
+# passed all 19 test(s)
+1..19
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6416-recursive-corner-cases.sh ***
@@ -417937,454 +415845,2014 @@
 hint: Disable this message with "git config advice.addEmbeddedRepo false"
 [B b3ca9b5] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 submod
-warning: unable to rmdir 'submod': Directory not empty
-Switched to a new branch 'C'
-warning: refname 'C' is ambiguous.
-warning: refname 'C' is ambiguous.
-HEAD is now at a2c92fc C
-warning: adding embedded git repository: submod
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> submod
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached submod
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[C 5df2365] C
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submod
+warning: unable to rmdir 'submod': Directory not empty
+Switched to a new branch 'C'
+warning: refname 'C' is ambiguous.
+warning: refname 'C' is ambiguous.
+HEAD is now at a2c92fc C
+warning: adding embedded git repository: submod
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> submod
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached submod
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[C 5df2365] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 submod
+Merge made by the 'ours' strategy.
+Merge made by the 'ours' strategy.
+ok 31 - setup submodule add/add
+
+expecting success of 6416.32 'check submodule add/add': 
+	(
+		cd submodule-add-add &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out
+	)
+
+Previous HEAD position was 0141fc3 E
+HEAD is now at 3e5a324 D
+M	submod
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (submod), and either merge commit a2c92fc
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add submod
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config advice.submoduleMergeConflict false"
+  From inner merge:  Failed to merge submodule submod (no merge base)
+  From inner merge:  CONFLICT (add/add): Merge conflict in submod
+Failed to merge submodule submod (no merge base)
+CONFLICT (submodule): Merge conflict in submod
+Automatic merge failed; fix conflicts and then commit the result.
+ok 32 - check submodule add/add
+
+expecting success of 6416.33 'setup conflicting entry types (submodule vs symlink)': 
+	git init submodule-symlink-add-add &&
+	(
+		cd submodule-symlink-add-add &&
+
+		git init path &&
+		(
+			cd path &&
+			touch file-B &&
+			git add file-B &&
+			git commit -m B &&
+			git tag B
+		) &&
+
+		touch irrelevant-file &&
+		git add irrelevant-file &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		git -C path reset --hard B &&
+		git add path &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		rm -rf path/ &&
+		test_ln_s_add irrelevant-file path &&
+		git commit -m C &&
+
+		git checkout -q B^0 &&
+		git merge -s ours -m D C^0 &&
+		git tag D &&
+
+		git checkout -q C^0 &&
+		git merge -s ours -m E B^0 &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6416-recursive-corner-cases/submodule-symlink-add-add/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6416-recursive-corner-cases/submodule-symlink-add-add/path/.git/
+[main (root-commit) f80342e] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 file-B
+[main (root-commit) ffa7695] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 irrelevant-file
+Switched to a new branch 'B'
+HEAD is now at f80342e B
+warning: adding embedded git repository: path
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> path
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached path
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[B 83ada27] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 path
+warning: unable to rmdir 'path': Directory not empty
+Switched to a new branch 'C'
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[C 7d3c6ec] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 120000 path
+Merge made by the 'ours' strategy.
+Merge made by the 'ours' strategy.
+ok 33 - setup conflicting entry types (submodule vs symlink)
+
+expecting success of 6416.34 'check conflicting entry types (submodule vs symlink)': 
+	(
+		cd submodule-symlink-add-add &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out
+	)
+
+Previous HEAD position was d862885 E
+HEAD is now at cc49267 D
+CONFLICT (distinct types): path had different types on each side; renamed both of them so each can be recorded somewhere.
+Automatic merge failed; fix conflicts and then commit the result.
+ok 34 - check conflicting entry types (submodule vs symlink)
+
+expecting success of 6416.35 'setup conflicting modes for regular file': 
+	git init regular-file-mode-conflict &&
+	(
+		cd regular-file-mode-conflict &&
+
+		touch irrelevant-file &&
+		git add irrelevant-file &&
+		git commit -m A &&
+		git tag A &&
+
+		git checkout -b B A &&
+		echo "command_to_run" >source_me.bash &&
+		git add source_me.bash &&
+		git commit -m B &&
+
+		git checkout -b C A &&
+		echo "command_to_run" >source_me.bash &&
+		git add source_me.bash &&
+		test_chmod +x source_me.bash &&
+		git commit -m C &&
+
+		git checkout -q B^0 &&
+		git merge -s ours -m D C^0 &&
+		git tag D &&
+
+		git checkout -q C^0 &&
+		git merge -s ours -m E B^0 &&
+		git tag E
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6416-recursive-corner-cases/regular-file-mode-conflict/.git/
+[main (root-commit) ffa7695] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 irrelevant-file
+Switched to a new branch 'B'
+[B b8c132e] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 source_me.bash
+Switched to a new branch 'C'
+[C 53e08af] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100755 source_me.bash
+Merge made by the 'ours' strategy.
+Merge made by the 'ours' strategy.
+ok 35 - setup conflicting modes for regular file
+
+checking known breakage of 6416.36 'check conflicting modes for regular file': 
+	(
+		cd regular-file-mode-conflict &&
+
+		git checkout D^0 &&
+
+		test_must_fail git merge -s recursive E^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 3 out &&
+		git ls-files -u >out &&
+		test_line_count = 2 out &&
+		git ls-files -o >out &&
+		test_line_count = 1 out
+	)
+
+Previous HEAD position was 0f3ce8e E
+HEAD is now at a770888 D
+  From inner merge:  CONFLICT (add/add): Merge conflict in source_me.bash
+Merge made by the 'ort' strategy.
+test_must_fail: command succeeded: git merge -s recursive E^0
+not ok 36 - check conflicting modes for regular file # TODO known breakage
+
+expecting success of 6416.37 'setup nested conflicts': 
+	git init nested_conflicts &&
+	(
+		cd nested_conflicts &&
+
+		# Create some related files now
+		printf "Random base content line %d\n" $(test_seq 1 10) >initial &&
+
+		cp initial b_L1 &&
+		cp initial b_R1 &&
+		cp initial b_L2 &&
+		cp initial b_R2 &&
+		cp initial a_L1 &&
+		cp initial a_R1 &&
+		cp initial a_L2 &&
+		cp initial a_R2 &&
+
+		test_write_lines b b_L1 >>b_L1 &&
+		test_write_lines b b_R1 >>b_R1 &&
+		test_write_lines b b_L2 >>b_L2 &&
+		test_write_lines b b_R2 >>b_R2 &&
+		test_write_lines a a_L1 >>a_L1 &&
+		test_write_lines a a_R1 >>a_R1 &&
+		test_write_lines a a_L2 >>a_L2 &&
+		test_write_lines a a_R2 >>a_R2 &&
+
+		# Setup original commit (or merge-base), consisting of
+		# files named "b" and "a"
+		cp initial b &&
+		cp initial a &&
+		echo b >>b &&
+		echo a >>a &&
+		git add b a &&
+		test_tick && git commit -m initial &&
+
+		git branch L &&
+		git branch R &&
+
+		# Handle the left side
+		git checkout L &&
+		mv -f b_L1 b &&
+		mv -f a_L1 a &&
+		git add b a &&
+		test_tick && git commit -m "version L1 of files" &&
+		git tag L1 &&
+
+		# Handle the right side
+		git checkout R &&
+		mv -f b_R1 b &&
+		mv -f a_R1 a &&
+		git add b a &&
+		test_tick && git commit -m "version R1 of files" &&
+		git tag R1 &&
+
+		# Create first merge on left side
+		git checkout L &&
+		test_must_fail git merge R1 &&
+		mv -f b_L2 b &&
+		mv -f a_L2 a &&
+		git add b a &&
+		git mv b m &&
+		test_tick && git commit -m "left merge, rename b->m" &&
+		git tag L2 &&
+
+		# Create first merge on right side
+		git checkout R &&
+		test_must_fail git merge L1 &&
+		mv -f b_R2 b &&
+		mv -f a_R2 a &&
+		git add b a &&
+		git mv a m &&
+		test_tick && git commit -m "right merge, rename a->m" &&
+		git tag R2
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6427-diff3-conflict-markers.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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 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 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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6428-merge-conflicts-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6428-merge-conflicts-sparse/.git/
+expecting success of 6428.1 'conflicting entries written to worktree even if sparse': 
+	test_setup_numerals plain &&
+	(
+		cd numerals_plain &&
+
+		git checkout A^0 &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		git sparse-checkout init &&
+		git sparse-checkout set --no-cone README &&
+
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		git ls-files -t >index_files &&
+		test_cmp expected-index index_files &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		test_cmp expected-merge numerals &&
+
+		# 4 other files:
+		#   * expected-merge
+		#   * expected-index
+		#   * index_files
+		#   * others
+		git ls-files -o >others &&
+		test_line_count = 4 others
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6428-merge-conflicts-sparse/numerals_plain/.git/
+[master (root-commit) e14c99c] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 README
+ create mode 100644 numerals
+Switched to branch 'A'
+[A 016e05e] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 5ca8904] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 016e05e A
+warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+Auto-merging numerals
+CONFLICT (content): Merge conflict in numerals
+Automatic merge failed; fix conflicts and then commit the result.
+ok 1 - conflicting entries written to worktree even if sparse
+
+expecting success of 6428.2 'present-despite-SKIP_WORKTREE handled reasonably': 
+	test_setup_numerals in_the_way &&
+	(
+		cd numerals_in_the_way &&
+
+		git checkout A^0 &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		git sparse-checkout init &&
+		git sparse-checkout set --no-cone README &&
+
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
+
+		echo foobar >numerals &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		test_path_is_missing .git/MERGE_HEAD &&
+
+		test_path_is_file numerals &&
+
+		# numerals should still have "foobar" in it
+		echo foobar >expect &&
+		test_cmp expect numerals
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6428-merge-conflicts-sparse/numerals_in_the_way/.git/
+[master (root-commit) e14c99c] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 3 insertions(+)
+ create mode 100644 README
+ create mode 100644 numerals
+Switched to branch 'A'
+[A 016e05e] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 5ca8904] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 016e05e A
+warning: pass a leading slash before paths such as 'README' if you want a single file (see NON-CONE PROBLEMS in the git-sparse-checkout manual).
+error: Your local changes to the following files would be overwritten by merge:
+	numerals
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 2 - present-despite-SKIP_WORKTREE handled reasonably
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6426-merge-skip-unneeded-updates.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/.git/
+expecting success of 6426.1 '1a-L: Modify(A)/Modify(B), change on B subset of A': 
+	test_setup_1a L &&
+	(
+		cd 1a_L &&
+
+		git checkout A^0 &&
+
+		test-tool chmtime --get -3600 b >old-mtime &&
+
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:b &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
+
+		git hash-object b   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/1a_L/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 14800cf A
+ok 1 - 1a-L: Modify(A)/Modify(B), change on B subset of A
+
+expecting success of 6426.2 '1a-R: Modify(A)/Modify(B), change on B subset of A': 
+	test_setup_1a R &&
+	(
+		cd 1a_R &&
+
+		git checkout B^0 &&
+
+		test-tool chmtime --get -3600 b >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		# Make sure b WAS updated
+		test-tool chmtime --get b >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
+		test_must_be_empty err &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:b &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
+
+		git hash-object b   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/1a_R/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'B^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at dfd7e13 B
+ok 2 - 1a-R: Modify(A)/Modify(B), change on B subset of A
+
+expecting success of 6426.3 '2a-L: Modify/rename, merge into modify side': 
+	test_setup_2a L &&
+	(
+		cd 2a_L &&
+
+		git checkout A^0 &&
+
+		test_path_is_missing c &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_path_is_file c &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
+
+		git hash-object c   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/2a_L/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A c2d59c7] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 6283fcf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => c (100%)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at c2d59c7 A
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 3 - 2a-L: Modify/rename, merge into modify side
+
+expecting success of 6426.4 '2a-R: Modify/rename, merge into rename side': 
+	test_setup_2a R &&
+	(
+		cd 2a_R &&
+
+		git checkout B^0 &&
+
+		test-tool chmtime --get -3600 c >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
+		test_must_be_empty err &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
+
+		git hash-object c   >actual &&
+		git rev-parse   A:b >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/2a_R/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A c2d59c7] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Switched to branch 'B'
+[B 6283fcf] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename b => c (100%)
+Note: switching to 'B^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 6283fcf B
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 4 - 2a-R: Modify/rename, merge into rename side
+
+expecting success of 6426.5 '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A': 
+	test_setup_2b L &&
+	(
+		cd 2b_L &&
+
+		git checkout A^0 &&
+
+		test-tool chmtime --get -3600 c >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
+
+		test_must_be_empty err &&
+
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:c &&
+		test_cmp expect actual &&
+
+		git hash-object c   >actual &&
+		git rev-parse   A:c >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/2b_L/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A fed518a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename b => c (70%)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at fed518a A
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 5 - 2b-L: Rename+Mod(A)/Mod(B), B mods subset of A
+
+expecting success of 6426.6 '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A': 
+	test_setup_2b R &&
+	(
+		cd 2b_R &&
+
+		git checkout B^0 &&
+
+		test_path_is_missing c &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
+
+		# Make sure c now present (and thus was updated)
+		test_path_is_file c &&
+
+		test_must_be_empty err &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
+
+		git rev-parse >actual HEAD:c &&
+		git rev-parse >expect A:c &&
+		test_cmp expect actual &&
+
+		git hash-object c   >actual &&
+		git rev-parse   A:c >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:b &&
+		test_path_is_missing b
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/2b_R/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A fed518a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename b => c (70%)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'B^0'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at dfd7e13 B
+fatal: path 'b' does not exist in 'HEAD'
+HEAD:b
+ok 6 - 2b-R: Rename+Mod(A)/Mod(B), B mods subset of A
+
+expecting success of 6426.7 '2c: Modify b & add c VS rename b->c': 
+	test_setup_2c &&
+	(
+		cd 2c &&
+
+		git checkout A^0 &&
+
+		test-tool chmtime --get -3600 c >old-mtime &&
+		GIT_MERGE_VERBOSITY=3 &&
+		export GIT_MERGE_VERBOSITY &&
+		test_must_fail git merge -s recursive B^0 >out 2>err &&
+
+		test_grep "CONFLICT (.*/add):" out &&
+		test_must_be_empty err &&
+
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
+
+		# Ensure b was removed
+		test_path_is_missing b &&
+
+		# Make sure c WAS updated...
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
+		# ...and has correct index entries and working tree contents
+		git rev-parse >actual :2:c :3:c &&
+		git rev-parse >expect A:c  A:b  &&
+		test_cmp expect actual &&
+
+		git cat-file -p A:b >>merge-me &&
+		git cat-file -p A:c >>merged &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "HEAD" \
+			-L "" \
+			-L "B^0" \
+			merged empty merge-me &&
+		test_cmp merged c
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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>
- 1 file changed, 1 insertion(+)
- create mode 160000 submod
-Merge made by the 'ours' strategy.
-Merge made by the 'ours' strategy.
-ok 31 - setup submodule add/add
+ 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'.
 
-expecting success of 6416.32 'check submodule add/add': 
-	(
-		cd submodule-add-add &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 checkout D^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:
 
-		test_must_fail git merge -s recursive E^0 &&
+  git switch -c <new-branch-name>
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out
-	)
+Or undo this operation with:
 
-Previous HEAD position was 0141fc3 E
-HEAD is now at 3e5a324 D
-M	submod
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (submod), and either merge commit a2c92fc
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add submod
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config advice.submoduleMergeConflict false"
-  From inner merge:  Failed to merge submodule submod (no merge base)
-  From inner merge:  CONFLICT (add/add): Merge conflict in submod
-Failed to merge submodule submod (no merge base)
-CONFLICT (submodule): Merge conflict in submod
-Automatic merge failed; fix conflicts and then commit the result.
-ok 32 - check submodule add/add
+  git switch -
 
-expecting success of 6416.33 'setup conflicting entry types (submodule vs symlink)': 
-	git init submodule-symlink-add-add &&
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at edf631f A
+CONFLICT (add/add): Merge conflict in c
+ok 7 - 2c: Modify b & add c VS rename b->c
+
+expecting success of 6426.8 '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3a L &&
 	(
-		cd submodule-symlink-add-add &&
+		cd 3a_L &&
 
-		git init path &&
-		(
-			cd path &&
-			touch file-B &&
-			git add file-B &&
-			git commit -m B &&
-			git tag B
-		) &&
+		git checkout A^0 &&
 
-		touch irrelevant-file &&
-		git add irrelevant-file &&
-		git commit -m A &&
-		git tag A &&
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-		git checkout -b B A &&
-		git -C path reset --hard B &&
-		git add path &&
-		git commit -m B &&
+		test_must_be_empty err &&
 
-		git checkout -b C A &&
-		rm -rf path/ &&
-		test_ln_s_add irrelevant-file path &&
-		git commit -m C &&
+		test_path_is_file bar/bq &&
 
-		git checkout -q B^0 &&
-		git merge -s ours -m D C^0 &&
-		git tag D &&
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
 
-		git checkout -q C^0 &&
-		git merge -s ours -m E B^0 &&
-		git tag E
+		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.45.2/t/trash directory.t6416-recursive-corner-cases/submodule-symlink-add-add/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6416-recursive-corner-cases/submodule-symlink-add-add/path/.git/
-[main (root-commit) f80342e] B
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 file-B
-[main (root-commit) ffa7695] A
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/3a_L/.git/
+[master (root-commit) 1e2aa57] O
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 irrelevant-file
-Switched to a new branch 'B'
-HEAD is now at f80342e B
-warning: adding embedded git repository: path
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> path
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached path
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[B 83ada27] B
+ 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 160000 path
-warning: unable to rmdir 'path': Directory not empty
-Switched to a new branch 'C'
-checking prerequisite: SYMLINKS
+ 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'.
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
+You are in 'detached HEAD' state. You can look around, make experimental
+changes 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 SYMLINKS ok
-[C 7d3c6ec] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 120000 path
-Merge made by the 'ours' strategy.
-Merge made by the 'ours' strategy.
-ok 33 - setup conflicting entry types (submodule vs symlink)
+If you want to 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 6416.34 'check conflicting entry types (submodule vs symlink)': 
-	(
-		cd submodule-symlink-add-add &&
+  git switch -c <new-branch-name>
 
-		git checkout D^0 &&
+Or undo this operation with:
 
-		test_must_fail git merge -s recursive E^0 &&
+  git switch -
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out
-	)
+Turn off this advice by setting config variable advice.detachedHead to false
 
-Previous HEAD position was d862885 E
-HEAD is now at cc49267 D
-CONFLICT (distinct types): path had different types on each side; renamed both of them so each can be recorded somewhere.
-Automatic merge failed; fix conflicts and then commit the result.
-ok 34 - check conflicting entry types (submodule vs symlink)
+HEAD is now at 5576138 A
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 8 - 3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
 
-expecting success of 6416.35 'setup conflicting modes for regular file': 
-	git init regular-file-mode-conflict &&
+expecting success of 6426.9 '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3a R &&
 	(
-		cd regular-file-mode-conflict &&
+		cd 3a_R &&
 
-		touch irrelevant-file &&
-		git add irrelevant-file &&
-		git commit -m A &&
-		git tag A &&
+		git checkout B^0 &&
 
-		git checkout -b B A &&
-		echo "command_to_run" >source_me.bash &&
-		git add source_me.bash &&
-		git commit -m B &&
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
-		git checkout -b C A &&
-		echo "command_to_run" >source_me.bash &&
-		git add source_me.bash &&
-		test_chmod +x source_me.bash &&
-		git commit -m C &&
+		test_must_be_empty err &&
 
-		git checkout -q B^0 &&
-		git merge -s ours -m D C^0 &&
-		git tag D &&
+		test_path_is_file bar/bq &&
 
-		git checkout -q C^0 &&
-		git merge -s ours -m E B^0 &&
-		git tag E
+		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.45.2/t/trash directory.t6416-recursive-corner-cases/regular-file-mode-conflict/.git/
-[main (root-commit) ffa7695] A
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/3a_R/.git/
+[master (root-commit) 1e2aa57] O
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 irrelevant-file
-Switched to a new branch 'B'
-[B b8c132e] B
+ 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 source_me.bash
-Switched to a new branch 'C'
-[C 53e08af] C
+ rename bq => foo/bq (87%)
+Switched to branch 'B'
+[B 69c0854] B
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100755 source_me.bash
-Merge made by the 'ours' strategy.
-Merge made by the 'ours' strategy.
-ok 35 - setup conflicting modes for regular file
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename {foo => bar}/whatever (100%)
+Note: switching to 'B^0'.
 
-checking known breakage of 6416.36 'check conflicting modes for regular file': 
-	(
-		cd regular-file-mode-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.
 
-		git checkout D^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:
 
-		test_must_fail git merge -s recursive E^0 &&
+  git switch -c <new-branch-name>
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out
-	)
+Or undo this operation with:
 
-Previous HEAD position was 0f3ce8e E
-HEAD is now at a770888 D
-  From inner merge:  CONFLICT (add/add): Merge conflict in source_me.bash
-Merge made by the 'ort' strategy.
-test_must_fail: command succeeded: git merge -s recursive E^0
-not ok 36 - check conflicting modes for regular file # TODO known breakage
+  git switch -
 
-expecting success of 6416.37 'setup nested conflicts': 
-	git init nested_conflicts &&
-	(
-		cd nested_conflicts &&
+Turn off this advice by setting config variable advice.detachedHead to false
 
-		# Create some related files now
-		printf "Random base content line %d\n" $(test_seq 1 10) >initial &&
+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
 
-		cp initial b_L1 &&
-		cp initial b_R1 &&
-		cp initial b_L2 &&
-		cp initial b_R2 &&
-		cp initial a_L1 &&
-		cp initial a_R1 &&
-		cp initial a_L2 &&
-		cp initial a_R2 &&
+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 &&
 
-		test_write_lines b b_L1 >>b_L1 &&
-		test_write_lines b b_R1 >>b_R1 &&
-		test_write_lines b b_L2 >>b_L2 &&
-		test_write_lines b b_R2 >>b_R2 &&
-		test_write_lines a a_L1 >>a_L1 &&
-		test_write_lines a a_R1 >>a_R1 &&
-		test_write_lines a a_L2 >>a_L2 &&
-		test_write_lines a a_R2 >>a_R2 &&
+		git checkout A^0 &&
 
-		# Setup original commit (or merge-base), consisting of
-		# files named "b" and "a"
-		cp initial b &&
-		cp initial a &&
-		echo b >>b &&
-		echo a >>a &&
-		git add b a &&
-		test_tick && git commit -m initial &&
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-		git branch L &&
-		git branch R &&
+		test_must_be_empty err &&
 
-		# Handle the left side
-		git checkout L &&
-		mv -f b_L1 b &&
-		mv -f a_L1 a &&
-		git add b a &&
-		test_tick && git commit -m "version L1 of files" &&
-		git tag L1 &&
+		test_path_is_file bar/bq &&
 
-		# Handle the right side
-		git checkout R &&
-		mv -f b_R1 b &&
-		mv -f a_R1 a &&
-		git add b a &&
-		test_tick && git commit -m "version R1 of files" &&
-		git tag R1 &&
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
 
-		# Create first merge on left side
-		git checkout L &&
-		test_must_fail git merge R1 &&
-		mv -f b_L2 b &&
-		mv -f a_L2 a &&
-		git add b a &&
-		git mv b m &&
-		test_tick && git commit -m "left merge, rename b->m" &&
-		git tag L2 &&
+		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect B:bq        A:foo/whatever &&
+		test_cmp expect actual &&
 
-		# 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
+		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.45.2/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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/3b_L/.git/
+[master (root-commit) 1e2aa57] O
  Author: A U Thor <author@example.com>
- 2 files changed, 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
+ 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>
-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
+ 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>
-ok 37 - setup nested conflicts
+ 2 files changed, 1 insertion(+)
+ rename {foo => bar}/whatever (100%)
+Note: switching to 'A^0'.
 
-expecting success of 6416.38 'check nested 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.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at d02b71c A
+fatal: path 'bq' does not exist in 'HEAD'
+HEAD:bq
+ok 10 - 3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B
+
+expecting success of 6426.11 '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B': 
+	test_setup_3b R &&
 	(
-		cd nested_conflicts &&
+		cd 3b_R &&
 
-		git clean -f &&
-		MAIN=$(git rev-parse --short main) &&
-		git checkout L2^0 &&
+		git checkout B^0 &&
 
-		# Merge must fail; there is a conflict
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R2^0 &&
+		test_path_is_missing bar/bq &&
+		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
-		# 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 &&
+		test_must_be_empty err &&
 
-		# 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 &&
+		test_path_is_file bar/bq &&
 
-		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 &&
+		git ls-files -s >index_files &&
+		test_line_count = 2 index_files &&
 
-		# 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 &&
+		git rev-parse >actual HEAD:bar/bq HEAD:bar/whatever &&
+		git rev-parse >expect B:bq        A:foo/whatever &&
+		test_cmp expect 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 &&
+		git hash-object bar/bq bar/whatever   >actual &&
+		git rev-parse   B:bq   A:foo/whatever >expect &&
+		test_cmp expect 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
+		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
 	)
 
-Removing initial
-Note: switching to 'L2^0'.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/3b_R/.git/
+[master (root-commit) 1e2aa57] O
+ Author: A U Thor <author@example.com>
+ 2 files changed, 21 insertions(+)
+ create mode 100644 bq
+ create mode 100644 foo/whatever
+Switched to branch 'A'
+[A d02b71c] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename bq => foo/bq (100%)
+Switched to branch 'B'
+[B 2f47892] B
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ rename {foo => bar}/whatever (100%)
+Note: switching to 'B^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -418401,192 +417869,122 @@
 
 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
+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 6416.39 'setup virtual merge base with nested conflicts': 
-	git init virtual_merge_base_has_nested_conflicts &&
+expecting success of 6426.12 '4a: Change on A, change on B subset of A, dirty mods present': 
+	test_setup_4a &&
 	(
-		cd virtual_merge_base_has_nested_conflicts &&
-
-		# Create some related files now
-		printf "Random base content line %d\n" $(test_seq 1 10) >content &&
+		cd 4a &&
 
-		# Setup original commit
-		git add content &&
-		test_tick && git commit -m initial &&
+		git checkout A^0 &&
+		echo "File rewritten" >b &&
 
-		git branch L &&
-		git branch R &&
+		test-tool chmtime --get -3600 b >old-mtime &&
 
-		# Create L1
-		git checkout L &&
-		echo left >>content &&
-		git add content &&
-		test_tick && git commit -m "version L1 of content" &&
-		git tag L1 &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		# Create R1
-		git checkout R &&
-		echo right >>content &&
-		git add content &&
-		test_tick && git commit -m "version R1 of content" &&
-		git tag R1 &&
+		test_must_be_empty err &&
 
-		# 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 &&
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
-		# 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 &&
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
 
-		# 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 &&
+		git rev-parse >actual :0:b &&
+		git rev-parse >expect A:b &&
+		test_cmp expect actual &&
 
-		# 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
+		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.45.2/t/trash directory.t6416-recursive-corner-cases/virtual_merge_base_has_nested_conflicts/.git/
-[main (root-commit) 0e6d233] initial
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/4a/.git/
+[master (root-commit) 105387b] O
  Author: A U Thor <author@example.com>
  1 file changed, 10 insertions(+)
- create mode 100644 content
-Switched to branch 'L'
-[L 80f6449] version L1 of content
+ create mode 100644 b
+Switched to branch 'A'
+[A 14800cf] A
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'R'
-[R 49ac0f6] version R1 of content
+ 1 file changed, 2 insertions(+)
+Switched to branch 'B'
+[B dfd7e13] B
  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
+Note: switching to 'A^0'.
 
-expecting success of 6416.40 'check virtual merge base with nested 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.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 14800cf A
+ok 12 - 4a: Change on A, change on B subset of A, dirty mods present
+
+expecting success of 6426.13 '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present': 
+	test_setup_4b &&
 	(
-		cd virtual_merge_base_has_nested_conflicts &&
+		cd 4b &&
 
-		MAIN=$(git rev-parse --short main) &&
-		git checkout L3^0 &&
+		git checkout A^0 &&
+		echo "File rewritten" >c &&
 
-		# Merge must fail; there is a conflict
-		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R3^0 &&
+		test-tool chmtime --get -3600 c >old-mtime &&
 
-		# 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 &&
+		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		# 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 &&
+		test_must_be_empty err &&
 
-		# 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 &&
+		# Make sure c was NOT updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
-		# 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 &&
+		git ls-files -s >index_files &&
+		test_line_count = 1 index_files &&
 
-		# Compare :1:content to expected value
-		git cat-file -p :1:content >actual &&
-		test_cmp vmb actual &&
+		git rev-parse >actual :0:c &&
+		git rev-parse >expect A:c &&
+		test_cmp expect 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
+		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
 	)
 
-Note: switching to 'L3^0'.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6426-merge-skip-unneeded-updates/4b/.git/
+[master (root-commit) 105387b] O
+ Author: A U Thor <author@example.com>
+ 1 file changed, 10 insertions(+)
+ create mode 100644 b
+Switched to branch 'A'
+[A fed518a] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ rename b => c (70%)
+Switched to branch 'B'
+[B dfd7e13] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'A^0'.
 
 You are in 'detached HEAD' state. You can look around, make experimental
 changes and commit them, and you can discard any commits you make in this
@@ -418603,19 +418001,13 @@
 
 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
+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
 
-# still have 3 known breakage(s)
-# passed all remaining 37 test(s)
-1..40
+# passed all 13 test(s)
+1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6431-merge-criscross.sh ***
@@ -420846,568 +420238,1089 @@
 1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6435-merge-sparse.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t6429-merge-sequence-rename-caching.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 
-[master (root-commit) badb3ac] init
+		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.45.2/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(+)
- create mode 100644 checked-out
- create mode 100644 modify_delete
-[master 1c06c2f] theirs
+Switched to branch 'topic'
+[topic e84d01a] A
  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
+ 1 file changed, 2 insertions(+)
+ rename numbers => sequence (76%)
+[topic 1354771] B
  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
+ 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 6435.2 'reset --hard works after the conflict': 
-	git reset --hard
+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 &&
 
-HEAD is now at 3dfe889 ours
-ok 2 - reset --hard works after the conflict
+		test_seq 11 30 >numbers &&
+		git add numbers &&
+		git commit -m orig &&
 
-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
+		git branch upstream &&
+		git branch topic &&
 
-ok 3 - is reset properly
+		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 6435.4 'setup: conflict back': 
-	test_must_fail git merge theirs
+		git switch topic &&
 
-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
+		test_seq 11 13 >numbers &&
+		git add numbers &&
+		git commit -m A &&
 
-expecting success of 6435.5 'Merge abort works after the conflict': 
-	git merge --abort
+		git revert HEAD &&
 
-ok 5 - Merge abort works after the conflict
+		#
+		# Actual testing
+		#
 
-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
+		git switch upstream &&
 
-ok 6 - is aborted properly
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6434-merge-recursive-rename-options.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6434-merge-recursive-rename-options/.git/
-expecting success of 6434.1 'setup repo': 
-	cat <<-\EOF >3-old &&
-	33a
-	33b
-	33c
-	33d
-	EOF
-	sed s/33/22/ <3-old >2-old &&
-	sed s/33/11/ <3-old >1-old &&
-	sed s/33/00/ <3-old >0-old &&
-	git add [0-3]-old &&
-	git commit -m base &&
-	git rm [0-3]-old &&
-	git commit -m delete &&
-	git checkout -b rename HEAD^ &&
-	cp 3-old 3-new &&
-	sed 1,1s/./x/ <2-old >2-new &&
-	sed 1,2s/./x/ <1-old >1-new &&
-	sed 1,3s/./x/ <0-old >0-new &&
-	git add [0-3]-new &&
-	git rm [0-3]-old &&
-	git commit -m rename &&
-	get_expected_stages 0 &&
-	get_expected_stages 1 &&
-	get_expected_stages 2 &&
-	get_expected_stages 3 &&
-	check_50="false" &&
-	tail="HEAD^ -- HEAD main"
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-[main (root-commit) f9f9b59] base
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 1 calls
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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>
- 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, 20 insertions(+)
+ create mode 100644 numbers
+Switched to branch 'upstream'
+[upstream ab0f48c] Renamed (and modified) numbers -> sequence
  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, 10 insertions(+)
+ rename numbers => sequence (74%)
+Switched to branch 'topic'
+[topic 0105939] A
  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
+ 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 6434.2 'setup thresholds': 
-	git diff --name-status -M01 HEAD^ HEAD >diff-output &&
-	test_debug "cat diff-output" &&
-	test_line_count = 4 diff-output &&
-	grep "R[0-9][0-9][0-9]	\([0-3]\)-old	\1-new" diff-output \
-		>grep-output &&
-	test_cmp diff-output grep-output &&
-	th0=$(sed -n "s/R\(...\)	0-old	0-new/\1/p" <diff-output) &&
-	th1=$(sed -n "s/R\(...\)	1-old	1-new/\1/p" <diff-output) &&
-	th2=$(sed -n "s/R\(...\)	2-old	2-new/\1/p" <diff-output) &&
-	th3=$(sed -n "s/R\(...\)	3-old	3-new/\1/p" <diff-output) &&
-	test "$th0" -lt "$th1" &&
-	test "$th1" -lt "$th2" &&
-	test "$th2" -lt "$th3" &&
-	test "$th3" = 100 &&
-	if test 50 -le "$th0"
-	then
-		check_50=check_threshold_0
-	elif test 50 -le "$th1"
-	then
-		check_50=check_threshold_1
-	elif test 50 -le "$th2"
-	then
-		check_50=check_threshold_2
-	fi &&
-	th0="$th0%" &&
-	th1="$th1%" &&
-	th2="$th2%" &&
-	th3="$th3%"
+expecting success of 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 &&
 
-ok 2 - setup thresholds
+		test_seq 3 8 >sequence &&
+		git add sequence &&
+		git commit -m orig &&
 
-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
+		git branch upstream &&
+		git branch topic &&
 
-ok 3 - assumption for tests: rename detection with diff
+		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 6434.4 'default similarity threshold is 50%': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive $tail &&
-	$check_50
+		git switch topic &&
 
-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%
+		test_seq 3 10 >sequence &&
+		git add sequence &&
+		git mv sequence values &&
+		git commit -m A &&
 
-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
+		test_write_lines A B C D E F G H I J >sequence &&
+		git add sequence &&
+		git commit -m B &&
 
-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
+		#
+		# Actual testing
+		#
 
-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
+		git switch upstream &&
 
-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
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-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
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-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
+		git ls-files >tracked &&
+		test_line_count = 2 tracked &&
+		test_path_is_file values &&
+		test_path_is_file sequence &&
 
-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
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+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 &&
 
-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
+		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 6434.10 'disabled rename detection': 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --no-renames $tail &&
-	check_no_renames
+		git branch upstream &&
+		git branch topic &&
 
-Merging HEAD with main
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-ok 10 - disabled rename detection
+		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 6434.11 'last wins in --find-renames=<m> --find-renames=<n>': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive \
-		--find-renames=$th0 --find-renames=$th2 $tail &&
-	check_threshold_2
+		git switch topic &&
 
-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>
+		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 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
+		>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m B &&
 
-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
+		#
+		# Actual testing
+		#
 
-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
+		git switch upstream &&
+		git config merge.directoryRenames true &&
 
-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
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-expecting success of 6434.14 'last wins in --find-renames --no-renames': 
-	git read-tree --reset -u HEAD &&
-	git merge-recursive --find-renames --no-renames $tail &&
-	check_no_renames
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-Merging HEAD with main
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-ok 14 - last wins in --find-renames --no-renames
+		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 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
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 3 calls
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+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 &&
 
-fatal: unknown option --find-renames=-25
-ok 16 - --find-renames rejects negative argument
+		mkdir olddir &&
+		test_seq 3 10 >olddir/a &&
+		test_seq 3 10 >olddir/b &&
+		git add olddir &&
+		git commit -m orig &&
 
-expecting success of 6434.17 '--find-renames rejects non-numbers': 
-	git read-tree --reset -u HEAD &&
-	test_must_fail git merge-recursive --find-renames=0xf \
-		HEAD -- HEAD HEAD &&
-	git diff --quiet --cached
+		git branch upstream &&
+		git branch topic &&
 
-fatal: unknown option --find-renames=0xf
-ok 17 - --find-renames rejects non-numbers
+		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 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
+		git switch topic &&
 
-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>
+		>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m A &&
 
-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
+		test_seq 1 8 >olddir/a &&
+		test_seq 1 8 >olddir/b &&
+		git add olddir &&
+		git mv olddir otherdir &&
+		git commit -m B &&
 
-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>
+		#
+		# Actual testing
+		#
 
-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
+		git switch upstream &&
+		git config merge.directoryRenames true &&
 
-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_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-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
+		test_must_fail git replay --onto HEAD upstream~1..topic >output &&
 
-fatal: unknown option --rename-threshold=-25
-ok 21 - --rename-threshold=<n> rejects negative argument
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-fatal: unknown option --rename-threshold=0xf
-ok 22 - --rename-threshold=<n> rejects non-numbers
+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 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 switch topic &&
 
-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>
+		test_seq 3 10 >relevant-rename &&
+		git add relevant-rename &&
+		git commit -m A &&
 
-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
+		echo foo >olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m B &&
 
-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>
+		echo bar >>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m C &&
 
-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
+		#
+		# Actual testing
+		#
 
-Merging HEAD with main
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-ok 25 - merge.renames disables rename detection
+		git switch upstream &&
+		git config merge.directoryRenames true &&
 
-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_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
 
-Merging HEAD with main
-Merging:
-056f2c0 rename
-f3f4da2 delete
-found 1 common ancestor:
-f9f9b59 base
-ok 26 - merge.renames defaults to diff.renames
+		git replay --onto HEAD upstream~1..topic >out &&
+		git update-ref --stdin <out &&
+		git checkout topic &&
 
-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
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls &&
 
-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
+		git ls-files >tracked &&
+		test_line_count = 5 tracked &&
+		test_path_is_missing olddir/newfile &&
+		test_path_is_file newdir/newfile
+	)
 
-# passed all 27 test(s)
-1..27
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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 advice.mergeConflict false"
+Could not apply f96ebc9... A
+ok 10 - avoid assuming we detected renames
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6433-merge-toplevel.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6433-merge-toplevel/.git/
+expecting success of 6433.1 'setup': 
+	test_commit one &&
+	git branch left &&
+	git branch right &&
+	test_commit two &&
+	git checkout left &&
+	test_commit three &&
+	git checkout right &&
+	test_commit four &&
+	git checkout --orphan newroot &&
+	test_commit five &&
+	git checkout main
+
+[main (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[main 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+Switched to branch 'left'
+[left 897c206] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+Switched to branch 'right'
+[right bd0edcc] four
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 four.t
+Switched to a new branch 'newroot'
+[newroot (root-commit) 5280273] five
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 five.t
+ create mode 100644 four.t
+ create mode 100644 one.t
+Switched to branch 'main'
+ok 1 - setup
+
+expecting success of 6433.2 'merge an octopus into void': 
+	t3033_reset &&
+	git checkout --orphan test &&
+	git rm -fr . &&
+	test_must_fail git merge left right &&
+	test_must_fail git rev-parse --verify HEAD &&
+	git diff --quiet &&
+	test_must_fail git rev-parse HEAD
+
+Reset branch 'main'
+Switched to a new branch 'test'
+rm 'one.t'
+rm 'two.t'
+fatal: Can merge only exactly one commit into empty head
+fatal: Needed a single revision
+fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+HEAD
+ok 2 - merge an octopus into void
+
+expecting success of 6433.3 'merge an octopus, fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git merge left right &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^3 &&
+	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
+	git rev-parse three four | sort >expect &&
+	test_cmp expect actual
+
+Switched to and reset branch 'main'
+HEAD is now at d79ce16 one
+Fast-forwarding to: left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 3 - merge an octopus, fast-forward (ff)
+
+expecting success of 6433.4 'merge octopus, non-fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git merge --no-ff left right &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse one three four | sort >expect &&
+	test_cmp expect actual
+
+Reset branch 'main'
+HEAD is now at d79ce16 one
+Fast-forwarding to: left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 4 - merge octopus, non-fast-forward (ff)
+
+expecting success of 6433.5 'merge octopus, fast-forward (does not ff)': 
+	t3033_reset &&
+	git merge left right &&
+	# two (main) is not an ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
+
+Reset branch 'main'
+Trying simple merge with left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 5 - merge octopus, fast-forward (does not ff)
+
+expecting success of 6433.6 'merge octopus, non-fast-forward': 
+	t3033_reset &&
+	git merge --no-ff left right &&
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
+
+Reset branch 'main'
+Trying simple merge with left
+Trying simple merge with right
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 6 - merge octopus, non-fast-forward
+
+expecting success of 6433.7 'merge FETCH_HEAD octopus into void': 
+	t3033_reset &&
+	git checkout --orphan test &&
+	git rm -fr . &&
+	git fetch . left right &&
+	test_must_fail git merge FETCH_HEAD &&
+	test_must_fail git rev-parse --verify HEAD &&
+	git diff --quiet &&
+	test_must_fail git rev-parse HEAD
+
+Reset branch 'main'
+Switched to a new branch 'test'
+rm 'one.t'
+rm 'two.t'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+fatal: Can merge only exactly one commit into empty head
+fatal: Needed a single revision
+fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+HEAD
+ok 7 - merge FETCH_HEAD octopus into void
+
+expecting success of 6433.8 'merge FETCH_HEAD octopus fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git fetch . left right &&
+	git merge FETCH_HEAD &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^3 &&
+	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
+	git rev-parse three four | sort >expect &&
+	test_cmp expect actual
+
+Switched to and reset branch 'main'
+HEAD is now at d79ce16 one
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Fast-forwarding to: 897c20684b5db8602798bc55d628f0a264841fec
+Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 8 - merge FETCH_HEAD octopus fast-forward (ff)
+
+expecting success of 6433.9 'merge FETCH_HEAD octopus non-fast-forward (ff)': 
+	t3033_reset &&
+	git reset --hard one &&
+	git fetch . left right &&
+	git merge --no-ff FETCH_HEAD &&
+	# one is ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse one three four | sort >expect &&
+	test_cmp expect actual
+
+Reset branch 'main'
+HEAD is now at d79ce16 one
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Fast-forwarding to: 897c20684b5db8602798bc55d628f0a264841fec
+Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 9 - merge FETCH_HEAD octopus non-fast-forward (ff)
+
+expecting success of 6433.10 'merge FETCH_HEAD octopus fast-forward (does not ff)': 
+	t3033_reset &&
+	git fetch . left right &&
+	git merge FETCH_HEAD &&
+	# two (main) is not an ancestor of three (left) and four (right)
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
+
+Reset branch 'main'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Trying simple merge with 897c20684b5db8602798bc55d628f0a264841fec
+Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 10 - merge FETCH_HEAD octopus fast-forward (does not ff)
+
+expecting success of 6433.11 'merge FETCH_HEAD octopus non-fast-forward': 
+	t3033_reset &&
+	git fetch . left right &&
+	git merge --no-ff FETCH_HEAD &&
+	test_must_fail git rev-parse --verify HEAD^4 &&
+	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
+	git rev-parse two three four | sort >expect &&
+	test_cmp expect actual
+
+Reset branch 'main'
+From .
+ * branch            left       -> FETCH_HEAD
+ * branch            right      -> FETCH_HEAD
+Trying simple merge with 897c20684b5db8602798bc55d628f0a264841fec
+Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
+Merge made by the 'octopus' strategy.
+ four.t  | 1 +
+ three.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 four.t
+ create mode 100644 three.t
+fatal: Needed a single revision
+ok 11 - merge FETCH_HEAD octopus non-fast-forward
+
+expecting success of 6433.12 'refuse two-project merge by default': 
+	t3033_reset &&
+	git reset --hard four &&
+	test_must_fail git merge five
+
+Reset branch 'main'
+HEAD is now at bd0edcc four
+fatal: refusing to merge unrelated histories
+ok 12 - refuse two-project merge by default
+
+expecting success of 6433.13 'refuse two-project merge by default, quit before --autostash happens': 
+	t3033_reset &&
+	git reset --hard four &&
+	echo change >>one.t &&
+	git diff >expect &&
+	test_must_fail git merge --autostash five 2>err &&
+	test_grep ! "stash" err &&
+	git diff >actual &&
+	test_cmp expect actual
+
+Reset branch 'main'
+HEAD is now at bd0edcc four
+ok 13 - refuse two-project merge by default, quit before --autostash happens
+
+expecting success of 6433.14 'two-project merge with --allow-unrelated-histories': 
+	t3033_reset &&
+	git reset --hard four &&
+	git merge --allow-unrelated-histories five &&
+	git diff --exit-code five
+
+Reset branch 'main'
+M	one.t
+HEAD is now at bd0edcc four
+Merge made by the 'ort' strategy.
+ five.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+ok 14 - two-project merge with --allow-unrelated-histories
+
+expecting success of 6433.15 'two-project merge with --allow-unrelated-histories with --autostash': 
+	t3033_reset &&
+	git reset --hard four &&
+	echo change >>one.t &&
+	git diff one.t >expect &&
+	git merge --allow-unrelated-histories --autostash five 2>err &&
+	test_grep "Applied autostash." err &&
+	git diff one.t >actual &&
+	test_cmp expect actual
+
+Reset branch 'main'
+HEAD is now at bd0edcc four
+Created autostash: 2969e55
+Merge made by the 'ort' strategy.
+ five.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 five.t
+Applied autostash.
+ok 15 - two-project merge with --allow-unrelated-histories with --autostash
+
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6430-merge-recursive.sh ***
@@ -422422,7 +422335,7 @@
 hint:
 hint: See "git help submodule" for more information.
 hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[topic 7d726c7] base
+[topic 9407295] base
  Author: A U Thor <author@example.com>
  22 files changed, 42 insertions(+), 2 deletions(-)
  delete mode 120000 a
@@ -422448,12 +422361,12 @@
  create mode 100644 theirs-has-rename-index
  rename {d => theirs-has-rename-work}/e (100%)
 Switched to a new branch 'other'
-[other 4ea25ca] changesimplefile
+[other 8435720] changesimplefile
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Switched to branch 'topic'
 rm 'sub1'
-[topic fc8fda8] changefiletodir
+[topic a8e1087] changefiletodir
  Author: A U Thor <author@example.com>
  4 files changed, 1 deletion(-)
  delete mode 100644 sub1
@@ -422491,7 +422404,7 @@
 
 	git clean -fd
 
-HEAD is now at 865cb38 Merge branch 'other' into topic
+HEAD is now at 2c95869 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
@@ -422562,18 +422475,18 @@
 
 	git merge $B
 
-HEAD is now at 865cb38 Merge branch 'other' into topic
-[topic c14a4d8] O0
+HEAD is now at 2c95869 Merge branch 'other' into topic
+[topic f4b2e81] O0
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file
-[topic 63c4cfe] O1
+[topic 48a81c4] O1
  Author: A U Thor <author@example.com>
-HEAD is now at c14a4d8 O0
-[topic f736b83] O2
+HEAD is now at f4b2e81 O0
+[topic a9c2bdd] O2
  Author: A U Thor <author@example.com>
 Merge made by the 'ours' strategy.
-HEAD is now at 63c4cfe O1
+HEAD is now at 48a81c4 O1
 Merge made by the 'ours' strategy.
 Merge made by the 'ort' strategy.
 ok 37 - merge-recursive internal merge resolves to the sameness
@@ -422582,1089 +422495,568 @@
 1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6433-merge-toplevel.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6433-merge-toplevel/.git/
-expecting success of 6433.1 'setup': 
-	test_commit one &&
-	git branch left &&
-	git branch right &&
-	test_commit two &&
-	git checkout left &&
-	test_commit three &&
-	git checkout right &&
-	test_commit four &&
-	git checkout --orphan newroot &&
-	test_commit five &&
-	git checkout main
+*** t6435-merge-sparse.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-[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
+[master (root-commit) badb3ac] init
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-Switched to branch 'right'
-[right bd0edcc] four
+ 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(+)
- create mode 100644 four.t
-Switched to a new branch 'newroot'
-[newroot (root-commit) 5280273] five
+ 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>
- 3 files changed, 3 insertions(+)
- create mode 100644 five.t
- create mode 100644 four.t
- create mode 100644 one.t
-Switched to branch 'main'
+ 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 6433.2 'merge an octopus into void': 
-	t3033_reset &&
-	git checkout --orphan test &&
-	git rm -fr . &&
-	test_must_fail git merge left right &&
-	test_must_fail git rev-parse --verify HEAD &&
-	git diff --quiet &&
-	test_must_fail git rev-parse HEAD
-
-Reset branch 'main'
-Switched to a new branch 'test'
-rm 'one.t'
-rm 'two.t'
-fatal: Can merge only exactly one commit into empty head
-fatal: Needed a single revision
-fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-HEAD
-ok 2 - merge an octopus into void
-
-expecting success of 6433.3 'merge an octopus, fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git merge left right &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^3 &&
-	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
-	git rev-parse three four | sort >expect &&
-	test_cmp expect actual
-
-Switched to and reset branch 'main'
-HEAD is now at d79ce16 one
-Fast-forwarding to: left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 3 - merge an octopus, fast-forward (ff)
-
-expecting success of 6433.4 'merge octopus, non-fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git merge --no-ff left right &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse one three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-HEAD is now at d79ce16 one
-Fast-forwarding to: left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 4 - merge octopus, non-fast-forward (ff)
-
-expecting success of 6433.5 'merge octopus, fast-forward (does not ff)': 
-	t3033_reset &&
-	git merge left right &&
-	# two (main) is not an ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse two three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-Trying simple merge with left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 5 - merge octopus, fast-forward (does not ff)
-
-expecting success of 6433.6 'merge octopus, non-fast-forward': 
-	t3033_reset &&
-	git merge --no-ff left right &&
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse two three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-Trying simple merge with left
-Trying simple merge with right
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 6 - merge octopus, non-fast-forward
-
-expecting success of 6433.7 'merge FETCH_HEAD octopus into void': 
-	t3033_reset &&
-	git checkout --orphan test &&
-	git rm -fr . &&
-	git fetch . left right &&
-	test_must_fail git merge FETCH_HEAD &&
-	test_must_fail git rev-parse --verify HEAD &&
-	git diff --quiet &&
-	test_must_fail git rev-parse HEAD
-
-Reset branch 'main'
-Switched to a new branch 'test'
-rm 'one.t'
-rm 'two.t'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-fatal: Can merge only exactly one commit into empty head
-fatal: Needed a single revision
-fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-HEAD
-ok 7 - merge FETCH_HEAD octopus into void
-
-expecting success of 6433.8 'merge FETCH_HEAD octopus fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git fetch . left right &&
-	git merge FETCH_HEAD &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^3 &&
-	git rev-parse HEAD^1 HEAD^2 | sort >actual &&
-	git rev-parse three four | sort >expect &&
-	test_cmp expect actual
-
-Switched to and reset branch 'main'
-HEAD is now at d79ce16 one
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Fast-forwarding to: 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 8 - merge FETCH_HEAD octopus fast-forward (ff)
-
-expecting success of 6433.9 'merge FETCH_HEAD octopus non-fast-forward (ff)': 
-	t3033_reset &&
-	git reset --hard one &&
-	git fetch . left right &&
-	git merge --no-ff FETCH_HEAD &&
-	# one is ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse one three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-HEAD is now at d79ce16 one
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Fast-forwarding to: 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 9 - merge FETCH_HEAD octopus non-fast-forward (ff)
-
-expecting success of 6433.10 'merge FETCH_HEAD octopus fast-forward (does not ff)': 
-	t3033_reset &&
-	git fetch . left right &&
-	git merge FETCH_HEAD &&
-	# two (main) is not an ancestor of three (left) and four (right)
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse two three four | sort >expect &&
-	test_cmp expect actual
-
-Reset branch 'main'
-From .
- * branch            left       -> FETCH_HEAD
- * branch            right      -> FETCH_HEAD
-Trying simple merge with 897c20684b5db8602798bc55d628f0a264841fec
-Trying simple merge with bd0edcc3f6e0375d96ab0d02fcc4c4a1fe1d8c5f
-Merge made by the 'octopus' strategy.
- four.t  | 1 +
- three.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 four.t
- create mode 100644 three.t
-fatal: Needed a single revision
-ok 10 - merge FETCH_HEAD octopus fast-forward (does not ff)
-
-expecting success of 6433.11 'merge FETCH_HEAD octopus non-fast-forward': 
-	t3033_reset &&
-	git fetch . left right &&
-	git merge --no-ff FETCH_HEAD &&
-	test_must_fail git rev-parse --verify HEAD^4 &&
-	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
-	git rev-parse two three four | sort >expect &&
-	test_cmp expect actual
+expecting success of 6435.2 'reset --hard works after the conflict': 
+	git reset --hard
 
-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 3dfe889 ours
+ok 2 - reset --hard works after the conflict
 
-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 6435.3 'is reset properly': 
+	git status --porcelain -- modify_delete >out &&
+	test_must_be_empty out &&
+	test_path_is_missing modify_delete
 
-Reset branch 'main'
-HEAD is now at bd0edcc four
-fatal: refusing to merge unrelated histories
-ok 12 - refuse two-project merge by default
+ok 3 - is reset properly
 
-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 6435.4 'setup: conflict back': 
+	test_must_fail git merge theirs
 
-Reset branch 'main'
-HEAD is now at bd0edcc four
-ok 13 - refuse two-project merge by default, quit before --autostash happens
+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 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 6435.5 'Merge abort works after the conflict': 
+	git merge --abort
 
-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
+ok 5 - Merge abort works after the conflict
 
-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
+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
 
-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
+ok 6 - is aborted properly
 
-# passed all 15 test(s)
-1..15
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6429-merge-sequence-rename-caching.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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
-	)
+*** t6434-merge-recursive-rename-options.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6434-merge-recursive-rename-options/.git/
+expecting success of 6434.1 'setup repo': 
+	cat <<-\EOF >3-old &&
+	33a
+	33b
+	33c
+	33d
+	EOF
+	sed s/33/22/ <3-old >2-old &&
+	sed s/33/11/ <3-old >1-old &&
+	sed s/33/00/ <3-old >0-old &&
+	git add [0-3]-old &&
+	git commit -m base &&
+	git rm [0-3]-old &&
+	git commit -m delete &&
+	git checkout -b rename HEAD^ &&
+	cp 3-old 3-new &&
+	sed 1,1s/./x/ <2-old >2-new &&
+	sed 1,2s/./x/ <1-old >1-new &&
+	sed 1,3s/./x/ <0-old >0-new &&
+	git add [0-3]-new &&
+	git rm [0-3]-old &&
+	git commit -m rename &&
+	get_expected_stages 0 &&
+	get_expected_stages 1 &&
+	get_expected_stages 2 &&
+	get_expected_stages 3 &&
+	check_50="false" &&
+	tail="HEAD^ -- HEAD main"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+[main (root-commit) f9f9b59] base
  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
+ 4 files changed, 16 insertions(+)
+ create mode 100644 0-old
+ create mode 100644 1-old
+ create mode 100644 2-old
+ create mode 100644 3-old
+rm '0-old'
+rm '1-old'
+rm '2-old'
+rm '3-old'
+[main f3f4da2] delete
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 olddir/newfile
-[topic 81a8875] B
+ 4 files changed, 16 deletions(-)
+ delete mode 100644 0-old
+ delete mode 100644 1-old
+ delete mode 100644 2-old
+ delete mode 100644 3-old
+Switched to a new branch 'rename'
+rm '0-old'
+rm '1-old'
+rm '2-old'
+rm '3-old'
+[rename 056f2c0] rename
  Author: A U Thor <author@example.com>
- 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 &&
+ 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
 
-		#
-		# Actual testing
-		#
+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%"
 
-		git switch upstream &&
-		git config merge.directoryRenames true &&
+ok 2 - setup thresholds
 
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
+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
 
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
+ok 3 - assumption for tests: rename detection with diff
 
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 2 calls &&
+expecting success of 6434.4 'default similarity threshold is 50%': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive $tail &&
+	$check_50
 
-		git ls-files >tracked &&
-		test_line_count = 5 tracked &&
-		test_path_is_missing olddir/newfile &&
-		test_path_is_file newdir/newfile
-	)
+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%
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 6434.5 'low rename threshold': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=$th0 $tail &&
+	check_threshold_0
 
-expecting success of 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 &&
+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
 
-		git switch topic &&
+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_seq 3 10 >relevant-rename &&
-		git add relevant-rename &&
-		git commit -m A &&
+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
 
-		test_seq 1 10 >somefile &&
-		git add somefile &&
-		git mv somefile olddir/newfile &&
-		git commit -m B &&
+expecting success of 6434.7 'high rename threshold': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=$th2 $tail &&
+	check_threshold_2
 
-		test_seq 1 12 >olddir/newfile &&
-		git add olddir/newfile &&
-		git commit -m C &&
+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
 
-		#
-		# Actual testing
-		#
+expecting success of 6434.8 'exact renames only': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=100% $tail &&
+	check_exact_renames
 
-		git switch upstream &&
-		git config merge.directoryRenames true &&
+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
 
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
+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
 
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
+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
 
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 3 calls &&
+expecting success of 6434.10 'disabled rename detection': 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --no-renames $tail &&
+	check_no_renames
 
-		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
-	)
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+ok 10 - disabled rename detection
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
 
-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 &&
+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>
 
-		git switch upstream &&
+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
 
-		>olddir/newfile &&
-		git add olddir/newfile &&
-		git commit -m "Add newfile" &&
+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
 
-		#
-		# Actual testing
-		#
+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
 
-		git switch upstream &&
+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
 
-		git config merge.directoryRenames true &&
+expecting success of 6434.14 'last wins in --find-renames --no-renames': 
+	git read-tree --reset -u HEAD &&
+	git merge-recursive --find-renames --no-renames $tail &&
+	check_no_renames
 
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+ok 14 - last wins in --find-renames --no-renames
 
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
+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
 
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 1 calls &&
+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
 
-		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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+fatal: unknown option --find-renames=-25
+ok 16 - --find-renames rejects negative argument
 
-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 6434.17 '--find-renames rejects non-numbers': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --find-renames=0xf \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
 
-		git switch upstream &&
+fatal: unknown option --find-renames=0xf
+ok 17 - --find-renames rejects non-numbers
 
-		git mv somefile olddir/newfile &&
-		git commit -m "Add newfile" &&
+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
 
-		#
-		# Actual testing
-		#
+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>
 
-		git switch upstream &&
+expecting success of 6434.19 'last wins in --no-renames --rename-threshold=<n>': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --no-renames --rename-threshold=$th0 $tail &&
+	check_threshold_0
 
-		git config merge.directoryRenames true &&
+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>
 
-		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
-		export GIT_TRACE2_PERF &&
+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
 
-		git replay --onto HEAD upstream~1..topic >out &&
-		git update-ref --stdin <out &&
-		git checkout topic &&
+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
 
-		grep region_enter.*diffcore_rename trace.output >calls &&
-		test_line_count = 2 calls &&
+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
 
-		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
-	)
+fatal: unknown option --rename-threshold=-25
+ok 21 - --rename-threshold=<n> rejects negative argument
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 6434.22 '--rename-threshold=<n> rejects non-numbers': 
+	git read-tree --reset -u HEAD &&
+	test_must_fail git merge-recursive --rename-threshold=0xf \
+		HEAD -- HEAD HEAD &&
+	git diff --quiet --cached
 
-expecting success of 6429.10 'avoid assuming we detected renames': 
-	git init redo-weirdness &&
-	(
-		cd redo-weirdness &&
+fatal: unknown option --rename-threshold=0xf
+ok 22 - --rename-threshold=<n> rejects non-numbers
 
-		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 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 branch upstream &&
-		git branch topic &&
+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>
 
-		git switch upstream &&
-		test_seq  1 10 >numbers &&
-		test_seq 11 20 >values &&
-		git add numbers &&
-		git commit -m "Some tweaks" &&
+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 switch topic &&
+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>
 
-		>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 6434.25 'merge.renames disables rename detection': 
+	git read-tree --reset -u HEAD &&
+	git -c merge.renames=false merge-recursive $tail &&
+	check_no_renames
 
-		#
-		# Actual testing
-		#
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+ok 25 - merge.renames disables rename detection
 
-		git switch --detach topic^0 &&
+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
 
-		test_must_fail git -c merge.renameLimit=1 rebase upstream &&
+Merging HEAD with main
+Merging:
+056f2c0 rename
+f3f4da2 delete
+found 1 common ancestor:
+f9f9b59 base
+ok 26 - merge.renames defaults to diff.renames
 
-		git ls-files -u >actual &&
-		test_line_count = 2 actual
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 advice.mergeConflict false"
-Could not apply f96ebc9... A
-ok 10 - avoid assuming we detected 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.
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6439-merge-co-error-msgs.sh ***
@@ -424200,12 +423592,12 @@
 expecting success of 6501.5 'simulate time passing (loose)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1765935490
-1765935490
-1765935490
-1765935490
-1765935490
-1765935490
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
 ok 5 - simulate time passing (loose)
 
 expecting success of 6501.6 'start writing new commit with old blob (loose)': 
@@ -424241,15 +423633,15 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at 8539479 base
-1765935490
-1765935490
-1765935490
-1765935490
-1765935490
-1765935490
-1765935490
-1765935490
-1765935490
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
 ok 10 - abandon objects again (loose)
 
 expecting success of 6501.11 'start writing new commit with same tree (loose)': 
@@ -424316,10 +423708,10 @@
 expecting success of 6501.18 'simulate time passing (repack)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1765935491
-1765935491
-1765935491
-1765935491
+1731526870
+1731526870
+1731526870
+1731526870
 ok 18 - simulate time passing (repack)
 
 expecting success of 6501.19 'start writing new commit with old blob (repack)': 
@@ -424356,17 +423748,17 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at aa8ecd7 base
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
+1731526870
+1731526871
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
+1731526870
 ok 23 - abandon objects again (repack)
 
 expecting success of 6501.24 'start writing new commit with same tree (repack)': 
@@ -424433,11 +423825,11 @@
 expecting success of 6501.31 'simulate time passing (bitmap)': 
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
+1731526871
+1731526871
+1731526871
+1731526871
+1731526871
 ok 31 - simulate time passing (bitmap)
 
 expecting success of 6501.32 'start writing new commit with old blob (bitmap)': 
@@ -424474,17 +423866,17 @@
 		test-tool chmtime --get -86400 $(find .git/objects -type f)
 	
 HEAD is now at 41163df base
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
-1765935491
+1731526871
+1731526871
+1731526871
+1731526871
+1731526871
+1731526871
+1731526871
+1731526871
+1731526871
+1731526871
+1731526871
 ok 36 - abandon objects again (bitmap)
 
 expecting success of 6501.37 'start writing new commit with same tree (bitmap)': 
@@ -424557,124 +423949,6 @@
 1..42
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6700-tree-depth.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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:          2770 KiB
-       pools:          2477 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
-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
-ok 4 - default limit for git-archive fails gracefully
-
-expecting success of 6700.5 'limit recursion of ls-tree -r': 
-	git $small_ok ls-tree -r small &&
-	test_must_fail git $small_no ls-tree -r small
-
-100644 blob d7178a291fc27940d51a7ac20784bb91c5ae524c	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
-error: exceeded maximum allowed tree depth
-ok 5 - limit recursion of ls-tree -r
-
-expecting success of 6700.6 'default limit for ls-tree fails gracefully': 
-	test_must_fail git ls-tree -r big >/dev/null
-
-error: exceeded maximum allowed tree depth
-ok 6 - default limit for ls-tree fails gracefully
-
-expecting success of 6700.7 'limit recursion of rev-list --objects': 
-	git $small_ok rev-list --objects small >/dev/null &&
-	test_must_fail git $small_no rev-list --objects small >/dev/null
-
-fatal: exceeded maximum allowed tree depth
-ok 7 - limit recursion of rev-list --objects
-
-expecting success of 6700.8 'default limit for rev-list fails gracefully': 
-	test_must_fail git rev-list --objects big >/dev/null
-
-fatal: exceeded maximum allowed tree depth
-ok 8 - default limit for rev-list fails gracefully
-
-expecting success of 6700.9 'limit recursion of diff-tree -r': 
-	git $small_ok diff-tree -r $EMPTY_TREE small &&
-	test_must_fail git $small_no diff-tree -r $EMPTY_TREE small
-
-:000000 100644 0000000000000000000000000000000000000000 d7178a291fc27940d51a7ac20784bb91c5ae524c A	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
-fatal: exceeded maximum allowed tree depth
-ok 9 - limit recursion of diff-tree -r
-
-expecting success of 6700.10 'default limit for diff-tree fails gracefully': 
-	test_must_fail git diff-tree -r $EMPTY_TREE big
-
-fatal: exceeded maximum allowed tree depth
-ok 10 - default limit for diff-tree fails gracefully
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6437-submodule-merge.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6437-submodule-merge/.git/
 expecting success of 6437.1 'setup': 
@@ -425459,7 +424733,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 Dec 18 01:38 path/file
+-rw-r--r-- 1 pbuilder2 pbuilder2 9 Nov 14 19:41 path/file
 HEAD is now at 90b0bac A
 not ok 18 - directory/submodule conflict; keep submodule clean # TODO known breakage
 
@@ -425578,47 +424852,165 @@
  create mode 100644 file-b
 ok 21 - setup for null merge base
 
-expecting success of 6437.22 'merging should fail with no merge base': 
-	(cd no-merge-base &&
-	git checkout -b b init &&
-	git add sub &&
-	git commit -m "b" &&
-	test_must_fail git merge a 2>actual &&
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-    then
-		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short HEAD^1)" &&
-		grep "$sub_expect" actual
-	fi)
+expecting success of 6437.22 'merging should fail with no merge base': 
+	(cd no-merge-base &&
+	git checkout -b b init &&
+	git add sub &&
+	git commit -m "b" &&
+	test_must_fail git merge a 2>actual &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+    then
+		sub_expect="go to submodule (sub), and either merge commit $(git -C sub rev-parse --short HEAD^1)" &&
+		grep "$sub_expect" actual
+	fi)
+
+Switched to a new branch 'b'
+warning: adding embedded git repository: sub
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sub
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sub
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[b 5e75592] b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+Failed to merge submodule sub (no merge base)
+CONFLICT (submodule): Merge conflict in sub
+Automatic merge failed; fix conflicts and then commit the result.
+hint:  - go to submodule (sub), and either merge commit d61d855
+ok 22 - merging should fail with no merge base
+
+# still have 2 known breakage(s)
+# passed all remaining 20 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6700-tree-depth.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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:          2770 KiB
+       pools:          2477 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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
+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
+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
 
-Switched to a new branch 'b'
-warning: adding embedded git repository: sub
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[b 5e75592] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub
-Failed to merge submodule sub (no merge base)
-CONFLICT (submodule): Merge conflict in sub
-Automatic merge failed; fix conflicts and then commit the result.
-hint:  - go to submodule (sub), and either merge commit d61d855
-ok 22 - merging should fail with no merge base
+expecting success of 6700.6 'default limit for ls-tree fails gracefully': 
+	test_must_fail git ls-tree -r big >/dev/null
 
-# still have 2 known breakage(s)
-# passed all remaining 20 test(s)
-1..22
+error: exceeded maximum allowed tree depth
+ok 6 - default limit for ls-tree fails gracefully
+
+expecting success of 6700.7 'limit recursion of rev-list --objects': 
+	git $small_ok rev-list --objects small >/dev/null &&
+	test_must_fail git $small_no rev-list --objects small >/dev/null
+
+fatal: exceeded maximum allowed tree depth
+ok 7 - limit recursion of rev-list --objects
+
+expecting success of 6700.8 'default limit for rev-list fails gracefully': 
+	test_must_fail git rev-list --objects big >/dev/null
+
+fatal: exceeded maximum allowed tree depth
+ok 8 - default limit for rev-list fails gracefully
+
+expecting success of 6700.9 'limit recursion of diff-tree -r': 
+	git $small_ok diff-tree -r $EMPTY_TREE small &&
+	test_must_fail git $small_no diff-tree -r $EMPTY_TREE small
+
+:000000 100644 0000000000000000000000000000000000000000 d7178a291fc27940d51a7ac20784bb91c5ae524c A	a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/a/file
+fatal: exceeded maximum allowed tree depth
+ok 9 - limit recursion of diff-tree -r
+
+expecting success of 6700.10 'default limit for diff-tree fails gracefully': 
+	test_must_fail git diff-tree -r $EMPTY_TREE big
+
+fatal: exceeded maximum allowed tree depth
+ok 10 - default limit for diff-tree fails gracefully
+
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6500-gc.sh ***
@@ -426231,7 +425623,7 @@
 		gc --cruft --max-cruft-size=1M &&
 	test_subcommand $cruft_max_size_opts --max-cruft-size=1048576 <trace2.txt
 
-{"event":"child_start","sid":"20251218T013813.778167Z-Hfbad846e-P00004fa8","thread":"main","time":"2025-12-18T01:38:13.785819Z","file":"run-command.c","line":724,"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":"20241114T194119.284480Z-H5c947e1c-P0000644f","thread":"main","time":"2024-11-14T19:41:19.431574Z","file":"run-command.c","line":724,"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': 
@@ -426244,8 +425636,8 @@
 		--max-cruft-size=3M &&
 	test_subcommand $cruft_max_size_opts --max-cruft-size=3145728 <trace2.txt
 
-{"event":"child_start","sid":"20251218T013813.818230Z-Hfbad846e-P00004fcb","thread":"main","time":"2025-12-18T01:38:13.825622Z","file":"run-command.c","line":724,"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":"20251218T013813.860684Z-Hfbad846e-P00004fec","thread":"main","time":"2025-12-18T01:38:13.868058Z","file":"run-command.c","line":724,"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":"20241114T194119.472826Z-H5c947e1c-P0000646a","thread":"main","time":"2024-11-14T19:41:19.842042Z","file":"run-command.c","line":724,"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":"20241114T194120.190270Z-H5c947e1c-P000064b2","thread":"main","time":"2024-11-14T19:41:20.249126Z","file":"run-command.c","line":724,"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': 
@@ -427199,7 +426591,7 @@
 	git mv ab a
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7001-mv/.git/
-[master (root-commit) f768f3c] initial
+[master (root-commit) 8055a70] initial
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+)
  create mode 100644 ab.c
@@ -427725,1555 +427117,6 @@
 1..52
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7005-editor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7005-editor/.git/
-expecting success of 7005.1 'determine default editor': 
-
-	vi=$(TERM=vt100 git var GIT_EDITOR) &&
-	test -n "$vi"
-
-
-ok 1 - determine default editor
-
-expecting success of 7005.2 'setup': 
-
-	msg="Hand-edited" &&
-	test_commit "$msg" &&
-	echo "$msg" >expect &&
-	git show -s --format=%s > actual &&
-	test_cmp expect actual
-
-
-[master (root-commit) 2ddcc77] Hand-edited
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 2 - setup
-
-expecting success of 7005.3 'dumb should error out when falling back on vi': 
-
-	if git commit --amend
-	then
-		echo "Oops?"
-		false
-	else
-		: happy
-	fi
-
-error: Terminal is dumb, but EDITOR unset
-Please supply the message using either -m or -F option.
-ok 3 - dumb should error out when falling back on vi
-
-expecting success of 7005.4 'dumb should prefer EDITOR to VISUAL': 
-
-	EDITOR=./e-EDITOR.sh &&
-	VISUAL=./e-VISUAL.sh &&
-	export EDITOR VISUAL &&
-	git commit --amend &&
-	test "$(git show -s --format=%s)" = "Edited by EDITOR"
-
-
-[master 7eecd8c] Edited by EDITOR
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 4 - dumb should prefer EDITOR to VISUAL
-
-expecting success of 7005.5 'Using editor': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 5b7078a] Edited by editor
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 5 - Using editor
-
-expecting success of 7005.6 'Using EDITOR': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 7eecd8c] Edited by EDITOR
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 6 - Using EDITOR
-
-expecting success of 7005.7 'Using VISUAL': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 2ee1d44] Edited by VISUAL
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 7 - Using VISUAL
-
-expecting success of 7005.8 'Using core_editor': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 1c851bb] Edited by core_editor
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 8 - Using core_editor
-
-expecting success of 7005.9 'Using GIT_EDITOR': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 1bdd03b] Edited by GIT_EDITOR
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 9 - Using GIT_EDITOR
-
-expecting success of 7005.10 'Using editor (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 5b7078a] Edited by editor
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 10 - Using editor (override)
-
-expecting success of 7005.11 'Using EDITOR (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 7eecd8c] Edited by EDITOR
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 11 - Using EDITOR (override)
-
-expecting success of 7005.12 'Using VISUAL (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 2ee1d44] Edited by VISUAL
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 12 - Using VISUAL (override)
-
-expecting success of 7005.13 'Using core_editor (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 1c851bb] Edited by core_editor
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 13 - Using core_editor (override)
-
-expecting success of 7005.14 'Using GIT_EDITOR (override)': 
-		git --exec-path=. commit --amend &&
-		git show -s --pretty=oneline |
-		sed -e "s/^[0-9a-f]* //" >actual &&
-		test_cmp expect actual
-	
-[master 1bdd03b] Edited by GIT_EDITOR
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 14 - Using GIT_EDITOR (override)
-
-expecting success of 7005.15 'editor with a space': 
-	echo "echo space >\"\$1\"" >"e space.sh" &&
-	chmod a+x "e space.sh" &&
-	GIT_EDITOR="./e\ space.sh" git commit --amend &&
-	test space = "$(git show -s --pretty=format:%s)"
-
-
-[master 5d9c28a] space
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 15 - editor with a space
-
-expecting success of 7005.16 'core.editor with a space': 
-
-	git config core.editor \"./e\ space.sh\" &&
-	git commit --amend &&
-	test space = "$(git show -s --pretty=format:%s)"
-
-
-[master 5d9c28a] space
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:13:13 2005 -0700
- 1 file changed, 1 insertion(+)
- create mode 100644 Hand-edited.t
-ok 16 - core.editor with a space
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6600-test-reach.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-
-# passed all 37 test(s)
-1..37
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7007-show.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7007-show/.git/
-expecting success of 7007.1 'setup': 
-	echo hello world >foo &&
-	H=$(git hash-object -w foo) &&
-	git tag -a foo-tag -m "Tags $H" $H &&
-	HH=$(expr "$H" : "\(..\)") &&
-	H38=$(expr "$H" : "..\(.*\)") &&
-	rm -f .git/objects/$HH/$H38
-
-ok 1 - setup
-
-expecting success of 7007.2 'showing a tag that point at a missing object': 
-	test_must_fail git --no-pager show foo-tag
-
-error: could not read object 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
-tag foo-tag
-Tagger: C O Mitter <committer@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-Tags 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
-ok 2 - showing a tag that point at a missing object
-
-expecting success of 7007.3 'set up a bit of history': 
-	test_commit main1 &&
-	test_commit main2 &&
-	test_commit main3 &&
-	git tag -m "annotated tag" annotated &&
-	git checkout -b side HEAD^^ &&
-	test_commit side2 &&
-	test_commit side3 &&
-	test_merge merge main3
-
-[master (root-commit) 9ca29bf] main1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main1.t
-[master 6983cd6] main2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main2.t
-[master 75daec8] main3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main3.t
-Switched to a new branch 'side'
-[side 2e812aa] side2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 side2.t
-[side 42b83a8] side3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 side3.t
-Merge made by the 'ort' strategy.
- main2.t | 1 +
- main3.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 main2.t
- create mode 100644 main3.t
-ok 3 - set up a bit of history
-
-expecting success of 7007.4 'showing two commits': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main2)
-	commit $(git rev-parse main3)
-	EOF
-	git show main2 main3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 4 - showing two commits
-
-expecting success of 7007.5 'showing a tree': 
-	cat >expected <<-EOF &&
-	tree main1:
-
-	main1.t
-	EOF
-	git show main1: >actual &&
-	test_cmp expected actual
-
-ok 5 - showing a tree
-
-expecting success of 7007.6 'showing two trees': 
-	cat >expected <<-EOF &&
-	tree main1^{tree}
-
-	main1.t
-
-	tree main2^{tree}
-
-	main1.t
-	main2.t
-	EOF
-	git show main1^{tree} main2^{tree} >actual &&
-	test_cmp expected actual
-
-ok 6 - showing two trees
-
-expecting success of 7007.7 'showing a trees is not recursive': 
-	git worktree add not-recursive main1 &&
-	mkdir not-recursive/a &&
-	test_commit -C not-recursive a/file &&
-	cat >expected <<-EOF &&
-	tree HEAD^{tree}
-
-	a/
-	main1.t
-	EOF
-	git -C not-recursive show HEAD^{tree} >actual &&
-	test_cmp expected actual
-
-Preparing worktree (detached HEAD 9ca29bf)
-HEAD is now at 9ca29bf main1
-[detached HEAD 2da4daa] a/file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a/file.t
-ok 7 - showing a trees is not recursive
-
-expecting success of 7007.8 'showing a range walks (linear)': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show main1..main3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 8 - showing a range walks (linear)
-
-expecting success of 7007.9 'showing a range walks (Y shape, ^ first)': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show ^side3 main3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 9 - showing a range walks (Y shape, ^ first)
-
-expecting success of 7007.10 'showing a range walks (Y shape, ^ last)': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show main3 ^side3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 10 - showing a range walks (Y shape, ^ last)
-
-expecting success of 7007.11 'showing with -N walks': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show -2 main3 >actual &&
-	grep ^commit actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 11 - showing with -N walks
-
-expecting success of 7007.12 'showing annotated tag': 
-	cat >expect <<-EOF &&
-	tag annotated
-	commit $(git rev-parse annotated^{commit})
-	EOF
-	git show annotated >actual &&
-	grep -E "^(commit|tag)" actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 12 - showing annotated tag
-
-expecting success of 7007.13 'showing annotated tag plus commit': 
-	cat >expect <<-EOF &&
-	tag annotated
-	commit $(git rev-parse annotated^{commit})
-	commit $(git rev-parse side3)
-	EOF
-	git show annotated side3 >actual &&
-	grep -E "^(commit|tag)" actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 13 - showing annotated tag plus commit
-
-expecting success of 7007.14 'showing range': 
-	cat >expect <<-EOF &&
-	commit $(git rev-parse main3)
-	commit $(git rev-parse main2)
-	EOF
-	git show ^side3 annotated >actual &&
-	grep -E "^(commit|tag)" actual >actual.filtered &&
-	test_cmp expect actual.filtered
-
-ok 14 - showing range
-
-expecting success of 7007.15 '-s suppresses diff': 
-	cat >expect <<-\EOF &&
-	merge
-	main3
-	EOF
-	git show -s --format=%s merge main3 >actual &&
-	test_cmp expect actual
-
-ok 15 - -s suppresses diff
-
-expecting success of 7007.16 '--quiet suppresses diff': 
-	echo main3 >expect &&
-	git show --quiet --format=%s main3 >actual &&
-	test_cmp expect actual
-
-ok 16 - --quiet suppresses diff
-
-expecting success of 7007.17 'show --graph is forbidden': 
-  test_must_fail git show --graph HEAD
-
-fatal: options '--no-walk' and '--graph' cannot be used together
-ok 17 - show --graph is forbidden
-
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7008-filter-branch-null-sha1.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7008-filter-branch-null-sha1/.git/
-expecting success of 7008.1 'setup: base commits': 
-	test_commit one &&
-	test_commit two &&
-	test_commit three
-
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[master 139b20d] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-[master 7c7cd71] three
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 three.t
-ok 1 - setup: base commits
-
-expecting success of 7008.2 'setup: a commit with a bogus null sha1 in the tree': 
-	{
-		git ls-tree HEAD &&
-		printf "160000 commit $ZERO_OID\\tbroken\\n"
-	} >broken-tree &&
-	echo "add broken entry" >msg &&
-
-	tree=$(git mktree <broken-tree) &&
-	test_tick &&
-	commit=$(git commit-tree $tree -p HEAD <msg) &&
-	git update-ref HEAD "$commit"
-
-ok 2 - setup: a commit with a bogus null sha1 in the tree
-
-expecting success of 7008.3 'setup: bring HEAD and index in sync': 
-	test_tick &&
-	git commit -a -m "back to normal"
-
-[master 6fc1982] back to normal
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
- delete mode 160000 broken
-ok 3 - setup: bring HEAD and index in sync
-
-expecting success of 7008.4 'noop filter-branch complains': 
-	test_must_fail git filter-branch \
-		--force --prune-empty \
-		--index-filter "true"
-
-
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (0 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
-error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
-fatal: git-write-tree: error building trees
-fatal: not a valid object name 
-could not write rewritten commit
-ok 4 - noop filter-branch complains
-
-expecting success of 7008.5 'filter commands are still checked': 
-	test_must_fail git filter-branch \
-		--force --prune-empty \
-		--index-filter "git rm --cached --ignore-unmatch three.t"
-
-
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    rm 'three.t'
-
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (1 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
-error: cache entry has null sha1: broken
-fatal: Unable to write new index file
-rm 'three.t'
-index filter failed: git rm --cached --ignore-unmatch three.t
-ok 5 - filter commands are still checked
-
-expecting success of 7008.6 'removing the broken entry works': 
-	echo three >expect &&
-	git filter-branch \
-		--force --prune-empty \
-		--index-filter "git rm --cached --ignore-unmatch broken" &&
-	git log -1 --format=%s >actual &&
-	test_cmp expect actual
-
-
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (0 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
-rm 'broken'
-
Rewrite 6fc1982a7cbeec7380180353ef341fd996ac21f7 (5/5) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/master' was rewritten
-ok 6 - removing the broken entry works
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t6423-merge-rename-directories.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6423-merge-rename-directories/.git/
 expecting success of 6423.1 '1a: Simple directory rename detection': 
@@ -435098,6 +432941,1555 @@
 1..76
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6600-test-reach.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+
+# passed all 37 test(s)
+1..37
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7005-editor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7005-editor/.git/
+expecting success of 7005.1 'determine default editor': 
+
+	vi=$(TERM=vt100 git var GIT_EDITOR) &&
+	test -n "$vi"
+
+
+ok 1 - determine default editor
+
+expecting success of 7005.2 'setup': 
+
+	msg="Hand-edited" &&
+	test_commit "$msg" &&
+	echo "$msg" >expect &&
+	git show -s --format=%s > actual &&
+	test_cmp expect actual
+
+
+[master (root-commit) 2ddcc77] Hand-edited
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 2 - setup
+
+expecting success of 7005.3 'dumb should error out when falling back on vi': 
+
+	if git commit --amend
+	then
+		echo "Oops?"
+		false
+	else
+		: happy
+	fi
+
+error: Terminal is dumb, but EDITOR unset
+Please supply the message using either -m or -F option.
+ok 3 - dumb should error out when falling back on vi
+
+expecting success of 7005.4 'dumb should prefer EDITOR to VISUAL': 
+
+	EDITOR=./e-EDITOR.sh &&
+	VISUAL=./e-VISUAL.sh &&
+	export EDITOR VISUAL &&
+	git commit --amend &&
+	test "$(git show -s --format=%s)" = "Edited by EDITOR"
+
+
+[master 7eecd8c] Edited by EDITOR
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 4 - dumb should prefer EDITOR to VISUAL
+
+expecting success of 7005.5 'Using editor': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 5b7078a] Edited by editor
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 5 - Using editor
+
+expecting success of 7005.6 'Using EDITOR': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 7eecd8c] Edited by EDITOR
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 6 - Using EDITOR
+
+expecting success of 7005.7 'Using VISUAL': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 2ee1d44] Edited by VISUAL
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 7 - Using VISUAL
+
+expecting success of 7005.8 'Using core_editor': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 1c851bb] Edited by core_editor
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 8 - Using core_editor
+
+expecting success of 7005.9 'Using GIT_EDITOR': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 1bdd03b] Edited by GIT_EDITOR
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 9 - Using GIT_EDITOR
+
+expecting success of 7005.10 'Using editor (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 5b7078a] Edited by editor
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 10 - Using editor (override)
+
+expecting success of 7005.11 'Using EDITOR (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 7eecd8c] Edited by EDITOR
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 11 - Using EDITOR (override)
+
+expecting success of 7005.12 'Using VISUAL (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 2ee1d44] Edited by VISUAL
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 12 - Using VISUAL (override)
+
+expecting success of 7005.13 'Using core_editor (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 1c851bb] Edited by core_editor
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 13 - Using core_editor (override)
+
+expecting success of 7005.14 'Using GIT_EDITOR (override)': 
+		git --exec-path=. commit --amend &&
+		git show -s --pretty=oneline |
+		sed -e "s/^[0-9a-f]* //" >actual &&
+		test_cmp expect actual
+	
+[master 1bdd03b] Edited by GIT_EDITOR
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 14 - Using GIT_EDITOR (override)
+
+expecting success of 7005.15 'editor with a space': 
+	echo "echo space >\"\$1\"" >"e space.sh" &&
+	chmod a+x "e space.sh" &&
+	GIT_EDITOR="./e\ space.sh" git commit --amend &&
+	test space = "$(git show -s --pretty=format:%s)"
+
+
+[master 5d9c28a] space
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 15 - editor with a space
+
+expecting success of 7005.16 'core.editor with a space': 
+
+	git config core.editor \"./e\ space.sh\" &&
+	git commit --amend &&
+	test space = "$(git show -s --pretty=format:%s)"
+
+
+[master 5d9c28a] space
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:13:13 2005 -0700
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Hand-edited.t
+ok 16 - core.editor with a space
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7007-show.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7007-show/.git/
+expecting success of 7007.1 'setup': 
+	echo hello world >foo &&
+	H=$(git hash-object -w foo) &&
+	git tag -a foo-tag -m "Tags $H" $H &&
+	HH=$(expr "$H" : "\(..\)") &&
+	H38=$(expr "$H" : "..\(.*\)") &&
+	rm -f .git/objects/$HH/$H38
+
+ok 1 - setup
+
+expecting success of 7007.2 'showing a tag that point at a missing object': 
+	test_must_fail git --no-pager show foo-tag
+
+error: could not read object 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
+tag foo-tag
+Tagger: C O Mitter <committer@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+Tags 3b18e512dba79e4c8300dd08aeb37f8e728b8dad
+ok 2 - showing a tag that point at a missing object
+
+expecting success of 7007.3 'set up a bit of history': 
+	test_commit main1 &&
+	test_commit main2 &&
+	test_commit main3 &&
+	git tag -m "annotated tag" annotated &&
+	git checkout -b side HEAD^^ &&
+	test_commit side2 &&
+	test_commit side3 &&
+	test_merge merge main3
+
+[master (root-commit) 9ca29bf] main1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main1.t
+[master 6983cd6] main2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main2.t
+[master 75daec8] main3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main3.t
+Switched to a new branch 'side'
+[side 2e812aa] side2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side2.t
+[side 42b83a8] side3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 side3.t
+Merge made by the 'ort' strategy.
+ main2.t | 1 +
+ main3.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 main2.t
+ create mode 100644 main3.t
+ok 3 - set up a bit of history
+
+expecting success of 7007.4 'showing two commits': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main2)
+	commit $(git rev-parse main3)
+	EOF
+	git show main2 main3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
+
+ok 4 - showing two commits
+
+expecting success of 7007.5 'showing a tree': 
+	cat >expected <<-EOF &&
+	tree main1:
+
+	main1.t
+	EOF
+	git show main1: >actual &&
+	test_cmp expected actual
+
+ok 5 - showing a tree
+
+expecting success of 7007.6 'showing two trees': 
+	cat >expected <<-EOF &&
+	tree main1^{tree}
+
+	main1.t
+
+	tree main2^{tree}
+
+	main1.t
+	main2.t
+	EOF
+	git show main1^{tree} main2^{tree} >actual &&
+	test_cmp expected actual
+
+ok 6 - showing two trees
+
+expecting success of 7007.7 'showing a trees is not recursive': 
+	git worktree add not-recursive main1 &&
+	mkdir not-recursive/a &&
+	test_commit -C not-recursive a/file &&
+	cat >expected <<-EOF &&
+	tree HEAD^{tree}
+
+	a/
+	main1.t
+	EOF
+	git -C not-recursive show HEAD^{tree} >actual &&
+	test_cmp expected actual
+
+Preparing worktree (detached HEAD 9ca29bf)
+HEAD is now at 9ca29bf main1
+[detached HEAD 2da4daa] a/file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a/file.t
+ok 7 - showing a trees is not recursive
+
+expecting success of 7007.8 'showing a range walks (linear)': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show main1..main3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
+
+ok 8 - showing a range walks (linear)
+
+expecting success of 7007.9 'showing a range walks (Y shape, ^ first)': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show ^side3 main3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
+
+ok 9 - showing a range walks (Y shape, ^ first)
+
+expecting success of 7007.10 'showing a range walks (Y shape, ^ last)': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show main3 ^side3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
+
+ok 10 - showing a range walks (Y shape, ^ last)
+
+expecting success of 7007.11 'showing with -N walks': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show -2 main3 >actual &&
+	grep ^commit actual >actual.filtered &&
+	test_cmp expect actual.filtered
+
+ok 11 - showing with -N walks
+
+expecting success of 7007.12 'showing annotated tag': 
+	cat >expect <<-EOF &&
+	tag annotated
+	commit $(git rev-parse annotated^{commit})
+	EOF
+	git show annotated >actual &&
+	grep -E "^(commit|tag)" actual >actual.filtered &&
+	test_cmp expect actual.filtered
+
+ok 12 - showing annotated tag
+
+expecting success of 7007.13 'showing annotated tag plus commit': 
+	cat >expect <<-EOF &&
+	tag annotated
+	commit $(git rev-parse annotated^{commit})
+	commit $(git rev-parse side3)
+	EOF
+	git show annotated side3 >actual &&
+	grep -E "^(commit|tag)" actual >actual.filtered &&
+	test_cmp expect actual.filtered
+
+ok 13 - showing annotated tag plus commit
+
+expecting success of 7007.14 'showing range': 
+	cat >expect <<-EOF &&
+	commit $(git rev-parse main3)
+	commit $(git rev-parse main2)
+	EOF
+	git show ^side3 annotated >actual &&
+	grep -E "^(commit|tag)" actual >actual.filtered &&
+	test_cmp expect actual.filtered
+
+ok 14 - showing range
+
+expecting success of 7007.15 '-s suppresses diff': 
+	cat >expect <<-\EOF &&
+	merge
+	main3
+	EOF
+	git show -s --format=%s merge main3 >actual &&
+	test_cmp expect actual
+
+ok 15 - -s suppresses diff
+
+expecting success of 7007.16 '--quiet suppresses diff': 
+	echo main3 >expect &&
+	git show --quiet --format=%s main3 >actual &&
+	test_cmp expect actual
+
+ok 16 - --quiet suppresses diff
+
+expecting success of 7007.17 'show --graph is forbidden': 
+  test_must_fail git show --graph HEAD
+
+fatal: options '--no-walk' and '--graph' cannot be used together
+ok 17 - show --graph is forbidden
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7008-filter-branch-null-sha1.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7008-filter-branch-null-sha1/.git/
+expecting success of 7008.1 'setup: base commits': 
+	test_commit one &&
+	test_commit two &&
+	test_commit three
+
+[master (root-commit) d79ce16] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[master 139b20d] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+[master 7c7cd71] three
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 three.t
+ok 1 - setup: base commits
+
+expecting success of 7008.2 'setup: a commit with a bogus null sha1 in the tree': 
+	{
+		git ls-tree HEAD &&
+		printf "160000 commit $ZERO_OID\\tbroken\\n"
+	} >broken-tree &&
+	echo "add broken entry" >msg &&
+
+	tree=$(git mktree <broken-tree) &&
+	test_tick &&
+	commit=$(git commit-tree $tree -p HEAD <msg) &&
+	git update-ref HEAD "$commit"
+
+ok 2 - setup: a commit with a bogus null sha1 in the tree
+
+expecting success of 7008.3 'setup: bring HEAD and index in sync': 
+	test_tick &&
+	git commit -a -m "back to normal"
+
+[master 6fc1982] back to normal
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ delete mode 160000 broken
+ok 3 - setup: bring HEAD and index in sync
+
+expecting success of 7008.4 'noop filter-branch complains': 
+	test_must_fail git filter-branch \
+		--force --prune-empty \
+		--index-filter "true"
+
+
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (0 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
+error: invalid object 160000 0000000000000000000000000000000000000000 for 'broken'
+fatal: git-write-tree: error building trees
+fatal: not a valid object name 
+could not write rewritten commit
+ok 4 - noop filter-branch complains
+
+expecting success of 7008.5 'filter commands are still checked': 
+	test_must_fail git filter-branch \
+		--force --prune-empty \
+		--index-filter "git rm --cached --ignore-unmatch three.t"
+
+
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (1 seconds passed, remaining 0 predicted)    rm 'three.t'
+
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (3/5) (1 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
+error: cache entry has null sha1: broken
+fatal: Unable to write new index file
+rm 'three.t'
+index filter failed: git rm --cached --ignore-unmatch three.t
+ok 5 - filter commands are still checked
+
+expecting success of 7008.6 'removing the broken entry works': 
+	echo three >expect &&
+	git filter-branch \
+		--force --prune-empty \
+		--index-filter "git rm --cached --ignore-unmatch broken" &&
+	git log -1 --format=%s >actual &&
+	test_cmp expect actual
+
+
Rewrite d79ce1670bdcb76e6d1da2ae095e890ccb326ae9 (1/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 139b20d8e6c5b496de61f033f642d0e3dbff528d (2/5) (0 seconds passed, remaining 0 predicted)    
Rewrite 7c7cd714e262561f73f3079dfca4e8724682ac21 (3/5) (0 seconds passed, remaining 0 predicted)    
Rewrite e3ed0c3a94f05540151bd8cb9ac647b8777964a6 (4/5) (1 seconds passed, remaining 0 predicted)    warning: cache entry has null sha1: broken
+rm 'broken'
+
Rewrite 6fc1982a7cbeec7380180353ef341fd996ac21f7 (4/5) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/master' was rewritten
+ok 6 - removing the broken entry works
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7010-setup.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7010-setup/.git/
 expecting success of 7010.1 'setup': 
@@ -435291,6 +434683,145 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7011-skip-worktree-reading.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7011-skip-worktree-reading/.git/
+expecting success of 7011.1 'setup': 
+	test_commit init &&
+	mkdir sub &&
+	touch ./1 ./2 sub/1 sub/2 &&
+	git add 1 2 sub/1 sub/2 &&
+	git update-index --skip-worktree 1 sub/1 &&
+	git ls-files -t > result &&
+	test_cmp expect.skip result
+
+[master (root-commit) 2519212] init
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 init.t
+ok 1 - setup
+
+expecting success of 7011.2 'update-index': 
+	setup_absent &&
+	git update-index 1 &&
+	test_absent
+
+ok 2 - update-index
+
+expecting success of 7011.3 'update-index': 
+	setup_dirty &&
+	git update-index 1 &&
+	test_dirty
+
+ok 3 - update-index
+
+expecting success of 7011.4 'update-index --remove': 
+	setup_absent &&
+	git update-index --remove 1 &&
+	test -z "$(git ls-files 1)" &&
+	test ! -f 1
+
+ok 4 - update-index --remove
+
+expecting success of 7011.5 'update-index --remove': 
+	setup_dirty &&
+	git update-index --remove 1 &&
+	test -z "$(git ls-files 1)" &&
+	echo dirty > expected &&
+	test_cmp expected 1
+
+ok 5 - update-index --remove
+
+expecting success of 7011.6 'ls-files --deleted': 
+	setup_absent &&
+	test -z "$(git ls-files -d)"
+
+ok 6 - ls-files --deleted
+
+expecting success of 7011.7 'ls-files --deleted': 
+	setup_dirty &&
+	test -z "$(git ls-files -d)"
+
+ok 7 - ls-files --deleted
+
+expecting success of 7011.8 'ls-files --modified': 
+	setup_absent &&
+	test -z "$(git ls-files -m)"
+
+ok 8 - ls-files --modified
+
+expecting success of 7011.9 'ls-files --modified': 
+	setup_dirty &&
+	test -z "$(git ls-files -m)"
+
+ok 9 - ls-files --modified
+
+expecting success of 7011.10 'diff-index does not examine skip-worktree absent entries': 
+	setup_absent &&
+	git diff-index HEAD -- 1 > result &&
+	test_cmp expected result
+
+ok 10 - diff-index does not examine skip-worktree absent entries
+
+expecting success of 7011.11 'diff-index does not examine skip-worktree dirty entries': 
+	setup_dirty &&
+	git diff-index HEAD -- 1 > result &&
+	test_cmp expected result
+
+ok 11 - diff-index does not examine skip-worktree dirty entries
+
+expecting success of 7011.12 'diff-files does not examine skip-worktree absent entries': 
+	setup_absent &&
+	test -z "$(git diff-files -- one)"
+
+ok 12 - diff-files does not examine skip-worktree absent entries
+
+expecting success of 7011.13 'diff-files does not examine skip-worktree dirty entries': 
+	setup_dirty &&
+	test -z "$(git diff-files -- one)"
+
+ok 13 - diff-files does not examine skip-worktree dirty entries
+
+expecting success of 7011.14 'commit on skip-worktree absent entries': 
+	git reset &&
+	setup_absent &&
+	test_must_fail git commit -m null 1
+
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	2
+	expect.full
+	expect.skip
+	expected
+	result
+	sub/
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 14 - commit on skip-worktree absent entries
+
+expecting success of 7011.15 'commit on skip-worktree dirty entries': 
+	git reset &&
+	setup_dirty &&
+	test_must_fail git commit -m null 1
+
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	1
+	2
+	expect.full
+	expect.skip
+	expected
+	result
+	sub/
+
+nothing added to commit but untracked files present (use "git add" to track)
+ok 15 - commit on skip-worktree dirty entries
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7004-tag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7004-tag/.git/
 expecting success of 7004.1 'setup': 
@@ -438229,143 +437760,244 @@
 1..221
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7011-skip-worktree-reading.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7011-skip-worktree-reading/.git/
-expecting success of 7011.1 'setup': 
+*** t7012-skip-worktree-writing.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7012-skip-worktree-writing/.git/
+expecting success of 7012.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
+	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 7011.2 'update-index': 
-	setup_absent &&
-	git update-index 1 &&
-	test_absent
+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
 
-ok 2 - update-index
+Note: switching to 'top'.
 
-expecting success of 7011.3 'update-index': 
-	setup_dirty &&
-	git update-index 1 &&
-	test_dirty
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-ok 3 - update-index
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
 
-expecting success of 7011.4 'update-index --remove': 
-	setup_absent &&
-	git update-index --remove 1 &&
-	test -z "$(git ls-files 1)" &&
-	test ! -f 1
+  git switch -c <new-branch-name>
 
-ok 4 - update-index --remove
+Or undo this operation with:
 
-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
+  git switch -
 
-ok 5 - update-index --remove
+Turn off this advice by setting config variable advice.detachedHead to false
 
-expecting success of 7011.6 'ls-files --deleted': 
-	setup_absent &&
-	test -z "$(git ls-files -d)"
+HEAD is now at fa1ce8e modified and added
+ok 2 - read-tree updates worktree, absent case
 
-ok 6 - ls-files --deleted
+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 7011.7 'ls-files --deleted': 
-	setup_dirty &&
-	test -z "$(git ls-files -d)"
+HEAD is now at fa1ce8e modified and added
+error: Entry 'init.t' not uptodate. Cannot merge.
+ok 3 - read-tree updates worktree, dirty case
 
-ok 7 - ls-files --deleted
+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
 
-expecting success of 7011.8 'ls-files --modified': 
-	setup_absent &&
-	test -z "$(git ls-files -m)"
+HEAD is now at fa1ce8e modified and added
+ok 4 - read-tree removes worktree, absent case
 
-ok 8 - ls-files --modified
+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 7011.9 'ls-files --modified': 
+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 -z "$(git ls-files -m)"
+	test_must_fail git rm 1 &&
+	test_dirty
 
-ok 9 - ls-files --modified
+The following paths and/or pathspecs matched paths that exist
+outside of your sparse-checkout definition, so will not be
+updated in the index:
+1
+hint: If you intend to update such entries, try one of the following:
+hint: * Use the --sparse option.
+hint: * Disable or modify the sparsity rules.
+hint: Disable this message with "git config advice.updateSparsePath false"
+ok 7 - git-rm fails if worktree is dirty
 
-expecting success of 7011.10 'diff-index does not examine skip-worktree absent entries': 
+expecting success of 7012.8 'git-clean, absent case': 
 	setup_absent &&
-	git diff-index HEAD -- 1 > result &&
+	git clean -n > result &&
 	test_cmp expected result
 
-ok 10 - diff-index does not examine skip-worktree absent entries
+ok 8 - git-clean, absent case
 
-expecting success of 7011.11 'diff-index does not examine skip-worktree dirty entries': 
+expecting success of 7012.9 'git-clean, dirty case': 
 	setup_dirty &&
-	git diff-index HEAD -- 1 > result &&
+	git clean -n > result &&
 	test_cmp expected result
 
-ok 11 - diff-index does not examine skip-worktree dirty entries
+ok 9 - git-clean, dirty case
 
-expecting success of 7011.12 'diff-files does not examine skip-worktree absent entries': 
-	setup_absent &&
-	test -z "$(git diff-files -- one)"
+expecting success of 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 &&
 
-ok 12 - diff-files does not examine skip-worktree absent entries
+	: ignoring the worktree &&
+	git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
+	git diff-index --cached --exit-code HEAD &&
 
-expecting success of 7011.13 'diff-files does not examine skip-worktree dirty entries': 
-	setup_dirty &&
-	test -z "$(git diff-files -- one)"
+	: 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
 
-ok 13 - diff-files does not examine skip-worktree dirty entries
+[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 7011.14 'commit on skip-worktree absent entries': 
-	git reset &&
-	setup_absent &&
-	test_must_fail git commit -m null 1
+expecting success of 7012.11 'stash restore in sparse checkout': 
+	test_create_repo stash-restore &&
+	(
+		cd stash-restore &&
 
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	2
-	expect.full
-	expect.skip
-	expected
-	result
-	sub/
+		mkdir subdir &&
+		echo A >subdir/A &&
+		echo untouched >untouched &&
+		echo removeme >removeme &&
+		echo modified >modified &&
+		git add . &&
+		git commit -m Initial &&
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 14 - commit on skip-worktree absent entries
+		echo AA >>subdir/A &&
+		echo addme >addme &&
+		echo tweaked >>modified &&
+		rm removeme &&
+		git add addme &&
 
-expecting success of 7011.15 'commit on skip-worktree dirty entries': 
-	git reset &&
-	setup_dirty &&
-	test_must_fail git commit -m null 1
+		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.45.2/t/trash directory.t7012-skip-worktree-writing/stash-restore/.git/
+[master (root-commit) 5e4d62b] Initial
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 modified
+ create mode 100644 removeme
+ create mode 100644 subdir/A
+ create mode 100644 untouched
+Saved working directory and index state WIP on master: 5e4d62b Initial
+Merging Version stash was based on with Stashed changes
 On branch master
+You are in a sparse checkout with 50% of tracked files present.
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   modified
+
 Untracked files:
   (use "git add <file>..." to include in what will be committed)
-	1
-	2
-	expect.full
-	expect.skip
-	expected
-	result
-	sub/
+	actual
+	error
+	expect
 
-nothing added to commit but untracked files present (use "git add" to track)
-ok 15 - commit on skip-worktree dirty entries
+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 15 test(s)
-1..15
+# passed all 11 test(s)
+1..11
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7030-verify-tag.sh ***
@@ -438597,274 +438229,6 @@
 1..14
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7012-skip-worktree-writing.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7012-skip-worktree-writing/.git/
-expecting success of 7012.1 'setup': 
-	test_commit init &&
-	echo modified >> init.t &&
-	touch added &&
-	git add init.t added &&
-	git commit -m "modified and added" &&
-	git tag top
-
-[master (root-commit) 2519212] init
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 init.t
-[master fa1ce8e] modified and added
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 added
-ok 1 - setup
-
-expecting success of 7012.2 'read-tree updates worktree, absent case': 
-	git checkout -f top &&
-	git update-index --skip-worktree init.t &&
-	rm init.t &&
-	git read-tree -m -u HEAD^ &&
-	echo init > expected &&
-	test_cmp expected init.t
-
-Note: switching to 'top'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at fa1ce8e modified and added
-ok 2 - read-tree updates worktree, absent case
-
-expecting success of 7012.3 'read-tree updates worktree, dirty case': 
-	git checkout -f top &&
-	git update-index --skip-worktree init.t &&
-	echo dirty >> init.t &&
-	test_must_fail git read-tree -m -u HEAD^ &&
-	grep -q dirty init.t &&
-	test "$(git ls-files -t init.t)" = "S init.t" &&
-	git update-index --no-skip-worktree init.t
-
-HEAD is now at fa1ce8e modified and added
-error: Entry 'init.t' not uptodate. Cannot merge.
-ok 3 - read-tree updates worktree, dirty case
-
-expecting success of 7012.4 'read-tree removes worktree, absent case': 
-	git checkout -f top &&
-	git update-index --skip-worktree added &&
-	rm added &&
-	git read-tree -m -u HEAD^ &&
-	test ! -f added
-
-HEAD is now at fa1ce8e modified and added
-ok 4 - read-tree removes worktree, absent case
-
-expecting success of 7012.5 'read-tree removes worktree, dirty case': 
-	git checkout -f top &&
-	git update-index --skip-worktree added &&
-	echo dirty >> added &&
-	test_must_fail git read-tree -m -u HEAD^ &&
-	grep -q dirty added &&
-	test "$(git ls-files -t added)" = "S added" &&
-	git update-index --no-skip-worktree added
-
-HEAD is now at fa1ce8e modified and added
-error: Entry 'added' not uptodate. Cannot merge.
-ok 5 - read-tree removes worktree, dirty case
-
-expecting success of 7012.6 'index setup': 
-	git checkout -f init &&
-	mkdir sub &&
-	touch ./1 ./2 sub/1 sub/2 &&
-	git add 1 2 sub/1 sub/2 &&
-	git update-index --skip-worktree 1 sub/1 &&
-	git ls-files -t > result &&
-	test_cmp expected result
-
-Previous HEAD position was fa1ce8e modified and added
-HEAD is now at 2519212 init
-ok 6 - index setup
-
-expecting success of 7012.7 'git-rm fails if worktree is dirty': 
-	setup_dirty &&
-	test_must_fail git rm 1 &&
-	test_dirty
-
-The following paths and/or pathspecs matched paths that exist
-outside of your sparse-checkout definition, so will not be
-updated in the index:
-1
-hint: If you intend to update such entries, try one of the following:
-hint: * Use the --sparse option.
-hint: * Disable or modify the sparsity rules.
-hint: Disable this message with "git config advice.updateSparsePath false"
-ok 7 - git-rm fails if worktree is dirty
-
-expecting success of 7012.8 'git-clean, absent case': 
-	setup_absent &&
-	git clean -n > result &&
-	test_cmp expected result
-
-ok 8 - git-clean, absent case
-
-expecting success of 7012.9 'git-clean, dirty case': 
-	setup_dirty &&
-	git clean -n > result &&
-	test_cmp expected result
-
-ok 9 - git-clean, dirty case
-
-expecting success of 7012.10 '--ignore-skip-worktree-entries leaves worktree alone': 
-	test_commit keep-me &&
-	git update-index --skip-worktree keep-me.t &&
-	rm keep-me.t &&
-
-	: ignoring the worktree &&
-	git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
-	git diff-index --cached --exit-code HEAD &&
-
-	: not ignoring the worktree, a deletion is staged &&
-	git update-index --remove keep-me.t &&
-	test_must_fail git diff-index --cached --exit-code HEAD \
-		--diff-filter=D -- keep-me.t
-
-[detached HEAD 2b2ea08] keep-me
- Author: A U Thor <author@example.com>
- 5 files changed, 1 insertion(+)
- create mode 100644 1
- create mode 100644 2
- create mode 100644 keep-me.t
- create mode 100644 sub/1
- create mode 100644 sub/2
-:100644 000000 f00f5e00581fe7be1be150ec748178e224a827d4 0000000000000000000000000000000000000000 D	keep-me.t
-ok 10 - --ignore-skip-worktree-entries leaves worktree alone
-
-expecting success of 7012.11 'stash restore in sparse checkout': 
-	test_create_repo stash-restore &&
-	(
-		cd stash-restore &&
-
-		mkdir subdir &&
-		echo A >subdir/A &&
-		echo untouched >untouched &&
-		echo removeme >removeme &&
-		echo modified >modified &&
-		git add . &&
-		git commit -m Initial &&
-
-		echo AA >>subdir/A &&
-		echo addme >addme &&
-		echo tweaked >>modified &&
-		rm removeme &&
-		git add addme &&
-
-		git stash push &&
-
-		git sparse-checkout set --no-cone subdir &&
-
-		# Ensure after sparse-checkout we only have expected files
-		cat >expect <<-EOF &&
-		S modified
-		S removeme
-		H subdir/A
-		S untouched
-		EOF
-		git ls-files -t >actual &&
-		test_cmp expect actual &&
-
-		test_path_is_missing addme &&
-		test_path_is_missing modified &&
-		test_path_is_missing removeme &&
-		test_path_is_file    subdir/A &&
-		test_path_is_missing untouched &&
-
-		# Put a file in the working directory in the way
-		echo in the way >modified &&
-		test_must_fail git stash apply 2>error&&
-
-		grep "changes.*would be overwritten by merge" error &&
-
-		echo in the way >expect &&
-		test_cmp expect modified &&
-		git diff --quiet HEAD ":!modified" &&
-
-		# ...and that working directory reflects the files correctly
-		test_path_is_missing addme &&
-		test_path_is_file    modified &&
-		test_path_is_missing removeme &&
-		test_path_is_file    subdir/A &&
-		test_path_is_missing untouched
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7012-skip-worktree-writing/stash-restore/.git/
-[master (root-commit) 5e4d62b] Initial
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 modified
- create mode 100644 removeme
- create mode 100644 subdir/A
- create mode 100644 untouched
-Saved working directory and index state WIP on master: 5e4d62b Initial
-Merging Version stash was based on with Stashed changes
-On branch master
-You are in a sparse checkout with 50% of tracked files present.
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	error
-	expect
-
-no changes added to commit (use "git add" and/or "git commit -a")
-error: Your local changes to the following files would be overwritten by merge:
-ok 11 - stash restore in sparse checkout
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7062-wtstatus-ignorecase.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7061-wtstatus-ignore.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7061-wtstatus-ignore/.git/
 expecting success of 7061.1 'status untracked directory with --ignored': 
@@ -439082,6 +438446,34 @@
 1..25
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7062-wtstatus-ignorecase.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7060-wtstatus.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7060-wtstatus/.git/
 expecting success of 7060.1 'setup': 
@@ -439486,88 +438878,6 @@
 1..17
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7101-reset-empty-subdirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7101-reset-empty-subdirs/.git/
-expecting success of 7101.1 'creating initial files': 
-	mkdir path0 &&
-	COPYING_test_data >path0/COPYING &&
-	git add path0/COPYING &&
-	git commit -m add -a
-
-[master (root-commit) eb5c9d9] add
- Author: A U Thor <author@example.com>
- 1 file changed, 18 insertions(+)
- create mode 100644 path0/COPYING
-ok 1 - creating initial files
-
-expecting success of 7101.2 'creating second files': 
-	mkdir path1 &&
-	mkdir path1/path2 &&
-	COPYING_test_data >path1/path2/COPYING &&
-	COPYING_test_data >path1/COPYING &&
-	COPYING_test_data >COPYING &&
-	COPYING_test_data >path0/COPYING-TOO &&
-	git add path1/path2/COPYING &&
-	git add path1/COPYING &&
-	git add COPYING &&
-	git add path0/COPYING-TOO &&
-	git commit -m change -a
-
-[master 2982bdc] change
- Author: A U Thor <author@example.com>
- 4 files changed, 72 insertions(+)
- create mode 100644 COPYING
- create mode 100644 path0/COPYING-TOO
- create mode 100644 path1/COPYING
- create mode 100644 path1/path2/COPYING
-ok 2 - creating second files
-
-expecting success of 7101.3 'resetting tree HEAD^': 
-	git reset --hard HEAD^
-
-HEAD is now at eb5c9d9 add
-ok 3 - resetting tree HEAD^
-
-expecting success of 7101.4 'checking initial files exist after rewind': 
-	test -d path0 &&
-	test -f path0/COPYING
-
-ok 4 - checking initial files exist after rewind
-
-expecting success of 7101.5 'checking lack of path1/path2/COPYING': 
-	! test -f path1/path2/COPYING
-
-ok 5 - checking lack of path1/path2/COPYING
-
-expecting success of 7101.6 'checking lack of path1/COPYING': 
-	! test -f path1/COPYING
-
-ok 6 - checking lack of path1/COPYING
-
-expecting success of 7101.7 'checking lack of COPYING': 
-	! test -f COPYING
-
-ok 7 - checking lack of COPYING
-
-expecting success of 7101.8 'checking checking lack of path1/COPYING-TOO': 
-	! test -f path0/COPYING-TOO
-
-ok 8 - checking checking lack of path1/COPYING-TOO
-
-expecting success of 7101.9 'checking lack of path1/path2': 
-	! test -d path1/path2
-
-ok 9 - checking lack of path1/path2
-
-expecting success of 7101.10 'checking lack of path1': 
-	! test -d path1
-
-ok 10 - checking lack of path1
-
-# passed all 10 test(s)
-1..10
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7006-pager.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7006-pager/.git/
 expecting success of 7006.1 'determine default pager': 
@@ -439645,8 +438955,8 @@
 	test_cmp expected actual
 
 ls: cannot access 'subdir/paginated.out': No such file or directory
---- expected	2025-12-18 01:38:18.774773267 +0000
-+++ actual	2025-12-18 01:38:18.814773267 +0000
+--- expected	2024-11-14 19:41:35.049080505 +0000
++++ actual	2024-11-14 19:41:35.161081657 +0000
 @@ -1 +1 @@
 -subdir/paginated.out
 +paginated.out
@@ -439788,7 +439098,6 @@
 	test_path_is_missing paginated.out
 
 initial
-died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 ok 16 - git tag -l respects pager.tag
 
 expecting success of 7006.17 'git tag -l respects --no-pager': 
@@ -439797,6 +439106,7 @@
 	test_path_is_missing paginated.out
 
 initial
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 ok 17 - git tag -l respects --no-pager
 
 expecting success of 7006.18 'git tag with no args defaults to paging': 
@@ -439814,6 +439124,7 @@
 	test_path_is_missing paginated.out
 
 initial
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 ok 19 - git tag with no args respects pager.tag
 
 expecting success of 7006.20 'git tag --contains defaults to paging': 
@@ -439848,6 +439159,7 @@
 	test_terminal git -c pager.tag tag -am message newtag &&
 	test_path_is_missing paginated.out
 
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 Deleted tag 'newtag' (was a052248)
 ok 23 - git tag -a ignores pager.tag
 
@@ -440518,7 +439830,7 @@
 		test_path_is_missing GIT_PAGER_used
 	
 Path exists:
--rw-r--r-- 1 pbuilder1 pbuilder1 24 Dec 18 01:38 GIT_PAGER_used
+-rw-r--r-- 1 pbuilder2 pbuilder2 24 Nov 14 19:41 GIT_PAGER_used
 not ok 81 - no pager for 'git -p nonsense' # TODO known breakage
 
 expecting success of 7006.82 'git shortlog - default pager is used by default': 
@@ -440600,6 +439912,10 @@
 		test_terminal  git shortlog &&
 		test_path_is_missing GIT_PAGER_used
 	
+A U Thor (1):
+      initial
+
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 ok 88 - no pager for 'git shortlog'
 
 expecting success of 7006.89 'git shortlog - core.pager is not used from subdirectory': 
@@ -440636,6 +439952,7 @@
 		) &&
 		test_path_is_file default_pager_used
 	
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 ok 90 - git -p shortlog - default pager is used by default
 
 expecting success of 7006.91 'git -p shortlog - core.pager overrides PAGER from subdirectory': 
@@ -440826,7 +440143,7 @@
 	test_path_is_file pager-used
 
 died of signal 13 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
-child_exit[0] pid:3992 code:0 elapsed:0.003665
+child_exit[0] pid:9566 code:0 elapsed:0.030675
 ok 104 - git returns SIGPIPE on early pager exit
 
 expecting success of 7006.105 'git returns SIGPIPE on early pager non-zero exit': 
@@ -440850,7 +440167,7 @@
 	test_path_is_file pager-used
 
 died of signal 13 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
-child_exit[0] pid:4133 code:1 elapsed:0.004688
+child_exit[0] pid:9674 code:1 elapsed:0.024635
 ok 105 - git returns SIGPIPE on early pager non-zero exit
 
 expecting success of 7006.106 'git discards pager non-zero exit without SIGPIPE': 
@@ -440867,7 +440184,7 @@
 	grep " code:1 " child-exits &&
 	test_path_is_file pager-used
 
-child_exit[0] pid:4221 code:1 elapsed:0.014403
+child_exit[0] pid:9847 code:1 elapsed:0.018264
 ok 106 - git discards pager non-zero exit without SIGPIPE
 
 expecting success of 7006.107 'git skips paging nonexisting command': 
@@ -440925,7 +440242,7 @@
 Date:   Thu Apr 7 15:13:13 2005 -0700
 
     initial
-child_exit[0] pid:-1 code:-1 elapsed:0.000070
+child_exit[0] pid:-1 code:-1 elapsed:0.000068
 ok 107 - git skips paging nonexisting command
 
 expecting success of 7006.108 'git returns SIGPIPE on propagated signals from pager': 
@@ -440949,20 +440266,20 @@
 	test_path_is_file pager-used
 
 died of signal 13 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
-child_exit[0] pid:4466 code:143 elapsed:0.004507
+child_exit[0] pid:10061 code:143 elapsed:0.026762
 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_terminal git show
 
-error: cannot run invalid-pager: No such file or directory
-error: cannot run invalid-pager: No such file or directory
 commit 06d91448ed6bcb5ffdc37124764a61bcba51446b (HEAD -> master)
 Author: A U Thor <author@example.com>
 Date:   Thu Apr 7 15:18:13 2005 -0700
 
-    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
+    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 messagerror: cannot run invalid-pager: No such file or directory
+error: cannot run invalid-pager: No such file or directory
+ethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis is a long commit messagethis 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
 ok 109 - non-existent pager doesnt cause crash
 
 # still have 3 known breakage(s)
@@ -440970,106 +440287,86 @@
 1..109
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7103-reset-bare.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7103-reset-bare/.git/
-expecting success of 7103.1 'setup non-bare': 
-	echo one >file &&
-	git add file &&
-	git commit -m one &&
-	echo two >file &&
-	git commit -a -m two
+*** t7101-reset-empty-subdirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7101-reset-empty-subdirs/.git/
+expecting success of 7101.1 'creating initial files': 
+	mkdir path0 &&
+	COPYING_test_data >path0/COPYING &&
+	git add path0/COPYING &&
+	git commit -m add -a
 
-[master (root-commit) 1993c08] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master 2f98c16] two
+[master (root-commit) eb5c9d9] add
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup non-bare
-
-expecting success of 7103.2 '"hard" reset requires a worktree': 
-	(cd .git &&
-	 test_must_fail git reset --hard)
-
-fatal: this operation must be run in a work tree
-ok 2 - "hard" reset requires a worktree
-
-expecting success of 7103.3 '"merge" reset requires a worktree': 
-	(cd .git &&
-	 test_must_fail git reset --merge)
-
-fatal: this operation must be run in a work tree
-ok 3 - "merge" reset requires a worktree
-
-expecting success of 7103.4 '"keep" reset requires a worktree': 
-	(cd .git &&
-	 test_must_fail git reset --keep)
-
-fatal: this operation must be run in a work tree
-ok 4 - "keep" reset requires a worktree
+ 1 file changed, 18 insertions(+)
+ create mode 100644 path0/COPYING
+ok 1 - creating initial files
 
-expecting success of 7103.5 '"mixed" reset is ok': 
-	(cd .git && git reset)
+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
 
-ok 5 - "mixed" reset is ok
+[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 7103.6 '"soft" reset is ok': 
-	(cd .git && git reset --soft)
+expecting success of 7101.3 'resetting tree HEAD^': 
+	git reset --hard HEAD^
 
-ok 6 - "soft" reset is ok
+HEAD is now at eb5c9d9 add
+ok 3 - resetting tree HEAD^
 
-expecting success of 7103.7 'hard reset works with GIT_WORK_TREE': 
-	mkdir worktree &&
-	GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
-	test_cmp file worktree/file
+expecting success of 7101.4 'checking initial files exist after rewind': 
+	test -d path0 &&
+	test -f path0/COPYING
 
-HEAD is now at 2f98c16 two
-ok 7 - hard reset works with GIT_WORK_TREE
+ok 4 - checking initial files exist after rewind
 
-expecting success of 7103.8 'setup bare': 
-	git clone --bare . bare.git &&
-	cd bare.git
+expecting success of 7101.5 'checking lack of path1/path2/COPYING': 
+	! test -f path1/path2/COPYING
 
-Cloning into bare repository 'bare.git'...
-done.
-ok 8 - setup bare
+ok 5 - checking lack of path1/path2/COPYING
 
-expecting success of 7103.9 '"hard" reset is not allowed in bare': 
-	test_must_fail git reset --hard HEAD^
+expecting success of 7101.6 'checking lack of path1/COPYING': 
+	! test -f path1/COPYING
 
-fatal: this operation must be run in a work tree
-ok 9 - "hard" reset is not allowed in bare
+ok 6 - checking lack of path1/COPYING
 
-expecting success of 7103.10 '"merge" reset is not allowed in bare': 
-	test_must_fail git reset --merge HEAD^
+expecting success of 7101.7 'checking lack of COPYING': 
+	! test -f COPYING
 
-fatal: this operation must be run in a work tree
-ok 10 - "merge" reset is not allowed in bare
+ok 7 - checking lack of COPYING
 
-expecting success of 7103.11 '"keep" reset is not allowed in bare': 
-	test_must_fail git reset --keep HEAD^
+expecting success of 7101.8 'checking checking lack of path1/COPYING-TOO': 
+	! test -f path0/COPYING-TOO
 
-fatal: this operation must be run in a work tree
-ok 11 - "keep" reset is not allowed in bare
+ok 8 - checking checking lack of path1/COPYING-TOO
 
-expecting success of 7103.12 '"mixed" reset is not allowed in bare': 
-	test_must_fail git reset --mixed HEAD^
+expecting success of 7101.9 'checking lack of path1/path2': 
+	! test -d path1/path2
 
-fatal: mixed reset is not allowed in a bare repository
-ok 12 - "mixed" reset is not allowed in bare
+ok 9 - checking lack of path1/path2
 
-expecting success of 7103.13 '"soft" reset is allowed in bare': 
-	git reset --soft HEAD^ &&
-	git show --pretty=format:%s >out &&
-	echo one >expect &&
-	head -n 1 out >actual &&
-	test_cmp expect actual
+expecting success of 7101.10 'checking lack of path1': 
+	! test -d path1
 
-ok 13 - "soft" reset is allowed in bare
+ok 10 - checking lack of path1
 
-# passed all 13 test(s)
-1..13
+# passed all 10 test(s)
+1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7064-wtstatus-pv2.sh ***
@@ -441884,6 +441181,108 @@
 1..28
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7103-reset-bare.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7103-reset-bare/.git/
+expecting success of 7103.1 'setup non-bare': 
+	echo one >file &&
+	git add file &&
+	git commit -m one &&
+	echo two >file &&
+	git commit -a -m two
+
+[master (root-commit) 1993c08] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master 2f98c16] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup non-bare
+
+expecting success of 7103.2 '"hard" reset requires a worktree': 
+	(cd .git &&
+	 test_must_fail git reset --hard)
+
+fatal: this operation must be run in a work tree
+ok 2 - "hard" reset requires a worktree
+
+expecting success of 7103.3 '"merge" reset requires a worktree': 
+	(cd .git &&
+	 test_must_fail git reset --merge)
+
+fatal: this operation must be run in a work tree
+ok 3 - "merge" reset requires a worktree
+
+expecting success of 7103.4 '"keep" reset requires a worktree': 
+	(cd .git &&
+	 test_must_fail git reset --keep)
+
+fatal: this operation must be run in a work tree
+ok 4 - "keep" reset requires a worktree
+
+expecting success of 7103.5 '"mixed" reset is ok': 
+	(cd .git && git reset)
+
+ok 5 - "mixed" reset is ok
+
+expecting success of 7103.6 '"soft" reset is ok': 
+	(cd .git && git reset --soft)
+
+ok 6 - "soft" reset is ok
+
+expecting success of 7103.7 'hard reset works with GIT_WORK_TREE': 
+	mkdir worktree &&
+	GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard &&
+	test_cmp file worktree/file
+
+HEAD is now at 2f98c16 two
+ok 7 - hard reset works with GIT_WORK_TREE
+
+expecting success of 7103.8 'setup bare': 
+	git clone --bare . bare.git &&
+	cd bare.git
+
+Cloning into bare repository 'bare.git'...
+done.
+ok 8 - setup bare
+
+expecting success of 7103.9 '"hard" reset is not allowed in bare': 
+	test_must_fail git reset --hard HEAD^
+
+fatal: this operation must be run in a work tree
+ok 9 - "hard" reset is not allowed in bare
+
+expecting success of 7103.10 '"merge" reset is not allowed in bare': 
+	test_must_fail git reset --merge HEAD^
+
+fatal: this operation must be run in a work tree
+ok 10 - "merge" reset is not allowed in bare
+
+expecting success of 7103.11 '"keep" reset is not allowed in bare': 
+	test_must_fail git reset --keep HEAD^
+
+fatal: this operation must be run in a work tree
+ok 11 - "keep" reset is not allowed in bare
+
+expecting success of 7103.12 '"mixed" reset is not allowed in bare': 
+	test_must_fail git reset --mixed HEAD^
+
+fatal: mixed reset is not allowed in a bare repository
+ok 12 - "mixed" reset is not allowed in bare
+
+expecting success of 7103.13 '"soft" reset is allowed in bare': 
+	git reset --soft HEAD^ &&
+	git show --pretty=format:%s >out &&
+	echo one >expect &&
+	head -n 1 out >actual &&
+	test_cmp expect actual
+
+ok 13 - "soft" reset is allowed in bare
+
+# passed all 13 test(s)
+1..13
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7104-reset-hard.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7104-reset-hard/.git/
 expecting success of 7104.1 'setup': 
@@ -441945,84 +441344,6 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7106-reset-unborn-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7106-reset-unborn-branch/.git/
-expecting success of 7106.1 'setup': 
-	echo a >a &&
-	echo b >b
-
-ok 1 - setup
-
-expecting success of 7106.2 'reset': 
-	git add a b &&
-	git reset &&
-
-	git ls-files >actual &&
-	test_must_be_empty actual
-
-ok 2 - reset
-
-expecting success of 7106.3 'reset HEAD': 
-	rm .git/index &&
-	git add a b &&
-	test_must_fail git reset HEAD
-
-fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-ok 3 - reset HEAD
-
-expecting success of 7106.4 'reset $file': 
-	rm .git/index &&
-	git add a b &&
-	git reset a &&
-
-	echo b >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
-
-ok 4 - reset $file
-
-expecting success of 7106.5 'reset -p': 
-	rm .git/index &&
-	git add a &&
-	echo y >yes &&
-	git reset -p <yes >output &&
-
-	git ls-files >actual &&
-	test_must_be_empty actual &&
-	test_grep "Unstage" output
-
-(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
-ok 5 - reset -p
-
-expecting success of 7106.6 'reset --soft is a no-op': 
-	rm .git/index &&
-	git add a &&
-	git reset --soft &&
-
-	echo a >expect &&
-	git ls-files >actual &&
-	test_cmp expect actual
-
-ok 6 - reset --soft is a no-op
-
-expecting success of 7106.7 'reset --hard': 
-	rm .git/index &&
-	git add a &&
-	test_when_finished "echo a >a" &&
-	git reset --hard &&
-
-	git ls-files >actual &&
-	test_must_be_empty actual &&
-	test_path_is_missing a
-
-ok 7 - reset --hard
-
-# passed all 7 test(s)
-1..7
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7102-reset.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7102-reset/.git/
 expecting success of 7102.1 'creating initial files and commits': 
@@ -443027,6 +442348,84 @@
 1..38
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7106-reset-unborn-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7106-reset-unborn-branch/.git/
+expecting success of 7106.1 'setup': 
+	echo a >a &&
+	echo b >b
+
+ok 1 - setup
+
+expecting success of 7106.2 'reset': 
+	git add a b &&
+	git reset &&
+
+	git ls-files >actual &&
+	test_must_be_empty actual
+
+ok 2 - reset
+
+expecting success of 7106.3 'reset HEAD': 
+	rm .git/index &&
+	git add a b &&
+	test_must_fail git reset HEAD
+
+fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+ok 3 - reset HEAD
+
+expecting success of 7106.4 'reset $file': 
+	rm .git/index &&
+	git add a b &&
+	git reset a &&
+
+	echo b >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 4 - reset $file
+
+expecting success of 7106.5 'reset -p': 
+	rm .git/index &&
+	git add a &&
+	echo y >yes &&
+	git reset -p <yes >output &&
+
+	git ls-files >actual &&
+	test_must_be_empty actual &&
+	test_grep "Unstage" output
+
+(1/1) Unstage addition [y,n,q,a,d,e,p,?]? 
+ok 5 - reset -p
+
+expecting success of 7106.6 'reset --soft is a no-op': 
+	rm .git/index &&
+	git add a &&
+	git reset --soft &&
+
+	echo a >expect &&
+	git ls-files >actual &&
+	test_cmp expect actual
+
+ok 6 - reset --soft is a no-op
+
+expecting success of 7106.7 'reset --hard': 
+	rm .git/index &&
+	git add a &&
+	test_when_finished "echo a >a" &&
+	git reset --hard &&
+
+	git ls-files >actual &&
+	test_must_be_empty actual &&
+	test_path_is_missing a
+
+ok 7 - reset --hard
+
+# passed all 7 test(s)
+1..7
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7105-reset-patch.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7105-reset-patch/.git/
 expecting success of 7105.1 'setup': 
@@ -443373,8 +442772,8 @@
 	verify_expect !
 
 HEAD is now at 4b301d4 Commit
---- expect	2025-12-18 01:38:26.622773267 +0000
-+++ actual	2025-12-18 01:38:26.622773267 +0000
+--- expect	2024-11-14 19:42:07.909418488 +0000
++++ actual	2024-11-14 19:42:07.921418611 +0000
 @@ -1 +0,0 @@
 - D fileA.t
 ok 9 - quotes not compatible with --pathspec-file-nul
@@ -443779,1117 +443178,3160 @@
 1..21
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7113-post-index-change-hook.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7113-post-index-change-hook/.git/
-expecting success of 7113.1 'setup': 
-	mkdir -p dir1 &&
-	touch dir1/file1.txt &&
-	echo testing >dir1/file2.txt &&
-	git add . &&
-	git commit -m "initial"
+*** t7063-status-untracked-cache.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache/.git/
+checking prerequisite: UNTRACKED_CACHE
 
-[main (root-commit) 7e53173] initial
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 dir1/file1.txt
- create mode 100644 dir1/file2.txt
-ok 1 - setup
+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
 
-expecting success of 7113.2 'test status, add, commit, others trigger hook without flags set': 
-	test_hook post-index-change <<-\EOF &&
-		if test "$1" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_workdir is set." >testfailure
-			exit 1
-		fi
-		if test "$2" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_skipworktree is set." >testfailure
-			exit 1
-		fi
-		if test -f ".git/index.lock"; then
-			echo ".git/index.lock exists" >testfailure
-			exit 3
-		fi
-		if ! test -f ".git/index"; then
-			echo ".git/index does not exist" >testfailure
-			exit 3
-		fi
-		echo "success" >testsuccess
-	EOF
-	mkdir -p dir2 &&
-	touch dir2/file1.txt &&
-	touch dir2/file2.txt &&
-	: force index to be dirty &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git status &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git add . &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git commit -m "second" &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git checkout -- dir1/file1.txt &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git update-index &&
-	test_path_is_missing testsuccess &&
-	test_path_is_missing testfailure &&
-	git reset --soft &&
-	test_path_is_missing testsuccess &&
-	test_path_is_missing testfailure
+)
+Testing mtime in '/build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache' ...... OK
+prerequisite UNTRACKED_CACHE ok
+expecting success of 7063.1 'core.untrackedCache is unset': 
+	test_must_fail git config --get core.untrackedCache
 
-On branch main
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir2/
+ok 1 - core.untrackedCache is unset
 
-nothing added to commit but untracked files present (use "git add" to track)
-[main 5070ba9] second
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 dir2/file1.txt
- create mode 100644 dir2/file2.txt
-ok 2 - test status, add, commit, others trigger hook without flags set
+expecting success of 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
 
-expecting success of 7113.3 'test checkout and reset trigger the hook': 
-	test_hook post-index-change <<-\EOF &&
-		if test "$1" -eq 1 && test "$2" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
-			exit 1
-		fi
-		if test "$1" -eq 0 && test "$2" -eq 0; then
-			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
-			exit 2
-		fi
-		if test "$1" -eq 1; then
-			if test -f ".git/index.lock"; then
-				echo "updated_workdir set but .git/index.lock exists" >testfailure
-				exit 3
-			fi
-			if ! test -f ".git/index"; then
-				echo "updated_workdir set but .git/index does not exist" >testfailure
-				exit 3
-			fi
-		else
-			echo "update_workdir should be set for checkout" >testfailure
-			exit 4
-		fi
-		echo "success" >testsuccess
+	exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0
+	exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c
+
+	done sha1:1946f0437f90c5005533cbe1736a6451ca301714
+	done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc
 	EOF
-	: force index to be dirty &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git checkout main &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git checkout HEAD &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git reset --hard &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git checkout -B test &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure
 
-Already on 'main'
-HEAD is now at 5070ba9 second
-Switched to a new branch 'test'
-ok 3 - test checkout and reset trigger the hook
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache/worktree/.git/
+ok 2 - setup
 
-expecting success of 7113.4 'test reset --mixed and update-index triggers the hook': 
-	test_hook post-index-change <<-\EOF &&
-		if test "$1" -eq 1 && test "$2" -eq 1; then
-			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
-			exit 1
-		fi
-		if test "$1" -eq 0 && test "$2" -eq 0; then
-			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
-			exit 2
-		fi
-		if test "$2" -eq 1; then
-			if test -f ".git/index.lock"; then
-				echo "updated_skipworktree set but .git/index.lock exists" >testfailure
-				exit 3
-			fi
-			if ! test -f ".git/index"; then
-				echo "updated_skipworktree set but .git/index does not exist" >testfailure
-				exit 3
-			fi
-		else
-			echo "updated_skipworktree should be set for reset --mixed and update-index" >testfailure
-			exit 4
-		fi
-		echo "success" >testsuccess
-	EOF
-	: force index to be dirty &&
-	test-tool chmtime +60 dir1/file1.txt &&
-	git reset --mixed --quiet HEAD~1 &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git hash-object -w --stdin <dir1/file2.txt >expect &&
-	git update-index --cacheinfo 100644 "$(cat expect)" dir1/file1.txt &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure &&
-	git update-index --skip-worktree dir1/file2.txt &&
-	git update-index --remove dir1/file2.txt &&
-	test_path_is_file testsuccess && rm -f testsuccess &&
-	test_path_is_missing testfailure
+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 4 - test reset --mixed and update-index triggers the hook
+ok 3 - untracked cache is empty
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7003-filter-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+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
 
-[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
+ok 4 - status first time (empty cache)
 
-expecting success of 7003.2 'rewrite identically': 
-	git filter-branch branch
+expecting success of 7063.5 'untracked cache after first status': 
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../dump.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) (1 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (8/9) (1 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/branch' is unchanged
-ok 2 - rewrite identically
+ok 5 - untracked cache after first status
 
-expecting success of 7003.3 'result is really identical': 
-	test $H = $(git rev-parse HEAD)
+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 3 - result is really identical
+ok 6 - status second time (fully populated cache)
 
-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)
+expecting success of 7063.7 'untracked cache after second status': 
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../dump.expect ../actual
 
-ok 4 - rewrite bare repository identically
+ok 7 - untracked cache after second status
 
-expecting success of 7003.5 'result is really identical': 
-	test $H = $(git rev-parse HEAD)
+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 5 - result is really identical
+ok 8 - untracked cache is bypassed with -uall
 
-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 7063.9 'untracked cache remains after bypass': 
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../dump.expect ../actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+ok 9 - untracked cache remains after bypass
 
-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 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+ok 10 - if -uall is configured, untracked cache gets populated by default
 
-expecting success of 7003.8 'Fail if commit filter fails': 
-	test_must_fail git filter-branch -f --commit-filter "exit 1" HEAD
+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
 
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    could not write rewritten commit
-ok 8 - Fail if commit filter fails
+ok 11 - if -uall was configured, untracked cache is populated
 
-expecting success of 7003.9 'rewrite, renaming a specific file': 
-	git filter-branch -f --tree-filter "mv D.t doh || :" HEAD
+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
 
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (0 seconds passed, remaining 0 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite bd662c15882f4e7910b78fc26a3d8fe1ffa802e5 (3/9) (0 seconds passed, remaining 0 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/9) (1 seconds passed, remaining 1 predicted)    mv: cannot stat 'D.t': No such file or directory
-
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (4/9) (1 seconds passed, remaining 1 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (9/9) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 9 - rewrite, renaming a specific file
+ok 12 - if -uall is configured, untracked cache is used by default
 
-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)"
+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 10 - test that the file was renamed
+ok 13 - if -uall is configured, untracked cache is bypassed with -unormal
 
-expecting success of 7003.11 'rewrite, renaming a specific directory': 
-	git filter-branch -f --tree-filter "mv dir diroh || :" HEAD
+expecting success of 7063.14 'repopulate untracked cache for -unormal': 
+	git status --porcelain
 
-
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) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 11 - rewrite, renaming a specific directory
+A  done/one
+A  one
+A  two
+?? dthree/
+?? dtwo/
+?? three
+ok 14 - repopulate untracked cache for -unormal
 
-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)"
+expecting success of 7063.15 'modify in root directory, one dir invalidation': 
+	: >four &&
+	test-tool chmtime =-240 four &&
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+A  done/one
+A  one
+A  two
+?? dthree/
+?? dtwo/
+?? four
+?? three
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:1
+ ....opendir:1
+EOF
+	test_cmp ../trace.expect ../trace.relevant
 
-ok 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
+ok 15 - modify in root directory, one dir invalidation
 
-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 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
 
-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
+ok 16 - verify untracked cache dump
 
-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 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 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
+ok 17 - new .gitignore invalidates recursively
 
-expecting success of 7003.16 'common ancestor is still common (unchanged)': 
-	test "$(git merge-base modD D)" = "$(git rev-parse B)"
+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 16 - common ancestor is still common (unchanged)
+ok 18 - verify untracked cache dump
 
-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
+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
 
-[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
+ok 19 - new info/exclude invalidates everything
+
+expecting success of 7063.20 'verify untracked cache dump': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 20 - verify untracked cache dump
+
+expecting success of 7063.21 'move two from tracked to untracked': 
+	git rm --cached two &&
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+rm 'two'
+ok 21 - move two from tracked to untracked
+
+expecting success of 7063.22 'status after the move': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+A  done/one
+A  one
+?? .gitignore
+?? dtwo/
+?? two
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:1
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 22 - status after the move
+
+expecting success of 7063.23 'verify untracked cache dump': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+two
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 23 - verify untracked cache dump
+
+expecting success of 7063.24 'move two from untracked to tracked': 
+	git add two &&
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 24 - move two from untracked to tracked
+
+expecting success of 7063.25 'status after the move': 
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	cat >../status.expect <<EOF &&
+A  done/one
+A  one
+A  two
+?? .gitignore
+?? dtwo/
+EOF
+	test_cmp ../status.expect ../status.iuc &&
+	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
+	cat >../trace.expect <<EOF &&
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:1
+EOF
+	test_cmp ../trace.expect ../trace.relevant
+
+ok 25 - status after the move
+
+expecting success of 7063.26 'verify untracked cache dump': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 26 - verify untracked cache dump
+
+expecting success of 7063.27 'set up for sparse checkout testing': 
+	echo two >done/.gitignore &&
+	echo three >>done/.gitignore &&
+	echo two >done/two &&
+	git add -f done/two done/.gitignore &&
+	git commit -m "first commit"
+
+[main (root-commit) 2d55d32] first commit
  Author: A U Thor <author@example.com>
- 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
+ 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 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
+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
 
-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
+ok 28 - status after commit
 
-expecting success of 7003.19 'more setup': 
+expecting success of 7063.29 'untracked cache correct after commit': 
+	test-tool dump-untracked-cache >../actual &&
+	cat >../expect <<EOF &&
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
+exclude_per_dir .gitignore
+flags 00000006
+/ $(test_oid root) recurse valid
+.gitignore
+dtwo/
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
+two
+EOF
+	test_cmp ../expect ../actual
+
+ok 29 - untracked cache correct after commit
+
+expecting success of 7063.30 'set up sparse checkout': 
+	echo "done/[a-z]*" >.git/info/sparse-checkout &&
+	test_config core.sparsecheckout true &&
 	git checkout main &&
-	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
+	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
 
-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
+Already on 'main'
+ok 30 - set up sparse checkout
 
-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
+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
 
-
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) (1 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (9/16) (1 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (9/16) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/directorymoved' was rewritten
-ok 20 - use index-filter to move into a subdirectory
+ok 31 - create/modify files, some of which are gitignored
 
-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
+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
 
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/16) (0 seconds passed, remaining 0 predicted)    msg filter failed: false
-ok 21 - stops when msg filter fails
+ok 32 - test sparse status with untracked cache
 
-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
+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
 
-[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
+ok 33 - untracked cache correct after status
 
-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 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
 
-[main 0261af1] i
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/18) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/18) (0 seconds passed, remaining 0 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (4/18) (0 seconds passed, remaining 0 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (5/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (6/18) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/18) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (8/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (9/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (10/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/18) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (12/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (13/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (14/18) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (15/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (16/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (17/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (18/18) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/removed-author' was rewritten
-ok 23 - remove a certain author's commits
+ok 34 - test sparse status again with untracked cache
 
-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^
+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
 
-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
+ok 35 - set up for test of subdir and sparse checkouts
 
-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
+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
 
-
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
+ok 36 - test sparse status with untracked cache and subdir
 
-expecting success of 7003.26 'Name needing quotes': 
+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
 
-	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)
+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
 
-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
+ok 38 - test sparse status again with untracked cache and subdir
 
-expecting success of 7003.27 'Subdirectory filter with disappearing trees': 
-	git reset --hard &&
-	git checkout main &&
+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
 
-	mkdir foo &&
-	touch foo/bar &&
-	git add foo &&
-	test_tick &&
-	git commit -m "Adding foo" &&
+ok 39 - move entry in subdir from untracked to cached
 
-	git rm -r foo &&
-	test_tick &&
-	git commit -m "Removing foo" &&
+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
 
-	mkdir foo &&
-	touch foo/bar &&
-	git add foo &&
-	test_tick &&
-	git commit -m "Re-adding foo" &&
+rm 'dtwo/two'
+ok 40 - move entry in subdir from cached to untracked
 
-	git filter-branch -f --subdirectory-filter foo &&
-	git rev-list main >actual &&
-	test_line_count = 3 actual
+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
 
-HEAD is now at 643bd56 Adding a file
-Switched to branch 'main'
-[main f7eadb2] Adding foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo/bar
-rm 'foo/bar'
-[main ee48524] Removing foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 foo/bar
-[main 14fe8c6] Re-adding foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo/bar
-
Rewrite f7eadb255c93eb12be4926fbb2a3995c413564ba (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite ee48524f38405c7e2028be80dc8acfbef4c75c13 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 14fe8c608ef61b8d11aca607ef6c7a4e24b8b32d (3/3) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-ok 27 - Subdirectory filter with disappearing trees
+ok 41 - --no-untracked-cache removes the cache
 
-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
+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
 
-
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (1 seconds passed, remaining 0 predicted)    
-WARNING: Ref 'refs/heads/main' is unchanged
-T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
-ok 28 - Tag name filtering retains tag message
+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 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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
 
-
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
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 42 - git status does not change anything
 
-checking prerequisite: GPG
+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
 
-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
+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
 
-	# 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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
 
-)
-prerequisite GPG not satisfied
-ok 30 # skip Filtering retains message of gpg signed commit (missing GPG)
+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 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
+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
 
-
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
+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 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
+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
 
-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
+On branch main
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 45 - setting core.untrackedCache to false and using git status removes the cache
+
+expecting success of 7063.46 'using --untracked-cache does not fail when core.untrackedCache is false': 
+	git update-index --untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-empty ../actual
+
+warning: core.untrackedCache is set to false; remove or change it, if you really want to enable the untracked cache
+ok 46 - using --untracked-cache does not fail when core.untrackedCache is false
+
+expecting success of 7063.47 'setting core.untrackedCache to keep': 
+	git config core.untrackedCache keep &&
+	git update-index --untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-empty ../actual &&
+	git status &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-from-test-dump ../actual &&
+	git update-index --no-untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-no-uc ../actual &&
+	git update-index --force-untracked-cache &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-empty ../actual &&
+	git status &&
+	test-tool dump-untracked-cache >../actual &&
+	test_cmp ../expect-from-test-dump ../actual
+
+On branch main
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+On branch main
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitignore
+	done/five
+	done/sub/
+	dtwo/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 47 - setting core.untrackedCache to keep
+
+expecting success of 7063.48 'test ident field is working': 
+	mkdir ../other_worktree &&
+	cp -R done dthree dtwo four three ../other_worktree &&
+	GIT_WORK_TREE=../other_worktree git status 2>../err &&
+	echo "warning: untracked cache is disabled on this system or location" >../expect &&
+	test_cmp ../expect ../err
+
+On branch main
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   done/two
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	done/five
+	done/four
+	done/sub/
+	dtwo/
+	four
+
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 48 - test ident field is working
+
+expecting success of 7063.49 'untracked cache survives a checkout': 
+	git commit --allow-empty -m empty &&
+	test-tool dump-untracked-cache >../before &&
+	test_when_finished  "git checkout main" &&
+	git checkout -b other_branch &&
+	test-tool dump-untracked-cache >../after &&
+	test_cmp ../before ../after &&
+	test_commit test &&
+	test-tool dump-untracked-cache >../before &&
+	git checkout main &&
+	test-tool dump-untracked-cache >../after &&
+	test_cmp ../before ../after
+
+[main 9462075] empty
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 G.t
-[branch-no-a 00fc75b] H
+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 H.t
-Switched to branch 'branch'
-ok 32 - setup --prune-empty comparisons
+ create mode 100644 test.t
+Switched to branch 'main'
+M	done/two
+Already on 'main'
+M	done/two
+ok 49 - untracked cache survives a checkout
 
-expecting success of 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
+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
 
-[branch 219a992] to_remove
+[main 527fa0b] commit
  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) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (4/14) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/14) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (9/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (9/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (9/14) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (9/14) (1 seconds passed, remaining 0 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (9/14) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 33 - Prune empty commits
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 50 - untracked cache survives a commit
 
-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
+expecting success of 7063.51 'teardown worktree': 
+	cd ..
 
-[branch cb86908] to_remove_2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 to_remove_2.t
-HEAD is now at ead226b again not subdir
-Merge made by the 'ort' strategy.
- to_remove_2.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 to_remove_2.t
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/15) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/15) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/15) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/15) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (8/15) (1 seconds passed, remaining 0 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (8/15) (1 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 34 - prune empty collapsed merges
+ok 51 - teardown worktree
 
-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
+checking prerequisite: SYMLINKS
 
-[branch 5b6cb84] empty
+mkdir -p "$TRASH_DIRECTORY/prereq-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.45.2/t/trash directory.t7063-status-untracked-cache/worktree-symlink/.git/
+[main (root-commit) 294fddc] first commit
  Author: A U Thor <author@example.com>
-
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (8/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (9/14) (0 seconds passed, remaining 0 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (10/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (12/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 5b6cb848f343668f1f75c3258a59d12c1680d67f (14/14) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/branch' was rewritten
-ok 35 - prune empty works even without index/tree filters
+ 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 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
+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
 
-
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
+Note: switching to 'HEAD~'.
 
-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
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-
Rewrite 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
+If you want to 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 7003.38 '--remap-to-ancestor with filename filters': 
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 294fddc first commit
+Previous HEAD position was 294fddc first commit
+Switched to branch 'main'
+ok 53 - "status" after symlink replacement should be clean with UC=true
+
+expecting success of 7063.54 '"status" after symlink replacement should be clean with UC=false': 
+	git config core.untrackedCache false &&
+	git checkout HEAD~ &&
+	status_is_clean &&
+	status_is_clean &&
 	git checkout main &&
-	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)
+	avoid_racy &&
+	status_is_clean &&
+	status_is_clean
+
+Note: switching to 'HEAD~'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
 
+HEAD is now at 294fddc first commit
+Previous HEAD position was 294fddc first commit
 Switched to branch 'main'
-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
+ok 54 - "status" after symlink replacement should be clean with UC=false
+
+expecting success of 7063.55 'setup worktree for non-symlink test': 
+	git init worktree-non-symlink &&
+	cd worktree-non-symlink &&
+	git config core.untrackedCache true &&
+	mkdir one two &&
+	touch one/file two/file &&
+	git add one/file two/file &&
+	git commit -m"first commit" &&
+	git rm -rf one &&
+	cp two/file one &&
+	git add one &&
+	git commit -m"second commit"
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/.git/
+[main (root-commit) 294fddc] first commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main b2d4813] change-foo
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 one/file
+ create mode 100644 two/file
+rm 'one/file'
+[main 0558445] second commit
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
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
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename one/file => one (100%)
+ok 55 - setup worktree for non-symlink test
 
-expecting success of 7003.39 'automatic remapping to ancestor with filename filters': 
+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 &&
-	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)
+	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
 
-Already on 'main'
-HEAD is now at 0ddfaf1 A
-[main 59b5b5a] add-foo2
+Note: switching to 'HEAD~'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 294fddc first commit
+Previous HEAD position was 294fddc first commit
+Switched to branch 'main'
+ok 56 - "status" after file replacement should be clean with UC=true
+
+expecting success of 7063.57 '"status" after file replacement should be clean with UC=false': 
+	git config core.untrackedCache false &&
+	git checkout HEAD~ &&
+	status_is_clean &&
+	status_is_clean &&
+	git checkout main &&
+	avoid_racy &&
+	status_is_clean &&
+	status_is_clean
+
+Note: switching to 'HEAD~'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 294fddc first commit
+Previous HEAD position was 294fddc first commit
+Switched to branch 'main'
+ok 57 - "status" after file replacement should be clean with UC=false
+
+expecting success of 7063.58 'empty repo (no index) and core.untrackedCache': 
+	git init emptyrepo &&
+	git -C emptyrepo -c core.untrackedCache=true write-tree
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/emptyrepo/.git/
+4b825dc642cb6eb9a060e54bf8d69288fbee4904
+ok 58 - empty repo (no index) and core.untrackedCache
+
+# passed all 58 test(s)
+1..58
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t6438-submodule-directory-file-conflicts.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/.git/
+expecting success of 6438.1 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo
-[main 20d4afa] add-bar2
+ 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.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main 1fe7e14] change-foo2
+ 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.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
  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.45.2/t/trash directory.t7003-filter-branch/.git/
-[main (root-commit) cc5d755] file
+ 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.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7003-filter-branch/submod/.git/
-[main (root-commit) bd0b946] file-in-submod
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file-in-submod.t
-Adding existing repo at 'submod' to the index
-[main eff5782] added submodule
+ 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, 4 insertions(+)
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 submod
-[main 1abb59f] add-file
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 add-file.t
-[main bf0f869] add-in-submodule
+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 add-in-submodule.t
-[main e633393] changed submodule
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
-ok 40 - setup submodule
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 1 - git_test_func: added submodule creates empty directory
 
-expecting success of 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 6438.2 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 2 - git_test_func: added submodule leaves existing empty directory alone
 
-
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite eff57823f0fc96a99e17509163cc6cfda8aed4ec (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 1abb59fcfa1ff298a610380baf77479b558e08bf (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite e6333937de4d4e9f85b7a9e07f128f463934d5d7 (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 6438.3 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 3 - git_test_func: replace tracked file with submodule creates empty directory
 
-expecting success of 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 6438.4 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Updating cb28587..a2e65d5
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 4 - git_test_func: replace directory with submodule
 
-HEAD is now at e633393 changed submodule
-
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite eff57823f0fc96a99e17509163cc6cfda8aed4ec (2/4) (1 seconds passed, remaining 1 predicted)    
Rewrite 1abb59fcfa1ff298a610380baf77479b558e08bf (2/4) (1 seconds passed, remaining 1 predicted)    
Rewrite e6333937de4d4e9f85b7a9e07f128f463934d5d7 (2/4) (1 seconds passed, remaining 1 predicted)    
-Ref 'refs/heads/main' was rewritten
-ok 42 - replace submodule revision
+expecting success of 6438.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-expecting success of 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 6438.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-HEAD is now at e633393 changed submodule
-
Rewrite ec6e83f70910deed4aa763515e88f21f10133d54 (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 6438.7 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 7 - git_test_func: replace submodule with a directory must fail
 
-expecting success of 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 6438.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 8 - git_test_func: replace submodule containing a .git directory with a directory must fail
 
-
Rewrite e6333937de4d4e9f85b7a9e07f128f463934d5d7 (1/1) (0 seconds passed, remaining 0 predicted)    
-Ref 'refs/heads/main' was rewritten
-file
-HEAD is now at e633393 changed submodule
-ok 44 - tree-filter deals with object name vs pathname ambiguity
+checking known breakage of 6438.9 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge replace_sub1_with_file
+not ok 9 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-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
+checking known breakage of 6438.10 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge replace_sub1_with_file
+not ok 10 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-HEAD is now at e633393 changed submodule
-Deleted replace ref '6b6717d1040a36461d19d4340f76ab94adb69382'
-HEAD is now at e633393 changed submodule
-ok 45 - rewrite repository including refs that point at non-commit object
+expecting success of 6438.11 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Updating 09bcf53..cb2bda7
+Fast-forward
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 11 - git_test_func: modified submodule does not update submodule work tree
 
-expecting success of 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 6438.12 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Updating 09bcf53..e6169bf
+Fast-forward
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 12 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-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
+expecting success of 6438.13 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
 fatal: Needed a single revision
-ok 46 - filter-branch handles ref deletion
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Updating e6169bf..3036e4e
+Fast-forward
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-expecting success of 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 6438.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Updating 27611a5..09bcf53
+ok 14 - git_test_func: added submodule doesn't remove untracked unignored file with same name
 
-Note: switching to 'empty'.
+expecting success of 6438.15 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 15 - git_test_func: added submodule creates empty directory
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 6438.16 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 16 - git_test_func: added submodule leaves existing empty directory alone
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 6438.17 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 17 - git_test_func: replace tracked file with submodule creates empty directory
 
-  git switch -c <new-branch-name>
+expecting success of 6438.18 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Updating cb28587..a2e65d5
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 18 - git_test_func: replace directory with submodule
+
+expecting success of 6438.19 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 19 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 6438.20 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 20 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 6438.21 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 21 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 6438.22 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 22 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 6438.23 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --ff replace_sub1_with_file
+not ok 23 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 6438.24 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --ff replace_sub1_with_file
+not ok 24 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 6438.25 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Updating 09bcf53..cb2bda7
+Fast-forward
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 25 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 6438.26 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Updating 09bcf53..e6169bf
+Fast-forward
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 26 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 6438.27 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Updating e6169bf..3036e4e
+Fast-forward
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 27 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 6438.28 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Updating 27611a5..09bcf53
+ok 28 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 6438.29 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 29 - git_test_func: added submodule creates empty directory
+
+expecting success of 6438.30 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Updating 27611a5..09bcf53
+Fast-forward
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 30 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 6438.31 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Updating 2364f5a..8b6fdfc
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 31 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 6438.32 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Updating cb28587..a2e65d5
+Fast-forward
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 32 - git_test_func: replace directory with submodule
+
+expecting success of 6438.33 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 33 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 6438.34 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Updating 09bcf53..d6ba723
+Fast-forward
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 34 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 6438.35 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 35 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 6438.36 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Updating 09bcf53..cb28587
+ok 36 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 6438.37 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --ff-only replace_sub1_with_file
+not ok 37 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 6438.38 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Updating 09bcf53..2364f5a
+Fast-forward
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --ff-only replace_sub1_with_file
+not ok 38 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 6438.39 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Updating 09bcf53..cb2bda7
+Fast-forward
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 39 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 6438.40 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Updating 09bcf53..e6169bf
+Fast-forward
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 40 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 6438.41 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Updating e6169bf..3036e4e
+Fast-forward
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 41 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 6438.42 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Updating 27611a5..09bcf53
+ok 42 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 6438.43 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 43 - git_test_func: added submodule creates empty directory
+
+expecting success of 6438.44 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 +++++++
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 44 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 6438.45 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ++++
+ sub1        | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 45 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 6438.46 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ++++
+ sub1/file1  | 1 -
+ sub1/file2  | 1 -
+ sub1/file3  | 1 -
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 46 - git_test_func: replace directory with submodule
+
+expecting success of 6438.47 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 47 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 6438.48 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+Merge made by the 'ort' strategy.
+ .gitmodules | 7 -------
+ 1 file changed, 7 deletions(-)
+ delete mode 100644 .gitmodules
+ok 48 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 6438.49 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 49 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 6438.50 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1/file1
+	sub1/file2
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 50 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 6438.51 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --no-ff replace_sub1_with_file
+not ok 51 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 6438.52 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+Merge made by the 'ort' strategy.
+ .gitmodules | 4 ----
+ sub1        | 2 +-
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+test_must_fail: command succeeded: git merge --no-ff replace_sub1_with_file
+not ok 52 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 6438.53 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Merge made by the 'ort' strategy.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 53 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 6438.54 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+Merge made by the 'ort' strategy.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 54 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 6438.55 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Merge made by the 'ort' strategy.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 55 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 6438.56 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: The following untracked working tree files would be overwritten by merge:
+	sub1
+Please move or remove them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 56 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+# still have 8 known breakage(s)
+# passed all remaining 48 test(s)
+1..56
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7113-post-index-change-hook.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7113-post-index-change-hook/.git/
+expecting success of 7113.1 'setup': 
+	mkdir -p dir1 &&
+	touch dir1/file1.txt &&
+	echo testing >dir1/file2.txt &&
+	git add . &&
+	git commit -m "initial"
+
+[main (root-commit) 7e53173] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 dir1/file1.txt
+ create mode 100644 dir1/file2.txt
+ok 1 - setup
+
+expecting success of 7113.2 'test status, add, commit, others trigger hook without flags set': 
+	test_hook post-index-change <<-\EOF &&
+		if test "$1" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_workdir is set." >testfailure
+			exit 1
+		fi
+		if test "$2" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_skipworktree is set." >testfailure
+			exit 1
+		fi
+		if test -f ".git/index.lock"; then
+			echo ".git/index.lock exists" >testfailure
+			exit 3
+		fi
+		if ! test -f ".git/index"; then
+			echo ".git/index does not exist" >testfailure
+			exit 3
+		fi
+		echo "success" >testsuccess
+	EOF
+	mkdir -p dir2 &&
+	touch dir2/file1.txt &&
+	touch dir2/file2.txt &&
+	: force index to be dirty &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git status &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git add . &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git commit -m "second" &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git checkout -- dir1/file1.txt &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git update-index &&
+	test_path_is_missing testsuccess &&
+	test_path_is_missing testfailure &&
+	git reset --soft &&
+	test_path_is_missing testsuccess &&
+	test_path_is_missing testfailure
 
-Or undo this operation with:
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir2/
 
-  git switch -
+nothing added to commit but untracked files present (use "git add" to track)
+[main 5070ba9] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dir2/file1.txt
+ create mode 100644 dir2/file2.txt
+ok 2 - test status, add, commit, others trigger hook without flags set
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7113.3 'test checkout and reset trigger the hook': 
+	test_hook post-index-change <<-\EOF &&
+		if test "$1" -eq 1 && test "$2" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
+			exit 1
+		fi
+		if test "$1" -eq 0 && test "$2" -eq 0; then
+			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
+			exit 2
+		fi
+		if test "$1" -eq 1; then
+			if test -f ".git/index.lock"; then
+				echo "updated_workdir set but .git/index.lock exists" >testfailure
+				exit 3
+			fi
+			if ! test -f ".git/index"; then
+				echo "updated_workdir set but .git/index does not exist" >testfailure
+				exit 3
+			fi
+		else
+			echo "update_workdir should be set for checkout" >testfailure
+			exit 4
+		fi
+		echo "success" >testsuccess
+	EOF
+	: force index to be dirty &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git checkout main &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git checkout HEAD &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git reset --hard &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git checkout -B test &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure
 
-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
+Already on 'main'
+HEAD is now at 5070ba9 second
+Switched to a new branch 'test'
+ok 3 - test checkout and reset trigger the hook
 
-expecting success of 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 7113.4 'test reset --mixed and update-index triggers the hook': 
+	test_hook post-index-change <<-\EOF &&
+		if test "$1" -eq 1 && test "$2" -eq 1; then
+			echo "Invalid combination of flags passed to hook; updated_workdir and updated_skipworktree are both set." >testfailure
+			exit 1
+		fi
+		if test "$1" -eq 0 && test "$2" -eq 0; then
+			echo "Invalid combination of flags passed to hook; neither updated_workdir or updated_skipworktree are set." >testfailure
+			exit 2
+		fi
+		if test "$2" -eq 1; then
+			if test -f ".git/index.lock"; then
+				echo "updated_skipworktree set but .git/index.lock exists" >testfailure
+				exit 3
+			fi
+			if ! test -f ".git/index"; then
+				echo "updated_skipworktree set but .git/index does not exist" >testfailure
+				exit 3
+			fi
+		else
+			echo "updated_skipworktree should be set for reset --mixed and update-index" >testfailure
+			exit 4
+		fi
+		echo "success" >testsuccess
+	EOF
+	: force index to be dirty &&
+	test-tool chmtime +60 dir1/file1.txt &&
+	git reset --mixed --quiet HEAD~1 &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git hash-object -w --stdin <dir1/file2.txt >expect &&
+	git update-index --cacheinfo 100644 "$(cat expect)" dir1/file1.txt &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure &&
+	git update-index --skip-worktree dir1/file2.txt &&
+	git update-index --remove dir1/file2.txt &&
+	test_path_is_file testsuccess && rm -f testsuccess &&
+	test_path_is_missing testfailure
 
-[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 4 - test reset --mixed and update-index triggers the hook
 
-# passed all 48 test(s)
-1..48
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7111-reset-table.sh ***
@@ -446164,7 +447606,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
@@ -446858,6 +448300,7 @@
 		sh -c "test -t 1 && test -t 2"
 
 )
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 prerequisite TTY ok
 expecting success of 7301.23 'git clean -i paints the header in HEADER color': 
 	>a.out &&
@@ -447610,7 +449053,7 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7300-clean/strange_bare/.git/
 Skipping repository baz/boo
 Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Dec 18 01:38 strange_bare
+drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Nov 14 19:42 strange_bare
 not ok 36 - nested (empty) bare repositories should be cleaned even when in .git # TODO known breakage
 
 checking known breakage of 7300.37 'nested (non-empty) bare repositories should be cleaned even when in .git': 
@@ -447624,7 +449067,7 @@
 done.
 Skipping repository baz/boo
 Path exists:
-drwxr-xr-x 3 pbuilder1 pbuilder1 4096 Dec 18 01:38 strange_bare
+drwxr-xr-x 3 pbuilder2 pbuilder2 4096 Nov 14 19:42 strange_bare
 not ok 37 - nested (non-empty) bare repositories should be cleaned even when in .git # TODO known breakage
 
 expecting success of 7300.38 'giving path in nested git work tree will NOT remove it': 
@@ -449253,6 +450696,954 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7003-filter-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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) (1 seconds passed, remaining 2 predicted)    
Rewrite 3abb9b554927997a06e6fafc3c62469a75ef32a3 (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 48ac83b9774bbddb9c1cd6fe140d5380297aa69c (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/9) (1 seconds passed, remaining 2 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (7/9) (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)    
+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.45.2/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.45.2/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) (1 seconds passed, remaining 8 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) (1 seconds passed, remaining 0 predicted)    
Rewrite 8d77ce9a0f051fe4d6b311099cfc061fc8fa238e (7/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 3623c2fd76a1257ce6cfb529b64aa3e51d851ffd (7/9) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 11 - rewrite, renaming a specific directory
+
+expecting success of 7003.12 'test that the directory was renamed': 
+	test dir/D = "$(git show HEAD:diroh/D.t --)" &&
+	! test -d dir &&
+	test -d diroh &&
+	! test -d diroh/dir &&
+	test -f diroh/D.t &&
+	test dir/D = "$(cat diroh/D.t)"
+
+ok 12 - test that the directory was renamed
+
+expecting success of 7003.13 'populate --state-branch': 
+	git filter-branch --state-branch state -f --tree-filter "touch file || :" HEAD
+
+Branch state does not exist. Will create
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/9) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/9) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/9) (1 seconds passed, remaining 0 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/9) (1 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+Saving rewrite state to state
+ok 13 - populate --state-branch
+
+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) (1 seconds passed, remaining 2 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (5/17) (1 seconds passed, remaining 2 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (5/17) (1 seconds passed, remaining 2 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/17) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/17) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/17) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (11/17) (2 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (11/17) (2 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/17) (2 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/17) (2 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/17) (2 seconds passed, remaining 1 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (11/17) (2 seconds passed, remaining 1 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (17/17) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/preserved-author' was rewritten
+ok 22 - author information is preserved
+
+expecting success of 7003.23 'remove a certain author's commits': 
+	echo i > i &&
+	test_tick &&
+	git commit -m i i &&
+	git branch removed-author &&
+	git filter-branch -f --commit-filter "\
+		if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
+		then\
+			skip_commit \"\$@\";
+		else\
+			git commit-tree \"\$@\";\
+		fi" removed-author &&
+	cnt1=$(git rev-list main | wc -l) &&
+	cnt2=$(git rev-list removed-author | wc -l) &&
+	test $cnt1 -eq $(($cnt2 + 1)) &&
+	git rev-list --author="B V Uips" removed-author >actual &&
+	test_line_count = 0 actual
+
+[main 0261af1] i
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/18) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/18) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/18) (1 seconds passed, remaining 5 predicted)    
Rewrite cb42fbf5b7b2d2717a15c7eb880151754077a891 (3/18) (1 seconds passed, remaining 5 predicted)    
Rewrite a1f80b99bf58d41c7e43e2e015579be4ed5ad662 (3/18) (1 seconds passed, remaining 5 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/18) (1 seconds passed, remaining 5 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (7/18) (2 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (7/18) (2 seconds passed, remaining 3 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/18) (2 seconds passed, remaining 3 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/18) (2 seconds passed, remaining 3 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) (4 seconds passed, remaining 0 predicted)    
Rewrite 2ffef5d63485c35f57cd4861517a7a34b4545fb3 (15/18) (4 seconds passed, remaining 0 predicted)    
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (15/18) (4 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (15/18) (4 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/removed-author' was rewritten
+ok 23 - remove a certain author's commits
+
+expecting success of 7003.24 'barf on invalid name': 
+	test_must_fail git filter-branch -f main xy-problem &&
+	test_must_fail git filter-branch -f HEAD^
+
+fatal: ambiguous argument 'xy-problem': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+You must specify a ref to rewrite.
+ok 24 - barf on invalid name
+
+expecting success of 7003.25 '"map" works in commit filter': 
+	git filter-branch -f --commit-filter "\
+		parent=\$(git rev-parse \$GIT_COMMIT^) &&
+		mapped=\$(map \$parent) &&
+		actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
+		test \$mapped = \$actual &&
+		git commit-tree \"\$@\";" main~2..main &&
+	git rev-parse --verify main
+
+
Rewrite 7da14efb2638f7e6e18d6a3324eb5c7d8a1e0e09 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 0261af146239dd954a19d76ae2a417dd3af8b791 (2/2) (0 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+0261af146239dd954a19d76ae2a417dd3af8b791
+ok 25 - "map" works in commit filter
+
+expecting success of 7003.26 'Name needing quotes': 
+
+	git checkout -b rerere A &&
+	mkdir foo &&
+	name="れれれ" &&
+	>foo/$name &&
+	git add foo &&
+	git commit -m "Adding a file" &&
+	git filter-branch --tree-filter "rm -fr foo" &&
+	test_must_fail git ls-files --error-unmatch "foo/$name" &&
+	test $(git rev-parse --verify rerere) != $(git rev-parse --verify A)
+
+
+Switched to a new branch 'rerere'
+[rerere 1d45e88] Adding a file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 "foo/\343\202\214\343\202\214\343\202\214"
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/2) (0 seconds passed, remaining 0 predicted)    
Rewrite 1d45e8854f1dd5452938be2dedb173087134c05c (2/2) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/rerere' was rewritten
+error: pathspec 'foo/れれれ' did not match any file(s) known to git
+Did you forget to 'git add'?
+ok 26 - Name needing quotes
+
+expecting success of 7003.27 'Subdirectory filter with disappearing trees': 
+	git reset --hard &&
+	git checkout main &&
+
+	mkdir foo &&
+	touch foo/bar &&
+	git add foo &&
+	test_tick &&
+	git commit -m "Adding foo" &&
+
+	git rm -r foo &&
+	test_tick &&
+	git commit -m "Removing foo" &&
+
+	mkdir foo &&
+	touch foo/bar &&
+	git add foo &&
+	test_tick &&
+	git commit -m "Re-adding foo" &&
+
+	git filter-branch -f --subdirectory-filter foo &&
+	git rev-list main >actual &&
+	test_line_count = 3 actual
+
+HEAD is now at 643bd56 Adding a file
+Switched to branch 'main'
+[main f7eadb2] Adding foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo/bar
+rm 'foo/bar'
+[main ee48524] Removing foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 foo/bar
+[main 14fe8c6] Re-adding foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo/bar
+
Rewrite f7eadb255c93eb12be4926fbb2a3995c413564ba (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite ee48524f38405c7e2028be80dc8acfbef4c75c13 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite 14fe8c608ef61b8d11aca607ef6c7a4e24b8b32d (3/3) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+ok 27 - Subdirectory filter with disappearing trees
+
+expecting success of 7003.28 'Tag name filtering retains tag message': 
+	git tag -m atag T &&
+	git cat-file tag T > expect &&
+	git filter-branch -f --tag-name-filter cat &&
+	git cat-file tag T > actual &&
+	test_cmp expect actual
+
+
Rewrite f78b0905e139f6556b004c5f87cfe750aa8e3286 (1/3) (0 seconds passed, remaining 0 predicted)    
Rewrite c9fbe965b33cbcb81865d123297fe4df816d7555 (2/3) (0 seconds passed, remaining 0 predicted)    
Rewrite fea59ed4667894c7bd682b11f147174ab39c40bd (3/3) (1 seconds passed, remaining 0 predicted)    
+WARNING: Ref 'refs/heads/main' is unchanged
+T -> T (fea59ed4667894c7bd682b11f147174ab39c40bd -> fea59ed4667894c7bd682b11f147174ab39c40bd)
+ok 28 - Tag name filtering retains tag message
+
+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) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (0 seconds passed, remaining 0 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (4/14) (0 seconds passed, remaining 0 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (6/14) (1 seconds passed, remaining 1 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (13/14) (2 seconds passed, remaining 0 predicted)    
Rewrite 219a992bdcfa9f21a6ac93c218579aed7936acdd (13/14) (2 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 33 - Prune empty commits
+
+expecting success of 7003.34 'prune empty collapsed merges': 
+	test_config merge.ff false &&
+	git rev-list HEAD >expect &&
+	test_commit to_remove_2 &&
+	git reset --hard HEAD^ &&
+	test_merge non-ff to_remove_2 &&
+	git filter-branch -f --index-filter "git update-index --remove to_remove_2.t" --prune-empty HEAD &&
+	git rev-list HEAD >actual &&
+	test_cmp expect actual
+
+[branch cb86908] to_remove_2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to_remove_2.t
+HEAD is now at ead226b again not subdir
+Merge made by the 'ort' strategy.
+ to_remove_2.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 to_remove_2.t
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/15) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/15) (1 seconds passed, remaining 6 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (2/15) (1 seconds passed, remaining 6 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (2/15) (1 seconds passed, remaining 6 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (5/15) (1 seconds passed, remaining 2 predicted)    
Rewrite 5bae69c6543c34be1d98816e26501bcda79d1d6b (11/15) (2 seconds passed, remaining 0 predicted)    
Rewrite 140072ead29d56d10c1c5c473c117e3aed45a333 (11/15) (2 seconds passed, remaining 0 predicted)    
Rewrite ead226bc0b53c5d210f2326ae871b0fea3004df3 (11/15) (2 seconds passed, remaining 0 predicted)    
Rewrite cb86908a399a1a40c4270055e48259f9034a5458 (11/15) (2 seconds passed, remaining 0 predicted)    
Rewrite 61efb63b91ac2be151fa30bc4f43e001cd3b8c86 (11/15) (2 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 34 - prune empty collapsed merges
+
+expecting success of 7003.35 'prune empty works even without index/tree filters': 
+	git rev-list HEAD >expect &&
+	git commit --allow-empty -m empty &&
+	git filter-branch -f --prune-empty HEAD &&
+	git rev-list HEAD >actual &&
+	test_cmp expect actual
+
+[branch 5b6cb84] empty
+ Author: A U Thor <author@example.com>
+
Rewrite 0ddfaf193ff13d6ab39b7cbd9eed645e3ee2f050 (1/14) (0 seconds passed, remaining 0 predicted)    
Rewrite e86e54590a6764f0c4219b3fe8b5e971cd5a0ed8 (2/14) (0 seconds passed, remaining 0 predicted)    
Rewrite 3d6c5360ccb48d27bbc524f53496821309a1fc79 (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite ef5df644a239016a9035ed6fe3e7f2b4b4a349bd (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite d66aa888e8e10ccecac31b04a73b006afcfb6ab2 (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (3/14) (1 seconds passed, remaining 3 predicted)    
Rewrite 095b78eb9c1f77139224464f38f1e0aff8add3cf (7/14) (2 seconds passed, remaining 2 predicted)    
Rewrite 20d07e95852c2683da5bd70d3badbd5028484552 (7/14) (2 seconds passed, remaining 2 predicted)    
Rewrite 8a3423ee5559c5e0c32440a860f6b09a0e6020fc (7/14) (2 seconds passed, remaining 2 predicted)    
Rewrite bb8f80d463b54137409c5a381ad07ea6bf4b1867 (7/14) (2 seconds passed, remaining 2 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 5b6cb848f343668f1f75c3258a59d12c1680d67f (11/14) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/branch' was rewritten
+ok 35 - prune empty works even without index/tree filters
+
+expecting success of 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) (2 seconds passed, remaining 1 predicted)    
Rewrite 0e63577b8a9dce52b69167d9c008f6a0e30de818 (5/9) (2 seconds passed, remaining 1 predicted)    
Rewrite 013e089e8403f3749848f7aafc6f271fb7179dbc (5/9) (2 seconds passed, remaining 1 predicted)    
Rewrite 3c39262d23e70569701d337b4d27a1e97512c2d9 (8/9) (3 seconds passed, remaining 0 predicted)    
Rewrite 110eac945dc1713b27bdf49e74e5805db66971f0 (8/9) (3 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/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.45.2/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.45.2/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 eff5782] added submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submod
+[main 1abb59f] 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 e633393] 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 eff57823f0fc96a99e17509163cc6cfda8aed4ec (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 1abb59fcfa1ff298a610380baf77479b558e08bf (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite e6333937de4d4e9f85b7a9e07f128f463934d5d7 (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 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 e633393 changed submodule
+
Rewrite cc5d7558673710c1da61856fa53718f4fe4029c5 (1/4) (0 seconds passed, remaining 0 predicted)    
Rewrite eff57823f0fc96a99e17509163cc6cfda8aed4ec (2/4) (0 seconds passed, remaining 0 predicted)    
Rewrite 1abb59fcfa1ff298a610380baf77479b558e08bf (3/4) (0 seconds passed, remaining 0 predicted)    
Rewrite e6333937de4d4e9f85b7a9e07f128f463934d5d7 (4/4) (0 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 e633393 changed submodule
+
Rewrite ec6e83f70910deed4aa763515e88f21f10133d54 (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 e6333937de4d4e9f85b7a9e07f128f463934d5d7 (1/1) (0 seconds passed, remaining 0 predicted)    
+Ref 'refs/heads/main' was rewritten
+file
+HEAD is now at e633393 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 e633393 changed submodule
+Deleted replace ref '6b6717d1040a36461d19d4340f76ab94adb69382'
+HEAD is now at e633393 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7401-submodule-summary.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7401-submodule-summary/.git/
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7401-submodule-summary/sm1/.git/
@@ -449464,4034 +451855,593 @@
 	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.45.2/t/trash directory.t7401-submodule-summary/sm2/.git/
-warning: adding embedded git repository: sm2
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm2
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm2
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-ok 17 - create second submodule
-
-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.45.2/t/trash directory.t7401-submodule-summary/xyzzy/.git/
-ok 23 - should not fail in an empty repo
-
-# passed all 23 test(s)
-1..23
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7403-submodule-sync.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/super-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/relative-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/recursive-clone/submodule'...
-done.
-Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
-Submodule 'sub-submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7063-status-untracked-cache.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache/.git/
-checking prerequisite: UNTRACKED_CACHE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UNTRACKED_CACHE" &&
-	{ git update-index --test-untracked-cache; ret=$?; } &&
-	test $ret -ne 1
-
-)
-Testing mtime in '/build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache' ...... OK
-prerequisite UNTRACKED_CACHE ok
-expecting success of 7063.1 'core.untrackedCache is unset': 
-	test_must_fail git config --get core.untrackedCache
-
-ok 1 - core.untrackedCache is unset
-
-expecting success of 7063.2 'setup': 
-	git init --template= worktree &&
-	cd worktree &&
-	mkdir done dtwo dthree &&
-	touch one two three done/one dtwo/two dthree/three &&
-	test-tool chmtime =-300 one two three done/one dtwo/two dthree/three &&
-	test-tool chmtime =-300 done dtwo dthree &&
-	test-tool chmtime =-300 . &&
-	git add one two done/one &&
-	mkdir .git/info &&
-	: >.git/info/exclude &&
-	git update-index --untracked-cache &&
-	test_oid_cache <<-EOF
-	root sha1:e6fcc8f2ee31bae321d66afd183fcb7237afae6e
-	root sha256:b90c672088c015b9c83876e919da311bad4cd39639fb139f988af6a11493b974
-
-	exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0
-	exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c
-
-	done sha1:1946f0437f90c5005533cbe1736a6451ca301714
-	done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc
-	EOF
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache/worktree/.git/
-ok 2 - setup
-
-expecting success of 7063.3 'untracked cache is empty': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect-empty <<EOF &&
-info/exclude $ZERO_OID
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-EOF
-	test_cmp ../expect-empty ../actual
-
-ok 3 - untracked cache is empty
-
-expecting success of 7063.4 'status first time (empty cache)': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:3
- ....gitignore-invalidation:1
- ....directory-invalidation:0
- ....opendir:4
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 4 - status first time (empty cache)
-
-expecting success of 7063.5 'untracked cache after first status': 
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../dump.expect ../actual
-
-ok 5 - untracked cache after first status
-
-expecting success of 7063.6 'status second time (fully populated cache)': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 6 - status second time (fully populated cache)
-
-expecting success of 7063.7 'untracked cache after second status': 
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../dump.expect ../actual
-
-ok 7 - untracked cache after second status
-
-expecting success of 7063.8 'untracked cache is bypassed with -uall': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status -uall --porcelain >../actual &&
-	iuc status -uall --porcelain >../status.iuc &&
-	test_cmp ../status_uall.expect ../status.iuc &&
-	test_cmp ../status_uall.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 8 - untracked cache is bypassed with -uall
-
-expecting success of 7063.9 'untracked cache remains after bypass': 
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../dump.expect ../actual
-
-ok 9 - untracked cache remains after bypass
-
-expecting success of 7063.10 'if -uall is configured, untracked cache gets populated by default': 
-	test_config status.showuntrackedfiles all &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status_uall.expect ../status.iuc &&
-	test_cmp ../status_uall.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:3
- ....gitignore-invalidation:1
- ....directory-invalidation:0
- ....opendir:4
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 10 - if -uall is configured, untracked cache gets populated by default
-
-expecting success of 7063.11 'if -uall was configured, untracked cache is populated': 
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../dump_uall.expect ../actual
-
-ok 11 - if -uall was configured, untracked cache is populated
-
-expecting success of 7063.12 'if -uall is configured, untracked cache is used by default': 
-	test_config status.showuntrackedfiles all &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status_uall.expect ../status.iuc &&
-	test_cmp ../status_uall.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 12 - if -uall is configured, untracked cache is used by default
-
-expecting success of 7063.13 'if -uall is configured, untracked cache is bypassed with -unormal': 
-	test_config status.showuntrackedfiles all &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status -unormal --porcelain >../actual &&
-	iuc status -unormal --porcelain >../status.iuc &&
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 13 - if -uall is configured, untracked cache is bypassed with -unormal
-
-expecting success of 7063.14 'repopulate untracked cache for -unormal': 
-	git status --porcelain
-
-A  done/one
-A  one
-A  two
-?? dthree/
-?? dtwo/
-?? three
-ok 14 - repopulate untracked cache for -unormal
-
-expecting success of 7063.15 'modify in root directory, one dir invalidation': 
-	: >four &&
-	test-tool chmtime =-240 four &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-A  two
-?? dthree/
-?? dtwo/
-?? four
-?? three
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:1
- ....opendir:1
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-
-ok 15 - modify in root directory, one dir invalidation
-
-expecting success of 7063.16 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $EMPTY_BLOB
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $ZERO_OID recurse valid
-dthree/
-dtwo/
-four
-three
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-three
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 16 - verify untracked cache dump
-
-expecting success of 7063.17 'new .gitignore invalidates recursively': 
-	echo four >.gitignore &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-A  two
-?? .gitignore
-?? dthree/
-?? dtwo/
-?? three
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:1
- ....directory-invalidation:1
- ....opendir:4
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-
-ok 17 - new .gitignore invalidates recursively
-
-expecting success of 7063.18 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $EMPTY_BLOB
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dthree/
-dtwo/
-three
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-three
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 18 - verify untracked cache dump
-
-expecting success of 7063.19 'new info/exclude invalidates everything': 
-	echo three >>.git/info/exclude &&
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-A  two
-?? .gitignore
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:1
- ....directory-invalidation:0
- ....opendir:4
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 19 - new info/exclude invalidates everything
-
-expecting success of 7063.20 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 20 - verify untracked cache dump
-
-expecting success of 7063.21 'move two from tracked to untracked': 
-	git rm --cached two &&
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-rm 'two'
-ok 21 - move two from tracked to untracked
-
-expecting success of 7063.22 'status after the move': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-?? .gitignore
-?? dtwo/
-?? two
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:1
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 22 - status after the move
-
-expecting success of 7063.23 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-two
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 23 - verify untracked cache dump
-
-expecting success of 7063.24 'move two from untracked to tracked': 
-	git add two &&
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 24 - move two from untracked to tracked
-
-expecting success of 7063.25 'status after the move': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-A  done/one
-A  one
-A  two
-?? .gitignore
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:1
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 25 - status after the move
-
-expecting success of 7063.26 'verify untracked cache dump': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 26 - verify untracked cache dump
-
-expecting success of 7063.27 'set up for sparse checkout testing': 
-	echo two >done/.gitignore &&
-	echo three >>done/.gitignore &&
-	echo two >done/two &&
-	git add -f done/two done/.gitignore &&
-	git commit -m "first commit"
-
-[main (root-commit) 2d55d32] first commit
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+)
- create mode 100644 done/.gitignore
- create mode 100644 done/one
- create mode 100644 done/two
- create mode 100644 one
- create mode 100644 two
-ok 27 - set up for sparse checkout testing
-
-expecting success of 7063.28 'status after commit': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
-?? .gitignore
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:2
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 28 - status after commit
-
-expecting success of 7063.29 'untracked cache correct after commit': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $ZERO_OID recurse valid
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 29 - untracked cache correct after commit
-
-expecting success of 7063.30 'set up sparse checkout': 
-	echo "done/[a-z]*" >.git/info/sparse-checkout &&
-	test_config core.sparsecheckout true &&
-	git checkout main &&
-	git update-index --force-untracked-cache &&
-	git status --porcelain >/dev/null && # prime the cache
-	test_path_is_missing done/.gitignore &&
-	test_path_is_file done/one
-
-Already on 'main'
-ok 30 - set up sparse checkout
-
-expecting success of 7063.31 'create/modify files, some of which are gitignored': 
-	echo two bis >done/two &&
-	echo three >done/three && # three is gitignored
-	echo four >done/four && # four is gitignored at a higher level
-	echo five >done/five && # five is not gitignored
-	test-tool chmtime =-180 done/two done/three done/four done/five done &&
-	# we need to ensure that the root dir is touched (in the past);
-	test-tool chmtime =-180 . &&
-	sync_mtime
-
-ok 31 - create/modify files, some of which are gitignored
-
-expecting success of 7063.32 'test sparse status with untracked cache': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:1
- ....directory-invalidation:2
- ....opendir:2
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 32 - test sparse status with untracked cache
-
-expecting success of 7063.33 'untracked cache correct after status': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $(test_oid done) recurse valid
-five
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect ../actual
-
-ok 33 - untracked cache correct after status
-
-expecting success of 7063.34 'test sparse status again with untracked cache': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 34 - test sparse status again with untracked cache
-
-expecting success of 7063.35 'set up for test of subdir and sparse checkouts': 
-	mkdir done/sub &&
-	mkdir done/sub/sub &&
-	echo "sub" > done/sub/sub/file &&
-	test-tool chmtime =-120 done/sub/sub/file done/sub/sub done/sub done
-
-ok 35 - set up for test of subdir and sparse checkouts
-
-expecting success of 7063.36 'test sparse status with untracked cache and subdir': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? done/sub/
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:2
- ....gitignore-invalidation:0
- ....directory-invalidation:1
- ....opendir:3
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 36 - test sparse status with untracked cache and subdir
-
-expecting success of 7063.37 'verify untracked cache dump (sparse/subdirs)': 
-	test-tool dump-untracked-cache >../actual &&
-	cat >../expect-from-test-dump <<EOF &&
-info/exclude $(test_oid exclude)
-core.excludesfile $ZERO_OID
-exclude_per_dir .gitignore
-flags 00000006
-/ $(test_oid root) recurse valid
-.gitignore
-dtwo/
-/done/ $(test_oid done) recurse valid
-five
-sub/
-/done/sub/ $ZERO_OID recurse check_only valid
-sub/
-/done/sub/sub/ $ZERO_OID recurse check_only valid
-file
-/dthree/ $ZERO_OID recurse check_only valid
-/dtwo/ $ZERO_OID recurse check_only valid
-two
-EOF
-	test_cmp ../expect-from-test-dump ../actual
-
-ok 37 - verify untracked cache dump (sparse/subdirs)
-
-expecting success of 7063.38 'test sparse status again with untracked cache and subdir': 
-	: >../trace.output &&
-	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual &&
-	get_relevant_traces ../trace.output ../trace.relevant &&
-	cat >../trace.expect <<EOF &&
- ....path:
- ....node-creation:0
- ....gitignore-invalidation:0
- ....directory-invalidation:0
- ....opendir:0
-EOF
-	test_cmp ../trace.expect ../trace.relevant
-
-ok 38 - test sparse status again with untracked cache and subdir
-
-expecting success of 7063.39 'move entry in subdir from untracked to cached': 
-	git add dtwo/two &&
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-A  dtwo/two
-?? .gitignore
-?? done/five
-?? done/sub/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual
-
-ok 39 - move entry in subdir from untracked to cached
-
-expecting success of 7063.40 'move entry in subdir from cached to untracked': 
-	git rm --cached dtwo/two &&
-	git status --porcelain >../status.actual &&
-	iuc status --porcelain >../status.iuc &&
-	cat >../status.expect <<EOF &&
- M done/two
-?? .gitignore
-?? done/five
-?? done/sub/
-?? dtwo/
-EOF
-	test_cmp ../status.expect ../status.iuc &&
-	test_cmp ../status.expect ../status.actual
-
-rm 'dtwo/two'
-ok 40 - move entry in subdir from cached to untracked
-
-expecting success of 7063.41 '--no-untracked-cache removes the cache': 
-	git update-index --no-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	echo "no untracked cache" >../expect-no-uc &&
-	test_cmp ../expect-no-uc ../actual
-
-ok 41 - --no-untracked-cache removes the cache
-
-expecting success of 7063.42 'git status does not change anything': 
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual
-
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 42 - git status does not change anything
-
-expecting success of 7063.43 'setting core.untrackedCache to true and using git status creates the cache': 
-	git config core.untrackedCache true &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-from-test-dump ../actual
-
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 43 - setting core.untrackedCache to true and using git status creates the cache
-
-expecting success of 7063.44 'using --no-untracked-cache does not fail when core.untrackedCache is true': 
-	git update-index --no-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual &&
-	git update-index --untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual
-
-warning: core.untrackedCache is set to true; remove or change it, if you really want to disable the untracked cache
-ok 44 - using --no-untracked-cache does not fail when core.untrackedCache is true
-
-expecting success of 7063.45 'setting core.untrackedCache to false and using git status removes the cache': 
-	git config core.untrackedCache false &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual
-
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 45 - setting core.untrackedCache to false and using git status removes the cache
-
-expecting success of 7063.46 'using --untracked-cache does not fail when core.untrackedCache is false': 
-	git update-index --untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual
-
-warning: core.untrackedCache is set to false; remove or change it, if you really want to enable the untracked cache
-ok 46 - using --untracked-cache does not fail when core.untrackedCache is false
-
-expecting success of 7063.47 'setting core.untrackedCache to keep': 
-	git config core.untrackedCache keep &&
-	git update-index --untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-from-test-dump ../actual &&
-	git update-index --no-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-no-uc ../actual &&
-	git update-index --force-untracked-cache &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-empty ../actual &&
-	git status &&
-	test-tool dump-untracked-cache >../actual &&
-	test_cmp ../expect-from-test-dump ../actual
-
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitignore
-	done/five
-	done/sub/
-	dtwo/
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 47 - setting core.untrackedCache to keep
-
-expecting success of 7063.48 'test ident field is working': 
-	mkdir ../other_worktree &&
-	cp -R done dthree dtwo four three ../other_worktree &&
-	GIT_WORK_TREE=../other_worktree git status 2>../err &&
-	echo "warning: untracked cache is disabled on this system or location" >../expect &&
-	test_cmp ../expect ../err
-
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   done/two
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	done/five
-	done/four
-	done/sub/
-	dtwo/
-	four
-
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 48 - test ident field is working
-
-expecting success of 7063.49 'untracked cache survives a checkout': 
-	git commit --allow-empty -m empty &&
-	test-tool dump-untracked-cache >../before &&
-	test_when_finished  "git checkout main" &&
-	git checkout -b other_branch &&
-	test-tool dump-untracked-cache >../after &&
-	test_cmp ../before ../after &&
-	test_commit test &&
-	test-tool dump-untracked-cache >../before &&
-	git checkout main &&
-	test-tool dump-untracked-cache >../after &&
-	test_cmp ../before ../after
-
-[main 9462075] empty
- Author: A U Thor <author@example.com>
-Switched to a new branch 'other_branch'
-[other_branch b773b8a] test
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test.t
-Switched to branch 'main'
-M	done/two
-Already on 'main'
-M	done/two
-ok 49 - untracked cache survives a checkout
-
-expecting success of 7063.50 'untracked cache survives a commit': 
-	test-tool dump-untracked-cache >../before &&
-	git add done/two &&
-	git commit -m commit &&
-	test-tool dump-untracked-cache >../after &&
-	test_cmp ../before ../after
-
-[main 527fa0b] commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 50 - untracked cache survives a commit
-
-expecting success of 7063.51 'teardown worktree': 
-	cd ..
-
-ok 51 - teardown worktree
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 7063.52 'setup worktree for symlink test': 
-	git init worktree-symlink &&
-	cd worktree-symlink &&
-	git config core.untrackedCache true &&
-	mkdir one two &&
-	touch one/file two/file &&
-	git add one/file two/file &&
-	git commit -m"first commit" &&
-	git rm -rf one &&
-	ln -s two one &&
-	git add one &&
-	git commit -m"second commit"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache/worktree-symlink/.git/
-[main (root-commit) 294fddc] first commit
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 one/file
- create mode 100644 two/file
-rm 'one/file'
-[main b7cd1f6] second commit
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 120000 one
- delete mode 100644 one/file
-ok 52 - setup worktree for symlink test
-
-expecting success of 7063.53 '"status" after symlink replacement should be clean with UC=true': 
-	git checkout HEAD~ &&
-	status_is_clean &&
-	status_is_clean &&
-	git checkout main &&
-	avoid_racy &&
-	status_is_clean &&
-	status_is_clean
-
-Note: switching to 'HEAD~'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'main'
-ok 53 - "status" after symlink replacement should be clean with UC=true
-
-expecting success of 7063.54 '"status" after symlink replacement should be clean with UC=false': 
-	git config core.untrackedCache false &&
-	git checkout HEAD~ &&
-	status_is_clean &&
-	status_is_clean &&
-	git checkout main &&
-	avoid_racy &&
-	status_is_clean &&
-	status_is_clean
-
-Note: switching to 'HEAD~'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'main'
-ok 54 - "status" after symlink replacement should be clean with UC=false
-
-expecting success of 7063.55 'setup worktree for non-symlink test': 
-	git init worktree-non-symlink &&
-	cd worktree-non-symlink &&
-	git config core.untrackedCache true &&
-	mkdir one two &&
-	touch one/file two/file &&
-	git add one/file two/file &&
-	git commit -m"first commit" &&
-	git rm -rf one &&
-	cp two/file one &&
-	git add one &&
-	git commit -m"second commit"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/.git/
-[main (root-commit) 294fddc] first commit
- Author: A U Thor <author@example.com>
- 2 files changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 one/file
- create mode 100644 two/file
-rm 'one/file'
-[main 0558445] second commit
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename one/file => one (100%)
-ok 55 - setup worktree for non-symlink test
-
-expecting success of 7063.56 '"status" after file replacement should be clean with UC=true': 
-	git checkout HEAD~ &&
-	status_is_clean &&
-	status_is_clean &&
-	git checkout main &&
-	avoid_racy &&
-	status_is_clean &&
-	test-tool dump-untracked-cache >../actual &&
-	grep -F "recurse valid" ../actual >../actual.grep &&
-	cat >../expect.grep <<EOF &&
-/ $ZERO_OID recurse valid
-/two/ $ZERO_OID recurse valid
-EOF
-	status_is_clean &&
-	test_cmp ../expect.grep ../actual.grep
-
-Note: switching to 'HEAD~'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'main'
-ok 56 - "status" after file replacement should be clean with UC=true
-
-expecting success of 7063.57 '"status" after file replacement should be clean with UC=false': 
-	git config core.untrackedCache false &&
-	git checkout HEAD~ &&
-	status_is_clean &&
-	status_is_clean &&
-	git checkout main &&
-	avoid_racy &&
-	status_is_clean &&
-	status_is_clean
-
-Note: switching to 'HEAD~'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 294fddc first commit
-Previous HEAD position was 294fddc first commit
-Switched to branch 'main'
-ok 57 - "status" after file replacement should be clean with UC=false
-
-expecting success of 7063.58 'empty repo (no index) and core.untrackedCache': 
-	git init emptyrepo &&
-	git -C emptyrepo -c core.untrackedCache=true write-tree
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7063-status-untracked-cache/worktree-symlink/worktree-non-symlink/emptyrepo/.git/
-4b825dc642cb6eb9a060e54bf8d69288fbee4904
-ok 58 - empty repo (no index) and core.untrackedCache
-
-# passed all 58 test(s)
-1..58
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t6438-submodule-directory-file-conflicts.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/.git/
-expecting success of 6438.1 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 1 - git_test_func: added submodule creates empty directory
-
-expecting success of 6438.2 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 2 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 6438.3 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 3 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 6438.4 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Updating cb28587..a2e65d5
-Fast-forward
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 4 - git_test_func: replace directory with submodule
-
-expecting success of 6438.5 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 5 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 6438.6 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 6 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 6438.7 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 7 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 6438.8 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 8 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 6438.9 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge replace_sub1_with_file
-not ok 9 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 6438.10 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge replace_sub1_with_file
-not ok 10 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 6438.11 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Updating 09bcf53..cb2bda7
-Fast-forward
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 11 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 6438.12 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Updating 09bcf53..e6169bf
-Fast-forward
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 12 - git_test_func: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 6438.13 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Updating e6169bf..3036e4e
-Fast-forward
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 13 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 6438.14 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Updating 27611a5..09bcf53
-ok 14 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 6438.15 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 15 - git_test_func: added submodule creates empty directory
-
-expecting success of 6438.16 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 16 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 6438.17 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 17 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 6438.18 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Updating cb28587..a2e65d5
-Fast-forward
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 18 - git_test_func: replace directory with submodule
-
-expecting success of 6438.19 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 19 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 6438.20 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 20 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 6438.21 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 21 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 6438.22 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 22 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 6438.23 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --ff replace_sub1_with_file
-not ok 23 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 6438.24 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --ff replace_sub1_with_file
-not ok 24 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 6438.25 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Updating 09bcf53..cb2bda7
-Fast-forward
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 25 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 6438.26 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Updating 09bcf53..e6169bf
-Fast-forward
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 26 - git_test_func: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 6438.27 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Updating e6169bf..3036e4e
-Fast-forward
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 27 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 6438.28 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Updating 27611a5..09bcf53
-ok 28 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 6438.29 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 29 - git_test_func: added submodule creates empty directory
-
-expecting success of 6438.30 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Updating 27611a5..09bcf53
-Fast-forward
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 30 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 6438.31 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Updating 2364f5a..8b6fdfc
-Fast-forward
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 31 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 6438.32 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Updating cb28587..a2e65d5
-Fast-forward
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 32 - git_test_func: replace directory with submodule
-
-expecting success of 6438.33 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 33 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 6438.34 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Updating 09bcf53..d6ba723
-Fast-forward
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 34 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 6438.35 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 35 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 6438.36 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Updating 09bcf53..cb28587
-ok 36 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 6438.37 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --ff-only replace_sub1_with_file
-not ok 37 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 6438.38 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Updating 09bcf53..2364f5a
-Fast-forward
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --ff-only replace_sub1_with_file
-not ok 38 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+ok 16 - deleted submodule
 
-expecting success of 6438.39 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Updating 09bcf53..cb2bda7
-Fast-forward
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 39 - git_test_func: modified submodule does not update submodule work tree
+expecting success of 7401.17 'create second submodule': 
+	test_create_repo sm2 &&
+	head7=$(add_file sm2 foo8 foo9) &&
+	git add sm2
 
-expecting success of 6438.40 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Updating 09bcf53..e6169bf
-Fast-forward
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 40 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7401-submodule-summary/sm2/.git/
+warning: adding embedded git repository: sm2
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm2
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm2
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+ok 17 - create second submodule
 
-expecting success of 6438.41 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Updating e6169bf..3036e4e
-Fast-forward
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 41 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+expecting success of 7401.18 'multiple submodules': 
+	git submodule summary >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
 
-expecting success of 6438.42 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Updating 27611a5..09bcf53
-ok 42 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
 
-expecting success of 6438.43 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 43 - git_test_func: added submodule creates empty directory
+	EOF
+	test_cmp expected actual
 
-expecting success of 6438.44 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 7 +++++++
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 44 - git_test_func: added submodule leaves existing empty directory alone
+ok 18 - multiple submodules
 
-expecting success of 6438.45 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ++++
- sub1        | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 45 - git_test_func: replace tracked file with submodule creates empty directory
+expecting success of 7401.19 'path filter': 
+	git submodule summary sm2 >actual &&
+	cat >expected <<-EOF &&
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
 
-expecting success of 6438.46 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ++++
- sub1/file1  | 1 -
- sub1/file2  | 1 -
- sub1/file3  | 1 -
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 46 - git_test_func: replace directory with submodule
+	EOF
+	test_cmp expected actual
 
-expecting success of 6438.47 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Merge made by the 'ort' strategy.
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 47 - git_test_func: removed submodule leaves submodule directory and its contents in place
+ok 19 - path filter
 
-expecting success of 6438.48 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-Merge made by the 'ort' strategy.
- .gitmodules | 7 -------
- 1 file changed, 7 deletions(-)
- delete mode 100644 .gitmodules
-ok 48 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+expecting success of 7401.20 'given commit': 
+	git submodule summary HEAD^ >actual &&
+	cat >expected <<-EOF &&
+	* sm1 6858906...0000000:
 
-expecting success of 6438.49 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 49 - git_test_func: replace submodule with a directory must fail
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
 
-expecting success of 6438.50 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1/file1
-	sub1/file2
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 50 - git_test_func: replace submodule containing a .git directory with a directory must fail
+	EOF
+	test_cmp expected actual
 
-checking known breakage of 6438.51 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --no-ff replace_sub1_with_file
-not ok 51 - git_test_func: replace submodule with a file must fail # TODO known breakage
+ok 20 - given commit
 
-checking known breakage of 6438.52 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-Merge made by the 'ort' strategy.
- .gitmodules | 4 ----
- sub1        | 2 +-
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-test_must_fail: command succeeded: git merge --no-ff replace_sub1_with_file
-not ok 52 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+expecting success of 7401.21 '--for-status': 
+	git submodule summary --for-status HEAD^ >actual &&
+	test_cmp - actual <<-EOF
+	* sm1 6858906...0000000:
 
-expecting success of 6438.53 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Merge made by the 'ort' strategy.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 53 - git_test_func: modified submodule does not update submodule work tree
+	* sm2 0000000...fa9eeaf (2):
+	  > Add foo9
 
-expecting success of 6438.54 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-Merge made by the 'ort' strategy.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 54 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+	EOF
 
-expecting success of 6438.55 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Merge made by the 'ort' strategy.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t6438-submodule-directory-file-conflicts/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 55 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+ok 21 - --for-status
 
-expecting success of 6438.56 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: The following untracked working tree files would be overwritten by merge:
-	sub1
-Please move or remove them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 56 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+expecting success of 7401.22 'fail when using --files together with --cached': 
+	test_must_fail git submodule summary --files --cached
 
-# still have 8 known breakage(s)
-# passed all remaining 48 test(s)
-1..56
+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.45.2/t/trash directory.t7401-submodule-summary/xyzzy/.git/
+ok 23 - should not fail in an empty repo
+
+# passed all 23 test(s)
+1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7409-submodule-detached-work-tree.sh ***
-expecting success of 7409.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
+*** t7403-submodule-sync.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/.git/
+expecting success of 7403.1 'setup': 
+	git config --global protocol.file.allow always &&
 
-expecting success of 7409.2 'submodule on detached working tree': 
-	git init --bare remote &&
-	test_create_repo bundle1 &&
+	echo file >file &&
+	git add file &&
+	test_tick &&
+	git commit -m upstream &&
+	git clone . super &&
+	git clone super submodule &&
 	(
-		cd bundle1 &&
-		test_commit "shoot" &&
-		git rev-parse --verify HEAD >../expect
+		cd submodule &&
+		git submodule add ../submodule sub-submodule &&
+		test_tick &&
+		git commit -m "sub-submodule"
 	) &&
-	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
+		cd super &&
+		git submodule add ../submodule submodule &&
+		test_tick &&
+		git commit -m "submodule"
 	) &&
-	mkdir home2 &&
+	git clone super super-clone &&
 	(
-		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
-		)
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/remote/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/bundle1/.git/
-[main (root-commit) d074fcf] shoot
+[main (root-commit) 0c90624] upstream
  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.
+ create mode 100644 file
+Cloning into 'super'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/.vim/bundle/sogood'...
+Cloning into 'submodule'...
 done.
-[main (root-commit) 2f89248] sogood
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/submodule/sub-submodule'...
+done.
+[main 5a446ba] sub-submodule
  Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+)
+ 2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 .vim/bundle/sogood
- create mode 100644 sogood.t
-To /build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/../remote
- * [new branch]      main -> main
-Cloning into bare repository '.dotfiles'...
+ create mode 160000 sub-submodule
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/super/submodule'...
 done.
-Already on 'main'
-Submodule '.vim/bundle/sogood' (/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home2/.vim/bundle/sogood'...
+[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 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.45.2/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
+Submodule 'submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/super-clone/submodule'...
 done.
-Already on 'main'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home3/.vim/bundle/dupe'...
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/super-clone/submodule/sub-submodule'...
 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.45.2/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
-   2f89248..e996493  main -> main
-From /build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/../remote
- * branch            HEAD       -> FETCH_HEAD
-Updating 2f89248..e996493
-Fast-forward
- .gitmodules      | 3 +++
- .vim/bundle/dupe | 1 +
- dupe.t           | 1 +
- 3 files changed, 5 insertions(+)
- create mode 160000 .vim/bundle/dupe
- create mode 100644 dupe.t
-Submodule '.vim/bundle/dupe' (/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/.vim/bundle/dupe'...
+Submodule path 'submodule/sub-submodule': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Cloning into 'empty-clone'...
 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7411-submodule-config.sh ***
-expecting success of 7411.1 'setup': 
-	git config --global protocol.file.allow always
-
+Submodule 'submodule' (/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/relative-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/recursive-clone/submodule'...
+done.
+Submodule path 'submodule': checked out '5a446ba52b7cd49fd2fdd854f363e71780faa9a8'
+Submodule 'sub-submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7403-submodule-sync/submodule) registered for path 'submodule/sub-submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/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 7411.2 'submodule config cache setup': 
-	mkdir submodule &&
-	(cd submodule &&
-		git init &&
-		echo a >a &&
-		git add . &&
-		git commit -ma
-	) &&
-	mkdir super &&
-	(cd super &&
-		git init &&
-		git submodule add ../submodule &&
-		git submodule add ../submodule a &&
-		git commit -m "add as submodule and as a" &&
-		git mv a b &&
-		git commit -m "move a to b"
+expecting success of 7403.2 'change submodule': 
+	(
+		cd submodule &&
+		echo second line >>file &&
+		test_tick &&
+		git commit -a -m "change submodule"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/submodule/.git/
-[master (root-commit) 7bdc13c] a
+[main c61fc01] change submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 a
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/super/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/super/submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/super/a'...
-done.
-[master (root-commit) 27cd28d] add as submodule and as a
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 a
- create mode 160000 submodule
-[master c15eddb] move a to b
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename a => b (100%)
-ok 2 - submodule config cache setup
+ok 2 - change submodule
 
-expecting success of 7411.3 'configuration parsing with error': 
-	test_when_finished "rm -rf repo" &&
-	test_create_repo repo &&
-	cat >repo/.gitmodules <<-\EOF &&
-	[submodule "s"]
-		path
-		ignore
-	EOF
+expecting success of 7403.3 'change submodule url': 
 	(
-		cd repo &&
-		test_must_fail test-tool submodule-config "" s 2>actual &&
-		test_grep "bad config" actual
+		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
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/repo/.git/
-fatal: bad config line 2 in file /build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/repo/.gitmodules
-ok 3 - configuration parsing with error
+Already on 'main'
+Your branch is up to date with 'origin/main'.
+From /build/reproducible-path/git-2.45.2/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 7411.4 'test parsing and lookup of submodule config by path': 
-	(cd super &&
-		test-tool submodule-config \
-			HEAD^ a \
-			HEAD b \
-			HEAD^ submodule \
-			HEAD submodule \
-				>actual &&
-		test_cmp expect actual
+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)"
 	)
 
-ok 4 - test parsing and lookup of submodule config by path
+From /build/reproducible-path/git-2.45.2/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.45.2/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 7411.5 'test parsing and lookup of submodule config by name': 
-	(cd super &&
-		test-tool submodule-config --name \
-			HEAD^ a \
-			HEAD a \
-			HEAD^ submodule \
-			HEAD submodule \
-				>actual &&
-		test_cmp expect actual
+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
 	)
 
-ok 5 - test parsing and lookup of submodule config by name
+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.45.2/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 7411.6 'error in history of one submodule config lets continue, stderr message contains blob ref': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		cp .gitmodules .gitmodules.bak &&
-		echo "	value = \"" >>.gitmodules &&
-		git add .gitmodules &&
-		mv .gitmodules.bak .gitmodules &&
-		git commit -m "add error" &&
-		sha1=$(git rev-parse HEAD) &&
-		test-tool submodule-config \
-			HEAD b \
-			HEAD submodule \
-				>actual \
-				2>actual_stderr &&
-		test_cmp expect_error actual &&
-		test_grep "submodule-blob $sha1:.gitmodules" actual_stderr >/dev/null
-	)
+expecting success of 7403.6 'reset submodule URLs': 
+	reset_submodule_urls super-clone
 
-[master a5e5db0] add error
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at c15eddb move a to b
-ok 6 - error in history of one submodule config lets continue, stderr message contains blob ref
+ok 6 - reset submodule URLs
 
-expecting success of 7411.7 'using different treeishs works': 
+expecting success of 7403.7 '"git submodule sync" should update submodule URLs - subdirectory': 
 	(
-		cd super &&
-		git tag new_tag &&
-		tree=$(git rev-parse HEAD^{tree}) &&
-		commit=$(git rev-parse HEAD^{commit}) &&
-		test-tool submodule-config $commit b >expect &&
-		test-tool submodule-config $tree b >actual.1 &&
-		test-tool submodule-config new_tag b >actual.2 &&
-		test_cmp expect actual.1 &&
-		test_cmp expect actual.2
+		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)"
 	)
 
-ok 7 - using different treeishs works
+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 7411.8 'error in history in fetchrecursesubmodule lets continue': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		git config -f .gitmodules \
-			submodule.submodule.fetchrecursesubmodules blabla &&
-		git add .gitmodules &&
-		git config --unset -f .gitmodules \
-			submodule.submodule.fetchrecursesubmodules &&
-		git commit -m "add error in fetchrecursesubmodules" &&
-		test-tool submodule-config \
-			HEAD b \
-			HEAD submodule \
-				>actual &&
-		test_cmp expect_error actual
+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
 	)
 
-[master ea57126] add error in fetchrecursesubmodules
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-HEAD is now at c15eddb move a to b
-ok 8 - error in history in fetchrecursesubmodule lets continue
+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 7411.9 'reading submodules config from the working tree': 
-	(cd super &&
-		echo "../submodule" >expect &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
+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)"
 	)
 
-ok 9 - reading submodules config from the working tree
+From /build/reproducible-path/git-2.45.2/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 7411.10 'unsetting submodules config from the working tree': 
-	(cd super &&
-		test-tool submodule config-unset submodule.submodule.url &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_must_be_empty actual
+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)"
 	)
 
-ok 10 - unsetting submodules config from the working tree
+From /build/reproducible-path/git-2.45.2/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 7411.11 'writing submodules config': 
-	(cd super &&
-		echo "new_url" >expect &&
-		test-tool submodule config-set submodule.submodule.url "new_url" &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
+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"
+		)
 	)
 
-ok 11 - writing submodules config
+Synchronizing submodule url for 'submodule'
+ok 11 - "git submodule sync" handles origin URL of the form foo
 
-expecting success of 7411.12 'overwriting unstaged submodules config': 
-	test_when_finished "git -C super checkout .gitmodules" &&
-	(cd super &&
-		echo "newer_url" >expect &&
-		test-tool submodule config-set submodule.submodule.url "newer_url" &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
+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"
+		)
 	)
 
-Updated 1 path from the index
-ok 12 - overwriting unstaged submodules config
-
-expecting success of 7411.13 'writeable .gitmodules when it is in the working tree': 
-	test-tool -C super submodule config-writeable
-
-ok 13 - writeable .gitmodules when it is in the working tree
+Synchronizing submodule url for 'submodule'
+ok 12 - "git submodule sync" handles origin URL of the form foo/bar
 
-expecting success of 7411.14 'writeable .gitmodules when it is nowhere in the repository': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		git rm .gitmodules &&
-		git commit -m "remove .gitmodules from the current branch" &&
-		test-tool submodule config-writeable
+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"
+		)
 	)
 
-rm '.gitmodules'
-[master d504b72] remove .gitmodules from the current branch
- Author: A U Thor <author@example.com>
- 1 file changed, 6 deletions(-)
- delete mode 100644 .gitmodules
-HEAD is now at c15eddb move a to b
-ok 14 - writeable .gitmodules when it is nowhere in the repository
+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 7411.15 'non-writeable .gitmodules when it is in the index but not in the working tree': 
-	test_when_finished "git -C super checkout .gitmodules" &&
-	(cd super &&
-		rm -f .gitmodules &&
-		test_must_fail test-tool submodule config-writeable
+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"
+		)
 	)
 
-Updated 1 path from the index
-ok 15 - non-writeable .gitmodules when it is in the index but not in the working tree
+Synchronizing submodule url for 'submodule'
+ok 14 - "git submodule sync" handles origin URL of the form ./foo
 
-expecting success of 7411.16 'non-writeable .gitmodules when it is in the current branch but not in the index': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		git rm .gitmodules &&
-		test_must_fail test-tool submodule config-writeable
+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"
+		)
 	)
 
-rm '.gitmodules'
-HEAD is now at c15eddb move a to b
-ok 16 - non-writeable .gitmodules when it is in the current branch but not in the index
+Synchronizing submodule url for 'submodule'
+ok 15 - "git submodule sync" handles origin URL of the form ./foo/bar
 
-expecting success of 7411.17 'reading submodules config from the index when .gitmodules is not in the working tree': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		test-tool submodule config-set submodule.submodule.url "staged_url" &&
-		git add .gitmodules &&
-		rm -f .gitmodules &&
-		echo "staged_url" >expect &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
+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"
+		)
 	)
 
-HEAD is now at c15eddb move a to b
-ok 17 - reading submodules config from the index when .gitmodules is not in the working tree
+Synchronizing submodule url for 'submodule'
+ok 16 - "git submodule sync" handles origin URL of the form ../foo
 
-expecting success of 7411.18 'reading submodules config from the current branch when .gitmodules is not in the index': 
-	ORIG=$(git -C super rev-parse HEAD) &&
-	test_when_finished "git -C super reset --hard $ORIG" &&
-	(cd super &&
-		git rm .gitmodules &&
-		echo "../submodule" >expect &&
-		test-tool submodule config-list submodule.submodule.url >actual &&
-		test_cmp expect actual
+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"
+		)
 	)
 
-rm '.gitmodules'
-HEAD is now at c15eddb move a to b
-ok 18 - reading submodules config from the current branch when .gitmodules is not in the index
+Synchronizing submodule url for 'submodule'
+ok 17 - "git submodule sync" handles origin URL of the form ../foo/bar
 
-expecting success of 7411.19 'reading nested submodules config': 
-	(cd super &&
-		git init submodule/nested_submodule &&
-		echo "a" >submodule/nested_submodule/a &&
-		git -C submodule/nested_submodule add a &&
-		git -C submodule/nested_submodule commit -m "add a" &&
-		git -C submodule submodule add ./nested_submodule &&
-		git -C submodule add nested_submodule &&
-		git -C submodule commit -m "added nested_submodule" &&
-		git add submodule &&
-		git commit -m "updated submodule" &&
-		echo "./nested_submodule" >expect &&
-		test-tool submodule-nested-repo-config \
-			submodule submodule.nested_submodule.url >actual &&
-		test_cmp expect actual
+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.45.2/t/trash directory.t7411-submodule-config/super/submodule/nested_submodule/.git/
-[master (root-commit) 925677c] add a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 a
-Adding existing repo at 'nested_submodule' to the index
-[master 62f7fd8] added nested_submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested_submodule
-[master c00b231] updated submodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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, 1 insertion(+), 1 deletion(-)
-ok 19 - reading nested submodules config
-
-expecting success of 7411.20 'reading nested submodules config when .gitmodules is not in the working tree': 
-	test_when_finished "git -C super/submodule checkout .gitmodules" &&
-	(cd super &&
-		echo "./nested_submodule" >expect &&
-		rm submodule/.gitmodules &&
-		test-tool submodule-nested-repo-config \
-			submodule submodule.nested_submodule.url >actual 2>warning &&
-		test_must_be_empty warning &&
-		test_cmp expect actual
-	)
-
-Updated 1 path from the index
-ok 20 - reading nested submodules config when .gitmodules is not in the working tree
+ 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 20 test(s)
-1..20
+# passed all 18 test(s)
+1..18
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7408-submodule-reference.sh ***
@@ -453880,1108 +452830,454 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7412-submodule-absorbgitdirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/.git/
-expecting success of 7412.1 'setup a real submodule': 
-	cwd="$(pwd)" &&
-	git init sub1 &&
-	test_commit -C sub1 first &&
-	git submodule add ./sub1 &&
-	test_tick &&
-	git commit -m superproject
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1/.git/
-[master (root-commit) 50e526b] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Adding existing repo at 'sub1' to the index
-[master (root-commit) 807c578] superproject
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
-ok 1 - setup a real submodule
-
-expecting success of 7412.2 'absorb the git dir': 
-	>expect &&
-	>actual &&
-	>expect.1 &&
-	>expect.2 &&
-	>actual.1 &&
-	>actual.2 &&
-	git status >expect.1 &&
-	git -C sub1 rev-parse HEAD >expect.2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub1' from
-	'$cwd/sub1/.git' to
-	'$cwd/.git/modules/sub1'
-	EOF
-	git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	git fsck &&
-	test -f sub1/.git &&
-	test -d .git/modules/sub1 &&
-	git status >actual.1 &&
-	git -C sub1 rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
-
-ok 2 - absorb the git dir
-
-expecting success of 7412.3 'absorbing does not fail for deinitialized submodules': 
-	test_when_finished "git submodule update --init" &&
-	git submodule deinit --all &&
-	git submodule absorbgitdirs 2>err &&
-	test_must_be_empty err &&
-	test -d .git/modules/sub1 &&
-	test -d sub1 &&
-	! test -e sub1/.git
+*** t7409-submodule-detached-work-tree.sh ***
+expecting success of 7409.1 'setup': 
+	git config --global protocol.file.allow always
 
-Cleared directory 'sub1'
-Submodule 'sub1' (./sub1) unregistered for path 'sub1'
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1) registered for path 'sub1'
-Submodule path 'sub1': checked out '50e526bb426771f6036ad3a8b0c81d511d91fc2a'
-ok 3 - absorbing does not fail for deinitialized submodules
+ok 1 - setup
 
-expecting success of 7412.4 'setup nested submodule': 
-	git init sub1/nested &&
-	test_commit -C sub1/nested first_nested &&
-	git -C sub1 submodule add ./nested &&
-	test_tick &&
-	git -C sub1 commit -m "add nested" &&
-	git add sub1 &&
-	git commit -m "sub1 to include nested submodule"
+expecting success of 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.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1/nested/.git/
-[master (root-commit) 2139925] first_nested
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/remote/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/bundle1/.git/
+[main (root-commit) d074fcf] shoot
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 first_nested.t
-Adding existing repo at 'nested' to the index
-[detached HEAD 838ca49] add nested
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 nested
-[master 4a7bb23] sub1 to include nested submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - setup nested submodule
-
-expecting success of 7412.5 'absorb the git dir in a nested submodule': 
-	git status >expect.1 &&
-	git -C sub1/nested rev-parse HEAD >expect.2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub1/nested' from
-	'$cwd/sub1/nested/.git' to
-	'$cwd/.git/modules/sub1/modules/nested'
-	EOF
-	git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	test -f sub1/nested/.git &&
-	test -d .git/modules/sub1/modules/nested &&
-	git status >actual.1 &&
-	git -C sub1/nested rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
-
-ok 5 - absorb the git dir in a nested submodule
-
-expecting success of 7412.6 're-setup nested submodule': 
-	# un-absorb the direct submodule, to test if the nested submodule
-	# is still correct (needs a rewrite of the gitfile only)
-	rm -rf sub1/.git &&
-	mv .git/modules/sub1 sub1/.git &&
-	GIT_WORK_TREE=. git -C sub1 config --unset core.worktree &&
-	# fixup the nested submodule
-	echo "gitdir: ../.git/modules/nested" >sub1/nested/.git &&
-	GIT_WORK_TREE=../../../nested git -C sub1/.git/modules/nested config \
-		core.worktree "../../../nested" &&
-	# make sure this re-setup is correct
-	git status --ignore-submodules=none &&
-
-	# also make sure this old setup does not regress
-	git submodule update --init --recursive >out 2>err &&
-	test_must_be_empty out &&
-	test_must_be_empty err
-
-On branch master
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	actual
-	actual.1
-	actual.2
-	err
-	expect
-	expect.1
-	expect.2
-
-nothing added to commit but untracked files present (use "git add" to track)
-ok 6 - re-setup nested submodule
-
-expecting success of 7412.7 'absorb the git dir in a nested submodule': 
-	git status >expect.1 &&
-	git -C sub1/nested rev-parse HEAD >expect.2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub1' from
-	'$cwd/sub1/.git' to
-	'$cwd/.git/modules/sub1'
-	EOF
-	git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	test -f sub1/.git &&
-	test -f sub1/nested/.git &&
-	test -d .git/modules/sub1/modules/nested &&
-	git status >actual.1 &&
-	git -C sub1/nested rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
-
-ok 7 - absorb the git dir in a nested submodule
-
-expecting success of 7412.8 'absorb the git dir outside of primary worktree': 
-	test_when_finished "rm -rf repo-bare.git" &&
-	git clone --bare . repo-bare.git &&
-	test_when_finished "rm -rf repo-wt" &&
-	git -C repo-bare.git worktree add ../repo-wt &&
-
-	test_when_finished "rm -f .gitconfig" &&
-	test_config_global protocol.file.allow always &&
-	git -C repo-wt submodule update --init &&
-	git init repo-wt/sub2 &&
-	test_commit -C repo-wt/sub2 A &&
-	git -C repo-wt submodule add ./sub2 sub2 &&
-	cat >expect <<-EOF &&
-	Migrating git directory of 'sub2' from
-	'$cwd/repo-wt/sub2/.git' to
-	'$cwd/repo-bare.git/worktrees/repo-wt/modules/sub2'
-	EOF
-	git -C repo-wt submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual
-
-Cloning into bare repository 'repo-bare.git'...
+ create mode 100644 shoot.t
+Cloning into bare repository '.dotfiles'...
+warning: You appear to have cloned an empty repository.
 done.
-Preparing worktree (new branch 'repo-wt')
-HEAD is now at 4a7bb23 sub1 to include nested submodule
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/./sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub1'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/.vim/bundle/sogood'...
 done.
-Submodule path 'sub1': checked out '838ca4973c32382bdf90170c18433708c487b6c3'
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub2/.git/
-[master (root-commit) c8e0c53] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Adding existing repo at 'sub2' to the index
-ok 8 - absorb the git dir outside of primary worktree
-
-expecting success of 7412.9 'setup a gitlink with missing .gitmodules entry': 
-	git init sub2 &&
-	test_commit -C sub2 first &&
-	git add sub2 &&
-	git commit -m superproject
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub2/.git/
-[master (root-commit) b9419e0] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-warning: adding embedded git repository: sub2
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sub2
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sub2
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[master 930a24c] superproject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 160000 sub2
-ok 9 - setup a gitlink with missing .gitmodules entry
-
-expecting success of 7412.10 'absorbing the git dir fails for incomplete submodules': 
-	git status >expect.1 &&
-	git -C sub2 rev-parse HEAD >expect.2 &&
-	cat >expect <<-\EOF &&
-	fatal: could not lookup name for submodule 'sub2'
-	EOF
-	test_must_fail git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual &&
-	git -C sub2 fsck &&
-	test -d sub2/.git &&
-	git status >actual &&
-	git -C sub2 rev-parse HEAD >actual.2 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2
-
-ok 10 - absorbing the git dir fails for incomplete submodules
-
-expecting success of 7412.11 'setup a submodule with multiple worktrees': 
-	# first create another unembedded git dir in a new submodule
-	git init sub3 &&
-	test_commit -C sub3 first &&
-	git submodule add ./sub3 &&
-	test_tick &&
-	git commit -m "add another submodule" &&
-	git -C sub3 worktree add ../sub3_second_work_tree
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub3/.git/
-[master (root-commit) dbecd43] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-Adding existing repo at 'sub3' to the index
-[master 54b05d9] add another submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 sub3
-Preparing worktree (new branch 'sub3_second_work_tree')
-HEAD is now at dbecd43 first
-ok 11 - setup a submodule with multiple worktrees
-
-expecting success of 7412.12 'absorbing fails for a submodule with multiple worktrees': 
-	cat >expect <<-\EOF &&
-	fatal: could not lookup name for submodule 'sub2'
-	EOF
-	test_must_fail git submodule absorbgitdirs 2>actual &&
-	test_cmp expect actual
-
-ok 12 - absorbing fails for a submodule with multiple worktrees
-
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7413-submodule-is-active.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/.git/
-expecting success of 7413.1 'setup': 
-	git config --global protocol.file.allow always &&
-	git init sub &&
-	test_commit -C sub initial &&
-	git init super &&
-	test_commit -C super initial &&
-	git -C super submodule add ../sub sub1 &&
-	git -C super submodule add ../sub sub2 &&
-
-	# Remove submodule.<name>.active entries in order to test in an
-	# environment where only URLs are present in the conifg
-	git -C super config --unset submodule.sub1.active &&
-	git -C super config --unset submodule.sub2.active &&
-
-	git -C super commit -a -m "add 2 submodules at sub{1,2}"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/sub/.git/
-[master (root-commit) 24b24cf] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super/.git/
-[master (root-commit) 5e30013] initial
+[main (root-commit) 2f89248] sogood
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super/sub1'...
+ 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.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/../remote
+ * [new branch]      main -> main
+Cloning into bare repository '.dotfiles'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super/sub2'...
+Already on 'main'
+Submodule '.vim/bundle/sogood' (/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home2/../bundle1) registered for path '.vim/bundle/sogood'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home2/.vim/bundle/sogood'...
 done.
-[master b6e0cac] add 2 submodules at sub{1,2}
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub1
- create mode 160000 sub2
-ok 1 - setup
-
-expecting success of 7413.2 'is-active works with urls': 
-	test-tool -C super submodule is-active sub1 &&
-	test-tool -C super submodule is-active sub2 &&
-
-	git -C super config --unset submodule.sub1.URL &&
-	test_must_fail test-tool -C super submodule is-active sub1 &&
-	git -C super config submodule.sub1.URL ../sub &&
-	test-tool -C super submodule is-active sub1
-
-ok 2 - is-active works with urls
-
-expecting success of 7413.3 'is-active works with submodule.<name>.active config': 
-	test_when_finished "git -C super config --unset submodule.sub1.active" &&
-	test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
-
-	git -C super config --bool submodule.sub1.active "false" &&
-	test_must_fail test-tool -C super submodule is-active sub1 &&
-
-	git -C super config --bool submodule.sub1.active "true" &&
-	git -C super config --unset submodule.sub1.URL &&
-	test-tool -C super submodule is-active sub1
-
-ok 3 - is-active works with submodule.<name>.active config
-
-expecting success of 7413.4 'is-active handles submodule.active config missing a value': 
-	cp super/.git/config super/.git/config.orig &&
-	test_when_finished mv super/.git/config.orig super/.git/config &&
-
-	cat >>super/.git/config <<-\EOF &&
-	[submodule]
-		active
-	EOF
-
-	cat >expect <<-\EOF &&
-	error: missing value for 'submodule.active'
-	EOF
-	test-tool -C super submodule is-active sub1 2>actual &&
-	test_cmp expect actual
-
-ok 4 - is-active handles submodule.active config missing a value
-
-expecting success of 7413.5 'is-active works with basic submodule.active config': 
-	test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
-	test_when_finished "git -C super config --unset-all submodule.active" &&
-
-	git -C super config --add submodule.active "." &&
-	git -C super config --unset submodule.sub1.URL &&
-
-	test-tool -C super submodule is-active sub1 &&
-	test-tool -C super submodule is-active sub2
-
-ok 5 - is-active works with basic submodule.active config
-
-expecting success of 7413.6 'is-active correctly works with paths that are not submodules': 
-	test_when_finished "git -C super config --unset-all submodule.active" &&
-
-	test_must_fail test-tool -C super submodule is-active not-a-submodule &&
-
-	git -C super config --add submodule.active "." &&
-	test_must_fail test-tool -C super submodule is-active not-a-submodule
-
-ok 6 - is-active correctly works with paths that are not submodules
-
-expecting success of 7413.7 'is-active works with exclusions in submodule.active config': 
-	test_when_finished "git -C super config --unset-all submodule.active" &&
-
-	git -C super config --add submodule.active "." &&
-	git -C super config --add submodule.active ":(exclude)sub1" &&
-
-	test_must_fail test-tool -C super submodule is-active sub1 &&
-	test-tool -C super submodule is-active sub2
-
-ok 7 - is-active works with exclusions in submodule.active config
-
-expecting success of 7413.8 'is-active with submodule.active and submodule.<name>.active': 
-	test_when_finished "git -C super config --unset-all submodule.active" &&
-	test_when_finished "git -C super config --unset submodule.sub1.active" &&
-	test_when_finished "git -C super config --unset submodule.sub2.active" &&
-
-	git -C super config --add submodule.active "sub1" &&
-	git -C super config --bool submodule.sub1.active "false" &&
-	git -C super config --bool submodule.sub2.active "true" &&
-
-	test_must_fail test-tool -C super submodule is-active sub1 &&
-	test-tool -C super submodule is-active sub2
-
-ok 8 - is-active with submodule.active and submodule.<name>.active
-
-expecting success of 7413.9 'is-active, submodule.active and submodule add': 
-	test_when_finished "rm -rf super2" &&
-	git init super2 &&
-	test_commit -C super2 initial &&
-	git -C super2 config --add submodule.active "sub*" &&
-
-	# submodule add should only add submodule.<name>.active
-	# to the config if not matched by the pathspec
-	git -C super2 submodule add ../sub sub1 &&
-	test_must_fail git -C super2 config --get submodule.sub1.active &&
+Submodule path '.vim/bundle/sogood': checked out 'd074fcf17f7c15e9e139fe2d6e7ca796a5e616e7'
+ok 2 - submodule on detached working tree
 
-	git -C super2 submodule add ../sub mod &&
-	git -C super2 config --get submodule.mod.active
+expecting success of 7409.3 'submodule on detached working pointed by core.worktree': 
+	mkdir home3 &&
+	(
+		cd home3 &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_DIR &&
+		git clone --bare ../remote "$GIT_DIR" &&
+		git config core.bare false &&
+		git config core.worktree .. &&
+		git checkout main &&
+		git submodule add ../bundle1 .vim/bundle/dupe &&
+		test_commit "dupe" &&
+		git push origin main
+	) &&
+	(
+		cd home &&
+		GIT_DIR="$(pwd)/.dotfiles" &&
+		export GIT_DIR &&
+		git config core.bare false &&
+		git config core.worktree .. &&
+		git pull &&
+		git submodule update --init &&
+		test -f .vim/bundle/dupe/shoot.t
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super2/.git/
-[master (root-commit) d39e3de] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super2/sub1'...
+Cloning into bare repository '/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home3/.dotfiles'...
 done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super2/mod'...
+Already on 'main'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home3/.vim/bundle/dupe'...
 done.
-true
-ok 9 - is-active, submodule.active and submodule add
-
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7414-submodule-mistakes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7414-submodule-mistakes/.git/
-expecting success of 7414.1 'create embedded repository': 
-	git init embed &&
-	test_commit -C embed one
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7414-submodule-mistakes/embed/.git/
-[master (root-commit) d79ce16] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-ok 1 - create embedded repository
-
-expecting success of 7414.2 'git-add on embedded repository warns': 
-	test_when_finished "git rm --cached -f embed" &&
-	git add embed 2>stderr &&
-	test_grep warning stderr
-
-warning: adding embedded git repository: embed
-rm 'embed'
-ok 2 - git-add on embedded repository warns
-
-expecting success of 7414.3 '--no-warn-embedded-repo suppresses warning': 
-	test_when_finished "git rm --cached -f embed" &&
-	git add --no-warn-embedded-repo embed 2>stderr &&
-	test_grep ! warning stderr
-
-rm 'embed'
-ok 3 - --no-warn-embedded-repo suppresses warning
-
-expecting success of 7414.4 'no warning when updating entry': 
-	test_when_finished "git rm --cached -f embed" &&
-	git add embed &&
-	git -C embed commit --allow-empty -m two &&
-	git add embed 2>stderr &&
-	test_grep ! warning stderr
-
-warning: adding embedded git repository: embed
-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> embed
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached embed
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-[master b0129aa] two
- Author: A U Thor <author@example.com>
-rm 'embed'
-ok 4 - no warning when updating entry
-
-expecting success of 7414.5 'submodule add does not warn': 
-	test_when_finished "git rm -rf submodule .gitmodules" &&
-	git -c protocol.file.allow=always \
-		submodule add ./embed submodule 2>stderr &&
-	test_grep ! warning stderr
-
-rm '.gitmodules'
-rm 'submodule'
-ok 5 - submodule add does not warn
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7417-submodule-path-url.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7417-submodule-path-url/.git/
-expecting success of 7417.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7417.2 'create submodule with dash in path': 
-	git init upstream &&
-	git -C upstream commit --allow-empty -m base &&
-	git submodule add ./upstream sub &&
-	git mv sub ./-sub &&
-	git commit -m submodule
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7417-submodule-path-url/upstream/.git/
-[main (root-commit) a4b5938] base
+[main e996493] dupe
  Author: A U Thor <author@example.com>
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7417-submodule-path-url/sub'...
+ 3 files changed, 5 insertions(+)
+ create mode 160000 .vim/bundle/dupe
+ create mode 100644 dupe.t
+To /build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home3/../remote
+   2f89248..e996493  main -> main
+From /build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/../remote
+ * branch            HEAD       -> FETCH_HEAD
+Updating 2f89248..e996493
+Fast-forward
+ .gitmodules      | 3 +++
+ .vim/bundle/dupe | 1 +
+ dupe.t           | 1 +
+ 3 files changed, 5 insertions(+)
+ create mode 160000 .vim/bundle/dupe
+ create mode 100644 dupe.t
+Submodule '.vim/bundle/dupe' (/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/../bundle1) registered for path '.vim/bundle/dupe'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7409-submodule-detached-work-tree/home/.vim/bundle/dupe'...
 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.45.2/t/trash directory.t7417-submodule-path-url/dst/
-remote: error: object 7e03af04dae731f9aa8e2febaf8b530bdafd3aa1: gitmodulesPath: disallowed submodule path: -sub        
-ok 4 - fsck rejects unprotected dash
-
-ok 5 # skip submodule paths disallows trailing spaces (missing MINGW)
+Submodule path '.vim/bundle/dupe': checked out 'd074fcf17f7c15e9e139fe2d6e7ca796a5e616e7'
+ok 3 - submodule on detached working pointed by core.worktree
 
-# passed all 5 test(s)
-1..5
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7418-submodule-sparse-gitmodules.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7418-submodule-sparse-gitmodules/.git/
-expecting success of 7418.1 'setup': 
+*** t7411-submodule-config.sh ***
+expecting success of 7411.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 &&
+expecting success of 7411.2 'submodule config cache setup': 
+	mkdir 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 init &&
+		echo a >a &&
+		git add . &&
+		git commit -ma
 	) &&
-	git clone --template= upstream super &&
+	mkdir 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
+		git init &&
+		git submodule add ../submodule &&
+		git submodule add ../submodule a &&
+		git commit -m "add as submodule and as a" &&
+		git mv a b &&
+		git commit -m "move a to b"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7418-submodule-sparse-gitmodules/submodule/.git/
-[master (root-commit) a939200] Add file
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/submodule/.git/
+[master (root-commit) 7bdc13c] a
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/submodule'...
+ create mode 100644 a
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/super/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/super/submodule'...
 done.
-[master (root-commit) caa93e1] Add submodule
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/super/a'...
+done.
+[master (root-commit) 27cd28d] add as submodule and as a
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
+ 3 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
+ create mode 160000 a
  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
+[master c15eddb] move a to b
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename a => b (100%)
+ok 2 - submodule config cache setup
 
-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 7411.3 'configuration parsing with error': 
+	test_when_finished "rm -rf repo" &&
+	test_create_repo repo &&
+	cat >repo/.gitmodules <<-\EOF &&
+	[submodule "s"]
+		path
+		ignore
+	EOF
+	(
+		cd repo &&
+		test_must_fail test-tool submodule-config "" s 2>actual &&
+		test_grep "bad config" actual
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/repo/.git/
+fatal: bad config line 2 in file /build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/repo/.gitmodules
+ok 3 - configuration parsing with error
 
-Submodule 'submodule' (/build/reproducible-path/git-2.45.2/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 7411.4 'test parsing and lookup of submodule config by path': 
+	(cd super &&
+		test-tool submodule-config \
+			HEAD^ a \
+			HEAD b \
+			HEAD^ submodule \
+			HEAD submodule \
+				>actual &&
+		test_cmp expect actual
+	)
 
-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
+ok 4 - test parsing and lookup of submodule config by path
 
-Cloning into '/build/reproducible-path/git-2.45.2/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 7411.5 'test parsing and lookup of submodule config by name': 
+	(cd super &&
+		test-tool submodule-config --name \
+			HEAD^ a \
+			HEAD a \
+			HEAD^ submodule \
+			HEAD submodule \
+				>actual &&
+		test_cmp expect actual
+	)
 
-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
+ok 5 - test parsing and lookup of submodule config by name
 
-	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
+expecting success of 7411.6 'error in history of one submodule config lets continue, stderr message contains blob ref': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		cp .gitmodules .gitmodules.bak &&
+		echo "	value = \"" >>.gitmodules &&
+		git add .gitmodules &&
+		mv .gitmodules.bak .gitmodules &&
+		git commit -m "add error" &&
+		sha1=$(git rev-parse HEAD) &&
+		test-tool submodule-config \
+			HEAD b \
+			HEAD submodule \
+				>actual \
+				2>actual_stderr &&
+		test_cmp expect_error actual &&
+		test_grep "submodule-blob $sha1:.gitmodules" actual_stderr >/dev/null
+	)
 
-[master 83d36b8] Add file2 to submodule
+[master a5e5db0] add error
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file2
-From /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
-   caa93e1..5ae4276  master     -> origin/master
-Fetching submodule submodule
-From /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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
+HEAD is now at c15eddb move a to b
+ok 6 - error in history of one submodule config lets continue, stderr message contains blob ref
 
-# passed all 9 test(s)
-1..9
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7416-submodule-dash-url.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/.git/
-expecting success of 7416.1 'setup': 
-	git config --global protocol.file.allow always
+expecting success of 7411.7 'using different treeishs works': 
+	(
+		cd super &&
+		git tag new_tag &&
+		tree=$(git rev-parse HEAD^{tree}) &&
+		commit=$(git rev-parse HEAD^{commit}) &&
+		test-tool submodule-config $commit b >expect &&
+		test-tool submodule-config $tree b >actual.1 &&
+		test-tool submodule-config new_tag b >actual.2 &&
+		test_cmp expect actual.1 &&
+		test_cmp expect actual.2
+	)
 
-ok 1 - setup
+ok 7 - using different treeishs works
 
-expecting success of 7416.2 'create submodule with protected dash in url': 
-	git init upstream &&
-	git -C upstream commit --allow-empty -m base &&
-	mv upstream ./-upstream &&
-	git submodule add ./-upstream sub &&
-	git add sub .gitmodules &&
-	git commit -m submodule
+expecting success of 7411.8 'error in history in fetchrecursesubmodule lets continue': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		git config -f .gitmodules \
+			submodule.submodule.fetchrecursesubmodules blabla &&
+		git add .gitmodules &&
+		git config --unset -f .gitmodules \
+			submodule.submodule.fetchrecursesubmodules &&
+		git commit -m "add error in fetchrecursesubmodules" &&
+		test-tool submodule-config \
+			HEAD b \
+			HEAD submodule \
+				>actual &&
+		test_cmp expect_error actual
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/upstream/.git/
-[master (root-commit) a4b5938] base
- Author: A U Thor <author@example.com>
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/sub'...
-done.
-[master (root-commit) a5de7d8] submodule
+[master ea57126] add error in fetchrecursesubmodules
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 2 - create submodule with protected dash in url
-
-expecting success of 7416.3 'clone can recurse submodule': 
-	test_when_finished "rm -rf dst" &&
-	git clone --recurse-submodules . dst &&
-	echo base >expect &&
-	git -C dst/sub log -1 --format=%s >actual &&
-	test_cmp expect actual
-
-Cloning into 'dst'...
-done.
-Submodule 'sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/./-upstream) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/sub'...
-done.
-Submodule path 'sub': checked out 'a4b5938bdb0638bd7b0fd149a017cda4db88b551'
-ok 3 - clone can recurse submodule
-
-expecting success of 7416.4 'fsck accepts protected dash': 
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	git push dst HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-To dst
- * [new branch]      HEAD -> master
-ok 4 - fsck accepts protected dash
+ 1 file changed, 1 insertion(+)
+HEAD is now at c15eddb move a to b
+ok 8 - error in history in fetchrecursesubmodule lets continue
 
-expecting success of 7416.5 'remove ./ protection from .gitmodules url': 
-	perl -i -pe "s{\./}{}" .gitmodules &&
-	git commit -am "drop protection"
+expecting success of 7411.9 'reading submodules config from the working tree': 
+	(cd super &&
+		echo "../submodule" >expect &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
 
-[master 6caf163] drop protection
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - remove ./ protection from .gitmodules url
+ok 9 - reading submodules config from the working tree
 
-expecting success of 7416.6 'clone rejects unprotected dash': 
-	test_when_finished "rm -rf dst" &&
-	test_must_fail git clone --recurse-submodules . dst 2>err &&
-	test_grep ignoring err
+expecting success of 7411.10 'unsetting submodules config from the working tree': 
+	(cd super &&
+		test-tool submodule config-unset submodule.submodule.url &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_must_be_empty actual
+	)
 
-warning: ignoring 'submodule.sub.url' which may be interpreted as a command-line option: -upstream
-ok 6 - clone rejects unprotected dash
+ok 10 - unsetting submodules config from the working tree
 
-expecting success of 7416.7 'fsck rejects unprotected dash': 
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7411.11 'writing submodules config': 
+	(cd super &&
+		echo "new_url" >expect &&
+		test-tool submodule config-set submodule.submodule.url "new_url" &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 3203a2d7fb3e9335b43e66a0c95b96887ed3670f: gitmodulesUrl: disallowed submodule url: -upstream        
-ok 7 - fsck rejects unprotected dash
+ok 11 - writing submodules config
 
-expecting success of 7416.8 'trailing backslash is handled correctly': 
-	git init testmodule &&
-	test_commit -C testmodule c &&
-	git submodule add ./testmodule &&
-	: ensure that the name ends in a double backslash &&
-	sed -e "s|\\(submodule \"testmodule\\)\"|\\1\\\\\\\\\"|" \
-		-e "s|url = .*|url = \" --should-not-be-an-option\"|" \
-		<.gitmodules >.new &&
-	mv .new .gitmodules &&
-	git commit -am "Add testmodule" &&
-	test_must_fail git clone --verbose --recurse-submodules . dolly 2>err &&
-	test_grep ! "unknown option" err
+expecting success of 7411.12 'overwriting unstaged submodules config': 
+	test_when_finished "git -C super checkout .gitmodules" &&
+	(cd super &&
+		echo "newer_url" >expect &&
+		test-tool submodule config-set submodule.submodule.url "newer_url" &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/testmodule/.git/
-[master (root-commit) ea1ac38] c
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c.t
-Adding existing repo at 'testmodule' to the index
-[master 8635531] Add testmodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+), 1 deletion(-)
- create mode 160000 testmodule
-ok 8 - trailing backslash is handled correctly
+Updated 1 path from the index
+ok 12 - overwriting unstaged submodules config
 
-expecting success of 7416.9 'fsck rejects missing URL scheme': 
-	git checkout --orphan missing-scheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = http::one.example.com/foo.git
-	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "gitmodules with missing URL scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7411.13 'writeable .gitmodules when it is in the working tree': 
+	test-tool -C super submodule config-writeable
 
-Switched to a new branch 'missing-scheme'
-[missing-scheme (root-commit) 43f6d1d] gitmodules with missing URL scheme
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 1b0034738c4ff76356b39245a20e6e3db27b9f16: gitmodulesUrl: disallowed submodule url: http::one.example.com/foo.git        
-ok 9 - fsck rejects missing URL scheme
+ok 13 - writeable .gitmodules when it is in the working tree
 
-expecting success of 7416.10 'fsck rejects relative URL resolving to missing scheme': 
-	git checkout --orphan relative-missing-scheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = "..\\../.\\../:one.example.com/foo.git"
-	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "gitmodules with relative URL that strips off scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7411.14 'writeable .gitmodules when it is nowhere in the repository': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		git rm .gitmodules &&
+		git commit -m "remove .gitmodules from the current branch" &&
+		test-tool submodule config-writeable
+	)
 
-Switched to a new branch 'relative-missing-scheme'
-[relative-missing-scheme (root-commit) ae93fe4] gitmodules with relative URL that strips off scheme
+rm '.gitmodules'
+[master d504b72] remove .gitmodules from the current branch
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 7994991dc5ea69078db13d6a6fe8ebdb9095f4f6: gitmodulesUrl: disallowed submodule url: ..\../.\../:one.example.com/foo.git        
-ok 10 - fsck rejects relative URL resolving to missing scheme
+ 1 file changed, 6 deletions(-)
+ delete mode 100644 .gitmodules
+HEAD is now at c15eddb move a to b
+ok 14 - writeable .gitmodules when it is nowhere in the repository
 
-expecting success of 7416.11 'fsck rejects empty URL scheme': 
-	git checkout --orphan empty-scheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = http::://one.example.com/foo.git
-	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "gitmodules with empty URL scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7411.15 'non-writeable .gitmodules when it is in the index but not in the working tree': 
+	test_when_finished "git -C super checkout .gitmodules" &&
+	(cd super &&
+		rm -f .gitmodules &&
+		test_must_fail test-tool submodule config-writeable
+	)
 
-Switched to a new branch 'empty-scheme'
-[empty-scheme (root-commit) 4daaf62] gitmodules with empty URL scheme
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 606181337c1ac6c1464989eddb68e626ebd5cebb: gitmodulesUrl: disallowed submodule url: http::://one.example.com/foo.git        
-ok 11 - fsck rejects empty URL scheme
+Updated 1 path from the index
+ok 15 - non-writeable .gitmodules when it is in the index but not in the working tree
 
-expecting success of 7416.12 'fsck rejects relative URL resolving to empty scheme': 
-	git checkout --orphan relative-empty-scheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = ../../../:://one.example.com/foo.git
-	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "relative gitmodules URL resolving to empty scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7411.16 'non-writeable .gitmodules when it is in the current branch but not in the index': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		git rm .gitmodules &&
+		test_must_fail test-tool submodule config-writeable
+	)
 
-Switched to a new branch 'relative-empty-scheme'
-[relative-empty-scheme (root-commit) 266aaa0] relative gitmodules URL resolving to empty scheme
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 6e731804bddde8189151d1e3afed752027c01894: gitmodulesUrl: disallowed submodule url: ../../../:://one.example.com/foo.git        
-ok 12 - fsck rejects relative URL resolving to empty scheme
+rm '.gitmodules'
+HEAD is now at c15eddb move a to b
+ok 16 - non-writeable .gitmodules when it is in the current branch but not in the index
 
-expecting success of 7416.13 'fsck rejects empty hostname': 
-	git checkout --orphan empty-host &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = http:///one.example.com/foo.git
-	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "gitmodules with extra slashes" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7411.17 'reading submodules config from the index when .gitmodules is not in the working tree': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		test-tool submodule config-set submodule.submodule.url "staged_url" &&
+		git add .gitmodules &&
+		rm -f .gitmodules &&
+		echo "staged_url" >expect &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
 
-Switched to a new branch 'empty-host'
-[empty-host (root-commit) bfddfb4] gitmodules with extra slashes
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 86df12e51bea97cc0153a56ca357968b068043bb: gitmodulesUrl: disallowed submodule url: http:///one.example.com/foo.git        
-ok 13 - fsck rejects empty hostname
+HEAD is now at c15eddb move a to b
+ok 17 - reading submodules config from the index when .gitmodules is not in the working tree
 
-expecting success of 7416.14 'fsck rejects relative url that produced empty hostname': 
-	git checkout --orphan messy-relative &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = ../../..//one.example.com/foo.git
-	EOF
-	git add .gitmodules &&
-	test_tick &&
-	git commit -m "gitmodules abusing relative_path" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7411.18 'reading submodules config from the current branch when .gitmodules is not in the index': 
+	ORIG=$(git -C super rev-parse HEAD) &&
+	test_when_finished "git -C super reset --hard $ORIG" &&
+	(cd super &&
+		git rm .gitmodules &&
+		echo "../submodule" >expect &&
+		test-tool submodule config-list submodule.submodule.url >actual &&
+		test_cmp expect actual
+	)
 
-Switched to a new branch 'messy-relative'
-[messy-relative (root-commit) 126d5fa] gitmodules abusing relative_path
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object a2186f87385db0aacec85e7779234576bd406d14: gitmodulesUrl: disallowed submodule url: ../../..//one.example.com/foo.git        
-ok 14 - fsck rejects relative url that produced empty hostname
+rm '.gitmodules'
+HEAD is now at c15eddb move a to b
+ok 18 - reading submodules config from the current branch when .gitmodules is not in the index
 
-expecting success of 7416.15 'fsck permits embedded newline with unrecognized scheme': 
-	git checkout --orphan newscheme &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = "data://acjbkd%0akajfdickajkd"
-	EOF
-	git add .gitmodules &&
-	git commit -m "gitmodules with unrecognized scheme" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	git push dst HEAD
+expecting success of 7411.19 'reading nested submodules config': 
+	(cd super &&
+		git init submodule/nested_submodule &&
+		echo "a" >submodule/nested_submodule/a &&
+		git -C submodule/nested_submodule add a &&
+		git -C submodule/nested_submodule commit -m "add a" &&
+		git -C submodule submodule add ./nested_submodule &&
+		git -C submodule add nested_submodule &&
+		git -C submodule commit -m "added nested_submodule" &&
+		git add submodule &&
+		git commit -m "updated submodule" &&
+		echo "./nested_submodule" >expect &&
+		test-tool submodule-nested-repo-config \
+			submodule submodule.nested_submodule.url >actual &&
+		test_cmp expect actual
+	)
 
-Switched to a new branch 'newscheme'
-[newscheme (root-commit) 75b80fe] gitmodules with unrecognized scheme
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7411-submodule-config/super/submodule/nested_submodule/.git/
+[master (root-commit) 925677c] add a
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-To dst
- * [new branch]      HEAD -> newscheme
-ok 15 - fsck permits embedded newline with unrecognized scheme
-
-expecting success of 7416.16 'fsck rejects embedded newline in url': 
-	# create an orphan branch to avoid existing .gitmodules objects
-	git checkout --orphan newline &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-	url = "https://one.example.com?%0ahost=two.example.com/foo.git"
-	EOF
-	git add .gitmodules &&
-	git commit -m "gitmodules with newline" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
-
-Switched to a new branch 'newline'
-[newline (root-commit) f62dcd9] gitmodules with newline
+ 1 file changed, 1 insertion(+)
+ create mode 100644 a
+Adding existing repo at 'nested_submodule' to the index
+[master 62f7fd8] added nested_submodule
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
+ 2 files changed, 4 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 59d2434e36eff88ddd704683001a17e1074748f7: gitmodulesUrl: disallowed submodule url: https://one.example.com?%0ahost=two.example.com/foo.git        
-ok 16 - fsck rejects embedded newline in url
-
-expecting success of 7416.17 'fsck rejects embedded newline in relative url': 
-	git checkout --orphan relative-newline &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-		url = "./%0ahost=two.example.com/foo.git"
-	EOF
-	git add .gitmodules &&
-	git commit -m "relative url with newline" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
-
-Switched to a new branch 'relative-newline'
-[relative-newline (root-commit) 66a85ea] relative url with newline
+ create mode 160000 nested_submodule
+[master c00b231] updated submodule
  Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 52bc96716641eb10811fc8e92cdfd07547964b6a: gitmodulesUrl: disallowed submodule url: ./%0ahost=two.example.com/foo.git        
-ok 17 - fsck rejects embedded newline in relative url
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - reading nested submodules config
 
-expecting success of 7416.18 'fsck rejects embedded newline in git url': 
-	git checkout --orphan git-newline &&
-	cat >.gitmodules <<-\EOF &&
-	[submodule "foo"]
-	url = "git://example.com:1234/repo%0a.git"
-	EOF
-	git add .gitmodules &&
-	git commit -m "git url with newline" &&
-	test_when_finished "rm -rf dst" &&
-	git init --bare dst &&
-	git -C dst config transfer.fsckObjects true &&
-	test_must_fail git push dst HEAD 2>err &&
-	grep gitmodulesUrl err
+expecting success of 7411.20 'reading nested submodules config when .gitmodules is not in the working tree': 
+	test_when_finished "git -C super/submodule checkout .gitmodules" &&
+	(cd super &&
+		echo "./nested_submodule" >expect &&
+		rm submodule/.gitmodules &&
+		test-tool submodule-nested-repo-config \
+			submodule submodule.nested_submodule.url >actual 2>warning &&
+		test_must_be_empty warning &&
+		test_cmp expect actual
+	)
 
-Switched to a new branch 'git-newline'
-[git-newline (root-commit) a8d2cc3] git url with newline
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
- create mode 160000 testmodule
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
-remote: error: object 9fbab0793cb64859d67bc4949d7feca5341bb05b: gitmodulesUrl: disallowed submodule url: git://example.com:1234/repo%0a.git        
-ok 18 - fsck rejects embedded newline in git url
+Updated 1 path from the index
+ok 20 - reading nested submodules config when .gitmodules is not in the working tree
 
-# passed all 18 test(s)
-1..18
+# passed all 20 test(s)
+1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7407-submodule-foreach.sh ***
@@ -455639,2577 +453935,1586 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7419-submodule-set-branch.sh ***
-expecting success of 7419.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7419.2 'submodule config cache setup': 
-	mkdir submodule &&
-	(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.45.2/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.45.2/t/trash directory.t7419-submodule-set-branch/super/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7419-submodule-set-branch/super/submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7420-submodule-set-url.sh ***
-expecting success of 7420.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7420.2 'submodule config cache setup': 
-	mkdir submodule &&
-	(
-		cd submodule &&
-		git init &&
-		echo a >file &&
-		git add file &&
-		git commit -ma
-	) &&
-	mkdir namedsubmodule &&
-	(
-		cd namedsubmodule &&
-		git init &&
-		echo 1 >file &&
-		git add file &&
-		git commit -m1
-	) &&
-	mkdir super &&
-	(
-		cd super &&
-		git init &&
-		git submodule add ../submodule &&
-		git submodule add --name thename ../namedsubmodule thepath &&
-		git commit -m "add submodules"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/submodule/.git/
-[master (root-commit) 18350fc] a
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/namedsubmodule/.git/
-[master (root-commit) c663a66] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/super/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/super/submodule'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/super/thepath'...
-done.
-[master (root-commit) 7cd7856] add submodules
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
- create mode 160000 thepath
-ok 2 - submodule config cache setup
-
-expecting success of 7420.3 'test submodule set-url': 
-	# add commits and move the submodules (change the urls)
-	(
-		cd submodule &&
-		echo b >>file &&
-		git add file &&
-		git commit -mb
-	) &&
-	mv submodule newsubmodule &&
-
-	(
-		cd namedsubmodule &&
-		echo 2 >>file &&
-		git add file &&
-		git commit -m2
-	) &&
-	mv namedsubmodule newnamedsubmodule &&
-
-	git -C newsubmodule show >expect &&
-	git -C newnamedsubmodule show >>expect &&
-	(
-		cd super &&
-		test_must_fail git submodule update --remote &&
-		git submodule set-url submodule ../newsubmodule &&
-		test_cmp_config ../newsubmodule -f .gitmodules submodule.submodule.url &&
-		git submodule set-url thepath ../newnamedsubmodule &&
-		test_cmp_config ../newnamedsubmodule -f .gitmodules submodule.thename.url &&
-		test_cmp_config "" -f .gitmodules --default "" submodule.thepath.url &&
-		git submodule update --remote
-	) &&
-	git -C super/submodule show >actual &&
-	git -C super/thepath show >>actual &&
-	test_cmp expect actual
-
-[master 8063db2] b
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 35c4e2f] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-fatal: '/build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/submodule' does not appear to be a git repository
-fatal: Could not read from remote repository.
+*** t7413-submodule-is-active.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/.git/
+expecting success of 7413.1 'setup': 
+	git config --global protocol.file.allow always &&
+	git init sub &&
+	test_commit -C sub initial &&
+	git init super &&
+	test_commit -C super initial &&
+	git -C super submodule add ../sub sub1 &&
+	git -C super submodule add ../sub sub2 &&
 
-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.45.2/t/trash directory.t7420-submodule-set-url/newsubmodule
-   18350fc..8063db2  master     -> origin/master
-Submodule path 'submodule': checked out '8063db2e93a425b6bc293b09198d2c4c1480f345'
-From /build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/newnamedsubmodule
-   c663a66..35c4e2f  master     -> origin/master
-Submodule path 'thepath': checked out '35c4e2f484f028248d55b9394adcdfb7266988b7'
-ok 3 - test submodule set-url
+	# Remove submodule.<name>.active entries in order to test in an
+	# environment where only URLs are present in the conifg
+	git -C super config --unset submodule.sub1.active &&
+	git -C super config --unset submodule.sub2.active &&
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7423-submodule-symlinks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/.git/
-expecting success of 7423.1 'prepare': 
-	git config --global protocol.file.allow always &&
-	test_commit initial &&
-	git init upstream &&
-	test_commit -C upstream upstream submodule_file &&
-	git submodule add ./upstream a/sm &&
-	test_tick &&
-	git commit -m submodule
+	git -C super commit -a -m "add 2 submodules at sub{1,2}"
 
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/sub/.git/
 [master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 initial.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/upstream/.git/
-[master (root-commit) 8435948] upstream
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 submodule_file
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/a/sm'...
-done.
-[master e6b5e91] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 a/sm
-ok 1 - prepare
-
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-expecting success of 7423.2 'git submodule update must not create submodule behind symlink': 
-	rm -rf a b &&
-	mkdir b &&
-	ln -s b a &&
-	test_path_is_missing b/sm &&
-	test_must_fail git submodule update &&
-	test_path_is_missing b/sm
-
-error: expected 'a' in submodule path 'a/sm' not to be a symbolic link
-Failed to clone 'a/sm'. Retry scheduled
-error: expected 'a' in submodule path 'a/sm' not to be a symbolic link
-Failed to clone 'a/sm' a second time, aborting
-ok 2 - git submodule update must not create submodule behind symlink
-
-checking prerequisite: CASE_INSENSITIVE_FS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
-	echo good >CamelCase &&
-	echo bad >camelcase &&
-	test "$(cat CamelCase)" != good
-
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 3 # skip git submodule update must not create submodule behind symlink on case insensitive fs (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
-
-expecting success of 7423.4 'git restore --recurse-submodules must not be confused by a symlink': 
-	prepare_symlink_to_repo &&
-	test_must_fail git restore --recurse-submodules a/sm &&
-	test_path_is_missing a/sm/submodule_file &&
-	test_path_is_dir a/target/.git &&
-	test_path_is_missing a/target/submodule_file
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/a/target/.git/
-From ../../upstream
- * branch            HEAD       -> FETCH_HEAD
-error: expected submodule path 'a/sm' not to be a symbolic link
-ok 4 - git restore --recurse-submodules must not be confused by a symlink
-
-expecting success of 7423.5 'git restore --recurse-submodules must not migrate git dir of symlinked repo': 
-	prepare_symlink_to_repo &&
-	rm -rf .git/modules &&
-	test_must_fail git restore --recurse-submodules a/sm &&
-	test_path_is_dir a/target/.git &&
-	test_path_is_missing .git/modules/a/sm &&
-	test_path_is_missing a/target/submodule_file
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/a/target/.git/
-From ../../upstream
- * branch            HEAD       -> FETCH_HEAD
-error: expected submodule path 'a/sm' not to be a symbolic link
-ok 5 - git restore --recurse-submodules must not migrate git dir of symlinked repo
-
-expecting success of 7423.6 'git checkout -f --recurse-submodules must not migrate git dir of symlinked repo when removing submodule': 
-	prepare_symlink_to_repo &&
-	rm -rf .git/modules &&
-	test_must_fail git checkout -f --recurse-submodules initial &&
-	test_path_is_dir a/target/.git &&
-	test_path_is_missing .git/modules/a/sm
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/a/target/.git/
-From ../../upstream
- * branch            HEAD       -> FETCH_HEAD
-error: expected submodule path 'a/sm' not to be a symbolic link
-ok 6 - git checkout -f --recurse-submodules must not migrate git dir of symlinked repo when removing submodule
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7421-submodule-summary-add.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/.git/
-expecting success of 7421.1 'setup': 
-	git config --global protocol.file.allow always
-
-ok 1 - setup
-
-expecting success of 7421.2 'summary test environment setup': 
-	git init sm &&
-	test_commit -C sm "add file" file file-content file-tag &&
-
-	git submodule add ./sm my-subm &&
-	test_tick &&
-	git commit -m "add submodule"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/sm/.git/
-[master (root-commit) 35b40f1] add file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/my-subm'...
-done.
-[master (root-commit) 0d0296a] add submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 my-subm
-ok 2 - summary test environment setup
-
-expecting success of 7421.3 'submodule summary output for initialized submodule': 
-	test_commit -C sm "add file2" file2 file2-content file2-tag &&
-	git submodule update --remote &&
-	test_tick &&
-	git commit -m "update submodule" my-subm &&
-	git submodule summary HEAD^ >actual &&
-	rev1=$(git -C sm rev-parse --short HEAD^) &&
-	rev2=$(git -C sm rev-parse --short HEAD) &&
-	cat >expected <<-EOF &&
-	* my-subm ${rev1}...${rev2} (1):
-	  > add file2
-
-	EOF
-	test_cmp expected actual
-
-[master dbd5fc8] add file2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-From /build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/sm
-   35b40f1..dbd5fc8  master     -> origin/master
- * [new tag]         file2-tag  -> file2-tag
-Submodule path 'my-subm': checked out 'dbd5fc8f8fdf3ce2b5f5235cf1be586e62b60698'
-[master c7068f0] update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - submodule summary output for initialized submodule
-
-expecting success of 7421.4 'submodule summary output for deinitialized submodule': 
-	git submodule deinit my-subm &&
-	git submodule summary HEAD^ >actual &&
-	test_must_be_empty actual &&
-	git submodule update --init my-subm &&
-	git submodule summary HEAD^ >actual &&
-	rev1=$(git -C sm rev-parse --short HEAD^) &&
-	rev2=$(git -C sm rev-parse --short HEAD) &&
-	cat >expected <<-EOF &&
-	* my-subm ${rev1}...${rev2} (1):
-	  > add file2
-
-	EOF
-	test_cmp expected actual
-
-Cleared directory 'my-subm'
-Submodule 'my-subm' (./sm) unregistered for path 'my-subm'
-warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
-Submodule 'my-subm' (/build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/sm) registered for path 'my-subm'
-Submodule path 'my-subm': checked out 'dbd5fc8f8fdf3ce2b5f5235cf1be586e62b60698'
-ok 4 - submodule summary output for deinitialized submodule
-
-expecting success of 7421.5 'submodule summary output for submodules with changed paths': 
-	git mv my-subm subm &&
-	git commit -m "change submodule path" &&
-	rev=$(git -C sm rev-parse --short HEAD^) &&
-	git submodule summary HEAD^^ -- my-subm >actual 2>err &&
-	test_must_be_empty err &&
-	cat >expected <<-EOF &&
-	* my-subm ${rev}...0000000:
-
-	EOF
-	test_cmp expected actual
-
-[master 02e2066] change submodule path
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename my-subm => subm (100%)
-ok 5 - submodule summary output for submodules with changed paths
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7422-submodule-output.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/.git/
-expecting success of 7422.1 'setup': 
-	test_commit A &&
-	test_commit B &&
-	setup_sub S  &&
-	setup_sub S.D &&
-	setup_sub S.C &&
-	setup_sub S.C.D &&
-	setup_sub X &&
-	git add S* &&
-	test_commit C &&
-
-	# recursive in X/
-	git -C X pull &&
-	GIT_ALLOW_PROTOCOL=file git -C X submodule update --init &&
-
-	# dirty
-	for d in S.D X/S.D
-	do
-		echo dirty >"$d"/A.t || return 1
-	done &&
-
-	# commit (for --cached)
-	for d in S.C* X/S.C*
-	do
-		git -C "$d" reset --hard A || return 1
-	done &&
-
-	# dirty
-	for d in S*.D X/S*.D
-	do
-		echo dirty >"$d/C2.t" || return 1
-	done &&
-
-	for ref in A B C
-	do
-		# Not different with SHA-1 and SHA-256, just (ab)using
-		# test_oid_cache as a variable bag to avoid using
-		# $(git rev-parse ...).
-		oid=$(git rev-parse $ref) &&
-		test_oid_cache <<-EOF || return 1
-		$ref sha1:$oid
-		$ref sha256:$oid
-		EOF
-	done
-
-[master (root-commit) 0ddfaf1] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master d9df450] B
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super/.git/
+[master (root-commit) 5e30013] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 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'...
+ create mode 100644 initial.t
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super/sub1'...
 done.
-Adding existing repo at 'S.C.D' to the index
-Cloning into 'X'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super/sub2'...
 done.
-Adding existing repo at 'X' to the index
-[master 2377ff0] C
+[master b6e0cac] add 2 submodules at sub{1,2}
  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.45.2/t/trash directory.t7422-submodule-output/.
-   d9df450..2377ff0  master     -> origin/master
- * [new tag]         C          -> C
-Updating d9df450..2377ff0
-Fast-forward
- .gitmodules | 15 +++++++++++++++
- C.t         |  1 +
- S           |  1 +
- S.C         |  1 +
- S.C.D       |  1 +
- S.D         |  1 +
- X           |  1 +
- 7 files changed, 21 insertions(+)
+ 3 files changed, 8 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.45.2/t/trash directory.t7422-submodule-output/./S) registered for path 'S'
-Submodule 'S.C' (/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/./S.C) registered for path 'S.C'
-Submodule 'S.C.D' (/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/./S.C.D) registered for path 'S.C.D'
-Submodule 'S.D' (/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/./S.D) registered for path 'S.D'
-Submodule 'X' (/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/./X) registered for path 'X'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/S'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/S.C'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/S.C.D'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/S.D'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/X'...
-done.
-Submodule path 'S': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-Submodule path 'S.C': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-Submodule path 'S.C.D': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-Submodule path 'S.D': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-Submodule path 'X': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
-HEAD is now at 0ddfaf1 A
-HEAD is now at 0ddfaf1 A
-HEAD is now at 0ddfaf1 A
-HEAD is now at 0ddfaf1 A
+ create mode 160000 sub1
+ create mode 160000 sub2
 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 7413.2 'is-active works with urls': 
+	test-tool -C super submodule is-active sub1 &&
+	test-tool -C super submodule is-active sub2 &&
 
-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
+	git -C super config --unset submodule.sub1.URL &&
+	test_must_fail test-tool -C super submodule is-active sub1 &&
+	git -C super config submodule.sub1.URL ../sub &&
+	test-tool -C super submodule is-active sub1
 
-expecting success of 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
+ok 2 - is-active works with urls
 
-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 7413.3 'is-active works with submodule.<name>.active config': 
+	test_when_finished "git -C super config --unset submodule.sub1.active" &&
+	test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7450-bad-git-dotfiles.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/.git/
-expecting success of 7450.1 'setup': 
-	git config --global protocol.file.allow always
+	git -C super config --bool submodule.sub1.active "false" &&
+	test_must_fail test-tool -C super submodule is-active sub1 &&
 
-ok 1 - setup
+	git -C super config --bool submodule.sub1.active "true" &&
+	git -C super config --unset submodule.sub1.URL &&
+	test-tool -C super submodule is-active sub1
 
-expecting success of 7450.2 'check names': 
-	cat >expect <<-\EOF &&
-	valid
-	valid/with/paths
-	EOF
+ok 3 - is-active works with submodule.<name>.active config
 
-	test-tool submodule check-name >actual <<-\EOF &&
-	valid
-	valid/with/paths
+expecting success of 7413.4 'is-active handles submodule.active config missing a value': 
+	cp super/.git/config super/.git/config.orig &&
+	test_when_finished mv super/.git/config.orig super/.git/config &&
 
-	../foo
-	/../foo
-	..\foo
-	\..\foo
-	foo/..
-	foo/../
-	foo\..
-	foo\..\
-	foo/../bar
+	cat >>super/.git/config <<-\EOF &&
+	[submodule]
+		active
 	EOF
 
-	test_cmp expect actual
-
-ok 2 - check names
-
-expecting success of 7450.3 'check urls': 
 	cat >expect <<-\EOF &&
-	./bar/baz/foo.git
-	https://example.com/foo.git
-	http://example.com:80/deeper/foo.git
-	EOF
-
-	test-tool submodule check-url >actual <<-\EOF &&
-	./bar/baz/foo.git
-	https://example.com/foo.git
-	http://example.com:80/deeper/foo.git
-	-a./foo
-	../../..//test/foo.git
-	../../../../../:localhost:8080/foo.git
-	..\../.\../:example.com/foo.git
-	./%0ahost=example.com/foo.git
-	https://one.example.com/evil?%0ahost=two.example.com
-	https:///example.com/foo.git
-	http://example.com:test/foo.git
-	https::example.com/foo.git
-	http:::example.com/foo.git
+	error: missing value for 'submodule.active'
 	EOF
-
+	test-tool -C super submodule is-active sub1 2>actual &&
 	test_cmp expect actual
 
-ok 3 - check urls
-
-expecting success of 7450.4 'create innocent subrepo': 
-	git init innocent &&
-	git -C innocent commit --allow-empty -m foo
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/innocent/.git/
-[master (root-commit) 2093db0] foo
- Author: A U Thor <author@example.com>
-ok 4 - create innocent subrepo
-
-expecting success of 7450.5 'submodule add refuses invalid names': 
-	test_must_fail \
-		git submodule add --name ../../modules/evil "$PWD/innocent" evil
-
-fatal: '../../modules/evil' is not a valid submodule name
-ok 5 - submodule add refuses invalid names
-
-expecting success of 7450.6 'add evil submodule': 
-	git submodule add "$PWD/innocent" evil &&
-
-	mkdir modules &&
-	cp -r .git/modules/evil modules &&
-	write_script modules/evil/hooks/post-checkout <<-\EOF &&
-	echo >&2 "RUNNING POST CHECKOUT"
-	EOF
-
-	git config -f .gitmodules submodule.evil.update checkout &&
-	git config -f .gitmodules --rename-section \
-		submodule.evil submodule.../../modules/evil &&
-	git add modules &&
-	git commit -am evil
-
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/evil'...
-done.
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-[master (root-commit) 4d33dfb] evil
- Author: A U Thor <author@example.com>
- 30 files changed, 902 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 evil
- create mode 100644 modules/evil/HEAD
- create mode 100644 modules/evil/config
- create mode 100644 modules/evil/description
- create mode 100755 modules/evil/hooks/applypatch-msg.sample
- create mode 100755 modules/evil/hooks/commit-msg.sample
- create mode 100755 modules/evil/hooks/fsmonitor-watchman.sample
- create mode 100755 modules/evil/hooks/post-checkout
- create mode 100755 modules/evil/hooks/post-update.sample
- create mode 100755 modules/evil/hooks/pre-applypatch.sample
- create mode 100755 modules/evil/hooks/pre-commit.sample
- create mode 100755 modules/evil/hooks/pre-merge-commit.sample
- create mode 100755 modules/evil/hooks/pre-push.sample
- create mode 100755 modules/evil/hooks/pre-rebase.sample
- create mode 100755 modules/evil/hooks/pre-receive.sample
- create mode 100755 modules/evil/hooks/prepare-commit-msg.sample
- create mode 100755 modules/evil/hooks/push-to-checkout.sample
- create mode 100755 modules/evil/hooks/sendemail-validate.sample
- create mode 100755 modules/evil/hooks/update.sample
- create mode 100644 modules/evil/index
- create mode 100644 modules/evil/info/exclude
- create mode 100644 modules/evil/logs/HEAD
- create mode 100644 modules/evil/logs/refs/heads/master
- create mode 100644 modules/evil/logs/refs/remotes/origin/HEAD
- create mode 100644 modules/evil/objects/20/93db06f424f426e05da2ca90f40d2663e89387
- create mode 100644 modules/evil/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
- create mode 100644 modules/evil/packed-refs
- create mode 100644 modules/evil/refs/heads/master
- create mode 100644 modules/evil/refs/remotes/origin/HEAD
-ok 6 - add evil submodule
-
-expecting success of 7450.7 'add other submodule': 
-	git submodule add "$PWD/innocent" another-module &&
-	git add another-module &&
-	git commit -am another
-
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/another-module'...
-done.
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-[master 35fde2a] another
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 160000 another-module
-ok 7 - add other submodule
-
-expecting success of 7450.8 'clone evil superproject': 
-	git clone --recurse-submodules . victim >output 2>&1 &&
-	! grep "RUNNING POST CHECKOUT" output
-
-ok 8 - clone evil superproject
-
-expecting success of 7450.9 'fsck detects evil superproject': 
-	test_must_fail git fsck
-
-error in blob 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-error in blob 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-dangling blob 241344bddcdf3b3d94f89244f7cfa976aa3f4b19
-ok 9 - fsck detects evil superproject
-
-expecting success of 7450.10 'transfer.fsckObjects detects evil superproject (unpack)': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	git -C dst.git config transfer.fsckObjects true &&
-	test_must_fail git push dst.git HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: fatal: fsck error in pack objects        
-error: remote unpack failed: unpack-objects abnormal exit
-To dst.git
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dst.git'
-ok 10 - transfer.fsckObjects detects evil superproject (unpack)
-
-expecting success of 7450.11 'transfer.fsckObjects detects evil superproject (index)': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	git -C dst.git config transfer.fsckObjects true &&
-	git -C dst.git config transfer.unpackLimit 1 &&
-	test_must_fail git push dst.git HEAD
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
-remote: fatal: fsck error in packed object        
-error: remote unpack failed: index-pack abnormal exit
-To dst.git
- ! [remote rejected] HEAD -> master (unpacker error)
-error: failed to push some refs to 'dst.git'
-ok 11 - transfer.fsckObjects detects evil superproject (index)
-
-expecting success of 7450.12 'create oddly ordered pack': 
-	git checkout --orphan odd &&
-	git rm -rf --cached . &&
-	git add .gitmodules &&
-	git commit -m odd &&
-	{
-		pack_header 3 &&
-		pack_obj $(git rev-parse HEAD:.gitmodules) &&
-		pack_obj $(git rev-parse HEAD^{tree}) &&
-		pack_obj $(git rev-parse HEAD)
-	} >odd.pack &&
-	pack_trailer odd.pack
-
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-warning: ignoring suspicious submodule name: ../../modules/evil
-Switched to a new branch 'odd'
-rm '.gitmodules'
-rm 'another-module'
-rm 'evil'
-rm 'modules/evil/HEAD'
-rm 'modules/evil/config'
-rm 'modules/evil/description'
-rm 'modules/evil/hooks/applypatch-msg.sample'
-rm 'modules/evil/hooks/commit-msg.sample'
-rm 'modules/evil/hooks/fsmonitor-watchman.sample'
-rm 'modules/evil/hooks/post-checkout'
-rm 'modules/evil/hooks/post-update.sample'
-rm 'modules/evil/hooks/pre-applypatch.sample'
-rm 'modules/evil/hooks/pre-commit.sample'
-rm 'modules/evil/hooks/pre-merge-commit.sample'
-rm 'modules/evil/hooks/pre-push.sample'
-rm 'modules/evil/hooks/pre-rebase.sample'
-rm 'modules/evil/hooks/pre-receive.sample'
-rm 'modules/evil/hooks/prepare-commit-msg.sample'
-rm 'modules/evil/hooks/push-to-checkout.sample'
-rm 'modules/evil/hooks/sendemail-validate.sample'
-rm 'modules/evil/hooks/update.sample'
-rm 'modules/evil/index'
-rm 'modules/evil/info/exclude'
-rm 'modules/evil/logs/HEAD'
-rm 'modules/evil/logs/refs/heads/master'
-rm 'modules/evil/logs/refs/remotes/origin/HEAD'
-rm 'modules/evil/objects/20/93db06f424f426e05da2ca90f40d2663e89387'
-rm 'modules/evil/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904'
-rm 'modules/evil/packed-refs'
-rm 'modules/evil/refs/heads/master'
-rm 'modules/evil/refs/remotes/origin/HEAD'
-[odd (root-commit) 3eb4d74] odd
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
- create mode 100644 .gitmodules
-157+0 records in
-157+0 records out
-157 bytes copied, 0.000254732 s, 616 kB/s
-50+0 records in
-50+0 records out
-50 bytes copied, 0.000101523 s, 492 kB/s
-126+0 records in
-126+0 records out
-126 bytes copied, 0.00026008 s, 484 kB/s
-ok 12 - create oddly ordered pack
-
-expecting success of 7450.13 'transfer.fsckObjects handles odd pack (unpack)': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	test_must_fail git -C dst.git unpack-objects --strict <odd.pack
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-fatal: fsck error in pack objects
-ok 13 - transfer.fsckObjects handles odd pack (unpack)
-
-expecting success of 7450.14 'transfer.fsckObjects handles odd pack (index)': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	test_must_fail git -C dst.git index-pack --strict --stdin <odd.pack
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-pack	e6c3665f0725d677af8e911369a5442b89a7079f
-error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-fatal: fsck error in pack objects
-ok 14 - transfer.fsckObjects handles odd pack (index)
-
-expecting success of 7450.15 'index-pack --strict works for non-repo pack': 
-	rm -rf dst.git &&
-	git init --bare dst.git &&
-	cp odd.pack dst.git &&
-	test_must_fail git -C dst.git index-pack --strict odd.pack 2>output &&
-	# Make sure we fail due to bad gitmodules content, not because we
-	# could not read the blob in the first place.
-	grep gitmodulesName output
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
-e6c3665f0725d677af8e911369a5442b89a7079f
-error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
-ok 15 - index-pack --strict works for non-repo pack
-
-expecting success of 7450.16 'set up repo with symlinked gitmodules (vanilla)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-vanilla/.git/
-ok 16 - set up repo with symlinked gitmodules (vanilla)
-
-expecting success of 7450.17 'fsck detects symlinked gitmodules (vanilla)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 2205f7d549bbb03fa136d63fd3101f1264afa01c
-error in tree 2205f7d549bbb03fa136d63fd3101f1264afa01c: gitmodulesSymlink: .gitmodules is a symbolic link
-ok 17 - fsck detects symlinked gitmodules (vanilla)
-
-expecting success of 7450.18 'refuse to load symlinked gitmodules into index (vanilla)': 
-		test_must_fail \
-			git -C $dir \
-			    -c core.protectntfs \
-			    -c core.protecthfs \
-			    read-tree $tree 2>err &&
-		grep "invalid path.*$name" err &&
-		git -C $dir ls-files -s >out &&
-		test_must_be_empty out
-	
-error: invalid path '.gitmodules'
-ok 18 - refuse to load symlinked gitmodules into index (vanilla)
-
-expecting success of 7450.19 'set up repo with symlinked gitmodules (ntfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-ntfs/.git/
-ok 19 - set up repo with symlinked gitmodules (ntfs)
-
-expecting success of 7450.20 'fsck detects symlinked gitmodules (ntfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree f595865647dcec0b21794b86a84545abc8fb2c1f
-error in tree f595865647dcec0b21794b86a84545abc8fb2c1f: gitmodulesSymlink: .gitmodules is a symbolic link
-ok 20 - fsck detects symlinked gitmodules (ntfs)
-
-expecting success of 7450.21 'refuse to load symlinked gitmodules into index (ntfs)': 
-		test_must_fail \
-			git -C $dir \
-			    -c core.protectntfs \
-			    -c core.protecthfs \
-			    read-tree $tree 2>err &&
-		grep "invalid path.*$name" err &&
-		git -C $dir ls-files -s >out &&
-		test_must_be_empty out
-	
-error: invalid path '.gitmodules .'
-ok 21 - refuse to load symlinked gitmodules into index (ntfs)
-
-expecting success of 7450.22 'set up repo with symlinked gitmodules (hfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-hfs/.git/
-ok 22 - set up repo with symlinked gitmodules (hfs)
-
-expecting success of 7450.23 'fsck detects symlinked gitmodules (hfs)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 0dc3665804a6af7935ce0b3f15c68a12a4d6526b
-error in tree 0dc3665804a6af7935ce0b3f15c68a12a4d6526b: gitmodulesSymlink: .gitmodules is a symbolic link
-ok 23 - fsck detects symlinked gitmodules (hfs)
-
-expecting success of 7450.24 'refuse to load symlinked gitmodules into index (hfs)': 
-		test_must_fail \
-			git -C $dir \
-			    -c core.protectntfs \
-			    -c core.protecthfs \
-			    read-tree $tree 2>err &&
-		grep "invalid path.*$name" err &&
-		git -C $dir ls-files -s >out &&
-		test_must_be_empty out
-	
-error: invalid path '.‌gitmodules'
-ok 24 - refuse to load symlinked gitmodules into index (hfs)
-
-expecting success of 7450.25 'set up repo with symlinked gitattributes (vanilla)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-vanilla/.git/
-ok 25 - set up repo with symlinked gitattributes (vanilla)
-
-expecting success of 7450.26 'fsck detects symlinked gitattributes (vanilla)': 
-		(
-			cd $dir &&
-
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree d3fa5d36168f4ffb0887d3090fc8e35ce68cca2d
-warning in tree d3fa5d36168f4ffb0887d3090fc8e35ce68cca2d: gitattributesSymlink: .gitattributes is a symlink
-ok 26 - fsck detects symlinked gitattributes (vanilla)
-
-expecting success of 7450.27 'set up repo with symlinked gitattributes (ntfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
-
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-ntfs/.git/
-ok 27 - set up repo with symlinked gitattributes (ntfs)
+ok 4 - is-active handles submodule.active config missing a value
 
-expecting success of 7450.28 'fsck detects symlinked gitattributes (ntfs)': 
-		(
-			cd $dir &&
+expecting success of 7413.5 'is-active works with basic submodule.active config': 
+	test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
+	test_when_finished "git -C super config --unset-all submodule.active" &&
 
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree fe19906f78d5036f7eb21a82bb48ce15b6d9a981
-warning in tree fe19906f78d5036f7eb21a82bb48ce15b6d9a981: gitattributesSymlink: .gitattributes is a symlink
-ok 28 - fsck detects symlinked gitattributes (ntfs)
+	git -C super config --add submodule.active "." &&
+	git -C super config --unset submodule.sub1.URL &&
 
-expecting success of 7450.29 'set up repo with symlinked gitattributes (hfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
+	test-tool -C super submodule is-active sub1 &&
+	test-tool -C super submodule is-active sub2
 
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-hfs/.git/
-ok 29 - set up repo with symlinked gitattributes (hfs)
+ok 5 - is-active works with basic submodule.active config
 
-expecting success of 7450.30 'fsck detects symlinked gitattributes (hfs)': 
-		(
-			cd $dir &&
+expecting success of 7413.6 'is-active correctly works with paths that are not submodules': 
+	test_when_finished "git -C super config --unset-all submodule.active" &&
 
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 754fb024f6f39ed37b501bbb859e6b782ac007a7
-warning in tree 754fb024f6f39ed37b501bbb859e6b782ac007a7: gitattributesSymlink: .gitattributes is a symlink
-ok 30 - fsck detects symlinked gitattributes (hfs)
+	test_must_fail test-tool -C super submodule is-active not-a-submodule &&
 
-expecting success of 7450.31 'set up repo with symlinked gitignore (vanilla)': 
-		git init $dir &&
-		(
-			cd $dir &&
+	git -C super config --add submodule.active "." &&
+	test_must_fail test-tool -C super submodule is-active not-a-submodule
 
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-vanilla/.git/
-ok 31 - set up repo with symlinked gitignore (vanilla)
+ok 6 - is-active correctly works with paths that are not submodules
 
-expecting success of 7450.32 'fsck detects symlinked gitignore (vanilla)': 
-		(
-			cd $dir &&
+expecting success of 7413.7 'is-active works with exclusions in submodule.active config': 
+	test_when_finished "git -C super config --unset-all submodule.active" &&
 
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 824072fb893dc93a2b1910ab9d885f977008b951
-warning in tree 824072fb893dc93a2b1910ab9d885f977008b951: gitignoreSymlink: .gitignore is a symlink
-ok 32 - fsck detects symlinked gitignore (vanilla)
+	git -C super config --add submodule.active "." &&
+	git -C super config --add submodule.active ":(exclude)sub1" &&
 
-expecting success of 7450.33 'set up repo with symlinked gitignore (ntfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
+	test_must_fail test-tool -C super submodule is-active sub1 &&
+	test-tool -C super submodule is-active sub2
 
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-ntfs/.git/
-ok 33 - set up repo with symlinked gitignore (ntfs)
+ok 7 - is-active works with exclusions in submodule.active config
 
-expecting success of 7450.34 'fsck detects symlinked gitignore (ntfs)': 
-		(
-			cd $dir &&
+expecting success of 7413.8 'is-active with submodule.active and submodule.<name>.active': 
+	test_when_finished "git -C super config --unset-all submodule.active" &&
+	test_when_finished "git -C super config --unset submodule.sub1.active" &&
+	test_when_finished "git -C super config --unset submodule.sub2.active" &&
 
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 65c3fac0e9d5b179b7e4b0c7a860415fedf192fb
-warning in tree 65c3fac0e9d5b179b7e4b0c7a860415fedf192fb: gitignoreSymlink: .gitignore is a symlink
-ok 34 - fsck detects symlinked gitignore (ntfs)
+	git -C super config --add submodule.active "sub1" &&
+	git -C super config --bool submodule.sub1.active "false" &&
+	git -C super config --bool submodule.sub2.active "true" &&
 
-expecting success of 7450.35 'set up repo with symlinked gitignore (hfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
+	test_must_fail test-tool -C super submodule is-active sub1 &&
+	test-tool -C super submodule is-active sub2
 
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-hfs/.git/
-ok 35 - set up repo with symlinked gitignore (hfs)
+ok 8 - is-active with submodule.active and submodule.<name>.active
 
-expecting success of 7450.36 'fsck detects symlinked gitignore (hfs)': 
-		(
-			cd $dir &&
+expecting success of 7413.9 'is-active, submodule.active and submodule add': 
+	test_when_finished "rm -rf super2" &&
+	git init super2 &&
+	test_commit -C super2 initial &&
+	git -C super2 config --add submodule.active "sub*" &&
 
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree ef4f32626400482445f8defad04f0f4d6d082a69
-warning in tree ef4f32626400482445f8defad04f0f4d6d082a69: gitignoreSymlink: .gitignore is a symlink
-ok 36 - fsck detects symlinked gitignore (hfs)
+	# submodule add should only add submodule.<name>.active
+	# to the config if not matched by the pathspec
+	git -C super2 submodule add ../sub sub1 &&
+	test_must_fail git -C super2 config --get submodule.sub1.active &&
 
-expecting success of 7450.37 'set up repo with symlinked mailmap (vanilla)': 
-		git init $dir &&
-		(
-			cd $dir &&
+	git -C super2 submodule add ../sub mod &&
+	git -C super2 config --get submodule.mod.active
 
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-vanilla/.git/
-ok 37 - set up repo with symlinked mailmap (vanilla)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super2/.git/
+[master (root-commit) d39e3de] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super2/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7413-submodule-is-active/super2/mod'...
+done.
+true
+ok 9 - is-active, submodule.active and submodule add
 
-expecting success of 7450.38 'fsck detects symlinked mailmap (vanilla)': 
-		(
-			cd $dir &&
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7412-submodule-absorbgitdirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/.git/
+expecting success of 7412.1 'setup a real submodule': 
+	cwd="$(pwd)" &&
+	git init sub1 &&
+	test_commit -C sub1 first &&
+	git submodule add ./sub1 &&
+	test_tick &&
+	git commit -m superproject
 
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 569a93720aff18fe0ba5cf49a45c91d187e3bcfe
-warning in tree 569a93720aff18fe0ba5cf49a45c91d187e3bcfe: mailmapSymlink: .mailmap is a symlink
-ok 38 - fsck detects symlinked mailmap (vanilla)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1/.git/
+[master (root-commit) 50e526b] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Adding existing repo at 'sub1' to the index
+[master (root-commit) 807c578] superproject
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub1
+ok 1 - setup a real submodule
 
-expecting success of 7450.39 'set up repo with symlinked mailmap (ntfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
+expecting success of 7412.2 'absorb the git dir': 
+	>expect &&
+	>actual &&
+	>expect.1 &&
+	>expect.2 &&
+	>actual.1 &&
+	>actual.2 &&
+	git status >expect.1 &&
+	git -C sub1 rev-parse HEAD >expect.2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub1' from
+	'$cwd/sub1/.git' to
+	'$cwd/.git/modules/sub1'
+	EOF
+	git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	git fsck &&
+	test -f sub1/.git &&
+	test -d .git/modules/sub1 &&
+	git status >actual.1 &&
+	git -C sub1 rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
 
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-ntfs/.git/
-ok 39 - set up repo with symlinked mailmap (ntfs)
+ok 2 - absorb the git dir
 
-expecting success of 7450.40 'fsck detects symlinked mailmap (ntfs)': 
-		(
-			cd $dir &&
+expecting success of 7412.3 'absorbing does not fail for deinitialized submodules': 
+	test_when_finished "git submodule update --init" &&
+	git submodule deinit --all &&
+	git submodule absorbgitdirs 2>err &&
+	test_must_be_empty err &&
+	test -d .git/modules/sub1 &&
+	test -d sub1 &&
+	! test -e sub1/.git
 
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree ad813e1d03460ca45a21c14518be7fadafd364a1
-warning in tree ad813e1d03460ca45a21c14518be7fadafd364a1: mailmapSymlink: .mailmap is a symlink
-ok 40 - fsck detects symlinked mailmap (ntfs)
+Cleared directory 'sub1'
+Submodule 'sub1' (./sub1) unregistered for path 'sub1'
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1) registered for path 'sub1'
+Submodule path 'sub1': checked out '50e526bb426771f6036ad3a8b0c81d511d91fc2a'
+ok 3 - absorbing does not fail for deinitialized submodules
 
-expecting success of 7450.41 'set up repo with symlinked mailmap (hfs)': 
-		git init $dir &&
-		(
-			cd $dir &&
+expecting success of 7412.4 'setup nested submodule': 
+	git init sub1/nested &&
+	test_commit -C sub1/nested first_nested &&
+	git -C sub1 submodule add ./nested &&
+	test_tick &&
+	git -C sub1 commit -m "add nested" &&
+	git add sub1 &&
+	git commit -m "sub1 to include nested submodule"
 
-			# Make the tree directly to avoid index restrictions.
-			#
-			# Because symlinks store the target as a blob, choose
-			# a pathname that could be parsed as a .gitmodules file
-			# to trick naive non-symlink-aware checking.
-			tricky="[foo]bar=true" &&
-			content=$(git hash-object -w ../.gitmodules) &&
-			target=$(printf "$tricky" | git hash-object -w --stdin) &&
-			{
-				printf "100644 blob $content\t$tricky\n" &&
-				printf "120000 blob $target\t$path\n"
-			} >bad-tree
-		) &&
-		tree=$(git -C $dir mktree <$dir/bad-tree)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-hfs/.git/
-ok 41 - set up repo with symlinked mailmap (hfs)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub1/nested/.git/
+[master (root-commit) 2139925] first_nested
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first_nested.t
+Adding existing repo at 'nested' to the index
+[detached HEAD 838ca49] add nested
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 nested
+[master 4a7bb23] sub1 to include nested submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - setup nested submodule
 
-expecting success of 7450.42 'fsck detects symlinked mailmap (hfs)': 
-		(
-			cd $dir &&
+expecting success of 7412.5 'absorb the git dir in a nested submodule': 
+	git status >expect.1 &&
+	git -C sub1/nested rev-parse HEAD >expect.2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub1/nested' from
+	'$cwd/sub1/nested/.git' to
+	'$cwd/.git/modules/sub1/modules/nested'
+	EOF
+	git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	test -f sub1/nested/.git &&
+	test -d .git/modules/sub1/modules/nested &&
+	git status >actual.1 &&
+	git -C sub1/nested rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
 
-			# Check not only that we fail, but that it is due to the
-			# symlink detector
-			$fsck_must_fail git fsck 2>output &&
-			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
-		)
-	
-dangling tree 4d6270ad879d6da19ce0d4a5f3c8e0e5ac26b27f
-warning in tree 4d6270ad879d6da19ce0d4a5f3c8e0e5ac26b27f: mailmapSymlink: .mailmap is a symlink
-ok 42 - fsck detects symlinked mailmap (hfs)
+ok 5 - absorb the git dir in a nested submodule
 
-expecting success of 7450.43 'fsck detects non-blob .gitmodules': 
-	git init non-blob &&
-	(
-		cd non-blob &&
+expecting success of 7412.6 're-setup nested submodule': 
+	# un-absorb the direct submodule, to test if the nested submodule
+	# is still correct (needs a rewrite of the gitfile only)
+	rm -rf sub1/.git &&
+	mv .git/modules/sub1 sub1/.git &&
+	GIT_WORK_TREE=. git -C sub1 config --unset core.worktree &&
+	# fixup the nested submodule
+	echo "gitdir: ../.git/modules/nested" >sub1/nested/.git &&
+	GIT_WORK_TREE=../../../nested git -C sub1/.git/modules/nested config \
+		core.worktree "../../../nested" &&
+	# make sure this re-setup is correct
+	git status --ignore-submodules=none &&
 
-		# As above, make the funny tree directly to avoid index
-		# restrictions.
-		mkdir subdir &&
-		cp ../.gitmodules subdir/file &&
-		git add subdir/file &&
-		git commit -m ok &&
-		git ls-tree HEAD | sed s/subdir/.gitmodules/ | git mktree &&
+	# also make sure this old setup does not regress
+	git submodule update --init --recursive >out 2>err &&
+	test_must_be_empty out &&
+	test_must_be_empty err
 
-		test_must_fail git fsck 2>output &&
-		test_grep gitmodulesBlob output
-	)
+On branch master
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	actual
+	actual.1
+	actual.2
+	err
+	expect
+	expect.1
+	expect.2
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/non-blob/.git/
-[master (root-commit) 9e50c62] ok
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
- create mode 100644 subdir/file
-65d6b7ea636c638236286e4d9bbfa4d1508a4d7f
-dangling tree 65d6b7ea636c638236286e4d9bbfa4d1508a4d7f
-error in tree 1c2f44688a0d99382e808d63806f1c430b3acdd5: gitmodulesBlob: non-blob found at .gitmodules
-ok 43 - fsck detects non-blob .gitmodules
+nothing added to commit but untracked files present (use "git add" to track)
+ok 6 - re-setup nested submodule
 
-expecting success of 7450.44 'fsck detects corrupt .gitmodules': 
-	git init corrupt &&
-	(
-		cd corrupt &&
+expecting success of 7412.7 'absorb the git dir in a nested submodule': 
+	git status >expect.1 &&
+	git -C sub1/nested rev-parse HEAD >expect.2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub1' from
+	'$cwd/sub1/.git' to
+	'$cwd/.git/modules/sub1'
+	EOF
+	git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	test -f sub1/.git &&
+	test -f sub1/nested/.git &&
+	test -d .git/modules/sub1/modules/nested &&
+	git status >actual.1 &&
+	git -C sub1/nested rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
 
-		echo "[broken" >.gitmodules &&
-		git add .gitmodules &&
-		git commit -m "broken gitmodules" &&
+ok 7 - absorb the git dir in a nested submodule
 
-		git fsck 2>output &&
-		test_grep gitmodulesParse output &&
-		test_grep ! "bad config" output
-	)
+expecting success of 7412.8 'absorb the git dir outside of primary worktree': 
+	test_when_finished "rm -rf repo-bare.git" &&
+	git clone --bare . repo-bare.git &&
+	test_when_finished "rm -rf repo-wt" &&
+	git -C repo-bare.git worktree add ../repo-wt &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/corrupt/.git/
-[master (root-commit) 3fe1e33] broken gitmodules
+	test_when_finished "rm -f .gitconfig" &&
+	test_config_global protocol.file.allow always &&
+	git -C repo-wt submodule update --init &&
+	git init repo-wt/sub2 &&
+	test_commit -C repo-wt/sub2 A &&
+	git -C repo-wt submodule add ./sub2 sub2 &&
+	cat >expect <<-EOF &&
+	Migrating git directory of 'sub2' from
+	'$cwd/repo-wt/sub2/.git' to
+	'$cwd/repo-bare.git/worktrees/repo-wt/modules/sub2'
+	EOF
+	git -C repo-wt submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual
+
+Cloning into bare repository 'repo-bare.git'...
+done.
+Preparing worktree (new branch 'repo-wt')
+HEAD is now at 4a7bb23 sub1 to include nested submodule
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/./sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub1'...
+done.
+Submodule path 'sub1': checked out '838ca4973c32382bdf90170c18433708c487b6c3'
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/repo-wt/sub2/.git/
+[master (root-commit) c8e0c53] A
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 .gitmodules
-warning in blob e39defa11acf1626d747f0b70076b6be5c0fd4c9: gitmodulesParse: could not parse gitmodules blob
-ok 44 - fsck detects corrupt .gitmodules
-
-ok 45 # skip prevent git~1 squatting on Windows (missing WINDOWS)
+ create mode 100644 A.t
+Adding existing repo at 'sub2' to the index
+ok 8 - absorb the git dir outside of primary worktree
 
-expecting success of 7450.46 'setup submodules with nested git dirs': 
-	git init nested &&
-	test_commit -C nested nested &&
-	(
-		cd nested &&
-		cat >.gitmodules <<-EOF &&
-		[submodule "hippo"]
-			url = .
-			path = thing1
-		[submodule "hippo/hooks"]
-			url = .
-			path = thing2
-		EOF
-		git clone . thing1 &&
-		git clone . thing2 &&
-		git add .gitmodules thing1 thing2 &&
-		test_tick &&
-		git commit -m nested
-	)
+expecting success of 7412.9 'setup a gitlink with missing .gitmodules entry': 
+	git init sub2 &&
+	test_commit -C sub2 first &&
+	git add sub2 &&
+	git commit -m superproject
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/nested/.git/
-[master (root-commit) 111f058] nested
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub2/.git/
+[master (root-commit) b9419e0] first
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 nested.t
-Cloning into 'thing1'...
-done.
-Cloning into 'thing2'...
-done.
-warning: adding embedded git repository: thing1
+ create mode 100644 first.t
+warning: adding embedded git repository: sub2
 hint: You've added another git repository inside your current repository.
 hint: Clones of the outer repository will not contain the contents of
 hint: the embedded repository and will not know how to obtain it.
 hint: If you meant to add a submodule, use:
 hint:
-hint: 	git submodule add <url> thing1
+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 thing1
+hint: 	git rm --cached sub2
 hint:
 hint: See "git help submodule" for more information.
 hint: Disable this message with "git config advice.addEmbeddedRepo false"
-warning: adding embedded git repository: thing2
-[master f2f7cbd] nested
+[master 930a24c] superproject
  Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 thing1
- create mode 160000 thing2
-ok 46 - setup submodules with nested git dirs
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub2
+ok 9 - setup a gitlink with missing .gitmodules entry
 
-expecting success of 7450.47 'git dirs of sibling submodules must not be nested': 
-	test_must_fail git clone --recurse-submodules nested clone 2>err &&
-	test_grep "is inside git dir" err
+expecting success of 7412.10 'absorbing the git dir fails for incomplete submodules': 
+	git status >expect.1 &&
+	git -C sub2 rev-parse HEAD >expect.2 &&
+	cat >expect <<-\EOF &&
+	fatal: could not lookup name for submodule 'sub2'
+	EOF
+	test_must_fail git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual &&
+	git -C sub2 fsck &&
+	test -d sub2/.git &&
+	git status >actual &&
+	git -C sub2 rev-parse HEAD >actual.2 &&
+	test_cmp expect.1 actual.1 &&
+	test_cmp expect.2 actual.2
 
-error: submodule git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo'
-error: submodule git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo'
-ok 47 - git dirs of sibling submodules must not be nested
+ok 10 - absorbing the git dir fails for incomplete submodules
 
-expecting success of 7450.48 'submodule git dir nesting detection must work with parallel cloning': 
-	test_must_fail git clone --recurse-submodules --jobs=2 nested clone_parallel 2>err &&
-	cat err &&
-	grep -E "(already exists|is inside git dir|not a git repository)" err &&
-	{
-		test_path_is_missing .git/modules/hippo/HEAD ||
-		test_path_is_missing .git/modules/hippo/hooks/HEAD
-	}
+expecting success of 7412.11 'setup a submodule with multiple worktrees': 
+	# first create another unembedded git dir in a new submodule
+	git init sub3 &&
+	test_commit -C sub3 first &&
+	git submodule add ./sub3 &&
+	test_tick &&
+	git commit -m "add another submodule" &&
+	git -C sub3 worktree add ../sub3_second_work_tree
 
-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.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1'...
-fatal: /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo already exists
-fatal: clone of '.' into submodule path '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1' failed
-Failed to clone 'thing1'. Retry scheduled
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2'...
-done.
-fatal: not a git repository: /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1/../.git/modules/hippo
-Failed to clone 'thing1' a second time, aborting
-fatal: /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo already exists
-fatal: not a git repository: /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1/../.git/modules/hippo
-ok 48 - submodule git dir nesting detection must work with parallel cloning
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7412-submodule-absorbgitdirs/sub3/.git/
+[master (root-commit) dbecd43] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+Adding existing repo at 'sub3' to the index
+[master 54b05d9] add another submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 sub3
+Preparing worktree (new branch 'sub3_second_work_tree')
+HEAD is now at dbecd43 first
+ok 11 - setup a submodule with multiple worktrees
 
-expecting success of 7450.49 'checkout -f --recurse-submodules must not use a nested gitdir': 
-	git clone nested nested_checkout &&
-	(
-		cd nested_checkout &&
-		git submodule init &&
-		git submodule update thing1 &&
-		mkdir -p .git/modules/hippo/hooks/refs &&
-		mkdir -p .git/modules/hippo/hooks/objects/info &&
-		echo "../../../../objects" >.git/modules/hippo/hooks/objects/info/alternates &&
-		echo "ref: refs/heads/master" >.git/modules/hippo/hooks/HEAD
-	) &&
-	test_must_fail git -C nested_checkout checkout -f --recurse-submodules HEAD 2>err &&
-	cat err &&
-	grep "is inside git dir" err &&
-	test_path_is_missing nested_checkout/thing2/.git
+expecting success of 7412.12 'absorbing fails for a submodule with multiple worktrees': 
+	cat >expect <<-\EOF &&
+	fatal: could not lookup name for submodule 'sub2'
+	EOF
+	test_must_fail git submodule absorbgitdirs 2>actual &&
+	test_cmp expect actual
 
-Cloning into 'nested_checkout'...
-done.
-Submodule 'hippo' (.) registered for path 'thing1'
-Submodule 'hippo/hooks' (.) registered for path 'thing2'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/nested_checkout/thing1'...
-done.
-Submodule path 'thing1': checked out '111f05809ae4bf877fb5852d7d418815278831e3'
-error: submodule git dir '.git/modules/hippo/hooks' is inside git dir '.git/modules/hippo'
-fatal: refusing to create/use '.git/modules/hippo/hooks' in another submodule's git dir
-error: submodule git dir '.git/modules/hippo/hooks' is inside git dir '.git/modules/hippo'
-ok 49 - checkout -f --recurse-submodules must not use a nested gitdir
+ok 12 - absorbing fails for a submodule with multiple worktrees
 
-# passed all 49 test(s)
-1..49
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7500-commit-template-squash-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
+*** t7414-submodule-mistakes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7414-submodule-mistakes/.git/
+expecting success of 7414.1 'create embedded repository': 
+	git init embed &&
+	test_commit -C embed one
 
-[master (root-commit) 02efb91] initial commit
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7414-submodule-mistakes/embed/.git/
+[master (root-commit) d79ce16] 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
-
-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.45.2/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
-ok 2 - nonexistent template file should return error
+ create mode 100644 one.t
+ok 1 - create embedded repository
 
-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
-	)
+expecting success of 7414.2 'git-add on embedded repository warns': 
+	test_when_finished "git rm --cached -f embed" &&
+	git add embed 2>stderr &&
+	test_grep warning stderr
 
-fatal: could not read '/build/reproducible-path/git-2.45.2/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
-ok 3 - nonexistent template file in config should return error
+warning: adding embedded git repository: embed
+rm 'embed'
+ok 2 - git-add on embedded repository warns
 
-expecting success of 7500.4 'unedited template should not commit': 
-	echo "template line" > "$TEMPLATE" &&
-	test_must_fail git commit --template "$TEMPLATE"
+expecting success of 7414.3 '--no-warn-embedded-repo suppresses warning': 
+	test_when_finished "git rm --cached -f embed" &&
+	git add --no-warn-embedded-repo embed 2>stderr &&
+	test_grep ! warning stderr
 
-Aborting commit; you did not edit the message.
-ok 4 - unedited template should not commit
+rm 'embed'
+ok 3 - --no-warn-embedded-repo suppresses warning
 
-expecting success of 7500.5 'unedited template with comments should not commit': 
-	echo "# comment in template" >> "$TEMPLATE" &&
-	test_must_fail git commit --template "$TEMPLATE"
+expecting success of 7414.4 'no warning when updating entry': 
+	test_when_finished "git rm --cached -f embed" &&
+	git add embed &&
+	git -C embed commit --allow-empty -m two &&
+	git add embed 2>stderr &&
+	test_grep ! warning stderr
 
-Aborting commit; you did not edit the message.
-ok 5 - unedited template with comments should not commit
+warning: adding embedded git repository: embed
+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> embed
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached embed
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+[master b0129aa] two
+ Author: A U Thor <author@example.com>
+rm 'embed'
+ok 4 - no warning when updating entry
 
-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"
-	)
+expecting success of 7414.5 'submodule add does not warn': 
+	test_when_finished "git rm -rf submodule .gitmodules" &&
+	git -c protocol.file.allow=always \
+		submodule add ./embed submodule 2>stderr &&
+	test_grep ! warning stderr
 
-Aborting commit; you did not edit the message.
-ok 6 - a Signed-off-by line by itself should not commit
+rm '.gitmodules'
+rm 'submodule'
+ok 5 - submodule add does not warn
 
-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"
-	)
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7417-submodule-path-url.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7417-submodule-path-url/.git/
+expecting success of 7417.1 'setup': 
+	git config --global protocol.file.allow always
 
-Aborting commit; you did not edit the message.
-ok 7 - adding comments to a template should not commit
+ok 1 - setup
 
-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"
+expecting success of 7417.2 'create submodule with dash in path': 
+	git init upstream &&
+	git -C upstream commit --allow-empty -m base &&
+	git submodule add ./upstream sub &&
+	git mv sub ./-sub &&
+	git commit -m submodule
 
-[master 0439be9] template line
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7417-submodule-path-url/upstream/.git/
+[main (root-commit) a4b5938] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 8 - adding real content to a template should commit
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7417-submodule-path-url/sub'...
+done.
+warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
+[main (root-commit) c0215d8] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 -sub
+ create mode 100644 .gitmodules
+ok 2 - create submodule with dash in path
 
-expecting success of 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 7417.3 'clone rejects unprotected dash': 
+	test_when_finished "rm -rf dst" &&
+	git clone --recurse-submodules . dst 2>err &&
+	test_grep ignoring err
 
-[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
+warning: ignoring 'submodule.sub.path' which may be interpreted as a command-line option: -sub
+ok 3 - clone rejects unprotected dash
 
-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 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
 
-[master 811561e] new template
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 10 - config-specified template should commit
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7417-submodule-path-url/dst/
+remote: error: object 7e03af04dae731f9aa8e2febaf8b530bdafd3aa1: gitmodulesPath: disallowed submodule path: -sub        
+ok 4 - fsck rejects unprotected dash
 
-expecting success of 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"
+ok 5 # skip submodule paths disallows trailing spaces (missing MINGW)
 
-[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
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7416-submodule-dash-url.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/.git/
+expecting success of 7416.1 'setup': 
+	git config --global protocol.file.allow always
 
-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"
+ok 1 - setup
 
-[master 65e5eb1] standard input msg
+expecting success of 7416.2 'create submodule with protected dash in url': 
+	git init upstream &&
+	git -C upstream commit --allow-empty -m base &&
+	mv upstream ./-upstream &&
+	git submodule add ./-upstream sub &&
+	git add sub .gitmodules &&
+	git commit -m submodule
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/upstream/.git/
+[master (root-commit) a4b5938] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 12 - commit message from file should override template
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/sub'...
+done.
+[master (root-commit) a5de7d8] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 2 - create submodule with protected dash in url
 
-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 7416.3 'clone can recurse submodule': 
+	test_when_finished "rm -rf dst" &&
+	git clone --recurse-submodules . dst &&
+	echo base >expect &&
+	git -C dst/sub log -1 --format=%s >actual &&
+	test_cmp expect actual
 
-[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
+Cloning into 'dst'...
+done.
+Submodule 'sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/./-upstream) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/sub'...
+done.
+Submodule path 'sub': checked out 'a4b5938bdb0638bd7b0fd149a017cda4db88b551'
+ok 3 - clone can recurse submodule
 
-expecting success of 7500.14 'using alternate GIT_INDEX_FILE (1)': 
+expecting success of 7416.4 'fsck accepts protected dash': 
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	git push dst HEAD
 
-	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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+To dst
+ * [new branch]      HEAD -> master
+ok 4 - fsck accepts protected dash
 
+expecting success of 7416.5 'remove ./ protection from .gitmodules url': 
+	perl -i -pe "s{\./}{}" .gitmodules &&
+	git commit -am "drop protection"
 
-[master 7c961fb] commit using another index
+[master 6caf163] drop protection
  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(+), 1 deletion(-)
+ok 5 - remove ./ protection from .gitmodules url
 
-expecting success of 7500.15 'using alternate GIT_INDEX_FILE (2)': 
+expecting success of 7416.6 'clone rejects unprotected dash': 
+	test_when_finished "rm -rf dst" &&
+	test_must_fail git clone --recurse-submodules . dst 2>err &&
+	test_grep ignoring err
 
-	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)"
+warning: ignoring 'submodule.sub.url' which may be interpreted as a command-line option: -upstream
+ok 6 - clone rejects unprotected dash
 
-	) &&
-	cmp .git/index saved-index >/dev/null
+expecting success of 7416.7 'fsck rejects unprotected dash': 
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-[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)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 3203a2d7fb3e9335b43e66a0c95b96887ed3670f: gitmodulesUrl: disallowed submodule url: -upstream        
+ok 7 - fsck rejects unprotected dash
 
-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 7416.8 'trailing backslash is handled correctly': 
+	git init testmodule &&
+	test_commit -C testmodule c &&
+	git submodule add ./testmodule &&
+	: ensure that the name ends in a double backslash &&
+	sed -e "s|\\(submodule \"testmodule\\)\"|\\1\\\\\\\\\"|" \
+		-e "s|url = .*|url = \" --should-not-be-an-option\"|" \
+		<.gitmodules >.new &&
+	mv .new .gitmodules &&
+	git commit -am "Add testmodule" &&
+	test_must_fail git clone --verbose --recurse-submodules . dolly 2>err &&
+	test_grep ! "unknown option" err
 
-[master 5b1a0f3] zort
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/testmodule/.git/
+[master (root-commit) ea1ac38] c
  Author: A U Thor <author@example.com>
- 1 file changed, 8 insertions(+)
- create mode 100644 foo
-ok 16 - --signoff
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c.t
+Adding existing repo at 'testmodule' to the index
+[master 8635531] Add testmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ create mode 160000 testmodule
+ok 8 - trailing backslash is handled correctly
 
-expecting success of 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"
+expecting success of 7416.9 'fsck rejects missing URL scheme': 
+	git checkout --orphan missing-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http::one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with missing URL scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-[master 101c1bd] Log in sub directory
+Switched to a new branch 'missing-scheme'
+[missing-scheme (root-commit) 43f6d1d] gitmodules with missing URL scheme
  Author: A U Thor <author@example.com>
-ok 17 - commit message from file (1)
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 1b0034738c4ff76356b39245a20e6e3db27b9f16: gitmodulesUrl: disallowed submodule url: http::one.example.com/foo.git        
+ok 9 - fsck rejects missing URL scheme
 
-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"
+expecting success of 7416.10 'fsck rejects relative URL resolving to missing scheme': 
+	git checkout --orphan relative-missing-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "..\\../.\\../:one.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with relative URL that strips off scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-[master 83046dc] Log in sub directory
+Switched to a new branch 'relative-missing-scheme'
+[relative-missing-scheme (root-commit) ae93fe4] gitmodules with relative URL that strips off scheme
  Author: A U Thor <author@example.com>
-ok 18 - commit message from file (2)
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 7994991dc5ea69078db13d6a6fe8ebdb9095f4f6: gitmodulesUrl: disallowed submodule url: ..\../.\../:one.example.com/foo.git        
+ok 10 - fsck rejects relative URL resolving to missing scheme
 
-expecting success of 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"
+expecting success of 7416.11 'fsck rejects empty URL scheme': 
+	git checkout --orphan empty-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http::://one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with empty URL scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-[master 2f170f9] Log with foo word
+Switched to a new branch 'empty-scheme'
+[empty-scheme (root-commit) 4daaf62] gitmodules with empty URL scheme
  Author: A U Thor <author@example.com>
-ok 19 - commit message from stdin
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 606181337c1ac6c1464989eddb68e626ebd5cebb: gitmodulesUrl: disallowed submodule url: http::://one.example.com/foo.git        
+ok 11 - fsck rejects empty URL scheme
 
-expecting success of 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"
+expecting success of 7416.12 'fsck rejects relative URL resolving to empty scheme': 
+	git checkout --orphan relative-empty-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = ../../../:://one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "relative gitmodules URL resolving to empty scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-[master df55417] -F log
+Switched to a new branch 'relative-empty-scheme'
+[relative-empty-scheme (root-commit) 266aaa0] relative gitmodules URL resolving to empty scheme
  Author: A U Thor <author@example.com>
-ok 20 - commit -F overrides -t
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 6e731804bddde8189151d1e3afed752027c01894: gitmodulesUrl: disallowed submodule url: ../../../:://one.example.com/foo.git        
+ok 12 - fsck rejects relative URL resolving to empty scheme
 
-expecting success of 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
+expecting success of 7416.13 'fsck rejects empty hostname': 
+	git checkout --orphan empty-host &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http:///one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with extra slashes" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-[master 5cf7fec] 
+Switched to a new branch 'empty-host'
+[empty-host (root-commit) bfddfb4] gitmodules with extra slashes
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 21 - Commit without message is allowed with --allow-empty-message
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 86df12e51bea97cc0153a56ca357968b068043bb: gitmodulesUrl: disallowed submodule url: http:///one.example.com/foo.git        
+ok 13 - fsck rejects empty hostname
 
-expecting success of 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
+expecting success of 7416.14 'fsck rejects relative url that produced empty hostname': 
+	git checkout --orphan messy-relative &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = ../../..//one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules abusing relative_path" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-Aborting commit due to empty commit message.
-ok 22 - Commit without message is no-no without --allow-empty-message
+Switched to a new branch 'messy-relative'
+[messy-relative (root-commit) 126d5fa] gitmodules abusing relative_path
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object a2186f87385db0aacec85e7779234576bd406d14: gitmodulesUrl: disallowed submodule url: ../../..//one.example.com/foo.git        
+ok 14 - fsck rejects relative url that produced empty hostname
 
-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"
+expecting success of 7416.15 'fsck permits embedded newline with unrecognized scheme': 
+	git checkout --orphan newscheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "data://acjbkd%0akajfdickajkd"
+	EOF
+	git add .gitmodules &&
+	git commit -m "gitmodules with unrecognized scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	git push dst HEAD
 
-[master 1a05b50] hello there
+Switched to a new branch 'newscheme'
+[newscheme (root-commit) 75b80fe] gitmodules with unrecognized scheme
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 23 - Commit a message with --allow-empty-message
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+To dst
+ * [new branch]      HEAD -> newscheme
+ok 15 - fsck permits embedded newline with unrecognized scheme
 
-expecting success of 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 7416.16 'fsck rejects embedded newline in url': 
+	# create an orphan branch to avoid existing .gitmodules objects
+	git checkout --orphan newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+	url = "https://one.example.com?%0ahost=two.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "gitmodules with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-Aborting commit due to empty commit message.
-[master 7c3a153] 
+Switched to a new branch 'newline'
+[newline (root-commit) f62dcd9] gitmodules with newline
  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
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 59d2434e36eff88ddd704683001a17e1074748f7: gitmodulesUrl: disallowed submodule url: https://one.example.com?%0ahost=two.example.com/foo.git        
+ok 16 - fsck rejects embedded newline in url
 
-expecting success of 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 7416.17 'fsck rejects embedded newline in relative url': 
+	git checkout --orphan relative-newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "./%0ahost=two.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "relative url with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
 
-[master 9b5b399] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 5b2adcc] intermediate commit
+Switched to a new branch 'relative-newline'
+[relative-newline (root-commit) 66a85ea] relative url with newline
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 77c550c] fixup! target message subject line
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 52bc96716641eb10811fc8e92cdfd07547964b6a: gitmodulesUrl: disallowed submodule url: ./%0ahost=two.example.com/foo.git        
+ok 17 - fsck rejects embedded newline in relative url
+
+expecting success of 7416.18 'fsck rejects embedded newline in git url': 
+	git checkout --orphan git-newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+	url = "git://example.com:1234/repo%0a.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "git url with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+
+Switched to a new branch 'git-newline'
+[git-newline (root-commit) a8d2cc3] git url with newline
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 25 - commit --fixup provides correct one-line commit message
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ create mode 160000 testmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7416-submodule-dash-url/dst/
+remote: error: object 9fbab0793cb64859d67bc4949d7feca5341bb05b: gitmodulesUrl: disallowed submodule url: git://example.com:1234/repo%0a.git        
+ok 18 - fsck rejects embedded newline in git url
 
-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
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7418-submodule-sparse-gitmodules.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7418-submodule-sparse-gitmodules/.git/
+expecting success of 7418.1 'setup': 
+	git config --global protocol.file.allow always
 
-extra"
+ok 1 - setup
 
-[master d870198] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 4134eb8] intermediate commit
+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.45.2/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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(+)
-[master d256be7] fixup! target message subject line
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7418-submodule-sparse-gitmodules/upstream/submodule'...
+done.
+[master (root-commit) caa93e1] Add submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 26 - commit --fixup -m"something" -m"extra"
+ 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 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 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
 
-[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
+ok 3 - reading gitmodules config file when it is not checked out
 
-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 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
 
-	$(get_commit_msg HEAD~)
+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
 
-	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 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
 
-[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
+Submodule 'submodule' (/build/reproducible-path/git-2.45.2/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 7500.29 '--fixup=amend: --only ignores staged changes': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
+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
 
-	$(get_commit_msg HEAD~)
+Cloning into '/build/reproducible-path/git-2.45.2/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
 
-	edited
-	EOF
-	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited" \
-			git commit --fixup=amend:HEAD~ --only
+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"
 	) &&
-	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
+	(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
 
-[master 495438c] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master edaae07] intermediate commit
+	EOF
+	test_cmp expect actual &&
+	# Test that the update actually succeeds
+	test_path_is_missing super/submodule/file2 &&
+	git -C super submodule update &&
+	test_cmp submodule/file2 super/submodule/file2 &&
+	git -C super status --short >output &&
+	test_must_be_empty output
+
+[master 83d36b8] Add file2 to submodule
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 948c995] amend! target message subject line
+ create mode 100644 file2
+From /build/reproducible-path/git-2.45.2/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>
-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
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.45.2/t/trash directory.t7418-submodule-sparse-gitmodules/upstream
+   caa93e1..5ae4276  master     -> origin/master
+Fetching submodule submodule
+From /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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 7500.30 '--fixup=reword: ignores staged changes': 
-	commit_for_rebase_autosquash_setup &&
-	cat >expected <<-EOF &&
-	amend! $(git log -1 --format=%s HEAD~)
+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
 
-	$(get_commit_msg HEAD~)
+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
 
-	edited
-	EOF
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7420-submodule-set-url.sh ***
+expecting success of 7420.1 'setup': 
+	git config --global protocol.file.allow always
+
+ok 1 - setup
+
+expecting success of 7420.2 'submodule config cache setup': 
+	mkdir submodule &&
 	(
-		set_fake_editor &&
-		FAKE_COMMIT_AMEND="edited" \
-			git commit --fixup=reword:HEAD~
+		cd submodule &&
+		git init &&
+		echo a >file &&
+		git add file &&
+		git commit -ma
 	) &&
-	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
+	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"
+	)
 
-[master ed4d665] target message subject line
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/submodule/.git/
+[master (root-commit) 18350fc] a
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 218b136] intermediate commit
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/namedsubmodule/.git/
+[master (root-commit) c663a66] 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master ee78bdc] amend! target message subject line
+ create mode 100644 file
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/super/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/super/submodule'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/super/thepath'...
+done.
+[master (root-commit) 7cd7856] add submodules
  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
+ 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 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
+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 &&
 
-[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
+	(
+		cd namedsubmodule &&
+		echo 2 >>file &&
+		git add file &&
+		git commit -m2
+	) &&
+	mv namedsubmodule newnamedsubmodule &&
 
-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 &&
+	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 a94321d] target message subject line
+[master 8063db2] b
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 7600d55] intermediate commit
+ 1 file changed, 1 insertion(+)
+[master 35c4e2f] 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 32 - --fixup=amend: error out with -m option
+fatal: '/build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/submodule' does not appear to be a git repository
+fatal: Could not read from remote repository.
 
-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~)
+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.45.2/t/trash directory.t7420-submodule-set-url/newsubmodule
+   18350fc..8063db2  master     -> origin/master
+Submodule path 'submodule': checked out '8063db2e93a425b6bc293b09198d2c4c1480f345'
+From /build/reproducible-path/git-2.45.2/t/trash directory.t7420-submodule-set-url/newnamedsubmodule
+   c663a66..35c4e2f  master     -> origin/master
+Submodule path 'thepath': checked out '35c4e2f484f028248d55b9394adcdfb7266988b7'
+ok 3 - test submodule set-url
 
-	$(get_commit_msg HEAD~)
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7419-submodule-set-branch.sh ***
+expecting success of 7419.1 'setup': 
+	git config --global protocol.file.allow always
 
-	edited 1
+ok 1 - setup
 
-	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
+expecting success of 7419.2 'submodule config cache setup': 
+	mkdir submodule &&
+	(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
 	) &&
-	get_commit_msg HEAD >actual &&
-	test_cmp expected actual
+	mkdir super &&
+	(cd super &&
+		git init &&
+		git submodule add ../submodule &&
+		git submodule add --name thename ../submodule thepath &&
+		git commit -m "add submodules"
+	)
 
-[master 2a99715] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-[master 550158e] intermediate commit
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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(+)
-[master 38fd587] amend! target message subject line
+ create mode 100644 a
+Switched to a new branch 'topic'
+[topic 45d819c] b
  Author: A U Thor <author@example.com>
-[master 1a502bb] amend! amend! target message subject line
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7419-submodule-set-branch/super/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7419-submodule-set-branch/super/submodule'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7419-submodule-set-branch/super/thepath'...
+done.
+[main (root-commit) 4a5a70f] add submodules
  Author: A U Thor <author@example.com>
-ok 33 - consecutive amend! commits remove amend! line from commit msg body
+ 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 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
+expecting success of 7419.3 'ensure submodule branch is unset': 
+	(cd super &&
+		test_cmp_config "" -f .gitmodules --default "" submodule.submodule.branch
+	)
 
-[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
+ok 3 - ensure submodule branch is unset
 
-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
+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
+	)
 
-[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
+Submodule path 'submodule': checked out '45d819cbb56645efda7287cb1bc7f96dd0799fdf'
+ok 4 - test submodule set-branch --branch
 
-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 &&
+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 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
+Submodule path 'submodule': checked out '7bdc13c17e1ff773030305cc5b258dbdef46a565'
+ok 5 - test submodule set-branch --default
 
-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 &&
+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 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 &&
+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
-	
-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 &&
+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
-	
-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
+Submodule path 'thepath': checked out '45d819cbb56645efda7287cb1bc7f96dd0799fdf'
+ok 8 - test submodule set-branch --branch with named submodule
 
-[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 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
+	)
 
-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
+Submodule path 'thepath': checked out '7bdc13c17e1ff773030305cc5b258dbdef46a565'
+ok 9 - test submodule set-branch --default with named submodule
 
-ok 42 - --fixup=reword: -F give error message
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7421-submodule-summary-add.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/.git/
+expecting success of 7421.1 'setup': 
+	git config --global protocol.file.allow always
 
-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"
+ok 1 - setup
 
-[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 7421.2 'summary test environment setup': 
+	git init sm &&
+	test_commit -C sm "add file" file file-content file-tag &&
 
-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"
+	git submodule add ./sm my-subm &&
+	test_tick &&
+	git commit -m "add submodule"
 
-[master 34d018d] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 9280558] intermediate commit
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/sm/.git/
+[master (root-commit) 35b40f1] add file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 74b4402] squash! target message subject line
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/my-subm'...
+done.
+[master (root-commit) 0d0296a] add submodule
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 44 - commit --squash works with -m
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 my-subm
+ok 2 - summary test environment setup
 
-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"
+expecting success of 7421.3 'submodule summary output for initialized submodule': 
+	test_commit -C sm "add file2" file2 file2-content file2-tag &&
+	git submodule update --remote &&
+	test_tick &&
+	git commit -m "update submodule" my-subm &&
+	git submodule summary HEAD^ >actual &&
+	rev1=$(git -C sm rev-parse --short HEAD^) &&
+	rev2=$(git -C sm rev-parse --short HEAD) &&
+	cat >expected <<-EOF &&
+	* my-subm ${rev1}...${rev2} (1):
+	  > add file2
 
-[master 6ba9d60] target message subject line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master a1fa052] intermediate commit
+	EOF
+	test_cmp expected actual
+
+[master dbd5fc8] add file2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 3059308] squash! target message subject line
+ create mode 100644 file2
+From /build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/sm
+   35b40f1..dbd5fc8  master     -> origin/master
+ * [new tag]         file2-tag  -> file2-tag
+Submodule path 'my-subm': checked out 'dbd5fc8f8fdf3ce2b5f5235cf1be586e62b60698'
+[master c7068f0] update submodule
  Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
-ok 45 - commit --squash works with -C
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - submodule summary output for initialized submodule
 
-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"
+expecting success of 7421.4 'submodule summary output for deinitialized submodule': 
+	git submodule deinit my-subm &&
+	git submodule summary HEAD^ >actual &&
+	test_must_be_empty actual &&
+	git submodule update --init my-subm &&
+	git submodule summary HEAD^ >actual &&
+	rev1=$(git -C sm rev-parse --short HEAD^) &&
+	rev2=$(git -C sm rev-parse --short HEAD) &&
+	cat >expected <<-EOF &&
+	* my-subm ${rev1}...${rev2} (1):
+	  > add file2
 
-[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
+	EOF
+	test_cmp expected actual
 
-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"
+Cleared directory 'my-subm'
+Submodule 'my-subm' (./sm) unregistered for path 'my-subm'
+warning: could not look up configuration 'remote.origin.url'. Assuming this repository is its own authoritative upstream.
+Submodule 'my-subm' (/build/reproducible-path/git-2.45.2/t/trash directory.t7421-submodule-summary-add/sm) registered for path 'my-subm'
+Submodule path 'my-subm': checked out 'dbd5fc8f8fdf3ce2b5f5235cf1be586e62b60698'
+ok 4 - submodule summary output for deinitialized submodule
 
-[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 7421.5 'submodule summary output for submodules with changed paths': 
+	git mv my-subm subm &&
+	git commit -m "change submodule path" &&
+	rev=$(git -C sm rev-parse --short HEAD^) &&
+	git submodule summary HEAD^^ -- my-subm >actual 2>err &&
+	test_must_be_empty err &&
+	cat >expected <<-EOF &&
+	* my-subm ${rev}...0000000:
 
-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"
+	EOF
+	test_cmp expected actual
 
-[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
+[master 02e2066] change submodule path
  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
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename my-subm => subm (100%)
+ok 5 - submodule summary output for submodules with changed paths
 
-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"
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7423-submodule-symlinks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/.git/
+expecting success of 7423.1 'prepare': 
+	git config --global protocol.file.allow always &&
+	test_commit initial &&
+	git init upstream &&
+	test_commit -C upstream upstream submodule_file &&
+	git submodule add ./upstream a/sm &&
+	test_tick &&
+	git commit -m submodule
 
-[master acfdcf4] target message subject line
+[master (root-commit) 24b24cf] initial
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 5a82cf8] intermediate commit
+ create mode 100644 initial.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/upstream/.git/
+[master (root-commit) 8435948] upstream
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 8042530] squash! target message subject line
+ create mode 100644 submodule_file
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/a/sm'...
+done.
+[master e6b5e91] submodule
  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
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 a/sm
+ok 1 - prepare
 
-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
+checking prerequisite: SYMLINKS
 
-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
+mkdir -p "$TRASH_DIRECTORY/prereq-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 '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
+)
+prerequisite SYMLINKS ok
+expecting success of 7423.2 'git submodule update must not create submodule behind symlink': 
+	rm -rf a b &&
+	mkdir b &&
+	ln -s b a &&
+	test_path_is_missing b/sm &&
+	test_must_fail git submodule update &&
+	test_path_is_missing b/sm
 
-expecting success of 7500.52 'setup empty commit with unstaged rename and copy': 
-	test_create_repo unstaged_rename_and_copy &&
-	(
-		cd unstaged_rename_and_copy &&
+error: expected 'a' in submodule path 'a/sm' not to be a symbolic link
+Failed to clone 'a/sm'. Retry scheduled
+error: expected 'a' in submodule path 'a/sm' not to be a symbolic link
+Failed to clone 'a/sm' a second time, aborting
+ok 2 - git submodule update must not create submodule behind symlink
 
-		echo content >orig &&
-		git add orig &&
-		test_commit orig &&
+checking prerequisite: CASE_INSENSITIVE_FS
 
-		cp orig new_copy &&
-		mv orig new_rename &&
-		git add -N new_copy new_rename
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 3 # skip git submodule update must not create submodule behind symlink on case insensitive fs (missing CASE_INSENSITIVE_FS of SYMLINKS,CASE_INSENSITIVE_FS)
 
-expecting success of 7500.53 'check commit with unstaged rename and copy': 
-	(
-		cd unstaged_rename_and_copy &&
+expecting success of 7423.4 'git restore --recurse-submodules must not be confused by a symlink': 
+	prepare_symlink_to_repo &&
+	test_must_fail git restore --recurse-submodules a/sm &&
+	test_path_is_missing a/sm/submodule_file &&
+	test_path_is_dir a/target/.git &&
+	test_path_is_missing a/target/submodule_file
 
-		test_must_fail git -c diff.renames=copy commit
-	)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/a/target/.git/
+From ../../upstream
+ * branch            HEAD       -> FETCH_HEAD
+error: expected submodule path 'a/sm' not to be a symbolic link
+ok 4 - git restore --recurse-submodules must not be confused by a symlink
 
-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
+expecting success of 7423.5 'git restore --recurse-submodules must not migrate git dir of symlinked repo': 
+	prepare_symlink_to_repo &&
+	rm -rf .git/modules &&
+	test_must_fail git restore --recurse-submodules a/sm &&
+	test_path_is_dir a/target/.git &&
+	test_path_is_missing .git/modules/a/sm &&
+	test_path_is_missing a/target/submodule_file
 
-no changes added to commit (use "git add" and/or "git commit -a")
-ok 53 - check commit with unstaged rename and copy
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/a/target/.git/
+From ../../upstream
+ * branch            HEAD       -> FETCH_HEAD
+error: expected submodule path 'a/sm' not to be a symbolic link
+ok 5 - git restore --recurse-submodules must not migrate git dir of symlinked repo
 
-expecting success of 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
+expecting success of 7423.6 'git checkout -f --recurse-submodules must not migrate git dir of symlinked repo when removing submodule': 
+	prepare_symlink_to_repo &&
+	rm -rf .git/modules &&
+	test_must_fail git checkout -f --recurse-submodules initial &&
+	test_path_is_dir a/target/.git &&
+	test_path_is_missing .git/modules/a/sm
 
-[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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7423-submodule-symlinks/a/target/.git/
+From ../../upstream
+ * branch            HEAD       -> FETCH_HEAD
+error: expected submodule path 'a/sm' not to be a symbolic link
+ok 6 - git checkout -f --recurse-submodules must not migrate git dir of symlinked repo when removing submodule
 
-# passed all 54 test(s)
-1..54
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7406-submodule-update.sh ***
@@ -459553,1075 +456858,2810 @@
 	 test_cmp expected actual
 	)
 
-[detached HEAD 3a6f187] added submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 8 insertions(+)
- create mode 160000 deeper/submodule
- create mode 160000 s1
-Cloning into 'super2'...
-done.
-Note: switching to '3a6f1872cb4f0ffb018914be6f6215cb5d81f789'.
+[detached HEAD 3a6f187] added submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 8 insertions(+)
+ create mode 160000 deeper/submodule
+ create mode 160000 s1
+Cloning into 'super2'...
+done.
+Note: switching to '3a6f1872cb4f0ffb018914be6f6215cb5d81f789'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+Submodule 'deeper/submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/submodule) registered for path 'deeper/submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super2/deeper/submodule'...
+done.
+Skipping submodule 'none'
+Submodule path 'deeper/submodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
+ok 47 - submodule update places git-dir in superprojects git-dir
+
+expecting success of 7406.48 'submodule add places git-dir in superprojects git-dir recursive': 
+	(cd super2 &&
+	 (cd deeper/submodule &&
+	  git submodule add ../submodule subsubmodule &&
+	  (cd subsubmodule &&
+	   git log > ../../../expected
+	  ) &&
+	  git commit -m "added subsubmodule" &&
+	  git push origin :
+	 ) &&
+	 (cd .git/modules/deeper/submodule/modules/subsubmodule &&
+	  git log > ../../../../../actual
+	 ) &&
+	 git add deeper/submodule &&
+	 git commit -m "update submodule" &&
+	 git push origin : &&
+	 test_cmp expected actual
+	)
+
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super2/deeper/submodule/subsubmodule'...
+done.
+[detached HEAD 0642c0f] added subsubmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsubmodule
+Everything up-to-date
+[detached HEAD 7b048b2] update submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Everything up-to-date
+ok 48 - submodule add places git-dir in superprojects git-dir recursive
+
+expecting success of 7406.49 'submodule update places git-dir in superprojects git-dir recursive': 
+	mkdir super_update_r &&
+	(cd super_update_r &&
+	 git init --bare
+	) &&
+	mkdir subsuper_update_r &&
+	(cd subsuper_update_r &&
+	 git init --bare
+	) &&
+	mkdir subsubsuper_update_r &&
+	(cd subsubsuper_update_r &&
+	 git init --bare
+	) &&
+	git clone subsubsuper_update_r subsubsuper_update_r2 &&
+	(cd subsubsuper_update_r2 &&
+	 test_commit "update_subsubsuper" file &&
+	 git push origin main
+	) &&
+	git clone subsuper_update_r subsuper_update_r2 &&
+	(cd subsuper_update_r2 &&
+	 test_commit "update_subsuper" file &&
+	 git submodule add ../subsubsuper_update_r subsubmodule &&
+	 git commit -am "subsubmodule" &&
+	 git push origin main
+	) &&
+	git clone super_update_r super_update_r2 &&
+	(cd super_update_r2 &&
+	 test_commit "update_super" file &&
+	 git submodule add ../subsuper_update_r submodule &&
+	 git commit -am "submodule" &&
+	 git push origin main
+	) &&
+	rm -rf super_update_r2 &&
+	git clone super_update_r super_update_r2 &&
+	(cd super_update_r2 &&
+	 git submodule update --init --recursive >actual &&
+	 test_grep "Submodule path .submodule/subsubmodule.: checked out" actual &&
+	 (cd submodule/subsubmodule &&
+	  git log > ../../expected
+	 ) &&
+	 (cd .git/modules/submodule/modules/subsubmodule &&
+	  git log > ../../../../../actual
+	 ) &&
+	 test_cmp expected actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsubsuper_update_r/
+Cloning into 'subsubsuper_update_r2'...
+warning: You appear to have cloned an empty repository.
+done.
+[main (root-commit) 0d20a78] update_subsubsuper
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+To /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsubsuper_update_r
+ * [new branch]      main -> main
+Cloning into 'subsuper_update_r2'...
+warning: You appear to have cloned an empty repository.
+done.
+[main (root-commit) 635883b] update_subsuper
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r2/subsubmodule'...
+done.
+[main 86a3496] subsubmodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 subsubmodule
+To /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r
+ * [new branch]      main -> main
+Cloning into 'super_update_r2'...
+warning: You appear to have cloned an empty repository.
+done.
+[main (root-commit) c2de1fa] update_super
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
+done.
+[main 2d70acb] submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule
+To /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r
+ * [new branch]      main -> main
+Cloning into 'super_update_r2'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
+done.
+Submodule 'subsubmodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r2/submodule/subsubmodule'...
+done.
+Submodule path 'submodule/subsubmodule': checked out '0d20a783d558db53f3b7ea74da7db3bb1a32b21b'
+ok 49 - submodule update places git-dir in superprojects git-dir recursive
+
+expecting success of 7406.50 'submodule add properly re-creates deeper level submodules': 
+	(cd super &&
+	 git reset --hard main &&
+	 rm -rf deeper/ &&
+	 git submodule add --force ../submodule deeper/submodule
+	)
+
+warning: unable to rmdir 'deeper/submodule': Directory not empty
+warning: unable to rmdir 's1': Directory not empty
+HEAD is now at 45a22d0 two_new_submodule_commits
+Reactivating local git directory for submodule 'deeper/submodule'
+ok 50 - submodule add properly re-creates deeper level submodules
+
+expecting success of 7406.51 'submodule update properly revives a moved submodule': 
+	(cd super &&
+	 H=$(git rev-parse --short HEAD) &&
+	 git commit -am "pre move" &&
+	 H2=$(git rev-parse --short HEAD) &&
+	 git status >out &&
+	 sed "s/$H/XXX/" out >expect &&
+	 H=$(cd submodule2 && git rev-parse HEAD) &&
+	 git rm --cached submodule2 &&
+	 rm -rf submodule2 &&
+	 mkdir -p "moved/sub module" &&
+	 git update-index --add --cacheinfo 160000 $H "moved/sub module" &&
+	 git config -f .gitmodules submodule.submodule2.path "moved/sub module" &&
+	 git commit -am "post move" &&
+	 git submodule update &&
+	 git status > out &&
+	 sed "s/$H2/XXX/" out >actual &&
+	 test_cmp expect actual
+	)
+
+[detached HEAD d262110] pre move
+ Author: A U Thor <author@example.com>
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+ create mode 160000 deeper/submodule
+rm 'submodule2'
+[detached HEAD db0a21b] post move
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename submodule2 => moved/sub module (100%)
+Skipping submodule 'none'
+Submodule path 'moved/sub module': checked out '9f300bf70a08f60a240990d98de1aaa8040994a1'
+ok 51 - submodule update properly revives a moved submodule
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+expecting success of 7406.52 'submodule update can handle symbolic links in pwd': 
+	mkdir -p linked/dir &&
+	ln -s linked/dir linkto &&
+	(cd linkto &&
+	 git clone "$TRASH_DIRECTORY"/super_update_r2 super &&
+	 (cd super &&
+	  git submodule update --init --recursive
+	 )
+	)
+
+Cloning into 'super'...
+done.
+Submodule 'submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/linked/dir/super/submodule'...
+done.
+Submodule path 'submodule': checked out '86a3496a1d60636ce953ea5245c2a0f63a7a2aa8'
+Submodule 'subsubmodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/linked/dir/super/submodule/subsubmodule'...
+done.
+Submodule path 'submodule/subsubmodule': checked out '0d20a783d558db53f3b7ea74da7db3bb1a32b21b'
+ok 52 - submodule update can handle symbolic links in pwd
+
+expecting success of 7406.53 'submodule update clone shallow submodule': 
+	test_when_finished "rm -rf super3" &&
+	first=$(git -C cloned rev-parse HEAD:submodule) &&
+	second=$(git -C submodule rev-parse HEAD) &&
+	commit_count=$(git -C submodule rev-list --count $first^..$second) &&
+	git clone cloned super3 &&
+	pwd=$(pwd) &&
+	(
+		cd super3 &&
+		sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
+		mv -f .gitmodules.tmp .gitmodules &&
+		git submodule update --init --depth=$commit_count &&
+		git -C submodule log --oneline >out &&
+		test_line_count = 1 out
+	)
+
+Cloning into 'super3'...
+done.
+Submodule 'merging' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super3/merging'...
+Skipping submodule 'none'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super3/rebasing'...
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super3/submodule'...
+Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 53 - submodule update clone shallow submodule
+
+expecting success of 7406.54 'submodule update clone shallow submodule outside of depth': 
+	test_when_finished "rm -rf super3" &&
+	git clone cloned super3 &&
+	pwd=$(pwd) &&
+	(
+		cd super3 &&
+		sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
+		mv -f .gitmodules.tmp .gitmodules &&
+		# Some protocol versions (e.g. 2) support fetching
+		# unadvertised objects, so restrict this test to v0.
+		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
+			git submodule update --init --depth=1 2>actual &&
+		test_grep "Direct fetching of that commit failed." actual &&
+		git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
+		git submodule update --init --depth=1 >actual &&
+		git -C submodule log --oneline >out &&
+		test_line_count = 1 out
+	)
+
+Cloning into 'super3'...
+done.
+Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+fatal: Fetched in submodule path 'submodule', but it did not contain 4301fd3e4110d3b6212c19aed3094150392545b9. Direct fetching of that commit failed.
+Skipping submodule 'none'
+From file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/submodule
+ * branch            4301fd3e4110d3b6212c19aed3094150392545b9 -> FETCH_HEAD
+ok 54 - submodule update clone shallow submodule outside of depth
+
+expecting success of 7406.55 'submodule update --recursive drops module name before recursing': 
+	(cd super2 &&
+	 (cd deeper/submodule/subsubmodule &&
+	  git checkout HEAD^
+	 ) &&
+	 git submodule update --recursive deeper/submodule >actual &&
+	 test_grep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
+	)
+
+Note: switching to 'HEAD^'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 2758ea9 upstream line4
+Submodule path 'deeper/submodule/subsubmodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
+ok 55 - submodule update --recursive drops module name before recursing
+
+expecting success of 7406.56 'submodule update can be run in parallel': 
+	(cd super2 &&
+	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 &&
+	 grep "7 tasks" trace.out &&
+	 git config submodule.fetchJobs 8 &&
+	 GIT_TRACE=$(pwd)/trace.out git submodule update &&
+	 grep "8 tasks" trace.out &&
+	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 &&
+	 grep "9 tasks" trace.out
+	)
+
+Skipping submodule 'none'
+run_processes_parallel: preparing to run up to 7 tasks
+Skipping submodule 'none'
+run_processes_parallel: preparing to run up to 8 tasks
+Skipping submodule 'none'
+run_processes_parallel: preparing to run up to 9 tasks
+ok 56 - submodule update can be run in parallel
+
+expecting success of 7406.57 'git clone passes the parallel jobs config on to submodules': 
+	test_when_finished "rm -rf super4" &&
+	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 &&
+	grep "7 tasks" trace.out &&
+	rm -rf super4 &&
+	git config --global submodule.fetchJobs 8 &&
+	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 &&
+	grep "8 tasks" trace.out &&
+	rm -rf super4 &&
+	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 &&
+	grep "9 tasks" trace.out &&
+	rm -rf super4
+
+Cloning into 'super4'...
+done.
+run_processes_parallel: preparing to run up to 7 tasks
+Cloning into 'super4'...
+done.
+run_processes_parallel: preparing to run up to 8 tasks
+Cloning into 'super4'...
+done.
+run_processes_parallel: preparing to run up to 9 tasks
+ok 57 - git clone passes the parallel jobs config on to submodules
+
+expecting success of 7406.58 'submodule update --quiet passes quietness to merge/rebase': 
+	(cd super &&
+	 test_commit -C rebasing message &&
+	 git submodule update --rebase --quiet >out 2>err &&
+	 test_must_be_empty out &&
+	 test_must_be_empty err &&
+	 git submodule update --rebase >out 2>err &&
+	 test_file_not_empty out &&
+	 test_must_be_empty err
+	)
+
+[main 271c4a7] message
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 message.t
+ok 58 - submodule update --quiet passes quietness to merge/rebase
+
+expecting success of 7406.59 'submodule update --quiet passes quietness to fetch with a shallow clone': 
+	test_when_finished "rm -rf super4 super5 super6" &&
+	git clone . super4 &&
+	(cd super4 &&
+	 git submodule add --quiet file://"$TRASH_DIRECTORY"/submodule submodule3 &&
+	 git commit -am "setup submodule3"
+	) &&
+	(cd submodule &&
+	  test_commit line6 file
+	) &&
+	git clone super4 super5 &&
+	(cd super5 &&
+	 git submodule update --quiet --init --depth=1 submodule3 >out 2>err &&
+	 test_must_be_empty out &&
+	 test_must_be_empty err
+	) &&
+	git clone super4 super6 &&
+	(cd super6 &&
+	 git submodule update --init --depth=1 submodule3 >out 2>err &&
+	 test_file_not_empty out &&
+	 test_file_not_empty err
+	)
+
+Cloning into 'super4'...
+done.
+[main 020c4e0] setup submodule3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 submodule3
+[main a93a1f3] line6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+Cloning into 'super5'...
+done.
+Cloning into 'super6'...
+done.
+ok 59 - submodule update --quiet passes quietness to fetch with a shallow clone
+
+expecting success of 7406.60 'submodule update --filter requires --init': 
+	test_expect_code 129 git -C super submodule update --filter blob:none
+
+usage: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
+
+    -f, --[no-]force      force checkout updates
+    --[no-]init           initialize uninitialized submodules before update
+    --[no-]remote         use SHA-1 of submodule's remote tracking branch
+    --[no-]recursive      traverse submodules recursively
+    -N, --no-fetch        don't fetch new objects from the remote site
+    --fetch               opposite of --no-fetch
+    --[no-]checkout       use the 'checkout' update strategy (default)
+    -m, --[no-]merge      use the 'merge' update strategy
+    -r, --[no-]rebase     use the 'rebase' update strategy
+    --[no-]reference <repo>
+                          reference repository
+    --[no-]dissociate     use --reference only while cloning
+    --[no-]depth <n>      create a shallow clone truncated to the specified number of revisions
+    -j, --[no-]jobs <n>   parallel jobs
+    --[no-]recommend-shallow
+                          whether the initial clone should follow the shallow recommendation
+    -q, --[no-]quiet      don't print cloning progress
+    --[no-]progress       force cloning progress
+    --[no-]require-init   disallow cloning into non-empty directory, implies --init
+    --[no-]single-branch  clone only one branch, HEAD or --branch
+    --[no-]filter <args>  object filtering
+
+ok 60 - submodule update --filter requires --init
+
+expecting success of 7406.61 'submodule update --filter sets partial clone settings': 
+	test_when_finished "rm -rf super-filter" &&
+	git clone cloned super-filter &&
+	git -C super-filter submodule update --init --filter blob:none &&
+	test_cmp_config -C super-filter/submodule true remote.origin.promisor &&
+	test_cmp_config -C super-filter/submodule blob:none remote.origin.partialclonefilter
+
+Cloning into 'super-filter'...
+done.
+Submodule 'merging' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
+Submodule 'none' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/none) registered for path 'none'
+Submodule 'rebasing' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
+Submodule 'submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super-filter/merging'...
+warning: --filter is ignored in local clones; use file:// instead.
+done.
+Skipping submodule 'none'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super-filter/rebasing'...
+warning: --filter is ignored in local clones; use file:// instead.
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super-filter/submodule'...
+warning: --filter is ignored in local clones; use file:// instead.
+done.
+Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
+Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
+ok 61 - submodule update --filter sets partial clone settings
+
+expecting success of 7406.62 'setup clean recursive superproject': 
+	git init bottom &&
+	test_commit -C bottom "bottom" &&
+	git init middle &&
+	git -C middle submodule add ../bottom bottom &&
+	git -C middle commit -m "middle" &&
+	git init top &&
+	git -C top submodule add ../middle middle &&
+	git -C top commit -m "top" &&
+	git clone --recurse-submodules top top-clean
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/bottom/.git/
+[main (root-commit) 581bdeb] bottom
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bottom.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle/bottom'...
+done.
+[main (root-commit) 8c7b95e] middle
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 bottom
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/top/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/top/middle'...
+done.
+[main (root-commit) ab8145a] top
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 middle
+Cloning into 'top-clean'...
+done.
+Submodule 'middle' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle) registered for path 'middle'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/top-clean/middle'...
+done.
+Submodule path 'middle': checked out '8c7b95e494a2782f61ae9299ca15d668e545d9a8'
+Submodule 'bottom' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/bottom) registered for path 'middle/bottom'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/top-clean/middle/bottom'...
+done.
+Submodule path 'middle/bottom': checked out '581bdebe7becb965f64fee4b6315195d6f9b87df'
+ok 62 - setup clean recursive superproject
+
+expecting success of 7406.63 'submodule update should skip unmerged submodules': 
+	test_when_finished "rm -fr top-cloned" &&
+	cp -r top-clean top-cloned &&
+
+	# Create an upstream commit in each repo, starting with bottom
+	test_commit -C bottom upstream_commit &&
+	# Create middle commit
+	git -C middle/bottom fetch &&
+	git -C middle/bottom checkout -f FETCH_HEAD &&
+	git -C middle add bottom &&
+	git -C middle commit -m "upstream_commit" &&
+	# Create top commit
+	git -C top/middle fetch &&
+	git -C top/middle checkout -f FETCH_HEAD &&
+	git -C top add middle &&
+	git -C top commit -m "upstream_commit" &&
+
+	# Create a downstream conflict
+	test_commit -C top-cloned/middle/bottom downstream_commit &&
+	git -C top-cloned/middle add bottom &&
+	git -C top-cloned/middle commit -m "downstream_commit" &&
+	git -C top-cloned/middle fetch --recurse-submodules origin &&
+	test_must_fail git -C top-cloned/middle merge origin/main &&
+
+	# Make the update of "middle" a no-op, otherwise we error out
+	# because of its unmerged state
+	test_config -C top-cloned submodule.middle.update !true &&
+	git -C top-cloned submodule update --recursive 2>actual.err &&
+	cat >expect.err <<-\EOF &&
+	Skipping unmerged submodule middle/bottom
+	EOF
+	test_cmp expect.err actual.err
+
+[main 1214144] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream_commit.t
+From /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/bottom
+   581bdeb..1214144  main            -> origin/main
+ * [new tag]         upstream_commit -> upstream_commit
+Note: switching to 'FETCH_HEAD'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 1214144 upstream_commit
+[main 02206c0] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle
+   8c7b95e..02206c0  main       -> origin/main
+Note: switching to 'FETCH_HEAD'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 02206c0 upstream_commit
+[main 3de434e] upstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[detached HEAD 732f4af] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 downstream_commit.t
+[detached HEAD bd1874b] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+From /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle
+   8c7b95e..02206c0  main       -> origin/main
+Fetching submodule bottom
+From /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/bottom
+   581bdeb..1214144  main            -> origin/main
+ * [new tag]         upstream_commit -> upstream_commit
+hint: Recursive merging with submodules currently only supports trivial cases.
+hint: Please manually handle the merging of each conflicted submodule.
+hint: This can be accomplished with the following steps:
+hint:  - go to submodule (bottom), and either merge commit 1214144
+hint:    or update to an existing commit which has merged those changes
+hint:  - come back to superproject and run:
+hint:
+hint:       git add bottom
+hint:
+hint:    to record the above merge or update
+hint:  - resolve any other conflicts in the superproject
+hint:  - commit the resulting index in the superproject
+hint:
+hint: Disable this message with "git config advice.submoduleMergeConflict false"
+Failed to merge submodule bottom
+CONFLICT (submodule): Merge conflict in bottom
+Automatic merge failed; fix conflicts and then commit the result.
+Submodule path 'middle': 'true 8c7b95e494a2782f61ae9299ca15d668e545d9a8'
+ok 63 - submodule update should skip unmerged submodules
+
+expecting success of 7406.64 'submodule update --recursive skip submodules with strategy=none': 
+	test_when_finished "rm -fr top-cloned" &&
+	cp -r top-clean top-cloned &&
+
+	test_commit -C top-cloned/middle/bottom downstream_commit &&
+	git -C top-cloned/middle config submodule.bottom.update none &&
+	git -C top-cloned submodule update --recursive 2>actual.err &&
+	cat >expect.err <<-\EOF &&
+	Skipping submodule 'middle/bottom'
+	EOF
+	test_cmp expect.err actual.err
+
+[detached HEAD 4ad2ba9] downstream_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 downstream_commit.t
+ok 64 - submodule update --recursive skip submodules with strategy=none
+
+expecting success of 7406.65 'commit with staged submodule change': 
+	add_submodule_commit_and_validate
+
+[main f3de040] create submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 160000 sub
+ok 65 - commit with staged submodule change
+
+expecting success of 7406.66 'commit with staged submodule change with ignoreSubmodules dirty': 
+	test_config diff.ignoreSubmodules dirty &&
+	add_submodule_commit_and_validate
+
+[main 9dbf457] create submodule
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 66 - commit with staged submodule change with ignoreSubmodules dirty
+
+expecting success of 7406.67 'commit with staged submodule change with ignoreSubmodules all': 
+	test_config diff.ignoreSubmodules all &&
+	add_submodule_commit_and_validate
+
+[main 70ee70e] create submodule
+ Author: A U Thor <author@example.com>
+ok 67 - commit with staged submodule change with ignoreSubmodules all
+
+checking prerequisite: CASE_INSENSITIVE_FS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-CASE_INSENSITIVE_FS" &&
+	echo good >CamelCase &&
+	echo bad >camelcase &&
+	test "$(cat CamelCase)" != good
+
+)
+prerequisite CASE_INSENSITIVE_FS not satisfied
+ok 68 # skip submodule paths must not follow symlinks (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
+
+# passed all 68 test(s)
+1..68
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7422-submodule-output.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/.git/
+expecting success of 7422.1 'setup': 
+	test_commit A &&
+	test_commit B &&
+	setup_sub S  &&
+	setup_sub S.D &&
+	setup_sub S.C &&
+	setup_sub S.C.D &&
+	setup_sub X &&
+	git add S* &&
+	test_commit C &&
+
+	# recursive in X/
+	git -C X pull &&
+	GIT_ALLOW_PROTOCOL=file git -C X submodule update --init &&
+
+	# dirty
+	for d in S.D X/S.D
+	do
+		echo dirty >"$d"/A.t || return 1
+	done &&
+
+	# commit (for --cached)
+	for d in S.C* X/S.C*
+	do
+		git -C "$d" reset --hard A || return 1
+	done &&
+
+	# dirty
+	for d in S*.D X/S*.D
+	do
+		echo dirty >"$d/C2.t" || return 1
+	done &&
+
+	for ref in A B C
+	do
+		# Not different with SHA-1 and SHA-256, just (ab)using
+		# test_oid_cache as a variable bag to avoid using
+		# $(git rev-parse ...).
+		oid=$(git rev-parse $ref) &&
+		test_oid_cache <<-EOF || return 1
+		$ref sha1:$oid
+		$ref sha256:$oid
+		EOF
+	done
+
+[master (root-commit) 0ddfaf1] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master d9df450] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Cloning into 'S'...
+done.
+Adding existing repo at 'S' to the index
+Cloning into 'S.D'...
+done.
+Adding existing repo at 'S.D' to the index
+Cloning into 'S.C'...
+done.
+Adding existing repo at 'S.C' to the index
+Cloning into 'S.C.D'...
+done.
+Adding existing repo at 'S.C.D' to the index
+Cloning into 'X'...
+done.
+Adding existing repo at 'X' to the index
+[master 2377ff0] C
+ Author: A U Thor <author@example.com>
+ 7 files changed, 21 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 C.t
+ create mode 160000 S
+ create mode 160000 S.C
+ create mode 160000 S.C.D
+ create mode 160000 S.D
+ create mode 160000 X
+From /build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/.
+   d9df450..2377ff0  master     -> origin/master
+ * [new tag]         C          -> C
+Updating d9df450..2377ff0
+Fast-forward
+ .gitmodules | 15 +++++++++++++++
+ C.t         |  1 +
+ S           |  1 +
+ S.C         |  1 +
+ S.C.D       |  1 +
+ S.D         |  1 +
+ X           |  1 +
+ 7 files changed, 21 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 100644 C.t
+ create mode 160000 S
+ create mode 160000 S.C
+ create mode 160000 S.C.D
+ create mode 160000 S.D
+ create mode 160000 X
+Submodule 'S' (/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/./S) registered for path 'S'
+Submodule 'S.C' (/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/./S.C) registered for path 'S.C'
+Submodule 'S.C.D' (/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/./S.C.D) registered for path 'S.C.D'
+Submodule 'S.D' (/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/./S.D) registered for path 'S.D'
+Submodule 'X' (/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/./X) registered for path 'X'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/S'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/S.C'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/S.C.D'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/S.D'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7422-submodule-output/X/X'...
+done.
+Submodule path 'S': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+Submodule path 'S.C': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+Submodule path 'S.C.D': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+Submodule path 'S.D': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+Submodule path 'X': checked out 'd9df4505cb3522088b9e29d6051ac16f1564154a'
+HEAD is now at 0ddfaf1 A
+HEAD is now at 0ddfaf1 A
+HEAD is now at 0ddfaf1 A
+HEAD is now at 0ddfaf1 A
+ok 1 - setup
+
+expecting success of 7422.2 'git submodule ': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid A) S.C (A)
+		>+$(test_oid A) S.C.D (A)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid C) X (C)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 2 - git submodule 
+
+expecting success of 7422.3 'git submodule status': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid A) S.C (A)
+		>+$(test_oid A) S.C.D (A)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid C) X (C)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 3 - git submodule status
+
+expecting success of 7422.4 'git submodule status --recursive': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid A) S.C (A)
+		>+$(test_oid A) S.C.D (A)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid C) X (C)
+		> $(test_oid B) X/S (B)
+		>+$(test_oid A) X/S.C (A)
+		>+$(test_oid A) X/S.C.D (A)
+		> $(test_oid B) X/S.D (B)
+		> $(test_oid B) X/X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 4 - git submodule status --recursive
+
+expecting success of 7422.5 'git submodule --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 5 - git submodule --quiet
+
+expecting success of 7422.6 'git submodule --quiet status': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 6 - git submodule --quiet status
+
+expecting success of 7422.7 'git submodule status --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 7 - git submodule status --quiet
+
+expecting success of 7422.8 'git submodule --cached': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 8 - git submodule --cached
+
+expecting success of 7422.9 'git submodule --cached status': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 9 - git submodule --cached status
+
+expecting success of 7422.10 'git submodule status --cached': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 10 - git submodule status --cached
+
+expecting success of 7422.11 'git submodule --cached --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 11 - git submodule --cached --quiet
+
+expecting success of 7422.12 'git submodule --cached --quiet status': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 12 - git submodule --cached --quiet status
+
+expecting success of 7422.13 'git submodule --cached status --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 13 - git submodule --cached status --quiet
+
+expecting success of 7422.14 'git submodule --quiet status --cached': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 14 - git submodule --quiet status --cached
+
+expecting success of 7422.15 'git submodule status --cached --quiet': 
+		git submodule $opts >out &&
+		test_must_be_empty out
+	
+ok 15 - git submodule status --cached --quiet
+
+expecting success of 7422.16 'git submodule status --cached --recursive': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		> $(test_oid B) X/S (B)
+		>+$(test_oid B) X/S.C (B)
+		>+$(test_oid B) X/S.C.D (B)
+		> $(test_oid B) X/S.D (B)
+		> $(test_oid B) X/X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 16 - git submodule status --cached --recursive
+
+expecting success of 7422.17 'git submodule --cached status --recursive': 
+		sed -e "s/^>//" >expect <<-EOF &&
+		> $(test_oid B) S (B)
+		>+$(test_oid B) S.C (B)
+		>+$(test_oid B) S.C.D (B)
+		> $(test_oid B) S.D (B)
+		>+$(test_oid B) X (B)
+		> $(test_oid B) X/S (B)
+		>+$(test_oid B) X/S.C (B)
+		>+$(test_oid B) X/S.C.D (B)
+		> $(test_oid B) X/S.D (B)
+		> $(test_oid B) X/X (B)
+		EOF
+		git submodule $opts >actual.raw &&
+		normalize_status <actual.raw >actual &&
+		test_cmp expect actual
+	
+ok 17 - git submodule --cached status --recursive
+
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7450-bad-git-dotfiles.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/.git/
+expecting success of 7450.1 'setup': 
+	git config --global protocol.file.allow always
+
+ok 1 - setup
+
+expecting success of 7450.2 'check names': 
+	cat >expect <<-\EOF &&
+	valid
+	valid/with/paths
+	EOF
+
+	test-tool submodule check-name >actual <<-\EOF &&
+	valid
+	valid/with/paths
+
+	../foo
+	/../foo
+	..\foo
+	\..\foo
+	foo/..
+	foo/../
+	foo\..
+	foo\..\
+	foo/../bar
+	EOF
+
+	test_cmp expect actual
+
+ok 2 - check names
+
+expecting success of 7450.3 'check urls': 
+	cat >expect <<-\EOF &&
+	./bar/baz/foo.git
+	https://example.com/foo.git
+	http://example.com:80/deeper/foo.git
+	EOF
+
+	test-tool submodule check-url >actual <<-\EOF &&
+	./bar/baz/foo.git
+	https://example.com/foo.git
+	http://example.com:80/deeper/foo.git
+	-a./foo
+	../../..//test/foo.git
+	../../../../../:localhost:8080/foo.git
+	..\../.\../:example.com/foo.git
+	./%0ahost=example.com/foo.git
+	https://one.example.com/evil?%0ahost=two.example.com
+	https:///example.com/foo.git
+	http://example.com:test/foo.git
+	https::example.com/foo.git
+	http:::example.com/foo.git
+	EOF
+
+	test_cmp expect actual
+
+ok 3 - check urls
+
+expecting success of 7450.4 'create innocent subrepo': 
+	git init innocent &&
+	git -C innocent commit --allow-empty -m foo
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/innocent/.git/
+[master (root-commit) 2093db0] foo
+ Author: A U Thor <author@example.com>
+ok 4 - create innocent subrepo
+
+expecting success of 7450.5 'submodule add refuses invalid names': 
+	test_must_fail \
+		git submodule add --name ../../modules/evil "$PWD/innocent" evil
+
+fatal: '../../modules/evil' is not a valid submodule name
+ok 5 - submodule add refuses invalid names
+
+expecting success of 7450.6 'add evil submodule': 
+	git submodule add "$PWD/innocent" evil &&
+
+	mkdir modules &&
+	cp -r .git/modules/evil modules &&
+	write_script modules/evil/hooks/post-checkout <<-\EOF &&
+	echo >&2 "RUNNING POST CHECKOUT"
+	EOF
+
+	git config -f .gitmodules submodule.evil.update checkout &&
+	git config -f .gitmodules --rename-section \
+		submodule.evil submodule.../../modules/evil &&
+	git add modules &&
+	git commit -am evil
+
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/evil'...
+done.
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+[master (root-commit) 4d33dfb] evil
+ Author: A U Thor <author@example.com>
+ 30 files changed, 902 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 evil
+ create mode 100644 modules/evil/HEAD
+ create mode 100644 modules/evil/config
+ create mode 100644 modules/evil/description
+ create mode 100755 modules/evil/hooks/applypatch-msg.sample
+ create mode 100755 modules/evil/hooks/commit-msg.sample
+ create mode 100755 modules/evil/hooks/fsmonitor-watchman.sample
+ create mode 100755 modules/evil/hooks/post-checkout
+ create mode 100755 modules/evil/hooks/post-update.sample
+ create mode 100755 modules/evil/hooks/pre-applypatch.sample
+ create mode 100755 modules/evil/hooks/pre-commit.sample
+ create mode 100755 modules/evil/hooks/pre-merge-commit.sample
+ create mode 100755 modules/evil/hooks/pre-push.sample
+ create mode 100755 modules/evil/hooks/pre-rebase.sample
+ create mode 100755 modules/evil/hooks/pre-receive.sample
+ create mode 100755 modules/evil/hooks/prepare-commit-msg.sample
+ create mode 100755 modules/evil/hooks/push-to-checkout.sample
+ create mode 100755 modules/evil/hooks/sendemail-validate.sample
+ create mode 100755 modules/evil/hooks/update.sample
+ create mode 100644 modules/evil/index
+ create mode 100644 modules/evil/info/exclude
+ create mode 100644 modules/evil/logs/HEAD
+ create mode 100644 modules/evil/logs/refs/heads/master
+ create mode 100644 modules/evil/logs/refs/remotes/origin/HEAD
+ create mode 100644 modules/evil/objects/20/93db06f424f426e05da2ca90f40d2663e89387
+ create mode 100644 modules/evil/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
+ create mode 100644 modules/evil/packed-refs
+ create mode 100644 modules/evil/refs/heads/master
+ create mode 100644 modules/evil/refs/remotes/origin/HEAD
+ok 6 - add evil submodule
+
+expecting success of 7450.7 'add other submodule': 
+	git submodule add "$PWD/innocent" another-module &&
+	git add another-module &&
+	git commit -am another
+
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/another-module'...
+done.
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+[master 35fde2a] another
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 160000 another-module
+ok 7 - add other submodule
+
+expecting success of 7450.8 'clone evil superproject': 
+	git clone --recurse-submodules . victim >output 2>&1 &&
+	! grep "RUNNING POST CHECKOUT" output
+
+ok 8 - clone evil superproject
+
+expecting success of 7450.9 'fsck detects evil superproject': 
+	test_must_fail git fsck
+
+error in blob 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+error in blob 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+dangling blob 241344bddcdf3b3d94f89244f7cfa976aa3f4b19
+ok 9 - fsck detects evil superproject
+
+expecting success of 7450.10 'transfer.fsckObjects detects evil superproject (unpack)': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	git -C dst.git config transfer.fsckObjects true &&
+	test_must_fail git push dst.git HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 6213eaddd5d914ef4d30e9d58eba35dd8abcdbf3: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: fatal: fsck error in pack objects        
+error: remote unpack failed: unpack-objects abnormal exit
+To dst.git
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dst.git'
+ok 10 - transfer.fsckObjects detects evil superproject (unpack)
+
+expecting success of 7450.11 'transfer.fsckObjects detects evil superproject (index)': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	git -C dst.git config transfer.fsckObjects true &&
+	git -C dst.git config transfer.unpackLimit 1 &&
+	test_must_fail git push dst.git HEAD
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil        
+remote: fatal: fsck error in packed object        
+error: remote unpack failed: index-pack abnormal exit
+To dst.git
+ ! [remote rejected] HEAD -> master (unpacker error)
+error: failed to push some refs to 'dst.git'
+ok 11 - transfer.fsckObjects detects evil superproject (index)
+
+expecting success of 7450.12 'create oddly ordered pack': 
+	git checkout --orphan odd &&
+	git rm -rf --cached . &&
+	git add .gitmodules &&
+	git commit -m odd &&
+	{
+		pack_header 3 &&
+		pack_obj $(git rev-parse HEAD:.gitmodules) &&
+		pack_obj $(git rev-parse HEAD^{tree}) &&
+		pack_obj $(git rev-parse HEAD)
+	} >odd.pack &&
+	pack_trailer odd.pack
+
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+warning: ignoring suspicious submodule name: ../../modules/evil
+Switched to a new branch 'odd'
+rm '.gitmodules'
+rm 'another-module'
+rm 'evil'
+rm 'modules/evil/HEAD'
+rm 'modules/evil/config'
+rm 'modules/evil/description'
+rm 'modules/evil/hooks/applypatch-msg.sample'
+rm 'modules/evil/hooks/commit-msg.sample'
+rm 'modules/evil/hooks/fsmonitor-watchman.sample'
+rm 'modules/evil/hooks/post-checkout'
+rm 'modules/evil/hooks/post-update.sample'
+rm 'modules/evil/hooks/pre-applypatch.sample'
+rm 'modules/evil/hooks/pre-commit.sample'
+rm 'modules/evil/hooks/pre-merge-commit.sample'
+rm 'modules/evil/hooks/pre-push.sample'
+rm 'modules/evil/hooks/pre-rebase.sample'
+rm 'modules/evil/hooks/pre-receive.sample'
+rm 'modules/evil/hooks/prepare-commit-msg.sample'
+rm 'modules/evil/hooks/push-to-checkout.sample'
+rm 'modules/evil/hooks/sendemail-validate.sample'
+rm 'modules/evil/hooks/update.sample'
+rm 'modules/evil/index'
+rm 'modules/evil/info/exclude'
+rm 'modules/evil/logs/HEAD'
+rm 'modules/evil/logs/refs/heads/master'
+rm 'modules/evil/logs/refs/remotes/origin/HEAD'
+rm 'modules/evil/objects/20/93db06f424f426e05da2ca90f40d2663e89387'
+rm 'modules/evil/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904'
+rm 'modules/evil/packed-refs'
+rm 'modules/evil/refs/heads/master'
+rm 'modules/evil/refs/remotes/origin/HEAD'
+[odd (root-commit) 3eb4d74] odd
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+ create mode 100644 .gitmodules
+157+0 records in
+157+0 records out
+157 bytes copied, 0.000271943 s, 577 kB/s
+50+0 records in
+50+0 records out
+50 bytes copied, 9.031e-05 s, 554 kB/s
+126+0 records in
+126+0 records out
+126 bytes copied, 0.000244972 s, 514 kB/s
+ok 12 - create oddly ordered pack
+
+expecting success of 7450.13 'transfer.fsckObjects handles odd pack (unpack)': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	test_must_fail git -C dst.git unpack-objects --strict <odd.pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+fatal: fsck error in pack objects
+ok 13 - transfer.fsckObjects handles odd pack (unpack)
+
+expecting success of 7450.14 'transfer.fsckObjects handles odd pack (index)': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	test_must_fail git -C dst.git index-pack --strict --stdin <odd.pack
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+pack	e6c3665f0725d677af8e911369a5442b89a7079f
+error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+fatal: fsck error in pack objects
+ok 14 - transfer.fsckObjects handles odd pack (index)
+
+expecting success of 7450.15 'index-pack --strict works for non-repo pack': 
+	rm -rf dst.git &&
+	git init --bare dst.git &&
+	cp odd.pack dst.git &&
+	test_must_fail git -C dst.git index-pack --strict odd.pack 2>output &&
+	# Make sure we fail due to bad gitmodules content, not because we
+	# could not read the blob in the first place.
+	grep gitmodulesName output
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/dst.git/
+e6c3665f0725d677af8e911369a5442b89a7079f
+error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+error: object 2cab4a9ad5d8e76e44d1eafc234b196533fdcd74: gitmodulesName: disallowed submodule name: ../../modules/evil
+ok 15 - index-pack --strict works for non-repo pack
+
+expecting success of 7450.16 'set up repo with symlinked gitmodules (vanilla)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-vanilla/.git/
+ok 16 - set up repo with symlinked gitmodules (vanilla)
+
+expecting success of 7450.17 'fsck detects symlinked gitmodules (vanilla)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 2205f7d549bbb03fa136d63fd3101f1264afa01c
+error in tree 2205f7d549bbb03fa136d63fd3101f1264afa01c: gitmodulesSymlink: .gitmodules is a symbolic link
+ok 17 - fsck detects symlinked gitmodules (vanilla)
+
+expecting success of 7450.18 'refuse to load symlinked gitmodules into index (vanilla)': 
+		test_must_fail \
+			git -C $dir \
+			    -c core.protectntfs \
+			    -c core.protecthfs \
+			    read-tree $tree 2>err &&
+		grep "invalid path.*$name" err &&
+		git -C $dir ls-files -s >out &&
+		test_must_be_empty out
+	
+error: invalid path '.gitmodules'
+ok 18 - refuse to load symlinked gitmodules into index (vanilla)
+
+expecting success of 7450.19 'set up repo with symlinked gitmodules (ntfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-ntfs/.git/
+ok 19 - set up repo with symlinked gitmodules (ntfs)
+
+expecting success of 7450.20 'fsck detects symlinked gitmodules (ntfs)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree f595865647dcec0b21794b86a84545abc8fb2c1f
+error in tree f595865647dcec0b21794b86a84545abc8fb2c1f: gitmodulesSymlink: .gitmodules is a symbolic link
+ok 20 - fsck detects symlinked gitmodules (ntfs)
+
+expecting success of 7450.21 'refuse to load symlinked gitmodules into index (ntfs)': 
+		test_must_fail \
+			git -C $dir \
+			    -c core.protectntfs \
+			    -c core.protecthfs \
+			    read-tree $tree 2>err &&
+		grep "invalid path.*$name" err &&
+		git -C $dir ls-files -s >out &&
+		test_must_be_empty out
+	
+error: invalid path '.gitmodules .'
+ok 21 - refuse to load symlinked gitmodules into index (ntfs)
+
+expecting success of 7450.22 'set up repo with symlinked gitmodules (hfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitmodules-hfs/.git/
+ok 22 - set up repo with symlinked gitmodules (hfs)
+
+expecting success of 7450.23 'fsck detects symlinked gitmodules (hfs)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 0dc3665804a6af7935ce0b3f15c68a12a4d6526b
+error in tree 0dc3665804a6af7935ce0b3f15c68a12a4d6526b: gitmodulesSymlink: .gitmodules is a symbolic link
+ok 23 - fsck detects symlinked gitmodules (hfs)
+
+expecting success of 7450.24 'refuse to load symlinked gitmodules into index (hfs)': 
+		test_must_fail \
+			git -C $dir \
+			    -c core.protectntfs \
+			    -c core.protecthfs \
+			    read-tree $tree 2>err &&
+		grep "invalid path.*$name" err &&
+		git -C $dir ls-files -s >out &&
+		test_must_be_empty out
+	
+error: invalid path '.‌gitmodules'
+ok 24 - refuse to load symlinked gitmodules into index (hfs)
+
+expecting success of 7450.25 'set up repo with symlinked gitattributes (vanilla)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-vanilla/.git/
+ok 25 - set up repo with symlinked gitattributes (vanilla)
+
+expecting success of 7450.26 'fsck detects symlinked gitattributes (vanilla)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree d3fa5d36168f4ffb0887d3090fc8e35ce68cca2d
+warning in tree d3fa5d36168f4ffb0887d3090fc8e35ce68cca2d: gitattributesSymlink: .gitattributes is a symlink
+ok 26 - fsck detects symlinked gitattributes (vanilla)
+
+expecting success of 7450.27 'set up repo with symlinked gitattributes (ntfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-ntfs/.git/
+ok 27 - set up repo with symlinked gitattributes (ntfs)
+
+expecting success of 7450.28 'fsck detects symlinked gitattributes (ntfs)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree fe19906f78d5036f7eb21a82bb48ce15b6d9a981
+warning in tree fe19906f78d5036f7eb21a82bb48ce15b6d9a981: gitattributesSymlink: .gitattributes is a symlink
+ok 28 - fsck detects symlinked gitattributes (ntfs)
+
+expecting success of 7450.29 'set up repo with symlinked gitattributes (hfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitattributes-hfs/.git/
+ok 29 - set up repo with symlinked gitattributes (hfs)
+
+expecting success of 7450.30 'fsck detects symlinked gitattributes (hfs)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 754fb024f6f39ed37b501bbb859e6b782ac007a7
+warning in tree 754fb024f6f39ed37b501bbb859e6b782ac007a7: gitattributesSymlink: .gitattributes is a symlink
+ok 30 - fsck detects symlinked gitattributes (hfs)
+
+expecting success of 7450.31 'set up repo with symlinked gitignore (vanilla)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-vanilla/.git/
+ok 31 - set up repo with symlinked gitignore (vanilla)
+
+expecting success of 7450.32 'fsck detects symlinked gitignore (vanilla)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 824072fb893dc93a2b1910ab9d885f977008b951
+warning in tree 824072fb893dc93a2b1910ab9d885f977008b951: gitignoreSymlink: .gitignore is a symlink
+ok 32 - fsck detects symlinked gitignore (vanilla)
+
+expecting success of 7450.33 'set up repo with symlinked gitignore (ntfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-ntfs/.git/
+ok 33 - set up repo with symlinked gitignore (ntfs)
+
+expecting success of 7450.34 'fsck detects symlinked gitignore (ntfs)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 65c3fac0e9d5b179b7e4b0c7a860415fedf192fb
+warning in tree 65c3fac0e9d5b179b7e4b0c7a860415fedf192fb: gitignoreSymlink: .gitignore is a symlink
+ok 34 - fsck detects symlinked gitignore (ntfs)
+
+expecting success of 7450.35 'set up repo with symlinked gitignore (hfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-gitignore-hfs/.git/
+ok 35 - set up repo with symlinked gitignore (hfs)
+
+expecting success of 7450.36 'fsck detects symlinked gitignore (hfs)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree ef4f32626400482445f8defad04f0f4d6d082a69
+warning in tree ef4f32626400482445f8defad04f0f4d6d082a69: gitignoreSymlink: .gitignore is a symlink
+ok 36 - fsck detects symlinked gitignore (hfs)
+
+expecting success of 7450.37 'set up repo with symlinked mailmap (vanilla)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-vanilla/.git/
+ok 37 - set up repo with symlinked mailmap (vanilla)
+
+expecting success of 7450.38 'fsck detects symlinked mailmap (vanilla)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 569a93720aff18fe0ba5cf49a45c91d187e3bcfe
+warning in tree 569a93720aff18fe0ba5cf49a45c91d187e3bcfe: mailmapSymlink: .mailmap is a symlink
+ok 38 - fsck detects symlinked mailmap (vanilla)
+
+expecting success of 7450.39 'set up repo with symlinked mailmap (ntfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-ntfs/.git/
+ok 39 - set up repo with symlinked mailmap (ntfs)
+
+expecting success of 7450.40 'fsck detects symlinked mailmap (ntfs)': 
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree ad813e1d03460ca45a21c14518be7fadafd364a1
+warning in tree ad813e1d03460ca45a21c14518be7fadafd364a1: mailmapSymlink: .mailmap is a symlink
+ok 40 - fsck detects symlinked mailmap (ntfs)
+
+expecting success of 7450.41 'set up repo with symlinked mailmap (hfs)': 
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/symlink-mailmap-hfs/.git/
+ok 41 - set up repo with symlinked mailmap (hfs)
+
+expecting success of 7450.42 'fsck detects symlinked mailmap (hfs)': 
+		(
+			cd $dir &&
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	
+dangling tree 4d6270ad879d6da19ce0d4a5f3c8e0e5ac26b27f
+warning in tree 4d6270ad879d6da19ce0d4a5f3c8e0e5ac26b27f: mailmapSymlink: .mailmap is a symlink
+ok 42 - fsck detects symlinked mailmap (hfs)
 
-If you want to 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 7450.43 'fsck detects non-blob .gitmodules': 
+	git init non-blob &&
+	(
+		cd non-blob &&
 
-  git switch -c <new-branch-name>
+		# As above, make the funny tree directly to avoid index
+		# restrictions.
+		mkdir subdir &&
+		cp ../.gitmodules subdir/file &&
+		git add subdir/file &&
+		git commit -m ok &&
+		git ls-tree HEAD | sed s/subdir/.gitmodules/ | git mktree &&
 
-Or undo this operation with:
+		test_must_fail git fsck 2>output &&
+		test_grep gitmodulesBlob output
+	)
 
-  git switch -
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/non-blob/.git/
+[master (root-commit) 9e50c62] ok
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+ create mode 100644 subdir/file
+65d6b7ea636c638236286e4d9bbfa4d1508a4d7f
+dangling tree 65d6b7ea636c638236286e4d9bbfa4d1508a4d7f
+error in tree 1c2f44688a0d99382e808d63806f1c430b3acdd5: gitmodulesBlob: non-blob found at .gitmodules
+ok 43 - fsck detects non-blob .gitmodules
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7450.44 'fsck detects corrupt .gitmodules': 
+	git init corrupt &&
+	(
+		cd corrupt &&
 
-Submodule 'deeper/submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/submodule) registered for path 'deeper/submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super2/deeper/submodule'...
-done.
-Skipping submodule 'none'
-Submodule path 'deeper/submodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
-ok 47 - submodule update places git-dir in superprojects git-dir
+		echo "[broken" >.gitmodules &&
+		git add .gitmodules &&
+		git commit -m "broken gitmodules" &&
 
-expecting success of 7406.48 'submodule add places git-dir in superprojects git-dir recursive': 
-	(cd super2 &&
-	 (cd deeper/submodule &&
-	  git submodule add ../submodule subsubmodule &&
-	  (cd subsubmodule &&
-	   git log > ../../../expected
-	  ) &&
-	  git commit -m "added subsubmodule" &&
-	  git push origin :
-	 ) &&
-	 (cd .git/modules/deeper/submodule/modules/subsubmodule &&
-	  git log > ../../../../../actual
-	 ) &&
-	 git add deeper/submodule &&
-	 git commit -m "update submodule" &&
-	 git push origin : &&
-	 test_cmp expected actual
+		git fsck 2>output &&
+		test_grep gitmodulesParse output &&
+		test_grep ! "bad config" output
 	)
 
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super2/deeper/submodule/subsubmodule'...
-done.
-[detached HEAD 0642c0f] added subsubmodule
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/corrupt/.git/
+[master (root-commit) 3fe1e33] broken gitmodules
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
+ 1 file changed, 1 insertion(+)
  create mode 100644 .gitmodules
- create mode 160000 subsubmodule
-Everything up-to-date
-[detached HEAD 7b048b2] update submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Everything up-to-date
-ok 48 - submodule add places git-dir in superprojects git-dir recursive
+warning in blob e39defa11acf1626d747f0b70076b6be5c0fd4c9: gitmodulesParse: could not parse gitmodules blob
+ok 44 - fsck detects corrupt .gitmodules
 
-expecting success of 7406.49 'submodule update places git-dir in superprojects git-dir recursive': 
-	mkdir super_update_r &&
-	(cd super_update_r &&
-	 git init --bare
-	) &&
-	mkdir subsuper_update_r &&
-	(cd subsuper_update_r &&
-	 git init --bare
-	) &&
-	mkdir subsubsuper_update_r &&
-	(cd subsubsuper_update_r &&
-	 git init --bare
-	) &&
-	git clone subsubsuper_update_r subsubsuper_update_r2 &&
-	(cd subsubsuper_update_r2 &&
-	 test_commit "update_subsubsuper" file &&
-	 git push origin main
-	) &&
-	git clone subsuper_update_r subsuper_update_r2 &&
-	(cd subsuper_update_r2 &&
-	 test_commit "update_subsuper" file &&
-	 git submodule add ../subsubsuper_update_r subsubmodule &&
-	 git commit -am "subsubmodule" &&
-	 git push origin main
-	) &&
-	git clone super_update_r super_update_r2 &&
-	(cd super_update_r2 &&
-	 test_commit "update_super" file &&
-	 git submodule add ../subsuper_update_r submodule &&
-	 git commit -am "submodule" &&
-	 git push origin main
-	) &&
-	rm -rf super_update_r2 &&
-	git clone super_update_r super_update_r2 &&
-	(cd super_update_r2 &&
-	 git submodule update --init --recursive >actual &&
-	 test_grep "Submodule path .submodule/subsubmodule.: checked out" actual &&
-	 (cd submodule/subsubmodule &&
-	  git log > ../../expected
-	 ) &&
-	 (cd .git/modules/submodule/modules/subsubmodule &&
-	  git log > ../../../../../actual
-	 ) &&
-	 test_cmp expected actual
+ok 45 # skip prevent git~1 squatting on Windows (missing WINDOWS)
+
+expecting success of 7450.46 'setup submodules with nested git dirs': 
+	git init nested &&
+	test_commit -C nested nested &&
+	(
+		cd nested &&
+		cat >.gitmodules <<-EOF &&
+		[submodule "hippo"]
+			url = .
+			path = thing1
+		[submodule "hippo/hooks"]
+			url = .
+			path = thing2
+		EOF
+		git clone . thing1 &&
+		git clone . thing2 &&
+		git add .gitmodules thing1 thing2 &&
+		test_tick &&
+		git commit -m nested
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsubsuper_update_r/
-Cloning into 'subsubsuper_update_r2'...
-warning: You appear to have cloned an empty repository.
-done.
-[main (root-commit) 0d20a78] update_subsubsuper
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/nested/.git/
+[master (root-commit) 111f058] nested
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 file
-To /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsubsuper_update_r
- * [new branch]      main -> main
-Cloning into 'subsuper_update_r2'...
-warning: You appear to have cloned an empty repository.
+ create mode 100644 nested.t
+Cloning into 'thing1'...
 done.
-[main (root-commit) 635883b] update_subsuper
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r2/subsubmodule'...
+Cloning into 'thing2'...
 done.
-[main 86a3496] subsubmodule
+warning: adding embedded git repository: thing1
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> thing1
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached thing1
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+warning: adding embedded git repository: thing2
+[master f2f7cbd] nested
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
+ 3 files changed, 8 insertions(+)
  create mode 100644 .gitmodules
- create mode 160000 subsubmodule
-To /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r
- * [new branch]      main -> main
-Cloning into 'super_update_r2'...
-warning: You appear to have cloned an empty repository.
-done.
-[main (root-commit) c2de1fa] update_super
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
+ create mode 160000 thing1
+ create mode 160000 thing2
+ok 46 - setup submodules with nested git dirs
+
+expecting success of 7450.47 'git dirs of sibling submodules must not be nested': 
+	test_must_fail git clone --recurse-submodules nested clone 2>err &&
+	test_grep "is inside git dir" err
+
+error: submodule git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo'
+error: submodule git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone/.git/modules/hippo'
+ok 47 - git dirs of sibling submodules must not be nested
+
+expecting success of 7450.48 'submodule git dir nesting detection must work with parallel cloning': 
+	test_must_fail git clone --recurse-submodules --jobs=2 nested clone_parallel 2>err &&
+	cat err &&
+	grep -E "(already exists|is inside git dir|not a git repository)" err &&
+	{
+		test_path_is_missing .git/modules/hippo/HEAD ||
+		test_path_is_missing .git/modules/hippo/hooks/HEAD
+	}
+
+Cloning into 'clone_parallel'...
 done.
-[main 2d70acb] submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule
-To /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r
- * [new branch]      main -> main
-Cloning into 'super_update_r2'...
+Submodule 'hippo' (.) registered for path 'thing1'
+Submodule 'hippo/hooks' (.) registered for path 'thing2'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing1'...
 done.
-Submodule 'submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r2/submodule'...
+fatal: repository path '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' already exists and is not an empty directory.
+fatal: clone of '.' into submodule path '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/thing2' failed
+Failed to clone 'thing2'. Retry scheduled
+error: submodule git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
+fatal: refusing to create/use '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' in another submodule's git dir
+Failed to clone 'thing2' a second time, aborting
+fatal: repository path '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' already exists and is not an empty directory.
+error: submodule git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo/hooks' is inside git dir '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/clone_parallel/.git/modules/hippo'
+ok 48 - submodule git dir nesting detection must work with parallel cloning
+
+expecting success of 7450.49 'checkout -f --recurse-submodules must not use a nested gitdir': 
+	git clone nested nested_checkout &&
+	(
+		cd nested_checkout &&
+		git submodule init &&
+		git submodule update thing1 &&
+		mkdir -p .git/modules/hippo/hooks/refs &&
+		mkdir -p .git/modules/hippo/hooks/objects/info &&
+		echo "../../../../objects" >.git/modules/hippo/hooks/objects/info/alternates &&
+		echo "ref: refs/heads/master" >.git/modules/hippo/hooks/HEAD
+	) &&
+	test_must_fail git -C nested_checkout checkout -f --recurse-submodules HEAD 2>err &&
+	cat err &&
+	grep "is inside git dir" err &&
+	test_path_is_missing nested_checkout/thing2/.git
+
+Cloning into 'nested_checkout'...
 done.
-Submodule 'subsubmodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super_update_r2/submodule/subsubmodule'...
+Submodule 'hippo' (.) registered for path 'thing1'
+Submodule 'hippo/hooks' (.) registered for path 'thing2'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7450-bad-git-dotfiles/nested_checkout/thing1'...
 done.
-Submodule path 'submodule/subsubmodule': checked out '0d20a783d558db53f3b7ea74da7db3bb1a32b21b'
-ok 49 - submodule update places git-dir in superprojects git-dir recursive
+Submodule path 'thing1': checked out '111f05809ae4bf877fb5852d7d418815278831e3'
+error: submodule git dir '.git/modules/hippo/hooks' is inside git dir '.git/modules/hippo'
+fatal: refusing to create/use '.git/modules/hippo/hooks' in another submodule's git dir
+error: submodule git dir '.git/modules/hippo/hooks' is inside git dir '.git/modules/hippo'
+ok 49 - checkout -f --recurse-submodules must not use a nested gitdir
 
-expecting success of 7406.50 'submodule add properly re-creates deeper level submodules': 
-	(cd super &&
-	 git reset --hard main &&
-	 rm -rf deeper/ &&
-	 git submodule add --force ../submodule deeper/submodule
-	)
+# passed all 49 test(s)
+1..49
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7500-commit-template-squash-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
 
-warning: unable to rmdir 'deeper/submodule': Directory not empty
-warning: unable to rmdir 's1': Directory not empty
-HEAD is now at 45a22d0 two_new_submodule_commits
-Reactivating local git directory for submodule 'deeper/submodule'
-ok 50 - submodule add properly re-creates deeper level submodules
+[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 7406.51 'submodule update properly revives a moved submodule': 
-	(cd super &&
-	 H=$(git rev-parse --short HEAD) &&
-	 git commit -am "pre move" &&
-	 H2=$(git rev-parse --short HEAD) &&
-	 git status >out &&
-	 sed "s/$H/XXX/" out >expect &&
-	 H=$(cd submodule2 && git rev-parse HEAD) &&
-	 git rm --cached submodule2 &&
-	 rm -rf submodule2 &&
-	 mkdir -p "moved/sub module" &&
-	 git update-index --add --cacheinfo 160000 $H "moved/sub module" &&
-	 git config -f .gitmodules submodule.submodule2.path "moved/sub module" &&
-	 git commit -am "post move" &&
-	 git submodule update &&
-	 git status > out &&
-	 sed "s/$H2/XXX/" out >actual &&
-	 test_cmp expect actual
+expecting success of 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
 	)
 
-[detached HEAD d262110] pre move
- Author: A U Thor <author@example.com>
- 3 files changed, 5 insertions(+), 1 deletion(-)
- create mode 160000 deeper/submodule
-rm 'submodule2'
-[detached HEAD db0a21b] post move
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 1 deletion(-)
- rename submodule2 => moved/sub module (100%)
-Skipping submodule 'none'
-Submodule path 'moved/sub module': checked out '9f300bf70a08f60a240990d98de1aaa8040994a1'
-ok 51 - submodule update properly revives a moved submodule
+fatal: could not read '/build/reproducible-path/git-2.45.2/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
+ok 2 - nonexistent template file should return error
 
-checking prerequisite: SYMLINKS
+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
+	)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-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: could not read '/build/reproducible-path/git-2.45.2/t/trash directory.t7500-commit-template-squash-signoff/notexist': No such file or directory
+ok 3 - nonexistent template file in config should return error
 
-)
-prerequisite SYMLINKS ok
-expecting success of 7406.52 'submodule update can handle symbolic links in pwd': 
-	mkdir -p linked/dir &&
-	ln -s linked/dir linkto &&
-	(cd linkto &&
-	 git clone "$TRASH_DIRECTORY"/super_update_r2 super &&
-	 (cd super &&
-	  git submodule update --init --recursive
-	 )
-	)
+expecting success of 7500.4 'unedited template should not commit': 
+	echo "template line" > "$TEMPLATE" &&
+	test_must_fail git commit --template "$TEMPLATE"
 
-Cloning into 'super'...
-done.
-Submodule 'submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsuper_update_r) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/linked/dir/super/submodule'...
-done.
-Submodule path 'submodule': checked out '86a3496a1d60636ce953ea5245c2a0f63a7a2aa8'
-Submodule 'subsubmodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/subsubsuper_update_r) registered for path 'submodule/subsubmodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/linked/dir/super/submodule/subsubmodule'...
-done.
-Submodule path 'submodule/subsubmodule': checked out '0d20a783d558db53f3b7ea74da7db3bb1a32b21b'
-ok 52 - submodule update can handle symbolic links in pwd
+Aborting commit; you did not edit the message.
+ok 4 - unedited template should not commit
 
-expecting success of 7406.53 'submodule update clone shallow submodule': 
-	test_when_finished "rm -rf super3" &&
-	first=$(git -C cloned rev-parse HEAD:submodule) &&
-	second=$(git -C submodule rev-parse HEAD) &&
-	commit_count=$(git -C submodule rev-list --count $first^..$second) &&
-	git clone cloned super3 &&
-	pwd=$(pwd) &&
-	(
-		cd super3 &&
-		sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
-		mv -f .gitmodules.tmp .gitmodules &&
-		git submodule update --init --depth=$commit_count &&
-		git -C submodule log --oneline >out &&
-		test_line_count = 1 out
-	)
+expecting success of 7500.5 'unedited template with comments should not commit': 
+	echo "# comment in template" >> "$TEMPLATE" &&
+	test_must_fail git commit --template "$TEMPLATE"
 
-Cloning into 'super3'...
-done.
-Submodule 'merging' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super3/merging'...
-Skipping submodule 'none'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super3/rebasing'...
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super3/submodule'...
-Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 53 - submodule update clone shallow submodule
+Aborting commit; you did not edit the message.
+ok 5 - unedited template with comments should not commit
 
-expecting success of 7406.54 'submodule update clone shallow submodule outside of depth': 
-	test_when_finished "rm -rf super3" &&
-	git clone cloned super3 &&
-	pwd=$(pwd) &&
+expecting success of 7500.6 'a Signed-off-by line by itself should not commit': 
 	(
-		cd super3 &&
-		sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp &&
-		mv -f .gitmodules.tmp .gitmodules &&
-		# Some protocol versions (e.g. 2) support fetching
-		# unadvertised objects, so restrict this test to v0.
-		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
-			git submodule update --init --depth=1 2>actual &&
-		test_grep "Direct fetching of that commit failed." actual &&
-		git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
-		git submodule update --init --depth=1 >actual &&
-		git -C submodule log --oneline >out &&
-		test_line_count = 1 out
+		test_set_editor "$TEST_DIRECTORY"/t7500/add-signed-off &&
+		test_must_fail git commit --template "$TEMPLATE"
 	)
 
-Cloning into 'super3'...
-done.
-Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-fatal: Fetched in submodule path 'submodule', but it did not contain 4301fd3e4110d3b6212c19aed3094150392545b9. Direct fetching of that commit failed.
-Skipping submodule 'none'
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/submodule
- * branch            4301fd3e4110d3b6212c19aed3094150392545b9 -> FETCH_HEAD
-ok 54 - submodule update clone shallow submodule outside of depth
+Aborting commit; you did not edit the message.
+ok 6 - a Signed-off-by line by itself should not commit
 
-expecting success of 7406.55 'submodule update --recursive drops module name before recursing': 
-	(cd super2 &&
-	 (cd deeper/submodule/subsubmodule &&
-	  git checkout HEAD^
-	 ) &&
-	 git submodule update --recursive deeper/submodule >actual &&
-	 test_grep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual
+expecting success of 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"
 	)
 
-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.
+Aborting commit; you did not edit the message.
+ok 7 - adding comments to a template should not 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 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"
 
-  git switch -c <new-branch-name>
+[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
 
-Or undo this operation with:
+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"
 
-  git switch -
+[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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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"
 
-HEAD is now at 2758ea9 upstream line4
-Submodule path 'deeper/submodule/subsubmodule': checked out 'e64979d13b9a9301a3030b8c005b1d9fd5397a44'
-ok 55 - submodule update --recursive drops module name before recursing
+[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 7406.56 'submodule update can be run in parallel': 
-	(cd super2 &&
-	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 &&
-	 grep "7 tasks" trace.out &&
-	 git config submodule.fetchJobs 8 &&
-	 GIT_TRACE=$(pwd)/trace.out git submodule update &&
-	 grep "8 tasks" trace.out &&
-	 GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 &&
-	 grep "9 tasks" trace.out
-	)
+expecting success of 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"
 
-Skipping submodule 'none'
-run_processes_parallel: preparing to run up to 7 tasks
-Skipping submodule 'none'
-run_processes_parallel: preparing to run up to 8 tasks
-Skipping submodule 'none'
-run_processes_parallel: preparing to run up to 9 tasks
-ok 56 - submodule update can be run in parallel
+[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 7406.57 'git clone passes the parallel jobs config on to submodules': 
-	test_when_finished "rm -rf super4" &&
-	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 &&
-	grep "7 tasks" trace.out &&
-	rm -rf super4 &&
-	git config --global submodule.fetchJobs 8 &&
-	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 &&
-	grep "8 tasks" trace.out &&
-	rm -rf super4 &&
-	GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 &&
-	grep "9 tasks" trace.out &&
-	rm -rf super4
+expecting success of 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"
 
-Cloning into 'super4'...
-done.
-run_processes_parallel: preparing to run up to 7 tasks
-Cloning into 'super4'...
-done.
-run_processes_parallel: preparing to run up to 8 tasks
-Cloning into 'super4'...
-done.
-run_processes_parallel: preparing to run up to 9 tasks
-ok 57 - git clone passes the parallel jobs config on to submodules
+[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 7406.58 'submodule update --quiet passes quietness to merge/rebase': 
-	(cd super &&
-	 test_commit -C rebasing message &&
-	 git submodule update --rebase --quiet >out 2>err &&
-	 test_must_be_empty out &&
-	 test_must_be_empty err &&
-	 git submodule update --rebase >out 2>err &&
-	 test_file_not_empty out &&
-	 test_must_be_empty err
-	)
+expecting success of 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"
 
-[main 271c4a7] message
+[master 5e66887] commit message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 message.t
-ok 58 - submodule update --quiet passes quietness to merge/rebase
+ok 13 - commit message from template with whitespace issue
 
-expecting success of 7406.59 'submodule update --quiet passes quietness to fetch with a shallow clone': 
-	test_when_finished "rm -rf super4 super5 super6" &&
-	git clone . super4 &&
-	(cd super4 &&
-	 git submodule add --quiet file://"$TRASH_DIRECTORY"/submodule submodule3 &&
-	 git commit -am "setup submodule3"
-	) &&
-	(cd submodule &&
-	  test_commit line6 file
-	) &&
-	git clone super4 super5 &&
-	(cd super5 &&
-	 git submodule update --quiet --init --depth=1 submodule3 >out 2>err &&
-	 test_must_be_empty out &&
-	 test_must_be_empty err
+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
 	) &&
-	git clone super4 super6 &&
-	(cd super6 &&
-	 git submodule update --init --depth=1 submodule3 >out 2>err &&
-	 test_file_not_empty out &&
-	 test_file_not_empty err
-	)
+	cmp .git/index saved-index >/dev/null
 
-Cloning into 'super4'...
-done.
-[main 020c4e0] setup submodule3
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 submodule3
-[main a93a1f3] line6
+
+[master 7c961fb] commit using another index
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 4 deletions(-)
-Cloning into 'super5'...
-done.
-Cloning into 'super6'...
-done.
-ok 59 - submodule update --quiet passes quietness to fetch with a shallow clone
+ 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 7406.60 'submodule update --filter requires --init': 
-	test_expect_code 129 git -C super submodule update --filter blob:none
+expecting success of 7500.15 'using alternate GIT_INDEX_FILE (2)': 
 
-usage: git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
+	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)"
 
-    -f, --[no-]force      force checkout updates
-    --[no-]init           initialize uninitialized submodules before update
-    --[no-]remote         use SHA-1 of submodule's remote tracking branch
-    --[no-]recursive      traverse submodules recursively
-    -N, --no-fetch        don't fetch new objects from the remote site
-    --fetch               opposite of --no-fetch
-    --[no-]checkout       use the 'checkout' update strategy (default)
-    -m, --[no-]merge      use the 'merge' update strategy
-    -r, --[no-]rebase     use the 'rebase' update strategy
-    --[no-]reference <repo>
-                          reference repository
-    --[no-]dissociate     use --reference only while cloning
-    --[no-]depth <n>      create a shallow clone truncated to the specified number of revisions
-    -j, --[no-]jobs <n>   parallel jobs
-    --[no-]recommend-shallow
-                          whether the initial clone should follow the shallow recommendation
-    -q, --[no-]quiet      don't print cloning progress
-    --[no-]progress       force cloning progress
-    --[no-]require-init   disallow cloning into non-empty directory, implies --init
-    --[no-]single-branch  clone only one branch, HEAD or --branch
-    --[no-]filter <args>  object filtering
+	) &&
+	cmp .git/index saved-index >/dev/null
 
-ok 60 - submodule update --filter requires --init
+[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 7406.61 'submodule update --filter sets partial clone settings': 
-	test_when_finished "rm -rf super-filter" &&
-	git clone cloned super-filter &&
-	git -C super-filter submodule update --init --filter blob:none &&
-	test_cmp_config -C super-filter/submodule true remote.origin.promisor &&
-	test_cmp_config -C super-filter/submodule blob:none remote.origin.partialclonefilter
+expecting success of 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
 
-Cloning into 'super-filter'...
-done.
-Submodule 'merging' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/merging) registered for path 'merging'
-Submodule 'none' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/none) registered for path 'none'
-Submodule 'rebasing' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/rebasing) registered for path 'rebasing'
-Submodule 'submodule' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/submodule) registered for path 'submodule'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super-filter/merging'...
-warning: --filter is ignored in local clones; use file:// instead.
-done.
-Skipping submodule 'none'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super-filter/rebasing'...
-warning: --filter is ignored in local clones; use file:// instead.
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/super-filter/submodule'...
-warning: --filter is ignored in local clones; use file:// instead.
-done.
-Submodule path 'merging': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'rebasing': checked out '0c90624ab7f1aaa301d3bb79f60dcfed1ec4897f'
-Submodule path 'submodule': checked out '4301fd3e4110d3b6212c19aed3094150392545b9'
-ok 61 - submodule update --filter sets partial clone settings
+[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 7406.62 'setup clean recursive superproject': 
-	git init bottom &&
-	test_commit -C bottom "bottom" &&
-	git init middle &&
-	git -C middle submodule add ../bottom bottom &&
-	git -C middle commit -m "middle" &&
-	git init top &&
-	git -C top submodule add ../middle middle &&
-	git -C top commit -m "top" &&
-	git clone --recurse-submodules top top-clean
+expecting success of 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"
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/bottom/.git/
-[main (root-commit) 581bdeb] bottom
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bottom.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle/bottom'...
-done.
-[main (root-commit) 8c7b95e] middle
+[master 101c1bd] Log in sub directory
  Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 bottom
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/top/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/top/middle'...
-done.
-[main (root-commit) ab8145a] top
+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>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 middle
-Cloning into 'top-clean'...
-done.
-Submodule 'middle' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle) registered for path 'middle'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/top-clean/middle'...
-done.
-Submodule path 'middle': checked out '8c7b95e494a2782f61ae9299ca15d668e545d9a8'
-Submodule 'bottom' (/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/bottom) registered for path 'middle/bottom'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/top-clean/middle/bottom'...
-done.
-Submodule path 'middle/bottom': checked out '581bdebe7becb965f64fee4b6315195d6f9b87df'
-ok 62 - setup clean recursive superproject
+ok 18 - commit message from file (2)
 
-expecting success of 7406.63 'submodule update should skip unmerged submodules': 
-	test_when_finished "rm -fr top-cloned" &&
-	cp -r top-clean top-cloned &&
+expecting success of 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"
 
-	# Create an upstream commit in each repo, starting with bottom
-	test_commit -C bottom upstream_commit &&
-	# Create middle commit
-	git -C middle/bottom fetch &&
-	git -C middle/bottom checkout -f FETCH_HEAD &&
-	git -C middle add bottom &&
-	git -C middle commit -m "upstream_commit" &&
-	# Create top commit
-	git -C top/middle fetch &&
-	git -C top/middle checkout -f FETCH_HEAD &&
-	git -C top add middle &&
-	git -C top commit -m "upstream_commit" &&
+[master 2f170f9] Log with foo word
+ Author: A U Thor <author@example.com>
+ok 19 - commit message from stdin
 
-	# Create a downstream conflict
-	test_commit -C top-cloned/middle/bottom downstream_commit &&
-	git -C top-cloned/middle add bottom &&
-	git -C top-cloned/middle commit -m "downstream_commit" &&
-	git -C top-cloned/middle fetch --recurse-submodules origin &&
-	test_must_fail git -C top-cloned/middle merge origin/main &&
+expecting success of 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"
 
-	# Make the update of "middle" a no-op, otherwise we error out
-	# because of its unmerged state
-	test_config -C top-cloned submodule.middle.update !true &&
-	git -C top-cloned submodule update --recursive 2>actual.err &&
-	cat >expect.err <<-\EOF &&
-	Skipping unmerged submodule middle/bottom
-	EOF
-	test_cmp expect.err actual.err
+[master df55417] -F log
+ Author: A U Thor <author@example.com>
+ok 20 - commit -F overrides -t
 
-[main 1214144] upstream_commit
+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(+)
- create mode 100644 upstream_commit.t
-From /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/bottom
-   581bdeb..1214144  main            -> origin/main
- * [new tag]         upstream_commit -> upstream_commit
-Note: switching to 'FETCH_HEAD'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+ok 21 - Commit without message is allowed with --allow-empty-message
 
-If you want to 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 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
 
-  git switch -c <new-branch-name>
+Aborting commit due to empty commit message.
+ok 22 - Commit without message is no-no without --allow-empty-message
 
-Or undo this operation with:
+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"
 
-  git switch -
+[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
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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 ""
 
-HEAD is now at 1214144 upstream_commit
-[main 02206c0] upstream_commit
+Aborting commit due to empty commit message.
+[master 7c3a153] 
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle
-   8c7b95e..02206c0  main       -> origin/main
-Note: switching to 'FETCH_HEAD'.
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ok 24 - commit -C empty respects --allow-empty-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.
+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"
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+[master 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
 
-  git switch -c <new-branch-name>
+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
 
-Or undo this operation with:
+extra"
 
-  git switch -
+[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"
 
-Turn off this advice by setting config variable advice.detachedHead to false
+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"
 
-HEAD is now at 02206c0 upstream_commit
-[main 3de434e] upstream_commit
+[master 68474d9] target message subject line
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[detached HEAD 732f4af] downstream_commit
+ 1 file changed, 1 insertion(+)
+[master d9cd24a] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 downstream_commit.t
-[detached HEAD bd1874b] downstream_commit
+[master b813bdf] fixup! target message subject line
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-From /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/middle
-   8c7b95e..02206c0  main       -> origin/main
-Fetching submodule bottom
-From /build/reproducible-path/git-2.45.2/t/trash directory.t7406-submodule-update/bottom
-   581bdeb..1214144  main            -> origin/main
- * [new tag]         upstream_commit -> upstream_commit
-hint: Recursive merging with submodules currently only supports trivial cases.
-hint: Please manually handle the merging of each conflicted submodule.
-hint: This can be accomplished with the following steps:
-hint:  - go to submodule (bottom), and either merge commit 1214144
-hint:    or update to an existing commit which has merged those changes
-hint:  - come back to superproject and run:
-hint:
-hint:       git add bottom
-hint:
-hint:    to record the above merge or update
-hint:  - resolve any other conflicts in the superproject
-hint:  - commit the resulting index in the superproject
-hint:
-hint: Disable this message with "git config advice.submoduleMergeConflict false"
-Failed to merge submodule bottom
-CONFLICT (submodule): Merge conflict in bottom
-Automatic merge failed; fix conflicts and then commit the result.
-Submodule path 'middle': 'true 8c7b95e494a2782f61ae9299ca15d668e545d9a8'
-ok 63 - submodule update should skip unmerged submodules
+ 1 file changed, 1 insertion(+)
+ok 27 - commit --fixup --edit
 
-expecting success of 7406.64 'submodule update --recursive skip submodules with strategy=none': 
-	test_when_finished "rm -fr top-cloned" &&
-	cp -r top-clean top-cloned &&
+expecting success of 7500.28 'commit --fixup=amend: creates amend! commit': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
 
-	test_commit -C top-cloned/middle/bottom downstream_commit &&
-	git -C top-cloned/middle config submodule.bottom.update none &&
-	git -C top-cloned submodule update --recursive 2>actual.err &&
-	cat >expect.err <<-\EOF &&
-	Skipping submodule 'middle/bottom'
+	$(get_commit_msg HEAD~)
+
+	edited
 	EOF
-	test_cmp expect.err actual.err
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=amend:HEAD~
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual
 
-[detached HEAD 4ad2ba9] downstream_commit
+[master 25d4b87] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 downstream_commit.t
-ok 64 - submodule update --recursive skip submodules with strategy=none
-
-expecting success of 7406.65 'commit with staged submodule change': 
-	add_submodule_commit_and_validate
-
-[main f3de040] create submodule
+[master 49d2e45] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 160000 sub
-ok 65 - commit with staged submodule change
+[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 7406.66 'commit with staged submodule change with ignoreSubmodules dirty': 
-	test_config diff.ignoreSubmodules dirty &&
-	add_submodule_commit_and_validate
+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~)
 
-[main 9dbf457] create submodule
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 66 - commit with staged submodule change with ignoreSubmodules dirty
+	$(get_commit_msg HEAD~)
 
-expecting success of 7406.67 'commit with staged submodule change with ignoreSubmodules all': 
-	test_config diff.ignoreSubmodules all &&
-	add_submodule_commit_and_validate
+	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
 
-[main 70ee70e] create submodule
+[master 495438c] target message subject line
  Author: A U Thor <author@example.com>
-ok 67 - commit with staged submodule change with ignoreSubmodules all
-
-checking prerequisite: CASE_INSENSITIVE_FS
+ 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
 
-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 7500.30 '--fixup=reword: ignores staged changes': 
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
 
-)
-prerequisite CASE_INSENSITIVE_FS not satisfied
-ok 68 # skip submodule paths must not follow symlinks (missing CASE_INSENSITIVE_FS of CASE_INSENSITIVE_FS,SYMLINKS)
+	$(get_commit_msg HEAD~)
 
-# passed all 68 test(s)
-1..68
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7503-pre-commit-and-pre-merge-commit-hooks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7503-pre-commit-and-pre-merge-commit-hooks/.git/
-expecting success of 7503.1 'root commit': 
-	echo "root" >file &&
-	git add file &&
-	git commit -m "zeroth" &&
-	git checkout -b side &&
-	echo "foo" >foo &&
-	git add foo &&
-	git commit -m "make it non-ff" &&
-	git branch side-orig side &&
-	git checkout main
+	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
 
-[main (root-commit) 0e29351] zeroth
+[master ed4d665] target message subject line
  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
+ 1 file changed, 2 insertions(+)
+[master 218b136] intermediate commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo
-Switched to branch 'main'
-ok 1 - root commit
+[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 7503.2 'setup conflicting branches': 
-	test_when_finished "git checkout main" &&
-	git checkout -b conflicting-a main &&
-	echo a >conflicting &&
-	git add conflicting &&
-	git commit -m conflicting-a &&
-	git checkout -b conflicting-b main &&
-	echo b >conflicting &&
-	git add conflicting &&
-	git commit -m conflicting-b
+expecting success of 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
 
-Switched to a new branch 'conflicting-a'
-[conflicting-a 3f25523] conflicting-a
+[master 9d96c85] target message subject line
  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
+ 1 file changed, 2 insertions(+)
+[master 5b2f7bf] intermediate commit
  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
+ok 31 - --fixup=reword: error out with -m option
 
-expecting success of 7503.3 'with no hook': 
-	test_when_finished "rm -f actual_hooks" &&
-	echo "foo" >file &&
-	git add file &&
-	git commit -m "first" &&
-	test_path_is_missing actual_hooks
+expecting success of 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
 
-[main e0ed36d] first
+[master a94321d] target message subject line
  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
+ 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
 
-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 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 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
+	$(get_commit_msg HEAD~)
 
-[main 9b1e6a8] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - --no-verify with no hook
+	edited 1
 
-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
+	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
 
-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)
+[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 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
+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
 
-[main 7901543] more
+[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 7 - with succeeding hook
+ok 34 - deny to create amend! commit if its commit msg body is empty
 
-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
+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
 
-Switched to branch 'side'
-Merge made by the 'ort' strategy.
- file | 1 +
+[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(+)
-Switched to branch 'main'
-ok 8 - with succeeding hook (merge)
+[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 7503.9 'automatic merge fails; both hooks are available': 
-	setup_success_hook "pre-commit" &&
-	setup_success_hook "pre-merge-commit" &&
+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 checkout conflicting-a &&
-	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
-	test_path_is_missing actual_hooks &&
+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
 
-	echo "pre-commit" >expected_hooks &&
-	echo a+b >conflicting &&
-	git add conflicting &&
-	git commit -m "resolve conflict" &&
-	test_cmp expected_hooks actual_hooks
+expecting success of 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
 
-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 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 7503.10 '--no-verify with succeeding hook': 
-	setup_success_hook "pre-commit" &&
-	echo "even more" >>file &&
-	git add file &&
-	git commit --no-verify -m "even more" &&
-	test_path_is_missing actual_hooks
+expecting success of 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
 
-[conflicting-a 79fc96c] even more
+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(+)
-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
+[master f054bdc] intermediate commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 41 - --fixup=reword: give error with pathsec
 
-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 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 7503.12 'with failing hook': 
-	setup_failing_hook "pre-commit" &&
-	test_when_finished "rm -f expected_hooks" &&
-	echo "pre-commit-failing-hook" >expected_hooks &&
+ok 42 - --fixup=reword: -F give error message
 
-	echo "another" >>file &&
-	git add file &&
-	test_must_fail git commit -m "another" &&
-	test_cmp expected_hooks actual_hooks
+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"
 
-ok 12 - with failing hook
+[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 7503.13 '--no-verify with failing hook': 
-	setup_failing_hook "pre-commit" &&
-	echo "stuff" >>file &&
-	git add file &&
-	git commit --no-verify -m "stuff" &&
-	test_path_is_missing actual_hooks
+expecting success of 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"
 
-[main 9073eff] stuff
+[master 34d018d] target message subject line
  Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
-ok 13 - --no-verify with failing hook
+ 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 7503.14 'with failing hook (merge)': 
-	setup_failing_hook "pre-merge-commit" &&
-	echo "pre-merge-commit-failing-hook" >expected_hooks &&
-	git checkout side &&
-	test_must_fail git merge -m "merge main" main &&
-	git checkout main &&
-	test_cmp expected_hooks actual_hooks
+expecting success of 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"
 
-Switched to branch 'side'
-Not committing merge; use 'git commit' to complete the merge.
-Switched to branch 'main'
-ok 14 - with failing hook (merge)
+[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 7503.15 '--no-verify with failing hook (merge)': 
-	setup_failing_hook "pre-merge-commit" &&
+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"
 
-	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
+[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
 
-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 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"
 
-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
+[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
 
-hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
-hint: You can disable this warning with `git config advice.ignoredHook false`.
-[main be1df3a] content
+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(+)
-ok 16 - with non-executable hook
+[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 7503.17 '--no-verify with non-executable hook': 
-	setup_non_exec_hook "pre-commit" &&
-	echo "more content" >>file &&
-	git add file &&
-	git commit --no-verify -m "more content" &&
-	test_path_is_missing actual_hooks
+expecting success of 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"
 
-[main dd373ff] more content
+[master acfdcf4] target message subject line
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-ok 17 - --no-verify with non-executable hook
+[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 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
+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
 
-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)
+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 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
+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 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)
+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 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 &&
+expecting success of 7500.52 'setup empty commit with unstaged rename and copy': 
+	test_create_repo unstaged_rename_and_copy &&
 	(
-		cd success &&
-		git commit -m "hook requires GIT_PREFIX = success/"
-	) &&
-	test_cmp expected_hooks actual_hooks
+		cd unstaged_rename_and_copy &&
 
-[main 91e0a75] hook requires GIT_PREFIX = success/
+		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.45.2/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>
- 1 file changed, 1 insertion(+)
-ok 20 - with hook requiring GIT_PREFIX
+ 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 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 &&
+expecting success of 7500.53 'check commit with unstaged rename and copy': 
 	(
-		cd fail &&
-		test_must_fail git commit -m "hook must fail"
-	) &&
-	git checkout -- file &&
-	test_cmp expected_hooks actual_hooks
+		cd unstaged_rename_and_copy &&
 
-ok 21 - with failing hook requiring GIT_PREFIX
+		test_must_fail git -c diff.renames=copy commit
+	)
 
-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
+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
 
-[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
+no changes added to commit (use "git add" and/or "git commit -a")
+ok 53 - check commit with unstaged rename and copy
 
-    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
+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
 
-    by new.author via command line
-ok 22 - check the author in hook
+[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 22 test(s)
-1..22
+# passed all 54 test(s)
+1..54
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7400-submodule-basic.sh ***
@@ -461223,8 +460263,8 @@
 Turn off this advice by setting config variable advice.detachedHead to false
 
 HEAD is now at 8f98e77 initial commit
---- actual	2025-12-18 01:38:34.950773267 +0000
-+++ actual2	2025-12-18 01:38:35.074773267 +0000
+--- actual	2024-11-14 19:42:36.913716771 +0000
++++ actual2	2024-11-14 19:42:37.397721749 +0000
 @@ -4,7 +4,7 @@
  23ad8e191a506339bc2aa0ae92a950f35303f38b
  23ad8e191a506339bc2aa0ae92a950f35303f38b
@@ -463969,142 +463009,2667 @@
  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
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7503-pre-commit-and-pre-merge-commit-hooks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7503-pre-commit-and-pre-merge-commit-hooks/.git/
+expecting success of 7503.1 'root commit': 
+	echo "root" >file &&
+	git add file &&
+	git commit -m "zeroth" &&
+	git checkout -b side &&
+	echo "foo" >foo &&
+	git add foo &&
+	git commit -m "make it non-ff" &&
+	git branch side-orig side &&
+	git checkout main
+
+[main (root-commit) 0e29351] zeroth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Switched to a new branch 'side'
+[side f4a0fae] make it non-ff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo
+Switched to branch 'main'
+ok 1 - root commit
+
+expecting success of 7503.2 'setup conflicting branches': 
+	test_when_finished "git checkout main" &&
+	git checkout -b conflicting-a main &&
+	echo a >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-a &&
+	git checkout -b conflicting-b main &&
+	echo b >conflicting &&
+	git add conflicting &&
+	git commit -m conflicting-b
+
+Switched to a new branch 'conflicting-a'
+[conflicting-a 3f25523] conflicting-a
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflicting
+Switched to a new branch 'conflicting-b'
+[conflicting-b 8c264fe] conflicting-b
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 conflicting
+Switched to branch 'main'
+ok 2 - setup conflicting branches
+
+expecting success of 7503.3 'with no hook': 
+	test_when_finished "rm -f actual_hooks" &&
+	echo "foo" >file &&
+	git add file &&
+	git commit -m "first" &&
+	test_path_is_missing actual_hooks
+
+[main e0ed36d] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - with no hook
+
+expecting success of 7503.4 'with no hook (merge)': 
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 4 - with no hook (merge)
+
+expecting success of 7503.5 '--no-verify with no hook': 
+	test_when_finished "rm -f actual_hooks" &&
+	echo "bar" >file &&
+	git add file &&
+	git commit --no-verify -m "bar" &&
+	test_path_is_missing actual_hooks
+
+[main 9b1e6a8] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - --no-verify with no hook
+
+expecting success of 7503.6 '--no-verify with no hook (merge)': 
+	test_when_finished "rm -f actual_hooks" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to branch 'main'
+ok 6 - --no-verify with no hook (merge)
+
+expecting success of 7503.7 'with succeeding hook': 
+	setup_success_hook "pre-commit" &&
+	echo "more" >>file &&
+	git add file &&
+	git commit -m "more" &&
+	test_cmp expected_hooks actual_hooks
+
+[main 7901543] more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 7 - with succeeding hook
+
+expecting success of 7503.8 'with succeeding hook (merge)': 
+	setup_success_hook "pre-merge-commit" &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_cmp expected_hooks actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 1 +
+ 1 file changed, 1 insertion(+)
+Switched to branch 'main'
+ok 8 - with succeeding hook (merge)
+
+expecting success of 7503.9 'automatic merge fails; both hooks are available': 
+	setup_success_hook "pre-commit" &&
+	setup_success_hook "pre-merge-commit" &&
+
+	git checkout conflicting-a &&
+	test_must_fail git merge -m "merge conflicting-b" conflicting-b &&
+	test_path_is_missing actual_hooks &&
+
+	echo "pre-commit" >expected_hooks &&
+	echo a+b >conflicting &&
+	git add conflicting &&
+	git commit -m "resolve conflict" &&
+	test_cmp expected_hooks actual_hooks
+
+Switched to branch 'conflicting-a'
+Auto-merging conflicting
+CONFLICT (add/add): Merge conflict in conflicting
+Automatic merge failed; fix conflicts and then commit the result.
+[conflicting-a ff0069b] resolve conflict
+ Author: A U Thor <author@example.com>
+ok 9 - automatic merge fails; both hooks are available
+
+expecting success of 7503.10 '--no-verify with succeeding hook': 
+	setup_success_hook "pre-commit" &&
+	echo "even more" >>file &&
+	git add file &&
+	git commit --no-verify -m "even more" &&
+	test_path_is_missing actual_hooks
+
+[conflicting-a 79fc96c] even more
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 10 - --no-verify with succeeding hook
+
+expecting success of 7503.11 '--no-verify with succeeding hook (merge)': 
+	setup_success_hook "pre-merge-commit" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 11 - --no-verify with succeeding hook (merge)
+
+expecting success of 7503.12 'with failing hook': 
+	setup_failing_hook "pre-commit" &&
+	test_when_finished "rm -f expected_hooks" &&
+	echo "pre-commit-failing-hook" >expected_hooks &&
+
+	echo "another" >>file &&
+	git add file &&
+	test_must_fail git commit -m "another" &&
+	test_cmp expected_hooks actual_hooks
+
+ok 12 - with failing hook
+
+expecting success of 7503.13 '--no-verify with failing hook': 
+	setup_failing_hook "pre-commit" &&
+	echo "stuff" >>file &&
+	git add file &&
+	git commit --no-verify -m "stuff" &&
+	test_path_is_missing actual_hooks
+
+[main 9073eff] stuff
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ok 13 - --no-verify with failing hook
+
+expecting success of 7503.14 'with failing hook (merge)': 
+	setup_failing_hook "pre-merge-commit" &&
+	echo "pre-merge-commit-failing-hook" >expected_hooks &&
+	git checkout side &&
+	test_must_fail git merge -m "merge main" main &&
+	git checkout main &&
+	test_cmp expected_hooks actual_hooks
+
+Switched to branch 'side'
+Not committing merge; use 'git commit' to complete the merge.
+Switched to branch 'main'
+ok 14 - with failing hook (merge)
+
+expecting success of 7503.15 '--no-verify with failing hook (merge)': 
+	setup_failing_hook "pre-merge-commit" &&
+
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 15 - --no-verify with failing hook (merge)
+
+expecting success of 7503.16 'with non-executable hook': 
+	setup_non_exec_hook "pre-commit" &&
+	echo "content" >>file &&
+	git add file &&
+	git commit -m "content" &&
+	test_path_is_missing actual_hooks
+
+hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.
+hint: You can disable this warning with `git config advice.ignoredHook false`.
+[main be1df3a] content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 16 - with non-executable hook
+
+expecting success of 7503.17 '--no-verify with non-executable hook': 
+	setup_non_exec_hook "pre-commit" &&
+	echo "more content" >>file &&
+	git add file &&
+	git commit --no-verify -m "more content" &&
+	test_path_is_missing actual_hooks
+
+[main dd373ff] more content
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 17 - --no-verify with non-executable hook
+
+expecting success of 7503.18 'with non-executable hook (merge)': 
+	setup_non_exec_hook "pre-merge" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 18 - with non-executable hook (merge)
+
+expecting success of 7503.19 '--no-verify with non-executable hook (merge)': 
+	setup_non_exec_hook "pre-merge" &&
+	git branch -f side side-orig &&
+	git checkout side &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
+	test_path_is_missing actual_hooks
+
+Switched to branch 'side'
+Merge made by the 'ort' strategy.
+ file | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Switched to branch 'main'
+ok 19 - --no-verify with non-executable hook (merge)
+
+expecting success of 7503.20 'with hook requiring GIT_PREFIX': 
+	test_when_finished "rm -rf actual_hooks success" &&
+	setup_require_prefix_hook &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir success &&
+	(
+		cd success &&
+		git commit -m "hook requires GIT_PREFIX = success/"
+	) &&
+	test_cmp expected_hooks actual_hooks
+
+[main 91e0a75] hook requires GIT_PREFIX = success/
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 20 - with hook requiring GIT_PREFIX
+
+expecting success of 7503.21 'with failing hook requiring GIT_PREFIX': 
+	test_when_finished "rm -rf actual_hooks fail" &&
+	setup_require_prefix_hook &&
+	echo "more content" >>file &&
+	git add file &&
+	mkdir fail &&
+	(
+		cd fail &&
+		test_must_fail git commit -m "hook must fail"
+	) &&
+	git checkout -- file &&
+	test_cmp expected_hooks actual_hooks
+
+ok 21 - with failing hook requiring GIT_PREFIX
+
+expecting success of 7503.22 'check the author in hook': 
+	setup_require_author_hook &&
+	cat >expected_hooks <<-EOF &&
+	check-author
+	check-author
+	check-author
+	EOF
+	test_must_fail git commit --allow-empty -m "by a.u.thor" &&
+	(
+		GIT_AUTHOR_NAME="New Author" &&
+		GIT_AUTHOR_EMAIL="newauthor@example.com" &&
+		export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
+		git commit --allow-empty -m "by new.author via env" &&
+		git show -s
+	) &&
+	git commit --author="New Author <newauthor@example.com>" \
+		--allow-empty -m "by new.author via command line" &&
+	git show -s &&
+	test_cmp expected_hooks actual_hooks
+
+[main 1b3a79e] by new.author via env
+ Author: New Author <newauthor@example.com>
+ 1 file changed, 1 insertion(+)
+commit 1b3a79eec1cf60fc72bbc0d27901d153c90e4abe
+Author: New Author <newauthor@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    by new.author via env
+[main 155e737] by new.author via command line
+ Author: New Author <newauthor@example.com>
+commit 155e73716852370372b22eca0576dacb5016aa2e
+Author: New Author <newauthor@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    by new.author via command line
+ok 22 - check the author in hook
+
+# passed all 22 test(s)
+1..22
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7112-reset-submodule.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/.git/
+expecting success of 7112.1 'git reset --keep --recurse-submodules: added submodule is checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1/.git/
+[master (root-commit) 63c4304] Base inside first submodule
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2/.git/
+[master (root-commit) 27c5769] nested submodule base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/.git/
+[master (root-commit) 27611a5] Base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 4 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 file1
+ create mode 100644 file2
+Switched to a new branch 'add_sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/uninitialized_sub'...
+done.
+[add_sub1 09bcf53] Add sub1
+ Author: A U Thor <author@example.com>
+ 2 files changed, 8 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 uninitialized_sub
+Switched to a new branch 'remove_sub1'
+warning: unable to rmdir 'sub1': Directory not empty
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+[remove_sub1 d6ba723] Revert "Add sub1"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 3 files changed, 9 deletions(-)
+ delete mode 100644 .gitmodules
+ delete mode 160000 sub1
+ delete mode 160000 uninitialized_sub
+Switched to a new branch 'modify_sub1'
+Switched to a new branch 'modifications'
+[modifications 03da4ea] modified file2 and added file3
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file3
+To /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1
+ * [new branch]      modifications -> modifications
+[modify_sub1 cb2bda7] Modify sub1
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'add_nested_sub'
+Switched to a new branch 'add_nested_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1/sub2'...
+done.
+[add_nested_sub 8b3b335] add a nested submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 5 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub2
+[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+Switched to a new branch 'modify_sub1_recursively'
+[modify_sub1_recursively c7c4624] make a change in nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file3
+[modify_sub1_recursively 92fc14a] update nested sub
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+[modify_sub1_recursively 953e869] update sub1, that updates nested sub
+ Author: A U Thor <author@example.com>
+To /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+To /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2
+ * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
+Cleared directory 'sub2'
+Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
+Switched to a new branch 'replace_sub1_with_directory'
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Previous HEAD position was 63c4304 Base inside first submodule
+Switched to branch 'modifications'
+rm 'sub1'
+[replace_sub1_with_directory cb28587] Replace sub1 with directory
+ Author: A U Thor <author@example.com>
+ 5 files changed, 3 insertions(+), 5 deletions(-)
+ delete mode 160000 sub1
+ create mode 100644 sub1/file1
+ create mode 100644 sub1/file2
+ create mode 100644 sub1/file3
+Switched to a new branch 'replace_directory_with_sub1'
+[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+ delete mode 100644 sub1/file1
+ delete mode 100644 sub1/file2
+ delete mode 100644 sub1/file3
+Switched to a new branch 'replace_sub1_with_file'
+rm 'sub1'
+[replace_sub1_with_file 2364f5a] Replace sub1 with file
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+ mode change 160000 => 100644 sub1
+Switched to a new branch 'replace_file_with_sub1'
+[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ mode change 100644 => 160000 sub1
+Switched to a new branch 'invalid_sub1'
+[invalid_sub1 e6169bf] Invalid sub1 commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'valid_sub1'
+[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+warning: unable to rmdir 'uninitialized_sub': Directory not empty
+Switched to branch 'master'
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 1 - git reset --keep --recurse-submodules: added submodule is checked out
+
+expecting success of 7112.2 'git reset --keep --recurse-submodules: added submodule is checked out in empty dir': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 2 - git reset --keep --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success of 7112.3 'git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+ok 3 - git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule
+
+expecting success of 7112.4 'git reset --keep --recurse-submodules: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+ok 4 - git reset --keep --recurse-submodules: replace directory with submodule
+
+expecting success of 7112.5 'git reset --keep --recurse-submodules: nested submodules are checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 5 - git reset --keep --recurse-submodules: nested submodules are checked out
+
+expecting success of 7112.6 'git reset --keep --recurse-submodules: removed submodule removes submodules working tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+ok 6 - git reset --keep --recurse-submodules: removed submodule removes submodules working tree
+
+expecting success of 7112.7 'git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+ok 7 - git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory
+
+expecting success of 7112.8 'git reset --keep --recurse-submodules: replace submodule with a file': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 8 - git reset --keep --recurse-submodules: replace submodule with a file
+
+checking known breakage of 7112.9 'git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/untrackedfile &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test -f sub1/untracked_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --keep --recurse-submodules replace_sub1_with_file
+not ok 9 - git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+
+expecting success of 7112.10 'git reset --keep --recurse-submodules: worktrees of nested submodules are removed': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t no_submodule origin/no_submodule &&
+			$command no_submodule &&
+			test_superproject_content origin/no_submodule &&
+			test_path_is_missing sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
+			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+ok 10 - git reset --keep --recurse-submodules: worktrees of nested submodules are removed
+
+expecting success of 7112.11 'git reset --keep --recurse-submodules: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 11 - git reset --keep --recurse-submodules: modified submodule updates submodule work tree
+
+expecting success of 7112.12 'git reset --keep --recurse-submodules: updating to a missing submodule commit fails': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			test_must_fail $command invalid_sub1 2>err &&
+			test_grep sub1 err &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+fatal: Could not reset index file to revision 'invalid_sub1'.
+ok 12 - git reset --keep --recurse-submodules: updating to a missing submodule commit fails
+
+expecting success of 7112.13 'git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git -C sub1 checkout -b keep_branch &&
+			git -C sub1 rev-parse HEAD >expect &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1 &&
+			git -C sub1 rev-parse keep_branch >actual &&
+			test_cmp expect actual &&
+			test_must_fail git -C sub1 symbolic-ref HEAD
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Switched to a new branch 'keep_branch'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+fatal: ref HEAD is not a symbolic ref
+ok 13 - git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead
+
+expecting success of 7112.14 'git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			: >sub1 &&
+			test_must_fail $command add_sub1 &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'add_sub1'.
+ok 14 - git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name
+
+expecting success of 7112.15 'git reset --keep --recurse-submodules: added submodule removes an untracked ignored file': 
+		test_when_finished "rm -rf submodule_update/.git/info" &&
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			: >sub1 &&
+			mkdir .git/info &&
+			echo sub1 >.git/info/exclude &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+ok 15 - git reset --keep --recurse-submodules: added submodule removes an untracked ignored file
+
+checking known breakage of 7112.16 'git reset --keep --recurse-submodules: replace submodule with a directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_submodule_content sub1 origin/replace_sub1_with_directory
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+not ok 16 - git reset --keep --recurse-submodules: replace submodule with a directory # TODO known breakage
+
+checking known breakage of 7112.17 'git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+not ok 17 - git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
+
+expecting success of 7112.18 'git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule': 
+		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			rm -rf .git/modules/sub1/info &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			mkdir .git/modules/sub1/info &&
+			echo ignored >.git/modules/sub1/info/exclude &&
+			: >sub1/ignored &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+ok 18 - git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
+
+expecting success of 7112.19 'git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			git -c submodule.recurse=true $cmd_args modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+ok 19 - git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree
+
+expecting success of 7112.20 'git reset --keep --recurse-submodules: modified submodule updates submodule recursively': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+ok 20 - git reset --keep --recurse-submodules: modified submodule updates submodule recursively
+
+expecting success of 7112.21 'git reset --hard --recurse-submodules: added submodule is checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 21 - git reset --hard --recurse-submodules: added submodule is checked out
+
+expecting success of 7112.22 'git reset --hard --recurse-submodules: added submodule is checked out in empty dir': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 22 - git reset --hard --recurse-submodules: added submodule is checked out in empty dir
+
+expecting success of 7112.23 'git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
+ok 23 - git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule
+
+expecting success of 7112.24 'git reset --hard --recurse-submodules: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to_interested replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
+ok 24 - git reset --hard --recurse-submodules: replace directory with submodule
+
+expecting success of 7112.25 'git reset --hard --recurse-submodules: nested submodules are checked out': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
+HEAD is now at 953e869 update sub1, that updates nested sub
+ok 25 - git reset --hard --recurse-submodules: nested submodules are checked out
+
+expecting success of 7112.26 'git reset --hard --recurse-submodules: removed submodule removes submodules working tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 26 - git reset --hard --recurse-submodules: removed submodule removes submodules working tree
+
+expecting success of 7112.27 'git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			! test -e sub1 &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 27 - git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory
+
+expecting success of 7112.28 'git reset --hard --recurse-submodules: replace submodule with a file': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file &&
+			test -f sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+ok 28 - git reset --hard --recurse-submodules: replace submodule with a file
+
+checking known breakage of 7112.29 'git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/untrackedfile &&
+			test_must_fail $command replace_sub1_with_file &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test -f sub1/untracked_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+test_must_fail: command succeeded: git reset --hard --recurse-submodules replace_sub1_with_file
+not ok 29 - git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
+
+expecting success of 7112.30 'git reset --hard --recurse-submodules: worktrees of nested submodules are removed': 
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t no_submodule origin/no_submodule &&
+			$command no_submodule &&
+			test_superproject_content origin/no_submodule &&
+			test_path_is_missing sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
+			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_nested_sub'
+branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
+Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
+done.
+Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+HEAD is now at 27611a5 Base
+ok 30 - git reset --hard --recurse-submodules: worktrees of nested submodules are removed
+
+expecting success of 7112.31 'git reset --hard --recurse-submodules: modified submodule updates submodule work tree': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+ok 31 - git reset --hard --recurse-submodules: modified submodule updates submodule work tree
+
+expecting success of 7112.32 'git reset --hard --recurse-submodules: updating to a missing submodule commit fails': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			test_must_fail $command invalid_sub1 2>err &&
+			test_grep sub1 err &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+error: Submodule 'sub1' could not be updated.
+error: Submodule 'sub1' cannot checkout new HEAD.
+fatal: Could not reset index file to revision 'invalid_sub1'.
+ok 32 - git reset --hard --recurse-submodules: updating to a missing submodule commit fails
+
+expecting success of 7112.33 'git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git -C sub1 checkout -b keep_branch &&
+			git -C sub1 rev-parse HEAD >expect &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1 &&
+			git -C sub1 rev-parse keep_branch >actual &&
+			test_cmp expect actual &&
+			test_must_fail git -C sub1 symbolic-ref HEAD
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Switched to a new branch 'keep_branch'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+fatal: ref HEAD is not a symbolic ref
+ok 33 - git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead
+
+expecting success of 7112.34 'git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced': 
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+ok 34 - git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
+
+expecting success of 7112.35 'git reset --hard --recurse-submodules: replace submodule with a directory': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+HEAD is now at cb28587 Replace sub1 with directory
+ok 35 - git reset --hard --recurse-submodules: replace submodule with a directory
+
+expecting success of 7112.36 'git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			rm -rf .git/modules/sub1 &&
+			$command replace_sub1_with_directory &&
+			test_superproject_content origin/replace_sub1_with_directory &&
+			test_git_directory_exists sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+Migrating git directory of 'sub1' from
+'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
+'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
+HEAD is now at cb28587 Replace sub1 with directory
+ok 36 - git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail
+
+expecting success of 7112.37 'git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			: >sub1/expect &&
+			$command replace_sub1_with_file &&
+			test_superproject_content origin/replace_sub1_with_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+ok 37 - git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files
+
+expecting success of 7112.38 'git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to_interested invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+HEAD is now at 3036e4e Revert "Invalid sub1 commit"
+ok 38 - git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit
+
+expecting success of 7112.39 'git reset --hard --recurse-submodules: updating submodules fixes .git links': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			echo "gitdir: bogus/path" >sub1/.git &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+ok 39 - git reset --hard --recurse-submodules: updating submodules fixes .git links
+
+expecting success of 7112.40 'git reset --hard --recurse-submodules: changed submodule worktree is reset': 
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			rm sub1/file1 &&
+			: >sub1/new_file &&
+			git -C sub1 add new_file &&
+			$command HEAD &&
+			test_path_is_file sub1/file1 &&
+			test_path_is_missing sub1/new_file
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+HEAD is now at 09bcf53 Add sub1
+ok 40 - git reset --hard --recurse-submodules: changed submodule worktree is reset
+
+expecting success of 7112.41 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 41 - git_test_func: added submodule creates empty directory
+
+expecting success of 7112.42 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 42 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 7112.43 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 43 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 7112.44 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 44 - git_test_func: replace directory with submodule
+
+expecting success of 7112.45 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 45 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 7112.46 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 46 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 7112.47 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 47 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 7112.48 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 48 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 7112.49 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
+not ok 49 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 7112.50 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
+not ok 50 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 7112.51 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 51 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 7112.52 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 52 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 7112.53 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 53 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 7112.54 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'add_sub1'.
+ok 54 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 7112.55 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 55 - git_test_func: added submodule creates empty directory
+
+expecting success of 7112.56 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 56 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 7112.57 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 57 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 7112.58 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 58 - git_test_func: replace directory with submodule
+
+expecting success of 7112.59 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 59 - git_test_func: removed submodule leaves submodule directory and its contents in place
+
+expecting success of 7112.60 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+ok 60 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+
+expecting success of 7112.61 'git_test_func: replace submodule with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 61 - git_test_func: replace submodule with a directory must fail
+
+expecting success of 7112.62 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_directory test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
+ok 62 - git_test_func: replace submodule containing a .git directory with a directory must fail
+
+checking known breakage of 7112.63 'git_test_func: replace submodule with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
+not ok 63 - git_test_func: replace submodule with a file must fail # TODO known breakage
+
+checking known breakage of 7112.64 'git_test_func: replace submodule containing a .git directory with a file must fail': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+			replace_gitfile_with_git_dir sub1 &&
+			$command replace_sub1_with_file test_must_fail &&
+			test_superproject_content origin/add_sub1 &&
+			test_git_directory_is_unchanged sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
+not ok 64 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+
+expecting success of 7112.65 'git_test_func: modified submodule does not update submodule work tree': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			git submodule update &&
+			test_submodule_content sub1 origin/modify_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 65 - git_test_func: modified submodule does not update submodule work tree
+
+expecting success of 7112.66 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t invalid_sub1 origin/invalid_sub1 &&
+			$command invalid_sub1 &&
+			test_superproject_content origin/invalid_sub1 &&
+			test_submodule_content sub1 origin/add_sub1 &&
+			test_must_fail git submodule update &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 66 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+
+expecting success of 7112.67 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
+		prolog &&
+		reset_work_tree_to invalid_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t valid_sub1 origin/valid_sub1 &&
+			$command valid_sub1 &&
+			test_superproject_content origin/valid_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/valid_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'invalid_sub1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+fatal: Needed a single revision
+branch 'valid_sub1' set up to track 'origin/valid_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 67 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+
+expecting success of 7112.68 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			>sub1 &&
+			$command add_sub1 test_must_fail &&
+			test_superproject_content origin/no_submodule &&
+			test_must_be_empty sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+error: Untracked working tree file 'sub1' would be overwritten by merge.
+fatal: Could not reset index file to revision 'add_sub1'.
+ok 68 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+
+expecting success of 7112.69 'git_test_func: added submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 69 - git_test_func: added submodule creates empty directory
+
+expecting success of 7112.70 'git_test_func: added submodule leaves existing empty directory alone': 
+		prolog &&
+		reset_work_tree_to no_submodule &&
+		(
+			cd submodule_update &&
+			mkdir sub1 &&
+			git branch -t add_sub1 origin/add_sub1 &&
+			$command add_sub1 &&
+			test_superproject_content origin/add_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'no_submodule'
+branch 'no_submodule' set up to track 'origin/no_submodule'.
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+HEAD is now at 09bcf53 Add sub1
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 70 - git_test_func: added submodule leaves existing empty directory alone
+
+expecting success of 7112.71 'git_test_func: replace tracked file with submodule creates empty directory': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_file &&
+		(
+			cd submodule_update &&
+			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
+			$command replace_file_with_sub1 &&
+			test_superproject_content origin/replace_file_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_file_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_file'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+fatal: Needed a single revision
+branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
+HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 71 - git_test_func: replace tracked file with submodule creates empty directory
+
+expecting success of 7112.72 'git_test_func: replace directory with submodule': 
+		prolog &&
+		reset_work_tree_to replace_sub1_with_directory &&
+		(
+			cd submodule_update &&
+			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
+			$command replace_directory_with_sub1 &&
+			test_superproject_content origin/replace_directory_with_sub1 &&
+			test_dir_is_empty sub1 &&
+			git submodule update --init --recursive &&
+			test_submodule_content sub1 origin/replace_directory_with_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'replace_sub1_with_directory'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+fatal: Needed a single revision
+branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
+HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 72 - git_test_func: replace directory with submodule
+
+expecting success of 7112.73 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
+		prolog &&
+		reset_work_tree_to add_sub1 &&
+		(
+			cd submodule_update &&
+			git branch -t remove_sub1 origin/remove_sub1 &&
+			$command remove_sub1 &&
+			test_superproject_content origin/remove_sub1 &&
+			test_submodule_content sub1 origin/add_sub1
+		)
+	
+Cloning into 'submodule_update'...
+done.
+Switched to a new branch 'add_sub1'
+branch 'add_sub1' set up to track 'origin/add_sub1'.
+Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 73 - git_test_func: removed submodule leaves submodule directory and its contents in place
 
-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 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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'remove_sub1' set up to track 'origin/remove_sub1'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at d6ba723 Revert "Add sub1"
+ok 74 - git_test_func: removed submodule leaves submodule containing a .git directory alone
 
-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
+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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at cb28587 Replace sub1 with directory
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
+not ok 75 - git_test_func: replace submodule with a directory must fail # TODO known breakage
 
-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
+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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
+warning: unable to rmdir 'sub1': Directory not empty
+HEAD is now at cb28587 Replace sub1 with directory
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
+not ok 76 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
 
-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."
+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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
+not ok 77 - git_test_func: replace submodule with a file must fail # TODO known breakage
 
-[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)
+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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
+HEAD is now at 2364f5a Replace sub1 with file
+test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
+not ok 78 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
 
-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
+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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'modify_sub1' set up to track 'origin/modify_sub1'.
+HEAD is now at cb2bda7 Modify sub1
+Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
+ok 79 - git_test_func: modified submodule does not update submodule work tree
 
-[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 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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
+HEAD is now at e6169bf Invalid sub1 commit
+fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
+fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
+ok 80 - git_test_func: modified submodule does not update submodule work tree to invalid commit
 
-expecting success of 7501.77 '--dry-run --short': 
-	>test-file &&
-	git add test-file &&
-	git commit --dry-run --short
+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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
+Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
+done.
+Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
+ok 81 - git_test_func: modified submodule does not update submodule work tree from invalid commit
 
-M  test-file
-?? actual
-?? actual.msg
-?? commit
-?? current
-?? diff
-?? diff1
-?? diff2
-?? editor
-?? err
-?? expect
-?? expect.msg
-?? expected
-?? file.actual
-?? file.expect
-?? ident
-?? msg
-?? out
-?? output
-?? remaining
-?? replace
-?? stat
-?? subject
-ok 77 - --dry-run --short
+expecting success of 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 77 test(s)
-1..77
+# still have 12 known breakage(s)
+# passed all remaining 70 test(s)
+1..82
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7504-commit-msg-hook.sh ***
@@ -464527,598 +466092,6 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7507-commit-verbose.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7507-commit-verbose/.git/
-expecting success of 7507.1 'setup': 
-	echo content >file &&
-	git add file &&
-	git commit -F message
-
-[master (root-commit) 5621fbe] subject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 1 - setup
-
-expecting success of 7507.2 'initial commit shows verbose diff': 
-	git commit --amend -v &&
-	test_line_count = 1 out
-
-[master 5621fbe] subject
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-ok 2 - initial commit shows verbose diff
-
-expecting success of 7507.3 'second commit': 
-	echo content modified >file &&
-	git add file &&
-	git commit -F message
-
-[master aa8777f] subject
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 3 - second commit
-
-expecting success of 7507.4 'verbose diff is stripped out': 
-	git commit --amend -v &&
-	check_message message &&
-	test_line_count = 1 out
-
-[master aa8777f] subject
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 4 - verbose diff is stripped out
-
-expecting success of 7507.5 'verbose diff is stripped out (mnemonicprefix)': 
-	git config diff.mnemonicprefix true &&
-	git commit --amend -v &&
-	check_message message &&
-	test_line_count = 1 out
-
-[master aa8777f] subject
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 5 - verbose diff is stripped out (mnemonicprefix)
-
-expecting success of 7507.6 'diff in message is retained without -v': 
-	git commit --amend -F diff &&
-	check_message diff
-
-[master 5165ef5] This is an example commit message that contains a diff.
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 6 - diff in message is retained without -v
-
-expecting success of 7507.7 'diff in message is retained with -v': 
-	git commit --amend -F diff -v &&
-	check_message diff
-
-[master 5165ef5] This is an example commit message that contains a diff.
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 7 - diff in message is retained with -v
-
-expecting success of 7507.8 'submodule log is stripped out too with -v': 
-	git config diff.submodule log &&
-	test_config_global protocol.file.allow always &&
-	git submodule add ./. sub &&
-	git commit -m "sub added" &&
-	(
-		cd sub &&
-		echo "more" >>file &&
-		git commit -a -m "submodule commit"
-	) &&
-	(
-		GIT_EDITOR=cat &&
-		export GIT_EDITOR &&
-		test_must_fail git commit -a -v 2>err
-	) &&
-	test_grep "Aborting commit due to empty commit message." err
-
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7507-commit-verbose/sub'...
-done.
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-[master 2b9398c] submodule commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# Author:    A U Thor <author@example.com>
-#
-# On branch master
-# Changes to be committed:
-#	modified:   sub
-#
-# Untracked files:
-#	.gitconfig
-#	actual
-#	check-for-diff
-#	diff
-#	err
-#	message
-#	out
-#
-# ------------------------ >8 ------------------------
-# Do not modify or remove the line above.
-# Everything below it will be ignored.
-Submodule sub 5165ef5..2b9398c:
-  > submodule commit
-Aborting commit due to empty commit message.
-ok 8 - submodule log is stripped out too with -v
-
-expecting success of 7507.9 'verbose diff is stripped out with set core.commentChar': 
-	(
-		GIT_EDITOR=cat &&
-		export GIT_EDITOR &&
-		test_must_fail git -c core.commentchar=";" commit -a -v 2>err
-	) &&
-	test_grep "Aborting commit due to empty commit message." err
-
-
-; Please enter the commit message for your changes. Lines starting
-; with ';' will be ignored, and an empty message aborts the commit.
-;
-; Author:    A U Thor <author@example.com>
-;
-; On branch master
-; Changes to be committed:
-;	modified:   sub
-;
-; Untracked files:
-;	.gitconfig
-;	actual
-;	check-for-diff
-;	diff
-;	err
-;	message
-;	out
-;
-; ------------------------ >8 ------------------------
-; Do not modify or remove the line above.
-; Everything below it will be ignored.
-Submodule sub 5165ef5..2b9398c:
-  > submodule commit
-Aborting commit due to empty commit message.
-ok 9 - verbose diff is stripped out with set core.commentChar
-
-expecting success of 7507.10 'verbose diff is stripped with multi-byte comment char': 
-	(
-		GIT_EDITOR=cat &&
-		export GIT_EDITOR &&
-		test_must_fail git -c core.commentchar="foo>" commit -a -v >out 2>err
-	) &&
-	grep "^foo> " out &&
-	test_grep "Aborting commit due to empty commit message." err
-
-foo> Please enter the commit message for your changes. Lines starting
-foo> with 'foo>' will be ignored, and an empty message aborts the commit.
-foo> Author:    A U Thor <author@example.com>
-foo> On branch master
-foo> Changes to be committed:
-foo> Untracked files:
-foo> ------------------------ >8 ------------------------
-foo> Do not modify or remove the line above.
-foo> Everything below it will be ignored.
-Aborting commit due to empty commit message.
-ok 10 - verbose diff is stripped with multi-byte comment char
-
-expecting success of 7507.11 'status does not verbose without --verbose': 
-	git status >actual &&
-	! grep "^diff --git" actual
-
-ok 11 - status does not verbose without --verbose
-
-expecting success of 7507.12 'setup -v -v': 
-	echo dirty >file
-
-ok 12 - setup -v -v
-
-expecting success of 7507.13 'commit.verbose=true and --verbose omitted': 
-		git -c commit.verbose=true commit --amend &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 13 - commit.verbose=true and --verbose omitted
-
-expecting success of 7507.14 'commit.verbose=1 and --verbose omitted': 
-		git -c commit.verbose=1 commit --amend &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 14 - commit.verbose=1 and --verbose omitted
-
-expecting success of 7507.15 'commit.verbose=false and --verbose omitted': 
-		git -c commit.verbose=false commit --amend &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 15 - commit.verbose=false and --verbose omitted
-
-expecting success of 7507.16 'commit.verbose=-2 and --verbose omitted': 
-		git -c commit.verbose=-2 commit --amend &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 16 - commit.verbose=-2 and --verbose omitted
-
-expecting success of 7507.17 'commit.verbose=-1 and --verbose omitted': 
-		git -c commit.verbose=-1 commit --amend &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 17 - commit.verbose=-1 and --verbose omitted
-
-expecting success of 7507.18 'commit.verbose=0 and --verbose omitted': 
-		git -c commit.verbose=0 commit --amend &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 18 - commit.verbose=0 and --verbose omitted
-
-expecting success of 7507.19 'commit.verbose=2 and --verbose omitted': 
-		git -c commit.verbose=2 commit --amend &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 19 - commit.verbose=2 and --verbose omitted
-
-expecting success of 7507.20 'commit.verbose=3 and --verbose omitted': 
-		git -c commit.verbose=3 commit --amend &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 20 - commit.verbose=3 and --verbose omitted
-
-expecting success of 7507.21 'commit.verbose=true and --verbose': 
-		git -c commit.verbose=true commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 21 - commit.verbose=true and --verbose
-
-expecting success of 7507.22 'commit.verbose=true and --no-verbose': 
-		git -c commit.verbose=true commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 22 - commit.verbose=true and --no-verbose
-
-expecting success of 7507.23 'commit.verbose=true and -v -v': 
-		git -c commit.verbose=true commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 23 - commit.verbose=true and -v -v
-
-expecting success of 7507.24 'commit.verbose=false and --verbose': 
-		git -c commit.verbose=false commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 24 - commit.verbose=false and --verbose
-
-expecting success of 7507.25 'commit.verbose=false and --no-verbose': 
-		git -c commit.verbose=false commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 25 - commit.verbose=false and --no-verbose
-
-expecting success of 7507.26 'commit.verbose=false and -v -v': 
-		git -c commit.verbose=false commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 26 - commit.verbose=false and -v -v
-
-expecting success of 7507.27 'commit.verbose=-2 and --verbose': 
-		git -c commit.verbose=-2 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 27 - commit.verbose=-2 and --verbose
-
-expecting success of 7507.28 'commit.verbose=-2 and --no-verbose': 
-		git -c commit.verbose=-2 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 28 - commit.verbose=-2 and --no-verbose
-
-expecting success of 7507.29 'commit.verbose=-2 and -v -v': 
-		git -c commit.verbose=-2 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 29 - commit.verbose=-2 and -v -v
-
-expecting success of 7507.30 'commit.verbose=-1 and --verbose': 
-		git -c commit.verbose=-1 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 30 - commit.verbose=-1 and --verbose
-
-expecting success of 7507.31 'commit.verbose=-1 and --no-verbose': 
-		git -c commit.verbose=-1 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 31 - commit.verbose=-1 and --no-verbose
-
-expecting success of 7507.32 'commit.verbose=-1 and -v -v': 
-		git -c commit.verbose=-1 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 32 - commit.verbose=-1 and -v -v
-
-expecting success of 7507.33 'commit.verbose=0 and --verbose': 
-		git -c commit.verbose=0 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 33 - commit.verbose=0 and --verbose
-
-expecting success of 7507.34 'commit.verbose=0 and --no-verbose': 
-		git -c commit.verbose=0 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 34 - commit.verbose=0 and --no-verbose
-
-expecting success of 7507.35 'commit.verbose=0 and -v -v': 
-		git -c commit.verbose=0 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 35 - commit.verbose=0 and -v -v
-
-expecting success of 7507.36 'commit.verbose=1 and --verbose': 
-		git -c commit.verbose=1 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 36 - commit.verbose=1 and --verbose
-
-expecting success of 7507.37 'commit.verbose=1 and --no-verbose': 
-		git -c commit.verbose=1 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 37 - commit.verbose=1 and --no-verbose
-
-expecting success of 7507.38 'commit.verbose=1 and -v -v': 
-		git -c commit.verbose=1 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 38 - commit.verbose=1 and -v -v
-
-expecting success of 7507.39 'commit.verbose=2 and --verbose': 
-		git -c commit.verbose=2 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 39 - commit.verbose=2 and --verbose
-
-expecting success of 7507.40 'commit.verbose=2 and --no-verbose': 
-		git -c commit.verbose=2 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 40 - commit.verbose=2 and --no-verbose
-
-expecting success of 7507.41 'commit.verbose=2 and -v -v': 
-		git -c commit.verbose=2 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 41 - commit.verbose=2 and -v -v
-
-expecting success of 7507.42 'commit.verbose=3 and --verbose': 
-		git -c commit.verbose=3 commit --amend --verbose &&
-		test_line_count = 1 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 42 - commit.verbose=3 and --verbose
-
-expecting success of 7507.43 'commit.verbose=3 and --no-verbose': 
-		git -c commit.verbose=3 commit --amend --no-verbose &&
-		test_line_count = 0 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 43 - commit.verbose=3 and --no-verbose
-
-expecting success of 7507.44 'commit.verbose=3 and -v -v': 
-		git -c commit.verbose=3 commit --amend -v -v &&
-		test_line_count = 2 out
-	
-[master 2f750a4] sub added
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 4 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub
-ok 44 - commit.verbose=3 and -v -v
-
-expecting success of 7507.45 'status ignores commit.verbose=true': 
-	git -c commit.verbose=true status >actual &&
-	! grep "^diff --git actual"
-
-ok 45 - status ignores commit.verbose=true
-
-# passed all 45 test(s)
-1..45
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7502-commit-porcelain.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7502-commit-porcelain/.git/
 expecting success of 7502.1 'output summary format': 
@@ -466059,21 +467032,38 @@
 	git var GIT_AUTHOR_IDENT
 
 )
-Author identity unknown
+second user <pbuilder2@infom07-i386.debian.net> 1112912533 -0700
+prerequisite AUTOIDENT ok
+expecting success of 7502.52 'message shows committer when it is automatic': 
 
-*** Please tell me who you are.
+	echo >>negative &&
+	(
+		sane_unset GIT_COMMITTER_EMAIL &&
+		sane_unset GIT_COMMITTER_NAME &&
+		git commit -e -m "sample" -a
+	) &&
+	# the ident is calculated from the system, so we cannot
+	# check the actual value, only that it is there
+	test_grep "^# Committer: " .git/COMMIT_EDITMSG
 
-Run
+[main b1e9835] sample
+ Author: A U Thor <author@example.com>
+ Committer: second user <pbuilder2@infom07-i386.debian.net>
+Your name and email address were configured automatically based
+on your username and hostname. Please check that they are accurate.
+You can suppress this message by setting them explicitly. Run the
+following command and follow the instructions in your editor to edit
+your configuration file:
 
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
+    git config --global --edit
 
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
+After doing this, you may fix the identity used for this commit with:
 
-fatal: empty ident name (for <pbuilder1@infom08-i386.debian.net>) not allowed
-prerequisite AUTOIDENT not satisfied
-ok 52 # skip message shows committer when it is automatic (missing AUTOIDENT)
+    git commit --amend --reset-author
+
+ 1 file changed, 1 insertion(+)
+# Committer: second user <pbuilder2@infom07-i386.debian.net>
+ok 52 - message shows committer when it is automatic
 
 checking prerequisite: FAIL_PREREQS
 
@@ -466084,33 +467074,7 @@
 	
 )
 prerequisite FAIL_PREREQS not satisfied
-expecting success of 7502.53 'do not fire editor when committer is bogus': 
-	>.git/result &&
-
-	echo >>negative &&
-	(
-		sane_unset GIT_COMMITTER_EMAIL &&
-		sane_unset GIT_COMMITTER_NAME &&
-		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
-		export GIT_EDITOR &&
-		test_must_fail git commit -e -m sample -a
-	) &&
-	test_must_be_empty .git/result
-
-Committer identity unknown
-
-*** Please tell me who you are.
-
-Run
-
-  git config --global user.email "you@example.com"
-  git config --global user.name "Your Name"
-
-to set your account's default identity.
-Omit --global to set the identity only in this repository.
-
-fatal: empty ident name (for <pbuilder1@infom08-i386.debian.net>) not allowed
-ok 53 - do not fire editor when committer is bogus
+ok 53 # skip do not fire editor when committer is bogus (missing !AUTOIDENT of !FAIL_PREREQS,!AUTOIDENT)
 
 expecting success of 7502.54 'do not fire editor if -m <msg> was given': 
 	echo tick >file &&
@@ -466119,7 +467083,7 @@
 	(GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" git commit -m tick) &&
 	test "$(cat .git/result)" = "editor not started"
 
-[main d97654e] tick
+[main 3ace993] 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
@@ -466132,7 +467096,7 @@
 	 git commit -m "" --allow-empty-message) &&
 	test "$(cat .git/result)" = "editor not started"
 
-[main 84f6bcc] 
+[main cdeb650] 
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 ok 55 - do not fire editor if -m "" was given
@@ -466176,22 +467140,21 @@
 Removing msg
 Removing raw
 Removing text
-[main 133e0fd] add g
+[main 197cea5] add g
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 g
-[main 6488bdd] modify g and add h
+[main f69298e] modify g and add h
  Author: A U Thor <author@example.com>
  2 files changed, 2 insertions(+), 1 deletion(-)
  create mode 100644 h
 Switched to branch 'second'
-M	negative
-[second 42e48b3] second
+[second c9a6ce6] second
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Auto-merging g
 CONFLICT (content): Merge conflict in g
-error: could not apply 6488bdd... modify g and add h
+error: could not apply f69298e... modify g and add h
 hint: after resolving the conflicts, mark the corrected paths
 hint: with 'git add <paths>' or 'git rm <paths>'
 hint: Disable this message with "git config advice.mergeConflict false"
@@ -466228,8 +467191,8 @@
 Auto-merging g
 CONFLICT (content): Merge conflict in g
 Automatic merge failed; fix conflicts and then commit the result.
-Updated 1 path from 890ab14
-[second 287266c] Merge branch 'main' into second
+Updated 1 path from b907ba1
+[second baeff8b] Merge branch 'main' into second
  Author: A U Thor <author@example.com>
 ok 58 - Hand committing of a redundant merge removes dups
 
@@ -466242,8 +467205,8 @@
 	test_line_count = 3 actual
 
 
-HEAD is now at 287266c Merge branch 'main' into second
-[second 8c7277e] hello: kitty
+HEAD is now at baeff8b Merge branch 'main' into second
+[second 72a05d0] hello: kitty
  Author: A U Thor <author@example.com>
 ok 59 - A single-liner subject with a token plus colon is not a footer
 
@@ -466258,7 +467221,7 @@
 	sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual &&
 	test_cmp expect actual
 
-[second 56e2ef7] Signed-off-by: C O Mitter <committer@example.com>
+[second c9ee882] 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
 
@@ -466266,8 +467229,8 @@
 		try_commit "" &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 56e2ef7 Signed-off-by: C O Mitter <committer@example.com>
-[second 7d4c5ba] message
+HEAD is now at c9ee882 Signed-off-by: C O Mitter <committer@example.com>
+[second 4960412] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -466277,8 +467240,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 7d4c5ba message
-[second 24b9005] message
+HEAD is now at 4960412 message
+[second 0d541bf] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -466288,8 +467251,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 24b9005 message
-[second 6f35a31] message
+HEAD is now at 0d541bf message
+[second ed11f1f] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 63 - commit --no-status
@@ -466299,8 +467262,8 @@
 		try_commit "" &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 6f35a31 message
-[second fb0e1b7] message
+HEAD is now at ed11f1f message
+[second da5ef2d] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -466311,8 +467274,8 @@
 		try_commit "" &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at fb0e1b7 message
-[second 19f43d6] message
+HEAD is now at da5ef2d message
+[second bfe7967] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 65 - commit with commit.status = no
@@ -466322,8 +467285,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 19f43d6 message
-[second a6956b4] message
+HEAD is now at bfe7967 message
+[second f45cf82] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -466334,8 +467297,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at a6956b4 message
-[second 3388dc5] message
+HEAD is now at f45cf82 message
+[second ae68a72] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 67 - commit --no-status with commit.status = yes
@@ -466345,8 +467308,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 3388dc5 message
-[second 517e0b4] message
+HEAD is now at ae68a72 message
+[second d58dff0] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 # Changes to be committed:
@@ -466357,8 +467320,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 517e0b4 message
-[second 2ee1433] message
+HEAD is now at d58dff0 message
+[second 2047c95] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ok 69 - commit --no-status with commit.status = no
@@ -466367,8 +467330,8 @@
 		try_commit "" &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 2ee1433 message
-[second 2e8ac9b] message
+HEAD is now at 2047c95 message
+[second 83f1705] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466379,8 +467342,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 2e8ac9b message
-[second baeb21a] message
+HEAD is now at 83f1705 message
+[second 7053bda] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466391,8 +467354,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at baeb21a message
-[second c2fe270] message
+HEAD is now at 7053bda message
+[second a986c80] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466403,8 +467366,8 @@
 		try_commit "" &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at c2fe270 message
-[second 34e9ff1] message
+HEAD is now at a986c80 message
+[second 5abc611] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466416,8 +467379,8 @@
 		try_commit "" &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 34e9ff1 message
-[second 76b6c0d] message
+HEAD is now at 5abc611 message
+[second 49c903a] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466428,8 +467391,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 76b6c0d message
-[second f761932] message
+HEAD is now at 49c903a message
+[second f818c7a] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466441,8 +467404,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at f761932 message
-[second 69efec9] message
+HEAD is now at f818c7a message
+[second fb98db1] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466453,8 +467416,8 @@
 		try_commit --status &&
 		test_grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 69efec9 message
-[second 8d9fa13] message
+HEAD is now at fb98db1 message
+[second 6bb2f27] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466466,8 +467429,8 @@
 		try_commit --no-status &&
 		test_grep ! "^# Changes to be committed:" .git/COMMIT_EDITMSG
 	
-HEAD is now at 8d9fa13 message
-[second 32b4909] message
+HEAD is now at 6bb2f27 message
+[second f1153a6] message
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466478,8 +467441,8 @@
 	try_commit --status &&
 	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
 
-HEAD is now at 32b4909 message
-[second 8e6fd00] message ## Custom template
+HEAD is now at f1153a6 message
+[second 1375c8d] message ## Custom template
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 ## Custom template
@@ -466491,11 +467454,11 @@
 	GIT_EDITOR=.git/FAKE_EDITOR git -c core.commentChar=auto commit --amend &&
 	test_grep "^; Changes to be committed:" .git/COMMIT_EDITMSG
 
-[second 0f719bb] #foo
+[second 6e28b1f] #foo
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
-[second e03ca23] message #foo
+[second cf7af72] message #foo
  Author: A U Thor <author@example.com>
  Date: Thu Apr 7 15:23:13 2005 -0700
  1 file changed, 1 insertion(+)
@@ -466522,7 +467485,7 @@
 		test_must_fail git -c core.commentChar=auto commit --amend
 	)
 
-[second cbf85e8] # 1 ; 2 @ 3 ! 4 $ 5 % 6 ^ 7 & 8 | 9 : 10
+[second 2f64017] # 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(+)
@@ -466535,6 +467498,598 @@
 1..81
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7507-commit-verbose.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7507-commit-verbose/.git/
+expecting success of 7507.1 'setup': 
+	echo content >file &&
+	git add file &&
+	git commit -F message
+
+[master (root-commit) 5621fbe] subject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 1 - setup
+
+expecting success of 7507.2 'initial commit shows verbose diff': 
+	git commit --amend -v &&
+	test_line_count = 1 out
+
+[master 5621fbe] subject
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+ok 2 - initial commit shows verbose diff
+
+expecting success of 7507.3 'second commit': 
+	echo content modified >file &&
+	git add file &&
+	git commit -F message
+
+[master aa8777f] subject
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 3 - second commit
+
+expecting success of 7507.4 'verbose diff is stripped out': 
+	git commit --amend -v &&
+	check_message message &&
+	test_line_count = 1 out
+
+[master aa8777f] subject
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 4 - verbose diff is stripped out
+
+expecting success of 7507.5 'verbose diff is stripped out (mnemonicprefix)': 
+	git config diff.mnemonicprefix true &&
+	git commit --amend -v &&
+	check_message message &&
+	test_line_count = 1 out
+
+[master aa8777f] subject
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 5 - verbose diff is stripped out (mnemonicprefix)
+
+expecting success of 7507.6 'diff in message is retained without -v': 
+	git commit --amend -F diff &&
+	check_message diff
+
+[master 5165ef5] This is an example commit message that contains a diff.
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 6 - diff in message is retained without -v
+
+expecting success of 7507.7 'diff in message is retained with -v': 
+	git commit --amend -F diff -v &&
+	check_message diff
+
+[master 5165ef5] This is an example commit message that contains a diff.
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 7 - diff in message is retained with -v
+
+expecting success of 7507.8 'submodule log is stripped out too with -v': 
+	git config diff.submodule log &&
+	test_config_global protocol.file.allow always &&
+	git submodule add ./. sub &&
+	git commit -m "sub added" &&
+	(
+		cd sub &&
+		echo "more" >>file &&
+		git commit -a -m "submodule commit"
+	) &&
+	(
+		GIT_EDITOR=cat &&
+		export GIT_EDITOR &&
+		test_must_fail git commit -a -v 2>err
+	) &&
+	test_grep "Aborting commit due to empty commit message." err
+
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7507-commit-verbose/sub'...
+done.
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+[master 2b9398c] submodule commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+
+# Please enter the commit message for your changes. Lines starting
+# with '#' will be ignored, and an empty message aborts the commit.
+#
+# Author:    A U Thor <author@example.com>
+#
+# On branch master
+# Changes to be committed:
+#	modified:   sub
+#
+# Untracked files:
+#	.gitconfig
+#	actual
+#	check-for-diff
+#	diff
+#	err
+#	message
+#	out
+#
+# ------------------------ >8 ------------------------
+# Do not modify or remove the line above.
+# Everything below it will be ignored.
+Submodule sub 5165ef5..2b9398c:
+  > submodule commit
+Aborting commit due to empty commit message.
+ok 8 - submodule log is stripped out too with -v
+
+expecting success of 7507.9 'verbose diff is stripped out with set core.commentChar': 
+	(
+		GIT_EDITOR=cat &&
+		export GIT_EDITOR &&
+		test_must_fail git -c core.commentchar=";" commit -a -v 2>err
+	) &&
+	test_grep "Aborting commit due to empty commit message." err
+
+
+; Please enter the commit message for your changes. Lines starting
+; with ';' will be ignored, and an empty message aborts the commit.
+;
+; Author:    A U Thor <author@example.com>
+;
+; On branch master
+; Changes to be committed:
+;	modified:   sub
+;
+; Untracked files:
+;	.gitconfig
+;	actual
+;	check-for-diff
+;	diff
+;	err
+;	message
+;	out
+;
+; ------------------------ >8 ------------------------
+; Do not modify or remove the line above.
+; Everything below it will be ignored.
+Submodule sub 5165ef5..2b9398c:
+  > submodule commit
+Aborting commit due to empty commit message.
+ok 9 - verbose diff is stripped out with set core.commentChar
+
+expecting success of 7507.10 'verbose diff is stripped with multi-byte comment char': 
+	(
+		GIT_EDITOR=cat &&
+		export GIT_EDITOR &&
+		test_must_fail git -c core.commentchar="foo>" commit -a -v >out 2>err
+	) &&
+	grep "^foo> " out &&
+	test_grep "Aborting commit due to empty commit message." err
+
+foo> Please enter the commit message for your changes. Lines starting
+foo> with 'foo>' will be ignored, and an empty message aborts the commit.
+foo> Author:    A U Thor <author@example.com>
+foo> On branch master
+foo> Changes to be committed:
+foo> Untracked files:
+foo> ------------------------ >8 ------------------------
+foo> Do not modify or remove the line above.
+foo> Everything below it will be ignored.
+Aborting commit due to empty commit message.
+ok 10 - verbose diff is stripped with multi-byte comment char
+
+expecting success of 7507.11 'status does not verbose without --verbose': 
+	git status >actual &&
+	! grep "^diff --git" actual
+
+ok 11 - status does not verbose without --verbose
+
+expecting success of 7507.12 'setup -v -v': 
+	echo dirty >file
+
+ok 12 - setup -v -v
+
+expecting success of 7507.13 'commit.verbose=true and --verbose omitted': 
+		git -c commit.verbose=true commit --amend &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 13 - commit.verbose=true and --verbose omitted
+
+expecting success of 7507.14 'commit.verbose=1 and --verbose omitted': 
+		git -c commit.verbose=1 commit --amend &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 14 - commit.verbose=1 and --verbose omitted
+
+expecting success of 7507.15 'commit.verbose=false and --verbose omitted': 
+		git -c commit.verbose=false commit --amend &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 15 - commit.verbose=false and --verbose omitted
+
+expecting success of 7507.16 'commit.verbose=-2 and --verbose omitted': 
+		git -c commit.verbose=-2 commit --amend &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 16 - commit.verbose=-2 and --verbose omitted
+
+expecting success of 7507.17 'commit.verbose=-1 and --verbose omitted': 
+		git -c commit.verbose=-1 commit --amend &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 17 - commit.verbose=-1 and --verbose omitted
+
+expecting success of 7507.18 'commit.verbose=0 and --verbose omitted': 
+		git -c commit.verbose=0 commit --amend &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 18 - commit.verbose=0 and --verbose omitted
+
+expecting success of 7507.19 'commit.verbose=2 and --verbose omitted': 
+		git -c commit.verbose=2 commit --amend &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 19 - commit.verbose=2 and --verbose omitted
+
+expecting success of 7507.20 'commit.verbose=3 and --verbose omitted': 
+		git -c commit.verbose=3 commit --amend &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 20 - commit.verbose=3 and --verbose omitted
+
+expecting success of 7507.21 'commit.verbose=true and --verbose': 
+		git -c commit.verbose=true commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 21 - commit.verbose=true and --verbose
+
+expecting success of 7507.22 'commit.verbose=true and --no-verbose': 
+		git -c commit.verbose=true commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 22 - commit.verbose=true and --no-verbose
+
+expecting success of 7507.23 'commit.verbose=true and -v -v': 
+		git -c commit.verbose=true commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 23 - commit.verbose=true and -v -v
+
+expecting success of 7507.24 'commit.verbose=false and --verbose': 
+		git -c commit.verbose=false commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 24 - commit.verbose=false and --verbose
+
+expecting success of 7507.25 'commit.verbose=false and --no-verbose': 
+		git -c commit.verbose=false commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 25 - commit.verbose=false and --no-verbose
+
+expecting success of 7507.26 'commit.verbose=false and -v -v': 
+		git -c commit.verbose=false commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 26 - commit.verbose=false and -v -v
+
+expecting success of 7507.27 'commit.verbose=-2 and --verbose': 
+		git -c commit.verbose=-2 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 27 - commit.verbose=-2 and --verbose
+
+expecting success of 7507.28 'commit.verbose=-2 and --no-verbose': 
+		git -c commit.verbose=-2 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 28 - commit.verbose=-2 and --no-verbose
+
+expecting success of 7507.29 'commit.verbose=-2 and -v -v': 
+		git -c commit.verbose=-2 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 29 - commit.verbose=-2 and -v -v
+
+expecting success of 7507.30 'commit.verbose=-1 and --verbose': 
+		git -c commit.verbose=-1 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 30 - commit.verbose=-1 and --verbose
+
+expecting success of 7507.31 'commit.verbose=-1 and --no-verbose': 
+		git -c commit.verbose=-1 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 31 - commit.verbose=-1 and --no-verbose
+
+expecting success of 7507.32 'commit.verbose=-1 and -v -v': 
+		git -c commit.verbose=-1 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 32 - commit.verbose=-1 and -v -v
+
+expecting success of 7507.33 'commit.verbose=0 and --verbose': 
+		git -c commit.verbose=0 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 33 - commit.verbose=0 and --verbose
+
+expecting success of 7507.34 'commit.verbose=0 and --no-verbose': 
+		git -c commit.verbose=0 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 34 - commit.verbose=0 and --no-verbose
+
+expecting success of 7507.35 'commit.verbose=0 and -v -v': 
+		git -c commit.verbose=0 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 35 - commit.verbose=0 and -v -v
+
+expecting success of 7507.36 'commit.verbose=1 and --verbose': 
+		git -c commit.verbose=1 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 36 - commit.verbose=1 and --verbose
+
+expecting success of 7507.37 'commit.verbose=1 and --no-verbose': 
+		git -c commit.verbose=1 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 37 - commit.verbose=1 and --no-verbose
+
+expecting success of 7507.38 'commit.verbose=1 and -v -v': 
+		git -c commit.verbose=1 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 38 - commit.verbose=1 and -v -v
+
+expecting success of 7507.39 'commit.verbose=2 and --verbose': 
+		git -c commit.verbose=2 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 39 - commit.verbose=2 and --verbose
+
+expecting success of 7507.40 'commit.verbose=2 and --no-verbose': 
+		git -c commit.verbose=2 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 40 - commit.verbose=2 and --no-verbose
+
+expecting success of 7507.41 'commit.verbose=2 and -v -v': 
+		git -c commit.verbose=2 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 41 - commit.verbose=2 and -v -v
+
+expecting success of 7507.42 'commit.verbose=3 and --verbose': 
+		git -c commit.verbose=3 commit --amend --verbose &&
+		test_line_count = 1 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 42 - commit.verbose=3 and --verbose
+
+expecting success of 7507.43 'commit.verbose=3 and --no-verbose': 
+		git -c commit.verbose=3 commit --amend --no-verbose &&
+		test_line_count = 0 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 43 - commit.verbose=3 and --no-verbose
+
+expecting success of 7507.44 'commit.verbose=3 and -v -v': 
+		git -c commit.verbose=3 commit --amend -v -v &&
+		test_line_count = 2 out
+	
+[master 2f750a4] sub added
+ Author: A U Thor <author@example.com>
+ Date: Fri Apr 1 13:14:15 2005 +0200
+ 2 files changed, 4 insertions(+)
+ create mode 100644 .gitmodules
+ create mode 160000 sub
+ok 44 - commit.verbose=3 and -v -v
+
+expecting success of 7507.45 'status ignores commit.verbose=true': 
+	git -c commit.verbose=true status >actual &&
+	! grep "^diff --git actual"
+
+ok 45 - status ignores commit.verbose=true
+
+# passed all 45 test(s)
+1..45
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7509-commit-authorship.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7509-commit-authorship/.git/
 expecting success of 7509.1 '-C option copies authorship and message': 
@@ -466812,191 +468367,6 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7510-signed-commit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7510-signed-commit/.git/
-checking prerequisite: GPG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG not satisfied
-ok 1 # skip create signed commits (missing GPG)
-
-ok 2 # skip verify and show signatures (missing GPG)
-
-ok 3 # skip verify-commit exits failure on unknown signature (missing GPG)
-
-ok 4 # skip verify-commit exits success on untrusted signature (missing GPG)
-
-ok 5 # skip verify-commit exits success with matching minTrustLevel (missing GPG)
-
-ok 6 # skip verify-commit exits success with low minTrustLevel (missing GPG)
-
-ok 7 # skip verify-commit exits failure with high minTrustLevel (missing GPG)
-
-ok 8 # skip verify signatures with --raw (missing GPG)
-
-ok 9 # skip proper header is used for hash algorithm (missing GPG)
-
-ok 10 # skip show signed commit with signature (missing GPG)
-
-ok 11 # skip detect fudged signature (missing GPG)
-
-ok 12 # skip detect fudged signature with NUL (missing GPG)
-
-ok 13 # skip amending already signed commit (missing GPG)
-
-checking prerequisite: GPG2
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	case "$gpg_version" in
-	"gpg (GnuPG) "[01].*)
-		say "This test requires a GPG version >= v2.0.0"
-		exit 1
-		;;
-	*)
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG2 not satisfied
-ok 14 # skip bare signature (missing GPG2)
-
-ok 15 # skip show good signature with custom format (missing GPG)
-
-ok 16 # skip show bad signature with custom format (missing GPG)
-
-ok 17 # skip show untrusted signature with custom format (missing GPG)
-
-ok 18 # skip show untrusted signature with undefined trust level (missing GPG)
-
-ok 19 # skip show untrusted signature with ultimate trust level (missing GPG)
-
-ok 20 # skip show unknown signature with custom format (missing GPG)
-
-ok 21 # skip show lack of signature with custom format (missing GPG)
-
-ok 22 # skip log.showsignature behaves like --show-signature (missing GPG)
-
-ok 23 # skip check config gpg.format values (missing GPG)
-
-ok 24 # skip detect fudged commit with double signature (missing GPG)
-
-ok 25 # skip show double signature with custom format (missing GPG)
-
-ok 26 # skip verify-commit verifies multiply signed commits (missing GPG)
-
-expecting success of 7510.27 'custom `gpg.program`': 
-	write_script fake-gpg <<-\EOF &&
-	args="$*"
-
-	# skip uninteresting options
-	while case "$1" in
-	--status-fd=*|--keyid-format=*) ;; # skip
-	*) break;;
-	esac; do shift; done
-
-	case "$1" in
-	-bsau)
-		test -z "$LET_GPG_PROGRAM_FAIL" || {
-			echo "zOMG signing failed!" >&2
-			exit 1
-		}
-		cat >sign.file
-		echo "[GNUPG:] SIG_CREATED $args" >&2
-		echo "-----BEGIN PGP MESSAGE-----"
-		echo "$args"
-		echo "-----END PGP MESSAGE-----"
-		;;
-	--verify)
-		cat "$2" >verify.file
-		exit 0
-		;;
-	*)
-		echo "Unhandled args: $*" >&2
-		exit 1
-		;;
-	esac
-	EOF
-
-	test_config gpg.program "$(pwd)/fake-gpg" &&
-	git commit -S --allow-empty -m signed-commit &&
-	test_path_exists sign.file &&
-	git show --show-signature &&
-	test_path_exists verify.file &&
-
-	test_must_fail env LET_GPG_PROGRAM_FAIL=1 \
-	git commit -S --allow-empty -m must-fail 2>err &&
-	grep zOMG err
-
-[main (root-commit) 554da10] signed-commit
- Author: A U Thor <author@example.com>
-commit 554da108591b1b44bd66564d7121378316c3ba6f
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    signed-commit
-zOMG signing failed!
-ok 27 - custom `gpg.program`
-
-# passed all 27 test(s)
-1..27
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7505-prepare-commit-msg-hook.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7505-prepare-commit-msg-hook/.git/
 expecting success of 7505.1 'set up commits for rebasing': 
@@ -467525,6 +468895,191 @@
 1..23
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7510-signed-commit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7510-signed-commit/.git/
+checking prerequisite: GPG
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
+
+	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
+	# that version, creation of signed tags using the generated key fails.
+	case "$gpg_version" in
+	"gpg (GnuPG) 1.0.6"*)
+		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
+		;;
+	*)
+		# Available key info:
+		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
+		#   name and email: C O Mitter <committer@example.com>
+		# * Type RSA, size 2048 bits, no expiration date,
+		#   name and email: Eris Discordia <discord@example.net>
+		# No password given, to enable non-interactive operation.
+		# To generate new key:
+		#	gpg --homedir /tmp/gpghome --gen-key
+		# To write armored exported key to keyring:
+		#	gpg --homedir /tmp/gpghome --export-secret-keys \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		#	gpg --homedir /tmp/gpghome --export \
+		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
+		# To export ownertrust:
+		#	gpg --homedir /tmp/gpghome --export-ownertrust \
+		#		> lib-gpg/ownertrust
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
+
+)
+prerequisite GPG not satisfied
+ok 1 # skip create signed commits (missing GPG)
+
+ok 2 # skip verify and show signatures (missing GPG)
+
+ok 3 # skip verify-commit exits failure on unknown signature (missing GPG)
+
+ok 4 # skip verify-commit exits success on untrusted signature (missing GPG)
+
+ok 5 # skip verify-commit exits success with matching minTrustLevel (missing GPG)
+
+ok 6 # skip verify-commit exits success with low minTrustLevel (missing GPG)
+
+ok 7 # skip verify-commit exits failure with high minTrustLevel (missing GPG)
+
+ok 8 # skip verify signatures with --raw (missing GPG)
+
+ok 9 # skip proper header is used for hash algorithm (missing GPG)
+
+ok 10 # skip show signed commit with signature (missing GPG)
+
+ok 11 # skip detect fudged signature (missing GPG)
+
+ok 12 # skip detect fudged signature with NUL (missing GPG)
+
+ok 13 # skip amending already signed commit (missing GPG)
+
+checking prerequisite: GPG2
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG2" &&
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
+
+	case "$gpg_version" in
+	"gpg (GnuPG) "[01].*)
+		say "This test requires a GPG version >= v2.0.0"
+		exit 1
+		;;
+	*)
+		(gpgconf --kill all || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
+			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
+			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
+		;;
+	esac
+
+)
+prerequisite GPG2 not satisfied
+ok 14 # skip bare signature (missing GPG2)
+
+ok 15 # skip show good signature with custom format (missing GPG)
+
+ok 16 # skip show bad signature with custom format (missing GPG)
+
+ok 17 # skip show untrusted signature with custom format (missing GPG)
+
+ok 18 # skip show untrusted signature with undefined trust level (missing GPG)
+
+ok 19 # skip show untrusted signature with ultimate trust level (missing GPG)
+
+ok 20 # skip show unknown signature with custom format (missing GPG)
+
+ok 21 # skip show lack of signature with custom format (missing GPG)
+
+ok 22 # skip log.showsignature behaves like --show-signature (missing GPG)
+
+ok 23 # skip check config gpg.format values (missing GPG)
+
+ok 24 # skip detect fudged commit with double signature (missing GPG)
+
+ok 25 # skip show double signature with custom format (missing GPG)
+
+ok 26 # skip verify-commit verifies multiply signed commits (missing GPG)
+
+expecting success of 7510.27 'custom `gpg.program`': 
+	write_script fake-gpg <<-\EOF &&
+	args="$*"
+
+	# skip uninteresting options
+	while case "$1" in
+	--status-fd=*|--keyid-format=*) ;; # skip
+	*) break;;
+	esac; do shift; done
+
+	case "$1" in
+	-bsau)
+		test -z "$LET_GPG_PROGRAM_FAIL" || {
+			echo "zOMG signing failed!" >&2
+			exit 1
+		}
+		cat >sign.file
+		echo "[GNUPG:] SIG_CREATED $args" >&2
+		echo "-----BEGIN PGP MESSAGE-----"
+		echo "$args"
+		echo "-----END PGP MESSAGE-----"
+		;;
+	--verify)
+		cat "$2" >verify.file
+		exit 0
+		;;
+	*)
+		echo "Unhandled args: $*" >&2
+		exit 1
+		;;
+	esac
+	EOF
+
+	test_config gpg.program "$(pwd)/fake-gpg" &&
+	git commit -S --allow-empty -m signed-commit &&
+	test_path_exists sign.file &&
+	git show --show-signature &&
+	test_path_exists verify.file &&
+
+	test_must_fail env LET_GPG_PROGRAM_FAIL=1 \
+	git commit -S --allow-empty -m must-fail 2>err &&
+	grep zOMG err
+
+[main (root-commit) 554da10] signed-commit
+ Author: A U Thor <author@example.com>
+commit 554da108591b1b44bd66564d7121378316c3ba6f
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    signed-commit
+zOMG signing failed!
+ok 27 - custom `gpg.program`
+
+# passed all 27 test(s)
+1..27
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7506-status-submodule.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7506-status-submodule/.git/
 expecting success of 7506.1 'setup': 
@@ -470114,532 +471669,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7525-status-rename.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7525-status-rename/.git/
-expecting success of 7525.1 'setup': 
-	echo 1 >original &&
-	git add . &&
-	git commit -m"Adding original file." &&
-	mv original renamed &&
-	echo 2 >> renamed &&
-	git add . &&
-	cat >.gitignore <<-\EOF
-	.gitignore
-	expect*
-	actual*
-	EOF
-
-[master (root-commit) 8050378] Adding original file.
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 original
-ok 1 - setup
-
-expecting success of 7525.2 'status no-options': 
-	git status >actual &&
-	test_grep "renamed:" actual
-
-	renamed:    original -> renamed
-ok 2 - status no-options
-
-expecting success of 7525.3 'status --no-renames': 
-	git status --no-renames >actual &&
-	test_grep "deleted:" actual &&
-	test_grep "new file:" actual
-
-	deleted:    original
-	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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7526-commit-pathspec-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7526-commit-pathspec-file/.git/
-expecting success of 7526.1 'setup': 
-	test_commit file0 &&
-	git tag checkpoint &&
-
-	echo A >fileA.t &&
-	echo B >fileB.t &&
-	echo C >fileC.t &&
-	echo D >fileD.t &&
-	git add fileA.t fileB.t fileC.t fileD.t
-
-[master (root-commit) ad2e047] file0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file0.t
-ok 1 - setup
-
-expecting success of 7526.2 '--pathspec-from-file from stdin': 
-	restore_checkpoint &&
-
-	echo fileA.t | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	EOF
-	verify_expect
-
-[master 95e22e1] Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA.t
-ok 2 - --pathspec-from-file from stdin
-
-expecting success of 7526.3 '--pathspec-from-file from file': 
-	restore_checkpoint &&
-
-	echo fileA.t >list &&
-	git commit --pathspec-from-file=list -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	EOF
-	verify_expect
-
-[master 95e22e1] Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA.t
-ok 3 - --pathspec-from-file from file
-
-expecting success of 7526.4 'NUL delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\0fileB.t\0" | git commit --pathspec-from-file=- --pathspec-file-nul -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	A	fileB.t
-	EOF
-	verify_expect
-
-[master ebcb447] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
-ok 4 - NUL delimiters
-
-expecting success of 7526.5 'LF delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\nfileB.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	A	fileB.t
-	EOF
-	verify_expect
-
-[master ebcb447] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
-ok 5 - LF delimiters
-
-expecting success of 7526.6 'no trailing delimiter': 
-	restore_checkpoint &&
-
-	printf "fileA.t\nfileB.t" | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	A	fileB.t
-	EOF
-	verify_expect
-
-[master ebcb447] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
-ok 6 - no trailing delimiter
-
-expecting success of 7526.7 'CRLF delimiters': 
-	restore_checkpoint &&
-
-	printf "fileA.t\r\nfileB.t\r\n" | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	A	fileB.t
-	EOF
-	verify_expect
-
-[master ebcb447] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileA.t
- create mode 100644 fileB.t
-ok 7 - CRLF delimiters
-
-expecting success of 7526.8 'quotes': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	git commit --pathspec-from-file=list -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileA.t
-	EOF
-	verify_expect expect
-
-[master 95e22e1] Commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 fileA.t
-ok 8 - quotes
-
-expecting success of 7526.9 'quotes not compatible with --pathspec-file-nul': 
-	restore_checkpoint &&
-
-	cat >list <<-\EOF &&
-	"file\101.t"
-	EOF
-
-	test_must_fail git commit --pathspec-from-file=list --pathspec-file-nul -m "Commit"
-
-error: pathspec '"file\101.t"
-' did not match any file(s) known to git
-ok 9 - quotes not compatible with --pathspec-file-nul
-
-expecting success of 7526.10 'only touches what was listed': 
-	restore_checkpoint &&
-
-	printf "fileB.t\nfileC.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
-
-	cat >expect <<-\EOF &&
-	A	fileB.t
-	A	fileC.t
-	EOF
-	verify_expect
-
-[master 6ba5a83] Commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 fileB.t
- create mode 100644 fileC.t
-ok 10 - only touches what was listed
-
-expecting success of 7526.11 'error conditions': 
-	restore_checkpoint &&
-	echo fileA.t >list &&
-	>empty_list &&
-
-	test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
-
-	test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
-
-	test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&
-	test_grep -e "options .--pathspec-from-file. and .-a. cannot be used together" err &&
-
-	test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&
-	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
-
-	test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
-	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
-
-	test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err &&
-	test_grep -e "No paths with --include/--only does not make sense." err &&
-
-	test_must_fail git commit --pathspec-from-file=empty_list --only -m "Commit" 2>err &&
-	test_grep -e "No paths with --include/--only does not make sense." err
-
-fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
-fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
-fatal: options '--pathspec-from-file' and '-a' cannot be used together
-fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
-fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
-fatal: No paths with --include/--only does not make sense.
-fatal: No paths with --include/--only does not make sense.
-ok 11 - error conditions
-
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7527-builtin-fsmonitor.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7527-builtin-fsmonitor/.git/
-checking prerequisite: FSMONITOR_DAEMON
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
-	git version --build-options >output &&
-	grep "feature: fsmonitor--daemon" output
-
-)
-prerequisite FSMONITOR_DAEMON not satisfied
-1..0 # SKIP fsmonitor--daemon is not supported on this platform
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7528-signed-commit-ssh.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7528-signed-commit-ssh/.git/
-checking prerequisite: GPGSSH
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH" &&
-	ssh_version=$(ssh-keygen -Y find-principals -n "git" 2>&1)
-	test $? != 127 || exit 1
-	echo $ssh_version | grep -q "find-principals:missing signature file"
-	test $? = 0 || exit 1;
-
-	# Setup some keys and an allowed signers file
-	mkdir -p "${GNUPGHOME}" &&
-	chmod 0700 "${GNUPGHOME}" &&
-	(setfacl -k "${GNUPGHOME}" 2>/dev/null || true) &&
-	ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_PRIMARY}" >/dev/null &&
-	ssh-keygen -t rsa -b 2048 -N "" -C "git rsa2048 key" -f "${GPGSSH_KEY_SECONDARY}" >/dev/null &&
-	ssh-keygen -t ed25519 -N "${GPGSSH_KEY_PASSPHRASE}" -C "git ed25519 encrypted key" -f "${GPGSSH_KEY_WITH_PASSPHRASE}" >/dev/null &&
-	ssh-keygen -t ecdsa -N "" -f "${GPGSSH_KEY_ECDSA}" >/dev/null &&
-	ssh-keygen -t ed25519 -N "" -C "git ed25519 key" -f "${GPGSSH_KEY_UNTRUSTED}" >/dev/null &&
-
-	cat >"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
-	"principal with number 1" $(cat "${GPGSSH_KEY_PRIMARY}.pub")"
-	"principal with number 2" $(cat "${GPGSSH_KEY_SECONDARY}.pub")"
-	"principal with number 3" $(cat "${GPGSSH_KEY_WITH_PASSPHRASE}.pub")"
-	"principal with number 4" $(cat "${GPGSSH_KEY_ECDSA}.pub")"
-	EOF
-
-	# Verify if at least one key and ssh-keygen works as expected
-	echo "testpayload" |
-	ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_PRIMARY}" >gpgssh_prereq.sig &&
-	ssh-keygen -Y find-principals -f "${GPGSSH_ALLOWED_SIGNERS}" -s gpgssh_prereq.sig &&
-	echo "testpayload" |
-	ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with number 1" -s gpgssh_prereq.sig
-
-)
-prerequisite GPGSSH not satisfied
-ok 1 # skip create signed commits (missing GPGSSH)
-
-ok 2 # skip sign commits using literal public keys with ssh-agent (missing GPGSSH)
-
-checking prerequisite: GPGSSH_VERIFYTIME
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH_VERIFYTIME" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPGSSH_VERIFYTIME" &&
-	test_have_prereq GPGSSH &&
-	# Check if ssh-keygen has a verify-time option by passing an invalid date to it
-	ssh-keygen -Overify-time=INVALID -Y check-novalidate -n "git" -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
-
-	# Set up keys with key lifetimes
-	ssh-keygen -t ed25519 -N "" -C "timeboxed valid key" -f "${GPGSSH_KEY_TIMEBOXEDVALID}" >/dev/null &&
-	key_valid=$(cat "${GPGSSH_KEY_TIMEBOXEDVALID}.pub") &&
-	ssh-keygen -t ed25519 -N "" -C "timeboxed invalid key" -f "${GPGSSH_KEY_TIMEBOXEDINVALID}" >/dev/null &&
-	key_invalid=$(cat "${GPGSSH_KEY_TIMEBOXEDINVALID}.pub") &&
-	ssh-keygen -t ed25519 -N "" -C "expired key" -f "${GPGSSH_KEY_EXPIRED}" >/dev/null &&
-	key_expired=$(cat "${GPGSSH_KEY_EXPIRED}.pub") &&
-	ssh-keygen -t ed25519 -N "" -C "not yet valid key" -f "${GPGSSH_KEY_NOTYETVALID}" >/dev/null &&
-	key_notyetvalid=$(cat "${GPGSSH_KEY_NOTYETVALID}.pub") &&
-
-	# Timestamps outside of test_tick span
-	ts2005a=20050401000000 ts2005b=200504020000 &&
-	# Timestamps within test_tick span
-	ts2005c=20050407000000 ts2005d=200504100000 &&
-	# Definitely not yet valid / expired timestamps
-	ts2000=20000101000000 ts2999=29990101000000 &&
-
-	cat >>"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
-	"timeboxed valid key" valid-after="$ts2005c",valid-before="$ts2005d" $key_valid"
-	"timeboxed invalid key" valid-after="$ts2005a",valid-before="$ts2005b" $key_invalid"
-	"principal with expired key" valid-before="$ts2000" $key_expired"
-	"principal with not yet valid key" valid-after="$ts2999" $key_notyetvalid"
-	EOF
-
-	# and verify ssh-keygen verifies the key lifetime
-	echo "testpayload" |
-	ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_EXPIRED}" >gpgssh_verifytime_prereq.sig &&
-	! (ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with expired key" -s gpgssh_verifytime_prereq.sig)
-
-)
-prerequisite GPGSSH_VERIFYTIME not satisfied
-ok 3 # skip create signed commits with keys having defined lifetimes (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 4 # skip verify and show signatures (missing GPGSSH)
-
-ok 5 # skip verify-commit exits failure on untrusted signature (missing GPGSSH)
-
-ok 6 # skip verify-commit exits failure on expired signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 7 # skip verify-commit exits failure on not yet valid signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 8 # skip verify-commit succeeds with commit date and key validity matching (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 9 # skip verify-commit exits failure with commit date outside of key validity (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
-
-ok 10 # skip verify-commit exits success with matching minTrustLevel (missing GPGSSH)
-
-ok 11 # skip verify-commit exits success with low minTrustLevel (missing GPGSSH)
-
-ok 12 # skip verify-commit exits failure with high minTrustLevel (missing GPGSSH)
-
-ok 13 # skip verify signatures with --raw (missing GPGSSH)
-
-ok 14 # skip proper header is used for hash algorithm (missing GPGSSH)
-
-ok 15 # skip show signed commit with signature (missing GPGSSH)
-
-ok 16 # skip detect fudged signature (missing GPGSSH)
-
-ok 17 # skip detect fudged signature with NUL (missing GPGSSH)
-
-ok 18 # skip amending already signed commit (missing GPGSSH)
-
-ok 19 # skip show good signature with custom format (missing GPGSSH)
-
-ok 20 # skip show bad signature with custom format (missing GPGSSH)
-
-ok 21 # skip show untrusted signature with custom format (missing GPGSSH)
-
-ok 22 # skip show untrusted signature with undefined trust level (missing GPGSSH)
-
-ok 23 # skip show untrusted signature with ultimate trust level (missing GPGSSH)
-
-ok 24 # skip show lack of signature with custom format (missing GPGSSH)
-
-ok 25 # skip log.showsignature behaves like --show-signature (missing GPGSSH)
-
-ok 26 # skip check config gpg.format values (missing GPGSSH)
-
-ok 27 # skip detect fudged commit with double signature (TODO) (missing GPGSSH)
-
-ok 28 # skip show double signature with custom format (TODO) (missing GPGSSH)
-
-ok 29 # skip verify-commit verifies multiply signed commits (TODO) (missing GPGSSH)
-
-# passed all 29 test(s)
-1..29
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7512-status-help.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7512-status-help/.git/
 expecting success of 7512.1 'prepare for conflicts': 
@@ -472511,1977 +473540,530 @@
 1..46
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7508-status.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/.git/
-expecting success of 7508.1 'status -h in broken repository': 
-	git config --global advice.statusuoption false &&
-	mkdir broken &&
-	test_when_finished "rm -fr broken" &&
-	(
-		cd broken &&
-		git init &&
-		echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
-		test_expect_code 129 git status -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage" broken/usage
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/broken/.git/
-usage: git status [<options>] [--] [<pathspec>...]
-ok 1 - status -h in broken repository
-
-expecting success of 7508.2 'commit -h in broken repository': 
-	mkdir broken &&
-	test_when_finished "rm -fr broken" &&
-	(
-		cd broken &&
-		git init &&
-		echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
-		test_expect_code 129 git commit -h >usage 2>&1
-	) &&
-	test_grep "[Uu]sage" broken/usage
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/broken/.git/
-usage: git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
-ok 2 - commit -h in broken repository
-
-expecting success of 7508.3 'create upstream branch': 
-	git checkout -b upstream &&
-	test_commit upstream1 &&
-	test_commit upstream2 &&
-	# leave the first commit on main as root because several
-	# tests depend on this case; for our upstream we only
-	# care about commit counts anyway, so a totally divergent
-	# history is OK
-	git checkout --orphan main
-
-Switched to a new branch 'upstream'
-[upstream (root-commit) 8d383b3] upstream1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream1.t
-[upstream 726fd3a] upstream2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 upstream2.t
-Switched to a new branch 'main'
-ok 3 - create upstream branch
-
-expecting success of 7508.4 'setup': 
-	: >tracked &&
-	: >modified &&
-	mkdir dir1 &&
-	: >dir1/tracked &&
-	: >dir1/modified &&
-	mkdir dir2 &&
-	: >dir1/tracked &&
-	: >dir1/modified &&
+*** t7525-status-rename.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7525-status-rename/.git/
+expecting success of 7525.1 'setup': 
+	echo 1 >original &&
 	git add . &&
-
-	git status >output &&
-
-	test_tick &&
-	git commit -m initial &&
-	: >untracked &&
-	: >dir1/untracked &&
-	: >dir2/untracked &&
-	echo 1 >dir1/modified &&
-	echo 2 >dir2/modified &&
-	echo 3 >dir2/added &&
-	git add dir2/added &&
-
-	git branch --set-upstream-to=upstream
-
-[main (root-commit) 5b37b0a] initial
- Author: A U Thor <author@example.com>
- 7 files changed, 4 insertions(+)
- create mode 100644 .gitconfig
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 modified
- create mode 100644 tracked
- create mode 100644 upstream1.t
- create mode 100644 upstream2.t
-branch 'main' set up to track 'upstream'.
-ok 4 - setup
-
-expecting success of 7508.5 'status (1)': 
-	test_grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
-
-  (use "git rm --cached <file>..." to unstage)
-ok 5 - status (1)
-
-expecting success of 7508.6 'status --column': 
-	cat >expect <<\EOF &&
-# On branch main
-# Your branch and 'upstream' have diverged,
-# and have 1 and 2 different commits each, respectively.
-#   (use "git pull" if you want to integrate the remote branch with yours)
-#
-# Changes to be committed:
-#   (use "git restore --staged <file>..." to unstage)
-#	new file:   dir2/added
-#
-# Changes not staged for commit:
-#   (use "git add <file>..." to update what will be committed)
-#   (use "git restore <file>..." to discard changes in working directory)
-#	modified:   dir1/modified
-#
-# Untracked files:
-#   (use "git add <file>..." to include in what will be committed)
-#	dir1/untracked dir2/untracked
-#	dir2/modified  untracked
-#
-EOF
-	COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
-	test_cmp expect output
-
-ok 6 - status --column
-
-expecting success of 7508.7 'status --column status.displayCommentPrefix=false': 
-	strip_comments expect &&
-	COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
-	test_cmp expect output
-
-ok 7 - status --column status.displayCommentPrefix=false
-
-expecting success of 7508.8 'status with status.displayCommentPrefix=true': 
-	git -c status.displayCommentPrefix=true status >output &&
-	test_cmp expect output
-
-ok 8 - status with status.displayCommentPrefix=true
-
-expecting success of 7508.9 'status with status.displayCommentPrefix=false': 
-	strip_comments expect &&
-	git -c status.displayCommentPrefix=false status >output &&
-	test_cmp expect output
-
-ok 9 - status with status.displayCommentPrefix=false
-
-expecting success of 7508.10 'status -v': 
-	(cat expect && git diff --cached) >expect-with-v &&
-	git status -v >output &&
-	test_cmp expect-with-v output
-
-ok 10 - status -v
-
-expecting success of 7508.11 'status -v -v': 
-	(cat expect &&
-	 echo "Changes to be committed:" &&
-	 git -c diff.mnemonicprefix=true diff --cached &&
-	 echo "--------------------------------------------------" &&
-	 echo "Changes not staged for commit:" &&
-	 git -c diff.mnemonicprefix=true diff) >expect-with-v &&
-	git status -v -v >output &&
-	test_cmp expect-with-v output
-
-ok 11 - status -v -v
-
-expecting success of 7508.12 'setup fake editor': 
-	cat >.git/editor <<-\EOF &&
-	#! /bin/sh
-	cp "$1" output
-EOF
-	chmod 755 .git/editor
-
-ok 12 - setup fake editor
-
-expecting success of 7508.13 'commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG': 
-	commit_template_commented
-
-Aborting commit due to empty commit message.
-ok 13 - commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG
-
-expecting success of 7508.14 'status (advice.statusHints false)': 
-	test_config advice.statusHints false &&
-	git status >output &&
-	test_cmp expect output
-
-
-ok 14 - status (advice.statusHints false)
-
-expecting success of 7508.15 'status -s': 
-
-	git status -s >output &&
-	test_cmp expect output
-
-
-ok 15 - status -s
-
-expecting success of 7508.16 'status with gitignore': 
-	{
-		echo ".gitignore" &&
-		echo "expect*" &&
-		echo "output" &&
-		echo "untracked"
-	} >.gitignore &&
-
-	cat >expect <<-\EOF &&
-	 M dir1/modified
-	A  dir2/added
-	?? dir2/modified
-	EOF
-	git status -s >output &&
-	test_cmp expect output &&
-
-	cat >expect <<-\EOF &&
-	 M dir1/modified
-	A  dir2/added
-	?? dir2/modified
-	!! .gitignore
-	!! dir1/untracked
-	!! dir2/untracked
-	!! expect
-	!! expect-with-v
-	!! output
-	!! untracked
-	EOF
-	git status -s --ignored >output &&
-	test_cmp expect output &&
-
-	cat >expect <<\EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir2/modified
-
-Ignored files:
-  (use "git add -f <file>..." to include in what will be committed)
+	git commit -m"Adding original file." &&
+	mv original renamed &&
+	echo 2 >> renamed &&
+	git add . &&
+	cat >.gitignore <<-\EOF
 	.gitignore
-	dir1/untracked
-	dir2/untracked
-	expect
-	expect-with-v
-	output
-	untracked
-
-EOF
-	git status --ignored >output &&
-	test_cmp expect output
-
-ok 16 - status with gitignore
-
-expecting success of 7508.17 'status with gitignore (nothing untracked)': 
-	{
-		echo ".gitignore" &&
-		echo "expect*" &&
-		echo "dir2/modified" &&
-		echo "output" &&
-		echo "untracked"
-	} >.gitignore &&
-
-	cat >expect <<-\EOF &&
-	 M dir1/modified
-	A  dir2/added
-	EOF
-	git status -s >output &&
-	test_cmp expect output &&
-
-	cat >expect <<-\EOF &&
-	 M dir1/modified
-	A  dir2/added
-	!! .gitignore
-	!! dir1/untracked
-	!! dir2/modified
-	!! dir2/untracked
-	!! expect
-	!! expect-with-v
-	!! output
-	!! untracked
+	expect*
+	actual*
 	EOF
-	git status -s --ignored >output &&
-	test_cmp expect output &&
-
-	cat >expect <<\EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Ignored files:
-  (use "git add -f <file>..." to include in what will be committed)
-	.gitignore
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	expect
-	expect-with-v
-	output
-	untracked
-
-EOF
-	git status --ignored >output &&
-	test_cmp expect output
-
-ok 17 - status with gitignore (nothing untracked)
-
-expecting success of 7508.18 'status -s -b': 
-
-	git status -s -b >output &&
-	test_cmp expect output
-
-
-ok 18 - status -s -b
-
-expecting success of 7508.19 'status -s -z -b': 
-	tr "\\n" Q <expect >expect.q &&
-	mv expect.q expect &&
-	git status -s -z -b >output &&
-	nul_to_q <output >output.q &&
-	mv output.q output &&
-	test_cmp expect output
-
-ok 19 - status -s -z -b
-
-expecting success of 7508.20 'setup dir3': 
-	mkdir dir3 &&
-	: >dir3/untracked1 &&
-	: >dir3/untracked2
-
-ok 20 - setup dir3
-
-expecting success of 7508.21 'status -uno': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Untracked files not listed (use -u option to show untracked files)
-EOF
-	git status -uno >output &&
-	test_cmp expect output &&
-	git status -ufalse >output &&
-	test_cmp expect output
-
-ok 21 - status -uno
-
-expecting success of 7508.22 'status (status.showUntrackedFiles no)': 
-		test_config status.showuntrackedfiles "$no" &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 22 - status (status.showUntrackedFiles no)
-
-expecting success of 7508.23 'status (status.showUntrackedFiles false)': 
-		test_config status.showuntrackedfiles "$no" &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 23 - status (status.showUntrackedFiles false)
-
-expecting success of 7508.24 'status (status.showUntrackedFiles 0)': 
-		test_config status.showuntrackedfiles "$no" &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 24 - status (status.showUntrackedFiles 0)
-
-expecting success of 7508.25 'status -uno (advice.statusHints false)': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-
-Changes to be committed:
-	new file:   dir2/added
-
-Changes not staged for commit:
-	modified:   dir1/modified
-
-Untracked files not listed
-EOF
-	test_config advice.statusHints false &&
-	git status -uno >output &&
-	test_cmp expect output
-
-ok 25 - status -uno (advice.statusHints false)
-
-expecting success of 7508.26 'status -s -uno': 
-	git status -s -uno >output &&
-	test_cmp expect output
-
-ok 26 - status -s -uno
-
-expecting success of 7508.27 'status -s (status.showUntrackedFiles no)': 
-	git config status.showuntrackedfiles no &&
-	git status -s >output &&
-	test_cmp expect output
-
-ok 27 - status -s (status.showUntrackedFiles no)
-
-expecting success of 7508.28 'status -unormal': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	dir3/
-	untracked
-
-EOF
-	git status -unormal >output &&
-	test_cmp expect output &&
-	git status -utrue >output &&
-	test_cmp expect output &&
-	git status -uyes >output &&
-	test_cmp expect output
-
-ok 28 - status -unormal
-
-expecting success of 7508.29 'status (status.showUntrackedFiles normal)': 
-		test_config status.showuntrackedfiles $normal &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 29 - status (status.showUntrackedFiles normal)
-
-expecting success of 7508.30 'status (status.showUntrackedFiles true)': 
-		test_config status.showuntrackedfiles $normal &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 30 - status (status.showUntrackedFiles true)
-
-expecting success of 7508.31 'status (status.showUntrackedFiles 1)': 
-		test_config status.showuntrackedfiles $normal &&
-		git status >output &&
-		test_cmp expect output
-	
-ok 31 - status (status.showUntrackedFiles 1)
-
-expecting success of 7508.32 'status -s -unormal': 
-	git status -s -unormal >output &&
-	test_cmp expect output
-
-ok 32 - status -s -unormal
-
-expecting success of 7508.33 'status -s (status.showUntrackedFiles normal)': 
-	git config status.showuntrackedfiles normal &&
-	git status -s >output &&
-	test_cmp expect output
-
-ok 33 - status -s (status.showUntrackedFiles normal)
-
-expecting success of 7508.34 'status -uall': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	dir3/untracked1
-	dir3/untracked2
-	untracked
-
-EOF
-	git status -uall >output &&
-	test_cmp expect output
-
-ok 34 - status -uall
-
-expecting success of 7508.35 'status (status.showUntrackedFiles all)': 
-	test_config status.showuntrackedfiles all &&
-	git status >output &&
-	test_cmp expect output
-
-ok 35 - status (status.showUntrackedFiles all)
-
-expecting success of 7508.36 'teardown dir3': 
-	rm -rf dir3
-
-ok 36 - teardown dir3
-
-expecting success of 7508.37 'status -s -uall': 
-	test_unconfig status.showuntrackedfiles &&
-	git status -s -uall >output &&
-	test_cmp expect output
-
-ok 37 - status -s -uall
-
-expecting success of 7508.38 'status -s (status.showUntrackedFiles all)': 
-	test_config status.showuntrackedfiles all &&
-	git status -s >output &&
-	rm -rf dir3 &&
-	test_cmp expect output
-
-ok 38 - status -s (status.showUntrackedFiles all)
-
-expecting success of 7508.39 'status with relative paths': 
-	cat >expect <<\EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   ../dir2/added
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	untracked
-	../dir2/modified
-	../dir2/untracked
-	../untracked
-
-EOF
-	(cd dir1 && git status) >output &&
-	test_cmp expect output
-
-ok 39 - status with relative paths
-
-expecting success of 7508.40 'status -s with relative paths': 
-
-	(cd dir1 && git status -s) >output &&
-	test_cmp expect output
-
-
-ok 40 - status -s with relative paths
-
-expecting success of 7508.41 'status --porcelain ignores relative paths setting': 
-
-	(cd dir1 && git status --porcelain) >output &&
-	test_cmp expect output
-
-
-ok 41 - status --porcelain ignores relative paths setting
-
-expecting success of 7508.42 'setup unique colors': 
-
-	git config status.color.untracked blue &&
-	git config status.color.branch green &&
-	git config status.color.localBranch yellow &&
-	git config status.color.remoteBranch cyan
-
-
-ok 42 - setup unique colors
-
-checking prerequisite: TTY
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
-	test_have_prereq PERL &&
-
-	# Reading from the pty master seems to get stuck _sometimes_
-	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
-	#
-	# Reproduction recipe: run
-	#
-	#	i=0
-	#	while ./test-terminal.perl echo hi $i
-	#	do
-	#		: $((i = $i + 1))
-	#	done
-	#
-	# After 2000 iterations or so it hangs.
-	# https://rt.cpan.org/Ticket/Display.html?id=65692
-	#
-	test "$(uname -s)" != Darwin &&
-
-	perl "$TEST_DIRECTORY"/test-terminal.perl \
-		sh -c "test -t 1 && test -t 2"
-
-)
-prerequisite TTY ok
-expecting success of 7508.43 'status with color.ui': 
-	cat >expect <<\EOF &&
-On branch <GREEN>main<RESET>
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	<GREEN>new file:   dir2/added<RESET>
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	<RED>modified:   dir1/modified<RESET>
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	<BLUE>dir1/untracked<RESET>
-	<BLUE>dir2/modified<RESET>
-	<BLUE>dir2/untracked<RESET>
-	<BLUE>untracked<RESET>
-
-EOF
-	test_config color.ui auto &&
-	test_terminal git status | test_decode_color >output &&
-	test_cmp expect output
-
-ok 43 - status with color.ui
-
-expecting success of 7508.44 'status with color.status': 
-	test_config color.status auto &&
-	test_terminal git status | test_decode_color >output &&
-	test_cmp expect output
-
-ok 44 - status with color.status
-
-expecting success of 7508.45 'status -s with color.ui': 
-
-	git config color.ui auto &&
-	test_terminal git status -s | test_decode_color >output &&
-	test_cmp expect output
-
-
-ok 45 - status -s with color.ui
-
-expecting success of 7508.46 'status -s with color.status': 
-
-	git config --unset color.ui &&
-	git config color.status auto &&
-	test_terminal git status -s | test_decode_color >output &&
-	test_cmp expect output
-
-
-ok 46 - status -s with color.status
-
-expecting success of 7508.47 'status -s -b with color.status': 
-
-	test_terminal git status -s -b | test_decode_color >output &&
-	test_cmp expect output
-
-
-ok 47 - status -s -b with color.status
-
-expecting success of 7508.48 'status --porcelain ignores color.ui': 
-
-	git config --unset color.status &&
-	git config color.ui auto &&
-	test_terminal git status --porcelain | test_decode_color >output &&
-	test_cmp expect output
-
-
-ok 48 - status --porcelain ignores color.ui
-
-expecting success of 7508.49 'status --porcelain ignores color.status': 
-
-	git config --unset color.ui &&
-	git config color.status auto &&
-	test_terminal git status --porcelain | test_decode_color >output &&
-	test_cmp expect output
-
-
-ok 49 - status --porcelain ignores color.status
-
-expecting success of 7508.50 'status --porcelain respects -b': 
-
-	git status --porcelain -b >output &&
-	{
-		echo "## main...upstream [ahead 1, behind 2]" &&
-		cat expect
-	} >tmp &&
-	mv tmp expect &&
-	test_cmp expect output
-
-
-ok 50 - status --porcelain respects -b
-
-expecting success of 7508.51 'status without relative paths': 
-	cat >expect <<\EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-EOF
-	test_config status.relativePaths false &&
-	(cd dir1 && git status) >output &&
-	test_cmp expect output
-
-
-ok 51 - status without relative paths
-
-expecting success of 7508.52 'status -s without relative paths': 
-
-	test_config status.relativePaths false &&
-	(cd dir1 && git status -s) >output &&
-	test_cmp expect output
-
-
-ok 52 - status -s without relative paths
-
-expecting success of 7508.53 'status -s without relative paths': 
-	test_when_finished "git rm --cached \"file with spaces\"; rm -f file*" &&
-	>"file with spaces" &&
-	>"file with spaces 2" &&
-	>"expect with spaces" &&
-	git add "file with spaces" &&
-
-	git status -s >output &&
-	test_cmp expect output &&
-
-	git status -s --ignored >output &&
-	grep "^!! \"expect with spaces\"$" output &&
-	grep -v "^!! " output >output-wo-ignored &&
-	test_cmp expect output-wo-ignored
-
-!! "expect with spaces"
-rm 'file with spaces'
-ok 53 - status -s without relative paths
-
-expecting success of 7508.54 'dry-run of partial commit excluding new file in index': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   dir1/modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/
-	untracked
 
-EOF
-	git commit --dry-run dir1/modified >output &&
-	test_cmp expect output
-
-ok 54 - dry-run of partial commit excluding new file in index
-
-expecting success of 7508.55 'status refreshes the index': 
-	touch dir2/added &&
-	git status &&
-	git diff-files >output &&
-	test_cmp expect output
-
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-ok 55 - status refreshes the index
-
-expecting success of 7508.56 'status shows detached HEAD properly after checking out non-local upstream branch': 
-	test_when_finished rm -rf upstream downstream actual &&
-
-	test_create_repo upstream &&
-	test_commit -C upstream foo &&
-
-	git clone upstream downstream &&
-	git -C downstream checkout @{u} &&
-	git -C downstream status >actual &&
-	grep -E "HEAD detached at [0-9a-f]+" actual
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/upstream/.git/
-[master (root-commit) f80cabb] foo
+[master (root-commit) 8050378] Adding original file.
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-Cloning into 'downstream'...
-done.
-Note: switching to '@{u}'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at f80cabb foo
-HEAD detached at f80cabb
-ok 56 - status shows detached HEAD properly after checking out non-local upstream branch
-
-expecting success of 7508.57 'setup status submodule summary': 
-	test_create_repo sm && (
-		cd sm &&
-		>foo &&
-		git add foo &&
-		git commit -m "Add foo"
-	) &&
-	git add sm
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/sm/.git/
-[master (root-commit) a2af2f1] Add foo
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 foo
-warning: adding embedded git repository: sm
-hint: You've added another git repository inside your current repository.
-hint: Clones of the outer repository will not contain the contents of
-hint: the embedded repository and will not know how to obtain it.
-hint: If you meant to add a submodule, use:
-hint:
-hint: 	git submodule add <url> sm
-hint:
-hint: If you added this path by mistake, you can remove it from the
-hint: index with:
-hint:
-hint: 	git rm --cached sm
-hint:
-hint: See "git help submodule" for more information.
-hint: Disable this message with "git config advice.addEmbeddedRepo false"
-ok 57 - setup status submodule summary
-
-expecting success of 7508.58 'status submodule summary is disabled by default': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-	new file:   sm
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-EOF
-	git status >output &&
-	test_cmp expect output
-
-ok 58 - status submodule summary is disabled by default
-
-expecting success of 7508.59 'status --untracked-files=all does not show submodule': 
-	git status --untracked-files=all >output &&
-	test_cmp expect output
-
-ok 59 - status --untracked-files=all does not show submodule
-
-expecting success of 7508.60 'status -s submodule summary is disabled by default': 
-	git status -s >output &&
-	test_cmp expect output
-
-ok 60 - status -s submodule summary is disabled by default
-
-expecting success of 7508.61 'status -s --untracked-files=all does not show submodule': 
-	git status -s --untracked-files=all >output &&
-	test_cmp expect output
+ create mode 100644 original
+ok 1 - setup
 
-ok 61 - status -s --untracked-files=all does not show submodule
+expecting success of 7525.2 'status no-options': 
+	git status >actual &&
+	test_grep "renamed:" actual
 
-expecting success of 7508.62 'status submodule summary': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 1 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+	renamed:    original -> renamed
+ok 2 - status no-options
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   dir2/added
-	new file:   sm
+expecting success of 7525.3 'status --no-renames': 
+	git status --no-renames >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+	deleted:    original
+	new file:   renamed
+ok 3 - status --no-renames
 
-Submodule changes to be committed:
+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
 
-* sm 0000000...$head (1):
-  > Add foo
+	deleted:    original
+	new file:   renamed
+ok 4 - status.renames inherits from diff.renames false
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+expecting success of 7525.5 'status.renames inherits from diff.renames true': 
+	git -c diff.renames=true status >actual &&
+	test_grep "renamed:" actual
 
-EOF
-	git config status.submodulesummary 10 &&
-	git status >output &&
-	test_cmp expect output
+	renamed:    original -> renamed
+ok 5 - status.renames inherits from diff.renames true
 
-ok 62 - status submodule summary
+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
 
-expecting success of 7508.63 'status submodule summary with status.displayCommentPrefix=false': 
-	strip_comments expect &&
-	git -c status.displayCommentPrefix=false status >output &&
-	test_cmp expect output
+	deleted:    original
+	new file:   renamed
+ok 6 - status.renames overrides diff.renames false
 
-ok 63 - status submodule summary with status.displayCommentPrefix=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
 
-expecting success of 7508.64 'commit with submodule summary ignores status.displayCommentPrefix': 
-	commit_template_commented
+	renamed:    original -> renamed
+ok 7 - status.renames overrides from diff.renames true
 
-Aborting commit due to empty commit message.
-ok 64 - commit with submodule summary ignores status.displayCommentPrefix
+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 7508.65 'status -s submodule summary': 
-	git status -s >output &&
-	test_cmp expect output
+	deleted:    original
+	new file:   renamed
+ok 8 - status status.renames=false
 
-ok 65 - status -s submodule summary
+expecting success of 7525.9 'status status.renames=true': 
+	git -c status.renames=true status >actual &&
+	test_grep "renamed:" actual
 
-expecting success of 7508.66 'status submodule summary (clean submodule): commit': 
-	cat >expect-status <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
+	renamed:    original -> renamed
+ok 9 - status status.renames=true
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+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
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+	deleted:    original
+	new file:   renamed
+ok 10 - commit honors status.renames=false
 
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	sed "/git pull/d" expect-status > expect-commit &&
-	git commit -m "commit submodule" &&
-	git config status.submodulesummary 10 &&
-	test_must_fail git commit --dry-run >output &&
-	test_cmp expect-commit output &&
-	git status >output &&
-	test_cmp expect-status output
+expecting success of 7525.11 'commit honors status.renames=true': 
+	git -c status.renames=true commit --dry-run >actual &&
+	test_grep "renamed:" actual
 
-[main 49f874e] commit submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 dir2/added
- create mode 160000 sm
-ok 66 - status submodule summary (clean submodule): commit
+	renamed:    original -> renamed
+ok 11 - commit honors status.renames=true
 
-expecting success of 7508.67 'status -s submodule summary (clean submodule)': 
-	git status -s >output &&
-	test_cmp expect output
+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
 
-ok 67 - status -s submodule summary (clean submodule)
+	deleted:    original
+	new file:   renamed
+ok 12 - status config overridden
 
-expecting success of 7508.68 'status -z implies porcelain': 
-	git status --porcelain |
-	perl -pe "s/\012/\000/g" >expect &&
-	git status -z >output &&
-	test_cmp expect output
+expecting success of 7525.13 'status score=100%': 
+	git status -M=100% >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual &&
 
-ok 68 - status -z implies porcelain
+	git status --find-renames=100% >actual &&
+	test_grep "deleted:" actual &&
+	test_grep "new file:" actual
 
-expecting success of 7508.69 'commit --dry-run submodule summary (--amend)': 
-	cat >expect <<EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
+	deleted:    original
+	new file:   renamed
+	deleted:    original
+	new file:   renamed
+ok 13 - status score=100%
 
-Changes to be committed:
-  (use "git restore --source=HEAD^1 --staged <file>..." to unstage)
-	new file:   dir2/added
-	new file:   sm
+expecting success of 7525.14 'status score=01%': 
+	git status -M=01% >actual &&
+	test_grep "renamed:" actual &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+	git status --find-renames=01% >actual &&
+	test_grep "renamed:" actual
 
-Submodule changes to be committed:
+	renamed:    original -> renamed
+	renamed:    original -> renamed
+ok 14 - status score=01%
 
-* sm 0000000...$head (1):
-  > Add foo
+expecting success of 7525.15 'copies not overridden by find-renames': 
+	cp renamed copy &&
+	git add copy &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+	git -c status.renames=copies status -M=01% >actual &&
+	test_grep "copied:" actual &&
+	test_grep "renamed:" actual &&
 
-EOF
-	git config status.submodulesummary 10 &&
-	git commit --dry-run --amend >output &&
-	test_cmp expect output
+	git -c status.renames=copies status --find-renames=01% >actual &&
+	test_grep "copied:" actual &&
+	test_grep "renamed:" actual
 
-ok 69 - commit --dry-run submodule summary (--amend)
+	copied:     original -> copy
+	renamed:    original -> renamed
+	copied:     original -> copy
+	renamed:    original -> renamed
+ok 15 - copies not overridden by find-renames
 
-checking prerequisite: SANITY
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7527-builtin-fsmonitor.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7527-builtin-fsmonitor/.git/
+checking prerequisite: FSMONITOR_DAEMON
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SANITY" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
 (
-	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
+	cd "$TRASH_DIRECTORY/prereq-test-dir-FSMONITOR_DAEMON" &&
+	git version --build-options >output &&
+	grep "feature: fsmonitor--daemon" output
 
 )
-rm: cannot remove 'SANETESTD.1/x': Permission denied
-prerequisite SANITY ok
-expecting success of 7508.70 'status succeeds in a read-only repository': 
-	test_when_finished "chmod 775 .git" &&
-	(
-		chmod a-w .git &&
-		# make dir1/tracked stat-dirty
-		>dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked &&
-		git status -s >output &&
-		! grep dir1/tracked output &&
-		# make sure "status" succeeded without writing index out
-		git diff-files | grep dir1/tracked
-	)
-
-:100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M	dir1/tracked
-ok 70 - status succeeds in a read-only repository
-
-expecting success of 7508.71 '--ignore-submodules=untracked suppresses submodules with untracked content': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Submodule changes to be committed:
-
-* sm $head...$new_head (1):
-  > Add bar
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-EOF
-	echo modified  sm/untracked &&
-	git status --ignore-submodules=untracked >output &&
-	test_cmp expect output
-
-modified sm/untracked
-ok 71 - --ignore-submodules=untracked suppresses submodules with untracked content
-
-expecting success of 7508.72 '.gitmodules ignore=untracked suppresses submodules with untracked content': 
-	test_config diff.ignoreSubmodules dirty &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --add -f .gitmodules submodule.subname.ignore untracked &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 72 - .gitmodules ignore=untracked suppresses submodules with untracked content
-
-expecting success of 7508.73 '.git/config ignore=untracked suppresses submodules with untracked content': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore untracked &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config --remove-section -f .gitmodules submodule.subname
-
-ok 73 - .git/config ignore=untracked suppresses submodules with untracked content
-
-expecting success of 7508.74 '--ignore-submodules=dirty suppresses submodules with untracked content': 
-	git status --ignore-submodules=dirty >output &&
-	test_cmp expect output
-
-ok 74 - --ignore-submodules=dirty suppresses submodules with untracked content
-
-expecting success of 7508.75 '.gitmodules ignore=dirty suppresses submodules with untracked content': 
-	test_config diff.ignoreSubmodules dirty &&
-	git status >output &&
-	! test -s actual &&
-	git config --add -f .gitmodules submodule.subname.ignore dirty &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 75 - .gitmodules ignore=dirty suppresses submodules with untracked content
-
-expecting success of 7508.76 '.git/config ignore=dirty suppresses submodules with untracked content': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore dirty &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 76 - .git/config ignore=dirty suppresses submodules with untracked content
-
-expecting success of 7508.77 '--ignore-submodules=dirty suppresses submodules with modified content': 
-	echo modified >sm/foo &&
-	git status --ignore-submodules=dirty >output &&
-	test_cmp expect output
-
-ok 77 - --ignore-submodules=dirty suppresses submodules with modified content
-
-expecting success of 7508.78 '.gitmodules ignore=dirty suppresses submodules with modified content': 
-	git config --add -f .gitmodules submodule.subname.ignore dirty &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 78 - .gitmodules ignore=dirty suppresses submodules with modified content
-
-expecting success of 7508.79 '.git/config ignore=dirty suppresses submodules with modified content': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore dirty &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 79 - .git/config ignore=dirty suppresses submodules with modified content
-
-expecting success of 7508.80 '--ignore-submodules=untracked doesn't suppress submodules with modified content': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-  (commit or discard the untracked or modified content in submodules)
-	modified:   dir1/modified
-	modified:   sm (modified content)
-
-Submodule changes to be committed:
-
-* sm $head...$new_head (1):
-  > Add bar
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-EOF
-	git status --ignore-submodules=untracked > output &&
-	test_cmp expect output
-
-ok 80 - --ignore-submodules=untracked doesn't suppress submodules with modified content
-
-expecting success of 7508.81 '.gitmodules ignore=untracked doesn't suppress submodules with modified content': 
-	git config --add -f .gitmodules submodule.subname.ignore untracked &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 81 - .gitmodules ignore=untracked doesn't suppress submodules with modified content
-
-expecting success of 7508.82 '.git/config ignore=untracked doesn't suppress submodules with modified content': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore untracked &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 82 - .git/config ignore=untracked doesn't suppress submodules with modified content
-
-expecting success of 7508.83 '--ignore-submodules=untracked doesn't suppress submodule summary': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-	modified:   sm (new commits)
-
-Submodule changes to be committed:
-
-* sm $head...$new_head (1):
-  > Add bar
-
-Submodules changed but not updated:
-
-* sm $new_head...$head2 (1):
-  > 2nd commit
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-EOF
-	git status --ignore-submodules=untracked > output &&
-	test_cmp expect output
-
-ok 83 - --ignore-submodules=untracked doesn't suppress submodule summary
-
-expecting success of 7508.84 '.gitmodules ignore=untracked doesn't suppress submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore untracked &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 84 - .gitmodules ignore=untracked doesn't suppress submodule summary
-
-expecting success of 7508.85 '.git/config ignore=untracked doesn't suppress submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore untracked &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 85 - .git/config ignore=untracked doesn't suppress submodule summary
-
-expecting success of 7508.86 '--ignore-submodules=dirty doesn't suppress submodule summary': 
-	git status --ignore-submodules=dirty > output &&
-	test_cmp expect output
-
-ok 86 - --ignore-submodules=dirty doesn't suppress submodule summary
-
-expecting success of 7508.87 '.gitmodules ignore=dirty doesn't suppress submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore dirty &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 87 - .gitmodules ignore=dirty doesn't suppress submodule summary
-
-expecting success of 7508.88 '.git/config ignore=dirty doesn't suppress submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore dirty &&
-	git config --add submodule.subname.path sm &&
-	git status >output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
-
-ok 88 - .git/config ignore=dirty doesn't suppress submodule summary
-
-expecting success of 7508.89 'status (core.commentchar with submodule summary)': 
-	test_config core.commentchar ";" &&
-	git -c status.displayCommentPrefix=true status >output &&
-	test_cmp expect output
-
-ok 89 - status (core.commentchar with submodule summary)
-
-expecting success of 7508.90 'status (core.commentchar with two chars with submodule summary)': 
-	test_config core.commentchar ";;" &&
-	sed "s/^/;/" <expect >expect.double &&
-	git -c status.displayCommentPrefix=true status >output &&
-	test_cmp expect.double output
-
-ok 90 - status (core.commentchar with two chars with submodule summary)
-
-expecting success of 7508.91 '--ignore-submodules=all suppresses submodule summary': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
-
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
-
-no changes added to commit (use "git add" and/or "git commit -a")
-EOF
-	git status --ignore-submodules=all > output &&
-	test_cmp expect output
-
-ok 91 - --ignore-submodules=all suppresses submodule summary
-
-expecting success of 7508.92 '.gitmodules ignore=all suppresses unstaged submodule summary': 
-	cat > expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
-  (use "git pull" if you want to integrate the remote branch with yours)
-
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
-
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+prerequisite FSMONITOR_DAEMON not satisfied
+1..0 # SKIP fsmonitor--daemon is not supported on this platform
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7526-commit-pathspec-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7526-commit-pathspec-file/.git/
+expecting success of 7526.1 'setup': 
+	test_commit file0 &&
+	git tag checkpoint &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+	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
 
-EOF
-	git config --add -f .gitmodules submodule.subname.ignore all &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git status > output &&
-	test_cmp expect output &&
-	git config -f .gitmodules  --remove-section submodule.subname
+[master (root-commit) ad2e047] file0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file0.t
+ok 1 - setup
 
-ok 92 - .gitmodules ignore=all suppresses unstaged submodule summary
+expecting success of 7526.2 '--pathspec-from-file from stdin': 
+	restore_checkpoint &&
 
-expecting success of 7508.93 '.git/config ignore=all suppresses unstaged submodule summary': 
-	git config --add -f .gitmodules submodule.subname.ignore none &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore all &&
-	git config --add submodule.subname.path sm &&
-	git status > output &&
-	test_cmp expect output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
+	echo fileA.t | git commit --pathspec-from-file=- -m "Commit" &&
 
-ok 93 - .git/config ignore=all suppresses unstaged submodule summary
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect
 
-expecting success of 7508.94 'setup of test environment': 
-	git config status.showUntrackedFiles no &&
-	git status -s >expected_short &&
-	git status --no-short >expected_noshort
+[master 95e22e1] Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA.t
+ok 2 - --pathspec-from-file from stdin
 
-ok 94 - setup of test environment
+expecting success of 7526.3 '--pathspec-from-file from file': 
+	restore_checkpoint &&
 
-expecting success of 7508.95 '"status.short=true" same as "-s"': 
-	git -c status.short=true status >actual &&
-	test_cmp expected_short actual
+	echo fileA.t >list &&
+	git commit --pathspec-from-file=list -m "Commit" &&
 
-ok 95 - "status.short=true" same as "-s"
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect
 
-expecting success of 7508.96 '"status.short=true" weaker than "--no-short"': 
-	git -c status.short=true status --no-short >actual &&
-	test_cmp expected_noshort actual
+[master 95e22e1] Commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA.t
+ok 3 - --pathspec-from-file from file
 
-ok 96 - "status.short=true" weaker than "--no-short"
+expecting success of 7526.4 'NUL delimiters': 
+	restore_checkpoint &&
 
-expecting success of 7508.97 '"status.short=false" same as "--no-short"': 
-	git -c status.short=false status >actual &&
-	test_cmp expected_noshort actual
+	printf "fileA.t\0fileB.t\0" | git commit --pathspec-from-file=- --pathspec-file-nul -m "Commit" &&
 
-ok 97 - "status.short=false" same as "--no-short"
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
 
-expecting success of 7508.98 '"status.short=false" weaker than "-s"': 
-	git -c status.short=false status -s >actual &&
-	test_cmp expected_short actual
+[master ebcb447] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ok 4 - NUL delimiters
 
-ok 98 - "status.short=false" weaker than "-s"
+expecting success of 7526.5 'LF delimiters': 
+	restore_checkpoint &&
 
-expecting success of 7508.99 '"status.branch=true" same as "-b"': 
-	git status -sb >expected_branch &&
-	git -c status.branch=true status -s >actual &&
-	test_cmp expected_branch actual
+	printf "fileA.t\nfileB.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
 
-ok 99 - "status.branch=true" same as "-b"
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
 
-expecting success of 7508.100 '"status.branch=true" different from "--no-branch"': 
-	git status -s --no-branch  >expected_nobranch &&
-	git -c status.branch=true status -s >actual &&
-	! test_cmp expected_nobranch actual
+[master ebcb447] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ok 5 - LF delimiters
 
---- expected_nobranch	2025-12-18 01:39:05.026773267 +0000
-+++ actual	2025-12-18 01:39:05.046773267 +0000
-@@ -1,2 +1,3 @@
-+## main...upstream [ahead 2, behind 2]
-  M dir1/modified
- MM sm
-ok 100 - "status.branch=true" different from "--no-branch"
+expecting success of 7526.6 'no trailing delimiter': 
+	restore_checkpoint &&
 
-expecting success of 7508.101 '"status.branch=true" weaker than "--no-branch"': 
-	git -c status.branch=true status -s --no-branch >actual &&
-	test_cmp expected_nobranch actual
+	printf "fileA.t\nfileB.t" | git commit --pathspec-from-file=- -m "Commit" &&
 
-ok 101 - "status.branch=true" weaker than "--no-branch"
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
 
-expecting success of 7508.102 '"status.branch=true" weaker than "--porcelain"': 
-	git -c status.branch=true status --porcelain >actual &&
-	test_cmp expected_nobranch actual
+[master ebcb447] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ok 6 - no trailing delimiter
 
-ok 102 - "status.branch=true" weaker than "--porcelain"
+expecting success of 7526.7 'CRLF delimiters': 
+	restore_checkpoint &&
 
-expecting success of 7508.103 '"status.branch=false" same as "--no-branch"': 
-	git -c status.branch=false status -s >actual &&
-	test_cmp expected_nobranch actual
+	printf "fileA.t\r\nfileB.t\r\n" | git commit --pathspec-from-file=- -m "Commit" &&
 
-ok 103 - "status.branch=false" same as "--no-branch"
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
 
-expecting success of 7508.104 '"status.branch=false" weaker than "-b"': 
-	git -c status.branch=false status -sb >actual &&
-	test_cmp expected_branch actual
+[master ebcb447] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileA.t
+ create mode 100644 fileB.t
+ok 7 - CRLF delimiters
 
-ok 104 - "status.branch=false" weaker than "-b"
+expecting success of 7526.8 'quotes': 
+	restore_checkpoint &&
 
-expecting success of 7508.105 'Restore default test environment': 
-	git config --unset status.showUntrackedFiles
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
 
-ok 105 - Restore default test environment
+	git commit --pathspec-from-file=list -m "Commit" &&
 
-expecting success of 7508.106 'git commit will commit a staged but ignored submodule': 
-	git config --add -f .gitmodules submodule.subname.ignore all &&
-	git config --add -f .gitmodules submodule.subname.path sm &&
-	git config --add submodule.subname.ignore all &&
-	git status -s --ignore-submodules=dirty >output &&
-	test_grep "^M. sm" output &&
-	GIT_EDITOR="echo hello >>\"\$1\"" &&
-	export GIT_EDITOR &&
-	git commit -uno &&
-	git status -s --ignore-submodules=dirty >output &&
-	test_grep ! "^M. sm" output
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect expect
 
-MM sm
-[main 24c442b] hello /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/.git/COMMIT_EDITMSG
+[master 95e22e1] Commit
  Author: A U Thor <author@example.com>
-ok 106 - git commit will commit a staged but ignored submodule
-
-expecting success of 7508.107 'git commit --dry-run will show a staged but ignored submodule': 
-	git reset HEAD^ &&
-	git add sm &&
-	cat >expect << EOF &&
-On branch main
-Your branch and 'upstream' have diverged,
-and have 2 and 2 different commits each, respectively.
+ 1 file changed, 1 insertion(+)
+ create mode 100644 fileA.t
+ok 8 - quotes
 
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	modified:   sm
+expecting success of 7526.9 'quotes not compatible with --pathspec-file-nul': 
+	restore_checkpoint &&
 
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   dir1/modified
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
 
-Untracked files not listed (use -u option to show untracked files)
-EOF
-	git commit -uno --dry-run >output &&
-	test_cmp expect output &&
-	git status -s --ignore-submodules=dirty >output &&
-	test_grep "^M. sm" output
+	test_must_fail git commit --pathspec-from-file=list --pathspec-file-nul -m "Commit"
 
-Unstaged changes after reset:
-M	dir1/modified
-M	sm
-M  sm
-ok 107 - git commit --dry-run will show a staged but ignored submodule
+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 7508.108 'git commit -m will commit a staged but ignored submodule': 
-	git commit -uno -m message &&
-	git status -s --ignore-submodules=dirty >output &&
-	test_grep ! "^M. sm" output &&
-	git config --remove-section submodule.subname &&
-	git config -f .gitmodules  --remove-section submodule.subname
+expecting success of 7526.10 'only touches what was listed': 
+	restore_checkpoint &&
 
-[main 45c17dd] message
- Author: A U Thor <author@example.com>
-ok 108 - git commit -m will commit a staged but ignored submodule
+	printf "fileB.t\nfileC.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
 
-expecting success of 7508.109 'show stash info with "--show-stash"': 
-	git reset --hard &&
-	git stash clear &&
-	echo 1 >file &&
-	git add file &&
-	git stash &&
-	git status >expected_default &&
-	git status --show-stash >expected_with_stash &&
-	test_grep "^Your stash currently has 1 entry$" expected_with_stash
+	cat >expect <<-\EOF &&
+	A	fileB.t
+	A	fileC.t
+	EOF
+	verify_expect
 
-HEAD is now at 45c17dd message
-Saved working directory and index state WIP on main: 45c17dd message
-Your stash currently has 1 entry
-ok 109 - show stash info with "--show-stash"
+[master 6ba5a83] Commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 fileB.t
+ create mode 100644 fileC.t
+ok 10 - only touches what was listed
 
-expecting success of 7508.110 'no stash info with "--show-stash --no-show-stash"': 
-	git status --show-stash --no-show-stash >expected_without_stash &&
-	test_cmp expected_default expected_without_stash
+expecting success of 7526.11 'error conditions': 
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>empty_list &&
 
-ok 110 - no stash info with "--show-stash --no-show-stash"
+	test_must_fail git commit --pathspec-from-file=list --interactive -m "Commit" 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
 
-expecting success of 7508.111 '"status.showStash=false" weaker than "--show-stash"': 
-	git -c status.showStash=false status --show-stash >actual &&
-	test_cmp expected_with_stash actual
+	test_must_fail git commit --pathspec-from-file=list --patch -m "Commit" 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .--interactive/--patch. cannot be used together" err &&
 
-ok 111 - "status.showStash=false" weaker than "--show-stash"
+	test_must_fail git commit --pathspec-from-file=list --all -m "Commit" 2>err &&
+	test_grep -e "options .--pathspec-from-file. and .-a. cannot be used together" err &&
 
-expecting success of 7508.112 '"status.showStash=true" weaker than "--no-show-stash"': 
-	git -c status.showStash=true status --no-show-stash >actual &&
-	test_cmp expected_without_stash actual
+	test_must_fail git commit --pathspec-from-file=list -m "Commit" -- fileA.t 2>err &&
+	test_grep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err &&
 
-ok 112 - "status.showStash=true" weaker than "--no-show-stash"
+	test_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
+	test_grep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err &&
 
-expecting success of 7508.113 'no additional info if no stash entries': 
-	git stash clear &&
-	git -c status.showStash=true status >actual &&
-	test_cmp expected_without_stash actual
+	test_must_fail git commit --pathspec-from-file=empty_list --include -m "Commit" 2>err &&
+	test_grep -e "No paths with --include/--only does not make sense." err &&
 
-ok 113 - no additional info if no stash entries
+	test_must_fail git commit --pathspec-from-file=empty_list --only -m "Commit" 2>err &&
+	test_grep -e "No paths with --include/--only does not make sense." err
 
-expecting success of 7508.114 '"No commits yet" should be noted in status output': 
-	git checkout --orphan empty-branch-1 &&
-	git status >output &&
-	test_grep "No commits yet" output
+fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
+fatal: options '--pathspec-from-file' and '--interactive/--patch' cannot be used together
+fatal: options '--pathspec-from-file' and '-a' cannot be used together
+fatal: '--pathspec-from-file' and pathspec arguments cannot be used together
+fatal: the option '--pathspec-file-nul' requires '--pathspec-from-file'
+fatal: No paths with --include/--only does not make sense.
+fatal: No paths with --include/--only does not make sense.
+ok 11 - error conditions
 
-Switched to a new branch 'empty-branch-1'
-No commits yet
-ok 114 - "No commits yet" should be noted in status output
+# passed all 11 test(s)
+1..11
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7528-signed-commit-ssh.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7528-signed-commit-ssh/.git/
+checking prerequisite: GPGSSH
 
-expecting success of 7508.115 '"No commits yet" should not be noted in status output': 
-	git checkout --orphan empty-branch-2 &&
-	test_commit test-commit-1 &&
-	git status >output &&
-	test_grep ! "No commits yet" output
+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;
 
-Switched to a new branch 'empty-branch-2'
-[empty-branch-2 (root-commit) f194efb] test-commit-1
- Author: A U Thor <author@example.com>
- 10 files changed, 7 insertions(+)
- create mode 100644 .gitconfig
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 dir2/added
- create mode 100644 modified
- create mode 160000 sm
- create mode 100644 test-commit-1.t
- create mode 100644 tracked
- create mode 100644 upstream1.t
- create mode 100644 upstream2.t
-ok 115 - "No commits yet" should not be noted in status output
+	# 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 7508.116 '"Initial commit" should be noted in commit template': 
-	git checkout --orphan empty-branch-3 &&
-	touch to_be_committed_1 &&
-	git add to_be_committed_1 &&
-	git commit --dry-run >output &&
-	test_grep "Initial commit" output
+	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
 
-Switched to a new branch 'empty-branch-3'
-Initial commit
-ok 116 - "Initial commit" should be noted in commit template
+	# 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 7508.117 '"Initial commit" should not be noted in commit template': 
-	git checkout --orphan empty-branch-4 &&
-	test_commit test-commit-2 &&
-	touch to_be_committed_2 &&
-	git add to_be_committed_2 &&
-	git commit --dry-run >output &&
-	test_grep ! "Initial commit" output
+)
+prerequisite GPGSSH not satisfied
+ok 1 # skip create signed commits (missing GPGSSH)
 
-Switched to a new branch 'empty-branch-4'
-[empty-branch-4 (root-commit) 92016e1] test-commit-2
- Author: A U Thor <author@example.com>
- 12 files changed, 8 insertions(+)
- create mode 100644 .gitconfig
- create mode 100644 dir1/modified
- create mode 100644 dir1/tracked
- create mode 100644 dir2/added
- create mode 100644 modified
- create mode 160000 sm
- create mode 100644 test-commit-1.t
- create mode 100644 test-commit-2.t
- create mode 100644 to_be_committed_1
- create mode 100644 tracked
- create mode 100644 upstream1.t
- create mode 100644 upstream2.t
-ok 117 - "Initial commit" should not be noted in commit template
+ok 2 # skip sign commits using literal public keys with ssh-agent (missing GPGSSH)
 
-expecting success of 7508.118 '--no-optional-locks prevents index update': 
-	test_set_magic_mtime .git/index &&
-	git --no-optional-locks status &&
-	test_is_magic_mtime .git/index &&
-	git status &&
-	! test_is_magic_mtime .git/index
+checking prerequisite: GPGSSH_VERIFYTIME
 
-On branch empty-branch-4
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   to_be_committed_2
+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\"" &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+	# 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") &&
 
-On branch empty-branch-4
-Changes to be committed:
-  (use "git restore --staged <file>..." to unstage)
-	new file:   to_be_committed_2
+	# 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 &&
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+	cat >>"${GPGSSH_ALLOWED_SIGNERS}" <<-EOF &&
+	"timeboxed valid key" valid-after="$ts2005c",valid-before="$ts2005d" $key_valid"
+	"timeboxed invalid key" valid-after="$ts2005a",valid-before="$ts2005b" $key_invalid"
+	"principal with expired key" valid-before="$ts2000" $key_expired"
+	"principal with not yet valid key" valid-after="$ts2999" $key_notyetvalid"
+	EOF
 
---- .git/test-mtime-expect	2025-12-18 01:39:06.950773267 +0000
-+++ .git/test-mtime-actual	2025-12-18 01:39:06.950773267 +0000
-@@ -1 +1 @@
--1234567890
-+1766021946
-ok 118 - --no-optional-locks prevents index update
+	# 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)
 
-expecting success of 7508.119 'racy timestamps will be fixed for clean worktree': 
-	echo content >racy-dirty &&
-	echo content >racy-racy &&
-	git add racy* &&
-	git commit -m "racy test files" &&
-	# let status rewrite the index, if necessary; after that we expect
-	# no more index writes unless caused by racy timestamps; note that
-	# timestamps may already be racy now (depending on previous tests)
-	git status &&
-	test_set_magic_mtime .git/index &&
-	git status &&
-	! test_is_magic_mtime .git/index
+)
+prerequisite GPGSSH_VERIFYTIME not satisfied
+ok 3 # skip create signed commits with keys having defined lifetimes (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-[empty-branch-4 1041e20] racy test files
- Author: A U Thor <author@example.com>
- 3 files changed, 2 insertions(+)
- create mode 100644 racy-dirty
- create mode 100644 racy-racy
- create mode 100644 to_be_committed_2
-On branch empty-branch-4
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+ok 4 # skip verify and show signatures (missing GPGSSH)
 
-nothing added to commit but untracked files present (use "git add" to track)
-On branch empty-branch-4
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+ok 5 # skip verify-commit exits failure on untrusted signature (missing GPGSSH)
 
-nothing added to commit but untracked files present (use "git add" to track)
---- .git/test-mtime-expect	2025-12-18 01:39:07.114773267 +0000
-+++ .git/test-mtime-actual	2025-12-18 01:39:07.114773267 +0000
-@@ -1 +1 @@
--1234567890
-+1766021947
-ok 119 - racy timestamps will be fixed for clean worktree
+ok 6 # skip verify-commit exits failure on expired signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-expecting success of 7508.120 'racy timestamps will be fixed for dirty worktree': 
-	echo content2 >racy-dirty &&
-	git status &&
-	test_set_magic_mtime .git/index &&
-	git status &&
-	! test_is_magic_mtime .git/index
+ok 7 # skip verify-commit exits failure on not yet valid signature key (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-On branch empty-branch-4
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   racy-dirty
+ok 8 # skip verify-commit succeeds with commit date and key validity matching (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+ok 9 # skip verify-commit exits failure with commit date outside of key validity (missing GPGSSH_VERIFYTIME,GPGSSH of GPGSSH,GPGSSH_VERIFYTIME)
 
-no changes added to commit (use "git add" and/or "git commit -a")
-On branch empty-branch-4
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git restore <file>..." to discard changes in working directory)
-	modified:   racy-dirty
+ok 10 # skip verify-commit exits success with matching minTrustLevel (missing GPGSSH)
 
-Untracked files:
-  (use "git add <file>..." to include in what will be committed)
-	.gitmodules
-	actual
-	dir1/untracked
-	dir2/modified
-	dir2/untracked
-	untracked
+ok 11 # skip verify-commit exits success with low minTrustLevel (missing GPGSSH)
 
-no changes added to commit (use "git add" and/or "git commit -a")
---- .git/test-mtime-expect	2025-12-18 01:39:07.242773267 +0000
-+++ .git/test-mtime-actual	2025-12-18 01:39:07.246773267 +0000
-@@ -1 +1 @@
--1234567890
-+1766021947
-ok 120 - racy timestamps will be fixed for dirty worktree
+ok 12 # skip verify-commit exits failure with high minTrustLevel (missing GPGSSH)
 
-expecting success of 7508.121 'setup slow status advice': 
-	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main git init slowstatus &&
-	(
-		cd slowstatus &&
-		cat >.gitignore <<-\EOF &&
-		/actual
-		/expected
-		/out
-		EOF
-		git add .gitignore &&
-		git commit -m "Add .gitignore" &&
-		git config advice.statusuoption true
-	)
+ok 13 # skip verify signatures with --raw (missing GPGSSH)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/slowstatus/.git/
-[main (root-commit) 557fde8] Add .gitignore
- Author: A U Thor <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 .gitignore
-ok 121 - setup slow status advice
+ok 14 # skip proper header is used for hash algorithm (missing GPGSSH)
 
-expecting success of 7508.122 'slow status advice when core.untrackedCache and fsmonitor are unset': 
-	(
-		cd slowstatus &&
-		git config core.untrackedCache false &&
-		git config core.fsmonitor false &&
-		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
-		cat >expected <<-\EOF &&
-		On branch main
+ok 15 # skip show signed commit with signature (missing GPGSSH)
 
-		It took 3.25 seconds to enumerate untracked files.
-		See 'git help status' for information on how to improve this.
+ok 16 # skip detect fudged signature (missing GPGSSH)
 
-		nothing to commit, working tree clean
-		EOF
-		test_cmp expected actual
-	)
+ok 17 # skip detect fudged signature with NUL (missing GPGSSH)
 
-ok 122 - slow status advice when core.untrackedCache and fsmonitor are unset
+ok 18 # skip amending already signed commit (missing GPGSSH)
 
-expecting success of 7508.123 'slow status advice when core.untrackedCache true, but not fsmonitor': 
-	(
-		cd slowstatus &&
-		git config core.untrackedCache true &&
-		git config core.fsmonitor false &&
-		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
-		cat >expected <<-\EOF &&
-		On branch main
+ok 19 # skip show good signature with custom format (missing GPGSSH)
 
-		It took 3.25 seconds to enumerate untracked files.
-		See 'git help status' for information on how to improve this.
+ok 20 # skip show bad signature with custom format (missing GPGSSH)
 
-		nothing to commit, working tree clean
-		EOF
-		test_cmp expected actual
-	)
+ok 21 # skip show untrusted signature with custom format (missing GPGSSH)
 
-ok 123 - slow status advice when core.untrackedCache true, but not fsmonitor
+ok 22 # skip show untrusted signature with undefined trust level (missing GPGSSH)
 
-expecting success of 7508.124 'slow status advice when core.untrackedCache true, and fsmonitor': 
-	(
-		cd slowstatus &&
-		git config core.untrackedCache true &&
-		git config core.fsmonitor true &&
-		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
-		cat >expected <<-\EOF &&
-		On branch main
+ok 23 # skip show untrusted signature with ultimate trust level (missing GPGSSH)
 
-		It took 3.25 seconds to enumerate untracked files,
-		but the results were cached, and subsequent runs may be faster.
-		See 'git help status' for information on how to improve this.
+ok 24 # skip show lack of signature with custom format (missing GPGSSH)
 
-		nothing to commit, working tree clean
-		EOF
-		test_cmp expected actual
-	)
+ok 25 # skip log.showsignature behaves like --show-signature (missing GPGSSH)
 
-ok 124 - slow status advice when core.untrackedCache true, and fsmonitor
+ok 26 # skip check config gpg.format values (missing GPGSSH)
 
-checking prerequisite: EXPENSIVE
+ok 27 # skip detect fudged commit with double signature (TODO) (missing GPGSSH)
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
+ok 28 # skip show double signature with custom format (TODO) (missing GPGSSH)
 
-)
-prerequisite EXPENSIVE not satisfied
-ok 125 # skip status does not re-read unchanged 4 or 8 GiB file (missing EXPENSIVE)
+ok 29 # skip verify-commit verifies multiply signed commits (TODO) (missing GPGSSH)
 
-# passed all 125 test(s)
-1..125
+# passed all 29 test(s)
+1..29
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7519-status-fsmonitor.sh ***
@@ -474564,7 +474146,7 @@
 
 fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
 fatal: cannot exec '.git/hooks/fsmonitor-test': No such file or directory
-fsmonitor last update 1766021942425699582
+fsmonitor last update 1731613444155804784
 ok 6 - update-index --fsmonitor" adds the fsmonitor extension
 
 expecting success of 7519.7 'update-index --no-fsmonitor" removes the fsmonitor extension': 
@@ -475239,10 +474821,10 @@
 done.
 Cloning into 'sparse'...
 done.
-{"event":"region_enter","sid":"20251218T013910.485245Z-Hfbad846e-P00007a54","thread":"main","time":"2025-12-18T01:39:10.486135Z","file":"fsmonitor.c","line":172,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20251218T013910.485245Z-Hfbad846e-P00007a54","thread":"main","time":"2025-12-18T01:39:10.487501Z","file":"fsmonitor.c","line":182,"t_rel":0.001365,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20251218T013910.521620Z-Hfbad846e-P00007a89","thread":"main","time":"2025-12-18T01:39:10.522454Z","file":"fsmonitor.c","line":172,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20251218T013910.521620Z-Hfbad846e-P00007a89","thread":"main","time":"2025-12-18T01:39:10.523800Z","file":"fsmonitor.c","line":182,"t_rel":0.001345,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20241114T194417.814530Z-H5c947e1c-P00003070","thread":"main","time":"2024-11-14T19:44:17.815177Z","file":"fsmonitor.c","line":172,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20241114T194417.814530Z-H5c947e1c-P00003070","thread":"main","time":"2024-11-14T19:44:17.831718Z","file":"fsmonitor.c","line":182,"t_rel":0.016541,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20241114T194417.892929Z-H5c947e1c-P000030b1","thread":"main","time":"2024-11-14T19:44:17.893683Z","file":"fsmonitor.c","line":172,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20241114T194417.892929Z-H5c947e1c-P000030b1","thread":"main","time":"2024-11-14T19:44:17.905160Z","file":"fsmonitor.c","line":182,"t_rel":0.011477,"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(-)
@@ -475253,343 +474835,20 @@
  2 files changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 dir1a/modified
  create mode 100644 dir1a/tracked
-{"event":"region_enter","sid":"20251218T013910.650411Z-Hfbad846e-P00007b21","thread":"main","time":"2025-12-18T01:39:10.652794Z","file":"sparse-index.c","line":338,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20251218T013910.650411Z-Hfbad846e-P00007b21","thread":"main","time":"2025-12-18T01:39:10.656340Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20251218T013910.650411Z-Hfbad846e-P00007b21","thread":"main","time":"2025-12-18T01:39:10.653436Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.000642,"nesting":2,"category":"index","label":"ensure_full_index"}
-{"event":"region_leave","sid":"20251218T013910.650411Z-Hfbad846e-P00007b21","thread":"main","time":"2025-12-18T01:39:10.656408Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.000067,"nesting":1,"category":"index","label":"ensure_full_index"}
-{"event":"region_enter","sid":"20251218T013910.650411Z-Hfbad846e-P00007b21","thread":"main","time":"2025-12-18T01:39:10.651333Z","file":"fsmonitor.c","line":172,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_enter","sid":"20251218T013910.650411Z-Hfbad846e-P00007b21","thread":"main","time":"2025-12-18T01:39:10.653667Z","file":"fsmonitor.c","line":172,"nesting":2,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20251218T013910.650411Z-Hfbad846e-P00007b21","thread":"main","time":"2025-12-18T01:39:10.652649Z","file":"fsmonitor.c","line":182,"t_rel":0.001315,"nesting":1,"category":"fsm_hook","label":"query"}
-{"event":"region_leave","sid":"20251218T013910.650411Z-Hfbad846e-P00007b21","thread":"main","time":"2025-12-18T01:39:10.655036Z","file":"fsmonitor.c","line":182,"t_rel":0.001368,"nesting":2,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20241114T194418.196157Z-H5c947e1c-P0000317d","thread":"main","time":"2024-11-14T19:44:18.203084Z","file":"sparse-index.c","line":338,"repo":1,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20241114T194418.196157Z-H5c947e1c-P0000317d","thread":"main","time":"2024-11-14T19:44:18.223020Z","file":"sparse-index.c","line":338,"repo":1,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20241114T194418.196157Z-H5c947e1c-P0000317d","thread":"main","time":"2024-11-14T19:44:18.203538Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.000454,"nesting":2,"category":"index","label":"ensure_full_index"}
+{"event":"region_leave","sid":"20241114T194418.196157Z-H5c947e1c-P0000317d","thread":"main","time":"2024-11-14T19:44:18.223074Z","file":"sparse-index.c","line":420,"repo":1,"t_rel":0.000054,"nesting":1,"category":"index","label":"ensure_full_index"}
+{"event":"region_enter","sid":"20241114T194418.196157Z-H5c947e1c-P0000317d","thread":"main","time":"2024-11-14T19:44:18.196823Z","file":"fsmonitor.c","line":172,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_enter","sid":"20241114T194418.196157Z-H5c947e1c-P0000317d","thread":"main","time":"2024-11-14T19:44:18.218143Z","file":"fsmonitor.c","line":172,"nesting":2,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20241114T194418.196157Z-H5c947e1c-P0000317d","thread":"main","time":"2024-11-14T19:44:18.202960Z","file":"fsmonitor.c","line":182,"t_rel":0.006137,"nesting":1,"category":"fsm_hook","label":"query"}
+{"event":"region_leave","sid":"20241114T194418.196157Z-H5c947e1c-P0000317d","thread":"main","time":"2024-11-14T19:44:18.220073Z","file":"fsmonitor.c","line":182,"t_rel":0.001929,"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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7602-merge-octopus-many.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7602-merge-octopus-many/.git/
-expecting success of 7602.1 'setup': 
-	echo c0 > c0.c &&
-	git add c0.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	i=1 &&
-	while test $i -le 30
-	do
-		git reset --hard c0 &&
-		echo c$i > c$i.c &&
-		git add c$i.c &&
-		git commit -m c$i &&
-		git tag c$i &&
-		i=$(expr $i + 1) || return 1
-	done
-
-[master (root-commit) e4f5a3c] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-HEAD is now at e4f5a3c c0
-[master 429abf0] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at e4f5a3c c0
-[master 028ea41] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-HEAD is now at e4f5a3c c0
-[master c0f42ec] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c3.c
-HEAD is now at e4f5a3c c0
-[master b7e05d5] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-HEAD is now at e4f5a3c c0
-[master c488b09] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5.c
-HEAD is now at e4f5a3c c0
-[master ec4097b] c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c6.c
-HEAD is now at e4f5a3c c0
-[master 0ce0f8d] c7
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c7.c
-HEAD is now at e4f5a3c c0
-[master ff3d47c] c8
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c8.c
-HEAD is now at e4f5a3c c0
-[master 7461614] c9
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c9.c
-HEAD is now at e4f5a3c c0
-[master 1afdb59] c10
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c10.c
-HEAD is now at e4f5a3c c0
-[master 0afbd17] c11
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c11.c
-HEAD is now at e4f5a3c c0
-[master 15bc59a] c12
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c12.c
-HEAD is now at e4f5a3c c0
-[master f06f676] c13
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c13.c
-HEAD is now at e4f5a3c c0
-[master a776bd6] c14
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c14.c
-HEAD is now at e4f5a3c c0
-[master 0d31625] c15
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c15.c
-HEAD is now at e4f5a3c c0
-[master 51ac193] c16
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c16.c
-HEAD is now at e4f5a3c c0
-[master 60d6a53] c17
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c17.c
-HEAD is now at e4f5a3c c0
-[master 3ce5753] c18
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c18.c
-HEAD is now at e4f5a3c c0
-[master 7a37c76] c19
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c19.c
-HEAD is now at e4f5a3c c0
-[master 4125031] c20
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c20.c
-HEAD is now at e4f5a3c c0
-[master f295446] c21
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c21.c
-HEAD is now at e4f5a3c c0
-[master aefb514] c22
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c22.c
-HEAD is now at e4f5a3c c0
-[master 6d1037c] c23
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c23.c
-HEAD is now at e4f5a3c c0
-[master 43701ce] c24
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c24.c
-HEAD is now at e4f5a3c c0
-[master 19740f9] c25
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c25.c
-HEAD is now at e4f5a3c c0
-[master bef4659] c26
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c26.c
-HEAD is now at e4f5a3c c0
-[master 5d3dacb] c27
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c27.c
-HEAD is now at e4f5a3c c0
-[master e1b2fdb] c28
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c28.c
-HEAD is now at e4f5a3c c0
-[master 2088804] c29
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c29.c
-HEAD is now at e4f5a3c c0
-[master fb57d80] c30
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c30.c
-ok 1 - setup
-
-expecting success of 7602.2 'merge c1 with c2, c3, c4, ... c29': 
-	git reset --hard c1 &&
-	i=2 &&
-	refs="" &&
-	while test $i -le 30
-	do
-		refs="$refs c$i" &&
-		i=$(expr $i + 1) || return 1
-	done &&
-	git merge $refs &&
-	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
-	i=1 &&
-	while test $i -le 30
-	do
-		test "$(git rev-parse c$i)" = "$(git rev-parse HEAD^$i)" &&
-		i=$(expr $i + 1) || return 1
-	done &&
-	git diff --exit-code &&
-	i=1 &&
-	while test $i -le 30
-	do
-		test -f c$i.c &&
-		i=$(expr $i + 1) || return 1
-	done
-
-HEAD is now at 429abf0 c1
-Trying simple merge with c2
-Trying simple merge with c3
-Trying simple merge with c4
-Trying simple merge with c5
-Trying simple merge with c6
-Trying simple merge with c7
-Trying simple merge with c8
-Trying simple merge with c9
-Trying simple merge with c10
-Trying simple merge with c11
-Trying simple merge with c12
-Trying simple merge with c13
-Trying simple merge with c14
-Trying simple merge with c15
-Trying simple merge with c16
-Trying simple merge with c17
-Trying simple merge with c18
-Trying simple merge with c19
-Trying simple merge with c20
-Trying simple merge with c21
-Trying simple merge with c22
-Trying simple merge with c23
-Trying simple merge with c24
-Trying simple merge with c25
-Trying simple merge with c26
-Trying simple merge with c27
-Trying simple merge with c28
-Trying simple merge with c29
-Trying simple merge with c30
-Merge made by the 'octopus' strategy.
- c10.c | 1 +
- c11.c | 1 +
- c12.c | 1 +
- c13.c | 1 +
- c14.c | 1 +
- c15.c | 1 +
- c16.c | 1 +
- c17.c | 1 +
- c18.c | 1 +
- c19.c | 1 +
- c2.c  | 1 +
- c20.c | 1 +
- c21.c | 1 +
- c22.c | 1 +
- c23.c | 1 +
- c24.c | 1 +
- c25.c | 1 +
- c26.c | 1 +
- c27.c | 1 +
- c28.c | 1 +
- c29.c | 1 +
- c3.c  | 1 +
- c30.c | 1 +
- c4.c  | 1 +
- c5.c  | 1 +
- c6.c  | 1 +
- c7.c  | 1 +
- c8.c  | 1 +
- c9.c  | 1 +
- 29 files changed, 29 insertions(+)
- create mode 100644 c10.c
- create mode 100644 c11.c
- create mode 100644 c12.c
- create mode 100644 c13.c
- create mode 100644 c14.c
- create mode 100644 c15.c
- create mode 100644 c16.c
- create mode 100644 c17.c
- create mode 100644 c18.c
- create mode 100644 c19.c
- create mode 100644 c2.c
- create mode 100644 c20.c
- create mode 100644 c21.c
- create mode 100644 c22.c
- create mode 100644 c23.c
- create mode 100644 c24.c
- create mode 100644 c25.c
- create mode 100644 c26.c
- create mode 100644 c27.c
- create mode 100644 c28.c
- create mode 100644 c29.c
- create mode 100644 c3.c
- create mode 100644 c30.c
- create mode 100644 c4.c
- create mode 100644 c5.c
- create mode 100644 c6.c
- create mode 100644 c7.c
- create mode 100644 c8.c
- create mode 100644 c9.c
-ok 2 - merge c1 with c2, c3, c4, ... c29
-
-expecting success of 7602.3 'merge output uses pretty names': 
-	git reset --hard c1 &&
-	git merge c2 c3 c4 >actual &&
-	test_cmp expected actual
-
-HEAD is now at 429abf0 c1
-ok 3 - merge output uses pretty names
-
-expecting success of 7602.4 'merge reduces irrelevant remote heads': 
-	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
-	then
-		mv expected expected.tmp &&
-		sed s/recursive/ort/ expected.tmp >expected &&
-		rm expected.tmp
-	fi &&
-	GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
-	test_cmp expected actual
-
-ok 4 - merge reduces irrelevant remote heads
-
-expecting success of 7602.5 'merge fast-forward output uses pretty names': 
-	git reset --hard c0 &&
-	git merge c1 c2 >actual &&
-	test_cmp expected actual
-
-HEAD is now at e4f5a3c c0
-ok 5 - merge fast-forward output uses pretty names
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7513-interpret-trailers.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7513-interpret-trailers/.git/
 expecting success of 7513.1 'setup': 
@@ -477661,262 +476920,6 @@
 1..96
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7604-merge-custom-message.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7604-merge-custom-message/.git/
-expecting success of 7604.1 'setup': 
-	echo c0 >c0.c &&
-	git add c0.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	echo c1 >c1.c &&
-	git add c1.c &&
-	git commit -m c1 &&
-	git tag c1 &&
-	git reset --hard c0 &&
-	echo c2 >c2.c &&
-	git add c2.c &&
-	git commit -m c2 &&
-	git tag c2 &&
-	create_merge_msgs
-
-[master (root-commit) e4f5a3c] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 429abf0] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at e4f5a3c c0
-[master 028ea41] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 1 - setup
-
-expecting success of 7604.2 'merge c2 with a custom message': 
-	git reset --hard c1 &&
-	git merge -m "$(cat exp.subject)" c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp exp.subject actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 2 - merge c2 with a custom message
-
-expecting success of 7604.3 'merge --log appends to custom message': 
-	git reset --hard c1 &&
-	git merge --log -m "$(cat exp.subject)" c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp exp.log actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 3 - merge --log appends to custom message
-
-expecting success of 7604.4 'prepare file with comment line and trailing newlines': 
-	printf "%s" "$mesg_with_comment_and_newlines" >expect
-
-ok 4 - prepare file with comment line and trailing newlines
-
-expecting success of 7604.5 'cleanup commit messages (verbatim option)': 
-	git reset --hard c1 &&
-	git merge --cleanup=verbatim -F expect c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 5 - cleanup commit messages (verbatim option)
-
-expecting success of 7604.6 'cleanup commit messages (whitespace option)': 
-	git reset --hard c1 &&
-	test_write_lines "" "# text" "" >text &&
-	echo "# text" >expect &&
-	git merge --cleanup=whitespace -F text c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 6 - cleanup commit messages (whitespace option)
-
-expecting success of 7604.7 'cleanup merge messages (scissors option)': 
-	git reset --hard c1 &&
-	cat >text <<-\EOF &&
-
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	# ------------------------ >8 ------------------------
-	to be removed
-	# ------------------------ >8 ------------------------
-	to be removed, too
-	EOF
-
-	cat >expect <<-\EOF &&
-	# to be kept
-
-	  # ------------------------ >8 ------------------------
-	# to be kept, too
-	EOF
-	git merge --cleanup=scissors -e -F text c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 7 - cleanup merge messages (scissors option)
-
-expecting success of 7604.8 'cleanup commit messages (strip option)': 
-	git reset --hard c1 &&
-	test_write_lines "" "# text" "sample" "" >text &&
-	echo sample >expect &&
-	git merge --cleanup=strip -F text c2 &&
-	git cat-file commit HEAD >raw &&
-	sed -e "1,/^$/d" raw >actual &&
-	test_cmp expect actual
-
-HEAD is now at 429abf0 c1
-Merge made by the 'ort' strategy.
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 8 - cleanup commit messages (strip option)
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7605-merge-resolve.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7605-merge-resolve/.git/
-expecting success of 7605.1 'setup': 
-	echo c0 > c0.c &&
-	git add c0.c &&
-	git commit -m c0 &&
-	git tag c0 &&
-	echo c1 > c1.c &&
-	git add c1.c &&
-	git commit -m c1 &&
-	git tag c1 &&
-	git reset --hard c0 &&
-	echo c2 > c2.c &&
-	git add c2.c &&
-	git commit -m c2 &&
-	git tag c2 &&
-	git reset --hard c0 &&
-	echo c3 > c2.c &&
-	git add c2.c &&
-	git commit -m c3 &&
-	git tag c3
-
-[master (root-commit) e4f5a3c] c0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c0.c
-[master 429abf0] c1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c1.c
-HEAD is now at e4f5a3c c0
-[master 028ea41] c2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-HEAD is now at e4f5a3c c0
-[master c984a5f] c3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 1 - setup
-
-expecting success of 7605.2 'merge c1 to c2': 
-	git reset --hard c1 &&
-	git merge -s resolve c2 &&
-	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
-	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
-	git diff --exit-code &&
-	test -f c0.c &&
-	test -f c1.c &&
-	test -f c2.c &&
-	test 3 = $(git ls-tree -r HEAD | wc -l) &&
-	test 3 = $(git ls-files | wc -l)
-
-HEAD is now at 429abf0 c1
-Trying really trivial in-index merge...
-Wonderful.
-In-index merge
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 2 - merge c1 to c2
-
-expecting success of 7605.3 'merge c1 to c2, again': 
-	git reset --hard c1 &&
-	git merge -s resolve c2 &&
-	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
-	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
-	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
-	git diff --exit-code &&
-	test -f c0.c &&
-	test -f c1.c &&
-	test -f c2.c &&
-	test 3 = $(git ls-tree -r HEAD | wc -l) &&
-	test 3 = $(git ls-files | wc -l)
-
-HEAD is now at 429abf0 c1
-Trying really trivial in-index merge...
-Wonderful.
-In-index merge
- c2.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c2.c
-ok 3 - merge c1 to c2, again
-
-expecting success of 7605.4 'merge c2 to c3 (fails)': 
-	git reset --hard c2 &&
-	test_must_fail git merge -s resolve c3
-
-HEAD is now at 028ea41 c2
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Added c2.c in both, but differently.
-fatal: unable to read blob object e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-error: Could not stat : No such file or directory
-ERROR: content conflict in c2.c
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 4 - merge c2 to c3 (fails)
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7603-merge-reduce-heads.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7603-merge-reduce-heads/.git/
 expecting success of 7603.1 'setup': 
@@ -478240,6 +477243,634 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7602-merge-octopus-many.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7602-merge-octopus-many/.git/
+expecting success of 7602.1 'setup': 
+	echo c0 > c0.c &&
+	git add c0.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	i=1 &&
+	while test $i -le 30
+	do
+		git reset --hard c0 &&
+		echo c$i > c$i.c &&
+		git add c$i.c &&
+		git commit -m c$i &&
+		git tag c$i &&
+		i=$(expr $i + 1) || return 1
+	done
+
+[master (root-commit) e4f5a3c] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+HEAD is now at e4f5a3c c0
+[master 429abf0] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at e4f5a3c c0
+[master 028ea41] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at e4f5a3c c0
+[master c0f42ec] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c3.c
+HEAD is now at e4f5a3c c0
+[master b7e05d5] c4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.c
+HEAD is now at e4f5a3c c0
+[master c488b09] c5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c5.c
+HEAD is now at e4f5a3c c0
+[master ec4097b] c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c6.c
+HEAD is now at e4f5a3c c0
+[master 0ce0f8d] c7
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c7.c
+HEAD is now at e4f5a3c c0
+[master ff3d47c] c8
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c8.c
+HEAD is now at e4f5a3c c0
+[master 7461614] c9
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c9.c
+HEAD is now at e4f5a3c c0
+[master 1afdb59] c10
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c10.c
+HEAD is now at e4f5a3c c0
+[master 0afbd17] c11
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c11.c
+HEAD is now at e4f5a3c c0
+[master 15bc59a] c12
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c12.c
+HEAD is now at e4f5a3c c0
+[master f06f676] c13
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c13.c
+HEAD is now at e4f5a3c c0
+[master a776bd6] c14
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c14.c
+HEAD is now at e4f5a3c c0
+[master 0d31625] c15
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c15.c
+HEAD is now at e4f5a3c c0
+[master 51ac193] c16
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c16.c
+HEAD is now at e4f5a3c c0
+[master 60d6a53] c17
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c17.c
+HEAD is now at e4f5a3c c0
+[master 3ce5753] c18
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c18.c
+HEAD is now at e4f5a3c c0
+[master 7a37c76] c19
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c19.c
+HEAD is now at e4f5a3c c0
+[master 4125031] c20
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c20.c
+HEAD is now at e4f5a3c c0
+[master f295446] c21
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c21.c
+HEAD is now at e4f5a3c c0
+[master aefb514] c22
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c22.c
+HEAD is now at e4f5a3c c0
+[master 6d1037c] c23
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c23.c
+HEAD is now at e4f5a3c c0
+[master 43701ce] c24
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c24.c
+HEAD is now at e4f5a3c c0
+[master 19740f9] c25
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c25.c
+HEAD is now at e4f5a3c c0
+[master bef4659] c26
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c26.c
+HEAD is now at e4f5a3c c0
+[master 5d3dacb] c27
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c27.c
+HEAD is now at e4f5a3c c0
+[master e1b2fdb] c28
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c28.c
+HEAD is now at e4f5a3c c0
+[master 2088804] c29
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c29.c
+HEAD is now at e4f5a3c c0
+[master fb57d80] c30
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c30.c
+ok 1 - setup
+
+expecting success of 7602.2 'merge c1 with c2, c3, c4, ... c29': 
+	git reset --hard c1 &&
+	i=2 &&
+	refs="" &&
+	while test $i -le 30
+	do
+		refs="$refs c$i" &&
+		i=$(expr $i + 1) || return 1
+	done &&
+	git merge $refs &&
+	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
+	i=1 &&
+	while test $i -le 30
+	do
+		test "$(git rev-parse c$i)" = "$(git rev-parse HEAD^$i)" &&
+		i=$(expr $i + 1) || return 1
+	done &&
+	git diff --exit-code &&
+	i=1 &&
+	while test $i -le 30
+	do
+		test -f c$i.c &&
+		i=$(expr $i + 1) || return 1
+	done
+
+HEAD is now at 429abf0 c1
+Trying simple merge with c2
+Trying simple merge with c3
+Trying simple merge with c4
+Trying simple merge with c5
+Trying simple merge with c6
+Trying simple merge with c7
+Trying simple merge with c8
+Trying simple merge with c9
+Trying simple merge with c10
+Trying simple merge with c11
+Trying simple merge with c12
+Trying simple merge with c13
+Trying simple merge with c14
+Trying simple merge with c15
+Trying simple merge with c16
+Trying simple merge with c17
+Trying simple merge with c18
+Trying simple merge with c19
+Trying simple merge with c20
+Trying simple merge with c21
+Trying simple merge with c22
+Trying simple merge with c23
+Trying simple merge with c24
+Trying simple merge with c25
+Trying simple merge with c26
+Trying simple merge with c27
+Trying simple merge with c28
+Trying simple merge with c29
+Trying simple merge with c30
+Merge made by the 'octopus' strategy.
+ c10.c | 1 +
+ c11.c | 1 +
+ c12.c | 1 +
+ c13.c | 1 +
+ c14.c | 1 +
+ c15.c | 1 +
+ c16.c | 1 +
+ c17.c | 1 +
+ c18.c | 1 +
+ c19.c | 1 +
+ c2.c  | 1 +
+ c20.c | 1 +
+ c21.c | 1 +
+ c22.c | 1 +
+ c23.c | 1 +
+ c24.c | 1 +
+ c25.c | 1 +
+ c26.c | 1 +
+ c27.c | 1 +
+ c28.c | 1 +
+ c29.c | 1 +
+ c3.c  | 1 +
+ c30.c | 1 +
+ c4.c  | 1 +
+ c5.c  | 1 +
+ c6.c  | 1 +
+ c7.c  | 1 +
+ c8.c  | 1 +
+ c9.c  | 1 +
+ 29 files changed, 29 insertions(+)
+ create mode 100644 c10.c
+ create mode 100644 c11.c
+ create mode 100644 c12.c
+ create mode 100644 c13.c
+ create mode 100644 c14.c
+ create mode 100644 c15.c
+ create mode 100644 c16.c
+ create mode 100644 c17.c
+ create mode 100644 c18.c
+ create mode 100644 c19.c
+ create mode 100644 c2.c
+ create mode 100644 c20.c
+ create mode 100644 c21.c
+ create mode 100644 c22.c
+ create mode 100644 c23.c
+ create mode 100644 c24.c
+ create mode 100644 c25.c
+ create mode 100644 c26.c
+ create mode 100644 c27.c
+ create mode 100644 c28.c
+ create mode 100644 c29.c
+ create mode 100644 c3.c
+ create mode 100644 c30.c
+ create mode 100644 c4.c
+ create mode 100644 c5.c
+ create mode 100644 c6.c
+ create mode 100644 c7.c
+ create mode 100644 c8.c
+ create mode 100644 c9.c
+ok 2 - merge c1 with c2, c3, c4, ... c29
+
+expecting success of 7602.3 'merge output uses pretty names': 
+	git reset --hard c1 &&
+	git merge c2 c3 c4 >actual &&
+	test_cmp expected actual
+
+HEAD is now at 429abf0 c1
+ok 3 - merge output uses pretty names
+
+expecting success of 7602.4 'merge reduces irrelevant remote heads': 
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		mv expected expected.tmp &&
+		sed s/recursive/ort/ expected.tmp >expected &&
+		rm expected.tmp
+	fi &&
+	GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
+	test_cmp expected actual
+
+ok 4 - merge reduces irrelevant remote heads
+
+expecting success of 7602.5 'merge fast-forward output uses pretty names': 
+	git reset --hard c0 &&
+	git merge c1 c2 >actual &&
+	test_cmp expected actual
+
+HEAD is now at e4f5a3c c0
+ok 5 - merge fast-forward output uses pretty names
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7604-merge-custom-message.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7604-merge-custom-message/.git/
+expecting success of 7604.1 'setup': 
+	echo c0 >c0.c &&
+	git add c0.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	echo c1 >c1.c &&
+	git add c1.c &&
+	git commit -m c1 &&
+	git tag c1 &&
+	git reset --hard c0 &&
+	echo c2 >c2.c &&
+	git add c2.c &&
+	git commit -m c2 &&
+	git tag c2 &&
+	create_merge_msgs
+
+[master (root-commit) e4f5a3c] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 429abf0] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at e4f5a3c c0
+[master 028ea41] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 1 - setup
+
+expecting success of 7604.2 'merge c2 with a custom message': 
+	git reset --hard c1 &&
+	git merge -m "$(cat exp.subject)" c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp exp.subject actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 2 - merge c2 with a custom message
+
+expecting success of 7604.3 'merge --log appends to custom message': 
+	git reset --hard c1 &&
+	git merge --log -m "$(cat exp.subject)" c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp exp.log actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 3 - merge --log appends to custom message
+
+expecting success of 7604.4 'prepare file with comment line and trailing newlines': 
+	printf "%s" "$mesg_with_comment_and_newlines" >expect
+
+ok 4 - prepare file with comment line and trailing newlines
+
+expecting success of 7604.5 'cleanup commit messages (verbatim option)': 
+	git reset --hard c1 &&
+	git merge --cleanup=verbatim -F expect c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 5 - cleanup commit messages (verbatim option)
+
+expecting success of 7604.6 'cleanup commit messages (whitespace option)': 
+	git reset --hard c1 &&
+	test_write_lines "" "# text" "" >text &&
+	echo "# text" >expect &&
+	git merge --cleanup=whitespace -F text c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 6 - cleanup commit messages (whitespace option)
+
+expecting success of 7604.7 'cleanup merge messages (scissors option)': 
+	git reset --hard c1 &&
+	cat >text <<-\EOF &&
+
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	# ------------------------ >8 ------------------------
+	to be removed
+	# ------------------------ >8 ------------------------
+	to be removed, too
+	EOF
+
+	cat >expect <<-\EOF &&
+	# to be kept
+
+	  # ------------------------ >8 ------------------------
+	# to be kept, too
+	EOF
+	git merge --cleanup=scissors -e -F text c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 7 - cleanup merge messages (scissors option)
+
+expecting success of 7604.8 'cleanup commit messages (strip option)': 
+	git reset --hard c1 &&
+	test_write_lines "" "# text" "sample" "" >text &&
+	echo sample >expect &&
+	git merge --cleanup=strip -F text c2 &&
+	git cat-file commit HEAD >raw &&
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+
+HEAD is now at 429abf0 c1
+Merge made by the 'ort' strategy.
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 8 - cleanup commit messages (strip option)
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7605-merge-resolve.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7605-merge-resolve/.git/
+expecting success of 7605.1 'setup': 
+	echo c0 > c0.c &&
+	git add c0.c &&
+	git commit -m c0 &&
+	git tag c0 &&
+	echo c1 > c1.c &&
+	git add c1.c &&
+	git commit -m c1 &&
+	git tag c1 &&
+	git reset --hard c0 &&
+	echo c2 > c2.c &&
+	git add c2.c &&
+	git commit -m c2 &&
+	git tag c2 &&
+	git reset --hard c0 &&
+	echo c3 > c2.c &&
+	git add c2.c &&
+	git commit -m c3 &&
+	git tag c3
+
+[master (root-commit) e4f5a3c] c0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c0.c
+[master 429abf0] c1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c1.c
+HEAD is now at e4f5a3c c0
+[master 028ea41] c2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+HEAD is now at e4f5a3c c0
+[master c984a5f] c3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 1 - setup
+
+expecting success of 7605.2 'merge c1 to c2': 
+	git reset --hard c1 &&
+	git merge -s resolve c2 &&
+	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
+	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
+	git diff --exit-code &&
+	test -f c0.c &&
+	test -f c1.c &&
+	test -f c2.c &&
+	test 3 = $(git ls-tree -r HEAD | wc -l) &&
+	test 3 = $(git ls-files | wc -l)
+
+HEAD is now at 429abf0 c1
+Trying really trivial in-index merge...
+Wonderful.
+In-index merge
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 2 - merge c1 to c2
+
+expecting success of 7605.3 'merge c1 to c2, again': 
+	git reset --hard c1 &&
+	git merge -s resolve c2 &&
+	test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
+	test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
+	test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
+	git diff --exit-code &&
+	test -f c0.c &&
+	test -f c1.c &&
+	test -f c2.c &&
+	test 3 = $(git ls-tree -r HEAD | wc -l) &&
+	test 3 = $(git ls-files | wc -l)
+
+HEAD is now at 429abf0 c1
+Trying really trivial in-index merge...
+Wonderful.
+In-index merge
+ c2.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c2.c
+ok 3 - merge c1 to c2, again
+
+expecting success of 7605.4 'merge c2 to c3 (fails)': 
+	git reset --hard c2 &&
+	test_must_fail git merge -s resolve c3
+
+HEAD is now at 028ea41 c2
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Added c2.c in both, but differently.
+fatal: unable to read blob object e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+error: Could not stat : No such file or directory
+ERROR: content conflict in c2.c
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 4 - merge c2 to c3 (fails)
+
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7607-merge-state.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7606-merge-custom.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7606-merge-custom/.git/
 expecting success of 7606.1 'set up custom strategy': 
@@ -478314,8 +477945,8 @@
  c2.c | 1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
  create mode 100644 c2.c
---- head.old	2025-12-18 01:39:12.302773267 +0000
-+++ head.new	2025-12-18 01:39:12.374773267 +0000
+--- head.old	2024-11-14 19:44:28.934868518 +0000
++++ head.new	2024-11-14 19:44:29.034869546 +0000
 @@ -1 +1 @@
 -7b51d7cdbd54b8c470d864639e1136d88ce718ef
 +5127482d58f03334905cdbe3564c8d092aa56dbe
@@ -478354,8 +477985,8 @@
  2 files changed, 1 insertion(+), 1 deletion(-)
  delete mode 100644 c1.c
  create mode 100644 c3.c
---- head.old	2025-12-18 01:39:12.422773267 +0000
-+++ head.new	2025-12-18 01:39:12.494773267 +0000
+--- head.old	2024-11-14 19:44:29.254871808 +0000
++++ head.new	2024-11-14 19:44:29.350872795 +0000
 @@ -1 +1 @@
 -7b51d7cdbd54b8c470d864639e1136d88ce718ef
 +f5f2abda42595469639ae786a37808202e35dcf0
@@ -478365,83 +477996,6 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7607-merge-state.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7609-mergetool--lib.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7609-mergetool--lib/.git/
-expecting success of 7609.1 'mergetool --tool=vimdiff creates the expected layout': 
-	. "$GIT_BUILD_DIR"/mergetools/vimdiff &&
-	run_unit_tests
-
-Test Case #01: OK
-Test Case #02: OK
-Test Case #03: OK
-Test Case #04: OK
-Test Case #05: OK
-Test Case #06: OK
-Test Case #07: OK
-Test Case #08: OK
-Test Case #09: OK
-Test Case #10: OK
-Test Case #11: OK
-Test Case #12: OK
-Test Case #13: OK
-Test Case #14: OK
-Test Case #15: OK
-Test Case #16: OK
-ok 1 - mergetool --tool=vimdiff creates the expected layout
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7601-merge-pull-config.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7601-merge-pull-config/.git/
 expecting success of 7601.1 'setup': 
@@ -478734,744 +478288,2719 @@
 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
+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 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7608-merge-messages.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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) 8ad97f7] main-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-1.t
+Switched to a new branch 'local-branch'
+[local-branch 7bd44c4] branch-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch-1.t
+Switched to branch 'main'
+[main 9b0bdc1] main-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-2.t
+Merge made by the 'ort' strategy.
+ branch-1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 branch-1.t
+ok 1 - merge local branch
+
+expecting success of 7608.2 'merge octopus branches': 
+	git checkout -b octopus-a main &&
+	test_commit octopus-1 &&
+	git checkout -b octopus-b main &&
+	test_commit octopus-2 &&
+	git checkout main &&
+	git merge octopus-a octopus-b &&
+	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
+
+Switched to a new branch 'octopus-a'
+[octopus-a d4e293f] octopus-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 octopus-1.t
+Switched to a new branch 'octopus-b'
+[octopus-b fd085cf] octopus-2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 octopus-2.t
+Switched to branch 'main'
+Fast-forwarding to: octopus-a
+Trying simple merge with octopus-b
+Merge made by the 'octopus' strategy.
+ octopus-1.t | 1 +
+ octopus-2.t | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 octopus-1.t
+ create mode 100644 octopus-2.t
+ok 2 - merge octopus branches
+
+expecting success of 7608.3 'merge tag': 
+	git checkout -b tag-branch main &&
+	test_commit tag-1 &&
+	git checkout main &&
+	test_commit main-3 &&
+	git merge tag-1 &&
+	check_oneline "Merge tag Qtag-1Q"
+
+Switched to a new branch 'tag-branch'
+[tag-branch 6757378] tag-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tag-1.t
+Switched to branch 'main'
+[main a5de04f] main-3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-3.t
+Merge made by the 'ort' strategy.
+ tag-1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tag-1.t
+ok 3 - merge tag
+
+expecting success of 7608.4 'ambiguous tag': 
+	git checkout -b ambiguous main &&
+	test_commit ambiguous &&
+	git checkout main &&
+	test_commit main-4 &&
+	git merge ambiguous &&
+	check_oneline "Merge tag QambiguousQ"
+
+Switched to a new branch 'ambiguous'
+[ambiguous ab5df7f] ambiguous
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ambiguous.t
+Switched to branch 'main'
+[main f5d97b7] main-4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-4.t
+warning: refname 'ambiguous' is ambiguous.
+warning: refname 'ambiguous' is ambiguous.
+Merge made by the 'ort' strategy.
+ ambiguous.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ambiguous.t
+ok 4 - ambiguous tag
+
+expecting success of 7608.5 'remote-tracking branch': 
+	git checkout -b remote main &&
+	test_commit remote-1 &&
+	git update-ref refs/remotes/origin/main remote &&
+	git checkout main &&
+	test_commit main-5 &&
+	git merge origin/main &&
+	check_oneline "Merge remote-tracking branch Qorigin/mainQ"
+
+Switched to a new branch 'remote'
+[remote 52036b0] remote-1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 remote-1.t
+Switched to branch 'main'
+[main 25894a3] main-5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 main-5.t
+Merge made by the 'ort' strategy.
+ remote-1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 remote-1.t
+ok 5 - remote-tracking branch
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7508-status.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/.git/
+expecting success of 7508.1 'status -h in broken repository': 
+	git config --global advice.statusuoption false &&
+	mkdir broken &&
+	test_when_finished "rm -fr broken" &&
+	(
+		cd broken &&
+		git init &&
+		echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
+		test_expect_code 129 git status -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage" broken/usage
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/broken/.git/
+usage: git status [<options>] [--] [<pathspec>...]
+ok 1 - status -h in broken repository
+
+expecting success of 7508.2 'commit -h in broken repository': 
+	mkdir broken &&
+	test_when_finished "rm -fr broken" &&
+	(
+		cd broken &&
+		git init &&
+		echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
+		test_expect_code 129 git commit -h >usage 2>&1
+	) &&
+	test_grep "[Uu]sage" broken/usage
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/broken/.git/
+usage: git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
+ok 2 - commit -h in broken repository
+
+expecting success of 7508.3 'create upstream branch': 
+	git checkout -b upstream &&
+	test_commit upstream1 &&
+	test_commit upstream2 &&
+	# leave the first commit on main as root because several
+	# tests depend on this case; for our upstream we only
+	# care about commit counts anyway, so a totally divergent
+	# history is OK
+	git checkout --orphan main
+
+Switched to a new branch 'upstream'
+[upstream (root-commit) 8d383b3] upstream1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream1.t
+[upstream 726fd3a] upstream2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 upstream2.t
+Switched to a new branch 'main'
+ok 3 - create upstream branch
+
+expecting success of 7508.4 'setup': 
+	: >tracked &&
+	: >modified &&
+	mkdir dir1 &&
+	: >dir1/tracked &&
+	: >dir1/modified &&
+	mkdir dir2 &&
+	: >dir1/tracked &&
+	: >dir1/modified &&
+	git add . &&
+
+	git status >output &&
+
+	test_tick &&
+	git commit -m initial &&
+	: >untracked &&
+	: >dir1/untracked &&
+	: >dir2/untracked &&
+	echo 1 >dir1/modified &&
+	echo 2 >dir2/modified &&
+	echo 3 >dir2/added &&
+	git add dir2/added &&
+
+	git branch --set-upstream-to=upstream
+
+[main (root-commit) 5b37b0a] initial
+ Author: A U Thor <author@example.com>
+ 7 files changed, 4 insertions(+)
+ create mode 100644 .gitconfig
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 modified
+ create mode 100644 tracked
+ create mode 100644 upstream1.t
+ create mode 100644 upstream2.t
+branch 'main' set up to track 'upstream'.
+ok 4 - setup
+
+expecting success of 7508.5 'status (1)': 
+	test_grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
+
+  (use "git rm --cached <file>..." to unstage)
+ok 5 - status (1)
+
+expecting success of 7508.6 'status --column': 
+	cat >expect <<\EOF &&
+# On branch main
+# Your branch and 'upstream' have diverged,
+# and have 1 and 2 different commits each, respectively.
+#   (use "git pull" if you want to integrate the remote branch with yours)
+#
+# Changes to be committed:
+#   (use "git restore --staged <file>..." to unstage)
+#	new file:   dir2/added
+#
+# Changes not staged for commit:
+#   (use "git add <file>..." to update what will be committed)
+#   (use "git restore <file>..." to discard changes in working directory)
+#	modified:   dir1/modified
+#
+# Untracked files:
+#   (use "git add <file>..." to include in what will be committed)
+#	dir1/untracked dir2/untracked
+#	dir2/modified  untracked
+#
+EOF
+	COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
+	test_cmp expect output
+
+ok 6 - status --column
+
+expecting success of 7508.7 'status --column status.displayCommentPrefix=false': 
+	strip_comments expect &&
+	COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
+	test_cmp expect output
+
+ok 7 - status --column status.displayCommentPrefix=false
+
+expecting success of 7508.8 'status with status.displayCommentPrefix=true': 
+	git -c status.displayCommentPrefix=true status >output &&
+	test_cmp expect output
+
+ok 8 - status with status.displayCommentPrefix=true
+
+expecting success of 7508.9 'status with status.displayCommentPrefix=false': 
+	strip_comments expect &&
+	git -c status.displayCommentPrefix=false status >output &&
+	test_cmp expect output
+
+ok 9 - status with status.displayCommentPrefix=false
+
+expecting success of 7508.10 'status -v': 
+	(cat expect && git diff --cached) >expect-with-v &&
+	git status -v >output &&
+	test_cmp expect-with-v output
+
+ok 10 - status -v
+
+expecting success of 7508.11 'status -v -v': 
+	(cat expect &&
+	 echo "Changes to be committed:" &&
+	 git -c diff.mnemonicprefix=true diff --cached &&
+	 echo "--------------------------------------------------" &&
+	 echo "Changes not staged for commit:" &&
+	 git -c diff.mnemonicprefix=true diff) >expect-with-v &&
+	git status -v -v >output &&
+	test_cmp expect-with-v output
+
+ok 11 - status -v -v
+
+expecting success of 7508.12 'setup fake editor': 
+	cat >.git/editor <<-\EOF &&
+	#! /bin/sh
+	cp "$1" output
+EOF
+	chmod 755 .git/editor
+
+ok 12 - setup fake editor
+
+expecting success of 7508.13 'commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG': 
+	commit_template_commented
+
+Aborting commit due to empty commit message.
+ok 13 - commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG
+
+expecting success of 7508.14 'status (advice.statusHints false)': 
+	test_config advice.statusHints false &&
+	git status >output &&
+	test_cmp expect output
+
+
+ok 14 - status (advice.statusHints false)
+
+expecting success of 7508.15 'status -s': 
+
+	git status -s >output &&
+	test_cmp expect output
+
+
+ok 15 - status -s
+
+expecting success of 7508.16 'status with gitignore': 
+	{
+		echo ".gitignore" &&
+		echo "expect*" &&
+		echo "output" &&
+		echo "untracked"
+	} >.gitignore &&
+
+	cat >expect <<-\EOF &&
+	 M dir1/modified
+	A  dir2/added
+	?? dir2/modified
+	EOF
+	git status -s >output &&
+	test_cmp expect output &&
+
+	cat >expect <<-\EOF &&
+	 M dir1/modified
+	A  dir2/added
+	?? dir2/modified
+	!! .gitignore
+	!! dir1/untracked
+	!! dir2/untracked
+	!! expect
+	!! expect-with-v
+	!! output
+	!! untracked
+	EOF
+	git status -s --ignored >output &&
+	test_cmp expect output &&
+
+	cat >expect <<\EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir2/modified
+
+Ignored files:
+  (use "git add -f <file>..." to include in what will be committed)
+	.gitignore
+	dir1/untracked
+	dir2/untracked
+	expect
+	expect-with-v
+	output
+	untracked
+
+EOF
+	git status --ignored >output &&
+	test_cmp expect output
+
+ok 16 - status with gitignore
+
+expecting success of 7508.17 'status with gitignore (nothing untracked)': 
+	{
+		echo ".gitignore" &&
+		echo "expect*" &&
+		echo "dir2/modified" &&
+		echo "output" &&
+		echo "untracked"
+	} >.gitignore &&
+
+	cat >expect <<-\EOF &&
+	 M dir1/modified
+	A  dir2/added
+	EOF
+	git status -s >output &&
+	test_cmp expect output &&
+
+	cat >expect <<-\EOF &&
+	 M dir1/modified
+	A  dir2/added
+	!! .gitignore
+	!! dir1/untracked
+	!! dir2/modified
+	!! dir2/untracked
+	!! expect
+	!! expect-with-v
+	!! output
+	!! untracked
+	EOF
+	git status -s --ignored >output &&
+	test_cmp expect output &&
+
+	cat >expect <<\EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Ignored files:
+  (use "git add -f <file>..." to include in what will be committed)
+	.gitignore
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	expect
+	expect-with-v
+	output
+	untracked
+
+EOF
+	git status --ignored >output &&
+	test_cmp expect output
+
+ok 17 - status with gitignore (nothing untracked)
+
+expecting success of 7508.18 'status -s -b': 
+
+	git status -s -b >output &&
+	test_cmp expect output
+
+
+ok 18 - status -s -b
+
+expecting success of 7508.19 'status -s -z -b': 
+	tr "\\n" Q <expect >expect.q &&
+	mv expect.q expect &&
+	git status -s -z -b >output &&
+	nul_to_q <output >output.q &&
+	mv output.q output &&
+	test_cmp expect output
+
+ok 19 - status -s -z -b
+
+expecting success of 7508.20 'setup dir3': 
+	mkdir dir3 &&
+	: >dir3/untracked1 &&
+	: >dir3/untracked2
+
+ok 20 - setup dir3
+
+expecting success of 7508.21 'status -uno': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files not listed (use -u option to show untracked files)
+EOF
+	git status -uno >output &&
+	test_cmp expect output &&
+	git status -ufalse >output &&
+	test_cmp expect output
+
+ok 21 - status -uno
+
+expecting success of 7508.22 'status (status.showUntrackedFiles no)': 
+		test_config status.showuntrackedfiles "$no" &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 22 - status (status.showUntrackedFiles no)
+
+expecting success of 7508.23 'status (status.showUntrackedFiles false)': 
+		test_config status.showuntrackedfiles "$no" &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 23 - status (status.showUntrackedFiles false)
+
+expecting success of 7508.24 'status (status.showUntrackedFiles 0)': 
+		test_config status.showuntrackedfiles "$no" &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 24 - status (status.showUntrackedFiles 0)
+
+expecting success of 7508.25 'status -uno (advice.statusHints false)': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+
+Changes to be committed:
+	new file:   dir2/added
+
+Changes not staged for commit:
+	modified:   dir1/modified
+
+Untracked files not listed
+EOF
+	test_config advice.statusHints false &&
+	git status -uno >output &&
+	test_cmp expect output
+
+ok 25 - status -uno (advice.statusHints false)
+
+expecting success of 7508.26 'status -s -uno': 
+	git status -s -uno >output &&
+	test_cmp expect output
+
+ok 26 - status -s -uno
+
+expecting success of 7508.27 'status -s (status.showUntrackedFiles no)': 
+	git config status.showuntrackedfiles no &&
+	git status -s >output &&
+	test_cmp expect output
+
+ok 27 - status -s (status.showUntrackedFiles no)
+
+expecting success of 7508.28 'status -unormal': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	dir3/
+	untracked
+
+EOF
+	git status -unormal >output &&
+	test_cmp expect output &&
+	git status -utrue >output &&
+	test_cmp expect output &&
+	git status -uyes >output &&
+	test_cmp expect output
+
+ok 28 - status -unormal
+
+expecting success of 7508.29 'status (status.showUntrackedFiles normal)': 
+		test_config status.showuntrackedfiles $normal &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 29 - status (status.showUntrackedFiles normal)
+
+expecting success of 7508.30 'status (status.showUntrackedFiles true)': 
+		test_config status.showuntrackedfiles $normal &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 30 - status (status.showUntrackedFiles true)
+
+expecting success of 7508.31 'status (status.showUntrackedFiles 1)': 
+		test_config status.showuntrackedfiles $normal &&
+		git status >output &&
+		test_cmp expect output
+	
+ok 31 - status (status.showUntrackedFiles 1)
+
+expecting success of 7508.32 'status -s -unormal': 
+	git status -s -unormal >output &&
+	test_cmp expect output
+
+ok 32 - status -s -unormal
+
+expecting success of 7508.33 'status -s (status.showUntrackedFiles normal)': 
+	git config status.showuntrackedfiles normal &&
+	git status -s >output &&
+	test_cmp expect output
+
+ok 33 - status -s (status.showUntrackedFiles normal)
+
+expecting success of 7508.34 'status -uall': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	dir3/untracked1
+	dir3/untracked2
+	untracked
+
+EOF
+	git status -uall >output &&
+	test_cmp expect output
+
+ok 34 - status -uall
+
+expecting success of 7508.35 'status (status.showUntrackedFiles all)': 
+	test_config status.showuntrackedfiles all &&
+	git status >output &&
+	test_cmp expect output
+
+ok 35 - status (status.showUntrackedFiles all)
+
+expecting success of 7508.36 'teardown dir3': 
+	rm -rf dir3
+
+ok 36 - teardown dir3
+
+expecting success of 7508.37 'status -s -uall': 
+	test_unconfig status.showuntrackedfiles &&
+	git status -s -uall >output &&
+	test_cmp expect output
+
+ok 37 - status -s -uall
+
+expecting success of 7508.38 'status -s (status.showUntrackedFiles all)': 
+	test_config status.showuntrackedfiles all &&
+	git status -s >output &&
+	rm -rf dir3 &&
+	test_cmp expect output
+
+ok 38 - status -s (status.showUntrackedFiles all)
+
+expecting success of 7508.39 'status with relative paths': 
+	cat >expect <<\EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   ../dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	untracked
+	../dir2/modified
+	../dir2/untracked
+	../untracked
+
+EOF
+	(cd dir1 && git status) >output &&
+	test_cmp expect output
+
+ok 39 - status with relative paths
+
+expecting success of 7508.40 'status -s with relative paths': 
+
+	(cd dir1 && git status -s) >output &&
+	test_cmp expect output
+
+
+ok 40 - status -s with relative paths
+
+expecting success of 7508.41 'status --porcelain ignores relative paths setting': 
+
+	(cd dir1 && git status --porcelain) >output &&
+	test_cmp expect output
+
+
+ok 41 - status --porcelain ignores relative paths setting
+
+expecting success of 7508.42 'setup unique colors': 
+
+	git config status.color.untracked blue &&
+	git config status.color.branch green &&
+	git config status.color.localBranch yellow &&
+	git config status.color.remoteBranch cyan
+
+
+ok 42 - setup unique colors
+
+checking prerequisite: TTY
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-TTY" &&
+	test_have_prereq PERL &&
+
+	# Reading from the pty master seems to get stuck _sometimes_
+	# on Mac OS X 10.5.0, using Perl 5.10.0 or 5.8.9.
+	#
+	# Reproduction recipe: run
+	#
+	#	i=0
+	#	while ./test-terminal.perl echo hi $i
+	#	do
+	#		: $((i = $i + 1))
+	#	done
+	#
+	# After 2000 iterations or so it hangs.
+	# https://rt.cpan.org/Ticket/Display.html?id=65692
+	#
+	test "$(uname -s)" != Darwin &&
+
+	perl "$TEST_DIRECTORY"/test-terminal.perl \
+		sh -c "test -t 1 && test -t 2"
+
+)
+prerequisite TTY ok
+expecting success of 7508.43 'status with color.ui': 
+	cat >expect <<\EOF &&
+On branch <GREEN>main<RESET>
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	<GREEN>new file:   dir2/added<RESET>
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	<RED>modified:   dir1/modified<RESET>
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	<BLUE>dir1/untracked<RESET>
+	<BLUE>dir2/modified<RESET>
+	<BLUE>dir2/untracked<RESET>
+	<BLUE>untracked<RESET>
+
+EOF
+	test_config color.ui auto &&
+	test_terminal git status | test_decode_color >output &&
+	test_cmp expect output
+
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
+ok 43 - status with color.ui
+
+expecting success of 7508.44 'status with color.status': 
+	test_config color.status auto &&
+	test_terminal git status | test_decode_color >output &&
+	test_cmp expect output
+
+ok 44 - status with color.status
+
+expecting success of 7508.45 'status -s with color.ui': 
+
+	git config color.ui auto &&
+	test_terminal git status -s | test_decode_color >output &&
+	test_cmp expect output
+
+
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
+ok 45 - status -s with color.ui
+
+expecting success of 7508.46 'status -s with color.status': 
+
+	git config --unset color.ui &&
+	git config color.status auto &&
+	test_terminal git status -s | test_decode_color >output &&
+	test_cmp expect output
+
+
+ok 46 - status -s with color.status
+
+expecting success of 7508.47 'status -s -b with color.status': 
+
+	test_terminal git status -s -b | test_decode_color >output &&
+	test_cmp expect output
+
+
+ok 47 - status -s -b with color.status
+
+expecting success of 7508.48 'status --porcelain ignores color.ui': 
+
+	git config --unset color.status &&
+	git config color.ui auto &&
+	test_terminal git status --porcelain | test_decode_color >output &&
+	test_cmp expect output
+
+
+ok 48 - status --porcelain ignores color.ui
+
+expecting success of 7508.49 'status --porcelain ignores color.status': 
+
+	git config --unset color.ui &&
+	git config color.status auto &&
+	test_terminal git status --porcelain | test_decode_color >output &&
+	test_cmp expect output
+
+
+ok 49 - status --porcelain ignores color.status
+
+expecting success of 7508.50 'status --porcelain respects -b': 
+
+	git status --porcelain -b >output &&
+	{
+		echo "## main...upstream [ahead 1, behind 2]" &&
+		cat expect
+	} >tmp &&
+	mv tmp expect &&
+	test_cmp expect output
+
+
+ok 50 - status --porcelain respects -b
+
+expecting success of 7508.51 'status without relative paths': 
+	cat >expect <<\EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+EOF
+	test_config status.relativePaths false &&
+	(cd dir1 && git status) >output &&
+	test_cmp expect output
+
+
+ok 51 - status without relative paths
+
+expecting success of 7508.52 'status -s without relative paths': 
+
+	test_config status.relativePaths false &&
+	(cd dir1 && git status -s) >output &&
+	test_cmp expect output
+
+
+ok 52 - status -s without relative paths
+
+expecting success of 7508.53 'status -s without relative paths': 
+	test_when_finished "git rm --cached \"file with spaces\"; rm -f file*" &&
+	>"file with spaces" &&
+	>"file with spaces 2" &&
+	>"expect with spaces" &&
+	git add "file with spaces" &&
+
+	git status -s >output &&
+	test_cmp expect output &&
+
+	git status -s --ignored >output &&
+	grep "^!! \"expect with spaces\"$" output &&
+	grep -v "^!! " output >output-wo-ignored &&
+	test_cmp expect output-wo-ignored
+
+!! "expect with spaces"
+rm 'file with spaces'
+ok 53 - status -s without relative paths
+
+expecting success of 7508.54 'dry-run of partial commit excluding new file in index': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/
+	untracked
+
+EOF
+	git commit --dry-run dir1/modified >output &&
+	test_cmp expect output
+
+ok 54 - dry-run of partial commit excluding new file in index
+
+expecting success of 7508.55 'status refreshes the index': 
+	touch dir2/added &&
+	git status &&
+	git diff-files >output &&
+	test_cmp expect output
+
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+ok 55 - status refreshes the index
+
+expecting success of 7508.56 'status shows detached HEAD properly after checking out non-local upstream branch': 
+	test_when_finished rm -rf upstream downstream actual &&
+
+	test_create_repo upstream &&
+	test_commit -C upstream foo &&
+
+	git clone upstream downstream &&
+	git -C downstream checkout @{u} &&
+	git -C downstream status >actual &&
+	grep -E "HEAD detached at [0-9a-f]+" actual
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/upstream/.git/
+[master (root-commit) f80cabb] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+Cloning into 'downstream'...
+done.
+Note: switching to '@{u}'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at f80cabb foo
+HEAD detached at f80cabb
+ok 56 - status shows detached HEAD properly after checking out non-local upstream branch
+
+expecting success of 7508.57 'setup status submodule summary': 
+	test_create_repo sm && (
+		cd sm &&
+		>foo &&
+		git add foo &&
+		git commit -m "Add foo"
+	) &&
+	git add sm
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/sm/.git/
+[master (root-commit) a2af2f1] Add foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 foo
+warning: adding embedded git repository: sm
+hint: You've added another git repository inside your current repository.
+hint: Clones of the outer repository will not contain the contents of
+hint: the embedded repository and will not know how to obtain it.
+hint: If you meant to add a submodule, use:
+hint:
+hint: 	git submodule add <url> sm
+hint:
+hint: If you added this path by mistake, you can remove it from the
+hint: index with:
+hint:
+hint: 	git rm --cached sm
+hint:
+hint: See "git help submodule" for more information.
+hint: Disable this message with "git config advice.addEmbeddedRepo false"
+ok 57 - setup status submodule summary
+
+expecting success of 7508.58 'status submodule summary is disabled by default': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+	new file:   sm
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+EOF
+	git status >output &&
+	test_cmp expect output
+
+ok 58 - status submodule summary is disabled by default
+
+expecting success of 7508.59 'status --untracked-files=all does not show submodule': 
+	git status --untracked-files=all >output &&
+	test_cmp expect output
+
+ok 59 - status --untracked-files=all does not show submodule
+
+expecting success of 7508.60 'status -s submodule summary is disabled by default': 
+	git status -s >output &&
+	test_cmp expect output
+
+ok 60 - status -s submodule summary is disabled by default
+
+expecting success of 7508.61 'status -s --untracked-files=all does not show submodule': 
+	git status -s --untracked-files=all >output &&
+	test_cmp expect output
+
+ok 61 - status -s --untracked-files=all does not show submodule
+
+expecting success of 7508.62 'status submodule summary': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 1 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   dir2/added
+	new file:   sm
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Submodule changes to be committed:
+
+* sm 0000000...$head (1):
+  > Add foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+EOF
+	git config status.submodulesummary 10 &&
+	git status >output &&
+	test_cmp expect output
+
+ok 62 - status submodule summary
+
+expecting success of 7508.63 'status submodule summary with status.displayCommentPrefix=false': 
+	strip_comments expect &&
+	git -c status.displayCommentPrefix=false status >output &&
+	test_cmp expect output
+
+ok 63 - status submodule summary with status.displayCommentPrefix=false
+
+expecting success of 7508.64 'commit with submodule summary ignores status.displayCommentPrefix': 
+	commit_template_commented
+
+Aborting commit due to empty commit message.
+ok 64 - commit with submodule summary ignores status.displayCommentPrefix
+
+expecting success of 7508.65 'status -s submodule summary': 
+	git status -s >output &&
+	test_cmp expect output
+
+ok 65 - status -s submodule summary
+
+expecting success of 7508.66 'status submodule summary (clean submodule): commit': 
+	cat >expect-status <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	sed "/git pull/d" expect-status > expect-commit &&
+	git commit -m "commit submodule" &&
+	git config status.submodulesummary 10 &&
+	test_must_fail git commit --dry-run >output &&
+	test_cmp expect-commit output &&
+	git status >output &&
+	test_cmp expect-status output
+
+[main 49f874e] commit submodule
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 dir2/added
+ create mode 160000 sm
+ok 66 - status submodule summary (clean submodule): commit
+
+expecting success of 7508.67 'status -s submodule summary (clean submodule)': 
+	git status -s >output &&
+	test_cmp expect output
+
+ok 67 - status -s submodule summary (clean submodule)
+
+expecting success of 7508.68 'status -z implies porcelain': 
+	git status --porcelain |
+	perl -pe "s/\012/\000/g" >expect &&
+	git status -z >output &&
+	test_cmp expect output
+
+ok 68 - status -z implies porcelain
+
+expecting success of 7508.69 'commit --dry-run submodule summary (--amend)': 
+	cat >expect <<EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+
+Changes to be committed:
+  (use "git restore --source=HEAD^1 --staged <file>..." to unstage)
+	new file:   dir2/added
+	new file:   sm
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Submodule changes to be committed:
+
+* sm 0000000...$head (1):
+  > Add foo
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+EOF
+	git config status.submodulesummary 10 &&
+	git commit --dry-run --amend >output &&
+	test_cmp expect output
+
+ok 69 - commit --dry-run submodule summary (--amend)
+
+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 7508.70 'status succeeds in a read-only repository': 
+	test_when_finished "chmod 775 .git" &&
+	(
+		chmod a-w .git &&
+		# make dir1/tracked stat-dirty
+		>dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked &&
+		git status -s >output &&
+		! grep dir1/tracked output &&
+		# make sure "status" succeeded without writing index out
+		git diff-files | grep dir1/tracked
+	)
+
+:100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M	dir1/tracked
+ok 70 - status succeeds in a read-only repository
+
+expecting success of 7508.71 '--ignore-submodules=untracked suppresses submodules with untracked content': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Submodule changes to be committed:
+
+* sm $head...$new_head (1):
+  > Add bar
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+EOF
+	echo modified  sm/untracked &&
+	git status --ignore-submodules=untracked >output &&
+	test_cmp expect output
+
+modified sm/untracked
+ok 71 - --ignore-submodules=untracked suppresses submodules with untracked content
+
+expecting success of 7508.72 '.gitmodules ignore=untracked suppresses submodules with untracked content': 
+	test_config diff.ignoreSubmodules dirty &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --add -f .gitmodules submodule.subname.ignore untracked &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 72 - .gitmodules ignore=untracked suppresses submodules with untracked content
+
+expecting success of 7508.73 '.git/config ignore=untracked suppresses submodules with untracked content': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore untracked &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config --remove-section -f .gitmodules submodule.subname
+
+ok 73 - .git/config ignore=untracked suppresses submodules with untracked content
+
+expecting success of 7508.74 '--ignore-submodules=dirty suppresses submodules with untracked content': 
+	git status --ignore-submodules=dirty >output &&
+	test_cmp expect output
+
+ok 74 - --ignore-submodules=dirty suppresses submodules with untracked content
+
+expecting success of 7508.75 '.gitmodules ignore=dirty suppresses submodules with untracked content': 
+	test_config diff.ignoreSubmodules dirty &&
+	git status >output &&
+	! test -s actual &&
+	git config --add -f .gitmodules submodule.subname.ignore dirty &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 75 - .gitmodules ignore=dirty suppresses submodules with untracked content
+
+expecting success of 7508.76 '.git/config ignore=dirty suppresses submodules with untracked content': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore dirty &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 76 - .git/config ignore=dirty suppresses submodules with untracked content
+
+expecting success of 7508.77 '--ignore-submodules=dirty suppresses submodules with modified content': 
+	echo modified >sm/foo &&
+	git status --ignore-submodules=dirty >output &&
+	test_cmp expect output
+
+ok 77 - --ignore-submodules=dirty suppresses submodules with modified content
+
+expecting success of 7508.78 '.gitmodules ignore=dirty suppresses submodules with modified content': 
+	git config --add -f .gitmodules submodule.subname.ignore dirty &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 78 - .gitmodules ignore=dirty suppresses submodules with modified content
+
+expecting success of 7508.79 '.git/config ignore=dirty suppresses submodules with modified content': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore dirty &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 79 - .git/config ignore=dirty suppresses submodules with modified content
+
+expecting success of 7508.80 '--ignore-submodules=untracked doesn't suppress submodules with modified content': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+  (commit or discard the untracked or modified content in submodules)
+	modified:   dir1/modified
+	modified:   sm (modified content)
+
+Submodule changes to be committed:
+
+* sm $head...$new_head (1):
+  > Add bar
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+EOF
+	git status --ignore-submodules=untracked > output &&
+	test_cmp expect output
+
+ok 80 - --ignore-submodules=untracked doesn't suppress submodules with modified content
+
+expecting success of 7508.81 '.gitmodules ignore=untracked doesn't suppress submodules with modified content': 
+	git config --add -f .gitmodules submodule.subname.ignore untracked &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 81 - .gitmodules ignore=untracked doesn't suppress submodules with modified content
+
+expecting success of 7508.82 '.git/config ignore=untracked doesn't suppress submodules with modified content': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore untracked &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 82 - .git/config ignore=untracked doesn't suppress submodules with modified content
+
+expecting success of 7508.83 '--ignore-submodules=untracked doesn't suppress submodule summary': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+	modified:   sm (new commits)
+
+Submodule changes to be committed:
+
+* sm $head...$new_head (1):
+  > Add bar
+
+Submodules changed but not updated:
+
+* sm $new_head...$head2 (1):
+  > 2nd commit
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
+
+EOF
+	git status --ignore-submodules=untracked > output &&
+	test_cmp expect output
+
+ok 83 - --ignore-submodules=untracked doesn't suppress submodule summary
+
+expecting success of 7508.84 '.gitmodules ignore=untracked doesn't suppress submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore untracked &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 84 - .gitmodules ignore=untracked doesn't suppress submodule summary
+
+expecting success of 7508.85 '.git/config ignore=untracked doesn't suppress submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore untracked &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 85 - .git/config ignore=untracked doesn't suppress submodule summary
+
+expecting success of 7508.86 '--ignore-submodules=dirty doesn't suppress submodule summary': 
+	git status --ignore-submodules=dirty > output &&
+	test_cmp expect output
+
+ok 86 - --ignore-submodules=dirty doesn't suppress submodule summary
+
+expecting success of 7508.87 '.gitmodules ignore=dirty doesn't suppress submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore dirty &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 87 - .gitmodules ignore=dirty doesn't suppress submodule summary
+
+expecting success of 7508.88 '.git/config ignore=dirty doesn't suppress submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore dirty &&
+	git config --add submodule.subname.path sm &&
+	git status >output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
+
+ok 88 - .git/config ignore=dirty doesn't suppress submodule summary
+
+expecting success of 7508.89 'status (core.commentchar with submodule summary)': 
+	test_config core.commentchar ";" &&
+	git -c status.displayCommentPrefix=true status >output &&
+	test_cmp expect output
+
+ok 89 - status (core.commentchar with submodule summary)
+
+expecting success of 7508.90 'status (core.commentchar with two chars with submodule summary)': 
+	test_config core.commentchar ";;" &&
+	sed "s/^/;/" <expect >expect.double &&
+	git -c status.displayCommentPrefix=true status >output &&
+	test_cmp expect.double output
+
+ok 90 - status (core.commentchar with two chars with submodule summary)
+
+expecting success of 7508.91 '--ignore-submodules=all suppresses submodule summary': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-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
+no changes added to commit (use "git add" and/or "git commit -a")
+EOF
+	git status --ignore-submodules=all > output &&
+	test_cmp expect output
 
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 24 - pull.ff=only overrides pull.rebase=false
+ok 91 - --ignore-submodules=all suppresses submodule summary
 
-expecting success of 7601.25 '--rebase overrides --no-ff': 
-	test_does_rebase pull --rebase --no-ff
+expecting success of 7508.92 '.gitmodules ignore=all suppresses unstaged submodule summary': 
+	cat > expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
 
-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
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
 
-expecting success of 7601.26 '--rebase overrides --ff': 
-	test_does_rebase pull --rebase --ff
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 7601.27 '--rebase fast-forwards when possible': 
-	test_does_fast_forward pull --rebase --ff
+EOF
+	git config --add -f .gitmodules submodule.subname.ignore all &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git status > output &&
+	test_cmp expect output &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-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
+ok 92 - .gitmodules ignore=all suppresses unstaged submodule summary
 
-expecting success of 7601.28 'pull.rebase=true overrides pull.ff=false': 
-	test_does_rebase -c pull.rebase=true -c pull.ff=false pull
+expecting success of 7508.93 '.git/config ignore=all suppresses unstaged submodule summary': 
+	git config --add -f .gitmodules submodule.subname.ignore none &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore all &&
+	git config --add submodule.subname.path sm &&
+	git status > output &&
+	test_cmp expect output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-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
+ok 93 - .git/config ignore=all suppresses unstaged submodule summary
 
-expecting success of 7601.29 'pull.rebase=true overrides pull.ff=true': 
-	test_does_rebase -c pull.rebase=true -c pull.ff=true pull
+expecting success of 7508.94 'setup of test environment': 
+	git config status.showUntrackedFiles no &&
+	git status -s >expected_short &&
+	git status --no-short >expected_noshort
 
-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
+ok 94 - setup of test environment
 
-expecting success of 7601.30 '--ff-only takes precedence over pull.rebase=true': 
-	test_attempts_fast_forward -c pull.rebase=true pull --ff-only
+expecting success of 7508.95 '"status.short=true" same as "-s"': 
+	git -c status.short=true status >actual &&
+	test_cmp expected_short actual
 
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 30 - --ff-only takes precedence over pull.rebase=true
+ok 95 - "status.short=true" same as "-s"
 
-expecting success of 7601.31 '--ff-only takes precedence over pull.rebase=false': 
-	test_attempts_fast_forward -c pull.rebase=false pull --ff-only
+expecting success of 7508.96 '"status.short=true" weaker than "--no-short"': 
+	git -c status.short=true status --no-short >actual &&
+	test_cmp expected_noshort actual
 
-HEAD is now at 028ea41 c2
-fatal: Not possible to fast-forward, aborting.
-ok 31 - --ff-only takes precedence over pull.rebase=false
+ok 96 - "status.short=true" weaker than "--no-short"
 
-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
+expecting success of 7508.97 '"status.short=false" same as "--no-short"': 
+	git -c status.short=false status >actual &&
+	test_cmp expected_noshort actual
 
-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
+ok 97 - "status.short=false" same as "--no-short"
 
-expecting success of 7601.33 '--rebase takes precedence over pull.ff=only': 
-	test_does_rebase -c pull.ff=only pull --rebase
+expecting success of 7508.98 '"status.short=false" weaker than "-s"': 
+	git -c status.short=false status -s >actual &&
+	test_cmp expected_short actual
 
-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
+ok 98 - "status.short=false" weaker than "-s"
 
-expecting success of 7601.34 '--rebase overrides pull.ff=true': 
-	test_does_rebase -c pull.ff=true pull --rebase
+expecting success of 7508.99 '"status.branch=true" same as "-b"': 
+	git status -sb >expected_branch &&
+	git -c status.branch=true status -s >actual &&
+	test_cmp expected_branch actual
 
-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
+ok 99 - "status.branch=true" same as "-b"
 
-expecting success of 7601.35 '--rebase overrides pull.ff=false': 
-	test_does_rebase -c pull.ff=false pull --rebase
+expecting success of 7508.100 '"status.branch=true" different from "--no-branch"': 
+	git status -s --no-branch  >expected_nobranch &&
+	git -c status.branch=true status -s >actual &&
+	! test_cmp expected_nobranch actual
 
-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
+--- expected_nobranch	2024-11-14 19:44:22.226799562 +0000
++++ actual	2024-11-14 19:44:22.242799726 +0000
+@@ -1,2 +1,3 @@
++## main...upstream [ahead 2, behind 2]
+  M dir1/modified
+ MM sm
+ok 100 - "status.branch=true" different from "--no-branch"
 
-expecting success of 7601.36 '--rebase overrides pull.ff unset': 
-	test_does_rebase pull --rebase
+expecting success of 7508.101 '"status.branch=true" weaker than "--no-branch"': 
+	git -c status.branch=true status -s --no-branch >actual &&
+	test_cmp expected_nobranch actual
 
-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
+ok 101 - "status.branch=true" weaker than "--no-branch"
 
-expecting success of 7601.37 '--no-rebase works with --no-ff': 
-	test_does_merge_when_ff_possible pull --no-rebase --no-ff
+expecting success of 7508.102 '"status.branch=true" weaker than "--porcelain"': 
+	git -c status.branch=true status --porcelain >actual &&
+	test_cmp expected_nobranch actual
 
-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
+ok 102 - "status.branch=true" weaker than "--porcelain"
 
-expecting success of 7601.38 '--no-rebase works with --ff': 
-	test_does_fast_forward pull --no-rebase --ff
+expecting success of 7508.103 '"status.branch=false" same as "--no-branch"': 
+	git -c status.branch=false status -s >actual &&
+	test_cmp expected_nobranch actual
 
-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
+ok 103 - "status.branch=false" same as "--no-branch"
 
-expecting success of 7601.39 '--no-rebase does ff if pull.ff unset': 
-	test_does_fast_forward pull --no-rebase
+expecting success of 7508.104 '"status.branch=false" weaker than "-b"': 
+	git -c status.branch=false status -sb >actual &&
+	test_cmp expected_branch actual
 
-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
+ok 104 - "status.branch=false" weaker than "-b"
 
-expecting success of 7601.40 '--no-rebase heeds pull.ff=true': 
-	test_does_fast_forward -c pull.ff=true pull --no-rebase
+expecting success of 7508.105 'Restore default test environment': 
+	git config --unset status.showUntrackedFiles
 
-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
+ok 105 - Restore default test environment
 
-expecting success of 7601.41 '--no-rebase heeds pull.ff=false': 
-	test_does_merge_when_ff_possible -c pull.ff=false pull --no-rebase
+expecting success of 7508.106 'git commit will commit a staged but ignored submodule': 
+	git config --add -f .gitmodules submodule.subname.ignore all &&
+	git config --add -f .gitmodules submodule.subname.path sm &&
+	git config --add submodule.subname.ignore all &&
+	git status -s --ignore-submodules=dirty >output &&
+	test_grep "^M. sm" output &&
+	GIT_EDITOR="echo hello >>\"\$1\"" &&
+	export GIT_EDITOR &&
+	git commit -uno &&
+	git status -s --ignore-submodules=dirty >output &&
+	test_grep ! "^M. sm" output
 
-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
+MM sm
+[main 24c442b] hello /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/.git/COMMIT_EDITMSG
+ Author: A U Thor <author@example.com>
+ok 106 - git commit will commit a staged but ignored submodule
 
-expecting success of 7601.42 'pull.rebase=true and --no-ff': 
-	test_does_rebase -c pull.rebase=true pull --no-ff
+expecting success of 7508.107 'git commit --dry-run will show a staged but ignored submodule': 
+	git reset HEAD^ &&
+	git add sm &&
+	cat >expect << EOF &&
+On branch main
+Your branch and 'upstream' have diverged,
+and have 2 and 2 different commits each, respectively.
 
-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
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	modified:   sm
 
-expecting success of 7601.43 'pull.rebase=true and --ff': 
-	test_does_rebase -c pull.rebase=true pull --ff
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   dir1/modified
 
-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
+Untracked files not listed (use -u option to show untracked files)
+EOF
+	git commit -uno --dry-run >output &&
+	test_cmp expect output &&
+	git status -s --ignore-submodules=dirty >output &&
+	test_grep "^M. sm" output
 
-expecting success of 7601.44 'pull.rebase=false and --no-ff': 
-	test_does_merge_when_ff_possible -c pull.rebase=false pull --no-ff
+Unstaged changes after reset:
+M	dir1/modified
+M	sm
+M  sm
+ok 107 - git commit --dry-run will show a staged but ignored submodule
 
-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 7508.108 'git commit -m will commit a staged but ignored submodule': 
+	git commit -uno -m message &&
+	git status -s --ignore-submodules=dirty >output &&
+	test_grep ! "^M. sm" output &&
+	git config --remove-section submodule.subname &&
+	git config -f .gitmodules  --remove-section submodule.subname
 
-expecting success of 7601.45 'pull.rebase=false and --ff, ff possible': 
-	test_does_fast_forward -c pull.rebase=false pull --ff
+[main 45c17dd] message
+ Author: A U Thor <author@example.com>
+ok 108 - git commit -m will commit a staged but ignored submodule
 
-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 7508.109 'show stash info with "--show-stash"': 
+	git reset --hard &&
+	git stash clear &&
+	echo 1 >file &&
+	git add file &&
+	git stash &&
+	git status >expected_default &&
+	git status --show-stash >expected_with_stash &&
+	test_grep "^Your stash currently has 1 entry$" expected_with_stash
 
-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 45c17dd message
+Saved working directory and index state WIP on main: 45c17dd message
+Your stash currently has 1 entry
+ok 109 - show stash info with "--show-stash"
 
-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 7508.110 'no stash info with "--show-stash --no-show-stash"': 
+	git status --show-stash --no-show-stash >expected_without_stash &&
+	test_cmp expected_default expected_without_stash
 
-expecting success of 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
+ok 110 - no stash info with "--show-stash --no-show-stash"
 
-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 7508.111 '"status.showStash=false" weaker than "--show-stash"': 
+	git -c status.showStash=false status --show-stash >actual &&
+	test_cmp expected_with_stash actual
 
-expecting success of 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
+ok 111 - "status.showStash=false" weaker than "--show-stash"
 
-HEAD is now at e4f5a3c c0
-fatal: Cannot fast-forward to multiple branches.
-ok 48 - Multiple can never be fast forwarded
+expecting success of 7508.112 '"status.showStash=true" weaker than "--no-show-stash"': 
+	git -c status.showStash=true status --no-show-stash >actual &&
+	test_cmp expected_without_stash actual
 
-expecting success of 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
+ok 112 - "status.showStash=true" weaker than "--no-show-stash"
 
-HEAD is now at e4f5a3c c0
-fatal: Cannot rebase onto multiple branches.
-ok 49 - Cannot rebase with multiple heads
+expecting success of 7508.113 'no additional info if no stash entries': 
+	git stash clear &&
+	git -c status.showStash=true status >actual &&
+	test_cmp expected_without_stash actual
 
-expecting success of 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
+ok 113 - no additional info if no stash entries
 
-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 7508.114 '"No commits yet" should be noted in status output': 
+	git checkout --orphan empty-branch-1 &&
+	git status >output &&
+	test_grep "No commits yet" output
 
-expecting success of 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)"
+Switched to a new branch 'empty-branch-1'
+No commits yet
+ok 114 - "No commits yet" should be noted in status output
 
-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 7508.115 '"No commits yet" should not be noted in status output': 
+	git checkout --orphan empty-branch-2 &&
+	test_commit test-commit-1 &&
+	git status >output &&
+	test_grep ! "No commits yet" output
 
-expecting success of 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)"
+Switched to a new branch 'empty-branch-2'
+[empty-branch-2 (root-commit) f194efb] test-commit-1
+ Author: A U Thor <author@example.com>
+ 10 files changed, 7 insertions(+)
+ create mode 100644 .gitconfig
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 dir2/added
+ create mode 100644 modified
+ create mode 160000 sm
+ create mode 100644 test-commit-1.t
+ create mode 100644 tracked
+ create mode 100644 upstream1.t
+ create mode 100644 upstream2.t
+ok 115 - "No commits yet" should not be noted in status output
 
-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 7508.116 '"Initial commit" should be noted in commit template': 
+	git checkout --orphan empty-branch-3 &&
+	touch to_be_committed_1 &&
+	git add to_be_committed_1 &&
+	git commit --dry-run >output &&
+	test_grep "Initial commit" output
 
-expecting success of 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)"
+Switched to a new branch 'empty-branch-3'
+Initial commit
+ok 116 - "Initial commit" should be noted in commit template
 
-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 7508.117 '"Initial commit" should not be noted in commit template': 
+	git checkout --orphan empty-branch-4 &&
+	test_commit test-commit-2 &&
+	touch to_be_committed_2 &&
+	git add to_be_committed_2 &&
+	git commit --dry-run >output &&
+	test_grep ! "Initial commit" output
 
-expecting success of 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
+Switched to a new branch 'empty-branch-4'
+[empty-branch-4 (root-commit) 92016e1] test-commit-2
+ Author: A U Thor <author@example.com>
+ 12 files changed, 8 insertions(+)
+ create mode 100644 .gitconfig
+ create mode 100644 dir1/modified
+ create mode 100644 dir1/tracked
+ create mode 100644 dir2/added
+ create mode 100644 modified
+ create mode 160000 sm
+ create mode 100644 test-commit-1.t
+ create mode 100644 test-commit-2.t
+ create mode 100644 to_be_committed_1
+ create mode 100644 tracked
+ create mode 100644 upstream1.t
+ create mode 100644 upstream2.t
+ok 117 - "Initial commit" should not be noted in commit template
 
-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 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 7508.118 '--no-optional-locks prevents index update': 
+	test_set_magic_mtime .git/index &&
+	git --no-optional-locks status &&
+	test_is_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
 
-expecting success of 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)"
+On branch empty-branch-4
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   to_be_committed_2
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 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)"
+On branch empty-branch-4
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+	new file:   to_be_committed_2
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 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)"
+--- .git/test-mtime-expect	2024-11-14 19:44:29.510874439 +0000
++++ .git/test-mtime-actual	2024-11-14 19:44:29.514874480 +0000
+@@ -1 +1 @@
+-1234567890
++1731613469
+ok 118 - --no-optional-locks prevents index update
 
-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 7508.119 'racy timestamps will be fixed for clean worktree': 
+	echo content >racy-dirty &&
+	echo content >racy-racy &&
+	git add racy* &&
+	git commit -m "racy test files" &&
+	# let status rewrite the index, if necessary; after that we expect
+	# no more index writes unless caused by racy timestamps; note that
+	# timestamps may already be racy now (depending on previous tests)
+	git status &&
+	test_set_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
 
-expecting success of 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
+[empty-branch-4 1041e20] racy test files
+ Author: A U Thor <author@example.com>
+ 3 files changed, 2 insertions(+)
+ create mode 100644 racy-dirty
+ create mode 100644 racy-racy
+ create mode 100644 to_be_committed_2
+On branch empty-branch-4
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-HEAD is now at 429abf0 c1
-Merge made by the 'ours' strategy.
-ok 58 - merge c1 with c2 (ours in pull.twohead)
+nothing added to commit but untracked files present (use "git add" to track)
+On branch empty-branch-4
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 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)"
+nothing added to commit but untracked files present (use "git add" to track)
+--- .git/test-mtime-expect	2024-11-14 19:44:30.722886898 +0000
++++ .git/test-mtime-actual	2024-11-14 19:44:30.722886898 +0000
+@@ -1 +1 @@
+-1234567890
++1731613470
+ok 119 - racy timestamps will be fixed for clean worktree
 
-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 7508.120 'racy timestamps will be fixed for dirty worktree': 
+	echo content2 >racy-dirty &&
+	git status &&
+	test_set_magic_mtime .git/index &&
+	git status &&
+	! test_is_magic_mtime .git/index
 
-expecting success of 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
+On branch empty-branch-4
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   racy-dirty
 
-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)
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 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
+no changes added to commit (use "git add" and/or "git commit -a")
+On branch empty-branch-4
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+	modified:   racy-dirty
 
-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
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+	.gitmodules
+	actual
+	dir1/untracked
+	dir2/modified
+	dir2/untracked
+	untracked
 
-expecting success of 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
+no changes added to commit (use "git add" and/or "git commit -a")
+--- .git/test-mtime-expect	2024-11-14 19:44:31.386893724 +0000
++++ .git/test-mtime-actual	2024-11-14 19:44:31.386893724 +0000
+@@ -1 +1 @@
+-1234567890
++1731613471
+ok 120 - racy timestamps will be fixed for dirty worktree
 
-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 7508.121 'setup slow status advice': 
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main git init slowstatus &&
+	(
+		cd slowstatus &&
+		cat >.gitignore <<-\EOF &&
+		/actual
+		/expected
+		/out
+		EOF
+		git add .gitignore &&
+		git commit -m "Add .gitignore" &&
+		git config advice.statusuoption true
+	)
 
-expecting success of 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7508-status/slowstatus/.git/
+[main (root-commit) 557fde8] Add .gitignore
+ Author: A U Thor <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 .gitignore
+ok 121 - setup slow status advice
 
-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 7508.122 'slow status advice when core.untrackedCache and fsmonitor are unset': 
+	(
+		cd slowstatus &&
+		git config core.untrackedCache false &&
+		git config core.fsmonitor false &&
+		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
+		cat >expected <<-\EOF &&
+		On branch main
 
-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
+		It took 3.25 seconds to enumerate untracked files.
+		See 'git help status' for information on how to improve this.
 
-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
+		nothing to commit, working tree clean
+		EOF
+		test_cmp expected actual
+	)
 
-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
+ok 122 - slow status advice when core.untrackedCache and fsmonitor are unset
 
-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
+expecting success of 7508.123 'slow status advice when core.untrackedCache true, but not fsmonitor': 
+	(
+		cd slowstatus &&
+		git config core.untrackedCache true &&
+		git config core.fsmonitor false &&
+		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
+		cat >expected <<-\EOF &&
+		On branch main
 
-# passed all 65 test(s)
-1..65
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7608-merge-messages.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
+		It took 3.25 seconds to enumerate untracked files.
+		See 'git help status' for information on how to improve this.
 
-[main (root-commit) 8ad97f7] main-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main-1.t
-Switched to a new branch 'local-branch'
-[local-branch 7bd44c4] branch-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 branch-1.t
-Switched to branch 'main'
-[main 9b0bdc1] main-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 main-2.t
-Merge made by the 'ort' strategy.
- branch-1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 branch-1.t
-ok 1 - merge local branch
+		nothing to commit, working tree clean
+		EOF
+		test_cmp expected actual
+	)
 
-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"
+ok 123 - slow status advice when core.untrackedCache true, but not fsmonitor
 
-Switched to a new branch 'octopus-a'
-[octopus-a d4e293f] octopus-1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 octopus-1.t
-Switched to a new branch 'octopus-b'
-[octopus-b fd085cf] octopus-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 octopus-2.t
-Switched to branch 'main'
-Fast-forwarding to: octopus-a
-Trying simple merge with octopus-b
-Merge made by the 'octopus' strategy.
- octopus-1.t | 1 +
- octopus-2.t | 1 +
- 2 files changed, 2 insertions(+)
- create mode 100644 octopus-1.t
- create mode 100644 octopus-2.t
-ok 2 - merge octopus branches
+expecting success of 7508.124 'slow status advice when core.untrackedCache true, and fsmonitor': 
+	(
+		cd slowstatus &&
+		git config core.untrackedCache true &&
+		git config core.fsmonitor true &&
+		GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
+		cat >expected <<-\EOF &&
+		On branch main
 
-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"
+		It took 3.25 seconds to enumerate untracked files,
+		but the results were cached, and subsequent runs may be faster.
+		See 'git help status' for information on how to improve this.
 
-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
+		nothing to commit, working tree clean
+		EOF
+		test_cmp expected actual
+	)
 
-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"
+ok 124 - slow status advice when core.untrackedCache true, and fsmonitor
 
-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
+checking prerequisite: EXPENSIVE
 
-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"
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
 
-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
+)
+prerequisite EXPENSIVE not satisfied
+ok 125 # skip status does not re-read unchanged 4 or 8 GiB file (missing EXPENSIVE)
 
-# passed all 5 test(s)
-1..5
+# passed all 125 test(s)
+1..125
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7612-merge-verify-signatures.sh ***
@@ -479560,653 +481089,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7614-merge-signoff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7614-merge-signoff/.git/
-expecting success of 7614.1 'setup': 
-	test_setup
-
-[main (root-commit) 6c54391] Initial empty commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'other-branch'
-[other-branch 5599d17] other-branch
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-ok 1 - setup
-
-expecting success of 7614.2 'git merge --signoff adds a sign-off line': 
-	git checkout main &&
-	test_commit main-branch-2 file2 2 &&
-	git checkout other-branch &&
-	git merge main --signoff --no-edit &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-signed actual
-
-Switched to branch 'main'
-[main 3d2fc9d] main-branch-2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-warning: refname 'other-branch' is ambiguous.
-Switched to branch 'other-branch'
-Merge made by the 'ort' strategy.
- file2 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file2
-ok 2 - git merge --signoff adds a sign-off line
-
-expecting success of 7614.3 'git merge does not add a sign-off line': 
-	git checkout main &&
-	test_commit main-branch-3 file3 3 &&
-	git checkout other-branch &&
-	git merge main --no-edit &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-unsigned actual
-
-Switched to branch 'main'
-[main fb2817d] main-branch-3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-warning: refname 'other-branch' is ambiguous.
-Switched to branch 'other-branch'
-Merge made by the 'ort' strategy.
- file3 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-ok 3 - git merge does not add a sign-off line
-
-expecting success of 7614.4 'git merge --no-signoff flag cancels --signoff flag': 
-	git checkout main &&
-	test_commit main-branch-4 file4 4 &&
-	git checkout other-branch &&
-	git merge main --no-edit --signoff --no-signoff &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
-	test_cmp expected-unsigned actual
-
-Switched to branch 'main'
-[main 6807046] main-branch-4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-warning: refname 'other-branch' is ambiguous.
-Switched to branch 'other-branch'
-Merge made by the 'ort' strategy.
- file4 | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 file4
-ok 4 - git merge --no-signoff flag cancels --signoff flag
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7701-repack-unpack-unreachable.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7701-repack-unpack-unreachable/.git/
-expecting success of 7701.1 '-A with -d option leaves unreachable objects unpacked': 
-	echo content > file1 &&
-	git add . &&
-	test_tick &&
-	git commit -m initial_commit &&
-	# create a transient branch with unique content
-	git checkout -b transient_branch &&
-	echo more content >> file1 &&
-	# record the objects created in the database for file, commit, tree
-	fsha1=$(git hash-object file1) &&
-	test_tick &&
-	git commit -a -m more_content &&
-	csha1=$(git rev-parse HEAD^{commit}) &&
-	tsha1=$(git rev-parse HEAD^{tree}) &&
-	git checkout main &&
-	echo even more content >> file1 &&
-	test_tick &&
-	git commit -a -m even_more_content &&
-	# delete the transient branch
-	git branch -D transient_branch &&
-	# pack the repo
-	git repack -A -d -l &&
-	# verify objects are packed in repository
-	test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		   grep -E "^($fsha1|$csha1|$tsha1) " |
-		   sort | uniq | wc -l) &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1 &&
-	# now expire the reflog, while keeping reachable ones but expiring
-	# unreachables immediately
-	test_tick &&
-	sometimeago=$(( $test_tick - 10000 )) &&
-	git reflog expire --expire=$sometimeago --expire-unreachable=$test_tick --all &&
-	# and repack
-	git repack -A -d -l &&
-	# verify objects are retained unpacked
-	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		   grep -E "^($fsha1|$csha1|$tsha1) " |
-		   sort | uniq | wc -l) &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1
-
-[main (root-commit) 5236a77] initial_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file1
-Switched to a new branch 'transient_branch'
-[transient_branch 24d3dd6] more_content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'main'
-[main 934cb86] even_more_content
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Deleted branch transient_branch (was 24d3dd6).
-content
-more content
-commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    more_content
-
-diff --git a/file1 b/file1
-index d95f3ad..86436d0 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- content
-+more content
-tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
-
-file1
-content
-more content
-commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    more_content
-
-diff --git a/file1 b/file1
-index d95f3ad..86436d0 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- content
-+more content
-tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
-
-file1
-ok 1 - -A with -d option leaves unreachable objects unpacked
-
-expecting success of 7701.2 '-A without -d option leaves unreachable objects packed': 
-	fsha1path=$(echo "$fsha1" | sed -e "s|\(..\)|\1/|") &&
-	fsha1path=".git/objects/$fsha1path" &&
-	csha1path=$(echo "$csha1" | sed -e "s|\(..\)|\1/|") &&
-	csha1path=".git/objects/$csha1path" &&
-	tsha1path=$(echo "$tsha1" | sed -e "s|\(..\)|\1/|") &&
-	tsha1path=".git/objects/$tsha1path" &&
-	git branch transient_branch $csha1 &&
-	git repack -a -d -l &&
-	test ! -f "$fsha1path" &&
-	test ! -f "$csha1path" &&
-	test ! -f "$tsha1path" &&
-	test 1 = $(ls -1 .git/objects/pack/pack-*.pack | wc -l) &&
-	packfile=$(ls .git/objects/pack/pack-*.pack) &&
-	git branch -D transient_branch &&
-	test_tick &&
-	git repack -A -l &&
-	test ! -f "$fsha1path" &&
-	test ! -f "$csha1path" &&
-	test ! -f "$tsha1path" &&
-	git show $fsha1 &&
-	git show $csha1 &&
-	git show $tsha1
-
-Deleted branch transient_branch (was 24d3dd6).
-content
-more content
-commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    more_content
-
-diff --git a/file1 b/file1
-index d95f3ad..86436d0 100644
---- a/file1
-+++ b/file1
-@@ -1 +1,2 @@
- content
-+more content
-tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
-
-file1
-ok 2 - -A without -d option leaves unreachable objects packed
-
-expecting success of 7701.3 'unpacked objects receive timestamp of pack file': 
-	tmppack=".git/objects/pack/tmp_pack" &&
-	ln "$packfile" "$tmppack" &&
-	git repack -A -l -d &&
-	test-tool chmtime --get "$tmppack" "$fsha1path" "$csha1path" "$tsha1path" \
-		> mtimes &&
-	compare_mtimes < mtimes
-
-ok 3 - unpacked objects receive timestamp of pack file
-
-expecting success of 7701.4 'do not bother loosening old objects': 
-	obj1=$(echo one | git hash-object -w --stdin) &&
-	obj2=$(echo two | git hash-object -w --stdin) &&
-	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
-	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
-	git prune-packed &&
-	git cat-file -p $obj1 &&
-	git cat-file -p $obj2 &&
-	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
-	git repack -A -d --unpack-unreachable=1.hour.ago &&
-	git cat-file -p $obj1 &&
-	test_must_fail git cat-file -p $obj2
-
-one
-two
-one
-fatal: Not a valid object name f719efd430d52bcfc8566a43b2eb655688d38871
-ok 4 - do not bother loosening old objects
-
-expecting success of 7701.5 'gc.recentObjectsHook': 
-	obj1=$(echo one | git hash-object -w --stdin) &&
-	obj2=$(echo two | git hash-object -w --stdin) &&
-	obj3=$(echo three | git hash-object -w --stdin) &&
-	pack1=$(echo $obj1 | git pack-objects .git/objects/pack/pack) &&
-	pack2=$(echo $obj2 | git pack-objects .git/objects/pack/pack) &&
-	pack3=$(echo $obj3 | git pack-objects .git/objects/pack/pack) &&
-	git prune-packed &&
-
-	git cat-file -p $obj1 &&
-	git cat-file -p $obj2 &&
-	git cat-file -p $obj3 &&
-
-	# make an unreachable annotated tag object to ensure we rescue objects
-	# which are reachable from non-pruned unreachable objects
-	obj2_tag="$(git mktag <<-EOF
-	object $obj2
-	type blob
-	tag obj2-tag
-	tagger T A Gger <tagger@example.com> 1234567890 -0000
-	EOF
-	)" &&
-
-	obj2_tag_pack="$(echo $obj2_tag | git pack-objects .git/objects/pack/pack)" &&
-	git prune-packed &&
-
-	write_script precious-objects <<-EOF &&
-	echo $obj2_tag
-	EOF
-	git config gc.recentObjectsHook ./precious-objects &&
-
-	test-tool chmtime =-86400 .git/objects/pack/pack-$pack2.pack &&
-	test-tool chmtime =-86400 .git/objects/pack/pack-$pack3.pack &&
-	test-tool chmtime =-86400 .git/objects/pack/pack-$obj2_tag_pack.pack &&
-	git repack -A -d --unpack-unreachable=1.hour.ago &&
-
-	git cat-file -p $obj1 &&
-	git cat-file -p $obj2 &&
-	git cat-file -p $obj2_tag &&
-	test_must_fail git cat-file -p $obj3
-
-one
-two
-three
-one
-two
-object f719efd430d52bcfc8566a43b2eb655688d38871
-type blob
-tag obj2-tag
-tagger T A Gger <tagger@example.com> 1234567890 -0000
-fatal: Not a valid object name 2bdf67abb163a4ffb2d7f3f0880c9fe5068ce782
-ok 5 - gc.recentObjectsHook
-
-expecting success of 7701.6 'keep packed objects found only in index': 
-	echo my-unique-content >file &&
-	git add file &&
-	git commit -m "make it reachable" &&
-	git gc &&
-	git reset HEAD^ &&
-	git reflog expire --expire=now --all &&
-	git add file &&
-	test-tool chmtime =-86400 .git/objects/pack/* &&
-	git gc --prune=1.hour.ago &&
-	git cat-file blob :file
-
-[main 73784a1] make it reachable
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-my-unique-content
-ok 6 - keep packed objects found only in index
-
-expecting success of 7701.7 'repack -k keeps unreachable packed objects': 
-	# create packed-but-unreachable object
-	sha1=$(echo unreachable-packed | git hash-object -w --stdin) &&
-	pack=$(echo $sha1 | git pack-objects .git/objects/pack/pack) &&
-	git prune-packed &&
-
-	# -k should keep it
-	git repack -adk &&
-	git cat-file -p $sha1 &&
-
-	# and double check that without -k it would have been removed
-	git repack -ad &&
-	test_must_fail git cat-file -p $sha1
-
-unreachable-packed
-fatal: Not a valid object name bdf1d55da464c8ffc31aa0891954caf1baf216e8
-ok 7 - repack -k keeps unreachable packed objects
-
-expecting success of 7701.8 'repack -k packs unreachable loose objects': 
-	# create loose unreachable object
-	sha1=$(echo would-be-deleted-loose | git hash-object -w --stdin) &&
-	objpath=.git/objects/$(echo $sha1 | sed "s,..,&/,") &&
-	test_path_is_file $objpath &&
-
-	# and confirm that the loose object goes away, but we can
-	# still access it (ergo, it is packed)
-	git repack -adk &&
-	test_path_is_missing $objpath &&
-	git cat-file -p $sha1
-
-would-be-deleted-loose
-ok 8 - repack -k packs unreachable loose objects
-
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7611-merge-abort.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 ! -f .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 ! -f .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 ! -f .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 -f .git/MERGE_HEAD &&
-	# Abort non-conflicting merge
-	git merge --abort &&
-	test ! -f .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 -f .git/MERGE_HEAD &&
-	# Abort conflicting merge
-	git merge --abort &&
-	test ! -f .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 ! -f .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 ! -f .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 -f .git/MERGE_HEAD &&
-	# Abort merge
-	git merge --abort &&
-	test ! -f .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 -f .git/MERGE_HEAD &&
-	# Abort merge
-	git merge --abort &&
-	test ! -f .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 ! -f .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 ! -f .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 16 - Fail conflicting merge with conflicting dirty worktree
-
-expecting success of 7611.17 'Reset worktree changes': 
-	git reset --hard "$pre_merge_head"
-
-HEAD is now at 9b32786 second
-ok 17 - Reset worktree changes
-
-expecting success of 7611.18 'Fail clean merge with matching dirty worktree': 
-	echo bart > bar &&
-	git diff > expect &&
-	test_must_fail git merge --no-commit clean_branch &&
-	test ! -f .git/MERGE_HEAD &&
-	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
-	test -z "$(git diff --staged)" &&
-	git diff > actual &&
-	test_cmp expect actual
-
-error: Your local changes to the following files would be overwritten by merge:
-	bar
-Please commit your changes or stash them before you merge.
-Aborting
-Merge with strategy ort failed.
-ok 18 - Fail clean merge with matching dirty worktree
-
-expecting success of 7611.19 'Fail conflicting merge with matching dirty worktree': 
-	echo barf > bar &&
-	git diff > expect &&
-	test_must_fail git merge conflict_branch &&
-	test ! -f .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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7702-repack-cyclic-alternate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7702-repack-cyclic-alternate/.git/
-expecting success of 7702.1 'setup': 
-	GIT_OBJECT_DIRECTORY=.git//../.git/objects &&
-	export GIT_OBJECT_DIRECTORY &&
-	touch a &&
-	git add a &&
-	git commit -m 1 &&
-	git repack -adl &&
-	echo "$(pwd)"/.git/objects/../objects >.git/objects/info/alternates
-
-[master (root-commit) 9b08673] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 a
-ok 1 - setup
-
-expecting success of 7702.2 're-packing repository with itsself as alternate': 
-	git repack -adl &&
-	git fsck
-
-ok 2 - re-packing repository with itsself as alternate
-
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7600-merge.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7600-merge/.git/
 expecting success of 7600.1 'setup': 
@@ -481290,3673 +482172,1500 @@
 
 expecting success of 7600.40 'option --no-ff overrides merge.ff=only config': 
 	git reset --hard c0 &&
-	test_config merge.ff only &&
-	git merge --no-ff c1
-
-HEAD is now at 88012a2 commit 0
-Merge made by the 'ort' strategy.
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-ok 40 - option --no-ff overrides merge.ff=only config
-
-expecting success of 7600.41 'merge c0 with c1 (ff overrides no-ff)': 
-	git reset --hard c0 &&
-	test_config branch.main.mergeoptions "--no-ff" &&
-	git merge --ff c1 &&
-	verify_merge file result.1 &&
-	verify_head $c1
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-ok 41 - merge c0 with c1 (ff overrides no-ff)
-
-expecting success of 7600.42 'merge log message': 
-	git reset --hard c0 &&
-	git merge --no-log c2 &&
-	git show -s --pretty=format:%b HEAD >msg.act &&
-	test_must_be_empty msg.act &&
-
-	git reset --hard c0 &&
-	test_config branch.main.mergeoptions "--no-ff" &&
-	git merge --no-log c2 &&
-	git show -s --pretty=format:%b HEAD >msg.act &&
-	test_must_be_empty msg.act &&
-
-	git merge --log c3 &&
-	git show -s --pretty=format:%b HEAD >msg.act &&
-	test_cmp msg.log msg.act &&
-
-	git reset --hard HEAD^ &&
-	test_config merge.log "yes" &&
-	git merge c3 &&
-	git show -s --pretty=format:%b HEAD >msg.act &&
-	test_cmp msg.log msg.act
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..ac59201
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 88012a2 commit 0
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 8e82df1 Merge tag 'c2'
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 42 - merge log message
-
-expecting success of 7600.43 'merge c1 with c0, c2, c0, and c1': 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge c0 c2 c0 c1 &&
-	verify_merge file result.1-5 &&
-	verify_parents $c1 $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 43 - merge c1 with c0, c2, c0, and c1
-
-expecting success of 7600.44 'merge c1 with c0, c2, c0, and c1': 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge c0 c2 c0 c1 &&
-	verify_merge file result.1-5 &&
-	verify_parents $c1 $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 44 - merge c1 with c0, c2, c0, and c1
-
-expecting success of 7600.45 'merge c1 with c1 and c2': 
-	git reset --hard c1 &&
-	test_tick &&
-	git merge c1 c2 &&
-	verify_merge file result.1-5 &&
-	verify_parents $c1 $c2
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Needed a single revision
-ok 45 - merge c1 with c1 and c2
-
-expecting success of 7600.46 'merge fast-forward in a dirty tree': 
-	git reset --hard c0 &&
-	mv file file1 &&
-	cat file1 >file &&
-	rm -f file1 &&
-	git merge c2
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..ac59201
-Fast-forward
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 46 - merge fast-forward in a dirty tree
-
-expecting success of 7600.47 'in-index merge': 
-	git reset --hard c0 &&
-	git merge --no-ff -s resolve c1 >out &&
-	test_grep "Wonderful." out &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Wonderful.
-fatal: Needed a single revision
-ok 47 - in-index merge
-
-expecting success of 7600.48 'refresh the index before merging': 
-	git reset --hard c1 &&
-	cp file file.n && mv -f file.n file &&
-	git merge c3
-
-HEAD is now at dc8b979 commit 1
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 48 - refresh the index before merging
-
-expecting success of 7600.49 'merge with --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git merge --autostash c2 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5 merge-result &&
-	test_cmp result.1-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Applied autostash.
-ok 49 - merge with --autostash
-
-expecting success of 7600.50 'merge with merge.autoStash': 
-	test_config merge.autoStash true &&
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git merge c2 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5 merge-result &&
-	test_cmp result.1-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Applied autostash.
-ok 50 - merge with merge.autoStash
-
-expecting success of 7600.51 'fast-forward merge with --autostash': 
-	git reset --hard c0 &&
-	git merge-file file file.orig file.5 &&
-	git merge --autostash c1 2>err &&
-	test_grep "Applied autostash." err &&
-	test_cmp result.1-5 file
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Created autostash: 4d9e18f
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-Applied autostash.
-ok 51 - fast-forward merge with --autostash
-
-expecting success of 7600.52 'failed fast-forward merge with --autostash': 
-	git reset --hard c0 &&
-	git merge-file file file.orig file.5 &&
-	cp file.5 other &&
-	test_when_finished "rm other" &&
-	test_must_fail git merge --autostash c1 2>err &&
-	test_grep "Applied autostash." err &&
-	test_cmp file.5 file
-
-HEAD is now at 88012a2 commit 0
-Updating 88012a2..dc8b979
-Created autostash: 4d9e18f
-Applied autostash.
-ok 52 - failed fast-forward merge with --autostash
-
-expecting success of 7600.53 'octopus merge with --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.3 &&
-	git merge --autostash c2 c3 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5-9 merge-result &&
-	test_cmp result.1-3-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: 27fb9f9
-Trying simple merge with c2
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Trying simple merge with c3
-Simple merge did not work, trying automatic merge.
-Auto-merging file
-Merge made by the 'octopus' strategy.
- file | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-Applied autostash.
-ok 53 - octopus merge with --autostash
-
-expecting success of 7600.54 'failed merge (exit 2) with --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.5 &&
-	test_must_fail git merge -s recursive --autostash c2 c3 2>err &&
-	test_grep "Applied autostash." err &&
-	test_cmp result.1-5 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: 92dee98
-Applied autostash.
-ok 54 - failed merge (exit 2) with --autostash
-
-expecting success of 7600.55 'conflicted merge with --autostash, --abort restores stash': 
-	git reset --hard c3 &&
-	cp file.1 file &&
-	test_must_fail git merge --autostash c7 &&
-	git merge --abort 2>err &&
-	test_grep "Applied autostash." err &&
-	test_cmp file.1 file
-
-HEAD is now at 8976188 commit 3
-Created autostash: e782531
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-When finished, apply stashed changes with `git stash pop`
-Applied autostash.
-ok 55 - conflicted merge with --autostash, --abort restores stash
-
-expecting success of 7600.56 'completed merge (git commit) with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git commit 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5 merge-result &&
-	test_cmp result.1-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-[main 35e0f0d] Merge tag 'c2'
- Author: A U Thor <author@example.com>
-Applied autostash.
-ok 56 - completed merge (git commit) with --no-commit and --autostash
-
-expecting success of 7600.57 'completed merge (git merge --continue) with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git merge --continue 2>err &&
-	test_grep "Applied autostash." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-5 merge-result &&
-	test_cmp result.1-5-9 file
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-[main 35e0f0d] Merge tag 'c2'
- Author: A U Thor <author@example.com>
-Applied autostash.
-ok 57 - completed merge (git merge --continue) with --no-commit and --autostash
-
-expecting success of 7600.58 'aborted merge (merge --abort) with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git merge --abort 2>err &&
-	test_grep "Applied autostash." err &&
-	git diff >actual &&
-	test_cmp expect actual
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-Applied autostash.
-ok 58 - aborted merge (merge --abort) with --no-commit and --autostash
-
-expecting success of 7600.59 'aborted merge (reset --hard) with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git reset --hard 2>err &&
-	test_grep "Autostash exists; creating a new stash entry." err &&
-	git diff --exit-code
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-HEAD is now at dc8b979 commit 1
-Autostash exists; creating a new stash entry.
-ok 59 - aborted merge (reset --hard) with --no-commit and --autostash
-
-expecting success of 7600.60 'quit merge with --no-commit and --autostash': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9 &&
-	git diff >expect &&
-	git merge --no-commit --autostash c2 &&
-	git stash show -p MERGE_AUTOSTASH >actual &&
-	test_cmp expect actual &&
-	git diff HEAD >expect &&
-	git merge --quit 2>err &&
-	test_grep "Autostash exists; creating a new stash entry." err &&
-	git diff HEAD >actual &&
-	test_cmp expect actual
-
-HEAD is now at dc8b979 commit 1
-Created autostash: a0a2bb4
-Auto-merging file
-Automatic merge went well; stopped before committing as requested
-When finished, apply stashed changes with `git stash pop`
-Autostash exists; creating a new stash entry.
-ok 60 - quit merge with --no-commit and --autostash
-
-expecting success of 7600.61 'merge with conflicted --autostash changes': 
-	git reset --hard c1 &&
-	git merge-file file file.orig file.9y &&
-	git diff >expect &&
-	test_when_finished "test_might_fail git stash drop" &&
-	git merge --autostash c3 2>err &&
-	test_grep "Applying autostash resulted in conflicts." err &&
-	git show HEAD:file >merge-result &&
-	test_cmp result.1-9 merge-result &&
-	git stash show -p >actual &&
-	test_cmp expect actual
-
-HEAD is now at dc8b979 commit 1
-Created autostash: 098cf2e
-Auto-merging file
-Merge made by the 'ort' strategy.
- file | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Applying autostash resulted in conflicts.
-Dropped refs/stash@{0} (098cf2e14a1e9d2feea2a6a4a433f28c1a9b286f)
-ok 61 - merge with conflicted --autostash changes
-
-expecting success of 7600.62 'merge early part of c2': 
-	git reset --hard c3 &&
-	echo c4 >c4.c &&
-	git add c4.c &&
-	git commit -m c4 &&
-	git tag c4 &&
-	echo c5 >c5.c &&
-	git add c5.c &&
-	git commit -m c5 &&
-	git tag c5 &&
-	git reset --hard c3 &&
-	echo c6 >c6.c &&
-	git add c6.c &&
-	git commit -m c6 &&
-	git tag c6 &&
-	git branch -f c5-branch c5 &&
-	git merge c5-branch~1 &&
-	git show -s --pretty=tformat:%s HEAD >actual.branch &&
-	git reset --keep HEAD^ &&
-	git merge c5~1 &&
-	git show -s --pretty=tformat:%s HEAD >actual.tag &&
-	test_cmp expected.branch actual.branch &&
-	test_cmp expected.tag actual.tag
-
-HEAD is now at 8976188 commit 3
-[main e193602] c4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-[main faccb43] c5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c5.c
-HEAD is now at 8976188 commit 3
-[main bfc1f93] c6
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 c6.c
-Merge made by the 'ort' strategy.
- c4.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-Merge made by the 'ort' strategy.
- c4.c | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 c4.c
-ok 62 - merge early part of c2
-
-expecting success of 7600.63 'merge --no-ff --no-commit && commit': 
-	git reset --hard c0 &&
-	git merge --no-ff --no-commit c1 &&
-	EDITOR=: git commit &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Automatic merge went well; stopped before committing as requested
-[main 214792f] Merge tag 'c1'
- Author: A U Thor <author@example.com>
-fatal: Needed a single revision
-ok 63 - merge --no-ff --no-commit && commit
-
-expecting success of 7600.64 'amending no-ff merge commit': 
-	EDITOR=: git commit --amend &&
-	verify_parents $c0 $c1
-
-[main 214792f] Merge tag 'c1'
- Author: A U Thor <author@example.com>
- Date: Thu Apr 7 15:34:13 2005 -0700
-fatal: Needed a single revision
-ok 64 - amending no-ff merge commit
-
-expecting success of 7600.65 'merge --no-ff --edit': 
-	git reset --hard c0 &&
-	EDITOR=./editor git merge --no-ff --edit c1 &&
-	verify_parents $c0 $c1 &&
-	git cat-file commit HEAD >raw &&
-	grep "work done on the side branch" raw &&
-	sed "1,/^$/d" >actual raw &&
-	test_cmp expected actual
-
-HEAD is now at 88012a2 commit 0
-Merge made by the 'ort' strategy.
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-fatal: Needed a single revision
-Merge work done on the side branch c1
-ok 65 - merge --no-ff --edit
-
-expecting success of 7600.66 'merge annotated/signed tag w/o tracking': 
-	test_when_finished "rm -rf dst; git tag -d anno1" &&
-	git tag -a -m "anno c1" anno1 c1 &&
-	git init dst &&
-	git rev-parse c1 >dst/expect &&
-	(
-		# c0 fast-forwards to c1 but because this repository
-		# is not a "downstream" whose refs/tags follows along
-		# tag from the "upstream", this pull defaults to --no-ff
-		cd dst &&
-		git pull .. c0 &&
-		git pull .. anno1 &&
-		git rev-parse HEAD^2 >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7600-merge/dst/.git/
-From ..
- * tag               c0         -> FETCH_HEAD
-From ..
- * tag               anno1      -> FETCH_HEAD
-Merge made by the 'ort' strategy.
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-Deleted tag 'anno1' (was 0a8cfaf)
-ok 66 - merge annotated/signed tag w/o tracking
-
-expecting success of 7600.67 'merge annotated/signed tag w/ tracking': 
-	test_when_finished "rm -rf dst; git tag -d anno1" &&
-	git tag -a -m "anno c1" anno1 c1 &&
-	git init dst &&
-	git rev-parse c1 >dst/expect &&
-	(
-		# c0 fast-forwards to c1 and because this repository
-		# is a "downstream" whose refs/tags follows along
-		# tag from the "upstream", this pull defaults to --ff
-		cd dst &&
-		git remote add origin .. &&
-		git pull origin c0 &&
-		git fetch origin &&
-		git merge anno1 &&
-		git rev-parse HEAD >actual &&
-		test_cmp expect actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7600-merge/dst/.git/
-From ..
- * tag               c0         -> FETCH_HEAD
-From ..
- * [new branch]      c5-branch  -> origin/c5-branch
- * [new branch]      kid        -> origin/kid
- * [new branch]      main       -> origin/main
- * [new tag]         anno1      -> anno1
- * [new tag]         c0         -> c0
- * [new tag]         c1         -> c1
- * [new tag]         c5         -> c5
- * [new tag]         c3         -> c3
- * [new tag]         c4         -> c4
-Updating 88012a2..dc8b979
-Fast-forward
- file  | 2 +-
- other | 9 +++++++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 other
-Deleted tag 'anno1' (was 0a8cfaf)
-ok 67 - merge annotated/signed tag w/ tracking
-
-checking prerequisite: GPG
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-GPG" &&
-	gpg_version=$(gpg --version 2>&1)
-	test $? != 127 || exit 1
-
-	# As said here: https://web.archive.org/web/20130212022238/https://www.gnupg.org/faq/gnupg-faq.html#why-does-gnupg-1.0.6-bail-out-on-keyrings-used-with-1.0.7
-	# the gpg version 1.0.6 did not parse trust packets correctly, so for
-	# that version, creation of signed tags using the generated key fails.
-	case "$gpg_version" in
-	"gpg (GnuPG) 1.0.6"*)
-		say "Your version of gpg (1.0.6) is too buggy for testing"
-		exit 1
-		;;
-	*)
-		# Available key info:
-		# * Type DSA and Elgamal, size 2048 bits, no expiration date,
-		#   name and email: C O Mitter <committer@example.com>
-		# * Type RSA, size 2048 bits, no expiration date,
-		#   name and email: Eris Discordia <discord@example.net>
-		# No password given, to enable non-interactive operation.
-		# To generate new key:
-		#	gpg --homedir /tmp/gpghome --gen-key
-		# To write armored exported key to keyring:
-		#	gpg --homedir /tmp/gpghome --export-secret-keys \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		#	gpg --homedir /tmp/gpghome --export \
-		#		--armor 0xDEADBEEF >> lib-gpg/keyring.gpg
-		# To export ownertrust:
-		#	gpg --homedir /tmp/gpghome --export-ownertrust \
-		#		> lib-gpg/ownertrust
-		mkdir "$GNUPGHOME" &&
-		chmod 0700 "$GNUPGHOME" &&
-		(gpgconf --kill all || : ) &&
-		gpg --homedir "${GNUPGHOME}" --import \
-			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" --update-trustdb &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
-			--sign -u committer@example.com
-		;;
-	esac
-
-)
-prerequisite GPG not satisfied
-ok 68 # skip merge --ff-only tag (missing GPG)
-
-ok 69 # skip merge --no-edit tag should skip editor (missing GPG)
-
-expecting success of 7600.70 'set up mod-256 conflict scenario': 
-	# 256 near-identical stanzas...
-	for i in $(test_seq 1 256); do
-		for j in 1 2 3 4 5; do
-			echo $i-$j || return 1
-		done
-	done >file &&
-	git add file &&
-	git commit -m base &&
-
-	# one side changes the first line of each to "main"
-	sed s/-1/-main/ file >tmp &&
-	mv tmp file &&
-	git commit -am main &&
-
-	# and the other to "side"; merging the two will
-	# yield 256 separate conflicts
-	git checkout -b side HEAD^ &&
-	sed s/-1/-side/ file >tmp &&
-	mv tmp file &&
-	git commit -am side
-
-[main 94176f0] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1280 insertions(+), 9 deletions(-)
-[main 98e62a1] main
- Author: A U Thor <author@example.com>
- 1 file changed, 256 insertions(+), 256 deletions(-)
-Switched to a new branch 'side'
-[side aee02fe] side
- Author: A U Thor <author@example.com>
- 1 file changed, 256 insertions(+), 256 deletions(-)
-ok 70 - set up mod-256 conflict scenario
-
-expecting success of 7600.71 'merge detects mod-256 conflicts (recursive)': 
-	git reset --hard &&
-	test_must_fail git merge -s recursive main
-
-HEAD is now at aee02fe side
-Auto-merging file
-CONFLICT (content): Merge conflict in file
-Automatic merge failed; fix conflicts and then commit the result.
-ok 71 - merge detects mod-256 conflicts (recursive)
-
-expecting success of 7600.72 'merge detects mod-256 conflicts (resolve)': 
-	git reset --hard &&
-	test_must_fail git merge -s resolve main
-
-HEAD is now at aee02fe side
-error: Merge requires file-level merging
-Trying really trivial in-index merge...
-Nope.
-Trying simple merge.
-Simple merge failed, trying Automatic merge.
-Auto-merging file
-ERROR: content conflict in file
-fatal: merge program failed
-Automatic merge failed; fix conflicts and then commit the result.
-ok 72 - merge detects mod-256 conflicts (resolve)
-
-expecting success of 7600.73 'merge nothing into void': 
-	git init void &&
-	(
-		cd void &&
-		git remote add up .. &&
-		git fetch up &&
-		test_must_fail git merge FETCH_HEAD
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7600-merge/void/.git/
-From ..
- * [new branch]      c5-branch  -> up/c5-branch
- * [new branch]      kid        -> up/kid
- * [new branch]      main       -> up/main
- * [new branch]      side       -> up/side
- * [new tag]         c1         -> c1
- * [new tag]         c5         -> c5
- * [new tag]         c0         -> c0
- * [new tag]         c3         -> c3
- * [new tag]         c4         -> c4
-fatal: FETCH_HEAD - not something we can merge
-ok 73 - merge nothing into void
-
-expecting success of 7600.74 'merge can be completed with --continue': 
-	git reset --hard c0 &&
-	git merge --no-ff --no-commit c1 &&
-	git merge --continue &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Automatic merge went well; stopped before committing as requested
-[side c2921bd] Merge tag 'c1' into side
- Author: A U Thor <author@example.com>
-fatal: Needed a single revision
-ok 74 - merge can be completed with --continue
-
-expecting success of 7600.75 'killed merge can be completed with --continue': 
-	git reset --hard c0 &&
-	! "$SHELL_PATH" -c '
-	  echo kill -TERM $$ >>.git/FAKE_EDITOR
-	  GIT_EDITOR=.git/FAKE_EDITOR
-	  export GIT_EDITOR
-	  exec git merge --no-ff --edit c1' &&
-	git merge --continue &&
-	verify_parents $c0 $c1
-
-HEAD is now at 88012a2 commit 0
-Terminated
-[side c2921bd] Merge tag 'c1' into side
- Author: A U Thor <author@example.com>
-fatal: Needed a single revision
-ok 75 - killed merge can be completed with --continue
-
-expecting success of 7600.76 'merge --quit': 
-	git init merge-quit &&
-	(
-		cd merge-quit &&
-		test_commit base &&
-		echo one >>base.t &&
-		git commit -am one &&
-		git branch one &&
-		git checkout base &&
-		echo two >>base.t &&
-		git commit -am two &&
-		test_must_fail git -c rerere.enabled=true merge one &&
-		test_path_is_file .git/MERGE_HEAD &&
-		test_path_is_file .git/MERGE_MODE &&
-		test_path_is_file .git/MERGE_MSG &&
-		git rerere status >rerere.before &&
-		git merge --quit &&
-		test_path_is_missing .git/MERGE_HEAD &&
-		test_path_is_missing .git/MERGE_MODE &&
-		test_path_is_missing .git/MERGE_MSG &&
-		git rerere status >rerere.after &&
-		test_must_be_empty rerere.after &&
-		! test_cmp rerere.after rerere.before
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7600-merge/merge-quit/.git/
-[main (root-commit) 814a92b] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[main cc12456] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Note: switching to 'base'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at 814a92b base
-[detached HEAD 89504c3] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Auto-merging base.t
-CONFLICT (content): Merge conflict in base.t
-Recorded preimage for 'base.t'
-Automatic merge failed; fix conflicts and then commit the result.
---- rerere.after	2025-12-18 01:39:16.330773267 +0000
-+++ rerere.before	2025-12-18 01:39:16.326773267 +0000
-@@ -0,0 +1 @@
-+base.t
-ok 76 - merge --quit
-
-expecting success of 7600.77 'merge suggests matching remote refname': 
-	git commit --allow-empty -m not-local &&
-	git update-ref refs/remotes/origin/not-local HEAD &&
-	git reset --hard HEAD^ &&
-
-	# This is white-box testing hackery; we happen to know
-	# that reading packed refs is more picky about the memory
-	# ownership of strings we pass to for_each_ref() callbacks.
-	git pack-refs --all --prune &&
-
-	test_must_fail git merge not-local 2>stderr &&
-	grep origin/not-local stderr
-
-[side 42f3c70] not-local
- Author: A U Thor <author@example.com>
-HEAD is now at c2921bd Merge tag 'c1' into side
-	origin/not-local
-ok 77 - merge suggests matching remote refname
-
-expecting success of 7600.78 'suggested names are not ambiguous': 
-	git update-ref refs/heads/origin/not-local HEAD &&
-	test_must_fail git merge not-local 2>stderr &&
-	grep remotes/origin/not-local stderr
-
-	remotes/origin/not-local
-ok 78 - suggested names are not ambiguous
-
-# passed all 78 test(s)
-1..78
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7112-reset-submodule.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/.git/
-expecting success of 7112.1 'git reset --keep --recurse-submodules: added submodule is checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1/.git/
-[master (root-commit) 63c4304] Base inside first submodule
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2/.git/
-[master (root-commit) 27c5769] nested submodule base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/.git/
-[master (root-commit) 27611a5] Base
- Author: A U Thor <author@example.com>
- 3 files changed, 4 insertions(+)
- create mode 100644 .gitignore
- create mode 100644 file1
- create mode 100644 file2
-Switched to a new branch 'add_sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/uninitialized_sub'...
-done.
-[add_sub1 09bcf53] Add sub1
- Author: A U Thor <author@example.com>
- 2 files changed, 8 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 uninitialized_sub
-Switched to a new branch 'remove_sub1'
-warning: unable to rmdir 'sub1': Directory not empty
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-[remove_sub1 d6ba723] Revert "Add sub1"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 3 files changed, 9 deletions(-)
- delete mode 100644 .gitmodules
- delete mode 160000 sub1
- delete mode 160000 uninitialized_sub
-Switched to a new branch 'modify_sub1'
-Switched to a new branch 'modifications'
-[modifications 03da4ea] modified file2 and added file3
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 file3
-To /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1
- * [new branch]      modifications -> modifications
-[modify_sub1 cb2bda7] Modify sub1
- Author: A U Thor <author@example.com>
-Switched to a new branch 'add_nested_sub'
-Switched to a new branch 'add_nested_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_repo/sub1/sub2'...
-done.
-[add_nested_sub 8b3b335] add a nested submodule
- Author: A U Thor <author@example.com>
- 2 files changed, 5 insertions(+)
- create mode 100644 .gitmodules
- create mode 160000 sub2
-[add_nested_sub 5bc57bf] update submodule, that updates a nested submodule
- Author: A U Thor <author@example.com>
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-Switched to a new branch 'modify_sub1_recursively'
-[modify_sub1_recursively c7c4624] make a change in nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file3
-[modify_sub1_recursively 92fc14a] update nested sub
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-[modify_sub1_recursively 953e869] update sub1, that updates nested sub
- Author: A U Thor <author@example.com>
-To /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-To /build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2
- * [new branch]      modify_sub1_recursively -> modify_sub1_recursively
-Cleared directory 'sub2'
-Submodule 'sub2' (../submodule_update_sub2) unregistered for path 'sub2'
-Switched to a new branch 'replace_sub1_with_directory'
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Previous HEAD position was 63c4304 Base inside first submodule
-Switched to branch 'modifications'
-rm 'sub1'
-[replace_sub1_with_directory cb28587] Replace sub1 with directory
- Author: A U Thor <author@example.com>
- 5 files changed, 3 insertions(+), 5 deletions(-)
- delete mode 160000 sub1
- create mode 100644 sub1/file1
- create mode 100644 sub1/file2
- create mode 100644 sub1/file3
-Switched to a new branch 'replace_directory_with_sub1'
-[replace_directory_with_sub1 a2e65d5] Revert "Replace sub1 with directory"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 4 files changed, 4 insertions(+), 3 deletions(-)
- delete mode 100644 sub1/file1
- delete mode 100644 sub1/file2
- delete mode 100644 sub1/file3
-Switched to a new branch 'replace_sub1_with_file'
-rm 'sub1'
-[replace_sub1_with_file 2364f5a] Replace sub1 with file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+), 5 deletions(-)
- mode change 160000 => 100644 sub1
-Switched to a new branch 'replace_file_with_sub1'
-[replace_file_with_sub1 8b6fdfc] Revert "Replace sub1 with file"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
- 2 files changed, 5 insertions(+), 1 deletion(-)
- mode change 100644 => 160000 sub1
-Switched to a new branch 'invalid_sub1'
-[invalid_sub1 e6169bf] Invalid sub1 commit
- Author: A U Thor <author@example.com>
-Switched to a new branch 'valid_sub1'
-[valid_sub1 3036e4e] Revert "Invalid sub1 commit"
- Author: A U Thor <author@example.com>
- Date: Fri Apr 1 13:14:15 2005 +0200
-warning: unable to rmdir 'uninitialized_sub': Directory not empty
-Switched to branch 'master'
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 1 - git reset --keep --recurse-submodules: added submodule is checked out
-
-expecting success of 7112.2 'git reset --keep --recurse-submodules: added submodule is checked out in empty dir': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 2 - git reset --keep --recurse-submodules: added submodule is checked out in empty dir
-
-expecting success of 7112.3 'git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-ok 3 - git reset --keep --recurse-submodules: replace tracked file with submodule checks out submodule
-
-expecting success of 7112.4 'git reset --keep --recurse-submodules: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-ok 4 - git reset --keep --recurse-submodules: replace directory with submodule
-
-expecting success of 7112.5 'git reset --keep --recurse-submodules: nested submodules are checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 5 - git reset --keep --recurse-submodules: nested submodules are checked out
-
-expecting success of 7112.6 'git reset --keep --recurse-submodules: removed submodule removes submodules working tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-ok 6 - git reset --keep --recurse-submodules: removed submodule removes submodules working tree
-
-expecting success of 7112.7 'git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-ok 7 - git reset --keep --recurse-submodules: removed submodule absorbs submodules .git directory
-
-expecting success of 7112.8 'git reset --keep --recurse-submodules: replace submodule with a file': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 8 - git reset --keep --recurse-submodules: replace submodule with a file
-
-checking known breakage of 7112.9 'git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/untrackedfile &&
-			test_must_fail $command replace_sub1_with_file &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test -f sub1/untracked_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --keep --recurse-submodules replace_sub1_with_file
-not ok 9 - git reset --keep --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
-
-expecting success of 7112.10 'git reset --keep --recurse-submodules: worktrees of nested submodules are removed': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t no_submodule origin/no_submodule &&
-			$command no_submodule &&
-			test_superproject_content origin/no_submodule &&
-			test_path_is_missing sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
-			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-ok 10 - git reset --keep --recurse-submodules: worktrees of nested submodules are removed
-
-expecting success of 7112.11 'git reset --keep --recurse-submodules: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 11 - git reset --keep --recurse-submodules: modified submodule updates submodule work tree
-
-expecting success of 7112.12 'git reset --keep --recurse-submodules: updating to a missing submodule commit fails': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			test_must_fail $command invalid_sub1 2>err &&
-			test_grep sub1 err &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-fatal: Could not reset index file to revision 'invalid_sub1'.
-ok 12 - git reset --keep --recurse-submodules: updating to a missing submodule commit fails
-
-expecting success of 7112.13 'git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git -C sub1 checkout -b keep_branch &&
-			git -C sub1 rev-parse HEAD >expect &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1 &&
-			git -C sub1 rev-parse keep_branch >actual &&
-			test_cmp expect actual &&
-			test_must_fail git -C sub1 symbolic-ref HEAD
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Switched to a new branch 'keep_branch'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-fatal: ref HEAD is not a symbolic ref
-ok 13 - git reset --keep --recurse-submodules: submodule branch is not changed, detach HEAD instead
-
-expecting success of 7112.14 'git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			: >sub1 &&
-			test_must_fail $command add_sub1 &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'add_sub1'.
-ok 14 - git reset --keep --recurse-submodules: added submodule doesn't remove untracked file with same name
-
-expecting success of 7112.15 'git reset --keep --recurse-submodules: added submodule removes an untracked ignored file': 
-		test_when_finished "rm -rf submodule_update/.git/info" &&
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			: >sub1 &&
-			mkdir .git/info &&
-			echo sub1 >.git/info/exclude &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-ok 15 - git reset --keep --recurse-submodules: added submodule removes an untracked ignored file
-
-checking known breakage of 7112.16 'git reset --keep --recurse-submodules: replace submodule with a directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_submodule_content sub1 origin/replace_sub1_with_directory
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-not ok 16 - git reset --keep --recurse-submodules: replace submodule with a directory # TODO known breakage
-
-checking known breakage of 7112.17 'git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-not ok 17 - git reset --keep --recurse-submodules: replace submodule containing a .git directory with a directory must absorb the git dir # TODO known breakage
-
-expecting success of 7112.18 'git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule': 
-		test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			rm -rf .git/modules/sub1/info &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			mkdir .git/modules/sub1/info &&
-			echo ignored >.git/modules/sub1/info/exclude &&
-			: >sub1/ignored &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-ok 18 - git reset --keep --recurse-submodules: replace submodule with a file works ignores ignored files in submodule
-
-expecting success of 7112.19 'git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			git -c submodule.recurse=true $cmd_args modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-ok 19 - git -c submodule.recurse=true reset --keep: modified submodule updates submodule work tree
-
-expecting success of 7112.20 'git reset --keep --recurse-submodules: modified submodule updates submodule recursively': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-ok 20 - git reset --keep --recurse-submodules: modified submodule updates submodule recursively
-
-expecting success of 7112.21 'git reset --hard --recurse-submodules: added submodule is checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 21 - git reset --hard --recurse-submodules: added submodule is checked out
-
-expecting success of 7112.22 'git reset --hard --recurse-submodules: added submodule is checked out in empty dir': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 22 - git reset --hard --recurse-submodules: added submodule is checked out in empty dir
-
-expecting success of 7112.23 'git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-HEAD is now at 8b6fdfc Revert "Replace sub1 with file"
-ok 23 - git reset --hard --recurse-submodules: replace tracked file with submodule checks out submodule
-
-expecting success of 7112.24 'git reset --hard --recurse-submodules: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to_interested replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-HEAD is now at a2e65d5 Revert "Replace sub1 with directory"
-ok 24 - git reset --hard --recurse-submodules: replace directory with submodule
-
-expecting success of 7112.25 'git reset --hard --recurse-submodules: nested submodules are checked out': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
-			$command modify_sub1_recursively &&
-			test_superproject_content origin/modify_sub1_recursively &&
-			test_submodule_content sub1 origin/modify_sub1_recursively &&
-			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'modify_sub1_recursively' set up to track 'origin/modify_sub1_recursively'.
-HEAD is now at 953e869 update sub1, that updates nested sub
-ok 25 - git reset --hard --recurse-submodules: nested submodules are checked out
-
-expecting success of 7112.26 'git reset --hard --recurse-submodules: removed submodule removes submodules working tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 26 - git reset --hard --recurse-submodules: removed submodule removes submodules working tree
-
-expecting success of 7112.27 'git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			! test -e sub1 &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 27 - git reset --hard --recurse-submodules: removed submodule absorbs submodules .git directory
-
-expecting success of 7112.28 'git reset --hard --recurse-submodules: replace submodule with a file': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file &&
-			test -f sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-ok 28 - git reset --hard --recurse-submodules: replace submodule with a file
-
-checking known breakage of 7112.29 'git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/untrackedfile &&
-			test_must_fail $command replace_sub1_with_file &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test -f sub1/untracked_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-test_must_fail: command succeeded: git reset --hard --recurse-submodules replace_sub1_with_file
-not ok 29 - git reset --hard --recurse-submodules: replace submodule with a file must fail with untracked files # TODO known breakage
-
-expecting success of 7112.30 'git reset --hard --recurse-submodules: worktrees of nested submodules are removed': 
-		prolog &&
-		reset_work_tree_to_interested add_nested_sub &&
-		(
-			cd submodule_update &&
-			git branch -t no_submodule origin/no_submodule &&
-			$command no_submodule &&
-			test_superproject_content origin/no_submodule &&
-			test_path_is_missing sub1 &&
-			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
-			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_nested_sub'
-branch 'add_nested_sub' set up to track 'origin/add_nested_sub'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '8b3b3353ac8999eb3d8af8e947e0ef2a08a60008'
-Submodule 'sub2' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub2) registered for path 'sub1/sub2'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/sub2'...
-done.
-Submodule path 'sub1/sub2': checked out '27c5769ac0ebf2d924e34d3aa503345baaaa98b2'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-HEAD is now at 27611a5 Base
-ok 30 - git reset --hard --recurse-submodules: worktrees of nested submodules are removed
-
-expecting success of 7112.31 'git reset --hard --recurse-submodules: modified submodule updates submodule work tree': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-ok 31 - git reset --hard --recurse-submodules: modified submodule updates submodule work tree
-
-expecting success of 7112.32 'git reset --hard --recurse-submodules: updating to a missing submodule commit fails': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			test_must_fail $command invalid_sub1 2>err &&
-			test_grep sub1 err &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-error: Submodule 'sub1' could not be updated.
-error: Submodule 'sub1' cannot checkout new HEAD.
-fatal: Could not reset index file to revision 'invalid_sub1'.
-ok 32 - git reset --hard --recurse-submodules: updating to a missing submodule commit fails
-
-expecting success of 7112.33 'git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git -C sub1 checkout -b keep_branch &&
-			git -C sub1 rev-parse HEAD >expect &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1 &&
-			git -C sub1 rev-parse keep_branch >actual &&
-			test_cmp expect actual &&
-			test_must_fail git -C sub1 symbolic-ref HEAD
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Switched to a new branch 'keep_branch'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-fatal: ref HEAD is not a symbolic ref
-ok 33 - git reset --hard --recurse-submodules: submodule branch is not changed, detach HEAD instead
-
-expecting success of 7112.34 'git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced': 
-		prolog &&
-		reset_work_tree_to_interested no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 34 - git reset --hard --recurse-submodules: added submodule does remove untracked unignored file with same name when forced
-
-expecting success of 7112.35 'git reset --hard --recurse-submodules: replace submodule with a directory': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-HEAD is now at cb28587 Replace sub1 with directory
-ok 35 - git reset --hard --recurse-submodules: replace submodule with a directory
-
-expecting success of 7112.36 'git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			rm -rf .git/modules/sub1 &&
-			$command replace_sub1_with_directory &&
-			test_superproject_content origin/replace_sub1_with_directory &&
-			test_git_directory_exists sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-Migrating git directory of 'sub1' from
-'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1/.git' to
-'/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/.git/modules/sub1'
-HEAD is now at cb28587 Replace sub1 with directory
-ok 36 - git reset --hard --recurse-submodules: replace submodule containing a .git directory with a directory must fail
-
-expecting success of 7112.37 'git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			: >sub1/expect &&
-			$command replace_sub1_with_file &&
-			test_superproject_content origin/replace_sub1_with_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-ok 37 - git reset --hard --recurse-submodules: replace submodule with a file ignoring ignored files
-
-expecting success of 7112.38 'git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to_interested invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-HEAD is now at 3036e4e Revert "Invalid sub1 commit"
-ok 38 - git reset --hard --recurse-submodules: modified submodule does update submodule work tree from invalid commit
-
-expecting success of 7112.39 'git reset --hard --recurse-submodules: updating submodules fixes .git links': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			echo "gitdir: bogus/path" >sub1/.git &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-ok 39 - git reset --hard --recurse-submodules: updating submodules fixes .git links
-
-expecting success of 7112.40 'git reset --hard --recurse-submodules: changed submodule worktree is reset': 
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			rm sub1/file1 &&
-			: >sub1/new_file &&
-			git -C sub1 add new_file &&
-			$command HEAD &&
-			test_path_is_file sub1/file1 &&
-			test_path_is_missing sub1/new_file
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-HEAD is now at 09bcf53 Add sub1
-ok 40 - git reset --hard --recurse-submodules: changed submodule worktree is reset
-
-expecting success of 7112.41 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 41 - git_test_func: added submodule creates empty directory
-
-expecting success of 7112.42 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 42 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 7112.43 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 43 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 7112.44 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 44 - git_test_func: replace directory with submodule
-
-expecting success of 7112.45 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 45 - git_test_func: removed submodule leaves submodule directory and its contents in place
-
-expecting success of 7112.46 'git_test_func: removed submodule leaves submodule containing a .git directory alone': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 46 - git_test_func: removed submodule leaves submodule containing a .git directory alone
-
-expecting success of 7112.47 'git_test_func: replace submodule with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 47 - git_test_func: replace submodule with a directory must fail
-
-expecting success of 7112.48 'git_test_func: replace submodule containing a .git directory with a directory must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_directory test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 48 - git_test_func: replace submodule containing a .git directory with a directory must fail
-
-checking known breakage of 7112.49 'git_test_func: replace submodule with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
-not ok 49 - git_test_func: replace submodule with a file must fail # TODO known breakage
-
-checking known breakage of 7112.50 'git_test_func: replace submodule containing a .git directory with a file must fail': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			replace_gitfile_with_git_dir sub1 &&
-			$command replace_sub1_with_file test_must_fail &&
-			test_superproject_content origin/add_sub1 &&
-			test_git_directory_is_unchanged sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --keep replace_sub1_with_file
-not ok 50 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
-
-expecting success of 7112.51 'git_test_func: modified submodule does not update submodule work tree': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			git submodule update &&
-			test_submodule_content sub1 origin/modify_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 51 - git_test_func: modified submodule does not update submodule work tree
-
-expecting success of 7112.52 'git_test_func: modified submodule does not update submodule work tree to invalid commit': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t invalid_sub1 origin/invalid_sub1 &&
-			$command invalid_sub1 &&
-			test_superproject_content origin/invalid_sub1 &&
-			test_submodule_content sub1 origin/add_sub1 &&
-			test_must_fail git submodule update &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 52 - git_test_func: modified submodule does not update submodule work tree to invalid commit
-
-expecting success of 7112.53 'git_test_func: modified submodule does not update submodule work tree from invalid commit': 
-		prolog &&
-		reset_work_tree_to invalid_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t valid_sub1 origin/valid_sub1 &&
-			$command valid_sub1 &&
-			test_superproject_content origin/valid_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/valid_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'invalid_sub1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 53 - git_test_func: modified submodule does not update submodule work tree from invalid commit
-
-expecting success of 7112.54 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'add_sub1'.
-ok 54 - git_test_func: added submodule doesn't remove untracked unignored file with same name
-
-expecting success of 7112.55 'git_test_func: added submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 55 - git_test_func: added submodule creates empty directory
-
-expecting success of 7112.56 'git_test_func: added submodule leaves existing empty directory alone': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			mkdir sub1 &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 56 - git_test_func: added submodule leaves existing empty directory alone
-
-expecting success of 7112.57 'git_test_func: replace tracked file with submodule creates empty directory': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_file &&
-		(
-			cd submodule_update &&
-			git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
-			$command replace_file_with_sub1 &&
-			test_superproject_content origin/replace_file_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_file_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_file'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-fatal: Needed a single revision
-branch 'replace_file_with_sub1' set up to track 'origin/replace_file_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 57 - git_test_func: replace tracked file with submodule creates empty directory
-
-expecting success of 7112.58 'git_test_func: replace directory with submodule': 
-		prolog &&
-		reset_work_tree_to replace_sub1_with_directory &&
-		(
-			cd submodule_update &&
-			git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
-			$command replace_directory_with_sub1 &&
-			test_superproject_content origin/replace_directory_with_sub1 &&
-			test_dir_is_empty sub1 &&
-			git submodule update --init --recursive &&
-			test_submodule_content sub1 origin/replace_directory_with_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'replace_sub1_with_directory'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-fatal: Needed a single revision
-branch 'replace_directory_with_sub1' set up to track 'origin/replace_directory_with_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 58 - git_test_func: replace directory with submodule
-
-expecting success of 7112.59 'git_test_func: removed submodule leaves submodule directory and its contents in place': 
-		prolog &&
-		reset_work_tree_to add_sub1 &&
-		(
-			cd submodule_update &&
-			git branch -t remove_sub1 origin/remove_sub1 &&
-			$command remove_sub1 &&
-			test_superproject_content origin/remove_sub1 &&
-			test_submodule_content sub1 origin/add_sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'add_sub1'
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 59 - git_test_func: removed submodule leaves submodule directory and its contents in place
+	test_config merge.ff only &&
+	git merge --no-ff c1
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-ok 60 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+HEAD is now at 88012a2 commit 0
+Merge made by the 'ort' strategy.
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+ok 40 - option --no-ff overrides merge.ff=only config
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 61 - git_test_func: replace submodule with a directory must fail
+expecting success of 7600.41 'merge c0 with c1 (ff overrides no-ff)': 
+	git reset --hard c0 &&
+	test_config branch.main.mergeoptions "--no-ff" &&
+	git merge --ff c1 &&
+	verify_merge file result.1 &&
+	verify_head $c1
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-error: Untracked working tree file 'sub1/file1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'replace_sub1_with_directory'.
-ok 62 - git_test_func: replace submodule containing a .git directory with a directory must fail
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+ok 41 - merge c0 with c1 (ff overrides no-ff)
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
-not ok 63 - git_test_func: replace submodule with a file must fail # TODO known breakage
+expecting success of 7600.42 'merge log message': 
+	git reset --hard c0 &&
+	git merge --no-log c2 &&
+	git show -s --pretty=format:%b HEAD >msg.act &&
+	test_must_be_empty msg.act &&
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-test_must_fail: command succeeded: git reset --merge replace_sub1_with_file
-not ok 64 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+	git reset --hard c0 &&
+	test_config branch.main.mergeoptions "--no-ff" &&
+	git merge --no-log c2 &&
+	git show -s --pretty=format:%b HEAD >msg.act &&
+	test_must_be_empty msg.act &&
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 65 - git_test_func: modified submodule does not update submodule work tree
+	git merge --log c3 &&
+	git show -s --pretty=format:%b HEAD >msg.act &&
+	test_cmp msg.log msg.act &&
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 66 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+	git reset --hard HEAD^ &&
+	test_config merge.log "yes" &&
+	git merge c3 &&
+	git show -s --pretty=format:%b HEAD >msg.act &&
+	test_cmp msg.log msg.act
 
-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'.
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..ac59201
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 88012a2 commit 0
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 8e82df1 Merge tag 'c2'
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 42 - merge log message
+
+expecting success of 7600.43 'merge c1 with c0, c2, c0, and c1': 
+	git reset --hard c1 &&
+	test_tick &&
+	git merge c0 c2 c0 c1 &&
+	verify_merge file result.1-5 &&
+	verify_parents $c1 $c2
+
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 fatal: Needed a single revision
-branch 'valid_sub1' set up to track 'origin/valid_sub1'.
-Submodule 'sub1' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 67 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+ok 43 - merge c1 with c0, c2, c0, and c1
 
-expecting success of 7112.68 'git_test_func: added submodule doesn't remove untracked unignored file with same name': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 test_must_fail &&
-			test_superproject_content origin/no_submodule &&
-			test_must_be_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-error: Untracked working tree file 'sub1' would be overwritten by merge.
-fatal: Could not reset index file to revision 'add_sub1'.
-ok 68 - git_test_func: added submodule doesn't remove untracked unignored file with same name
+expecting success of 7600.44 'merge c1 with c0, c2, c0, and c1': 
+	git reset --hard c1 &&
+	test_tick &&
+	git merge c0 c2 c0 c1 &&
+	verify_merge file result.1-5 &&
+	verify_parents $c1 $c2
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 69 - git_test_func: added submodule creates empty directory
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Needed a single revision
+ok 44 - merge c1 with c0, c2, c0, and c1
 
-expecting success of 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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 70 - git_test_func: added submodule leaves existing empty directory alone
+expecting success of 7600.45 'merge c1 with c1 and c2': 
+	git reset --hard c1 &&
+	test_tick &&
+	git merge c1 c2 &&
+	verify_merge file result.1-5 &&
+	verify_parents $c1 $c2
 
-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'.
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 fatal: Needed a single revision
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 71 - git_test_func: replace tracked file with submodule creates empty directory
+ok 45 - merge c1 with c1 and c2
 
-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'.
+expecting success of 7600.46 'merge fast-forward in a dirty tree': 
+	git reset --hard c0 &&
+	mv file file1 &&
+	cat file1 >file &&
+	rm -f file1 &&
+	git merge c2
+
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..ac59201
+Fast-forward
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 46 - merge fast-forward in a dirty tree
+
+expecting success of 7600.47 'in-index merge': 
+	git reset --hard c0 &&
+	git merge --no-ff -s resolve c1 >out &&
+	test_grep "Wonderful." out &&
+	verify_parents $c0 $c1
+
+HEAD is now at 88012a2 commit 0
+Wonderful.
 fatal: Needed a single revision
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 72 - git_test_func: replace directory with submodule
+ok 47 - in-index merge
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 73 - git_test_func: removed submodule leaves submodule directory and its contents in place
+expecting success of 7600.48 'refresh the index before merging': 
+	git reset --hard c1 &&
+	cp file file.n && mv -f file.n file &&
+	git merge c3
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'remove_sub1' set up to track 'origin/remove_sub1'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at d6ba723 Revert "Add sub1"
-ok 74 - git_test_func: removed submodule leaves submodule containing a .git directory alone
+HEAD is now at dc8b979 commit 1
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 48 - refresh the index before merging
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at cb28587 Replace sub1 with directory
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
-not ok 75 - git_test_func: replace submodule with a directory must fail # TODO known breakage
+expecting success of 7600.49 'merge with --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git merge --autostash c2 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_directory' set up to track 'origin/replace_sub1_with_directory'.
-warning: unable to rmdir 'sub1': Directory not empty
-HEAD is now at cb28587 Replace sub1 with directory
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_directory
-not ok 76 - git_test_func: replace submodule containing a .git directory with a directory must fail # TODO known breakage
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Applied autostash.
+ok 49 - merge with --autostash
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
-not ok 77 - git_test_func: replace submodule with a file must fail # TODO known breakage
+expecting success of 7600.50 'merge with merge.autoStash': 
+	test_config merge.autoStash true &&
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git merge c2 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'replace_sub1_with_file' set up to track 'origin/replace_sub1_with_file'.
-HEAD is now at 2364f5a Replace sub1 with file
-test_must_fail: command succeeded: git reset --hard replace_sub1_with_file
-not ok 78 - git_test_func: replace submodule containing a .git directory with a file must fail # TODO known breakage
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Applied autostash.
+ok 50 - merge with merge.autoStash
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'modify_sub1' set up to track 'origin/modify_sub1'.
-HEAD is now at cb2bda7 Modify sub1
-Submodule path 'sub1': checked out '03da4ea88bb165bd26ee0b2e5c657f2858b23f53'
-ok 79 - git_test_func: modified submodule does not update submodule work tree
+expecting success of 7600.51 'fast-forward merge with --autostash': 
+	git reset --hard c0 &&
+	git merge-file file file.orig file.5 &&
+	git merge --autostash c1 2>err &&
+	test_grep "Applied autostash." err &&
+	test_cmp result.1-5 file
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-branch 'invalid_sub1' set up to track 'origin/invalid_sub1'.
-HEAD is now at e6169bf Invalid sub1 commit
-fatal: git upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: remote error: upload-pack: not our ref 0123456789012345678901234567890123456789
-fatal: Fetched in submodule path 'sub1', but it did not contain 0123456789012345678901234567890123456789. Direct fetching of that commit failed.
-ok 80 - git_test_func: modified submodule does not update submodule work tree to invalid commit
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Created autostash: 4d9e18f
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+Applied autostash.
+ok 51 - fast-forward merge with --autostash
 
-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.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'sub1'
-Submodule 'uninitialized_sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update_sub1) registered for path 'uninitialized_sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/sub1'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7112-reset-submodule/submodule_update/uninitialized_sub'...
-done.
-Submodule path 'sub1': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-Submodule path 'uninitialized_sub': checked out '63c430421a9604f896526f8a04236bdfe3ac1fc1'
-ok 81 - git_test_func: modified submodule does not update submodule work tree from invalid commit
+expecting success of 7600.52 'failed fast-forward merge with --autostash': 
+	git reset --hard c0 &&
+	git merge-file file file.orig file.5 &&
+	cp file.5 other &&
+	test_when_finished "rm other" &&
+	test_must_fail git merge --autostash c1 2>err &&
+	test_grep "Applied autostash." err &&
+	test_cmp file.5 file
 
-expecting success of 7112.82 'git_test_func: added submodule does remove untracked unignored file with same name when forced': 
-		prolog &&
-		reset_work_tree_to no_submodule &&
-		(
-			cd submodule_update &&
-			git branch -t add_sub1 origin/add_sub1 &&
-			>sub1 &&
-			$command add_sub1 &&
-			test_superproject_content origin/add_sub1 &&
-			test_dir_is_empty sub1
-		)
-	
-Cloning into 'submodule_update'...
-done.
-Switched to a new branch 'no_submodule'
-branch 'no_submodule' set up to track 'origin/no_submodule'.
-branch 'add_sub1' set up to track 'origin/add_sub1'.
-HEAD is now at 09bcf53 Add sub1
-ok 82 - git_test_func: added submodule does remove untracked unignored file with same name when forced
+HEAD is now at 88012a2 commit 0
+Updating 88012a2..dc8b979
+Created autostash: 4d9e18f
+Applied autostash.
+ok 52 - failed fast-forward merge with --autostash
 
-# still have 12 known breakage(s)
-# passed all remaining 70 test(s)
-1..82
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7704-repack-cruft.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 7600.53 'octopus merge with --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.3 &&
+	git merge --autostash c2 c3 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5-9 merge-result &&
+	test_cmp result.1-3-5-9 file
 
-		git branch -M main &&
+HEAD is now at dc8b979 commit 1
+Created autostash: 27fb9f9
+Trying simple merge with c2
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Trying simple merge with c3
+Simple merge did not work, trying automatic merge.
+Auto-merging file
+Merge made by the 'octopus' strategy.
+ file | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Applied autostash.
+ok 53 - octopus merge with --autostash
 
-		test_commit base &&
+expecting success of 7600.54 'failed merge (exit 2) with --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.5 &&
+	test_must_fail git merge -s recursive --autostash c2 c3 2>err &&
+	test_grep "Applied autostash." err &&
+	test_cmp result.1-5 file
 
-		git checkout -b cruft &&
-		test_commit --no-tag cruft &&
+HEAD is now at dc8b979 commit 1
+Created autostash: 92dee98
+Applied autostash.
+ok 54 - failed merge (exit 2) with --autostash
 
-		git rev-list --objects --no-object-names main..cruft >moved.raw &&
-		sort moved.raw >moved.want &&
+expecting success of 7600.55 'conflicted merge with --autostash, --abort restores stash': 
+	git reset --hard c3 &&
+	cp file.1 file &&
+	test_must_fail git merge --autostash c7 &&
+	git merge --abort 2>err &&
+	test_grep "Applied autostash." err &&
+	test_cmp file.1 file
 
-		git rev-list --all --objects --no-object-names >expect.raw &&
-		sort expect.raw >expect &&
+HEAD is now at 8976188 commit 3
+Created autostash: e782531
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+When finished, apply stashed changes with `git stash pop`
+Applied autostash.
+ok 55 - conflicted merge with --autostash, --abort restores stash
 
-		git checkout main &&
-		git branch -D cruft &&
-		git reflog expire --all --expire=all &&
+expecting success of 7600.56 'completed merge (git commit) with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git commit 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
 
-		git init --bare expired.git &&
-		git repack -d \
-			--cruft --cruft-expiration="now" \
-			--expire-to="expired.git/objects/pack/pack" &&
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+[main 35e0f0d] Merge tag 'c2'
+ Author: A U Thor <author@example.com>
+Applied autostash.
+ok 56 - completed merge (git commit) with --no-commit and --autostash
 
-		expired="$(ls expired.git/objects/pack/pack-*.idx)" &&
-		test_path_is_file "${expired%.idx}.mtimes" &&
+expecting success of 7600.57 'completed merge (git merge --continue) with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git merge --continue 2>err &&
+	test_grep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
 
-		# 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 &&
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+[main 35e0f0d] Merge tag 'c2'
+ Author: A U Thor <author@example.com>
+Applied autostash.
+ok 57 - completed merge (git merge --continue) with --no-commit and --autostash
 
-		# ...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 7600.58 'aborted merge (merge --abort) with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git merge --abort 2>err &&
+	test_grep "Applied autostash." err &&
+	git diff >actual &&
+	test_cmp expect actual
 
-		# 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
-	)
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+Applied autostash.
+ok 58 - aborted merge (merge --abort) with --no-commit and --autostash
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7704-repack-cruft/expire-to-now/.git/
-[main (root-commit) d1ff1c9] base
+expecting success of 7600.59 'aborted merge (reset --hard) with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git reset --hard 2>err &&
+	test_grep "Autostash exists; creating a new stash entry." err &&
+	git diff --exit-code
+
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+HEAD is now at dc8b979 commit 1
+Autostash exists; creating a new stash entry.
+ok 59 - aborted merge (reset --hard) with --no-commit and --autostash
+
+expecting success of 7600.60 'quit merge with --no-commit and --autostash': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git diff HEAD >expect &&
+	git merge --quit 2>err &&
+	test_grep "Autostash exists; creating a new stash entry." err &&
+	git diff HEAD >actual &&
+	test_cmp expect actual
+
+HEAD is now at dc8b979 commit 1
+Created autostash: a0a2bb4
+Auto-merging file
+Automatic merge went well; stopped before committing as requested
+When finished, apply stashed changes with `git stash pop`
+Autostash exists; creating a new stash entry.
+ok 60 - quit merge with --no-commit and --autostash
+
+expecting success of 7600.61 'merge with conflicted --autostash changes': 
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9y &&
+	git diff >expect &&
+	test_when_finished "test_might_fail git stash drop" &&
+	git merge --autostash c3 2>err &&
+	test_grep "Applying autostash resulted in conflicts." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-9 merge-result &&
+	git stash show -p >actual &&
+	test_cmp expect actual
+
+HEAD is now at dc8b979 commit 1
+Created autostash: 098cf2e
+Auto-merging file
+Merge made by the 'ort' strategy.
+ file | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Applying autostash resulted in conflicts.
+Dropped refs/stash@{0} (098cf2e14a1e9d2feea2a6a4a433f28c1a9b286f)
+ok 61 - merge with conflicted --autostash changes
+
+expecting success of 7600.62 'merge early part of c2': 
+	git reset --hard c3 &&
+	echo c4 >c4.c &&
+	git add c4.c &&
+	git commit -m c4 &&
+	git tag c4 &&
+	echo c5 >c5.c &&
+	git add c5.c &&
+	git commit -m c5 &&
+	git tag c5 &&
+	git reset --hard c3 &&
+	echo c6 >c6.c &&
+	git add c6.c &&
+	git commit -m c6 &&
+	git tag c6 &&
+	git branch -f c5-branch c5 &&
+	git merge c5-branch~1 &&
+	git show -s --pretty=tformat:%s HEAD >actual.branch &&
+	git reset --keep HEAD^ &&
+	git merge c5~1 &&
+	git show -s --pretty=tformat:%s HEAD >actual.tag &&
+	test_cmp expected.branch actual.branch &&
+	test_cmp expected.tag actual.tag
+
+HEAD is now at 8976188 commit 3
+[main e193602] c4
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'cruft'
-[cruft 7b73700] cruft
+ create mode 100644 c4.c
+[main faccb43] c5
  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.45.2/t/trash directory.t7704-repack-cruft/expire-to-now/expired.git/
-ok 1 - --expire-to stores pruned objects (now)
+ create mode 100644 c5.c
+HEAD is now at 8976188 commit 3
+[main bfc1f93] c6
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c6.c
+Merge made by the 'ort' strategy.
+ c4.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.c
+Merge made by the 'ort' strategy.
+ c4.c | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 c4.c
+ok 62 - merge early part of c2
 
-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 &&
+expecting success of 7600.63 'merge --no-ff --no-commit && commit': 
+	git reset --hard c0 &&
+	git merge --no-ff --no-commit c1 &&
+	EDITOR=: git commit &&
+	verify_parents $c0 $c1
 
-		git branch -M main &&
+HEAD is now at 88012a2 commit 0
+Automatic merge went well; stopped before committing as requested
+[main 214792f] Merge tag 'c1'
+ Author: A U Thor <author@example.com>
+fatal: Needed a single revision
+ok 63 - merge --no-ff --no-commit && commit
 
-		test_commit base &&
+expecting success of 7600.64 'amending no-ff merge commit': 
+	EDITOR=: git commit --amend &&
+	verify_parents $c0 $c1
 
-		# 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 &&
+[main 214792f] Merge tag 'c1'
+ Author: A U Thor <author@example.com>
+ Date: Thu Apr 7 15:34:13 2005 -0700
+fatal: Needed a single revision
+ok 64 - amending no-ff merge commit
 
-		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)" &&
+expecting success of 7600.65 'merge --no-ff --edit': 
+	git reset --hard c0 &&
+	EDITOR=./editor git merge --no-ff --edit c1 &&
+	verify_parents $c0 $c1 &&
+	git cat-file commit HEAD >raw &&
+	grep "work done on the side branch" raw &&
+	sed "1,/^$/d" >actual raw &&
+	test_cmp expected actual
 
-		# 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 &&
+HEAD is now at 88012a2 commit 0
+Merge made by the 'ort' strategy.
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+fatal: Needed a single revision
+Merge work done on the side branch c1
+ok 65 - merge --no-ff --edit
 
-		# moved.want holds the set of objects we expect to find
-		# in expired.git
-		git rev-list --objects --no-object-names main..stale >out &&
-		sort out >moved.want &&
+expecting success of 7600.66 'merge annotated/signed tag w/o tracking': 
+	test_when_finished "rm -rf dst; git tag -d anno1" &&
+	git tag -a -m "anno c1" anno1 c1 &&
+	git init dst &&
+	git rev-parse c1 >dst/expect &&
+	(
+		# c0 fast-forwards to c1 but because this repository
+		# is not a "downstream" whose refs/tags follows along
+		# tag from the "upstream", this pull defaults to --no-ff
+		cd dst &&
+		git pull .. c0 &&
+		git pull .. anno1 &&
+		git rev-parse HEAD^2 >actual &&
+		test_cmp expect actual
+	)
 
-		git checkout main &&
-		git branch -D stale recent &&
-		git reflog expire --all --expire=all &&
-		git prune-packed &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7600-merge/dst/.git/
+From ..
+ * tag               c0         -> FETCH_HEAD
+From ..
+ * tag               anno1      -> FETCH_HEAD
+Merge made by the 'ort' strategy.
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+Deleted tag 'anno1' (was 0a8cfaf)
+ok 66 - merge annotated/signed tag w/o tracking
 
-		git init --bare expired.git &&
-		git repack -d \
-			--cruft --cruft-expiration=5.minutes.ago \
-			--expire-to="expired.git/objects/pack/pack" &&
+expecting success of 7600.67 'merge annotated/signed tag w/ tracking': 
+	test_when_finished "rm -rf dst; git tag -d anno1" &&
+	git tag -a -m "anno c1" anno1 c1 &&
+	git init dst &&
+	git rev-parse c1 >dst/expect &&
+	(
+		# c0 fast-forwards to c1 and because this repository
+		# is a "downstream" whose refs/tags follows along
+		# tag from the "upstream", this pull defaults to --ff
+		cd dst &&
+		git remote add origin .. &&
+		git pull origin c0 &&
+		git fetch origin &&
+		git merge anno1 &&
+		git rev-parse HEAD >actual &&
+		test_cmp expect actual
+	)
 
-		# 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 &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7600-merge/dst/.git/
+From ..
+ * tag               c0         -> FETCH_HEAD
+From ..
+ * [new branch]      c5-branch  -> origin/c5-branch
+ * [new branch]      kid        -> origin/kid
+ * [new branch]      main       -> origin/main
+ * [new tag]         anno1      -> anno1
+ * [new tag]         c0         -> c0
+ * [new tag]         c1         -> c1
+ * [new tag]         c5         -> c5
+ * [new tag]         c3         -> c3
+ * [new tag]         c4         -> c4
+Updating 88012a2..dc8b979
+Fast-forward
+ file  | 2 +-
+ other | 9 +++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+ create mode 100644 other
+Deleted tag 'anno1' (was 0a8cfaf)
+ok 67 - merge annotated/signed tag w/ tracking
 
-		(
-			cd expired.git &&
+checking prerequisite: GPG
 
-			expired="$(ls objects/pack/pack-*.mtimes)" &&
-			test-tool pack-mtimes $(basename $expired) >out &&
-			cut -d" " -f1 out | sort >../moved.got &&
+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
 
-			# 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
-	)
+	# 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/.git/
-[main (root-commit) d1ff1c9] base
+)
+prerequisite GPG not satisfied
+ok 68 # skip merge --ff-only tag (missing GPG)
+
+ok 69 # skip merge --no-edit tag should skip editor (missing GPG)
+
+expecting success of 7600.70 'set up mod-256 conflict scenario': 
+	# 256 near-identical stanzas...
+	for i in $(test_seq 1 256); do
+		for j in 1 2 3 4 5; do
+			echo $i-$j || return 1
+		done
+	done >file &&
+	git add file &&
+	git commit -m base &&
+
+	# one side changes the first line of each to "main"
+	sed s/-1/-main/ file >tmp &&
+	mv tmp file &&
+	git commit -am main &&
+
+	# and the other to "side"; merging the two will
+	# yield 256 separate conflicts
+	git checkout -b side HEAD^ &&
+	sed s/-1/-side/ file >tmp &&
+	mv tmp file &&
+	git commit -am side
+
+[main 94176f0] base
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-Switched to a new branch 'stale'
-[stale aad0965] stale
+ 1 file changed, 1280 insertions(+), 9 deletions(-)
+[main 98e62a1] main
  Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 stale.t
-Switched to a new branch 'recent'
-[recent 52849af] recent
+ 1 file changed, 256 insertions(+), 256 deletions(-)
+Switched to a new branch 'side'
+[side aee02fe] side
  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.45.2/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/expired.git/
-ok 2 - --expire-to stores pruned objects (5.minutes.ago)
+ 1 file changed, 256 insertions(+), 256 deletions(-)
+ok 70 - set up mod-256 conflict scenario
 
-expecting success of 7704.3 '--max-cruft-size creates new packs when above threshold': 
-	git init max-cruft-size-large &&
+expecting success of 7600.71 'merge detects mod-256 conflicts (recursive)': 
+	git reset --hard &&
+	test_must_fail git merge -s recursive main
+
+HEAD is now at aee02fe side
+Auto-merging file
+CONFLICT (content): Merge conflict in file
+Automatic merge failed; fix conflicts and then commit the result.
+ok 71 - merge detects mod-256 conflicts (recursive)
+
+expecting success of 7600.72 'merge detects mod-256 conflicts (resolve)': 
+	git reset --hard &&
+	test_must_fail git merge -s resolve main
+
+HEAD is now at aee02fe side
+error: Merge requires file-level merging
+Trying really trivial in-index merge...
+Nope.
+Trying simple merge.
+Simple merge failed, trying Automatic merge.
+Auto-merging file
+ERROR: content conflict in file
+fatal: merge program failed
+Automatic merge failed; fix conflicts and then commit the result.
+ok 72 - merge detects mod-256 conflicts (resolve)
+
+expecting success of 7600.73 'merge nothing into void': 
+	git init void &&
 	(
-		cd max-cruft-size-large &&
-		test_commit base &&
+		cd void &&
+		git remote add up .. &&
+		git fetch up &&
+		test_must_fail git merge FETCH_HEAD
+	)
 
-		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
-		git repack --cruft -d &&
-		cruft_foo="$(ls $packdir/pack-*.mtimes)" &&
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7600-merge/void/.git/
+From ..
+ * [new branch]      c5-branch  -> up/c5-branch
+ * [new branch]      kid        -> up/kid
+ * [new branch]      main       -> up/main
+ * [new branch]      side       -> up/side
+ * [new tag]         c1         -> c1
+ * [new tag]         c5         -> c5
+ * [new tag]         c0         -> c0
+ * [new tag]         c3         -> c3
+ * [new tag]         c4         -> c4
+fatal: FETCH_HEAD - not something we can merge
+ok 73 - merge nothing into void
 
-		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
-		git repack --cruft -d --max-cruft-size=1M &&
-		cruft_bar="$(ls $packdir/pack-*.mtimes | grep -v $cruft_foo)" &&
+expecting success of 7600.74 'merge can be completed with --continue': 
+	git reset --hard c0 &&
+	git merge --no-ff --no-commit c1 &&
+	git merge --continue &&
+	verify_parents $c0 $c1
 
-		test-tool pack-mtimes $(basename "$cruft_foo") >foo.objects &&
-		test-tool pack-mtimes $(basename "$cruft_bar") >bar.objects &&
+HEAD is now at 88012a2 commit 0
+Automatic merge went well; stopped before committing as requested
+[side c2921bd] Merge tag 'c1' into side
+ Author: A U Thor <author@example.com>
+fatal: Needed a single revision
+ok 74 - merge can be completed with --continue
 
-		grep "^$foo" foo.objects &&
-		test_line_count = 1 foo.objects &&
-		grep "^$bar" bar.objects &&
-		test_line_count = 1 bar.objects
+expecting success of 7600.75 'killed merge can be completed with --continue': 
+	git reset --hard c0 &&
+	! "$SHELL_PATH" -c '
+	  echo kill -TERM $$ >>.git/FAKE_EDITOR
+	  GIT_EDITOR=.git/FAKE_EDITOR
+	  export GIT_EDITOR
+	  exec git merge --no-ff --edit c1' &&
+	git merge --continue &&
+	verify_parents $c0 $c1
+
+HEAD is now at 88012a2 commit 0
+Terminated
+[side c2921bd] Merge tag 'c1' into side
+ Author: A U Thor <author@example.com>
+fatal: Needed a single revision
+ok 75 - killed merge can be completed with --continue
+
+expecting success of 7600.76 'merge --quit': 
+	git init merge-quit &&
+	(
+		cd merge-quit &&
+		test_commit base &&
+		echo one >>base.t &&
+		git commit -am one &&
+		git branch one &&
+		git checkout base &&
+		echo two >>base.t &&
+		git commit -am two &&
+		test_must_fail git -c rerere.enabled=true merge one &&
+		test_path_is_file .git/MERGE_HEAD &&
+		test_path_is_file .git/MERGE_MODE &&
+		test_path_is_file .git/MERGE_MSG &&
+		git rerere status >rerere.before &&
+		git merge --quit &&
+		test_path_is_missing .git/MERGE_HEAD &&
+		test_path_is_missing .git/MERGE_MODE &&
+		test_path_is_missing .git/MERGE_MSG &&
+		git rerere status >rerere.after &&
+		test_must_be_empty rerere.after &&
+		! test_cmp rerere.after rerere.before
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7704-repack-cruft/max-cruft-size-large/.git/
-[master (root-commit) d1ff1c9] base
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7600-merge/merge-quit/.git/
+[main (root-commit) 814a92b] base
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423 1766021957
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1766021957
-ok 3 - --max-cruft-size creates new packs when above threshold
+[main cc12456] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Note: switching to 'base'.
 
-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 &&
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
 
-		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
-		git repack --cruft -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:
 
-		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
-		git repack --cruft -d --max-cruft-size=10M &&
+  git switch -c <new-branch-name>
 
-		cruft=$(ls $packdir/pack-*.mtimes) &&
-		test-tool pack-mtimes $(basename "$cruft") >cruft.objects &&
+Or undo this operation with:
 
-		grep "^$foo" cruft.objects &&
-		grep "^$bar" cruft.objects &&
-		test_line_count = 2 cruft.objects
-	)
+  git switch -
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7704-repack-cruft/max-cruft-size-small/.git/
-[master (root-commit) d1ff1c9] base
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 814a92b base
+[detached HEAD 89504c3] two
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-4f336f3df31054eabc05ac05f98bc024c8e05423 1766021958
-bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1766021958
-ok 4 - --max-cruft-size combines existing packs when below threshold
+Auto-merging base.t
+CONFLICT (content): Merge conflict in base.t
+Recorded preimage for 'base.t'
+Automatic merge failed; fix conflicts and then commit the result.
+--- rerere.after	2024-11-14 19:44:32.630906511 +0000
++++ rerere.before	2024-11-14 19:44:32.606906264 +0000
+@@ -0,0 +1 @@
++base.t
+ok 76 - merge --quit
 
-expecting success of 7704.5 '--max-cruft-size combines smaller packs first': 
-	git init max-cruft-size-consume-small &&
-	(
-		cd max-cruft-size-consume-small &&
+expecting success of 7600.77 'merge suggests matching remote refname': 
+	git commit --allow-empty -m not-local &&
+	git update-ref refs/remotes/origin/not-local HEAD &&
+	git reset --hard HEAD^ &&
 
-		test_commit base &&
-		git repack -ad &&
+	# This is white-box testing hackery; we happen to know
+	# that reading packed refs is more picky about the memory
+	# ownership of strings we pass to for_each_ref() callbacks.
+	git pack-refs --all --prune &&
 
-		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_must_fail git merge not-local 2>stderr &&
+	grep origin/not-local stderr
 
-		test-tool pack-mtimes "$(basename $cruft_foo)" >expect.raw &&
-		test-tool pack-mtimes "$(basename $cruft_bar)" >>expect.raw &&
-		sort expect.raw >expect.objects &&
+[side 42f3c70] not-local
+ Author: A U Thor <author@example.com>
+HEAD is now at c2921bd Merge tag 'c1' into side
+	origin/not-local
+ok 77 - merge suggests matching remote refname
 
-		# 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 &&
+expecting success of 7600.78 'suggested names are not ambiguous': 
+	git update-ref refs/heads/origin/not-local HEAD &&
+	test_must_fail git merge not-local 2>stderr &&
+	grep remotes/origin/not-local stderr
 
-		comm -13 cruft.before cruft.after >cruft.new &&
-		comm -23 cruft.before cruft.after >cruft.removed &&
+	remotes/origin/not-local
+ok 78 - suggested names are not ambiguous
 
-		test_line_count = 1 cruft.new &&
-		test_line_count = 2 cruft.removed &&
+# passed all 78 test(s)
+1..78
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7611-merge-abort.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-		# 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 &&
+[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
 
-		# ...and contain the set of objects rolled up
-		test-tool pack-mtimes "$(basename $(cat cruft.new))" >actual.raw &&
-		sort actual.raw >actual.objects &&
+expecting success of 7611.2 'fails without MERGE_HEAD (unstarted merge)': 
+	test_must_fail git merge --abort 2>output &&
+	test_grep MERGE_HEAD output
 
-		test_cmp expect.objects actual.objects
-	)
+fatal: There is no merge to abort (MERGE_HEAD missing).
+ok 2 - fails without MERGE_HEAD (unstarted merge)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 7611.3 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity': 
+	test ! -f .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)"
 
-expecting success of 7704.6 'setup --max-cruft-size with freshened objects': 
-	git init max-cruft-size-freshen &&
-	(
-		cd max-cruft-size-freshen &&
+ok 3 - fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity
 
-		test_commit base &&
-		git repack -ad &&
+expecting success of 7611.4 'fails without MERGE_HEAD (completed merge)': 
+	git merge clean_branch &&
+	test ! -f .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
 
-		foo="$(generate_random_blob foo 64)" &&
-		test-tool chmtime --get -10000 \
-			"$objdir/$(test_oid_to_path "$foo")" >foo.mtime &&
+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)
 
-		git repack --cruft -d &&
+expecting success of 7611.5 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity': 
+	test ! -f .git/MERGE_HEAD &&
+	test "$post_merge_head" = "$(git rev-parse HEAD)"
 
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect &&
-		test_cmp expect actual
-	)
+ok 5 - fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 7611.6 'Forget previous merge': 
+	git reset --hard "$pre_merge_head"
 
-expecting success of 7704.7 '--max-cruft-size with freshened objects (loose)': 
-	(
-		cd max-cruft-size-freshen &&
+HEAD is now at 9b32786 second
+ok 6 - Forget previous merge
 
-		# 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 7611.7 'Abort after --no-commit': 
+	# Redo merge, but stop before creating merge commit
+	git merge --no-commit clean_branch &&
+	test -f .git/MERGE_HEAD &&
+	# Abort non-conflicting merge
+	git merge --abort &&
+	test ! -f .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	test -z "$(git diff --staged)"
 
-		git repack --cruft -d &&
+Automatic merge went well; stopped before committing as requested
+ok 7 - Abort after --no-commit
 
-		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 7611.8 'Abort after conflicts': 
+	# Create conflicting merge
+	test_must_fail git merge conflict_branch &&
+	test -f .git/MERGE_HEAD &&
+	# Abort conflicting merge
+	git merge --abort &&
+	test ! -f .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	test -z "$(git diff --staged)"
 
-ok 7 - --max-cruft-size with freshened objects (loose)
+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 7704.8 '--max-cruft-size with freshened objects (packed)': 
-	(
-		cd max-cruft-size-freshen &&
+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 ! -f .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	git diff --staged > actual &&
+	test_cmp expect actual
 
-		# 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 &&
+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
 
-		test-tool chmtime --get -10 \
-			"$packdir/pack-$foo_pack.pack" >foo.mtime &&
+expecting success of 7611.10 'Conflicting merge with dirty index fails': 
+	test_must_fail git merge conflict_branch &&
+	test ! -f .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff)" &&
+	git diff --staged > actual &&
+	test_cmp expect actual
 
-		git repack --cruft -d &&
+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
 
-		cruft="$(ls $packdir/pack-*.mtimes)" &&
-		test-tool pack-mtimes "$(basename $cruft)" >actual &&
-		echo "$foo $(cat foo.mtime)" >expect.raw &&
-		echo "$bar $(cat foo.mtime)" >>expect.raw &&
-		sort expect.raw >expect &&
-		test_cmp expect actual
-	)
+expecting success of 7611.11 'Reset index (but preserve worktree changes)': 
+	git reset "$pre_merge_head" &&
+	git diff > actual &&
+	test_cmp expect actual
 
-ok 8 - --max-cruft-size with freshened objects (packed)
+Unstaged changes after reset:
+M	foo
+ok 11 - Reset index (but preserve worktree changes)
 
-expecting success of 7704.9 '--max-cruft-size with pruning': 
-	git init max-cruft-size-prune &&
-	(
-		cd max-cruft-size-prune &&
+expecting success of 7611.12 'Abort clean merge with non-conflicting dirty worktree': 
+	git merge --no-commit clean_branch &&
+	test -f .git/MERGE_HEAD &&
+	# Abort merge
+	git merge --abort &&
+	test ! -f .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 base &&
-		foo="$(generate_random_blob foo $((1024*1024)))" &&
-		bar="$(generate_random_blob bar $((1024*1024)))" &&
-		baz="$(generate_random_blob baz $((1024*1024)))" &&
+Automatic merge went well; stopped before committing as requested
+ok 12 - Abort clean merge with non-conflicting dirty worktree
 
-		test-tool chmtime -10000 "$objdir/$(test_oid_to_path "$foo")" &&
+expecting success of 7611.13 'Abort conflicting merge with non-conflicting dirty worktree': 
+	test_must_fail git merge conflict_branch &&
+	test -f .git/MERGE_HEAD &&
+	# Abort merge
+	git merge --abort &&
+	test ! -f .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
 
-		git repack -d --cruft --max-cruft-size=1M &&
+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
 
-		# 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 &&
+expecting success of 7611.14 'Reset worktree changes': 
+	git reset --hard "$pre_merge_head"
 
-		# 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=10.seconds.ago &&
-		ls $packdir/pack-*.mtimes | sort >cruft.after &&
+HEAD is now at 9b32786 second
+ok 14 - Reset worktree changes
 
-		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 &&
+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 ! -f .git/MERGE_HEAD &&
+	test "$pre_merge_head" = "$(git rev-parse HEAD)" &&
+	test -z "$(git diff --staged)" &&
+	git diff > actual &&
+	test_cmp expect actual
 
-		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
-	)
+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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 7611.16 'Fail conflicting merge with conflicting dirty worktree': 
+	test_must_fail git merge conflict_branch &&
+	test ! -f .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 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
-	) &&
+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
 
-	git clone --reference=$repo $repo $repo-alt &&
-	(
-		cd $repo-alt &&
+expecting success of 7611.17 'Reset worktree changes': 
+	git reset --hard "$pre_merge_head"
 
-		test_commit other &&
-		generate_random_blob bar 64 &&
+HEAD is now at 9b32786 second
+ok 17 - Reset worktree changes
 
-		# 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
-	)
+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 ! -f .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.45.2/t/trash directory.t7704-repack-cruft/max-cruft-size-non-local/.git/
-[master (root-commit) d1ff1c9] base
+error: Your local changes to the following files would be overwritten by merge:
+	bar
+Please commit your changes or stash them before you merge.
+Aborting
+Merge with strategy ort failed.
+ok 18 - Fail clean merge with matching dirty worktree
+
+expecting success of 7611.19 'Fail conflicting merge with matching dirty worktree': 
+	echo barf > bar &&
+	git diff > expect &&
+	test_must_fail git merge conflict_branch &&
+	test ! -f .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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7609-mergetool--lib.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7609-mergetool--lib/.git/
+expecting success of 7609.1 'mergetool --tool=vimdiff creates the expected layout': 
+	. "$GIT_BUILD_DIR"/mergetools/vimdiff &&
+	run_unit_tests
+
+Test Case #01: OK
+Test Case #02: OK
+Test Case #03: OK
+Test Case #04: OK
+Test Case #05: OK
+Test Case #06: OK
+Test Case #07: OK
+Test Case #08: OK
+Test Case #09: OK
+Test Case #10: OK
+Test Case #11: OK
+Test Case #12: OK
+Test Case #13: OK
+Test Case #14: OK
+Test Case #15: OK
+Test Case #16: OK
+ok 1 - mergetool --tool=vimdiff creates the expected layout
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7614-merge-signoff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7614-merge-signoff/.git/
+expecting success of 7614.1 'setup': 
+	test_setup
+
+[main (root-commit) 6c54391] Initial empty commit
+ Author: A U Thor <author@example.com>
+Switched to a new branch 'other-branch'
+[other-branch 5599d17] other-branch
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-54e90c3729eb77c2e36713e4c8ffddb3d282a270
-Cloning into 'max-cruft-size-non-local-alt'...
-done.
-[master c5d7d1d] other
+ 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 other.t
-38614f4581a1b39849954e788ae9d75096235951
-ok 10 - --max-cruft-size ignores non-local packs
+ 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 7704.11 'reachable packs are preferred over cruft ones': 
-	repo="cruft-preferred-packs" &&
-	git init "$repo" &&
-	(
-		cd "$repo" &&
+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
 
-		# 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 &&
+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
 
-		test_commit base &&
-		test_commit --no-tag cruft &&
+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
 
-		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 &&
+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
 
-		test_commit other &&
-		git repack -d &&
+# passed all 4 test(s)
+1..4
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7702-repack-cyclic-alternate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7702-repack-cyclic-alternate/.git/
+expecting success of 7702.1 'setup': 
+	GIT_OBJECT_DIRECTORY=.git//../.git/objects &&
+	export GIT_OBJECT_DIRECTORY &&
+	touch a &&
+	git add a &&
+	git commit -m 1 &&
+	git repack -adl &&
+	echo "$(pwd)"/.git/objects/../objects >.git/objects/info/alternates
 
-		git repack --geometric 2 -d --write-midx --write-bitmap-index &&
+[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
 
-		# 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 &&
+expecting success of 7702.2 're-packing repository with itsself as alternate': 
+	git repack -adl &&
+	git fsck
 
-		# 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"
-	)
+ok 2 - re-packing repository with itsself as alternate
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7704-repack-cruft/cruft-preferred-packs/.git/
-[master (root-commit) d1ff1c9] base
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7701-repack-unpack-unreachable.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7701-repack-unpack-unreachable/.git/
+expecting success of 7701.1 '-A with -d option leaves unreachable objects unpacked': 
+	echo content > file1 &&
+	git add . &&
+	test_tick &&
+	git commit -m initial_commit &&
+	# create a transient branch with unique content
+	git checkout -b transient_branch &&
+	echo more content >> file1 &&
+	# record the objects created in the database for file, commit, tree
+	fsha1=$(git hash-object file1) &&
+	test_tick &&
+	git commit -a -m more_content &&
+	csha1=$(git rev-parse HEAD^{commit}) &&
+	tsha1=$(git rev-parse HEAD^{tree}) &&
+	git checkout main &&
+	echo even more content >> file1 &&
+	test_tick &&
+	git commit -a -m even_more_content &&
+	# delete the transient branch
+	git branch -D transient_branch &&
+	# pack the repo
+	git repack -A -d -l &&
+	# verify objects are packed in repository
+	test 3 = $(git verify-pack -v -- .git/objects/pack/*.idx |
+		   grep -E "^($fsha1|$csha1|$tsha1) " |
+		   sort | uniq | wc -l) &&
+	git show $fsha1 &&
+	git show $csha1 &&
+	git show $tsha1 &&
+	# now expire the reflog, while keeping reachable ones but expiring
+	# unreachables immediately
+	test_tick &&
+	sometimeago=$(( $test_tick - 10000 )) &&
+	git reflog expire --expire=$sometimeago --expire-unreachable=$test_tick --all &&
+	# and repack
+	git repack -A -d -l &&
+	# verify objects are retained unpacked
+	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
+		   grep -E "^($fsha1|$csha1|$tsha1) " |
+		   sort | uniq | wc -l) &&
+	git show $fsha1 &&
+	git show $csha1 &&
+	git show $tsha1
+
+[main (root-commit) 5236a77] initial_commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[master 7b73700] cruft
+ 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 cruft.t
-[master be186e2] other
+Switched to branch 'main'
+[main 934cb86] even_more_content
  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
+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
 
-# passed all 11 test(s)
-1..11
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7811-grep-open.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7811-grep-open/.git/
-expecting success of 7811.1 'determine default pager': 
-	test_might_fail git config --unset core.pager &&
-	less=$(
-		sane_unset PAGER GIT_PAGER &&
-		git var GIT_PAGER
-	) &&
-	test -n "$less"
+    more_content
 
-ok 1 - determine default pager
+diff --git a/file1 b/file1
+index d95f3ad..86436d0 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ content
++more content
+tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
 
-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,
-};" &&
+file1
+content
+more content
+commit 24d3dd69fb58e8ee7cf49dd5cf55ba09486cf335
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
 
-	test_commit add-user revision.c "
-	}
-	if (seen_dashdash)
-		read_pathspec_from_stdin(revs, &sb, prune);
-	strbuf_release(&sb);
-}
+    more_content
 
-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);
-" &&
+diff --git a/file1 b/file1
+index d95f3ad..86436d0 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ content
++more content
+tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
 
-	mkdir subdir &&
-	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
+file1
+ok 1 - -A with -d option leaves unreachable objects unpacked
 
-	test_commit uninteresting unrelated "hello, world" &&
+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
 
-	echo GREP_PATTERN >untracked
+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
 
-[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
+    more_content
 
-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 &&
+diff --git a/file1 b/file1
+index d95f3ad..86436d0 100644
+--- a/file1
++++ b/file1
+@@ -1 +1,2 @@
+ content
++more content
+tree 23dcdce1632612f22c2c58e14a653890ee9cb0aa
 
-	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
+file1
+ok 2 - -A without -d option leaves unreachable objects packed
 
---- expect.less	2025-12-18 01:39:22.810773267 +0000
-+++ pager-args	2025-12-18 01:39:22.810773267 +0000
-@@ -1,2 +1 @@
--+/*GREP_PATTERN
- grep.h
-ok 3 - git grep -O
+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
 
-expecting success of 7811.4 'git grep -O --cached': 
-	test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
-	test_grep open-files-in-pager msg
+ok 3 - unpacked objects receive timestamp of pack file
 
-fatal: --open-files-in-pager only works on the worktree
-ok 4 - git grep -O --cached
+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
 
-expecting success of 7811.5 'git grep -O --no-index': 
-	rm -f expect.less pager-args out &&
-	cat >expect <<-\EOF &&
-	grep.h
-	untracked
-	EOF
+one
+two
+one
+fatal: Not a valid object name f719efd430d52bcfc8566a43b2eb655688d38871
+ok 4 - do not bother loosening old objects
 
-	(
-		GIT_PAGER='printf "%s\n" >pager-args' &&
-		export GIT_PAGER &&
-		git grep --no-index -O GREP_PATTERN >out
-	) &&
-	test_cmp expect pager-args &&
-	test_must_be_empty out
+expecting success of 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 &&
 
-ok 5 - git grep -O --no-index
+	git cat-file -p $obj1 &&
+	git cat-file -p $obj2 &&
+	git cat-file -p $obj3 &&
 
-expecting success of 7811.6 'setup: fake "less"': 
-	cat >less <<-\EOF &&
-	#!/bin/sh
-	printf "%s\n" "$@" >actual
+	# 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
-	chmod +x less
+	)" &&
 
-ok 6 - setup: fake "less"
+	obj2_tag_pack="$(echo $obj2_tag | git pack-objects .git/objects/pack/pack)" &&
+	git prune-packed &&
 
-expecting success of 7811.7 'git grep -O jumps to line in less': 
-	cat >expect <<-\EOF &&
-	+/*GREP_PATTERN
-	grep.h
+	write_script precious-objects <<-EOF &&
+	echo $obj2_tag
 	EOF
+	git config gc.recentObjectsHook ./precious-objects &&
 
-	GIT_PAGER=./less git grep -O GREP_PATTERN >out &&
-	test_cmp expect actual &&
-	test_must_be_empty out &&
+	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 grep -O./less GREP_PATTERN >out2 &&
-	test_cmp expect actual &&
-	test_must_be_empty out2
+	git cat-file -p $obj1 &&
+	git cat-file -p $obj2 &&
+	git cat-file -p $obj2_tag &&
+	test_must_fail git cat-file -p $obj3
 
-ok 7 - git grep -O jumps to line in less
+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 7811.8 'modified file': 
-	rm -f actual &&
-	cat >expect <<-\EOF &&
-	+/*enum grep_pat_token
-	grep.h
-	revision.c
-	subdir/grep.c
-	unrelated
-	EOF
+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
 
-	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
+[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
 
-HEAD is now at cd972f3 uninteresting
-ok 8 - modified file
+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 &&
 
-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
+	# -k should keep it
+	git repack -adk &&
+	git cat-file -p $sha1 &&
 
-ok 9 - copes with color settings
+	# and double check that without -k it would have been removed
+	git repack -ad &&
+	test_must_fail git cat-file -p $sha1
 
-expecting success of 7811.10 'run from subdir': 
-	rm -f actual &&
-	echo grep.c >expect &&
+unreachable-packed
+fatal: Not a valid object name bdf1d55da464c8ffc31aa0891954caf1baf216e8
+ok 7 - repack -k keeps unreachable packed objects
 
-	(
-		cd subdir &&
-		export GIT_PAGER &&
-		GIT_PAGER='printf "%s\n" >../args' &&
-		git grep -O "enum grep_pat_token" >../out &&
-		git grep -O"pwd >../dir; :" "enum grep_pat_token" >../out2
-	) &&
-	case $(cat dir) in
-	*subdir)
-		: good
-		;;
-	*)
-		false
-		;;
-	esac &&
-	test_cmp expect args &&
-	test_must_be_empty out &&
-	test_must_be_empty out2
+expecting success of 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 &&
 
-ok 10 - run from subdir
+	# 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
 
-# passed all 10 test(s)
-1..10
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7703-repack-geometric.sh ***
@@ -485893,8 +484602,8 @@
 
 Your branch is ahead of 'origin/master' by 1 commit.
   (use "git push" to publish your local commits)
---- shared-objects	2025-12-18 01:39:22.950773267 +0000
-+++ member-objects	2025-12-18 01:39:22.958773267 +0000
+--- shared-objects	2024-11-14 19:44:38.362965433 +0000
++++ member-objects	2024-11-14 19:44:38.394965761 +0000
 @@ -1,3 +1,3 @@
 -04646a23dde207060dc8a802fc9bd5d3c2c976bd
 -a0054e492840f572e48a3cb791d2e083afaf08f6
@@ -485992,203 +484701,491 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7813-grep-icase-iso.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7813-grep-icase-iso/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-ok 1 # skip setup (missing GETTEXT_ISO_LOCALE)
+*** t7704-repack-cruft.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
 
-ok 2 # skip grep pcre string (missing GETTEXT_ISO_LOCALE of GETTEXT_ISO_LOCALE,PCRE)
+		git branch -M main &&
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7812-grep-icase-non-ascii.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7812-grep-icase-non-ascii/.git/
-# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
-# lib-gettext: No is_IS ISO-8859-1 locale available
-expecting success of 7812.1 'setup': 
-	test_write_lines "TILRAUN: Halló Heimur!" >file &&
-	git add file &&
-	LC_ALL="$is_IS_locale" &&
-	export LC_ALL
+		test_commit base &&
 
-ok 1 - setup
+		git checkout -b cruft &&
+		test_commit --no-tag cruft &&
 
-expecting success of 7812.2 'setup REGEX_LOCALE prerequisite': 
-	# This "test-tool" invocation is identical...
-	if test-tool regex "HALLÓ" "Halló" ICASE
-	then
-		test_set_prereq REGEX_LOCALE
-	else
+		git rev-list --objects --no-object-names main..cruft >moved.raw &&
+		sort moved.raw >moved.want &&
 
-		# ... to this one, but this way "test_must_fail" will
-		# tell a segfault or abort() from the regexec() test
-		# itself
-		test_must_fail test-tool regex "HALLÓ" "Halló" ICASE
-	fi
+		git rev-list --all --objects --no-object-names >expect.raw &&
+		sort expect.raw >expect &&
 
-ok 2 - setup REGEX_LOCALE prerequisite
+		git checkout main &&
+		git branch -D cruft &&
+		git reflog expire --all --expire=all &&
 
-expecting success of 7812.3 'grep literal string, no -F': 
-	git grep -i "TILRAUN: Halló Heimur!" &&
-	git grep -i "TILRAUN: HALLÓ HEIMUR!"
+		git init --bare expired.git &&
+		git repack -d \
+			--cruft --cruft-expiration="now" \
+			--expire-to="expired.git/objects/pack/pack" &&
 
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-ok 3 - grep literal string, no -F
+		expired="$(ls expired.git/objects/pack/pack-*.idx)" &&
+		test_path_is_file "${expired%.idx}.mtimes" &&
 
-expecting success of 7812.4 'grep pcre utf-8 icase': 
-	git grep --perl-regexp    "TILRAUN: H.lló Heimur!" &&
-	git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
-	git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
+		# 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 &&
 
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-ok 4 - grep pcre utf-8 icase
+		# ...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 7812.5 'grep pcre utf-8 string with "+"': 
-	test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
-	git add file2 &&
-	git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
-	echo file >expected &&
-	echo file2 >>expected &&
-	test_cmp expected actual
+		# The "moved" objects (i.e., those in expired.git)
+		# should be the same as the cruft objects which were
+		# expired in the previous step.
+		test_cmp moved.want expired.objects
+	)
 
-ok 5 - grep pcre utf-8 string with "+"
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t7704-repack-cruft/expire-to-now/expired.git/
+ok 1 - --expire-to stores pruned objects (now)
 
-expecting success of 7812.6 'grep literal string, with -F': 
-	git grep -i -F "TILRAUN: Halló Heimur!" &&
-	git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
+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 &&
 
-file:TILRAUN: Halló Heimur!
-file:TILRAUN: Halló Heimur!
-ok 6 - grep literal string, with -F
+		git branch -M main &&
 
-expecting success of 7812.7 'grep string with regex, with -F': 
-	test_write_lines "TILRAUN: Halló Heimur [abc]!" >file3 &&
-	git add file3 &&
-	git grep -i -F "TILRAUN: Halló Heimur [abc]!" file3
+		test_commit base &&
 
-file3:TILRAUN: Halló Heimur [abc]!
-ok 7 - grep string with regex, with -F
+		# 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 7812.8 'pickaxe -i on non-ascii': 
-	git commit -m first &&
-	git log --format=%f -i -S"TILRAUN: HALLÓ HEIMUR!" >actual &&
-	echo first >expected &&
-	test_cmp expected actual
+		git 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)" &&
 
-[master (root-commit) 891c4a2] first
+		# 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.45.2/t/trash directory.t7704-repack-cruft/expire-to-5.minutes.ago/.git/
+[main (root-commit) d1ff1c9] base
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+)
- create mode 100644 file
- create mode 100644 file2
- create mode 100644 file3
-ok 8 - pickaxe -i on non-ascii
+ 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.45.2/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 7812.9 'PCRE v2: setup invalid UTF-8 data': 
-	printf "\\200\\n" >invalid-0x80 &&
-	echo "ævar" >expected &&
-	cat expected >>invalid-0x80 &&
-	git add invalid-0x80 &&
+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 &&
 
-	# Test for PCRE2_MATCH_INVALID_UTF bug
-	# https://bugs.exim.org/show_bug.cgi?id=2642
-	printf "\\345Aæ\\n" >invalid-0xe5 &&
-	git add invalid-0xe5
+		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
+		git repack --cruft -d &&
+		cruft_foo="$(ls $packdir/pack-*.mtimes)" &&
 
-ok 9 - PCRE v2: setup invalid UTF-8 data
+		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
+		git repack --cruft -d --max-cruft-size=1M &&
+		cruft_bar="$(ls $packdir/pack-*.mtimes | grep -v $cruft_foo)" &&
 
-expecting success of 7812.10 'PCRE v2: grep ASCII from invalid UTF-8 data': 
-	git grep -h "var" invalid-0x80 >actual &&
-	test_cmp expected actual &&
-	git grep -h "(*NO_JIT)var" invalid-0x80 >actual &&
-	test_cmp expected actual
+		test-tool pack-mtimes $(basename "$cruft_foo") >foo.objects &&
+		test-tool pack-mtimes $(basename "$cruft_bar") >bar.objects &&
 
-ok 10 - PCRE v2: grep ASCII from invalid UTF-8 data
+		grep "^$foo" foo.objects &&
+		test_line_count = 1 foo.objects &&
+		grep "^$bar" bar.objects &&
+		test_line_count = 1 bar.objects
+	)
 
-expecting success of 7812.11 'PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)': 
-	git grep -h "Aæ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
-	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 1731613476
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1731613476
+ok 3 - --max-cruft-size creates new packs when above threshold
 
-ok 11 - PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)
+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 &&
 
-expecting success of 7812.12 'PCRE v2: grep non-ASCII from invalid UTF-8 data': 
-	git grep -h "æ" invalid-0x80 >actual &&
-	test_cmp expected actual &&
-	git grep -h "(*NO_JIT)æ" invalid-0x80 >actual &&
-	test_cmp expected actual
+		foo="$(pack_random_blob foo $((1*1024*1024)))" &&
+		git repack --cruft -d &&
 
-ok 12 - PCRE v2: grep non-ASCII from invalid UTF-8 data
+		bar="$(pack_random_blob bar $((1*1024*1024)))" &&
+		git repack --cruft -d --max-cruft-size=10M &&
 
-expecting success of 7812.13 'PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)': 
-	git grep -h "Aæ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
-	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual
+		cruft=$(ls $packdir/pack-*.mtimes) &&
+		test-tool pack-mtimes $(basename "$cruft") >cruft.objects &&
 
-ok 13 - PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)
+		grep "^$foo" cruft.objects &&
+		grep "^$bar" cruft.objects &&
+		test_line_count = 2 cruft.objects
+	)
 
-expecting success of 7812.14 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i': 
-	test_might_fail git grep -hi "Æ" invalid-0x80 >actual &&
-	test_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 1731613477
+bd44d8aa2d22eb47ff70cef4b0bb45d1549ee49c 1731613477
+ok 4 - --max-cruft-size combines existing packs when below threshold
 
-ok 14 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i
+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 &&
 
-checking prerequisite: PCRE2_MATCH_INVALID_UTF
+		test_commit base &&
+		git repack -ad &&
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PCRE2_MATCH_INVALID_UTF" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PCRE2_MATCH_INVALID_UTF" &&
-	test-tool pcre2-config has-PCRE2_MATCH_INVALID_UTF
+		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
 
-)
-prerequisite PCRE2_MATCH_INVALID_UTF ok
-expecting success of 7812.15 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i': 
-	git grep -hi "Æ" invalid-0x80 >actual &&
-	test_cmp expected actual &&
-	git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
-	test_cmp expected actual
+		test-tool pack-mtimes "$(basename $cruft_foo)" >expect.raw &&
+		test-tool pack-mtimes "$(basename $cruft_bar)" >>expect.raw &&
+		sort expect.raw >expect.objects &&
 
-ok 15 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i
+		# 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 &&
 
-expecting success of 7812.16 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)': 
-	git grep -hi "Æ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
-	git grep -hi "(*NO_JIT)Æ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
+		comm -13 cruft.before cruft.after >cruft.new &&
+		comm -23 cruft.before cruft.after >cruft.removed &&
 
-	# Only the case of grepping the ASCII part in a way that
-	# relies on -i fails
-	git grep -hi "aÆ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual &&
-	git grep -hi "(*NO_JIT)aÆ" invalid-0xe5 >actual &&
-	test_cmp invalid-0xe5 actual
+		test_line_count = 1 cruft.new &&
+		test_line_count = 2 cruft.removed &&
 
-ok 16 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)
+		# 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 7812.17 'PCRE v2: grep non-literal ASCII from UTF-8': 
-	git grep --perl-regexp -h -o -e ll. file >actual &&
-	echo "lló" >expected &&
-	test_cmp expected actual
+		# ...and contain the set of objects rolled up
+		test-tool pack-mtimes "$(basename $(cat cruft.new))" >actual.raw &&
+		sort actual.raw >actual.objects &&
 
-ok 17 - PCRE v2: grep non-literal ASCII from UTF-8
+		test_cmp expect.objects actual.objects
+	)
 
-expecting success of 7812.18 'PCRE v2: grep avoid endless loop bug': 
-	echo " Halló" >leading-whitespace &&
-	git add leading-whitespace &&
-	doalarm 1 git grep --perl-regexp "^\s" leading-whitespace
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 
-leading-whitespace: Halló
-ok 18 - PCRE v2: grep avoid endless loop bug
+expecting success of 7704.6 'setup --max-cruft-size with freshened objects': 
+	git init max-cruft-size-freshen &&
+	(
+		cd max-cruft-size-freshen &&
 
-# passed all 18 test(s)
-1..18
+		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.45.2/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=10.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.45.2/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.45.2/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.45.2/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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7700-repack.sh ***
@@ -487034,8 +486031,8 @@
 
 Nothing new to pack.
 Nothing new to pack.
---- before	2025-12-18 01:39:23.098773267 +0000
-+++ after	2025-12-18 01:39:23.274773267 +0000
+--- before	2024-11-14 19:44:39.954981797 +0000
++++ after	2024-11-14 19:44:40.042982701 +0000
 @@ -1 +1 @@
 -8cd3b9bb7db0d633144114a81b7374e6a2b1b22c
 +3d2725684b43b31e3b81e5070d1847c9f1e2cf00
@@ -487302,6 +486299,401 @@
 1..45
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7811-grep-open.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7811-grep-open/.git/
+expecting success of 7811.1 'determine default pager': 
+	test_might_fail git config --unset core.pager &&
+	less=$(
+		sane_unset PAGER GIT_PAGER &&
+		git var GIT_PAGER
+	) &&
+	test -n "$less"
+
+ok 1 - determine default pager
+
+expecting success of 7811.2 'setup': 
+	test_commit initial grep.h "
+enum grep_pat_token {
+	GREP_PATTERN,
+	GREP_PATTERN_HEAD,
+	GREP_PATTERN_BODY,
+	GREP_AND,
+	GREP_OPEN_PAREN,
+	GREP_CLOSE_PAREN,
+	GREP_NOT,
+	GREP_OR,
+};" &&
+
+	test_commit add-user revision.c "
+	}
+	if (seen_dashdash)
+		read_pathspec_from_stdin(revs, &sb, prune);
+	strbuf_release(&sb);
+}
+
+static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
+{
+	append_grep_pattern(&revs->grep_filter, ptn, \"command line\", 0, what);
+" &&
+
+	mkdir subdir &&
+	test_commit subdir subdir/grep.c "enum grep_pat_token" &&
+
+	test_commit uninteresting unrelated "hello, world" &&
+
+	echo GREP_PATTERN >untracked
+
+[master (root-commit) 6a780d2] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 grep.h
+[master 7eeae3c] add-user
+ Author: A U Thor <author@example.com>
+ 1 file changed, 11 insertions(+)
+ create mode 100644 revision.c
+[master 22c3f1e] subdir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/grep.c
+[master cd972f3] uninteresting
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 unrelated
+ok 2 - setup
+
+expecting success of 7811.3 'git grep -O': 
+	cat >$less <<-\EOF &&
+	#!/bin/sh
+	printf "%s\n" "$@" >pager-args
+	EOF
+	chmod +x $less &&
+	cat >expect.less <<-\EOF &&
+	+/*GREP_PATTERN
+	grep.h
+	EOF
+	echo grep.h >expect.notless &&
+
+	PATH=.:$PATH git grep -O GREP_PATTERN >out &&
+	{
+		test_cmp expect.less pager-args ||
+		test_cmp expect.notless pager-args
+	} &&
+	test_must_be_empty out
+
+--- expect.less	2024-11-14 19:44:40.898991501 +0000
++++ pager-args	2024-11-14 19:44:40.910991624 +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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7813-grep-icase-iso.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7813-grep-icase-iso/.git/
+# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
+# lib-gettext: No is_IS ISO-8859-1 locale available
+ok 1 # skip setup (missing GETTEXT_ISO_LOCALE)
+
+ok 2 # skip grep pcre string (missing GETTEXT_ISO_LOCALE of GETTEXT_ISO_LOCALE,PCRE)
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7812-grep-icase-non-ascii.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7812-grep-icase-non-ascii/.git/
+# lib-gettext: Found 'is_IS.utf8' as an is_IS UTF-8 locale
+# lib-gettext: No is_IS ISO-8859-1 locale available
+expecting success of 7812.1 'setup': 
+	test_write_lines "TILRAUN: Halló Heimur!" >file &&
+	git add file &&
+	LC_ALL="$is_IS_locale" &&
+	export LC_ALL
+
+ok 1 - setup
+
+expecting success of 7812.2 'setup REGEX_LOCALE prerequisite': 
+	# This "test-tool" invocation is identical...
+	if test-tool regex "HALLÓ" "Halló" ICASE
+	then
+		test_set_prereq REGEX_LOCALE
+	else
+
+		# ... to this one, but this way "test_must_fail" will
+		# tell a segfault or abort() from the regexec() test
+		# itself
+		test_must_fail test-tool regex "HALLÓ" "Halló" ICASE
+	fi
+
+ok 2 - setup REGEX_LOCALE prerequisite
+
+expecting success of 7812.3 'grep literal string, no -F': 
+	git grep -i "TILRAUN: Halló Heimur!" &&
+	git grep -i "TILRAUN: HALLÓ HEIMUR!"
+
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+ok 3 - grep literal string, no -F
+
+expecting success of 7812.4 'grep pcre utf-8 icase': 
+	git grep --perl-regexp    "TILRAUN: H.lló Heimur!" &&
+	git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&
+	git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"
+
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+ok 4 - grep pcre utf-8 icase
+
+expecting success of 7812.5 'grep pcre utf-8 string with "+"': 
+	test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&
+	git add file2 &&
+	git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&
+	echo file >expected &&
+	echo file2 >>expected &&
+	test_cmp expected actual
+
+ok 5 - grep pcre utf-8 string with "+"
+
+expecting success of 7812.6 'grep literal string, with -F': 
+	git grep -i -F "TILRAUN: Halló Heimur!" &&
+	git grep -i -F "TILRAUN: HALLÓ HEIMUR!"
+
+file:TILRAUN: Halló Heimur!
+file:TILRAUN: Halló Heimur!
+ok 6 - grep literal string, with -F
+
+expecting success of 7812.7 'grep string with regex, with -F': 
+	test_write_lines "TILRAUN: Halló Heimur [abc]!" >file3 &&
+	git add file3 &&
+	git grep -i -F "TILRAUN: Halló Heimur [abc]!" file3
+
+file3:TILRAUN: Halló Heimur [abc]!
+ok 7 - grep string with regex, with -F
+
+expecting success of 7812.8 'pickaxe -i on non-ascii': 
+	git commit -m first &&
+	git log --format=%f -i -S"TILRAUN: HALLÓ HEIMUR!" >actual &&
+	echo first >expected &&
+	test_cmp expected actual
+
+[master (root-commit) 891c4a2] first
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+)
+ create mode 100644 file
+ create mode 100644 file2
+ create mode 100644 file3
+ok 8 - pickaxe -i on non-ascii
+
+expecting success of 7812.9 'PCRE v2: setup invalid UTF-8 data': 
+	printf "\\200\\n" >invalid-0x80 &&
+	echo "ævar" >expected &&
+	cat expected >>invalid-0x80 &&
+	git add invalid-0x80 &&
+
+	# Test for PCRE2_MATCH_INVALID_UTF bug
+	# https://bugs.exim.org/show_bug.cgi?id=2642
+	printf "\\345Aæ\\n" >invalid-0xe5 &&
+	git add invalid-0xe5
+
+ok 9 - PCRE v2: setup invalid UTF-8 data
+
+expecting success of 7812.10 'PCRE v2: grep ASCII from invalid UTF-8 data': 
+	git grep -h "var" invalid-0x80 >actual &&
+	test_cmp expected actual &&
+	git grep -h "(*NO_JIT)var" invalid-0x80 >actual &&
+	test_cmp expected actual
+
+ok 10 - PCRE v2: grep ASCII from invalid UTF-8 data
+
+expecting success of 7812.11 'PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)': 
+	git grep -h "Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual
+
+ok 11 - PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)
+
+expecting success of 7812.12 'PCRE v2: grep non-ASCII from invalid UTF-8 data': 
+	git grep -h "æ" invalid-0x80 >actual &&
+	test_cmp expected actual &&
+	git grep -h "(*NO_JIT)æ" invalid-0x80 >actual &&
+	test_cmp expected actual
+
+ok 12 - PCRE v2: grep non-ASCII from invalid UTF-8 data
+
+expecting success of 7812.13 'PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)': 
+	git grep -h "Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual
+
+ok 13 - PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)
+
+expecting success of 7812.14 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i': 
+	test_might_fail git grep -hi "Æ" invalid-0x80 >actual &&
+	test_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual
+
+ok 14 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i
+
+checking prerequisite: PCRE2_MATCH_INVALID_UTF
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PCRE2_MATCH_INVALID_UTF" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PCRE2_MATCH_INVALID_UTF" &&
+	test-tool pcre2-config has-PCRE2_MATCH_INVALID_UTF
+
+)
+prerequisite PCRE2_MATCH_INVALID_UTF ok
+expecting success of 7812.15 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i': 
+	git grep -hi "Æ" invalid-0x80 >actual &&
+	test_cmp expected actual &&
+	git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
+	test_cmp expected actual
+
+ok 15 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i
+
+expecting success of 7812.16 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)': 
+	git grep -hi "Æ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -hi "(*NO_JIT)Æ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+
+	# Only the case of grepping the ASCII part in a way that
+	# relies on -i fails
+	git grep -hi "aÆ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -hi "(*NO_JIT)aÆ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual
+
+ok 16 - PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)
+
+expecting success of 7812.17 'PCRE v2: grep non-literal ASCII from UTF-8': 
+	git grep --perl-regexp -h -o -e ll. file >actual &&
+	echo "lló" >expected &&
+	test_cmp expected actual
+
+ok 17 - PCRE v2: grep non-literal ASCII from UTF-8
+
+expecting success of 7812.18 'PCRE v2: grep avoid endless loop bug': 
+	echo " Halló" >leading-whitespace &&
+	git add leading-whitespace &&
+	doalarm 1 git grep --perl-regexp "^\s" leading-whitespace
+
+leading-whitespace: Halló
+ok 18 - PCRE v2: grep avoid endless loop bug
+
+# passed all 18 test(s)
+1..18
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7815-grep-binary.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7815-grep-binary/.git/
 expecting success of 7815.1 'setup': 
@@ -487326,155 +486718,1066 @@
 	git grep -ah ina a >actual &&
 	test_cmp a actual
 
-ok 3 - git grep -ah ina a
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7814-grep-recurse-submodules.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7814-grep-recurse-submodules/parent/src/sub'...
+done.
+Cloning into '/build/reproducible-path/git-2.45.2/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 7815.4 'git grep -I ina a': 
-	test_must_fail git grep -I ina a >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 - 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
+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
 
-ok 5 - git grep -c ina a
+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 7815.6 'git grep -l ina a': 
-	echo a >expect &&
-	git grep -l ina a >actual &&
+	cat >expect <<-\EOF &&
+	a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
 	test_cmp expect actual
 
-ok 6 - git grep -l ina a
+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	2024-11-14 19:44:45.887042772 +0000
++++ actual	2024-11-14 19:44:45.919043102 +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
 
-expecting success of 7815.7 'git grep -L bar a': 
-	echo a >expect &&
-	git grep -L bar a >actual &&
+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
 
-ok 7 - git grep -L bar a
+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	2024-11-14 19:44:46.331047336 +0000
++++ actual	2024-11-14 19:44:46.395047994 +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 7815.8 'git grep -q ina a': 
-	git grep -q ina a >actual &&
-	test_must_be_empty actual
+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 8 - git grep -q ina a
+	cat >expect <<-\EOF &&
+	a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
 
-expecting success of 7815.9 'git grep -F ile a': 
-	git grep -F ile 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	2024-11-14 19:44:46.875052928 +0000
++++ actual	2024-11-14 19:44:46.939053586 +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
 
-Binary file a matches
-ok 9 - git grep -F ile 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 7815.10 'git grep -Fi iLE a': 
-	git grep -Fi iLE a
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
 
-Binary file a matches
-ok 10 - git grep -Fi iLE 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	2024-11-14 19:44:47.327057575 +0000
++++ actual	2024-11-14 19:44:47.379058109 +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 7815.11 'git grep ile a': 
-	git grep ile 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 &&
 
-Binary file a matches
-ok 11 - git grep ile a
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
+	test_cmp expect actual
 
-checking known breakage of 7815.12 'git grep .fi a': 
-	git grep .fi 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
 
-not ok 12 - git grep .fi a # TODO known breakage
+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 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 &&
+	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" &&
+
+	cat >expect <<-\EOF &&
+	submodule/a:(1|2)x(3|4)
+	EOF
+	git grep --textconv --recurse-submodules x >actual &&
 	test_cmp expect actual
 
-ok 13 - grep respects binary diff attribute
+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 7815.14 'grep --cached respects binary diff attribute': 
-	git grep --cached text t >actual &&
-	test_cmp expect actual
+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 &&
 
-ok 14 - grep --cached respects binary diff attribute
+	# 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 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
+	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"
 
-Updated 1 path from the index
-rm '.gitattributes'
-ok 15 - grep --cached respects binary diff attribute (2)
+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 Nov 14 19:44 .git/refs/notes/textconv/d2x_cached
+not ok 32 - grep saves textconv cache in the appropriate repository # TODO known breakage
 
-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
+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
 
-[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
+		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 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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7814-grep-recurse-submodules/super/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t7814-grep-recurse-submodules/super/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7814-grep-recurse-submodules/partial/sub'...
+Submodule path 'sub': checked out '289fae02a658deff257301016761eff04f091022'
+{"event":"data","sid":"20241114T194449.524600Z-H5c947e1c-P00001b28","thread":"th01:unknown","time":"2024-11-14T19:44:49.529957Z","file":"promisor-remote.c","line":48,"repo":2,"t_abs":0.005540,"t_rel":0.002738,"nesting":1,"category":"promisor","key":"fetch_count","value":"1"}
+ok 33 - grep partially-cloned submodule
 
-ok 17 - grep respects not-binary diff attribute
+expecting success of 7814.34 'check scope of core.useReplaceRefs': 
+	git init base &&
+	git init base/sub &&
 
-expecting success of 7815.18 'setup textconv filters': 
-	echo a diff=foo >.gitattributes &&
-	git config diff.foo.textconv "\"$(pwd)\""/nul_to_q_textconv
+	echo A >base/a &&
+	echo B >base/b &&
+	echo C >base/sub/c &&
+	echo D >base/sub/d &&
 
-ok 18 - setup textconv filters
+	git -C base/sub add c d &&
+	git -C base/sub commit -m "Add files" &&
 
-expecting success of 7815.19 'grep does not honor textconv': 
-	test_must_fail git grep Qfile
+	git -C base submodule add ./sub &&
+	git -C base add a b sub &&
+	git -C base commit -m "Add files and submodule" &&
 
-ok 19 - grep does not honor textconv
+	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 7815.20 'grep --textconv honors textconv': 
-	echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
-	git grep --textconv Qfile >actual &&
-	test_cmp expect actual
+	git -C base replace $A $B &&
+	git -C base/sub replace $C $D &&
 
-ok 20 - grep --textconv honors textconv
+	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 7815.21 'grep --no-textconv does not honor textconv': 
-	test_must_fail git grep --no-textconv Qfile
+	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 &&
 
-ok 21 - grep --no-textconv does not honor textconv
+	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 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
+	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
 
-ok 22 - grep --textconv blob honors textconv
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7814-grep-recurse-submodules/base/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 1 known breakage(s)
-# passed all remaining 21 test(s)
-1..22
+# still have 7 known breakage(s)
+# passed all remaining 27 test(s)
+1..34
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7817-grep-sparse-checkout.sh ***
@@ -487710,1267 +488013,6 @@
 1..8
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7816-grep-binary-pattern.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7816-grep-binary-pattern/.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 7816.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 7816.2 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>f' a': 
-			>stderr &&
-			printf 'yQf' | 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 2 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>f' a
-
-expecting success of 7816.3 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>f' a': 
-			>stderr &&
-			printf 'yQf' | 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 3 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>f' a
-
-expecting success of 7816.4 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>f' a': 
-			>stderr &&
-			printf 'yQf' | 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 4 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>f' a
-
-expecting success of 7816.5 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>x' a': 
-			>stderr &&
-			printf 'yQx' | 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 5 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>x' a
-
-expecting success of 7816.6 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>x' a': 
-			>stderr &&
-			printf 'yQx' | 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 6 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>x' a
-
-expecting success of 7816.7 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>x' a': 
-			>stderr &&
-			printf 'yQx' | 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 7 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>x' a
-
-expecting success of 7816.8 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>f' a': 
-			>stderr &&
-			printf 'YQf' | 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 8 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>f' a
-
-expecting success of 7816.9 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>f' a': 
-			>stderr &&
-			printf 'YQf' | 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 9 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>f' a
-
-expecting success of 7816.10 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>f' a': 
-			>stderr &&
-			printf 'YQf' | 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 10 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>f' a
-
-expecting success of 7816.11 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>x' a': 
-			>stderr &&
-			printf 'YQx' | 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 11 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>x' a
-
-expecting success of 7816.12 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>x' a': 
-			>stderr &&
-			printf 'YQx' | 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 12 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>x' a
-
-expecting success of 7816.13 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>x' a': 
-			>stderr &&
-			printf 'YQx' | 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 13 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>x' a
-
-expecting success of 7816.14 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>f' a': 
-			>stderr &&
-			printf 'yQf' | 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 14 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>f' a
-
-expecting success of 7816.15 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>f' a': 
-			>stderr &&
-			printf 'yQf' | 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 15 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>f' a
-
-expecting success of 7816.16 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>f' a': 
-			printf 'yQf' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f  a
-		
-Binary file a matches
-ok 16 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>f' a
-
-expecting success of 7816.17 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>x' a': 
-			>stderr &&
-			printf 'yQx' | 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 17 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>x' a
-
-expecting success of 7816.18 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>x' a': 
-			>stderr &&
-			printf 'yQx' | 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 18 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>x' a
-
-expecting success of 7816.19 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>x' a': 
-			>stderr &&
-			printf 'yQx' | 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 19 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>x' a
-
-expecting success of 7816.20 '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 20 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>ð' a
-
-expecting success of 7816.21 '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 21 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>ð' a
-
-expecting success of 7816.22 '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 22 - LC_ALL='is_IS.utf8' git grep -P -f f  'æ<NUL>ð' a
-
-expecting success of 7816.23 'error, PCRE v2 only: LC_ALL='C' git grep -f 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 -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 23 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'e<NUL>m[*]c' a
-
-expecting success of 7816.24 'error, PCRE v2 only: LC_ALL='C' git grep -f 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 -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 24 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'e<NUL>m[*]c' a
-
-expecting success of 7816.25 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f 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 -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 25 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'e<NUL>m[*]c' a
-
-expecting success of 7816.26 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'E<NUL>M[*]C' a': 
-			>stderr &&
-			printf 'EQM[*]C' | 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 26 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'E<NUL>M[*]C' a
-
-expecting success of 7816.27 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'E<NUL>M[*]C' a': 
-			>stderr &&
-			printf 'EQM[*]C' | 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 27 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'E<NUL>M[*]C' a
-
-expecting success of 7816.28 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'E<NUL>M[*]C' a': 
-			>stderr &&
-			printf 'EQM[*]C' | 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 28 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'E<NUL>M[*]C' a
-
-expecting success of 7816.29 '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 29 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a
-
-expecting success of 7816.30 '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 30 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a
-
-expecting success of 7816.31 '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 31 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>[f]' a
-
-expecting success of 7816.32 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[y]<NUL>f' a': 
-			>stderr &&
-			printf '[y]Qf' | 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 32 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[y]<NUL>f' a
-
-expecting success of 7816.33 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[y]<NUL>f' a': 
-			>stderr &&
-			printf '[y]Qf' | 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 33 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[y]<NUL>f' a
-
-expecting success of 7816.34 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F '[y]<NUL>f' a': 
-			>stderr &&
-			printf '[y]Qf' | 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 34 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F '[y]<NUL>f' a
-
-expecting success of 7816.35 '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 35 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a
-
-expecting success of 7816.36 '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 36 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a
-
-expecting success of 7816.37 '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 37 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>[F]' a
-
-expecting success of 7816.38 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi '[Y]<NUL>F' a': 
-			>stderr &&
-			printf '[Y]QF' | 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 38 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi '[Y]<NUL>F' a
-
-expecting success of 7816.39 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi '[Y]<NUL>F' a': 
-			>stderr &&
-			printf '[Y]QF' | 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 39 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi '[Y]<NUL>F' a
-
-expecting success of 7816.40 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi '[Y]<NUL>F' a': 
-			>stderr &&
-			printf '[Y]QF' | 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 40 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi '[Y]<NUL>F' a
-
-expecting success of 7816.41 '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 41 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
-
-expecting success of 7816.42 '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 42 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
-
-expecting success of 7816.43 '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 43 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a
-
-expecting success of 7816.44 '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 44 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[æ]<NUL>ð' a
-
-expecting success of 7816.45 '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 45 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[æ]<NUL>ð' a
-
-expecting success of 7816.46 '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 46 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F '[æ]<NUL>ð' a
-
-expecting success of 7816.47 '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 47 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[æ]<NUL>ð' a
-
-expecting success of 7816.48 'LC_ALL='C' git grep -P -f f -i '[æ]<NUL>ð' a': 
-			printf '[æ]Qð' | q_to_nul >f &&
-			LC_ALL='C' git grep -P -f f -i a
-		
-Binary file a matches
-ok 48 - LC_ALL='C' git grep -P -f f -i '[æ]<NUL>ð' a
-
-expecting success of 7816.49 '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 49 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[æ]<NUL>ð' a
-
-expecting success of 7816.50 '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 50 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
-
-expecting success of 7816.51 '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 51 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
-
-expecting success of 7816.52 '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 52 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a
-
-expecting success of 7816.53 '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 53 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
-
-expecting success of 7816.54 'LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[�]' a': 
-			>stderr &&
-			printf 'ÆQ[�]' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[�]' a
-
-expecting success of 7816.55 '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 55 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a
-
-expecting success of 7816.56 '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 56 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Æ]<NUL>�' a
-
-expecting success of 7816.57 'LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>�' a': 
-			>stderr &&
-			printf '[Æ]Q�' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>�' a
-
-expecting success of 7816.58 '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 58 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[Æ]<NUL>�' a
-
-expecting success of 7816.59 '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 59 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Æ]<NUL>ð' a
-
-expecting success of 7816.60 'LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a': 
-			>stderr &&
-			printf '[Æ]Qð' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a
-
-expecting success of 7816.61 '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 61 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[Æ]<NUL>ð' a
-
-expecting success of 7816.62 '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 62 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>�' a
-
-expecting success of 7816.63 'LC_ALL='C' git grep -P -f f -i 'Æ<NUL>�' a': 
-			>stderr &&
-			printf 'ÆQ�' | q_to_nul >f &&
-			test_must_fail env LC_ALL="C" git grep -P -f f -i a 2>stderr &&
-			test_grep ! 'This is only supported with -P under PCRE v2' stderr
-		
-ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>�' a
-
-expecting success of 7816.64 '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 64 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>�' a
-
-expecting success of 7816.65 'error, PCRE v2 only: LC_ALL='C' git grep -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  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 65 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>[f]' a
-
-expecting success of 7816.66 'error, PCRE v2 only: LC_ALL='C' git grep -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  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 66 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>[f]' a
-
-expecting success of 7816.67 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>[f]' a': 
-			printf 'yQ[f]' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f  a
-		
-Binary file a matches
-ok 67 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>[f]' a
-
-expecting success of 7816.68 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '[y]<NUL>f' a': 
-			>stderr &&
-			printf '[y]Qf' | 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 68 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '[y]<NUL>f' a
-
-expecting success of 7816.69 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '[y]<NUL>f' a': 
-			>stderr &&
-			printf '[y]Qf' | 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 69 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '[y]<NUL>f' a
-
-expecting success of 7816.70 'LC_ALL='is_IS.utf8' git grep -P -f f  '[y]<NUL>f' a': 
-			printf '[y]Qf' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f  a
-		
-Binary file a matches
-ok 70 - LC_ALL='is_IS.utf8' git grep -P -f f  '[y]<NUL>f' a
-
-expecting success of 7816.71 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>[F]' a': 
-			>stderr &&
-			printf 'YQ[F]' | 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 71 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>[F]' a
-
-expecting success of 7816.72 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>[F]' a': 
-			>stderr &&
-			printf 'YQ[F]' | 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 72 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>[F]' a
-
-expecting success of 7816.73 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>[F]' a': 
-			printf 'YQ[F]' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f -i a
-		
-Binary file a matches
-ok 73 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>[F]' a
-
-expecting success of 7816.74 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Y]<NUL>f' a': 
-			>stderr &&
-			printf '[Y]Qf' | 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 74 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Y]<NUL>f' a
-
-expecting success of 7816.75 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Y]<NUL>f' a': 
-			>stderr &&
-			printf '[Y]Qf' | 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 75 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Y]<NUL>f' a
-
-expecting success of 7816.76 'LC_ALL='is_IS.utf8' git grep -P -f f -i '[Y]<NUL>f' a': 
-			printf '[Y]Qf' | q_to_nul >f &&
-			LC_ALL='is_IS.utf8' git grep -P -f f -i a
-		
-Binary file a matches
-ok 76 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[Y]<NUL>f' a
-
-expecting success of 7816.77 '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 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7810-grep.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7810-grep/.git/
 expecting success of 7810.1 'setup': 
@@ -491570,3276 +490612,1299 @@
 	git add cache-this &&
 	rm cache-this &&
 	test_when_finished "git rm --cached cache-this" &&
-	test_must_fail git grep --quiet "only in the index" &&
-	git grep --quiet --cached "only in the index" &&
-	test_must_fail git grep --quiet "only in the index" HEAD
-
-rm 'cache-this'
-ok 259 - grep can find things only in the index
-
-expecting success of 7810.260 'grep does not report i-t-a with -L --cached': 
-	echo "intend to add this" >intend-to-add &&
-	git add -N intend-to-add &&
-	test_when_finished "git rm -f intend-to-add" &&
-	git ls-files | grep -v "^intend-to-add\$" >expected &&
-	git grep -L --cached "nonexistent_string" >actual &&
-	test_cmp expected actual
-
-rm 'intend-to-add'
-ok 260 - grep does not report i-t-a with -L --cached
-
-expecting success of 7810.261 'grep does not report i-t-a and assume unchanged with -L': 
-	echo "intend to add this" >intend-to-add-assume-unchanged &&
-	git add -N intend-to-add-assume-unchanged &&
-	test_when_finished "git rm -f intend-to-add-assume-unchanged" &&
-	git update-index --assume-unchanged intend-to-add-assume-unchanged &&
-	git ls-files | grep -v "^intend-to-add-assume-unchanged\$" >expected &&
-	git grep -L "nonexistent_string" >actual &&
-	test_cmp expected actual
-
-rm 'intend-to-add-assume-unchanged'
-ok 261 - grep does not report i-t-a and assume unchanged with -L
-
-# passed all 261 test(s)
-1..261
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7900-maintenance.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.git/
-expecting success of 7900.1 'help text': 
-	test_expect_code 129 git maintenance -h >actual &&
-	test_grep "usage: git maintenance <subcommand>" actual &&
-	test_expect_code 129 git maintenance barf 2>err &&
-	test_grep "unknown subcommand: \`barf'" err &&
-	test_grep "usage: git maintenance" err &&
-	test_expect_code 129 git maintenance 2>err &&
-	test_grep "error: need a subcommand" err &&
-	test_grep "usage: git maintenance" err
-
-usage: git maintenance <subcommand> [<options>]
-error: unknown subcommand: `barf'
-usage: git maintenance <subcommand> [<options>]
-error: need a subcommand
-usage: git maintenance <subcommand> [<options>]
-ok 1 - help text
-
-expecting success of 7900.2 'run [--auto|--quiet]': 
-	GIT_TRACE2_EVENT="$(pwd)/run-no-auto.txt" \
-		git maintenance run 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-auto.txt" \
-		git maintenance run --auto 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-no-quiet.txt" \
-		git maintenance run --no-quiet 2>/dev/null &&
-	test_subcommand git gc --quiet <run-no-auto.txt &&
-	test_subcommand ! git gc --auto --quiet <run-auto.txt &&
-	test_subcommand git gc --no-quiet <run-no-quiet.txt
-
-Nothing new to pack.
-{"event":"child_start","sid":"20251218T013925.540612Z-Hfbad846e-P00004f4f","thread":"main","time":"2025-12-18T01:39:25.541357Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet"]}
-{"event":"child_start","sid":"20251218T013925.575590Z-Hfbad846e-P00004fc0","thread":"main","time":"2025-12-18T01:39:25.576321Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet"]}
-ok 2 - run [--auto|--quiet]
-
-expecting success of 7900.3 'maintenance.auto config option': 
-	GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 &&
-	test_subcommand git maintenance run --auto --quiet <default &&
-	GIT_TRACE2_EVENT="$(pwd)/true" \
-		git -c maintenance.auto=true \
-		commit --quiet --allow-empty -m 2 &&
-	test_subcommand git maintenance run --auto --quiet  <true &&
-	GIT_TRACE2_EVENT="$(pwd)/false" \
-		git -c maintenance.auto=false \
-		commit --quiet --allow-empty -m 3 &&
-	test_subcommand ! git maintenance run --auto --quiet  <false
-
-{"event":"child_start","sid":"20251218T013925.617800Z-Hfbad846e-P00005052","thread":"main","time":"2025-12-18T01:39:25.620310Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet"]}
-{"event":"child_start","sid":"20251218T013925.626846Z-Hfbad846e-P00005074","thread":"main","time":"2025-12-18T01:39:25.629511Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet"]}
-ok 3 - maintenance.auto config option
-
-expecting success of 7900.4 'register uses XDG_CONFIG_HOME config if it exists': 
-	test_when_finished rm -r .config/git/config &&
-	(
-		XDG_CONFIG_HOME=.config &&
-		export XDG_CONFIG_HOME &&
-		mkdir -p $XDG_CONFIG_HOME/git &&
-		>$XDG_CONFIG_HOME/git/config &&
-		git maintenance register &&
-		git config --file=$XDG_CONFIG_HOME/git/config --get maintenance.repo >actual &&
-		pwd >expect &&
-		test_cmp expect actual
-	)
-
-ok 4 - register uses XDG_CONFIG_HOME config if it exists
-
-expecting success of 7900.5 'register does not need XDG_CONFIG_HOME config to exist': 
-	test_when_finished git maintenance unregister &&
-	test_path_is_missing $XDG_CONFIG_HOME/git/config &&
-	git maintenance register &&
-	git config --global --get maintenance.repo >actual &&
-	pwd >expect &&
-	test_cmp expect actual
-
-ok 5 - register does not need XDG_CONFIG_HOME config to exist
-
-expecting success of 7900.6 'unregister uses XDG_CONFIG_HOME config if it exists': 
-	test_when_finished rm -r .config/git/config &&
-	(
-		XDG_CONFIG_HOME=.config &&
-		export XDG_CONFIG_HOME &&
-		mkdir -p $XDG_CONFIG_HOME/git &&
-		>$XDG_CONFIG_HOME/git/config &&
-		git maintenance register &&
-		git maintenance unregister &&
-		test_must_fail git config --file=$XDG_CONFIG_HOME/git/config --get maintenance.repo >actual &&
-		test_must_be_empty actual
-	)
-
-ok 6 - unregister uses XDG_CONFIG_HOME config if it exists
-
-expecting success of 7900.7 'unregister does not need XDG_CONFIG_HOME config to exist': 
-	test_path_is_missing $XDG_CONFIG_HOME/git/config &&
-	git maintenance register &&
-	git maintenance unregister &&
-	test_must_fail git config --global --get maintenance.repo >actual &&
-	test_must_be_empty actual
-
-ok 7 - unregister does not need XDG_CONFIG_HOME config to exist
-
-expecting success of 7900.8 'maintenance.<task>.enabled': 
-	git config maintenance.gc.enabled false &&
-	git config maintenance.commit-graph.enabled true &&
-	GIT_TRACE2_EVENT="$(pwd)/run-config.txt" git maintenance run 2>err &&
-	test_subcommand ! git gc --quiet <run-config.txt &&
-	test_subcommand git commit-graph write --split --reachable --no-progress <run-config.txt
-
-{"event":"child_start","sid":"20251218T013925.797779Z-Hfbad846e-P0000527c","thread":"main","time":"2025-12-18T01:39:25.798656Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-ok 8 - maintenance.<task>.enabled
-
-expecting success of 7900.9 'run --task=<task>': 
-	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
-		git maintenance run --task=commit-graph 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-gc.txt" \
-		git maintenance run --task=gc 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
-		git maintenance run --task=commit-graph 2>/dev/null &&
-	GIT_TRACE2_EVENT="$(pwd)/run-both.txt" \
-		git maintenance run --task=commit-graph --task=gc 2>/dev/null &&
-	test_subcommand ! git gc --quiet <run-commit-graph.txt &&
-	test_subcommand git gc --quiet <run-gc.txt &&
-	test_subcommand git gc --quiet <run-both.txt &&
-	test_subcommand git commit-graph write --split --reachable --no-progress <run-commit-graph.txt &&
-	test_subcommand ! git commit-graph write --split --reachable --no-progress <run-gc.txt &&
-	test_subcommand git commit-graph write --split --reachable --no-progress <run-both.txt
-
-{"event":"child_start","sid":"20251218T013925.822538Z-Hfbad846e-P000052f6","thread":"main","time":"2025-12-18T01:39:25.823266Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet"]}
-{"event":"child_start","sid":"20251218T013925.865239Z-Hfbad846e-P0000537f","thread":"main","time":"2025-12-18T01:39:25.865921Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet"]}
-{"event":"child_start","sid":"20251218T013925.813161Z-Hfbad846e-P000052d1","thread":"main","time":"2025-12-18T01:39:25.813975Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013925.858778Z-Hfbad846e-P00005373","thread":"main","time":"2025-12-18T01:39:25.859578Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013925.865239Z-Hfbad846e-P0000537f","thread":"main","time":"2025-12-18T01:39:25.895509Z","file":"run-command.c","line":724,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-ok 9 - run --task=<task>
-
-expecting success of 7900.10 'core.commitGraph=false prevents write process': 
-	GIT_TRACE2_EVENT="$(pwd)/no-commit-graph.txt" \
-		git -c core.commitGraph=false maintenance run \
-		--task=commit-graph 2>/dev/null &&
-	test_subcommand ! git commit-graph write --split --reachable --no-progress \
-		<no-commit-graph.txt
-
-ok 10 - core.commitGraph=false prevents write process
-
-expecting success of 7900.11 'commit-graph auto condition': 
-	COMMAND="maintenance run --task=commit-graph --auto --quiet" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/cg-no.txt" \
-		git -c maintenance.commit-graph.auto=1 $COMMAND &&
-	GIT_TRACE2_EVENT="$(pwd)/cg-negative-means-yes.txt" \
-		git -c maintenance.commit-graph.auto="-1" $COMMAND &&
-
-	test_commit first &&
-
-	GIT_TRACE2_EVENT="$(pwd)/cg-zero-means-no.txt" \
-		git -c maintenance.commit-graph.auto=0 $COMMAND &&
-	GIT_TRACE2_EVENT="$(pwd)/cg-one-satisfied.txt" \
-		git -c maintenance.commit-graph.auto=1 $COMMAND &&
-
-	git commit --allow-empty -m "second" &&
-	git commit --allow-empty -m "third" &&
-
-	GIT_TRACE2_EVENT="$(pwd)/cg-two-satisfied.txt" \
-		git -c maintenance.commit-graph.auto=2 $COMMAND &&
-
-	COMMIT_GRAPH_WRITE="git commit-graph write --split --reachable --no-progress" &&
-	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-no.txt &&
-	test_subcommand $COMMIT_GRAPH_WRITE <cg-negative-means-yes.txt &&
-	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-zero-means-no.txt &&
-	test_subcommand $COMMIT_GRAPH_WRITE <cg-one-satisfied.txt &&
-	test_subcommand $COMMIT_GRAPH_WRITE <cg-two-satisfied.txt
-
-[master a69f914] first
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 first.t
-[master 0c7e5e9] second
- Author: A U Thor <author@example.com>
-[master fa248cf] third
- Author: A U Thor <author@example.com>
-{"event":"child_start","sid":"20251218T013925.923635Z-Hfbad846e-P0000540b","thread":"main","time":"2025-12-18T01:39:25.924363Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013925.963870Z-Hfbad846e-P00005480","thread":"main","time":"2025-12-18T01:39:25.965205Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013925.998212Z-Hfbad846e-P000054d7","thread":"main","time":"2025-12-18T01:39:25.999665Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-ok 11 - commit-graph auto condition
-
-expecting success of 7900.12 'run --task=bogus': 
-	test_must_fail git maintenance run --task=bogus 2>err &&
-	test_grep "is not a valid task" err
-
-error: 'bogus' is not a valid task
-ok 12 - run --task=bogus
-
-expecting success of 7900.13 'run --task duplicate': 
-	test_must_fail git maintenance run --task=gc --task=gc 2>err &&
-	test_grep "cannot be selected multiple times" err
-
-error: task 'gc' cannot be selected multiple times
-ok 13 - run --task duplicate
-
-expecting success of 7900.14 'run --task=prefetch with no remotes': 
-	git maintenance run --task=prefetch 2>err &&
-	test_must_be_empty err
-
-ok 14 - run --task=prefetch with no remotes
-
-expecting success of 7900.15 'prefetch multiple remotes': 
-	git clone . clone1 &&
-	git clone . clone2 &&
-	git remote add remote1 "file://$(pwd)/clone1" &&
-	git remote add remote2 "file://$(pwd)/clone2" &&
-	git -C clone1 switch -c one &&
-	git -C clone2 switch -c two &&
-	test_commit -C clone1 one &&
-	test_commit -C clone2 two &&
-	GIT_TRACE2_EVENT="$(pwd)/run-prefetch.txt" git maintenance run --task=prefetch 2>/dev/null &&
-	fetchargs="--prefetch --prune --no-tags --no-write-fetch-head --recurse-submodules=no --quiet" &&
-	test_subcommand git fetch remote1 $fetchargs <run-prefetch.txt &&
-	test_subcommand git fetch remote2 $fetchargs <run-prefetch.txt &&
-	git for-each-ref refs/remotes >actual &&
-	test_must_be_empty actual &&
-	git log prefetch/remotes/remote1/one &&
-	git log prefetch/remotes/remote2/two &&
-	git fetch --all &&
-	test_cmp_rev refs/remotes/remote1/one refs/prefetch/remotes/remote1/one &&
-	test_cmp_rev refs/remotes/remote2/two refs/prefetch/remotes/remote2/two &&
-
-	git log --oneline --decorate --all >log &&
-	! grep "prefetch" log &&
-
-	test_when_finished git config --unset remote.remote1.skipFetchAll &&
-	git config remote.remote1.skipFetchAll true &&
-	GIT_TRACE2_EVENT="$(pwd)/skip-remote1.txt" git maintenance run --task=prefetch 2>/dev/null &&
-	test_subcommand ! git fetch remote1 $fetchargs <skip-remote1.txt &&
-	test_subcommand git fetch remote2 $fetchargs <skip-remote1.txt
-
-Cloning into 'clone1'...
-done.
-Cloning into 'clone2'...
-done.
-Switched to a new branch 'one'
-Switched to a new branch 'two'
-[one e779b39] one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 one.t
-[two 41188fb] two
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 two.t
-{"event":"child_start","sid":"20251218T013926.356249Z-Hfbad846e-P000057fa","thread":"main","time":"2025-12-18T01:39:26.356981Z","file":"run-command.c","line":724,"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":"20251218T013926.356249Z-Hfbad846e-P000057fa","thread":"main","time":"2025-12-18T01:39:26.404392Z","file":"run-command.c","line":724,"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 e779b3967abc4fd38a0961b501c6e2ec4b1da869
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:14:13 2005 -0700
-
-    one
-
-commit fa248cfd6f7af9061e71aa34bdf8603f49b12a5b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    third
-
-commit 0c7e5e94681801e1ca3e9f2d77cc7ed455d17e75
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    second
-
-commit a69f9140dbb5bbddf7198dcc8b3a47a087a097a9
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    first
-
-commit 54c6b2cd4fb50066683a197cc6d677689618505a
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    3
-
-commit fc99def8b1df27bcab7d1f4b7ced73239f9bd7ec
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    2
-
-commit a3a8cd3c82028671bf51502d77277baf14a2f528
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-commit 41188fb9f5dcfd3e516e0bf1c29bc446a9072e3d
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    two
-
-commit fa248cfd6f7af9061e71aa34bdf8603f49b12a5b
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    third
-
-commit 0c7e5e94681801e1ca3e9f2d77cc7ed455d17e75
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    second
-
-commit a69f9140dbb5bbddf7198dcc8b3a47a087a097a9
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    first
-
-commit 54c6b2cd4fb50066683a197cc6d677689618505a
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    3
-
-commit fc99def8b1df27bcab7d1f4b7ced73239f9bd7ec
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    2
-
-commit a3a8cd3c82028671bf51502d77277baf14a2f528
-Author: A U Thor <author@example.com>
-Date:   Fri Apr 1 13:14:15 2005 +0200
-
-    1
-Fetching remote1
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/clone1
- * [new branch]      master     -> remote1/master
- * [new branch]      one        -> remote1/one
- * [new tag]         one        -> one
-Fetching remote2
-From file:///build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/clone2
- * [new branch]      master     -> remote2/master
- * [new branch]      two        -> remote2/two
- * [new tag]         two        -> two
-{"event":"child_start","sid":"20251218T013926.570373Z-Hfbad846e-P0000599f","thread":"main","time":"2025-12-18T01:39:26.571175Z","file":"run-command.c","line":724,"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 15 - prefetch multiple remotes
-
-expecting success of 7900.16 'loose-objects task': 
-	# Repack everything so we know the state of the object dir
-	git repack -adk &&
-
-	# Hack to stop maintenance from running during "git commit"
-	echo in use >.git/objects/maintenance.lock &&
-
-	# Assuming that "git commit" creates at least one loose object
-	test_commit create-loose-object &&
-	rm .git/objects/maintenance.lock &&
-
-	ls .git/objects >obj-dir-before &&
-	test_file_not_empty obj-dir-before &&
-	ls .git/objects/pack/*.pack >packs-before &&
-	test_line_count = 1 packs-before &&
-
-	# The first run creates a pack-file
-	# but does not delete loose objects.
-	git maintenance run --task=loose-objects &&
-	ls .git/objects >obj-dir-between &&
-	test_cmp obj-dir-before obj-dir-between &&
-	ls .git/objects/pack/*.pack >packs-between &&
-	test_line_count = 2 packs-between &&
-	ls .git/objects/pack/loose-*.pack >loose-packs &&
-	test_line_count = 1 loose-packs &&
-
-	# The second run deletes loose objects
-	# but does not create a pack-file.
-	git maintenance run --task=loose-objects &&
-	ls .git/objects >obj-dir-after &&
-	cat >expect <<-\EOF &&
-	info
-	pack
-	EOF
-	test_cmp expect obj-dir-after &&
-	ls .git/objects/pack/*.pack >packs-after &&
-	test_cmp packs-between packs-after
-
-[master 765eeea] create-loose-object
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 create-loose-object.t
-76f3951ecb34584aaf08a645cd287aaeb6c6975f
-ok 16 - loose-objects task
-
-expecting success of 7900.17 'maintenance.loose-objects.auto': 
-	git repack -adk &&
-	GIT_TRACE2_EVENT="$(pwd)/trace-lo1.txt" \
-		git -c maintenance.loose-objects.auto=1 maintenance \
-		run --auto --task=loose-objects 2>/dev/null &&
-	test_subcommand ! git prune-packed --quiet <trace-lo1.txt &&
-	printf data-A | git hash-object -t blob --stdin -w &&
-	GIT_TRACE2_EVENT="$(pwd)/trace-loA" \
-		git -c maintenance.loose-objects.auto=2 \
-		maintenance run --auto --task=loose-objects 2>/dev/null &&
-	test_subcommand ! git prune-packed --quiet <trace-loA &&
-	printf data-B | git hash-object -t blob --stdin -w &&
-	GIT_TRACE2_EVENT="$(pwd)/trace-loB" \
-		git -c maintenance.loose-objects.auto=2 \
-		maintenance run --auto --task=loose-objects 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <trace-loB &&
-	GIT_TRACE2_EVENT="$(pwd)/trace-loC" \
-		git -c maintenance.loose-objects.auto=2 \
-		maintenance run --auto --task=loose-objects 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <trace-loC
-
-07163daad06a0119b0a241cf1882adae4f88fd56
-4e26d6d394bf76d04cf3ab6f994c0bcaaf1a0a2f
-b45f8ed9850b966e2e4097582fd20e83ec6714cd
-{"event":"child_start","sid":"20251218T013926.791828Z-Hfbad846e-P00005be6","thread":"main","time":"2025-12-18T01:39:26.792736Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20251218T013926.810286Z-Hfbad846e-P00005c14","thread":"main","time":"2025-12-18T01:39:26.811259Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-ok 17 - maintenance.loose-objects.auto
-
-expecting success of 7900.18 'incremental-repack task': 
-	packDir=.git/objects/pack &&
-	for i in $(test_seq 1 5)
-	do
-		test_commit $i || return 1
-	done &&
-
-	# Create three disjoint pack-files with size BIG, small, small.
-	echo HEAD~2 | git pack-objects --revs $packDir/test-1 &&
-	test_tick &&
-	git pack-objects --revs $packDir/test-2 <<-\EOF &&
-	HEAD~1
-	^HEAD~2
-	EOF
-	test_tick &&
-	git pack-objects --revs $packDir/test-3 <<-\EOF &&
-	HEAD
-	^HEAD~1
-	EOF
-
-	# Delete refs that have not been repacked in these packs.
-	git for-each-ref --format="delete %(refname)" \
-		refs/prefetch refs/tags refs/remotes >refs &&
-	git update-ref --stdin <refs &&
-
-	# Replace the object directory with this pack layout.
-	rm -f $packDir/pack-* &&
-	rm -f $packDir/loose-* &&
-	ls $packDir/*.pack >packs-before &&
-	test_line_count = 3 packs-before &&
-
-	# make sure we do not have any broken refs that were
-	# missed in the deletion above
-	git for-each-ref &&
-
-	# the job repacks the two into a new pack, but does not
-	# delete the old ones.
-	git maintenance run --task=incremental-repack &&
-	ls $packDir/*.pack >packs-between &&
-	test_line_count = 4 packs-between &&
-
-	# the job deletes the two old packs, and does not write
-	# a new one because the batch size is not high enough to
-	# pack the largest pack-file.
-	git maintenance run --task=incremental-repack &&
-	ls .git/objects/pack/*.pack >packs-after &&
-	test_line_count = 2 packs-after
-
-[master 3c8869b] 1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 1.t
-[master 2399dc1] 2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 2.t
-[master b7d27f9] 3
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 3.t
-[master b0737fd] 4
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 4.t
-[master 70626b3] 5
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 5.t
-e47e5aa80e9b70c2b26c98277f97a2011efcd068
-b828c1fd30682bb2bc80a3b7331978be5c6c2e26
-c20fc1cb0ef9be625e4c591c8507f7f9cfc087b8
-70626b3574ae58642e68da67a570eaa414d5aebf commit	refs/heads/master
-ok 18 - incremental-repack task
-
-checking prerequisite: EXPENSIVE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
-	test -n "$GIT_TEST_LONG"
-
-)
-prerequisite EXPENSIVE not satisfied
-ok 19 # skip incremental-repack 2g limit (missing EXPENSIVE)
-
-expecting success of 7900.20 'maintenance.incremental-repack.auto': 
-	rm -rf incremental-repack-true &&
-	git init incremental-repack-true &&
-	(
-		cd incremental-repack-true &&
-		git config core.multiPackIndex true &&
-		run_incremental_repack_and_verify
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/incremental-repack-true/.git/
-[master (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master ab54baa] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ba2455fe8b258f9311bea5fa32bd29103f57ba7e
-[master 3983a09] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-2f10694fe702316bcde937d57f956fe5ae42f7fe
-{"event":"child_start","sid":"20251218T013927.087451Z-Hfbad846e-P000060bf","thread":"main","time":"2025-12-18T01:39:27.088489Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-ok 20 - maintenance.incremental-repack.auto
-
-expecting success of 7900.21 'maintenance.incremental-repack.auto (when config is unset)': 
-	rm -rf incremental-repack-unset &&
-	git init incremental-repack-unset &&
-	(
-		cd incremental-repack-unset &&
-		test_unconfig core.multiPackIndex &&
-		run_incremental_repack_and_verify
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/incremental-repack-unset/.git/
-[master (root-commit) fa70208] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-[master ab54baa] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-ba2455fe8b258f9311bea5fa32bd29103f57ba7e
-[master 3983a09] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-2f10694fe702316bcde937d57f956fe5ae42f7fe
-{"event":"child_start","sid":"20251218T013927.205611Z-Hfbad846e-P000062d2","thread":"main","time":"2025-12-18T01:39:27.206628Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-ok 21 - maintenance.incremental-repack.auto (when config is unset)
-
-expecting success of 7900.22 'pack-refs task': 
-	for n in $(test_seq 1 5)
-	do
-		git branch -f to-pack/$n HEAD || return 1
-	done &&
-	GIT_TRACE2_EVENT="$(pwd)/pack-refs.txt" \
-		git maintenance run --task=pack-refs &&
-	test_subcommand git pack-refs --all --prune <pack-refs.txt
-
-{"event":"child_start","sid":"20251218T013927.246896Z-Hfbad846e-P000063a4","thread":"main","time":"2025-12-18T01:39:27.247877Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
-ok 22 - pack-refs task
-
-expecting success of 7900.23 '--auto and --schedule incompatible': 
-	test_must_fail git maintenance run --auto --schedule=daily 2>err &&
-	test_grep "at most one" err
-
-fatal: use at most one of --auto and --schedule=<frequency>
-ok 23 - --auto and --schedule incompatible
-
-expecting success of 7900.24 'invalid --schedule value': 
-	test_must_fail git maintenance run --schedule=annually 2>err &&
-	test_grep "unrecognized --schedule" err
-
-fatal: unrecognized --schedule argument 'annually'
-ok 24 - invalid --schedule value
-
-expecting success of 7900.25 '--schedule inheritance weekly -> daily -> hourly': 
-	git config maintenance.loose-objects.enabled true &&
-	git config maintenance.loose-objects.schedule hourly &&
-	git config maintenance.commit-graph.enabled true &&
-	git config maintenance.commit-graph.schedule daily &&
-	git config maintenance.incremental-repack.enabled true &&
-	git config maintenance.incremental-repack.schedule weekly &&
-
-	GIT_TRACE2_EVENT="$(pwd)/hourly.txt" \
-		git maintenance run --schedule=hourly 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <hourly.txt &&
-	test_subcommand ! git commit-graph write --split --reachable \
-		--no-progress <hourly.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress <hourly.txt &&
-
-	GIT_TRACE2_EVENT="$(pwd)/daily.txt" \
-		git maintenance run --schedule=daily 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <daily.txt &&
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <daily.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress <daily.txt &&
-
-	GIT_TRACE2_EVENT="$(pwd)/weekly.txt" \
-		git maintenance run --schedule=weekly 2>/dev/null &&
-	test_subcommand git prune-packed --quiet <weekly.txt &&
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <weekly.txt &&
-	test_subcommand git multi-pack-index write --no-progress <weekly.txt
-
-e2fec807c0f920d0361f890beb2cb31019219ebe
-{"event":"child_start","sid":"20251218T013927.291391Z-Hfbad846e-P00006464","thread":"main","time":"2025-12-18T01:39:27.384797Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20251218T013927.409374Z-Hfbad846e-P000065ca","thread":"main","time":"2025-12-18T01:39:27.452564Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20251218T013927.409374Z-Hfbad846e-P000065ca","thread":"main","time":"2025-12-18T01:39:27.456846Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013927.472913Z-Hfbad846e-P0000667b","thread":"main","time":"2025-12-18T01:39:27.501096Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20251218T013927.472913Z-Hfbad846e-P0000667b","thread":"main","time":"2025-12-18T01:39:27.531949Z","file":"run-command.c","line":724,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013927.472913Z-Hfbad846e-P0000667b","thread":"main","time":"2025-12-18T01:39:27.507310Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-ok 25 - --schedule inheritance weekly -> daily -> hourly
-
-expecting success of 7900.26 'maintenance.strategy inheritance': 
-	for task in commit-graph loose-objects incremental-repack
-	do
-		git config --unset maintenance.$task.schedule || return 1
-	done &&
-
-	test_when_finished git config --unset maintenance.strategy &&
-	git config maintenance.strategy incremental &&
-
-	GIT_TRACE2_EVENT="$(pwd)/incremental-hourly.txt" \
-		git maintenance run --schedule=hourly --quiet &&
-	GIT_TRACE2_EVENT="$(pwd)/incremental-daily.txt" \
-		git maintenance run --schedule=daily --quiet &&
-	GIT_TRACE2_EVENT="$(pwd)/incremental-weekly.txt" \
-		git maintenance run --schedule=weekly --quiet &&
-
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <incremental-hourly.txt &&
-	test_subcommand ! git prune-packed --quiet <incremental-hourly.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress \
-		<incremental-hourly.txt &&
-	test_subcommand ! git pack-refs --all --prune \
-		<incremental-hourly.txt &&
-
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <incremental-daily.txt &&
-	test_subcommand git prune-packed --quiet <incremental-daily.txt &&
-	test_subcommand git multi-pack-index write --no-progress \
-		<incremental-daily.txt &&
-	test_subcommand ! git pack-refs --all --prune \
-		<incremental-daily.txt &&
-
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <incremental-weekly.txt &&
-	test_subcommand git prune-packed --quiet <incremental-weekly.txt &&
-	test_subcommand git multi-pack-index write --no-progress \
-		<incremental-weekly.txt &&
-	test_subcommand git pack-refs --all --prune \
-		<incremental-weekly.txt &&
-
-	# Modify defaults
-	git config maintenance.commit-graph.schedule daily &&
-	git config maintenance.loose-objects.schedule hourly &&
-	git config maintenance.incremental-repack.enabled false &&
-
-	GIT_TRACE2_EVENT="$(pwd)/modified-hourly.txt" \
-		git maintenance run --schedule=hourly --quiet &&
-	GIT_TRACE2_EVENT="$(pwd)/modified-daily.txt" \
-		git maintenance run --schedule=daily --quiet &&
-
-	test_subcommand ! git commit-graph write --split --reachable \
-		--no-progress <modified-hourly.txt &&
-	test_subcommand git prune-packed --quiet <modified-hourly.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress \
-		<modified-hourly.txt &&
-
-	test_subcommand git commit-graph write --split --reachable \
-		--no-progress <modified-daily.txt &&
-	test_subcommand git prune-packed --quiet <modified-daily.txt &&
-	test_subcommand ! git multi-pack-index write --no-progress \
-		<modified-daily.txt
-
-{"event":"child_start","sid":"20251218T013927.574957Z-Hfbad846e-P0000678b","thread":"main","time":"2025-12-18T01:39:27.598091Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013927.610560Z-Hfbad846e-P000067e4","thread":"main","time":"2025-12-18T01:39:27.661274Z","file":"run-command.c","line":724,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013927.610560Z-Hfbad846e-P000067e4","thread":"main","time":"2025-12-18T01:39:27.632140Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20251218T013927.610560Z-Hfbad846e-P000067e4","thread":"main","time":"2025-12-18T01:39:27.636910Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20251218T013927.672081Z-Hfbad846e-P000068c5","thread":"main","time":"2025-12-18T01:39:27.715162Z","file":"run-command.c","line":724,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013927.672081Z-Hfbad846e-P000068c5","thread":"main","time":"2025-12-18T01:39:27.701555Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20251218T013927.672081Z-Hfbad846e-P000068c5","thread":"main","time":"2025-12-18T01:39:27.705881Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
-{"event":"child_start","sid":"20251218T013927.672081Z-Hfbad846e-P000068c5","thread":"main","time":"2025-12-18T01:39:27.719485Z","file":"run-command.c","line":724,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
-{"event":"child_start","sid":"20251218T013927.753839Z-Hfbad846e-P00006a25","thread":"main","time":"2025-12-18T01:39:27.777177Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-{"event":"child_start","sid":"20251218T013927.784148Z-Hfbad846e-P00006a99","thread":"main","time":"2025-12-18T01:39:27.812366Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
-{"event":"child_start","sid":"20251218T013927.784148Z-Hfbad846e-P00006a99","thread":"main","time":"2025-12-18T01:39:27.807876Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
-ok 26 - maintenance.strategy inheritance
-
-expecting success of 7900.27 'register and unregister': 
-	test_when_finished git config --global --unset-all maintenance.repo &&
-
-	test_must_fail git maintenance unregister 2>err &&
-	grep "is not registered" err &&
-	git maintenance unregister --force &&
-
-	git config --global --add maintenance.repo /existing1 &&
-	git config --global --add maintenance.repo /existing2 &&
-	git config --global --get-all maintenance.repo >before &&
-
-	git maintenance register &&
-	test_cmp_config false maintenance.auto &&
-	git config --global --get-all maintenance.repo >between &&
-	cp before expect &&
-	pwd >>expect &&
-	test_cmp expect between &&
-
-	git maintenance unregister &&
-	git config --global --get-all maintenance.repo >actual &&
-	test_cmp before actual &&
-
-	git config --file ./other --add maintenance.repo /existing1 &&
-	git config --file ./other --add maintenance.repo /existing2 &&
-	git config --file ./other --get-all maintenance.repo >before &&
-
-	git maintenance register --config-file ./other &&
-	test_cmp_config false maintenance.auto &&
-	git config --file ./other --get-all maintenance.repo >between &&
-	cp before expect &&
-	pwd >>expect &&
-	test_cmp expect between &&
-
-	git maintenance unregister --config-file ./other &&
-	git config --file ./other --get-all maintenance.repo >actual &&
-	test_cmp before actual &&
-
-	test_must_fail git maintenance unregister 2>err &&
-	grep "is not registered" err &&
-	git maintenance unregister --force &&
-
-	test_must_fail git maintenance unregister --config-file ./other 2>err &&
-	grep "is not registered" err &&
-	git maintenance unregister --config-file ./other --force
-
-fatal: repository '/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance' is not registered
-fatal: repository '/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance' is not registered
-fatal: repository '/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance' is not registered
-ok 27 - register and unregister
-
-expecting success of 7900.28 'register with no value for maintenance.repo': 
-	cp .git/config .git/config.orig &&
-	test_when_finished mv .git/config.orig .git/config &&
-
-	cat >>.git/config <<-\EOF &&
-	[maintenance]
-		repo
-	EOF
-	cat >expect <<-\EOF &&
-	error: missing value for 'maintenance.repo'
-	EOF
-	git maintenance register 2>actual &&
-	test_cmp expect actual &&
-	git config maintenance.repo
-
-
-ok 28 - register with no value for maintenance.repo
-
-expecting success of 7900.29 'unregister with no value for maintenance.repo': 
-	cp .git/config .git/config.orig &&
-	test_when_finished mv .git/config.orig .git/config &&
-
-	cat >>.git/config <<-\EOF &&
-	[maintenance]
-		repo
-	EOF
-	cat >expect <<-\EOF &&
-	error: missing value for 'maintenance.repo'
-	EOF
-	test_expect_code 128 git maintenance unregister 2>actual.raw &&
-	grep ^error actual.raw >actual &&
-	test_cmp expect actual &&
-	git config maintenance.repo &&
-
-	git maintenance unregister --force 2>actual.raw &&
-	grep ^error actual.raw >actual &&
-	test_cmp expect actual &&
-	git config maintenance.repo
-
-
-
-ok 29 - unregister with no value for maintenance.repo
-
-expecting success of 7900.30 'register and unregister with regex metacharacters': 
-	META="a+b*c" &&
-	git init "$META" &&
-	git -C "$META" maintenance register &&
-	git config --get-all --show-origin maintenance.repo &&
-	git config --get-all --global --fixed-value \
-		maintenance.repo "$(pwd)/$META" &&
-	git -C "$META" maintenance unregister &&
-	test_must_fail git config --get-all --global --fixed-value \
-		maintenance.repo "$(pwd)/$META"
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/a+b*c/.git/
-file:/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.gitconfig	/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
-file:/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.gitconfig	/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/a+b*c
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/a+b*c
-ok 30 - register and unregister with regex metacharacters
-
-expecting success of 7900.31 'start --scheduler=<scheduler>': 
-	test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
-	test_grep "unrecognized --scheduler argument" err &&
-
-	test_expect_code 129 git maintenance start --no-scheduler 2>err &&
-	test_grep "unknown option" err &&
-
-	test_expect_code 128 \
-		env GIT_TEST_MAINT_SCHEDULER="launchctl:true,schtasks:true" \
-		git maintenance start --scheduler=crontab 2>err &&
-	test_grep "fatal: crontab scheduler is not available" err
-
-error: unrecognized --scheduler argument 'foo'
-error: unknown option `no-scheduler'
-fatal: crontab scheduler is not available
-ok 31 - start --scheduler=<scheduler>
-
-expecting success of 7900.32 'start from empty cron table': 
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
-
-	# start registers the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	grep "for-each-repo --config=maintenance.repo maintenance run --schedule=daily" cron.txt &&
-	grep "for-each-repo --config=maintenance.repo maintenance run --schedule=hourly" cron.txt &&
-	grep "for-each-repo --config=maintenance.repo maintenance run --schedule=weekly" cron.txt
-
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
-13 0 * * 1-6 "/build/reproducible-path/git-2.45.2/git" --exec-path="/build/reproducible-path/git-2.45.2" for-each-repo --config=maintenance.repo maintenance run --schedule=daily
-13 1-23 * * * "/build/reproducible-path/git-2.45.2/git" --exec-path="/build/reproducible-path/git-2.45.2" for-each-repo --config=maintenance.repo maintenance run --schedule=hourly
-13 0 * * 0 "/build/reproducible-path/git-2.45.2/git" --exec-path="/build/reproducible-path/git-2.45.2" for-each-repo --config=maintenance.repo maintenance run --schedule=weekly
-ok 32 - start from empty cron table
-
-expecting success of 7900.33 'stop from existing schedule': 
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
-
-	# stop does not unregister the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	# Operation is idempotent
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
-	test_must_be_empty cron.txt
-
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
-ok 33 - stop from existing schedule
-
-expecting success of 7900.34 'start preserves existing schedule': 
-	echo "Important information!" >cron.txt &&
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
-	grep "Important information!" cron.txt
-
-Important information!
-ok 34 - start preserves existing schedule
-
-expecting success of 7900.35 'magic markers are correct': 
-	grep "GIT MAINTENANCE SCHEDULE" cron.txt >actual &&
-	cat >expect <<-\EOF &&
-	# BEGIN GIT MAINTENANCE SCHEDULE
-	# END GIT MAINTENANCE SCHEDULE
-	EOF
-	test_cmp actual expect
-
-ok 35 - magic markers are correct
-
-expecting success of 7900.36 'stop preserves surrounding schedule': 
-	echo "Crucial information!" >>cron.txt &&
-	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
-	grep "Important information!" cron.txt &&
-	grep "Crucial information!" cron.txt
-
-Important information!
-Crucial information!
-ok 36 - stop preserves surrounding schedule
-
-expecting success of 7900.37 'start and stop macOS maintenance': 
-	# ensure $HOME can be compared against hook arguments on all platforms
-	pfx=$(cd "$HOME" && pwd) &&
-
-	write_script print-args <<-\EOF &&
-	echo $* | sed "s:gui/[0-9][0-9]*:gui/[UID]:" >>args
-	EOF
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
-
-	# start registers the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	ls "$HOME/Library/LaunchAgents" >actual &&
-	cat >expect <<-\EOF &&
-	org.git-scm.git.daily.plist
-	org.git-scm.git.hourly.plist
-	org.git-scm.git.weekly.plist
-	EOF
-	test_cmp expect actual &&
-
-	rm -f expect &&
-	for frequency in hourly daily weekly
-	do
-		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
-		test_xmllint "$PLIST" &&
-		grep schedule=$frequency "$PLIST" &&
-		echo "bootout gui/[UID] $PLIST" >>expect &&
-		echo "bootstrap gui/[UID] $PLIST" >>expect || return 1
-	done &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance stop &&
-
-	# stop does not unregister the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	printf "bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
-		hourly daily weekly >expect &&
-	test_cmp expect args &&
-	ls "$HOME/Library/LaunchAgents" >actual &&
-	test_line_count = 0 actual
-
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
-checking prerequisite: XMLLINT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-XMLLINT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-XMLLINT" &&
-	xmllint --version
-
-)
-xmllint: using libxml version 20914
-   compiled with: Threads Tree Output Push Reader Patterns Writer SAXv1 FTP HTTP DTDValid HTML Legacy C14N Catalog XPath XPointer XInclude Iconv ICU ISO8859X Unicode Regexps Automata Schemas Schematron Modules Debug Zlib Lzma 
-prerequisite XMLLINT ok
-<string>--schedule=hourly</string>
-<string>--schedule=daily</string>
-<string>--schedule=weekly</string>
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
-ok 37 - start and stop macOS maintenance
-
-expecting success of 7900.38 'use launchctl list to prevent extra work': 
-	# ensure we are registered
-	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
-
-	# do it again on a fresh args file
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
-
-	ls "$HOME/Library/LaunchAgents" >actual &&
-	cat >expect <<-\EOF &&
-	list org.git-scm.git.hourly
-	list org.git-scm.git.daily
-	list org.git-scm.git.weekly
-	EOF
-	test_cmp expect args
-
-ok 38 - use launchctl list to prevent extra work
-
-expecting success of 7900.39 'start and stop Windows maintenance': 
-	write_script print-args <<-\EOF &&
-	echo $* >>args
-	while test $# -gt 0
-	do
-		case "$1" in
-		/xml) shift; xmlfile=$1; break ;;
-		*) shift ;;
-		esac
-	done
-	test -z "$xmlfile" || cp "$xmlfile" "$xmlfile.xml"
-	EOF
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start --scheduler=schtasks &&
-
-	# start registers the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	for frequency in hourly daily weekly
-	do
-		grep "/create /tn Git Maintenance ($frequency) /f /xml" args &&
-		file=$(ls .git/schedule_${frequency}*.xml) &&
-		test_xmllint "$file" || return 1
-	done &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance stop &&
-
-	# stop does not unregister the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	printf "/delete /tn Git Maintenance (%s) /f\n" \
-		hourly daily weekly >expect &&
-	test_cmp expect args
-
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
-/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.git/schedule_hourly_tCEpYk
-/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.git/schedule_daily_uVN2bz
-/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.git/schedule_weekly_JiJd4q
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
-ok 39 - start and stop Windows maintenance
-
-expecting success of 7900.40 'start and stop Linux/systemd maintenance': 
-	write_script print-args <<-\EOF &&
-	printf "%s\n" "$*" >>args
-	EOF
-
-	XDG_CONFIG_HOME="$PWD" &&
-	export XDG_CONFIG_HOME &&
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance start --scheduler=systemd-timer &&
-
-	# start registers the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	for schedule in hourly daily weekly
-	do
-		test_path_is_file "systemd/user/git-maintenance@$schedule.timer" || return 1
-	done &&
-	test_path_is_file "systemd/user/git-maintenance@.service" &&
-
-	test_systemd_analyze_verify "systemd/user/git-maintenance@hourly.service" &&
-	test_systemd_analyze_verify "systemd/user/git-maintenance@daily.service" &&
-	test_systemd_analyze_verify "systemd/user/git-maintenance@weekly.service" &&
-
-	printf -- "--user enable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance stop &&
-
-	# stop does not unregister the repo
-	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-
-	for schedule in hourly daily weekly
-	do
-		test_path_is_missing "systemd/user/git-maintenance@$schedule.timer" || return 1
-	done &&
-	test_path_is_missing "systemd/user/git-maintenance@.service" &&
-
-	printf -- "--user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	test_cmp expect args
-
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
-checking prerequisite: SYSTEMD_ANALYZE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYSTEMD_ANALYZE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYSTEMD_ANALYZE" &&
-	systemd-analyze verify /lib/systemd/system/basic.target
-
-)
-t7900-maintenance.sh: 7: eval: systemd-analyze: not found
-prerequisite SYSTEMD_ANALYZE not satisfied
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
-ok 40 - start and stop Linux/systemd maintenance
-
-expecting success of 7900.41 'start and stop when several schedulers are available': 
-	write_script print-args <<-\EOF &&
-	printf "%s\n" "$*" | sed "s:gui/[0-9][0-9]*:gui/[UID]:; s:\(schtasks /create .* /xml\).*:\1:;" >>args
-	EOF
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=systemd-timer &&
-	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
-		hourly daily weekly >expect &&
-	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
-		hourly daily weekly >>expect &&
-	printf -- "systemctl --user enable --now git-maintenance@%s.timer\n" hourly daily weekly >>expect &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=launchctl &&
-	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
-		hourly daily weekly >>expect &&
-	for frequency in hourly daily weekly
-	do
-		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
-		echo "launchctl bootout gui/[UID] $PLIST" >>expect &&
-		echo "launchctl bootstrap gui/[UID] $PLIST" >>expect || return 1
-	done &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=schtasks &&
-	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
-		hourly daily weekly >>expect &&
-	printf "schtasks /create /tn Git Maintenance (%s) /f /xml\n" \
-		hourly daily weekly >>expect &&
-	test_cmp expect args &&
-
-	rm -f args &&
-	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance stop &&
-	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
-	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
-		hourly daily weekly >>expect &&
-	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
-		hourly daily weekly >>expect &&
-	test_cmp expect args
-
-ok 41 - start and stop when several schedulers are available
-
-expecting success of 7900.42 'register preserves existing strategy': 
-	git config maintenance.strategy none &&
-	git maintenance register &&
-	test_config maintenance.strategy none &&
-	git config --unset maintenance.strategy &&
-	git maintenance register &&
-	test_config maintenance.strategy incremental
-
-ok 42 - register preserves existing strategy
-
-expecting success of 7900.43 'fails when running outside of a repository': 
-	nongit test_must_fail git maintenance run &&
-	nongit test_must_fail git maintenance stop &&
-	nongit test_must_fail git maintenance start &&
-	nongit test_must_fail git maintenance register &&
-	nongit test_must_fail git maintenance unregister
-
-fatal: not a git repository (or any of the parent directories): .git
-fatal: not a git repository (or any of the parent directories): .git
-fatal: not a git repository (or any of the parent directories): .git
-fatal: not a git repository (or any of the parent directories): .git
-fatal: not a git repository (or any of the parent directories): .git
-ok 43 - fails when running outside of a repository
-
-expecting success of 7900.44 'register and unregister bare repo': 
-	test_when_finished "git config --global --unset-all maintenance.repo || :" &&
-	test_might_fail git config --global --unset-all maintenance.repo &&
-	git init --bare barerepo &&
-	(
-		cd barerepo &&
-		git maintenance register &&
-		git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
-		git maintenance unregister &&
-		test_must_fail git config --global --get-all maintenance.repo
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/barerepo/
-/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/barerepo
-ok 44 - register and unregister bare repo
-
-expecting success of 7900.45 'failed schedule prevents config change': 
-	git init --bare failcase &&
-
-	for scheduler in crontab launchctl schtasks systemctl
-	do
-		GIT_TEST_MAINT_SCHEDULER="$scheduler:false" &&
-		export GIT_TEST_MAINT_SCHEDULER &&
-		test_must_fail \
-			git -C failcase maintenance start &&
-		test_must_fail git -C failcase config maintenance.auto || return 1
-	done
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/failcase/
-error: 'crontab' died
-fatal: failed to set up maintenance schedule
-fatal: neither systemd timers nor crontab are available
-fatal: neither systemd timers nor crontab are available
-error: failed to run systemctl
-fatal: failed to set up maintenance schedule
-ok 45 - failed schedule prevents config change
-
-# passed all 45 test(s)
-1..45
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t7814-grep-recurse-submodules.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t/trash directory.t7814-grep-recurse-submodules/parent/.git/
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7814-grep-recurse-submodules/parent/src/sub'...
-done.
-Cloning into '/build/reproducible-path/git-2.45.2/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-12-18 01:39:26.922773267 +0000
-+++ actual	2025-12-18 01:39:26.934773267 +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-12-18 01:39:27.058773267 +0000
-+++ actual	2025-12-18 01:39:27.070773267 +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-12-18 01:39:27.210773267 +0000
-+++ actual	2025-12-18 01:39:27.226773267 +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
-
-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 &&
-
-	cat >expect <<-\EOF &&
-	submodule/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-12-18 01:39:27.394773267 +0000
-+++ actual	2025-12-18 01:39:27.410773267 +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
-
-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 &&
-
-	cat >expect <<-\EOF &&
-	submodule/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'
-Removing .gitattributes
-Entering 'submodule/sub'
-not ok 30 - grep --textconv correctly reads submodule .gitattributes (from index) # TODO known breakage
-
-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/\"" &&
-
-	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" &&
-
-	cat >expect <<-\EOF &&
-	submodule/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'
-not ok 31 - grep --textconv correctly reads submodule .git/info/attributes # TODO known breakage
-
-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 &&
-
-	# 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 &&
-
-	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"
-
-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 Dec 18 01:39 .git/refs/notes/textconv/d2x_cached
-not ok 32 - grep saves textconv cache in the appropriate repository # TODO known breakage
-
-expecting success of 7814.33 'grep partially-cloned submodule': 
-	# 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
-
-		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
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7814-grep-recurse-submodules/super/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t7814-grep-recurse-submodules/super/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t7814-grep-recurse-submodules/partial/sub'...
-Submodule path 'sub': checked out '289fae02a658deff257301016761eff04f091022'
-{"event":"data","sid":"20251218T013928.576855Z-Hfbad846e-P00007307","thread":"th01:unknown","time":"2025-12-18T01:39:28.580231Z","file":"promisor-remote.c","line":48,"repo":2,"t_abs":0.003576,"t_rel":0.000725,"nesting":1,"category":"promisor","key":"fetch_count","value":"1"}
-ok 33 - grep partially-cloned submodule
-
-expecting success of 7814.34 'check scope of core.useReplaceRefs': 
-	git init base &&
-	git init base/sub &&
-
-	echo A >base/a &&
-	echo B >base/b &&
-	echo C >base/sub/c &&
-	echo D >base/sub/d &&
-
-	git -C base/sub add c d &&
-	git -C base/sub commit -m "Add files" &&
-
-	git -C base submodule add ./sub &&
-	git -C base add a b sub &&
-	git -C base commit -m "Add files and submodule" &&
-
-	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) &&
-
-	git -C base replace $A $B &&
-	git -C base/sub replace $C $D &&
-
-	test_must_fail git -C base grep --cached --recurse-submodules A &&
-	test_must_fail git -C base grep --cached --recurse-submodules C &&
-
-	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 &&
-
-	git -C base/sub config core.useReplaceRefs false &&
-	git -C base grep --cached --recurse-submodules A &&
-	git -C base grep --cached --recurse-submodules C &&
-
-	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
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7814-grep-recurse-submodules/base/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8004-blame-with-conflicts.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 &&
-
-	# Branch
-	git checkout -b foo &&
-
-	# 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 &&
-
-	# Back to main and change something
-	git checkout main &&
-	echo "
-
-bla" >> file1 &&
-	git commit --author "Old Line <ol@localhost>" -a -m file1.b &&
-
-	# 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
-
-bla
-Even more" > file2 &&
-	git rm file1 &&
-	git commit --author "M Result <mr@localhost>" -a -m merged &&
-
-	# 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 &&
-
-	# 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
-
-[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 8004.2 'blame runs on unconflicted file while other file has conflicts': 
-	git blame file2
-
-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
-
-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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8005-blame-i18n.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8005-blame-i18n/.git/
-expecting success of 8005.1 'setup the repository': 
-	# Create the file
-	echo "UTF-8 LINE" > file &&
-	git add file &&
-	git commit --author "$UTF8_NAME <utf8@localhost>" -m "$UTF8_MSG" &&
-
-	echo "EUC-JAPAN LINE" >> file &&
-	git add file &&
-	git config i18n.commitencoding eucJP &&
-	git commit --author "$EUC_JAPAN_NAME <euc-japan@localhost>" -m "$EUC_JAPAN_MSG" &&
-
-	echo "SJIS LINE" >> file &&
-	git add file &&
-	git config i18n.commitencoding SJIS &&
-	git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG"
-
-[master (root-commit) 732dccd] ブレーム�テスト��。
- Author: 山田 太郎 <utf8@localhost>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-[master fd45e78] ブレーム�テスト��。
- Author: »³ÅÄ ÂÀϺ <euc-japan@localhost>
- 1 file changed, 1 insertion(+)
-[master 6624d04] ブレーム�テスト��。
- Author: ŽR“c ‘¾˜Y <sjis@localhost>
- 1 file changed, 1 insertion(+)
-ok 1 - setup the repository
-
-expecting success of 8005.2 'blame respects i18n.commitencoding': 
-	git blame --incremental file >output &&
-	filter_author_summary output >actual &&
-	test_cmp expected actual
-
-ok 2 - blame respects i18n.commitencoding
-
-expecting success of 8005.3 'blame respects i18n.logoutputencoding': 
-	git config i18n.logoutputencoding eucJP &&
-	git blame --incremental file >output &&
-	filter_author_summary output >actual &&
-	test_cmp expected actual
-
-ok 3 - blame respects i18n.logoutputencoding
-
-expecting success of 8005.4 'blame respects --encoding=UTF-8': 
-	git blame --incremental --encoding=UTF-8 file >output &&
-	filter_author_summary output >actual &&
-	test_cmp expected actual
-
-ok 4 - blame respects --encoding=UTF-8
-
-expecting success of 8005.5 'blame respects --encoding=none': 
-	git blame --incremental --encoding=none file >output &&
-	filter_author_summary output >actual &&
-	test_cmp expected actual
-
-ok 5 - blame respects --encoding=none
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8003-blame-corner-cases.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8003-blame-corner-cases/.git/
-expecting success of 8003.1 'setup': 
-	echo A A A A A >one &&
-	echo B B B B B >two &&
-	echo C C C C C >tres &&
-	echo ABC >mouse &&
-	test_write_lines 1 2 3 4 5 6 7 8 9 >nine_lines &&
-	test_write_lines 1 2 3 4 5 6 7 8 9 a >ten_lines &&
-	git add one two tres mouse nine_lines ten_lines &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Initial git commit -m Initial &&
-
-	cat one >uno &&
-	mv two dos &&
-	cat one >>tres &&
-	echo DEF >>mouse &&
-	git add uno dos tres mouse &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Second git commit -a -m Second &&
-
-	echo GHIJK >>mouse &&
-	git add mouse &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Third git commit -m Third &&
-
-	cat mouse >cow &&
-	git add cow &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Fourth git commit -m Fourth &&
-
-	cat >cow <<-\EOF &&
-	ABC
-	DEF
-	XXXX
-	GHIJK
-	EOF
-	git add cow &&
-	test_tick &&
-	GIT_AUTHOR_NAME=Fifth git commit -m Fifth
-
-[main (root-commit) a7d6c31] Initial
- Author: Initial <author@example.com>
- 6 files changed, 23 insertions(+)
- create mode 100644 mouse
- create mode 100644 nine_lines
- create mode 100644 one
- create mode 100644 ten_lines
- create mode 100644 tres
- create mode 100644 two
-[main 480ef79] Second
- Author: Second <author@example.com>
- 4 files changed, 3 insertions(+)
- rename two => dos (100%)
- create mode 100644 uno
-[main 74385ca] Third
- Author: Third <author@example.com>
- 1 file changed, 1 insertion(+)
-[main 5b22ca3] Fourth
- Author: Fourth <author@example.com>
- 1 file changed, 3 insertions(+)
- create mode 100644 cow
-[main 018e313] Fifth
- Author: Fifth <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - setup
-
-expecting success of 8003.2 'straight copy without -C': 
-
-	git blame uno | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 1) A A A A A
-ok 2 - straight copy without -C
-
-expecting success of 8003.3 'straight move without -C': 
-
-	git blame dos | grep Initial
-
-
-^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
-ok 3 - straight move without -C
-
-expecting success of 8003.4 'straight copy with -C': 
-
-	git blame -C1 uno | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 1) A A A A A
-ok 4 - straight copy with -C
-
-expecting success of 8003.5 'straight move with -C': 
-
-	git blame -C1 dos | grep Initial
-
-
-^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
-ok 5 - straight move with -C
-
-expecting success of 8003.6 'straight copy with -C -C': 
-
-	git blame -C -C1 uno | grep Initial
-
-
-^a7d6c31 one (Initial 2005-04-07 15:13:13 -0700 1) A A A A A
-ok 6 - straight copy with -C -C
-
-expecting success of 8003.7 'straight move with -C -C': 
-
-	git blame -C -C1 dos | grep Initial
-
-
-^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
-ok 7 - straight move with -C -C
-
-expecting success of 8003.8 'append without -C': 
-
-	git blame -L2 tres | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
-ok 8 - append without -C
-
-expecting success of 8003.9 'append with -C': 
-
-	git blame -L2 -C1 tres | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
-ok 9 - append with -C
-
-expecting success of 8003.10 'append with -C -C': 
-
-	git blame -L2 -C -C1 tres | grep Second
-
-
-480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
-ok 10 - append with -C -C
-
-expecting success of 8003.11 'append with -C -C -C': 
-
-	git blame -L2 -C -C -C1 tres | grep Initial
-
-
-^a7d6c31 one (Initial 2005-04-07 15:13:13 -0700 2) A A A A A
-ok 11 - append with -C -C -C
-
-expecting success of 8003.12 'blame wholesale copy': 
-
-	git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current &&
-	cat >expected <<-\EOF &&
-	mouse-Initial
-	mouse-Second
-	mouse-Third
-	EOF
-	test_cmp expected current
-
-
-ok 12 - blame wholesale copy
-
-expecting success of 8003.13 'blame wholesale copy and more': 
-
-	git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current &&
-	cat >expected <<-\EOF &&
-	mouse-Initial
-	mouse-Second
-	cow-Fifth
-	mouse-Third
-	EOF
-	test_cmp expected current
+	test_must_fail git grep --quiet "only in the index" &&
+	git grep --quiet --cached "only in the index" &&
+	test_must_fail git grep --quiet "only in the index" HEAD
 
+rm 'cache-this'
+ok 259 - grep can find things only in the index
 
-ok 13 - blame wholesale copy and more
+expecting success of 7810.260 'grep does not report i-t-a with -L --cached': 
+	echo "intend to add this" >intend-to-add &&
+	git add -N intend-to-add &&
+	test_when_finished "git rm -f intend-to-add" &&
+	git ls-files | grep -v "^intend-to-add\$" >expected &&
+	git grep -L --cached "nonexistent_string" >actual &&
+	test_cmp expected actual
 
-expecting success of 8003.14 'blame wholesale copy and more in the index': 
+rm 'intend-to-add'
+ok 260 - grep does not report i-t-a with -L --cached
 
-	cat >horse <<-\EOF &&
-	ABC
-	DEF
-	XXXX
-	YYYY
-	GHIJK
-	EOF
-	git add horse &&
-	test_when_finished "git rm -f horse" &&
-	git blame -f -C -C1 -- horse | sed -e "$pick_fc" >current &&
-	cat >expected <<-\EOF &&
-	mouse-Initial
-	mouse-Second
-	cow-Fifth
-	horse-Not
-	mouse-Third
-	EOF
-	test_cmp expected current
+expecting success of 7810.261 'grep does not report i-t-a and assume unchanged with -L': 
+	echo "intend to add this" >intend-to-add-assume-unchanged &&
+	git add -N intend-to-add-assume-unchanged &&
+	test_when_finished "git rm -f intend-to-add-assume-unchanged" &&
+	git update-index --assume-unchanged intend-to-add-assume-unchanged &&
+	git ls-files | grep -v "^intend-to-add-assume-unchanged\$" >expected &&
+	git grep -L "nonexistent_string" >actual &&
+	test_cmp expected actual
 
+rm 'intend-to-add-assume-unchanged'
+ok 261 - grep does not report i-t-a and assume unchanged with -L
 
-rm 'horse'
-ok 14 - blame wholesale copy and more in the index
+# passed all 261 test(s)
+1..261
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7816-grep-binary-pattern.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7816-grep-binary-pattern/.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 7816.1 'setup': 
+	echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
+	git add a &&
+	git commit -m.
 
-expecting success of 8003.15 'blame during cherry-pick with file rename conflict': 
+[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
 
-	test_when_finished "git reset --hard && git checkout main" &&
-	git checkout HEAD~3 &&
-	echo MOUSE >> mouse &&
-	git mv mouse rodent &&
-	git add rodent &&
-	GIT_AUTHOR_NAME=Rodent git commit -m "rodent" &&
-	git checkout --detach main &&
-	(git cherry-pick HEAD@{1} || test $? -eq 1) &&
-	git show HEAD@{1}:rodent > rodent &&
-	git add rodent &&
-	git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
-	cat >expected <<-\EOF &&
-	mouse-Initial
-	mouse-Second
-	rodent-Not
-	EOF
-	test_cmp expected current
+expecting success of 7816.2 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>f' a': 
+			>stderr &&
+			printf 'yQf' | 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 2 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>f' a
 
-Note: switching to 'HEAD~3'.
+expecting success of 7816.3 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>f' a': 
+			>stderr &&
+			printf 'yQf' | 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 3 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>f' a
 
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
+expecting success of 7816.4 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>f' a': 
+			>stderr &&
+			printf 'yQf' | 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 4 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>f' a
 
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
+expecting success of 7816.5 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>x' a': 
+			>stderr &&
+			printf 'yQx' | 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 5 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>x' a
 
-  git switch -c <new-branch-name>
+expecting success of 7816.6 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>x' a': 
+			>stderr &&
+			printf 'yQx' | 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 6 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>x' a
 
-Or undo this operation with:
+expecting success of 7816.7 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>x' a': 
+			>stderr &&
+			printf 'yQx' | 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 7 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>x' a
 
-  git switch -
+expecting success of 7816.8 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>f' a': 
+			>stderr &&
+			printf 'YQf' | 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 8 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>f' a
 
-Turn off this advice by setting config variable advice.detachedHead to false
+expecting success of 7816.9 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>f' a': 
+			>stderr &&
+			printf 'YQf' | 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 9 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>f' a
 
-HEAD is now at 480ef79 Second
-[detached HEAD b1c6d57] rodent
- Author: Rodent <author@example.com>
- 1 file changed, 1 insertion(+)
- rename mouse => rodent (57%)
-Warning: you are leaving 1 commit behind, not connected to
-any of your branches:
+expecting success of 7816.10 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>f' a': 
+			>stderr &&
+			printf 'YQf' | 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 10 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>f' a
 
-  b1c6d57 rodent
+expecting success of 7816.11 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>x' a': 
+			>stderr &&
+			printf 'YQx' | 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 11 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>x' a
 
-If you want to keep it by creating a new branch, this may be a good time
-to do so with:
+expecting success of 7816.12 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>x' a': 
+			>stderr &&
+			printf 'YQx' | 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 12 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>x' a
 
- git branch <new-branch-name> b1c6d57
+expecting success of 7816.13 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>x' a': 
+			>stderr &&
+			printf 'YQx' | 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 13 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>x' a
 
-HEAD is now at 018e313 Fifth
-Auto-merging rodent
-CONFLICT (content): Merge conflict in rodent
-error: could not apply b1c6d57... rodent
-hint: After resolving the conflicts, mark them with
-hint: "git add/rm <pathspec>", then run
-hint: "git cherry-pick --continue".
-hint: You can instead skip this commit with "git cherry-pick --skip".
-hint: To abort and get back to the state before "git cherry-pick",
-hint: run "git cherry-pick --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-HEAD is now at 018e313 Fifth
-Switched to branch 'main'
-ok 15 - blame during cherry-pick with file rename conflict
+expecting success of 7816.14 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>f' a': 
+			>stderr &&
+			printf 'yQf' | 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 14 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>f' a
 
-expecting success of 8003.16 'blame path that used to be a directory': 
-	mkdir path &&
-	echo A A A A A >path/file &&
-	echo B B B B B >path/elif &&
-	git add path &&
-	test_tick &&
-	git commit -m "path was a directory" &&
-	rm -fr path &&
-	echo A A A A A >path &&
-	git add path &&
-	test_tick &&
-	git commit -m "path is a regular file" &&
-	git blame HEAD^.. -- path
+expecting success of 7816.15 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>f' a': 
+			>stderr &&
+			printf 'yQf' | 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 15 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>f' a
 
-[main 0aef879] path was a directory
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 path/elif
- create mode 100644 path/file
-[main 846e53e] path is a regular file
- Author: A U Thor <author@example.com>
- 2 files changed, 1 deletion(-)
- rename path/file => path (100%)
- delete mode 100644 path/elif
-^0aef879 path/file (A U Thor 2005-04-07 15:18:13 -0700 1) A A A A A
-ok 16 - blame path that used to be a directory
+expecting success of 7816.16 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>f' a': 
+			printf 'yQf' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f  a
+		
+Binary file a matches
+ok 16 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>f' a
 
-expecting success of 8003.17 'blame to a commit with no author name': 
-  TREE=$(git rev-parse HEAD:) &&
-  cat >badcommit <<EOF &&
-tree $TREE
-author <noname> 1234567890 +0000
-committer David Reiss <dreiss@facebook.com> 1234567890 +0000
+expecting success of 7816.17 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>x' a': 
+			>stderr &&
+			printf 'yQx' | 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 17 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>x' a
 
-some message
-EOF
-  COMMIT=$(git hash-object --literally -t commit -w badcommit) &&
-  git --no-pager blame $COMMIT -- uno >/dev/null
+expecting success of 7816.18 'error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>x' a': 
+			>stderr &&
+			printf 'yQx' | 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 18 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>x' a
 
-ok 17 - blame to a commit with no author name
+expecting success of 7816.19 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>x' a': 
+			>stderr &&
+			printf 'yQx' | 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 19 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>x' a
 
-expecting success of 8003.18 'blame -L with invalid start': 
-	test_must_fail git blame -L5 tres 2>errors &&
-	test_grep "has only 2 lines" errors
+expecting success of 7816.20 '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 20 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>ð' a
 
-fatal: file tres has only 2 lines
-ok 18 - blame -L with invalid start
+expecting success of 7816.21 '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 21 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>ð' a
 
-expecting success of 8003.19 'blame -L with invalid end': 
-	git blame -L1,5 tres >out &&
-	test_line_count = 2 out
+expecting success of 7816.22 '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 22 - LC_ALL='is_IS.utf8' git grep -P -f f  'æ<NUL>ð' a
 
-ok 19 - blame -L with invalid end
+expecting success of 7816.23 'error, PCRE v2 only: LC_ALL='C' git grep -f 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 -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 23 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'e<NUL>m[*]c' a
 
-expecting success of 8003.20 'blame parses <end> part of -L': 
-	git blame -L1,1 tres >out &&
-	test_line_count = 1 out
+expecting success of 7816.24 'error, PCRE v2 only: LC_ALL='C' git grep -f 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 -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 24 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'e<NUL>m[*]c' a
 
-ok 20 - blame parses <end> part of -L
+expecting success of 7816.25 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f 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 -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 25 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'e<NUL>m[*]c' a
 
-expecting success of 8003.21 'blame -Ln,-(n+1)': 
-	git blame -L3,-4 nine_lines >out &&
-	test_line_count = 3 out
+expecting success of 7816.26 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'E<NUL>M[*]C' a': 
+			>stderr &&
+			printf 'EQM[*]C' | 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 26 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'E<NUL>M[*]C' a
 
-ok 21 - blame -Ln,-(n+1)
+expecting success of 7816.27 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'E<NUL>M[*]C' a': 
+			>stderr &&
+			printf 'EQM[*]C' | 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 27 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'E<NUL>M[*]C' a
 
-expecting success of 8003.22 'indent of line numbers, nine lines': 
-	git blame nine_lines >actual &&
-	test $(grep -c "  " actual) = 0
+expecting success of 7816.28 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'E<NUL>M[*]C' a': 
+			>stderr &&
+			printf 'EQM[*]C' | 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 28 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'E<NUL>M[*]C' a
 
-ok 22 - indent of line numbers, nine lines
+expecting success of 7816.29 '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 29 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a
 
-expecting success of 8003.23 'indent of line numbers, ten lines': 
-	git blame ten_lines >actual &&
-	test $(grep -c "  " actual) = 9
+expecting success of 7816.30 '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 30 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'y<NUL>[f]' a
 
-ok 23 - indent of line numbers, ten lines
+expecting success of 7816.31 '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 31 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'y<NUL>[f]' a
 
-expecting success of 8003.24 'setup file with CRLF newlines': 
-	git config core.autocrlf false &&
-	printf "testcase\n" >crlffile &&
-	git add crlffile &&
-	git commit -m testcase &&
-	printf "testcase\r\n" >crlffile
+expecting success of 7816.32 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[y]<NUL>f' a': 
+			>stderr &&
+			printf '[y]Qf' | 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 32 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[y]<NUL>f' a
 
-[main 281288b] testcase
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 crlffile
-ok 24 - setup file with CRLF newlines
+expecting success of 7816.33 'error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[y]<NUL>f' a': 
+			>stderr &&
+			printf '[y]Qf' | 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 33 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[y]<NUL>f' a
 
-expecting success of 8003.25 'blame file with CRLF core.autocrlf true': 
-	git config core.autocrlf true &&
-	git blame crlffile >actual &&
-	grep "A U Thor" actual
+expecting success of 7816.34 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F '[y]<NUL>f' a': 
+			>stderr &&
+			printf '[y]Qf' | 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 34 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F '[y]<NUL>f' a
 
-281288b4 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
-ok 25 - blame file with CRLF core.autocrlf true
+expecting success of 7816.35 '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 35 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a
 
-expecting success of 8003.26 'blame file with CRLF attributes text': 
-	git config core.autocrlf false &&
-	echo "crlffile text" >.gitattributes &&
-	git blame crlffile >actual &&
-	grep "A U Thor" actual
+expecting success of 7816.36 '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 36 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Y<NUL>[F]' a
 
-281288b4 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
-ok 26 - blame file with CRLF attributes text
+expecting success of 7816.37 '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 37 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Y<NUL>[F]' a
 
-expecting success of 8003.27 'blame file with CRLF core.autocrlf=true': 
-	git config core.autocrlf false &&
-	printf "testcase\r\n" >crlfinrepo &&
-	>.gitattributes &&
-	git add crlfinrepo &&
-	git commit -m "add crlfinrepo" &&
-	git config core.autocrlf true &&
-	mv crlfinrepo tmp &&
-	git checkout crlfinrepo &&
-	rm tmp &&
-	git blame crlfinrepo >actual &&
-	grep "A U Thor" actual
+expecting success of 7816.38 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi '[Y]<NUL>F' a': 
+			>stderr &&
+			printf '[Y]QF' | 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 38 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi '[Y]<NUL>F' a
 
-[main 2b0eeed] add crlfinrepo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 crlfinrepo
-Updated 1 path from the index
-2b0eeed1 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
-ok 27 - blame file with CRLF core.autocrlf=true
+expecting success of 7816.39 'error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi '[Y]<NUL>F' a': 
+			>stderr &&
+			printf '[Y]QF' | 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 39 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi '[Y]<NUL>F' a
 
-expecting success of 8003.28 'setup coalesce tests': 
-	cat >giraffe <<-\EOF &&
-	ABC
-	DEF
-	EOF
-	git add giraffe &&
-	git commit -m "original file" &&
-	orig=$(git rev-parse HEAD) &&
+expecting success of 7816.40 'error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi '[Y]<NUL>F' a': 
+			>stderr &&
+			printf '[Y]QF' | 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 40 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi '[Y]<NUL>F' a
 
-	cat >giraffe <<-\EOF &&
-	ABC
-	SPLIT
-	DEF
-	EOF
-	git add giraffe &&
-	git commit -m "interior SPLIT line" &&
-	split=$(git rev-parse HEAD) &&
+expecting success of 7816.41 '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 41 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
 
-	cat >giraffe <<-\EOF &&
-	ABC
-	DEF
-	EOF
-	git add giraffe &&
-	git commit -m "same contents as original" &&
-	final=$(git rev-parse HEAD)
+expecting success of 7816.42 '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 42 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F 'æ<NUL>[ð]' a
 
-warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
-[main 7531dad] original file
- Author: A U Thor <author@example.com>
- 1 file changed, 2 insertions(+)
- create mode 100644 giraffe
-warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
-[main e82fb63] interior SPLIT line
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
-[main 39e6f40] same contents as original
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-ok 28 - setup coalesce tests
+expecting success of 7816.43 '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 43 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F 'æ<NUL>[ð]' a
 
-expecting success of 8003.29 'blame coalesce': 
-	cat >expect <<-EOF &&
-	$orig 1 1 2
-	$orig 2 2
-	EOF
-	git blame --porcelain $final giraffe >actual.raw &&
-	grep "^$orig" actual.raw >actual &&
-	test_cmp expect actual
+expecting success of 7816.44 '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 44 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[æ]<NUL>ð' a
 
-ok 29 - blame coalesce
+expecting success of 7816.45 '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 45 - error, PCRE v2 only: LC_ALL='C' git grep -f f -F '[æ]<NUL>ð' a
 
-expecting success of 8003.30 'blame does not coalesce non-adjacent result lines': 
-	cat >expect <<-EOF &&
-	$orig 1) ABC
-	$orig 3) DEF
-	EOF
-	git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual &&
-	test_cmp expect actual
+expecting success of 7816.46 '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 46 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -F '[æ]<NUL>ð' a
 
-ok 30 - blame does not coalesce non-adjacent result lines
+expecting success of 7816.47 '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 47 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[æ]<NUL>ð' a
 
-# passed all 30 test(s)
-1..30
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8006-blame-textconv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
+expecting success of 7816.48 'LC_ALL='C' git grep -P -f f -i '[æ]<NUL>ð' a': 
+			printf '[æ]Qð' | q_to_nul >f &&
+			LC_ALL='C' git grep -P -f f -i a
+		
+Binary file a matches
+ok 48 - LC_ALL='C' git grep -P -f f -i '[æ]<NUL>ð' a
 
-checking prerequisite: SYMLINKS
+expecting success of 7816.49 '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 49 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[æ]<NUL>ð' a
 
-mkdir -p "$TRASH_DIRECTORY/prereq-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 7816.50 '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 50 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
 
-)
-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 7816.51 '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 51 - error, PCRE v2 only: LC_ALL='C' git grep -f f -Fi 'Æ<NUL>[�]' a
 
-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 7816.52 '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 52 - error, PCRE v2 only: LC_ALL='is_IS.utf8' git grep -f f -Fi 'Æ<NUL>[�]' a
 
-ok 2 - no filter specified
+expecting success of 7816.53 '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 53 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
 
-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 7816.54 'LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[�]' a
 
-ok 3 - setup textconv filters
+expecting success of 7816.55 '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 55 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>[�]' a
 
-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 7816.56 '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 56 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Æ]<NUL>�' a
 
-ok 4 - blame with --no-textconv
+expecting success of 7816.57 'LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>�' a': 
+			>stderr &&
+			printf '[Æ]Q�' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>�' a
 
-expecting success of 8006.5 'basic blame on last commit': 
-	git blame one.bin >blame &&
-	find_blame  <blame >result &&
-	test_cmp expected result
+expecting success of 7816.58 '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 58 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[Æ]<NUL>�' a
 
-ok 5 - basic blame on last commit
+expecting success of 7816.59 '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 59 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Æ]<NUL>ð' a
 
-expecting success of 8006.6 'blame --textconv going through revisions': 
-	git blame --textconv two.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
+expecting success of 7816.60 'LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a': 
+			>stderr &&
+			printf '[Æ]Qð' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a
 
-ok 6 - blame --textconv going through revisions
+expecting success of 7816.61 '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 61 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[Æ]<NUL>ð' a
 
-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 7816.62 '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 62 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>�' a
 
-75
-Updated 1 path from the index
-ok 7 - blame --textconv with local changes
+expecting success of 7816.63 'LC_ALL='C' git grep -P -f f -i 'Æ<NUL>�' a': 
+			>stderr &&
+			printf 'ÆQ�' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -P -f f -i a 2>stderr &&
+			test_grep ! 'This is only supported with -P under PCRE v2' stderr
+		
+ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>�' a
 
-expecting success of 8006.8 'setup +cachetextconv': 
-	git config diff.test.cachetextconv true
+expecting success of 7816.64 '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 64 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Æ<NUL>�' a
 
-ok 8 - setup +cachetextconv
+expecting success of 7816.65 'error, PCRE v2 only: LC_ALL='C' git grep -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  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 65 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>[f]' a
 
-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
+expecting success of 7816.66 'error, PCRE v2 only: LC_ALL='C' git grep -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  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 66 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'y<NUL>[f]' a
 
-ok 9 - blame --textconv works with textconvcache
+expecting success of 7816.67 'LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>[f]' a': 
+			printf 'yQ[f]' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f  a
+		
+Binary file a matches
+ok 67 - LC_ALL='is_IS.utf8' git grep -P -f f  'y<NUL>[f]' a
 
-expecting success of 8006.10 'setup -cachetextconv': 
-	git config diff.test.cachetextconv false
+expecting success of 7816.68 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '[y]<NUL>f' a': 
+			>stderr &&
+			printf '[y]Qf' | 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 68 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '[y]<NUL>f' a
 
-ok 10 - setup -cachetextconv
+expecting success of 7816.69 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '[y]<NUL>f' a': 
+			>stderr &&
+			printf '[y]Qf' | 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 69 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '[y]<NUL>f' a
 
-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"
+expecting success of 7816.70 'LC_ALL='is_IS.utf8' git grep -P -f f  '[y]<NUL>f' a': 
+			printf '[y]Qf' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f  a
+		
+Binary file a matches
+ok 70 - LC_ALL='is_IS.utf8' git grep -P -f f  '[y]<NUL>f' a
 
-[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 7816.71 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>[F]' a': 
+			>stderr &&
+			printf 'YQ[F]' | 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 71 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>[F]' a
 
-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 7816.72 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>[F]' a': 
+			>stderr &&
+			printf 'YQ[F]' | 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 72 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Y<NUL>[F]' a
 
-ok 12 - blame from previous revision
+expecting success of 7816.73 'LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>[F]' a': 
+			printf 'YQ[F]' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f -i a
+		
+Binary file a matches
+ok 73 - LC_ALL='is_IS.utf8' git grep -P -f f -i 'Y<NUL>[F]' a
 
-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
+expecting success of 7816.74 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Y]<NUL>f' a': 
+			>stderr &&
+			printf '[Y]Qf' | 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 74 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Y]<NUL>f' a
 
-ok 13 - blame with --no-textconv (on symlink)
+expecting success of 7816.75 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Y]<NUL>f' a': 
+			>stderr &&
+			printf '[Y]Qf' | 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 75 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i '[Y]<NUL>f' a
 
-expecting success of 8006.14 'blame --textconv (on symlink)': 
-	git blame --textconv symlink.bin >blame &&
-	find_blame <blame >result &&
-	test_cmp expected result
+expecting success of 7816.76 'LC_ALL='is_IS.utf8' git grep -P -f f -i '[Y]<NUL>f' a': 
+			printf '[Y]Qf' | q_to_nul >f &&
+			LC_ALL='is_IS.utf8' git grep -P -f f -i a
+		
+Binary file a matches
+ok 76 - LC_ALL='is_IS.utf8' git grep -P -f f -i '[Y]<NUL>f' a
 
-ok 14 - blame --textconv (on symlink)
+expecting success of 7816.77 '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 77 - error, PCRE v2 only: LC_ALL='C' git grep -f f  'æ<NUL>[ð]' a
 
-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 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
 
-[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
+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 8006.16 'blame on last commit (-C -C, symlink)': 
-	git blame -C -C three.bin >blame &&
-	find_blame <blame >result &&
-	cat >expected <<\EOF &&
-(Number1 2010-01-01 18:00:00 +0000 1) converted: test number 2
-(Number2 2010-01-01 20:00:00 +0000 2) converted: test number 2 version 2
-(Number3 2010-01-01 22:00:00 +0000 3) converted: test number 2 version 3
-(Number4 2010-01-01 23:00:00 +0000 4) converted: test number 3
-EOF
-	test_cmp expected result
+expecting success of 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
 
-ok 16 - blame on last commit (-C -C, symlink)
+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
 
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8007-cat-file-textconv.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8007-cat-file-textconv/.git/
-expecting success of 8007.1 'setup ': 
-	echo "bin: test" >one.bin &&
-	test_ln_s_add one.bin symlink.bin &&
-	git add . &&
-	GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" &&
-	echo "bin: test version 2" >one.bin &&
-	GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
+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
 
-checking prerequisite: SYMLINKS
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-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 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
 
-)
-prerequisite SYMLINKS ok
-[master (root-commit) 6a4de31] First
- Author: Number1 <author@example.com>
- Date: Fri Jan 1 18:00:00 2010 +0000
- 3 files changed, 5 insertions(+)
- create mode 100755 helper
- create mode 100644 one.bin
- create mode 120000 symlink.bin
-[master aa3beaa] Second
- Author: Number2 <author@example.com>
- Date: Fri Jan 1 20:00:00 2010 +0000
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 1 - setup 
+expecting success of 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 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
+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
 
-ok 2 - usage: <bad rev>
+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 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
+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
 
-ok 3 - usage: <bad rev>:<bad path>
+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 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 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
 
-ok 4 - usage: <rev>:<bad path>
+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 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
+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
 
-ok 5 - usage: <rev> with no <path>
+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 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
+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
 
-ok 6 - usage: <bad rev>:<good (in HEAD) path>
+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 8007.7 'no filter specified': 
-	git cat-file --textconv :one.bin >result &&
-	test_cmp expected result
+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
 
-ok 7 - no filter specified
+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 8007.8 'setup textconv filters': 
-	echo "*.bin diff=test" >.gitattributes &&
-	git config diff.test.textconv ./helper &&
-	git config diff.test.cachetextconv false
+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
 
-ok 8 - setup textconv filters
+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 8007.9 'cat-file without --textconv': 
-	git cat-file blob :one.bin >result &&
-	test_cmp expected result
+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
 
-ok 9 - cat-file without --textconv
+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 8007.10 'cat-file without --textconv on previous commit': 
-	git cat-file -p HEAD^:one.bin >result &&
-	test_cmp expected result
+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
 
-ok 10 - cat-file without --textconv on previous commit
+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 8007.11 'cat-file --textconv on last commit': 
-	git cat-file --textconv :one.bin >result &&
-	test_cmp expected result
+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
 
-ok 11 - cat-file --textconv on last commit
+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 8007.12 'cat-file --textconv on previous commit': 
-	git cat-file --textconv HEAD^:one.bin >result &&
-	test_cmp expected result
+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
 
-ok 12 - cat-file --textconv on previous commit
+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 8007.13 'cat-file without --textconv (symlink)': 
-	printf "%s" "one.bin" >expected &&
-	git cat-file blob :symlink.bin >result &&
-	test_cmp expected result
+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
 
-ok 13 - cat-file without --textconv (symlink)
+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 8007.14 'cat-file --textconv on index (symlink)': 
-	git cat-file --textconv :symlink.bin >result &&
-	test_cmp expected result
+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
 
-ok 14 - cat-file --textconv on index (symlink)
+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 8007.15 'cat-file --textconv on HEAD (symlink)': 
-	git cat-file --textconv HEAD:symlink.bin >result &&
-	test_cmp expected result
+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
 
-ok 15 - cat-file --textconv on HEAD (symlink)
+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
 
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8008-blame-formats.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8008-blame-formats/.git/
-expecting success of 8008.1 'setup': 
-	echo a >file &&
-	git add file &&
-	test_tick &&
-	git commit -m one &&
-	echo b >>file &&
-	echo c >>file &&
-	echo d >>file &&
-	test_tick &&
-	git commit -a -m two &&
-	ID1=$(git rev-parse HEAD^) &&
-	shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" &&
-	ID2=$(git rev-parse HEAD) &&
-	shortID2="$(git rev-parse HEAD |cut -c 1-18)"
+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
 
-[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 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 8008.2 'normal blame output': 
-	git blame --abbrev=17 file >actual &&
-	test_cmp expect actual
+expecting success of 7816.116 'error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a': 
+			>stderr &&
+			printf 'QNOMATCH' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f  a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 116 - error, PCRE v2 only: LC_ALL='C' git grep -f f  '<NUL>NOMATCH' a
 
-ok 2 - normal blame output
+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 8008.3 'blame --porcelain output': 
-	git blame --porcelain file >actual &&
-	test_cmp expect actual
+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
 
-ok 3 - blame --porcelain output
+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 8008.4 'blame --line-porcelain output': 
-	git blame --line-porcelain file >actual &&
-	test_cmp expect actual
+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
 
-ok 4 - blame --line-porcelain output
+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 8008.5 '--porcelain detects first non-blank line as subject': 
-	(
-		GIT_INDEX_FILE=.git/tmp-index &&
-		export GIT_INDEX_FILE &&
-		echo "This is it" >single-file &&
-		git add single-file &&
-		tree=$(git write-tree) &&
-		commit=$(printf "%s\n%s\n%s\n\n\n  \noneline\n\nbody\n" \
-			"tree $tree" \
-			"author A <a@b.c> 123456789 +0000" \
-			"committer C <c@d.e> 123456789 +0000" |
-		git hash-object -w -t commit --stdin) &&
-		git blame --porcelain $commit -- single-file >output &&
-		grep "^summary oneline$" output
-	)
+expecting success of 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
 
-summary oneline
-ok 5 - --porcelain detects first non-blank line as subject
+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
 
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8009-blame-vs-topicbranches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8009-blame-vs-topicbranches/.git/
-expecting success of 8009.1 'setup': 
-	test_commit A0 file.t line0 &&
-	test_commit A1 &&
-	git reset --hard A0 &&
-	test_commit B1 &&
-	test_commit B2 file.t line0changed &&
-	git reset --hard A1 &&
-	test_merge A2 B2 &&
-	git reset --hard A1 &&
-	test_commit C1 &&
-	git reset --hard A2 &&
-	test_merge A3 C1
-	
-[master (root-commit) 2152206] A0
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.t
-[master 5392e14] A1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A1.t
-HEAD is now at 2152206 A0
-[master 15a8c72] B1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B1.t
-[master e1433f5] B2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-HEAD is now at 5392e14 A1
-Merge made by the 'ort' strategy.
- B1.t   | 1 +
- file.t | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
- create mode 100644 B1.t
-HEAD is now at 5392e14 A1
-[master fa266ba] C1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-HEAD is now at 6e3b304 A2
-Merge made by the 'ort' strategy.
- C1.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C1.t
-ok 1 - setup
+expecting success of 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 8009.2 'blame --reverse --first-parent finds A1': 
-	git blame --porcelain --reverse --first-parent A0..A3 -- file.t >actual_full &&
-	head -n 1 <actual_full | sed -e "s/ .*//" >actual &&
-	git rev-parse A1 >expect &&
-	test_cmp expect actual
-	
-ok 2 - blame --reverse --first-parent finds A1
+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
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8010-cat-file-filters.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8010-cat-file-filters/.git/
-expecting success of 8010.1 'setup ': 
-	echo "*.txt eol=crlf diff=txt" >.gitattributes &&
-	echo "hello" | append_cr >world.txt &&
-	git add .gitattributes world.txt &&
-	test_tick &&
-	git commit -m "Initial commit"
+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
 
-[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 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 8010.2 'no filters with `git show`': 
-	git show HEAD:world.txt >actual &&
-	! has_cr actual
+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
 
-ok 2 - no filters with `git show`
+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 8010.3 'no filters with cat-file': 
-	git cat-file blob HEAD:world.txt >actual &&
-	! has_cr actual
+expecting success of 7816.131 'error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a': 
+			>stderr &&
+			printf 'ÆQ[�]' | q_to_nul >f &&
+			test_must_fail env LC_ALL="C" git grep -f f -i a 2>stderr &&
+			test_grep 'This is only supported with -P under PCRE v2' stderr
+		
+fatal: given pattern contains NULL byte (via -f <file>). This is only supported with -P under PCRE v2
+ok 131 - error, PCRE v2 only: LC_ALL='C' git grep -f f -i 'Æ<NUL>[�]' a
 
-ok 3 - no filters with cat-file
+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 8010.4 'cat-file --filters converts to worktree version': 
-	git cat-file --filters HEAD:world.txt >actual &&
-	has_cr actual
+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
 
-ok 4 - cat-file --filters converts to worktree version
+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 8010.5 'cat-file --filters --path=<path> works': 
-	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
-	git cat-file --filters --path=world.txt $sha1 >actual &&
-	has_cr actual
+expecting success of 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
 
-ok 5 - cat-file --filters --path=<path> works
+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 8010.6 'cat-file --textconv --path=<path> works': 
-	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
-	test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" &&
-	git cat-file --textconv --path=hello.txt $sha1 >rot13 &&
-	test uryyb = "$(remove_cr <rot13)"
+expecting success of 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
 
-ok 6 - cat-file --textconv --path=<path> works
+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 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 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
 
-fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
-ok 7 - --path=<path> complains without --textconv/--filters
+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 8010.8 '--textconv/--filters complain without path': 
-	test_must_fail git cat-file --textconv HEAD &&
-	test_must_fail git cat-file --filters HEAD
+expecting success of 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
 
-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 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 8010.9 'cat-file --textconv --batch works': 
-	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
-	test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" &&
-	printf "%s hello.txt\n%s hello\n" $sha1 $sha1 |
-	git cat-file --textconv --batch >actual &&
-	printf "%s blob 6\nuryyb\r\n\n%s blob 6\nhello\n\n" \
-		$sha1 $sha1 >expect &&
-	test_cmp expect actual
+expecting success of 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
 
-ok 9 - cat-file --textconv --batch works
+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
 
-# passed all 9 test(s)
-1..9
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7800-difftool.sh ***
@@ -494995,7 +492060,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.45.2/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.45.2/git-mergetool--lib: line 172: i-dont-exist: command not found
 fatal: external diff died, stopping at file
 ok 14 - difftool without options honors exit status if command not found
 
@@ -495068,7 +492133,7 @@
 		fi &&
 		test_expect_code ${expected_code} git difftool ${opt} -y -t nonexistent branch
 	
-/build/reproducible-path/git-2.45.2/git-difftool--helper: 1: eval: i-dont-exist: not found
+/build/reproducible-path/git-2.45.2/git-mergetool--lib: line 172: i-dont-exist: command not found
 warning: failed: 127
 ok 22 - difftool --dir-diff honors exit status if command not found
 
@@ -495944,10 +493009,10 @@
 		test_cmp expect "$(cat tmpdir)/file"
 	)
 
-warning: both files modified: '/build/reproducible-path/git-2.45.2/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.45.2/t/trash directory.t7800-difftool/git-difftool.lNRIoy/right/file'.
+warning: both files modified: '/build/reproducible-path/git-2.45.2/t/trash directory.t7800-difftool/file' and '/build/reproducible-path/git-2.45.2/t/trash directory.t7800-difftool/git-difftool.EFLLHa/right/file'.
 warning: working tree file has been left.
 warning: 
-warning: temporary files exist in '/build/reproducible-path/git-2.45.2/t/trash directory.t7800-difftool/git-difftool.lNRIoy'.
+warning: temporary files exist in '/build/reproducible-path/git-2.45.2/t/trash directory.t7800-difftool/git-difftool.EFLLHa'.
 warning: you may want to cleanup or recover these.
 ok 82 - difftool --no-symlinks detects conflict 
 
@@ -496159,9 +493224,9 @@
 	git add -N intent-to-add &&
 	git difftool --dir-diff --extcmd ls
 
-/tmp/git-difftool.Hkvz6z/left/:
+/tmp/git-difftool.50zD45/left/:
 
-/tmp/git-difftool.Hkvz6z/right/:
+/tmp/git-difftool.50zD45/right/:
 intent-to-add
 HEAD is now at 8845cd2 initial
 ok 87 - add -N and difftool -d
@@ -496279,160 +493344,640 @@
 1..93
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8011-blame-split-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8011-blame-split-file/.git/
-expecting success of 8011.1 'setup split file case': 
-	# use lines long enough to trigger content detection
-	test_seq 1000 1010 >one &&
-	test_seq 2000 2010 >two &&
-	git add one two &&
-	test_commit base &&
+*** t8003-blame-corner-cases.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8003-blame-corner-cases/.git/
+expecting success of 8003.1 'setup': 
+	echo A A A A A >one &&
+	echo B B B B B >two &&
+	echo C C C C C >tres &&
+	echo ABC >mouse &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 >nine_lines &&
+	test_write_lines 1 2 3 4 5 6 7 8 9 a >ten_lines &&
+	git add one two tres mouse nine_lines ten_lines &&
+	test_tick &&
+	GIT_AUTHOR_NAME=Initial git commit -m Initial &&
 
-	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 >uno &&
+	mv two dos &&
+	cat one >>tres &&
+	echo DEF >>mouse &&
+	git add uno dos tres mouse &&
+	test_tick &&
+	GIT_AUTHOR_NAME=Second git commit -a -m Second &&
 
-	cat one two >combined &&
-	git add combined &&
-	git rm one two &&
-	test_commit combined
+	echo GHIJK >>mouse &&
+	git add mouse &&
+	test_tick &&
+	GIT_AUTHOR_NAME=Third git commit -m Third &&
 
-[master (root-commit) ad6b874] base
- Author: A U Thor <author@example.com>
- 3 files changed, 23 insertions(+)
- create mode 100644 base.t
+	cat mouse >cow &&
+	git add cow &&
+	test_tick &&
+	GIT_AUTHOR_NAME=Fourth git commit -m Fourth &&
+
+	cat >cow <<-\EOF &&
+	ABC
+	DEF
+	XXXX
+	GHIJK
+	EOF
+	git add cow &&
+	test_tick &&
+	GIT_AUTHOR_NAME=Fifth git commit -m Fifth
+
+[main (root-commit) a7d6c31] Initial
+ Author: Initial <author@example.com>
+ 6 files changed, 23 insertions(+)
+ create mode 100644 mouse
+ create mode 100644 nine_lines
  create mode 100644 one
+ create mode 100644 ten_lines
+ create mode 100644 tres
  create mode 100644 two
-[master 9b55153] modified
+[main 480ef79] Second
+ Author: Second <author@example.com>
+ 4 files changed, 3 insertions(+)
+ rename two => dos (100%)
+ create mode 100644 uno
+[main 74385ca] Third
+ Author: Third <author@example.com>
+ 1 file changed, 1 insertion(+)
+[main 5b22ca3] Fourth
+ Author: Fourth <author@example.com>
+ 1 file changed, 3 insertions(+)
+ create mode 100644 cow
+[main 018e313] Fifth
+ Author: Fifth <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup
+
+expecting success of 8003.2 'straight copy without -C': 
+
+	git blame uno | grep Second
+
+
+480ef79e (Second 2005-04-07 15:14:13 -0700 1) A A A A A
+ok 2 - straight copy without -C
+
+expecting success of 8003.3 'straight move without -C': 
+
+	git blame dos | grep Initial
+
+
+^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
+ok 3 - straight move without -C
+
+expecting success of 8003.4 'straight copy with -C': 
+
+	git blame -C1 uno | grep Second
+
+
+480ef79e (Second 2005-04-07 15:14:13 -0700 1) A A A A A
+ok 4 - straight copy with -C
+
+expecting success of 8003.5 'straight move with -C': 
+
+	git blame -C1 dos | grep Initial
+
+
+^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
+ok 5 - straight move with -C
+
+expecting success of 8003.6 'straight copy with -C -C': 
+
+	git blame -C -C1 uno | grep Initial
+
+
+^a7d6c31 one (Initial 2005-04-07 15:13:13 -0700 1) A A A A A
+ok 6 - straight copy with -C -C
+
+expecting success of 8003.7 'straight move with -C -C': 
+
+	git blame -C -C1 dos | grep Initial
+
+
+^a7d6c31 two (Initial 2005-04-07 15:13:13 -0700 1) B B B B B
+ok 7 - straight move with -C -C
+
+expecting success of 8003.8 'append without -C': 
+
+	git blame -L2 tres | grep Second
+
+
+480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
+ok 8 - append without -C
+
+expecting success of 8003.9 'append with -C': 
+
+	git blame -L2 -C1 tres | grep Second
+
+
+480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
+ok 9 - append with -C
+
+expecting success of 8003.10 'append with -C -C': 
+
+	git blame -L2 -C -C1 tres | grep Second
+
+
+480ef79e (Second 2005-04-07 15:14:13 -0700 2) A A A A A
+ok 10 - append with -C -C
+
+expecting success of 8003.11 'append with -C -C -C': 
+
+	git blame -L2 -C -C -C1 tres | grep Initial
+
+
+^a7d6c31 one (Initial 2005-04-07 15:13:13 -0700 2) A A A A A
+ok 11 - append with -C -C -C
+
+expecting success of 8003.12 'blame wholesale copy': 
+
+	git blame -f -C -C1 HEAD^ -- cow | sed -e "$pick_fc" >current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	mouse-Third
+	EOF
+	test_cmp expected current
+
+
+ok 12 - blame wholesale copy
+
+expecting success of 8003.13 'blame wholesale copy and more': 
+
+	git blame -f -C -C1 HEAD -- cow | sed -e "$pick_fc" >current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	cow-Fifth
+	mouse-Third
+	EOF
+	test_cmp expected current
+
+
+ok 13 - blame wholesale copy and more
+
+expecting success of 8003.14 'blame wholesale copy and more in the index': 
+
+	cat >horse <<-\EOF &&
+	ABC
+	DEF
+	XXXX
+	YYYY
+	GHIJK
+	EOF
+	git add horse &&
+	test_when_finished "git rm -f horse" &&
+	git blame -f -C -C1 -- horse | sed -e "$pick_fc" >current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	cow-Fifth
+	horse-Not
+	mouse-Third
+	EOF
+	test_cmp expected current
+
+
+rm 'horse'
+ok 14 - blame wholesale copy and more in the index
+
+expecting success of 8003.15 'blame during cherry-pick with file rename conflict': 
+
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout HEAD~3 &&
+	echo MOUSE >> mouse &&
+	git mv mouse rodent &&
+	git add rodent &&
+	GIT_AUTHOR_NAME=Rodent git commit -m "rodent" &&
+	git checkout --detach main &&
+	(git cherry-pick HEAD@{1} || test $? -eq 1) &&
+	git show HEAD@{1}:rodent > rodent &&
+	git add rodent &&
+	git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
+	cat >expected <<-\EOF &&
+	mouse-Initial
+	mouse-Second
+	rodent-Not
+	EOF
+	test_cmp expected current
+
+Note: switching to 'HEAD~3'.
+
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-name>
+
+Or undo this operation with:
+
+  git switch -
+
+Turn off this advice by setting config variable advice.detachedHead to false
+
+HEAD is now at 480ef79 Second
+[detached HEAD b1c6d57] rodent
+ Author: Rodent <author@example.com>
+ 1 file changed, 1 insertion(+)
+ rename mouse => rodent (57%)
+Warning: you are leaving 1 commit behind, not connected to
+any of your branches:
+
+  b1c6d57 rodent
+
+If you want to keep it by creating a new branch, this may be a good time
+to do so with:
+
+ git branch <new-branch-name> b1c6d57
+
+HEAD is now at 018e313 Fifth
+Auto-merging rodent
+CONFLICT (content): Merge conflict in rodent
+error: could not apply b1c6d57... rodent
+hint: After resolving the conflicts, mark them with
+hint: "git add/rm <pathspec>", then run
+hint: "git cherry-pick --continue".
+hint: You can instead skip this commit with "git cherry-pick --skip".
+hint: To abort and get back to the state before "git cherry-pick",
+hint: run "git cherry-pick --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+HEAD is now at 018e313 Fifth
+Switched to branch 'main'
+ok 15 - blame during cherry-pick with file rename conflict
+
+expecting success of 8003.16 'blame path that used to be a directory': 
+	mkdir path &&
+	echo A A A A A >path/file &&
+	echo B B B B B >path/elif &&
+	git add path &&
+	test_tick &&
+	git commit -m "path was a directory" &&
+	rm -fr path &&
+	echo A A A A A >path &&
+	git add path &&
+	test_tick &&
+	git commit -m "path is a regular file" &&
+	git blame HEAD^.. -- path
+
+[main 0aef879] path was a directory
  Author: A U Thor <author@example.com>
- 3 files changed, 3 insertions(+), 2 deletions(-)
- create mode 100644 modified.t
-rm 'one'
-rm 'two'
-[master cc1b823] combined
+ 2 files changed, 2 insertions(+)
+ create mode 100644 path/elif
+ create mode 100644 path/file
+[main 846e53e] path is a regular file
  Author: A U Thor <author@example.com>
- 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
+ 2 files changed, 1 deletion(-)
+ rename path/file => path (100%)
+ delete mode 100644 path/elif
+^0aef879 path/file (A U Thor 2005-04-07 15:18:13 -0700 1) A A A A A
+ok 16 - blame path that used to be a directory
 
-expecting success of 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();
+expecting success of 8003.17 'blame to a commit with no author name': 
+  TREE=$(git rev-parse HEAD:) &&
+  cat >badcommit <<EOF &&
+tree $TREE
+author <noname> 1234567890 +0000
+committer David Reiss <dreiss@facebook.com> 1234567890 +0000
 
-	sub flush {
-		return unless defined $hash;
-		if (defined $cache{$hash}) {
-			print "$cache{$hash}\n";
-		} else {
-			print "NONE\n";
-		}
-	}
+some message
+EOF
+  COMMIT=$(git hash-object --literally -t commit -w badcommit) &&
+  git --no-pager blame $COMMIT -- uno >/dev/null
+
+ok 17 - blame to a commit with no author name
+
+expecting success of 8003.18 'blame -L with invalid start': 
+	test_must_fail git blame -L5 tres 2>errors &&
+	test_grep "has only 2 lines" errors
+
+fatal: file tres has only 2 lines
+ok 18 - blame -L with invalid start
+
+expecting success of 8003.19 'blame -L with invalid end': 
+	git blame -L1,5 tres >out &&
+	test_line_count = 2 out
+
+ok 19 - blame -L with invalid end
+
+expecting success of 8003.20 'blame parses <end> part of -L': 
+	git blame -L1,1 tres >out &&
+	test_line_count = 1 out
+
+ok 20 - blame parses <end> part of -L
+
+expecting success of 8003.21 'blame -Ln,-(n+1)': 
+	git blame -L3,-4 nine_lines >out &&
+	test_line_count = 3 out
+
+ok 21 - blame -Ln,-(n+1)
+
+expecting success of 8003.22 'indent of line numbers, nine lines': 
+	git blame nine_lines >actual &&
+	test $(grep -c "  " actual) = 0
+
+ok 22 - indent of line numbers, nine lines
+
+expecting success of 8003.23 'indent of line numbers, ten lines': 
+	git blame ten_lines >actual &&
+	test $(grep -c "  " actual) = 9
+
+ok 23 - indent of line numbers, ten lines
+
+expecting success of 8003.24 'setup file with CRLF newlines': 
+	git config core.autocrlf false &&
+	printf "testcase\n" >crlffile &&
+	git add crlffile &&
+	git commit -m testcase &&
+	printf "testcase\r\n" >crlffile
+
+[main 281288b] testcase
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 crlffile
+ok 24 - setup file with CRLF newlines
+
+expecting success of 8003.25 'blame file with CRLF core.autocrlf true': 
+	git config core.autocrlf true &&
+	git blame crlffile >actual &&
+	grep "A U Thor" actual
+
+281288b4 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
+ok 25 - blame file with CRLF core.autocrlf true
+
+expecting success of 8003.26 'blame file with CRLF attributes text': 
+	git config core.autocrlf false &&
+	echo "crlffile text" >.gitattributes &&
+	git blame crlffile >actual &&
+	grep "A U Thor" actual
+
+281288b4 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
+ok 26 - blame file with CRLF attributes text
+
+expecting success of 8003.27 'blame file with CRLF core.autocrlf=true': 
+	git config core.autocrlf false &&
+	printf "testcase\r\n" >crlfinrepo &&
+	>.gitattributes &&
+	git add crlfinrepo &&
+	git commit -m "add crlfinrepo" &&
+	git config core.autocrlf true &&
+	mv crlfinrepo tmp &&
+	git checkout crlfinrepo &&
+	rm tmp &&
+	git blame crlfinrepo >actual &&
+	grep "A U Thor" actual
+
+[main 2b0eeed] add crlfinrepo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 crlfinrepo
+Updated 1 path from the index
+2b0eeed1 (A U Thor 2005-04-07 15:19:13 -0700 1) testcase
+ok 27 - blame file with CRLF core.autocrlf=true
+
+expecting success of 8003.28 'setup coalesce tests': 
+	cat >giraffe <<-\EOF &&
+	ABC
+	DEF
 	EOF
+	git add giraffe &&
+	git commit -m "original file" &&
+	orig=$(git rev-parse HEAD) &&
 
-ok 2 - setup simulated porcelain
+	cat >giraffe <<-\EOF &&
+	ABC
+	SPLIT
+	DEF
+	EOF
+	git add giraffe &&
+	git commit -m "interior SPLIT line" &&
+	split=$(git rev-parse HEAD) &&
 
-expecting success of 8011.3 'generate --porcelain output': 
-		git blame --root -C --$output combined >output
-	
-ok 3 - generate --porcelain output
+	cat >giraffe <<-\EOF &&
+	ABC
+	DEF
+	EOF
+	git add giraffe &&
+	git commit -m "same contents as original" &&
+	final=$(git rev-parse HEAD)
 
-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
+warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
+[main 7531dad] original file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 insertions(+)
+ create mode 100644 giraffe
+warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
+[main e82fb63] interior SPLIT line
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+warning: in the working copy of 'giraffe', LF will be replaced by CRLF the next time Git touches it
+[main 39e6f40] same contents as original
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+ok 28 - setup coalesce tests
 
-expecting success of 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 8003.29 'blame coalesce': 
+	cat >expect <<-EOF &&
+	$orig 1 1 2
+	$orig 2 2
+	EOF
+	git blame --porcelain $final giraffe >actual.raw &&
+	grep "^$orig" actual.raw >actual &&
+	test_cmp expect actual
 
-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
+ok 29 - blame coalesce
 
-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 8003.30 'blame does not coalesce non-adjacent result lines': 
+	cat >expect <<-EOF &&
+	$orig 1) ABC
+	$orig 3) DEF
+	EOF
+	git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual &&
+	test_cmp expect actual
 
-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
+ok 30 - blame does not coalesce non-adjacent result 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
+# passed all 30 test(s)
+1..30
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t8004-blame-with-conflicts.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 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
+	# Branch
+	git checkout -b foo &&
 
-# passed all 10 test(s)
-1..10
+	# 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 &&
+
+	# Back to main and change something
+	git checkout main &&
+	echo "
+
+bla" >> file1 &&
+	git commit --author "Old Line <ol@localhost>" -a -m file1.b &&
+
+	# 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
+
+bla
+Even more" > file2 &&
+	git rm file1 &&
+	git commit --author "M Result <mr@localhost>" -a -m merged &&
+
+	# 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 &&
+
+	# 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
+
+[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 8004.2 'blame runs on unconflicted file while other file has conflicts': 
+	git blame file2
+
+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
+
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t8005-blame-i18n.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8005-blame-i18n/.git/
+expecting success of 8005.1 'setup the repository': 
+	# Create the file
+	echo "UTF-8 LINE" > file &&
+	git add file &&
+	git commit --author "$UTF8_NAME <utf8@localhost>" -m "$UTF8_MSG" &&
+
+	echo "EUC-JAPAN LINE" >> file &&
+	git add file &&
+	git config i18n.commitencoding eucJP &&
+	git commit --author "$EUC_JAPAN_NAME <euc-japan@localhost>" -m "$EUC_JAPAN_MSG" &&
+
+	echo "SJIS LINE" >> file &&
+	git add file &&
+	git config i18n.commitencoding SJIS &&
+	git commit --author "$SJIS_NAME <sjis@localhost>" -m "$SJIS_MSG"
+
+[master (root-commit) 732dccd] ブレーム�テスト��。
+ Author: 山田 太郎 <utf8@localhost>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+[master fd45e78] ブレーム�テスト��。
+ Author: »³ÅÄ ÂÀϺ <euc-japan@localhost>
+ 1 file changed, 1 insertion(+)
+[master 6624d04] ブレーム�テスト��。
+ Author: ŽR“c ‘¾˜Y <sjis@localhost>
+ 1 file changed, 1 insertion(+)
+ok 1 - setup the repository
+
+expecting success of 8005.2 'blame respects i18n.commitencoding': 
+	git blame --incremental file >output &&
+	filter_author_summary output >actual &&
+	test_cmp expected actual
+
+ok 2 - blame respects i18n.commitencoding
+
+expecting success of 8005.3 'blame respects i18n.logoutputencoding': 
+	git config i18n.logoutputencoding eucJP &&
+	git blame --incremental file >output &&
+	filter_author_summary output >actual &&
+	test_cmp expected actual
+
+ok 3 - blame respects i18n.logoutputencoding
+
+expecting success of 8005.4 'blame respects --encoding=UTF-8': 
+	git blame --incremental --encoding=UTF-8 file >output &&
+	filter_author_summary output >actual &&
+	test_cmp expected actual
+
+ok 4 - blame respects --encoding=UTF-8
+
+expecting success of 8005.5 'blame respects --encoding=none': 
+	git blame --incremental --encoding=none file >output &&
+	filter_author_summary output >actual &&
+	test_cmp expected actual
+
+ok 5 - blame respects --encoding=none
+
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t8001-annotate.sh ***
@@ -496464,8 +494009,8 @@
 	check_count A 1 "Not Committed Yet" 1
 
 git annotate  file 
-Author Not Committed Yet (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author Not Committed Yet (expected 1, attributed 1) good
 ok 3 - blame working copy
 
 expecting success of 8001.4 'blame with --contents': 
@@ -496552,8 +494097,8 @@
 	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
 
 git annotate  --contents=file file testTag
-Author A (expected 2, attributed 2) good
 Author External file (--contents) (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
 ok 11 - blame with --contents and revision
 
 expecting success of 8001.12 'setup B1 lines (branch1)': 
@@ -496595,9 +494140,9 @@
 	check_count A 2 B 1 B2 1
 
 git annotate  file 
-Author B (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 15 - blame 2 authors + 1 branch2 author
 
 expecting success of 8001.16 'merge branch1 & branch2': 
@@ -496613,20 +494158,20 @@
 	check_count A 2 B 1 B1 2 B2 1
 
 git annotate  file 
-Author B (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
+Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
 ok 17 - blame 2 authors + 2 merged-in authors
 
 expecting success of 8001.18 'blame --first-parent blames merge for branch1': 
 	check_count --first-parent A 2 B 1 "A U Thor" 2 B2 1
 
 git annotate  --first-parent file 
+Author B (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author A U Thor (expected 2, attributed 2) good
 Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 ok 18 - blame --first-parent blames merge for branch1
 
 expecting success of 8001.19 'blame ancestor': 
@@ -496657,11 +494202,11 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
 git annotate  file 
-Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 ok 22 - blame evil merge
 
 expecting success of 8001.23 'blame huge graft': 
@@ -496863,12 +494408,12 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
 
 git annotate  file 
-Author C (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
 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
 ok 25 - blame incomplete line
 
 expecting success of 8001.26 'setup edits': 
@@ -496891,12 +494436,12 @@
 
 git annotate  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
 Author A U Thor (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
-Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 27 - blame edits
 
 expecting success of 8001.28 'setup obfuscated email': 
@@ -496915,13 +494460,13 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  file 
-Author B (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author 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 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 ok 29 - blame obfuscated email
 
@@ -496929,28 +494474,28 @@
 	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  -L1 file 
-Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 30 - blame -L 1 (all)
 
 expecting success of 8001.31 'blame -L , (all)': 
 	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git annotate  -L, file 
-Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author 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 C (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 31 - blame -L , (all)
 
 expecting success of 8001.32 'blame -L X (X to end)': 
@@ -496958,28 +494503,28 @@
 
 git annotate  -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
-Author B1 (expected 1, attributed 1) good
 ok 32 - blame -L X (X to end)
 
 expecting success of 8001.33 'blame -L X, (X to end)': 
 	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
 
 git annotate  -L5, file 
-Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 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 8001.34 'blame -L ,Y (up to Y)': 
 	check_count -L,3 A 1 B2 1 E 1
 
 git annotate  -L,3 file 
+Author E (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 ok 34 - blame -L ,Y (up to Y)
 
 expecting success of 8001.35 'blame -L X,X': 
@@ -496993,803 +494538,2494 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git annotate  -L3,6 file 
+Author B1 (expected 1, attributed 1) good
+Author 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 8001.37 'blame -L Y,X (undocumented)': 
+	check_count -L6,3 B 1 B1 1 B2 1 D 1
+
+git annotate  -L6,3 file 
 Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-ok 36 - blame -L X,Y
+ok 37 - blame -L Y,X (undocumented)
+
+expecting success of 8001.38 'blame -L -X': 
+	test_must_fail $PROG -L-1 file
+
+fatal: -L invalid line number: -1
+ok 38 - blame -L -X
+
+expecting success of 8001.39 'blame -L 0': 
+	test_must_fail $PROG -L0 file
+
+fatal: -L invalid line number: 0
+ok 39 - blame -L 0
+
+expecting success of 8001.40 'blame -L ,0': 
+	test_must_fail $PROG -L,0 file
+
+fatal: -L invalid line number: 0
+ok 40 - blame -L ,0
+
+expecting success of 8001.41 'blame -L ,+0': 
+	test_must_fail $PROG -L,+0 file
+
+fatal: -L invalid empty range
+ok 41 - blame -L ,+0
+
+expecting success of 8001.42 'blame -L X,+0': 
+	test_must_fail $PROG -L1,+0 file
+
+fatal: -L invalid empty range
+ok 42 - blame -L X,+0
+
+expecting success of 8001.43 'blame -L X,+1': 
+	check_count -L3,+1 B2 1
+
+git annotate  -L3,+1 file 
+Author B2 (expected 1, attributed 1) good
+ok 43 - blame -L X,+1
+
+expecting success of 8001.44 'blame -L X,+N': 
+	check_count -L3,+4 B 1 B1 1 B2 1 D 1
+
+git annotate  -L3,+4 file 
+Author 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
+ok 44 - blame -L X,+N
+
+expecting success of 8001.45 'blame -L ,-0': 
+	test_must_fail $PROG -L,-0 file
+
+fatal: -L invalid empty range
+ok 45 - blame -L ,-0
+
+expecting success of 8001.46 'blame -L X,-0': 
+	test_must_fail $PROG -L1,-0 file
+
+fatal: -L invalid empty range
+ok 46 - blame -L X,-0
+
+expecting success of 8001.47 'blame -L X,-1': 
+	check_count -L3,-1 B2 1
+
+git annotate  -L3,-1 file 
+Author B2 (expected 1, attributed 1) good
+ok 47 - blame -L X,-1
+
+expecting success of 8001.48 'blame -L X,-N': 
+	check_count -L6,-4 B 1 B1 1 B2 1 D 1
+
+git annotate  -L6,-4 file 
+Author 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
+
+expecting success of 8001.49 'blame -L /RE/ (RE to end)': 
+	check_count -L/evil/ C 1 "A U Thor" 1
+
+git annotate  -L/evil/ file 
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 49 - blame -L /RE/ (RE to end)
+
+expecting success of 8001.50 'blame -L /RE/,/RE2/': 
+	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+
+git annotate  -L/robot/,/green/ file 
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 50 - blame -L /RE/,/RE2/
+
+expecting success of 8001.51 'blame -L X,/RE/': 
+	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+
+git annotate  -L5,/evil/ file 
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 51 - blame -L X,/RE/
+
+expecting success of 8001.52 'blame -L /RE/,Y': 
+	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+
+git annotate  -L/99/,7 file 
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 52 - blame -L /RE/,Y
+
+expecting success of 8001.53 'blame -L /RE/,+N': 
+	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
+
+git annotate  -L/99/,+3 file 
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+ok 53 - blame -L /RE/,+N
+
+expecting success of 8001.54 'blame -L /RE/,-N': 
+	check_count -L/99/,-3 B 1 B2 1 D 1
+
+git annotate  -L/99/,-3 file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 54 - blame -L /RE/,-N
+
+expecting success of 8001.55 'blame -L X (X == nlines)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n C 1
+
+git annotate  -L8 file 
+Author C (expected 1, attributed 1) good
+ok 55 - blame -L X (X == nlines)
+
+expecting success of 8001.56 'blame -L X (X == nlines + 1)': 
+	n=$(expr $(wc -l <file) + 2) &&
+	test_must_fail $PROG -L$n file
+
+fatal: file file has only 8 lines
+ok 56 - blame -L X (X == nlines + 1)
+
+expecting success of 8001.57 'blame -L X (X > nlines)': 
+	test_must_fail $PROG -L12345 file
+
+fatal: file file has only 8 lines
+ok 57 - blame -L X (X > nlines)
+
+expecting success of 8001.58 'blame -L ,Y (Y == nlines)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git annotate  -L,8 file 
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 58 - blame -L ,Y (Y == nlines)
+
+expecting success of 8001.59 'blame -L ,Y (Y == nlines + 1)': 
+	n=$(expr $(wc -l <file) + 2) &&
+	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git annotate  -L,9 file 
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+ok 59 - blame -L ,Y (Y == nlines + 1)
+
+expecting success of 8001.60 'blame -L ,Y (Y > nlines)': 
+	check_count -L,12345 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
+
+git annotate  -L,12345 file 
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 60 - blame -L ,Y (Y > nlines)
+
+expecting success of 8001.61 'blame -L multiple (disjoint)': 
+	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
+
+git annotate  -L2,3 -L6,7 file 
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+ok 61 - blame -L multiple (disjoint)
+
+expecting success of 8001.62 'blame -L multiple (disjoint: unordered)': 
+	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
+
+git annotate  -L6,7 -L2,3 file 
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 62 - blame -L multiple (disjoint: unordered)
+
+expecting success of 8001.63 'blame -L multiple (adjacent)': 
+	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
+
+git annotate  -L2,3 -L4,5 file 
+Author D (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 63 - blame -L multiple (adjacent)
+
+expecting success of 8001.64 'blame -L multiple (adjacent: unordered)': 
+	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
+
+git annotate  -L4,5 -L2,3 file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 64 - blame -L multiple (adjacent: unordered)
+
+expecting success of 8001.65 'blame -L multiple (overlapping)': 
+	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
+
+git annotate  -L2,4 -L3,5 file 
+Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 65 - blame -L multiple (overlapping)
+
+expecting success of 8001.66 'blame -L multiple (overlapping: unordered)': 
+	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
+
+git annotate  -L3,5 -L2,4 file 
+Author 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 66 - blame -L multiple (overlapping: unordered)
+
+expecting success of 8001.67 'blame -L multiple (superset/subset)': 
+	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git annotate  -L2,8 -L3,5 file 
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+ok 67 - blame -L multiple (superset/subset)
+
+expecting success of 8001.68 'blame -L multiple (superset/subset: unordered)': 
+	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git annotate  -L3,5 -L2,8 file 
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+ok 68 - blame -L multiple (superset/subset: unordered)
+
+expecting success of 8001.69 'blame -L /RE/ (relative)': 
+	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git annotate  -L3,3 -L/fox/ file 
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author C (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 8001.70 'blame -L /RE/ (relative: no preceding range)': 
+	check_count -L/dog/ A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
+
+git annotate  -L/dog/ file 
+Author B1 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author 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 8001.71 'blame -L /RE/ (relative: adjacent)': 
+	check_count -L1,1 -L/dog/,+1 A 1 E 1
+
+git annotate  -L1,1 -L/dog/,+1 file 
+Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+ok 71 - blame -L /RE/ (relative: adjacent)
+
+expecting success of 8001.72 'blame -L /RE/ (relative: not found)': 
+	test_must_fail $PROG -L4,4 -L/dog/ file
+
+fatal: -L parameter 'dog' starting at line 5: No match
+ok 72 - blame -L /RE/ (relative: not found)
+
+expecting success of 8001.73 'blame -L /RE/ (relative: end-of-file)': 
+	test_must_fail $PROG -L, -L/$/ file
+
+fatal: file file has only 8 lines
+ok 73 - blame -L /RE/ (relative: end-of-file)
+
+expecting success of 8001.74 'blame -L ^/RE/ (absolute)': 
+	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
+
+git annotate  -L3,3 -L^/dog/,+2 file 
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 74 - blame -L ^/RE/ (absolute)
+
+expecting success of 8001.75 'blame -L ^/RE/ (absolute: no preceding range)': 
+	check_count -L^/dog/,+2 A 1 B2 1
+
+git annotate  -L^/dog/,+2 file 
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+ok 75 - blame -L ^/RE/ (absolute: no preceding range)
+
+expecting success of 8001.76 'blame -L ^/RE/ (absolute: not found)': 
+	test_must_fail $PROG -L4,4 -L^/tambourine/ file
+
+fatal: -L parameter 'tambourine' starting at line 1: No match
+ok 76 - blame -L ^/RE/ (absolute: not found)
+
+expecting success of 8001.77 'blame -L ^/RE/ (absolute: end-of-file)': 
+	n=$(expr $(wc -l <file) + 1) &&
+	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
+
+git annotate  -L8 -L^/$/,+2 file 
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+ok 77 - blame -L ^/RE/ (absolute: end-of-file)
+
+expecting success of 8001.78 'setup -L :regex': 
+	tr Q "\\t" >hello.c <<-\EOF &&
+	int main(int argc, const char *argv[])
+	{
+	Qputs("hello");
+	}
+	EOF
+	git add hello.c &&
+	GIT_AUTHOR_NAME="F" GIT_AUTHOR_EMAIL="F@test.git" \
+	git commit -m "hello" &&
+
+	mv hello.c hello.orig &&
+	sed -e "/}/ {x; s/$/Qputs(\"goodbye\");/; G;}" <hello.orig |
+	tr Q "\\t" >hello.c &&
+	GIT_AUTHOR_NAME="G" GIT_AUTHOR_EMAIL="G@test.git" \
+	git commit -a -m "goodbye" &&
+
+	mv hello.c hello.orig &&
+	echo "#include <stdio.h>" >hello.c &&
+	cat hello.orig >>hello.c &&
+	tr Q "\\t" >>hello.c <<-\EOF &&
+	void mail()
+	{
+	Qputs("mail");
+	}
+	EOF
+	GIT_AUTHOR_NAME="H" GIT_AUTHOR_EMAIL="H@test.git" \
+	git commit -a -m "mail"
+
+[branch2 f82005e] hello
+ Author: F <F@test.git>
+ 1 file changed, 4 insertions(+)
+ create mode 100644 hello.c
+[branch2 edbab84] goodbye
+ Author: G <G@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 846166b] mail
+ Author: H <H@test.git>
+ 1 file changed, 5 insertions(+)
+ok 78 - setup -L :regex
+
+expecting success of 8001.79 'blame -L :literal': 
+	check_count -f hello.c -L:main F 4 G 1
+
+git annotate  -L:main hello.c 
+Author F (expected 4, attributed 4) good
+Author G (expected 1, attributed 1) good
+ok 79 - blame -L :literal
+
+expecting success of 8001.80 'blame -L :regex': 
+	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+
+git annotate  -L:m[a-z][a-z]l hello.c 
+Author H (expected 4, attributed 4) good
+ok 80 - blame -L :regex
+
+expecting success of 8001.81 'blame -L :nomatch': 
+	test_must_fail $PROG -L:nomatch hello.c
+
+fatal: -L parameter 'nomatch' starting at line 1: no match
+ok 81 - blame -L :nomatch
+
+expecting success of 8001.82 'blame -L :RE (relative)': 
+	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
+
+git annotate  -L3,3 -L:ma.. hello.c 
+Author H (expected 4, attributed 4) good
+Author F (expected 1, attributed 1) good
+ok 82 - blame -L :RE (relative)
+
+expecting success of 8001.83 'blame -L :RE (relative: no preceding range)': 
+	check_count -f hello.c -L:ma.. F 4 G 1
+
+git annotate  -L:ma.. hello.c 
+Author F (expected 4, attributed 4) good
+Author G (expected 1, attributed 1) good
+ok 83 - blame -L :RE (relative: no preceding range)
+
+expecting success of 8001.84 'blame -L :RE (relative: not found)': 
+	test_must_fail $PROG -L3,3 -L:tambourine hello.c
+
+fatal: -L parameter 'tambourine' starting at line 4: no match
+ok 84 - blame -L :RE (relative: not found)
+
+expecting success of 8001.85 'blame -L :RE (relative: end-of-file)': 
+	test_must_fail $PROG -L, -L:main hello.c
+
+fatal: -L parameter 'main' starting at line 11: no match
+ok 85 - blame -L :RE (relative: end-of-file)
+
+expecting success of 8001.86 'blame -L ^:RE (absolute)': 
+	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
+
+git annotate  -L3,3 -L^:ma.. hello.c 
+Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
+ok 86 - blame -L ^:RE (absolute)
+
+expecting success of 8001.87 'blame -L ^:RE (absolute: no preceding range)': 
+	check_count -f hello.c -L^:ma.. F 4 G 1
+
+git annotate  -L^:ma.. hello.c 
+Author F (expected 4, attributed 4) good
+Author G (expected 1, attributed 1) good
+ok 87 - blame -L ^:RE (absolute: no preceding range)
+
+expecting success of 8001.88 'blame -L ^:RE (absolute: not found)': 
+	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
+
+fatal: -L parameter 'tambourine' starting at line 1: no match
+ok 88 - blame -L ^:RE (absolute: not found)
+
+expecting success of 8001.89 'blame -L ^:RE (absolute: end-of-file)': 
+	n=$(printf "%d" $(wc -l <hello.c)) &&
+	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
+
+git annotate  -L10 -L^:ma.. hello.c 
+Author 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 8001.90 'blame -L :funcname with userdiff driver': 
+	cat >file.template <<-\EOF &&
+	DO NOT MATCH THIS LINE
+	function RIGHT(a, b) result(c)
+	AS THE DEFAULT DRIVER WOULD
+
+	integer, intent(in) :: ChangeMe
+	EOF
+
+	fortran_file=file.f03 &&
+	test_when_finished "rm .gitattributes" &&
+	echo "$fortran_file diff=fortran" >.gitattributes &&
+
+	test_commit --author "A <A@test.git>" \
+		"add" "$fortran_file" \
+		"$(cat file.template)" &&
+	test_commit --author "B <B@test.git>" \
+		"change" "$fortran_file" \
+		"$(sed -e s/ChangeMe/IWasChanged/ file.template)" &&
+	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
+
+[branch2 6b1b7a1] add
+ Author: A <A@test.git>
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file.f03
+[branch2 7caa17d] change
+ Author: B <B@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+git annotate  -L:RIGHT file.f03 
+Author B (expected 1, attributed 1) good
+Author A (expected 3, attributed 3) good
+ok 90 - blame -L :funcname with userdiff driver
+
+expecting success of 8001.91 'setup incremental': 
+	(
+	GIT_AUTHOR_NAME=I &&
+	export GIT_AUTHOR_NAME &&
+	GIT_AUTHOR_EMAIL=I@test.git &&
+	export GIT_AUTHOR_EMAIL &&
+	>incremental &&
+	git add incremental &&
+	git commit -m "step 0" &&
+	printf "partial" >>incremental &&
+	git commit -a -m "step 0.5" &&
+	echo >>incremental &&
+	git commit -a -m "step 1"
+	)
+
+[branch2 6c56eef] step 0
+ Author: I <I@test.git>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 incremental
+[branch2 c79b19e] step 0.5
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+)
+[branch2 f65a7a7] step 1
+ Author: I <I@test.git>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 91 - setup incremental
+
+expecting success of 8001.92 'blame empty': 
+	check_count -h HEAD^^ -f incremental
+
+git annotate  incremental HEAD^^
+ok 92 - blame empty
+
+expecting success of 8001.93 'blame -L 0 empty': 
+	test_must_fail $PROG -L0 incremental HEAD^^
+
+fatal: -L invalid line number: 0
+ok 93 - blame -L 0 empty
+
+expecting success of 8001.94 'blame -L 1 empty': 
+	test_must_fail $PROG -L1 incremental HEAD^^
+
+fatal: file incremental has only 0 lines
+ok 94 - blame -L 1 empty
+
+expecting success of 8001.95 'blame -L 2 empty': 
+	test_must_fail $PROG -L2 incremental HEAD^^
+
+fatal: file incremental has only 0 lines
+ok 95 - blame -L 2 empty
+
+expecting success of 8001.96 'blame half': 
+	check_count -h HEAD^ -f incremental I 1
+
+git annotate  incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 96 - blame half
+
+expecting success of 8001.97 'blame -L 0 half': 
+	test_must_fail $PROG -L0 incremental HEAD^
+
+fatal: -L invalid line number: 0
+ok 97 - blame -L 0 half
+
+expecting success of 8001.98 'blame -L 1 half': 
+	check_count -h HEAD^ -f incremental -L1 I 1
+
+git annotate  -L1 incremental HEAD^
+Author I (expected 1, attributed 1) good
+ok 98 - blame -L 1 half
+
+expecting success of 8001.99 'blame -L 2 half': 
+	test_must_fail $PROG -L2 incremental HEAD^
+
+fatal: file incremental has only 1 line
+ok 99 - blame -L 2 half
+
+expecting success of 8001.100 'blame -L 3 half': 
+	test_must_fail $PROG -L3 incremental HEAD^
+
+fatal: file incremental has only 1 line
+ok 100 - blame -L 3 half
+
+expecting success of 8001.101 'blame full': 
+	check_count -f incremental I 1
+
+git annotate  incremental 
+Author I (expected 1, attributed 1) good
+ok 101 - blame full
+
+expecting success of 8001.102 'blame -L 0 full': 
+	test_must_fail $PROG -L0 incremental
+
+fatal: -L invalid line number: 0
+ok 102 - blame -L 0 full
+
+expecting success of 8001.103 'blame -L 1 full': 
+	check_count -f incremental -L1 I 1
+
+git annotate  -L1 incremental 
+Author I (expected 1, attributed 1) good
+ok 103 - blame -L 1 full
+
+expecting success of 8001.104 'blame -L 2 full': 
+	test_must_fail $PROG -L2 incremental
+
+fatal: file incremental has only 1 line
+ok 104 - blame -L 2 full
+
+expecting success of 8001.105 'blame -L 3 full': 
+	test_must_fail $PROG -L3 incremental
+
+fatal: file incremental has only 1 line
+ok 105 - blame -L 3 full
+
+expecting success of 8001.106 'blame -L': 
+	test_must_fail $PROG -L file
+
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+
+    <rev-opts> are documented in git-rev-list(1)
+
+    --[no-]incremental    show blame entries as we find them, incrementally
+    -b                    do not show object names of boundary commits (Default: off)
+    --[no-]root           do not treat root commits as boundaries (Default: off)
+    --[no-]show-stats     show work cost statistics
+    --[no-]progress       force progress reporting
+    --[no-]score-debug    show output score for blame entries
+    -f, --[no-]show-name  show original filename (Default: auto)
+    -n, --[no-]show-number
+                          show original linenumber (Default: off)
+    -p, --[no-]porcelain  show in a format designed for machine consumption
+    --[no-]line-porcelain show porcelain format with per-line commit information
+    -c                    use the same output mode as git-annotate (Default: off)
+    -t                    show raw timestamp (Default: off)
+    -l                    show long commit SHA1 (Default: off)
+    -s                    suppress author name and timestamp (Default: off)
+    -e, --[no-]show-email show author email instead of name (Default: off)
+    -w                    ignore whitespace differences
+    --[no-]ignore-rev <rev>
+                          ignore <rev> when blaming
+    --[no-]ignore-revs-file <file>
+                          ignore revisions from <file>
+    --[no-]color-lines    color redundant metadata from previous line differently
+    --[no-]color-by-age   color lines by age
+    --[no-]minimal        spend extra cycles to find better match
+    -S <file>             use revisions from <file> instead of calling git-rev-list
+    --[no-]contents <file>
+                          use <file>'s contents as the final image
+    -C[<score>]           find line copies within and across files
+    -M[<score>]           find line movements within and across files
+    -L <range>            process only line range <start>,<end> or function :<funcname>
+    --[no-]abbrev[=<n>]   use <n> digits to display object names
+
+ok 106 - blame -L
+
+expecting success of 8001.107 'blame -L X,+': 
+	test_must_fail $PROG -L1,+ file
+
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 107 - blame -L X,+
+
+expecting success of 8001.108 'blame -L X,-': 
+	test_must_fail $PROG -L1,- file
+
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 108 - blame -L X,-
+
+expecting success of 8001.109 'blame -L X (non-numeric X)': 
+	test_must_fail $PROG -LX file
+
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 109 - blame -L X (non-numeric X)
+
+expecting success of 8001.110 'blame -L X,Y (non-numeric Y)': 
+	test_must_fail $PROG -L1,Y file
+
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 110 - blame -L X,Y (non-numeric Y)
+
+expecting success of 8001.111 'blame -L X,+N (non-numeric N)': 
+	test_must_fail $PROG -L1,+N file
+
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 111 - blame -L X,+N (non-numeric N)
+
+expecting success of 8001.112 'blame -L X,-N (non-numeric N)': 
+	test_must_fail $PROG -L1,-N file
+
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 112 - blame -L X,-N (non-numeric N)
+
+expecting success of 8001.113 'blame -L ,^/RE/': 
+	test_must_fail $PROG -L1,^/99/ file
+
+usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+ok 113 - blame -L ,^/RE/
+
+expecting success of 8001.114 'blame progress on a full file': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (10/10), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+
+846166ba (H 2005-04-07 15:42:13 -0700  1) #include <stdio.h>
+f82005e9 (F 2005-04-07 15:42:13 -0700  2) int main(int argc, const char *argv[])
+f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
+846166ba (H 2005-04-07 15:42:13 -0700  7) void mail()
+846166ba (H 2005-04-07 15:42:13 -0700  8) {
+846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
+846166ba (H 2005-04-07 15:42:13 -0700 10) }
+ok 114 - blame progress on a full file
+
+expecting success of 8001.115 'blame progress on a single range': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (4/4), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+
+f82005e9 (F 2005-04-07 15:42:13 -0700 3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700 4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700 5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700 6) }
+ok 115 - blame progress on a single range
+
+expecting success of 8001.116 'blame progress on multiple ranges': 
+	cat >expect <<-\EOF &&
+	Blaming lines: 100% (7/7), done.
+	EOF
+
+	GIT_PROGRESS_DELAY=0 \
+	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
+
+	get_progress_result <stderr >actual &&
+	test_cmp expect actual
+
+f82005e9 (F 2005-04-07 15:42:13 -0700  3) {
+f82005e9 (F 2005-04-07 15:42:13 -0700  4) 	puts("hello");
+edbab84e (G 2005-04-07 15:42:13 -0700  5) 	puts("goodbye");
+f82005e9 (F 2005-04-07 15:42:13 -0700  6) }
+846166ba (H 2005-04-07 15:42:13 -0700  8) {
+846166ba (H 2005-04-07 15:42:13 -0700  9) 	puts("mail");
+846166ba (H 2005-04-07 15:42:13 -0700 10) }
+ok 116 - blame progress on multiple ranges
+
+expecting success of 8001.117 'annotate old revision': 
+	git annotate file main >actual &&
+	awk "{ print \$3; }" <actual >authors &&
+	test 2 = $(grep A <authors | wc -l) &&
+	test 2 = $(grep B <authors | wc -l)
+
+ok 117 - annotate old revision
+
+# passed all 117 test(s)
+1..117
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t8007-cat-file-textconv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8007-cat-file-textconv/.git/
+expecting success of 8007.1 'setup ': 
+	echo "bin: test" >one.bin &&
+	test_ln_s_add one.bin symlink.bin &&
+	git add . &&
+	GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" &&
+	echo "bin: test version 2" >one.bin &&
+	GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00"
+
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+[master (root-commit) 6a4de31] First
+ Author: Number1 <author@example.com>
+ Date: Fri Jan 1 18:00:00 2010 +0000
+ 3 files changed, 5 insertions(+)
+ create mode 100755 helper
+ create mode 100644 one.bin
+ create mode 120000 symlink.bin
+[master aa3beaa] Second
+ Author: Number2 <author@example.com>
+ Date: Fri Jan 1 20:00:00 2010 +0000
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - setup 
+
+expecting success of 8007.2 'usage: <bad rev>': 
+	cat >expect <<-\EOF &&
+	fatal: Not a valid object name HEAD2
+	EOF
+	test_must_fail git cat-file --textconv HEAD2 2>actual &&
+	test_cmp expect actual
+
+ok 2 - usage: <bad rev>
+
+expecting success of 8007.3 'usage: <bad rev>:<bad path>': 
+	cat >expect <<-\EOF &&
+	fatal: invalid object name 'HEAD2'.
+	EOF
+	test_must_fail git cat-file --textconv HEAD2:two.bin 2>actual &&
+	test_cmp expect actual
+
+ok 3 - usage: <bad rev>:<bad path>
+
+expecting success of 8007.4 'usage: <rev>:<bad path>': 
+	cat >expect <<-\EOF &&
+	fatal: path 'two.bin' does not exist in 'HEAD'
+	EOF
+	test_must_fail git cat-file --textconv HEAD:two.bin 2>actual &&
+	test_cmp expect actual
+
+ok 4 - usage: <rev>:<bad path>
+
+expecting success of 8007.5 'usage: <rev> with no <path>': 
+	cat >expect <<-\EOF &&
+	fatal: <object>:<path> required, only <object> 'HEAD' given
+	EOF
+	test_must_fail git cat-file --textconv HEAD 2>actual &&
+	test_cmp expect actual
+
+ok 5 - usage: <rev> with no <path>
+
+expecting success of 8007.6 'usage: <bad rev>:<good (in HEAD) path>': 
+	cat >expect <<-\EOF &&
+	fatal: invalid object name 'HEAD2'.
+	EOF
+	test_must_fail git cat-file --textconv HEAD2:one.bin 2>actual &&
+	test_cmp expect actual
+
+ok 6 - usage: <bad rev>:<good (in HEAD) path>
+
+expecting success of 8007.7 'no filter specified': 
+	git cat-file --textconv :one.bin >result &&
+	test_cmp expected result
+
+ok 7 - no filter specified
+
+expecting success of 8007.8 'setup textconv filters': 
+	echo "*.bin diff=test" >.gitattributes &&
+	git config diff.test.textconv ./helper &&
+	git config diff.test.cachetextconv false
+
+ok 8 - setup textconv filters
+
+expecting success of 8007.9 'cat-file without --textconv': 
+	git cat-file blob :one.bin >result &&
+	test_cmp expected result
+
+ok 9 - cat-file without --textconv
+
+expecting success of 8007.10 'cat-file without --textconv on previous commit': 
+	git cat-file -p HEAD^:one.bin >result &&
+	test_cmp expected result
+
+ok 10 - cat-file without --textconv on previous commit
+
+expecting success of 8007.11 'cat-file --textconv on last commit': 
+	git cat-file --textconv :one.bin >result &&
+	test_cmp expected result
+
+ok 11 - cat-file --textconv on last commit
+
+expecting success of 8007.12 'cat-file --textconv on previous commit': 
+	git cat-file --textconv HEAD^:one.bin >result &&
+	test_cmp expected result
+
+ok 12 - cat-file --textconv on previous commit
+
+expecting success of 8007.13 'cat-file without --textconv (symlink)': 
+	printf "%s" "one.bin" >expected &&
+	git cat-file blob :symlink.bin >result &&
+	test_cmp expected result
+
+ok 13 - cat-file without --textconv (symlink)
+
+expecting success of 8007.14 'cat-file --textconv on index (symlink)': 
+	git cat-file --textconv :symlink.bin >result &&
+	test_cmp expected result
+
+ok 14 - cat-file --textconv on index (symlink)
+
+expecting success of 8007.15 'cat-file --textconv on HEAD (symlink)': 
+	git cat-file --textconv HEAD:symlink.bin >result &&
+	test_cmp expected result
+
+ok 15 - cat-file --textconv on HEAD (symlink)
+
+# passed all 15 test(s)
+1..15
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t7900-maintenance.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.git/
+expecting success of 7900.1 'help text': 
+	test_expect_code 129 git maintenance -h >actual &&
+	test_grep "usage: git maintenance <subcommand>" actual &&
+	test_expect_code 129 git maintenance barf 2>err &&
+	test_grep "unknown subcommand: \`barf'" err &&
+	test_grep "usage: git maintenance" err &&
+	test_expect_code 129 git maintenance 2>err &&
+	test_grep "error: need a subcommand" err &&
+	test_grep "usage: git maintenance" err
+
+usage: git maintenance <subcommand> [<options>]
+error: unknown subcommand: `barf'
+usage: git maintenance <subcommand> [<options>]
+error: need a subcommand
+usage: git maintenance <subcommand> [<options>]
+ok 1 - help text
+
+expecting success of 7900.2 'run [--auto|--quiet]': 
+	GIT_TRACE2_EVENT="$(pwd)/run-no-auto.txt" \
+		git maintenance run 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-auto.txt" \
+		git maintenance run --auto 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-no-quiet.txt" \
+		git maintenance run --no-quiet 2>/dev/null &&
+	test_subcommand git gc --quiet <run-no-auto.txt &&
+	test_subcommand ! git gc --auto --quiet <run-auto.txt &&
+	test_subcommand git gc --no-quiet <run-no-quiet.txt
+
+Nothing new to pack.
+{"event":"child_start","sid":"20241114T194453.502454Z-H5c947e1c-P0000257d","thread":"main","time":"2024-11-14T19:44:53.503068Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet"]}
+{"event":"child_start","sid":"20241114T194453.583370Z-H5c947e1c-P000025ae","thread":"main","time":"2024-11-14T19:44:53.583927Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--no-quiet"]}
+ok 2 - run [--auto|--quiet]
+
+expecting success of 7900.3 'maintenance.auto config option': 
+	GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 &&
+	test_subcommand git maintenance run --auto --quiet <default &&
+	GIT_TRACE2_EVENT="$(pwd)/true" \
+		git -c maintenance.auto=true \
+		commit --quiet --allow-empty -m 2 &&
+	test_subcommand git maintenance run --auto --quiet  <true &&
+	GIT_TRACE2_EVENT="$(pwd)/false" \
+		git -c maintenance.auto=false \
+		commit --quiet --allow-empty -m 3 &&
+	test_subcommand ! git maintenance run --auto --quiet  <false
+
+{"event":"child_start","sid":"20241114T194453.783619Z-H5c947e1c-P00002610","thread":"main","time":"2024-11-14T19:44:53.786033Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet"]}
+{"event":"child_start","sid":"20241114T194453.805040Z-H5c947e1c-P00002624","thread":"main","time":"2024-11-14T19:44:53.807594Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","maintenance","run","--auto","--quiet"]}
+ok 3 - maintenance.auto config option
+
+expecting success of 7900.4 'register uses XDG_CONFIG_HOME config if it exists': 
+	test_when_finished rm -r .config/git/config &&
+	(
+		XDG_CONFIG_HOME=.config &&
+		export XDG_CONFIG_HOME &&
+		mkdir -p $XDG_CONFIG_HOME/git &&
+		>$XDG_CONFIG_HOME/git/config &&
+		git maintenance register &&
+		git config --file=$XDG_CONFIG_HOME/git/config --get maintenance.repo >actual &&
+		pwd >expect &&
+		test_cmp expect actual
+	)
+
+ok 4 - register uses XDG_CONFIG_HOME config if it exists
+
+expecting success of 7900.5 'register does not need XDG_CONFIG_HOME config to exist': 
+	test_when_finished git maintenance unregister &&
+	test_path_is_missing $XDG_CONFIG_HOME/git/config &&
+	git maintenance register &&
+	git config --global --get maintenance.repo >actual &&
+	pwd >expect &&
+	test_cmp expect actual
+
+ok 5 - register does not need XDG_CONFIG_HOME config to exist
+
+expecting success of 7900.6 'unregister uses XDG_CONFIG_HOME config if it exists': 
+	test_when_finished rm -r .config/git/config &&
+	(
+		XDG_CONFIG_HOME=.config &&
+		export XDG_CONFIG_HOME &&
+		mkdir -p $XDG_CONFIG_HOME/git &&
+		>$XDG_CONFIG_HOME/git/config &&
+		git maintenance register &&
+		git maintenance unregister &&
+		test_must_fail git config --file=$XDG_CONFIG_HOME/git/config --get maintenance.repo >actual &&
+		test_must_be_empty actual
+	)
+
+ok 6 - unregister uses XDG_CONFIG_HOME config if it exists
+
+expecting success of 7900.7 'unregister does not need XDG_CONFIG_HOME config to exist': 
+	test_path_is_missing $XDG_CONFIG_HOME/git/config &&
+	git maintenance register &&
+	git maintenance unregister &&
+	test_must_fail git config --global --get maintenance.repo >actual &&
+	test_must_be_empty actual
+
+ok 7 - unregister does not need XDG_CONFIG_HOME config to exist
+
+expecting success of 7900.8 'maintenance.<task>.enabled': 
+	git config maintenance.gc.enabled false &&
+	git config maintenance.commit-graph.enabled true &&
+	GIT_TRACE2_EVENT="$(pwd)/run-config.txt" git maintenance run 2>err &&
+	test_subcommand ! git gc --quiet <run-config.txt &&
+	test_subcommand git commit-graph write --split --reachable --no-progress <run-config.txt
+
+{"event":"child_start","sid":"20241114T194453.980169Z-H5c947e1c-P000026fb","thread":"main","time":"2024-11-14T19:44:53.980797Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+ok 8 - maintenance.<task>.enabled
+
+expecting success of 7900.9 'run --task=<task>': 
+	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
+		git maintenance run --task=commit-graph 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-gc.txt" \
+		git maintenance run --task=gc 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
+		git maintenance run --task=commit-graph 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-both.txt" \
+		git maintenance run --task=commit-graph --task=gc 2>/dev/null &&
+	test_subcommand ! git gc --quiet <run-commit-graph.txt &&
+	test_subcommand git gc --quiet <run-gc.txt &&
+	test_subcommand git gc --quiet <run-both.txt &&
+	test_subcommand git commit-graph write --split --reachable --no-progress <run-commit-graph.txt &&
+	test_subcommand ! git commit-graph write --split --reachable --no-progress <run-gc.txt &&
+	test_subcommand git commit-graph write --split --reachable --no-progress <run-both.txt
+
+{"event":"child_start","sid":"20241114T194454.028618Z-H5c947e1c-P00002736","thread":"main","time":"2024-11-14T19:44:54.033269Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet"]}
+{"event":"child_start","sid":"20241114T194454.202561Z-H5c947e1c-P000027ef","thread":"main","time":"2024-11-14T19:44:54.203264Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","gc","--quiet"]}
+{"event":"child_start","sid":"20241114T194454.003878Z-H5c947e1c-P00002726","thread":"main","time":"2024-11-14T19:44:54.004568Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194454.187120Z-H5c947e1c-P000027d9","thread":"main","time":"2024-11-14T19:44:54.187767Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194454.202561Z-H5c947e1c-P000027ef","thread":"main","time":"2024-11-14T19:44:54.309240Z","file":"run-command.c","line":724,"child_id":1,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+ok 9 - run --task=<task>
+
+expecting success of 7900.10 'core.commitGraph=false prevents write process': 
+	GIT_TRACE2_EVENT="$(pwd)/no-commit-graph.txt" \
+		git -c core.commitGraph=false maintenance run \
+		--task=commit-graph 2>/dev/null &&
+	test_subcommand ! git commit-graph write --split --reachable --no-progress \
+		<no-commit-graph.txt
+
+ok 10 - core.commitGraph=false prevents write process
+
+expecting success of 7900.11 'commit-graph auto condition': 
+	COMMAND="maintenance run --task=commit-graph --auto --quiet" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/cg-no.txt" \
+		git -c maintenance.commit-graph.auto=1 $COMMAND &&
+	GIT_TRACE2_EVENT="$(pwd)/cg-negative-means-yes.txt" \
+		git -c maintenance.commit-graph.auto="-1" $COMMAND &&
+
+	test_commit first &&
+
+	GIT_TRACE2_EVENT="$(pwd)/cg-zero-means-no.txt" \
+		git -c maintenance.commit-graph.auto=0 $COMMAND &&
+	GIT_TRACE2_EVENT="$(pwd)/cg-one-satisfied.txt" \
+		git -c maintenance.commit-graph.auto=1 $COMMAND &&
+
+	git commit --allow-empty -m "second" &&
+	git commit --allow-empty -m "third" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/cg-two-satisfied.txt" \
+		git -c maintenance.commit-graph.auto=2 $COMMAND &&
+
+	COMMIT_GRAPH_WRITE="git commit-graph write --split --reachable --no-progress" &&
+	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-no.txt &&
+	test_subcommand $COMMIT_GRAPH_WRITE <cg-negative-means-yes.txt &&
+	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-zero-means-no.txt &&
+	test_subcommand $COMMIT_GRAPH_WRITE <cg-one-satisfied.txt &&
+	test_subcommand $COMMIT_GRAPH_WRITE <cg-two-satisfied.txt
+
+[master a69f914] first
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 first.t
+[master 0c7e5e9] second
+ Author: A U Thor <author@example.com>
+[master fa248cf] third
+ Author: A U Thor <author@example.com>
+{"event":"child_start","sid":"20241114T194454.412784Z-H5c947e1c-P0000289b","thread":"main","time":"2024-11-14T19:44:54.413515Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194454.485792Z-H5c947e1c-P000028e3","thread":"main","time":"2024-11-14T19:44:54.487015Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194454.535216Z-H5c947e1c-P00002912","thread":"main","time":"2024-11-14T19:44:54.536577Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+ok 11 - commit-graph auto condition
+
+expecting success of 7900.12 'run --task=bogus': 
+	test_must_fail git maintenance run --task=bogus 2>err &&
+	test_grep "is not a valid task" err
+
+error: 'bogus' is not a valid task
+ok 12 - run --task=bogus
+
+expecting success of 7900.13 'run --task duplicate': 
+	test_must_fail git maintenance run --task=gc --task=gc 2>err &&
+	test_grep "cannot be selected multiple times" err
+
+error: task 'gc' cannot be selected multiple times
+ok 13 - run --task duplicate
+
+expecting success of 7900.14 'run --task=prefetch with no remotes': 
+	git maintenance run --task=prefetch 2>err &&
+	test_must_be_empty err
+
+ok 14 - run --task=prefetch with no remotes
+
+expecting success of 7900.15 'prefetch multiple remotes': 
+	git clone . clone1 &&
+	git clone . clone2 &&
+	git remote add remote1 "file://$(pwd)/clone1" &&
+	git remote add remote2 "file://$(pwd)/clone2" &&
+	git -C clone1 switch -c one &&
+	git -C clone2 switch -c two &&
+	test_commit -C clone1 one &&
+	test_commit -C clone2 two &&
+	GIT_TRACE2_EVENT="$(pwd)/run-prefetch.txt" git maintenance run --task=prefetch 2>/dev/null &&
+	fetchargs="--prefetch --prune --no-tags --no-write-fetch-head --recurse-submodules=no --quiet" &&
+	test_subcommand git fetch remote1 $fetchargs <run-prefetch.txt &&
+	test_subcommand git fetch remote2 $fetchargs <run-prefetch.txt &&
+	git for-each-ref refs/remotes >actual &&
+	test_must_be_empty actual &&
+	git log prefetch/remotes/remote1/one &&
+	git log prefetch/remotes/remote2/two &&
+	git fetch --all &&
+	test_cmp_rev refs/remotes/remote1/one refs/prefetch/remotes/remote1/one &&
+	test_cmp_rev refs/remotes/remote2/two refs/prefetch/remotes/remote2/two &&
+
+	git log --oneline --decorate --all >log &&
+	! grep "prefetch" log &&
+
+	test_when_finished git config --unset remote.remote1.skipFetchAll &&
+	git config remote.remote1.skipFetchAll true &&
+	GIT_TRACE2_EVENT="$(pwd)/skip-remote1.txt" git maintenance run --task=prefetch 2>/dev/null &&
+	test_subcommand ! git fetch remote1 $fetchargs <skip-remote1.txt &&
+	test_subcommand git fetch remote2 $fetchargs <skip-remote1.txt
+
+Cloning into 'clone1'...
+done.
+Cloning into 'clone2'...
+done.
+Switched to a new branch 'one'
+Switched to a new branch 'two'
+[one e779b39] one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 one.t
+[two 41188fb] two
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 two.t
+{"event":"child_start","sid":"20241114T194454.959898Z-H5c947e1c-P00002a62","thread":"main","time":"2024-11-14T19:44:54.960725Z","file":"run-command.c","line":724,"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":"20241114T194454.959898Z-H5c947e1c-P00002a62","thread":"main","time":"2024-11-14T19:44:54.983098Z","file":"run-command.c","line":724,"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 e779b3967abc4fd38a0961b501c6e2ec4b1da869
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:14:13 2005 -0700
+
+    one
+
+commit fa248cfd6f7af9061e71aa34bdf8603f49b12a5b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    third
+
+commit 0c7e5e94681801e1ca3e9f2d77cc7ed455d17e75
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    second
+
+commit a69f9140dbb5bbddf7198dcc8b3a47a087a097a9
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    first
+
+commit 54c6b2cd4fb50066683a197cc6d677689618505a
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    3
+
+commit fc99def8b1df27bcab7d1f4b7ced73239f9bd7ec
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    2
+
+commit a3a8cd3c82028671bf51502d77277baf14a2f528
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+commit 41188fb9f5dcfd3e516e0bf1c29bc446a9072e3d
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:15:13 2005 -0700
+
+    two
+
+commit fa248cfd6f7af9061e71aa34bdf8603f49b12a5b
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    third
+
+commit 0c7e5e94681801e1ca3e9f2d77cc7ed455d17e75
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    second
+
+commit a69f9140dbb5bbddf7198dcc8b3a47a087a097a9
+Author: A U Thor <author@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    first
+
+commit 54c6b2cd4fb50066683a197cc6d677689618505a
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    3
+
+commit fc99def8b1df27bcab7d1f4b7ced73239f9bd7ec
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    2
+
+commit a3a8cd3c82028671bf51502d77277baf14a2f528
+Author: A U Thor <author@example.com>
+Date:   Fri Apr 1 13:14:15 2005 +0200
+
+    1
+Fetching remote1
+From file:///build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/clone1
+ * [new branch]      master     -> remote1/master
+ * [new branch]      one        -> remote1/one
+ * [new tag]         one        -> one
+Fetching remote2
+From file:///build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/clone2
+ * [new branch]      master     -> remote2/master
+ * [new branch]      two        -> remote2/two
+ * [new tag]         two        -> two
+{"event":"child_start","sid":"20241114T194455.157223Z-H5c947e1c-P00002b15","thread":"main","time":"2024-11-14T19:44:55.157800Z","file":"run-command.c","line":724,"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 15 - prefetch multiple remotes
+
+expecting success of 7900.16 'loose-objects task': 
+	# Repack everything so we know the state of the object dir
+	git repack -adk &&
+
+	# Hack to stop maintenance from running during "git commit"
+	echo in use >.git/objects/maintenance.lock &&
+
+	# Assuming that "git commit" creates at least one loose object
+	test_commit create-loose-object &&
+	rm .git/objects/maintenance.lock &&
+
+	ls .git/objects >obj-dir-before &&
+	test_file_not_empty obj-dir-before &&
+	ls .git/objects/pack/*.pack >packs-before &&
+	test_line_count = 1 packs-before &&
+
+	# The first run creates a pack-file
+	# but does not delete loose objects.
+	git maintenance run --task=loose-objects &&
+	ls .git/objects >obj-dir-between &&
+	test_cmp obj-dir-before obj-dir-between &&
+	ls .git/objects/pack/*.pack >packs-between &&
+	test_line_count = 2 packs-between &&
+	ls .git/objects/pack/loose-*.pack >loose-packs &&
+	test_line_count = 1 loose-packs &&
+
+	# The second run deletes loose objects
+	# but does not create a pack-file.
+	git maintenance run --task=loose-objects &&
+	ls .git/objects >obj-dir-after &&
+	cat >expect <<-\EOF &&
+	info
+	pack
+	EOF
+	test_cmp expect obj-dir-after &&
+	ls .git/objects/pack/*.pack >packs-after &&
+	test_cmp packs-between packs-after
+
+[master 765eeea] create-loose-object
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 create-loose-object.t
+76f3951ecb34584aaf08a645cd287aaeb6c6975f
+ok 16 - loose-objects task
+
+expecting success of 7900.17 'maintenance.loose-objects.auto': 
+	git repack -adk &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-lo1.txt" \
+		git -c maintenance.loose-objects.auto=1 maintenance \
+		run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand ! git prune-packed --quiet <trace-lo1.txt &&
+	printf data-A | git hash-object -t blob --stdin -w &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-loA" \
+		git -c maintenance.loose-objects.auto=2 \
+		maintenance run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand ! git prune-packed --quiet <trace-loA &&
+	printf data-B | git hash-object -t blob --stdin -w &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-loB" \
+		git -c maintenance.loose-objects.auto=2 \
+		maintenance run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <trace-loB &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-loC" \
+		git -c maintenance.loose-objects.auto=2 \
+		maintenance run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <trace-loC
+
+07163daad06a0119b0a241cf1882adae4f88fd56
+4e26d6d394bf76d04cf3ab6f994c0bcaaf1a0a2f
+b45f8ed9850b966e2e4097582fd20e83ec6714cd
+{"event":"child_start","sid":"20241114T194455.875962Z-H5c947e1c-P00002c33","thread":"main","time":"2024-11-14T19:44:55.876839Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20241114T194455.888343Z-H5c947e1c-P00002c3b","thread":"main","time":"2024-11-14T19:44:55.889162Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+ok 17 - maintenance.loose-objects.auto
+
+expecting success of 7900.18 'incremental-repack task': 
+	packDir=.git/objects/pack &&
+	for i in $(test_seq 1 5)
+	do
+		test_commit $i || return 1
+	done &&
+
+	# Create three disjoint pack-files with size BIG, small, small.
+	echo HEAD~2 | git pack-objects --revs $packDir/test-1 &&
+	test_tick &&
+	git pack-objects --revs $packDir/test-2 <<-\EOF &&
+	HEAD~1
+	^HEAD~2
+	EOF
+	test_tick &&
+	git pack-objects --revs $packDir/test-3 <<-\EOF &&
+	HEAD
+	^HEAD~1
+	EOF
+
+	# Delete refs that have not been repacked in these packs.
+	git for-each-ref --format="delete %(refname)" \
+		refs/prefetch refs/tags refs/remotes >refs &&
+	git update-ref --stdin <refs &&
+
+	# Replace the object directory with this pack layout.
+	rm -f $packDir/pack-* &&
+	rm -f $packDir/loose-* &&
+	ls $packDir/*.pack >packs-before &&
+	test_line_count = 3 packs-before &&
+
+	# make sure we do not have any broken refs that were
+	# missed in the deletion above
+	git for-each-ref &&
+
+	# the job repacks the two into a new pack, but does not
+	# delete the old ones.
+	git maintenance run --task=incremental-repack &&
+	ls $packDir/*.pack >packs-between &&
+	test_line_count = 4 packs-between &&
+
+	# the job deletes the two old packs, and does not write
+	# a new one because the batch size is not high enough to
+	# pack the largest pack-file.
+	git maintenance run --task=incremental-repack &&
+	ls .git/objects/pack/*.pack >packs-after &&
+	test_line_count = 2 packs-after
+
+[master 3c8869b] 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 1.t
+[master 2399dc1] 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 2.t
+[master b7d27f9] 3
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 3.t
+[master b0737fd] 4
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 4.t
+[master 70626b3] 5
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 5.t
+e47e5aa80e9b70c2b26c98277f97a2011efcd068
+b828c1fd30682bb2bc80a3b7331978be5c6c2e26
+c20fc1cb0ef9be625e4c591c8507f7f9cfc087b8
+70626b3574ae58642e68da67a570eaa414d5aebf commit	refs/heads/master
+ok 18 - incremental-repack task
+
+checking prerequisite: EXPENSIVE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-EXPENSIVE" &&
+	test -n "$GIT_TEST_LONG"
+
+)
+prerequisite EXPENSIVE not satisfied
+ok 19 # skip incremental-repack 2g limit (missing EXPENSIVE)
+
+expecting success of 7900.20 'maintenance.incremental-repack.auto': 
+	rm -rf incremental-repack-true &&
+	git init incremental-repack-true &&
+	(
+		cd incremental-repack-true &&
+		git config core.multiPackIndex true &&
+		run_incremental_repack_and_verify
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/incremental-repack-true/.git/
+[master (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master ab54baa] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ba2455fe8b258f9311bea5fa32bd29103f57ba7e
+[master 3983a09] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+2f10694fe702316bcde937d57f956fe5ae42f7fe
+{"event":"child_start","sid":"20241114T194458.577441Z-H5c947e1c-P00002e99","thread":"main","time":"2024-11-14T19:44:58.578246Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+ok 20 - maintenance.incremental-repack.auto
+
+expecting success of 7900.21 'maintenance.incremental-repack.auto (when config is unset)': 
+	rm -rf incremental-repack-unset &&
+	git init incremental-repack-unset &&
+	(
+		cd incremental-repack-unset &&
+		test_unconfig core.multiPackIndex &&
+		run_incremental_repack_and_verify
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/incremental-repack-unset/.git/
+[master (root-commit) fa70208] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+[master ab54baa] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+ba2455fe8b258f9311bea5fa32bd29103f57ba7e
+[master 3983a09] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+2f10694fe702316bcde937d57f956fe5ae42f7fe
+{"event":"child_start","sid":"20241114T194459.536956Z-H5c947e1c-P00002fd6","thread":"main","time":"2024-11-14T19:44:59.537786Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+ok 21 - maintenance.incremental-repack.auto (when config is unset)
+
+expecting success of 7900.22 'pack-refs task': 
+	for n in $(test_seq 1 5)
+	do
+		git branch -f to-pack/$n HEAD || return 1
+	done &&
+	GIT_TRACE2_EVENT="$(pwd)/pack-refs.txt" \
+		git maintenance run --task=pack-refs &&
+	test_subcommand git pack-refs --all --prune <pack-refs.txt
+
+{"event":"child_start","sid":"20241114T194459.726710Z-H5c947e1c-P0000302c","thread":"main","time":"2024-11-14T19:44:59.727366Z","file":"run-command.c","line":724,"child_id":0,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+ok 22 - pack-refs task
+
+expecting success of 7900.23 '--auto and --schedule incompatible': 
+	test_must_fail git maintenance run --auto --schedule=daily 2>err &&
+	test_grep "at most one" err
 
-expecting success of 8001.37 'blame -L Y,X (undocumented)': 
-	check_count -L6,3 B 1 B1 1 B2 1 D 1
+fatal: use at most one of --auto and --schedule=<frequency>
+ok 23 - --auto and --schedule incompatible
 
-git annotate  -L6,3 file 
-Author B (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 37 - blame -L Y,X (undocumented)
+expecting success of 7900.24 'invalid --schedule value': 
+	test_must_fail git maintenance run --schedule=annually 2>err &&
+	test_grep "unrecognized --schedule" err
 
-expecting success of 8001.38 'blame -L -X': 
-	test_must_fail $PROG -L-1 file
+fatal: unrecognized --schedule argument 'annually'
+ok 24 - invalid --schedule value
 
-fatal: -L invalid line number: -1
-ok 38 - blame -L -X
+expecting success of 7900.25 '--schedule inheritance weekly -> daily -> hourly': 
+	git config maintenance.loose-objects.enabled true &&
+	git config maintenance.loose-objects.schedule hourly &&
+	git config maintenance.commit-graph.enabled true &&
+	git config maintenance.commit-graph.schedule daily &&
+	git config maintenance.incremental-repack.enabled true &&
+	git config maintenance.incremental-repack.schedule weekly &&
 
-expecting success of 8001.39 'blame -L 0': 
-	test_must_fail $PROG -L0 file
+	GIT_TRACE2_EVENT="$(pwd)/hourly.txt" \
+		git maintenance run --schedule=hourly 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <hourly.txt &&
+	test_subcommand ! git commit-graph write --split --reachable \
+		--no-progress <hourly.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress <hourly.txt &&
 
-fatal: -L invalid line number: 0
-ok 39 - blame -L 0
+	GIT_TRACE2_EVENT="$(pwd)/daily.txt" \
+		git maintenance run --schedule=daily 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <daily.txt &&
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <daily.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress <daily.txt &&
 
-expecting success of 8001.40 'blame -L ,0': 
-	test_must_fail $PROG -L,0 file
+	GIT_TRACE2_EVENT="$(pwd)/weekly.txt" \
+		git maintenance run --schedule=weekly 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <weekly.txt &&
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <weekly.txt &&
+	test_subcommand git multi-pack-index write --no-progress <weekly.txt
 
-fatal: -L invalid line number: 0
-ok 40 - blame -L ,0
+e2fec807c0f920d0361f890beb2cb31019219ebe
+{"event":"child_start","sid":"20241114T194500.770919Z-H5c947e1c-P000031cc","thread":"main","time":"2024-11-14T19:45:00.819413Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20241114T194500.864604Z-H5c947e1c-P0000322e","thread":"main","time":"2024-11-14T19:45:00.885707Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20241114T194500.864604Z-H5c947e1c-P0000322e","thread":"main","time":"2024-11-14T19:45:00.889822Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194500.989402Z-H5c947e1c-P00003251","thread":"main","time":"2024-11-14T19:45:01.015660Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20241114T194500.989402Z-H5c947e1c-P00003251","thread":"main","time":"2024-11-14T19:45:01.059310Z","file":"run-command.c","line":724,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194500.989402Z-H5c947e1c-P00003251","thread":"main","time":"2024-11-14T19:45:01.018763Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+ok 25 - --schedule inheritance weekly -> daily -> hourly
 
-expecting success of 8001.41 'blame -L ,+0': 
-	test_must_fail $PROG -L,+0 file
+expecting success of 7900.26 'maintenance.strategy inheritance': 
+	for task in commit-graph loose-objects incremental-repack
+	do
+		git config --unset maintenance.$task.schedule || return 1
+	done &&
 
-fatal: -L invalid empty range
-ok 41 - blame -L ,+0
+	test_when_finished git config --unset maintenance.strategy &&
+	git config maintenance.strategy incremental &&
 
-expecting success of 8001.42 'blame -L X,+0': 
-	test_must_fail $PROG -L1,+0 file
+	GIT_TRACE2_EVENT="$(pwd)/incremental-hourly.txt" \
+		git maintenance run --schedule=hourly --quiet &&
+	GIT_TRACE2_EVENT="$(pwd)/incremental-daily.txt" \
+		git maintenance run --schedule=daily --quiet &&
+	GIT_TRACE2_EVENT="$(pwd)/incremental-weekly.txt" \
+		git maintenance run --schedule=weekly --quiet &&
 
-fatal: -L invalid empty range
-ok 42 - blame -L X,+0
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <incremental-hourly.txt &&
+	test_subcommand ! git prune-packed --quiet <incremental-hourly.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress \
+		<incremental-hourly.txt &&
+	test_subcommand ! git pack-refs --all --prune \
+		<incremental-hourly.txt &&
 
-expecting success of 8001.43 'blame -L X,+1': 
-	check_count -L3,+1 B2 1
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <incremental-daily.txt &&
+	test_subcommand git prune-packed --quiet <incremental-daily.txt &&
+	test_subcommand git multi-pack-index write --no-progress \
+		<incremental-daily.txt &&
+	test_subcommand ! git pack-refs --all --prune \
+		<incremental-daily.txt &&
 
-git annotate  -L3,+1 file 
-Author B2 (expected 1, attributed 1) good
-ok 43 - blame -L X,+1
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <incremental-weekly.txt &&
+	test_subcommand git prune-packed --quiet <incremental-weekly.txt &&
+	test_subcommand git multi-pack-index write --no-progress \
+		<incremental-weekly.txt &&
+	test_subcommand git pack-refs --all --prune \
+		<incremental-weekly.txt &&
 
-expecting success of 8001.44 'blame -L X,+N': 
-	check_count -L3,+4 B 1 B1 1 B2 1 D 1
+	# Modify defaults
+	git config maintenance.commit-graph.schedule daily &&
+	git config maintenance.loose-objects.schedule hourly &&
+	git config maintenance.incremental-repack.enabled false &&
 
-git annotate  -L3,+4 file 
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 44 - blame -L X,+N
+	GIT_TRACE2_EVENT="$(pwd)/modified-hourly.txt" \
+		git maintenance run --schedule=hourly --quiet &&
+	GIT_TRACE2_EVENT="$(pwd)/modified-daily.txt" \
+		git maintenance run --schedule=daily --quiet &&
 
-expecting success of 8001.45 'blame -L ,-0': 
-	test_must_fail $PROG -L,-0 file
+	test_subcommand ! git commit-graph write --split --reachable \
+		--no-progress <modified-hourly.txt &&
+	test_subcommand git prune-packed --quiet <modified-hourly.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress \
+		<modified-hourly.txt &&
 
-fatal: -L invalid empty range
-ok 45 - blame -L ,-0
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <modified-daily.txt &&
+	test_subcommand git prune-packed --quiet <modified-daily.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress \
+		<modified-daily.txt
 
-expecting success of 8001.46 'blame -L X,-0': 
-	test_must_fail $PROG -L1,-0 file
+{"event":"child_start","sid":"20241114T194501.412127Z-H5c947e1c-P000032da","thread":"main","time":"2024-11-14T19:45:01.430469Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194501.436927Z-H5c947e1c-P000032e7","thread":"main","time":"2024-11-14T19:45:01.597177Z","file":"run-command.c","line":724,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194501.436927Z-H5c947e1c-P000032e7","thread":"main","time":"2024-11-14T19:45:01.456456Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20241114T194501.436927Z-H5c947e1c-P000032e7","thread":"main","time":"2024-11-14T19:45:01.459108Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20241114T194501.607258Z-H5c947e1c-P00003303","thread":"main","time":"2024-11-14T19:45:01.638940Z","file":"run-command.c","line":724,"child_id":6,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194501.607258Z-H5c947e1c-P00003303","thread":"main","time":"2024-11-14T19:45:01.628277Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20241114T194501.607258Z-H5c947e1c-P00003303","thread":"main","time":"2024-11-14T19:45:01.631025Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","multi-pack-index","write","--no-progress"]}
+{"event":"child_start","sid":"20241114T194501.607258Z-H5c947e1c-P00003303","thread":"main","time":"2024-11-14T19:45:01.642175Z","file":"run-command.c","line":724,"child_id":7,"child_class":"?","use_shell":false,"argv":["git","pack-refs","--all","--prune"]}
+{"event":"child_start","sid":"20241114T194501.873855Z-H5c947e1c-P0000334d","thread":"main","time":"2024-11-14T19:45:01.901744Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+{"event":"child_start","sid":"20241114T194501.910036Z-H5c947e1c-P0000335b","thread":"main","time":"2024-11-14T19:45:01.933234Z","file":"run-command.c","line":724,"child_id":3,"child_class":"?","use_shell":false,"argv":["git","commit-graph","write","--split","--reachable","--no-progress"]}
+{"event":"child_start","sid":"20241114T194501.910036Z-H5c947e1c-P0000335b","thread":"main","time":"2024-11-14T19:45:01.930393Z","file":"run-command.c","line":724,"child_id":2,"child_class":"?","use_shell":false,"argv":["git","prune-packed","--quiet"]}
+ok 26 - maintenance.strategy inheritance
 
-fatal: -L invalid empty range
-ok 46 - blame -L X,-0
+expecting success of 7900.27 'register and unregister': 
+	test_when_finished git config --global --unset-all maintenance.repo &&
 
-expecting success of 8001.47 'blame -L X,-1': 
-	check_count -L3,-1 B2 1
+	test_must_fail git maintenance unregister 2>err &&
+	grep "is not registered" err &&
+	git maintenance unregister --force &&
 
-git annotate  -L3,-1 file 
-Author B2 (expected 1, attributed 1) good
-ok 47 - blame -L X,-1
+	git config --global --add maintenance.repo /existing1 &&
+	git config --global --add maintenance.repo /existing2 &&
+	git config --global --get-all maintenance.repo >before &&
 
-expecting success of 8001.48 'blame -L X,-N': 
-	check_count -L6,-4 B 1 B1 1 B2 1 D 1
+	git maintenance register &&
+	test_cmp_config false maintenance.auto &&
+	git config --global --get-all maintenance.repo >between &&
+	cp before expect &&
+	pwd >>expect &&
+	test_cmp expect between &&
 
-git annotate  -L6,-4 file 
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 48 - blame -L X,-N
+	git maintenance unregister &&
+	git config --global --get-all maintenance.repo >actual &&
+	test_cmp before actual &&
 
-expecting success of 8001.49 'blame -L /RE/ (RE to end)': 
-	check_count -L/evil/ C 1 "A U Thor" 1
+	git config --file ./other --add maintenance.repo /existing1 &&
+	git config --file ./other --add maintenance.repo /existing2 &&
+	git config --file ./other --get-all maintenance.repo >before &&
 
-git 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)
+	git maintenance register --config-file ./other &&
+	test_cmp_config false maintenance.auto &&
+	git config --file ./other --get-all maintenance.repo >between &&
+	cp before expect &&
+	pwd >>expect &&
+	test_cmp expect between &&
 
-expecting success of 8001.50 'blame -L /RE/,/RE2/': 
-	check_count -L/robot/,/green/ A 1 B 1 B2 1 D 1 E 1
+	git maintenance unregister --config-file ./other &&
+	git config --file ./other --get-all maintenance.repo >actual &&
+	test_cmp before actual &&
 
-git annotate  -L/robot/,/green/ file 
-Author E (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 50 - blame -L /RE/,/RE2/
+	test_must_fail git maintenance unregister 2>err &&
+	grep "is not registered" err &&
+	git maintenance unregister --force &&
 
-expecting success of 8001.51 'blame -L X,/RE/': 
-	check_count -L5,/evil/ B1 1 D 1 "A U Thor" 1
+	test_must_fail git maintenance unregister --config-file ./other 2>err &&
+	grep "is not registered" err &&
+	git maintenance unregister --config-file ./other --force
 
-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/
+fatal: repository '/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance' is not registered
+fatal: repository '/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance' is not registered
+fatal: repository '/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance' is not registered
+ok 27 - register and unregister
 
-expecting success of 8001.52 'blame -L /RE/,Y': 
-	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
+expecting success of 7900.28 'register with no value for maintenance.repo': 
+	cp .git/config .git/config.orig &&
+	test_when_finished mv .git/config.orig .git/config &&
 
-git annotate  -L/99/,7 file 
-Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 52 - blame -L /RE/,Y
+	cat >>.git/config <<-\EOF &&
+	[maintenance]
+		repo
+	EOF
+	cat >expect <<-\EOF &&
+	error: missing value for 'maintenance.repo'
+	EOF
+	git maintenance register 2>actual &&
+	test_cmp expect actual &&
+	git config maintenance.repo
 
-expecting success of 8001.53 'blame -L /RE/,+N': 
-	check_count -L/99/,+3 B1 1 D 1 "A U Thor" 1
 
-git annotate  -L/99/,+3 file 
-Author 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
+ok 28 - register with no value for maintenance.repo
 
-expecting success of 8001.54 'blame -L /RE/,-N': 
-	check_count -L/99/,-3 B 1 B2 1 D 1
+expecting success of 7900.29 'unregister with no value for maintenance.repo': 
+	cp .git/config .git/config.orig &&
+	test_when_finished mv .git/config.orig .git/config &&
 
-git annotate  -L/99/,-3 file 
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 54 - blame -L /RE/,-N
+	cat >>.git/config <<-\EOF &&
+	[maintenance]
+		repo
+	EOF
+	cat >expect <<-\EOF &&
+	error: missing value for 'maintenance.repo'
+	EOF
+	test_expect_code 128 git maintenance unregister 2>actual.raw &&
+	grep ^error actual.raw >actual &&
+	test_cmp expect actual &&
+	git config maintenance.repo &&
 
-expecting success of 8001.55 'blame -L X (X == nlines)': 
-	n=$(expr $(wc -l <file) + 1) &&
-	check_count -L$n C 1
+	git maintenance unregister --force 2>actual.raw &&
+	grep ^error actual.raw >actual &&
+	test_cmp expect actual &&
+	git config maintenance.repo
 
-git annotate  -L8 file 
-Author C (expected 1, attributed 1) good
-ok 55 - blame -L X (X == nlines)
 
-expecting success of 8001.56 'blame -L X (X == nlines + 1)': 
-	n=$(expr $(wc -l <file) + 2) &&
-	test_must_fail $PROG -L$n file
 
-fatal: file file has only 8 lines
-ok 56 - blame -L X (X == nlines + 1)
+ok 29 - unregister with no value for maintenance.repo
 
-expecting success of 8001.57 'blame -L X (X > nlines)': 
-	test_must_fail $PROG -L12345 file
+expecting success of 7900.30 'register and unregister with regex metacharacters': 
+	META="a+b*c" &&
+	git init "$META" &&
+	git -C "$META" maintenance register &&
+	git config --get-all --show-origin maintenance.repo &&
+	git config --get-all --global --fixed-value \
+		maintenance.repo "$(pwd)/$META" &&
+	git -C "$META" maintenance unregister &&
+	test_must_fail git config --get-all --global --fixed-value \
+		maintenance.repo "$(pwd)/$META"
 
-fatal: file file has only 8 lines
-ok 57 - blame -L X (X > nlines)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/a+b*c/.git/
+file:/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.gitconfig	/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
+file:/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.gitconfig	/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/a+b*c
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/a+b*c
+ok 30 - register and unregister with regex metacharacters
 
-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
+expecting success of 7900.31 'start --scheduler=<scheduler>': 
+	test_expect_code 129 git maintenance start --scheduler=foo 2>err &&
+	test_grep "unrecognized --scheduler argument" err &&
 
-git annotate  -L,8 file 
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B1 (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 58 - blame -L ,Y (Y == nlines)
+	test_expect_code 129 git maintenance start --no-scheduler 2>err &&
+	test_grep "unknown option" err &&
 
-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_expect_code 128 \
+		env GIT_TEST_MAINT_SCHEDULER="launchctl:true,schtasks:true" \
+		git maintenance start --scheduler=crontab 2>err &&
+	test_grep "fatal: crontab scheduler is not available" err
 
-git annotate  -L,9 file 
-Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 59 - blame -L ,Y (Y == nlines + 1)
+error: unrecognized --scheduler argument 'foo'
+error: unknown option `no-scheduler'
+fatal: crontab scheduler is not available
+ok 31 - start --scheduler=<scheduler>
 
-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
+expecting success of 7900.32 'start from empty cron table': 
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
 
-git annotate  -L,12345 file 
-Author B1 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 60 - blame -L ,Y (Y > nlines)
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
 
-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
+	grep "for-each-repo --config=maintenance.repo maintenance run --schedule=daily" cron.txt &&
+	grep "for-each-repo --config=maintenance.repo maintenance run --schedule=hourly" cron.txt &&
+	grep "for-each-repo --config=maintenance.repo maintenance run --schedule=weekly" cron.txt
 
-git annotate  -L2,3 -L6,7 file 
-Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 61 - blame -L multiple (disjoint)
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
+13 0 * * 1-6 "/build/reproducible-path/git-2.45.2/git" --exec-path="/build/reproducible-path/git-2.45.2" for-each-repo --config=maintenance.repo maintenance run --schedule=daily
+13 1-23 * * * "/build/reproducible-path/git-2.45.2/git" --exec-path="/build/reproducible-path/git-2.45.2" for-each-repo --config=maintenance.repo maintenance run --schedule=hourly
+13 0 * * 0 "/build/reproducible-path/git-2.45.2/git" --exec-path="/build/reproducible-path/git-2.45.2" for-each-repo --config=maintenance.repo maintenance run --schedule=weekly
+ok 32 - start from empty cron table
 
-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
+expecting success of 7900.33 'stop from existing schedule': 
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
 
-git annotate  -L6,7 -L2,3 file 
-Author B1 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 62 - blame -L multiple (disjoint: unordered)
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
 
-expecting success of 8001.63 'blame -L multiple (adjacent)': 
-	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
+	# Operation is idempotent
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+	test_must_be_empty cron.txt
 
-git annotate  -L2,3 -L4,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 63 - blame -L multiple (adjacent)
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
+ok 33 - stop from existing schedule
 
-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 7900.34 'start preserves existing schedule': 
+	echo "Important information!" >cron.txt &&
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start --scheduler=crontab &&
+	grep "Important information!" cron.txt
 
-git annotate  -L4,5 -L2,3 file 
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 64 - blame -L multiple (adjacent: unordered)
+Important information!
+ok 34 - start preserves existing schedule
 
-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 7900.35 'magic markers are correct': 
+	grep "GIT MAINTENANCE SCHEDULE" cron.txt >actual &&
+	cat >expect <<-\EOF &&
+	# BEGIN GIT MAINTENANCE SCHEDULE
+	# END GIT MAINTENANCE SCHEDULE
+	EOF
+	test_cmp actual expect
 
-git annotate  -L2,4 -L3,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 65 - blame -L multiple (overlapping)
+ok 35 - magic markers are correct
 
-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 7900.36 'stop preserves surrounding schedule': 
+	echo "Crucial information!" >>cron.txt &&
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+	grep "Important information!" cron.txt &&
+	grep "Crucial information!" cron.txt
 
-git annotate  -L3,5 -L2,4 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 66 - blame -L multiple (overlapping: unordered)
+Important information!
+Crucial information!
+ok 36 - stop preserves surrounding schedule
 
-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 7900.37 'start and stop macOS maintenance': 
+	# ensure $HOME can be compared against hook arguments on all platforms
+	pfx=$(cd "$HOME" && pwd) &&
 
-git annotate  -L2,8 -L3,5 file 
-Author A (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 B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-ok 67 - blame -L multiple (superset/subset)
+	write_script print-args <<-\EOF &&
+	echo $* | sed "s:gui/[0-9][0-9]*:gui/[UID]:" >>args
+	EOF
 
-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
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
 
-git annotate  -L3,5 -L2,8 file 
-Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-ok 68 - blame -L multiple (superset/subset: unordered)
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
 
-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
+	ls "$HOME/Library/LaunchAgents" >actual &&
+	cat >expect <<-\EOF &&
+	org.git-scm.git.daily.plist
+	org.git-scm.git.hourly.plist
+	org.git-scm.git.weekly.plist
+	EOF
+	test_cmp expect actual &&
 
-git annotate  -L3,3 -L/fox/ file 
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-ok 69 - blame -L /RE/ (relative)
+	rm -f expect &&
+	for frequency in hourly daily weekly
+	do
+		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
+		test_xmllint "$PLIST" &&
+		grep schedule=$frequency "$PLIST" &&
+		echo "bootout gui/[UID] $PLIST" >>expect &&
+		echo "bootstrap gui/[UID] $PLIST" >>expect || return 1
+	done &&
+	test_cmp expect args &&
 
-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
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance stop &&
 
-git annotate  -L/dog/ 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 B1 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-ok 70 - blame -L /RE/ (relative: no preceding range)
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
 
-expecting success of 8001.71 'blame -L /RE/ (relative: adjacent)': 
-	check_count -L1,1 -L/dog/,+1 A 1 E 1
+	printf "bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >expect &&
+	test_cmp expect args &&
+	ls "$HOME/Library/LaunchAgents" >actual &&
+	test_line_count = 0 actual
 
-git annotate  -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)
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
+checking prerequisite: XMLLINT
 
-expecting success of 8001.72 'blame -L /RE/ (relative: not found)': 
-	test_must_fail $PROG -L4,4 -L/dog/ file
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-XMLLINT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-XMLLINT" &&
+	xmllint --version
 
-fatal: -L parameter 'dog' starting at line 5: No match
-ok 72 - blame -L /RE/ (relative: not found)
+)
+xmllint: using libxml version 20914
+   compiled with: Threads Tree Output Push Reader Patterns Writer SAXv1 FTP HTTP DTDValid HTML Legacy C14N Catalog XPath XPointer XInclude Iconv ICU ISO8859X Unicode Regexps Automata Schemas Schematron Modules Debug Zlib Lzma 
+prerequisite XMLLINT ok
+<string>--schedule=hourly</string>
+<string>--schedule=daily</string>
+<string>--schedule=weekly</string>
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
+ok 37 - start and stop macOS maintenance
 
-expecting success of 8001.73 'blame -L /RE/ (relative: end-of-file)': 
-	test_must_fail $PROG -L, -L/$/ file
+expecting success of 7900.38 'use launchctl list to prevent extra work': 
+	# ensure we are registered
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
 
-fatal: file file has only 8 lines
-ok 73 - blame -L /RE/ (relative: end-of-file)
+	# do it again on a fresh args file
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start --scheduler=launchctl &&
 
-expecting success of 8001.74 'blame -L ^/RE/ (absolute)': 
-	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
+	ls "$HOME/Library/LaunchAgents" >actual &&
+	cat >expect <<-\EOF &&
+	list org.git-scm.git.hourly
+	list org.git-scm.git.daily
+	list org.git-scm.git.weekly
+	EOF
+	test_cmp expect args
 
-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)
+ok 38 - use launchctl list to prevent extra work
 
-expecting success of 8001.75 'blame -L ^/RE/ (absolute: no preceding range)': 
-	check_count -L^/dog/,+2 A 1 B2 1
+expecting success of 7900.39 'start and stop Windows maintenance': 
+	write_script print-args <<-\EOF &&
+	echo $* >>args
+	while test $# -gt 0
+	do
+		case "$1" in
+		/xml) shift; xmlfile=$1; break ;;
+		*) shift ;;
+		esac
+	done
+	test -z "$xmlfile" || cp "$xmlfile" "$xmlfile.xml"
+	EOF
 
-git annotate  -L^/dog/,+2 file 
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-ok 75 - blame -L ^/RE/ (absolute: no preceding range)
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start --scheduler=schtasks &&
 
-expecting success of 8001.76 'blame -L ^/RE/ (absolute: not found)': 
-	test_must_fail $PROG -L4,4 -L^/tambourine/ file
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
 
-fatal: -L parameter 'tambourine' starting at line 1: No match
-ok 76 - blame -L ^/RE/ (absolute: not found)
+	for frequency in hourly daily weekly
+	do
+		grep "/create /tn Git Maintenance ($frequency) /f /xml" args &&
+		file=$(ls .git/schedule_${frequency}*.xml) &&
+		test_xmllint "$file" || return 1
+	done &&
 
-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
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance stop &&
 
-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)
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
 
-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" &&
+	printf "/delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >expect &&
+	test_cmp expect args
 
-	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" &&
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
+/create /tn Git Maintenance (hourly) /f /xml /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.git/schedule_hourly_ab14Gk
+/create /tn Git Maintenance (daily) /f /xml /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.git/schedule_daily_8sP19H
+/create /tn Git Maintenance (weekly) /f /xml /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/.git/schedule_weekly_2KaGNn
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
+ok 39 - start and stop Windows maintenance
 
-	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");
-	}
+expecting success of 7900.40 'start and stop Linux/systemd maintenance': 
+	write_script print-args <<-\EOF &&
+	printf "%s\n" "$*" >>args
 	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
+	XDG_CONFIG_HOME="$PWD" &&
+	export XDG_CONFIG_HOME &&
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance start --scheduler=systemd-timer &&
 
-expecting success of 8001.79 'blame -L :literal': 
-	check_count -f hello.c -L:main F 4 G 1
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
 
-git annotate  -L:main hello.c 
-Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
-ok 79 - blame -L :literal
+	for schedule in hourly daily weekly
+	do
+		test_path_is_file "systemd/user/git-maintenance@$schedule.timer" || return 1
+	done &&
+	test_path_is_file "systemd/user/git-maintenance@.service" &&
 
-expecting success of 8001.80 'blame -L :regex': 
-	check_count -f hello.c "-L:m[a-z][a-z]l" H 4
+	test_systemd_analyze_verify "systemd/user/git-maintenance@hourly.service" &&
+	test_systemd_analyze_verify "systemd/user/git-maintenance@daily.service" &&
+	test_systemd_analyze_verify "systemd/user/git-maintenance@weekly.service" &&
 
-git annotate  -L:m[a-z][a-z]l hello.c 
-Author H (expected 4, attributed 4) good
-ok 80 - blame -L :regex
+	printf -- "--user enable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	test_cmp expect args &&
 
-expecting success of 8001.81 'blame -L :nomatch': 
-	test_must_fail $PROG -L:nomatch hello.c
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args" git maintenance stop &&
 
-fatal: -L parameter 'nomatch' starting at line 1: no match
-ok 81 - blame -L :nomatch
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
 
-expecting success of 8001.82 'blame -L :RE (relative)': 
-	check_count -f hello.c -L3,3 -L:ma.. F 1 H 4
+	for schedule in hourly daily weekly
+	do
+		test_path_is_missing "systemd/user/git-maintenance@$schedule.timer" || return 1
+	done &&
+	test_path_is_missing "systemd/user/git-maintenance@.service" &&
 
-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)
+	printf -- "--user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	test_cmp expect args
 
-expecting success of 8001.83 'blame -L :RE (relative: no preceding range)': 
-	check_count -f hello.c -L:ma.. F 4 G 1
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
+checking prerequisite: SYSTEMD_ANALYZE
 
-git annotate  -L:ma.. hello.c 
-Author G (expected 1, attributed 1) good
-Author F (expected 4, attributed 4) good
-ok 83 - blame -L :RE (relative: no preceding range)
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYSTEMD_ANALYZE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYSTEMD_ANALYZE" &&
+	systemd-analyze verify /lib/systemd/system/basic.target
 
-expecting success of 8001.84 'blame -L :RE (relative: not found)': 
-	test_must_fail $PROG -L3,3 -L:tambourine hello.c
+)
+./test-lib.sh: line 1056: systemd-analyze: command not found
+prerequisite SYSTEMD_ANALYZE not satisfied
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance
+ok 40 - start and stop Linux/systemd maintenance
 
-fatal: -L parameter 'tambourine' starting at line 4: no match
-ok 84 - blame -L :RE (relative: not found)
+expecting success of 7900.41 'start and stop when several schedulers are available': 
+	write_script print-args <<-\EOF &&
+	printf "%s\n" "$*" | sed "s:gui/[0-9][0-9]*:gui/[UID]:; s:\(schtasks /create .* /xml\).*:\1:;" >>args
+	EOF
 
-expecting success of 8001.85 'blame -L :RE (relative: end-of-file)': 
-	test_must_fail $PROG -L, -L:main hello.c
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=systemd-timer &&
+	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >expect &&
+	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >>expect &&
+	printf -- "systemctl --user enable --now git-maintenance@%s.timer\n" hourly daily weekly >>expect &&
+	test_cmp expect args &&
 
-fatal: -L parameter 'main' starting at line 11: no match
-ok 85 - blame -L :RE (relative: end-of-file)
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=launchctl &&
+	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >>expect &&
+	for frequency in hourly daily weekly
+	do
+		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
+		echo "launchctl bootout gui/[UID] $PLIST" >>expect &&
+		echo "launchctl bootstrap gui/[UID] $PLIST" >>expect || return 1
+	done &&
+	test_cmp expect args &&
 
-expecting success of 8001.86 'blame -L ^:RE (absolute)': 
-	check_count -f hello.c -L3,3 -L^:ma.. F 4 G 1
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance start --scheduler=schtasks &&
+	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >>expect &&
+	printf "schtasks /create /tn Git Maintenance (%s) /f /xml\n" \
+		hourly daily weekly >>expect &&
+	test_cmp expect args &&
 
-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)
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="systemctl:./print-args systemctl,launchctl:./print-args launchctl,schtasks:./print-args schtasks" git maintenance stop &&
+	printf -- "systemctl --user disable --now git-maintenance@%s.timer\n" hourly daily weekly >expect &&
+	printf "launchctl bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >>expect &&
+	printf "schtasks /delete /tn Git Maintenance (%s) /f\n" \
+		hourly daily weekly >>expect &&
+	test_cmp expect args
 
-expecting success of 8001.87 'blame -L ^:RE (absolute: no preceding range)': 
-	check_count -f hello.c -L^:ma.. F 4 G 1
+ok 41 - start and stop when several schedulers are available
 
-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 7900.42 'register preserves existing strategy': 
+	git config maintenance.strategy none &&
+	git maintenance register &&
+	test_config maintenance.strategy none &&
+	git config --unset maintenance.strategy &&
+	git maintenance register &&
+	test_config maintenance.strategy incremental
 
-expecting success of 8001.88 'blame -L ^:RE (absolute: not found)': 
-	test_must_fail $PROG -L4,4 -L^:tambourine hello.c
+ok 42 - register preserves existing strategy
 
-fatal: -L parameter 'tambourine' starting at line 1: no match
-ok 88 - blame -L ^:RE (absolute: not found)
+expecting success of 7900.43 'fails when running outside of a repository': 
+	nongit test_must_fail git maintenance run &&
+	nongit test_must_fail git maintenance stop &&
+	nongit test_must_fail git maintenance start &&
+	nongit test_must_fail git maintenance register &&
+	nongit test_must_fail git maintenance unregister
 
-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
+fatal: not a git repository (or any of the parent directories): .git
+fatal: not a git repository (or any of the parent directories): .git
+fatal: not a git repository (or any of the parent directories): .git
+fatal: not a git repository (or any of the parent directories): .git
+fatal: not a git repository (or any of the parent directories): .git
+ok 43 - fails when running outside of a repository
 
-git annotate  -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 7900.44 'register and unregister bare repo': 
+	test_when_finished "git config --global --unset-all maintenance.repo || :" &&
+	test_might_fail git config --global --unset-all maintenance.repo &&
+	git init --bare barerepo &&
+	(
+		cd barerepo &&
+		git maintenance register &&
+		git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+		git maintenance unregister &&
+		test_must_fail git config --global --get-all maintenance.repo
+	)
 
-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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/barerepo/
+/build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/barerepo
+ok 44 - register and unregister bare repo
 
-	integer, intent(in) :: ChangeMe
-	EOF
+expecting success of 7900.45 'failed schedule prevents config change': 
+	git init --bare failcase &&
 
-	fortran_file=file.f03 &&
-	test_when_finished "rm .gitattributes" &&
-	echo "$fortran_file diff=fortran" >.gitattributes &&
+	for scheduler in crontab launchctl schtasks systemctl
+	do
+		GIT_TEST_MAINT_SCHEDULER="$scheduler:false" &&
+		export GIT_TEST_MAINT_SCHEDULER &&
+		test_must_fail \
+			git -C failcase maintenance start &&
+		test_must_fail git -C failcase config maintenance.auto || return 1
+	done
 
-	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
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7900-maintenance/failcase/
+error: 'crontab' died
+fatal: failed to set up maintenance schedule
+fatal: neither systemd timers nor crontab are available
+fatal: neither systemd timers nor crontab are available
+error: failed to run systemctl
+fatal: failed to set up maintenance schedule
+ok 45 - failed schedule prevents config change
 
-[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
+# passed all 45 test(s)
+1..45
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t8006-blame-textconv.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
 
-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 prerequisite: SYMLINKS
 
-[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
+mkdir -p "$TRASH_DIRECTORY/prereq-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.92 'blame empty': 
-	check_count -h HEAD^^ -f incremental
+)
+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 
 
-git annotate  incremental HEAD^^
-ok 92 - blame empty
+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 8001.93 'blame -L 0 empty': 
-	test_must_fail $PROG -L0 incremental HEAD^^
+ok 2 - no filter specified
 
-fatal: -L invalid line number: 0
-ok 93 - blame -L 0 empty
+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 8001.94 'blame -L 1 empty': 
-	test_must_fail $PROG -L1 incremental HEAD^^
+ok 3 - setup textconv filters
 
-fatal: file incremental has only 0 lines
-ok 94 - blame -L 1 empty
+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 8001.95 'blame -L 2 empty': 
-	test_must_fail $PROG -L2 incremental HEAD^^
+ok 4 - blame with --no-textconv
 
-fatal: file incremental has only 0 lines
-ok 95 - blame -L 2 empty
+expecting success of 8006.5 'basic blame on last commit': 
+	git blame one.bin >blame &&
+	find_blame  <blame >result &&
+	test_cmp expected result
 
-expecting success of 8001.96 'blame half': 
-	check_count -h HEAD^ -f incremental I 1
+ok 5 - basic blame on last commit
 
-git annotate  incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 96 - blame half
+expecting success of 8006.6 'blame --textconv going through revisions': 
+	git blame --textconv two.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
 
-expecting success of 8001.97 'blame -L 0 half': 
-	test_must_fail $PROG -L0 incremental HEAD^
+ok 6 - blame --textconv going through revisions
 
-fatal: -L invalid line number: 0
-ok 97 - blame -L 0 half
+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 8001.98 'blame -L 1 half': 
-	check_count -h HEAD^ -f incremental -L1 I 1
+75
+Updated 1 path from the index
+ok 7 - blame --textconv with local changes
 
-git annotate  -L1 incremental HEAD^
-Author I (expected 1, attributed 1) good
-ok 98 - blame -L 1 half
+expecting success of 8006.8 'setup +cachetextconv': 
+	git config diff.test.cachetextconv true
 
-expecting success of 8001.99 'blame -L 2 half': 
-	test_must_fail $PROG -L2 incremental HEAD^
+ok 8 - setup +cachetextconv
 
-fatal: file incremental has only 1 line
-ok 99 - blame -L 2 half
+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
 
-expecting success of 8001.100 'blame -L 3 half': 
-	test_must_fail $PROG -L3 incremental HEAD^
+ok 9 - blame --textconv works with textconvcache
 
-fatal: file incremental has only 1 line
-ok 100 - blame -L 3 half
+expecting success of 8006.10 'setup -cachetextconv': 
+	git config diff.test.cachetextconv false
 
-expecting success of 8001.101 'blame full': 
-	check_count -f incremental I 1
+ok 10 - setup -cachetextconv
 
-git annotate  incremental 
-Author I (expected 1, attributed 1) good
-ok 101 - blame full
+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"
 
-expecting success of 8001.102 'blame -L 0 full': 
-	test_must_fail $PROG -L0 incremental
+[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
 
-fatal: -L invalid line number: 0
-ok 102 - blame -L 0 full
+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 8001.103 'blame -L 1 full': 
-	check_count -f incremental -L1 I 1
+ok 12 - blame from previous revision
 
-git annotate  -L1 incremental 
-Author I (expected 1, attributed 1) good
-ok 103 - blame -L 1 full
+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
 
-expecting success of 8001.104 'blame -L 2 full': 
-	test_must_fail $PROG -L2 incremental
+ok 13 - blame with --no-textconv (on symlink)
 
-fatal: file incremental has only 1 line
-ok 104 - blame -L 2 full
+expecting success of 8006.14 'blame --textconv (on symlink)': 
+	git blame --textconv symlink.bin >blame &&
+	find_blame <blame >result &&
+	test_cmp expected result
 
-expecting success of 8001.105 'blame -L 3 full': 
-	test_must_fail $PROG -L3 incremental
+ok 14 - blame --textconv (on symlink)
 
-fatal: file incremental has only 1 line
-ok 105 - blame -L 3 full
+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 8001.106 'blame -L': 
-	test_must_fail $PROG -L file
+[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
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
+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
 
-    <rev-opts> are documented in git-rev-list(1)
+ok 16 - blame on last commit (-C -C, symlink)
 
-    --[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
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t8008-blame-formats.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8008-blame-formats/.git/
+expecting success of 8008.1 'setup': 
+	echo a >file &&
+	git add file &&
+	test_tick &&
+	git commit -m one &&
+	echo b >>file &&
+	echo c >>file &&
+	echo d >>file &&
+	test_tick &&
+	git commit -a -m two &&
+	ID1=$(git rev-parse HEAD^) &&
+	shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" &&
+	ID2=$(git rev-parse HEAD) &&
+	shortID2="$(git rev-parse HEAD |cut -c 1-18)"
 
-ok 106 - blame -L
+[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 8001.107 'blame -L X,+': 
-	test_must_fail $PROG -L1,+ file
+expecting success of 8008.2 'normal blame output': 
+	git blame --abbrev=17 file >actual &&
+	test_cmp expect actual
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 107 - blame -L X,+
+ok 2 - normal blame output
 
-expecting success of 8001.108 'blame -L X,-': 
-	test_must_fail $PROG -L1,- file
+expecting success of 8008.3 'blame --porcelain output': 
+	git blame --porcelain file >actual &&
+	test_cmp expect actual
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 108 - blame -L X,-
+ok 3 - blame --porcelain output
 
-expecting success of 8001.109 'blame -L X (non-numeric X)': 
-	test_must_fail $PROG -LX file
+expecting success of 8008.4 'blame --line-porcelain output': 
+	git blame --line-porcelain file >actual &&
+	test_cmp expect actual
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 109 - blame -L X (non-numeric X)
+ok 4 - blame --line-porcelain output
 
-expecting success of 8001.110 'blame -L X,Y (non-numeric Y)': 
-	test_must_fail $PROG -L1,Y file
+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
+	)
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 110 - blame -L X,Y (non-numeric Y)
+summary oneline
+ok 5 - --porcelain detects first non-blank line as subject
 
-expecting success of 8001.111 'blame -L X,+N (non-numeric N)': 
-	test_must_fail $PROG -L1,+N file
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t8010-cat-file-filters.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8010-cat-file-filters/.git/
+expecting success of 8010.1 'setup ': 
+	echo "*.txt eol=crlf diff=txt" >.gitattributes &&
+	echo "hello" | append_cr >world.txt &&
+	git add .gitattributes world.txt &&
+	test_tick &&
+	git commit -m "Initial commit"
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 111 - blame -L X,+N (non-numeric N)
+[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 8001.112 'blame -L X,-N (non-numeric N)': 
-	test_must_fail $PROG -L1,-N file
+expecting success of 8010.2 'no filters with `git show`': 
+	git show HEAD:world.txt >actual &&
+	! has_cr actual
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 112 - blame -L X,-N (non-numeric N)
 
-expecting success of 8001.113 'blame -L ,^/RE/': 
-	test_must_fail $PROG -L1,^/99/ file
+ok 2 - no filters with `git show`
 
-usage: git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>
-ok 113 - blame -L ,^/RE/
+expecting success of 8010.3 'no filters with cat-file': 
+	git cat-file blob HEAD:world.txt >actual &&
+	! has_cr actual
 
-expecting success of 8001.114 'blame progress on a full file': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (10/10), done.
-	EOF
+ok 3 - no filters with cat-file
 
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress hello.c 2>stderr &&
+expecting success of 8010.4 'cat-file --filters converts to worktree version': 
+	git cat-file --filters HEAD:world.txt >actual &&
+	has_cr actual
 
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
+ok 4 - cat-file --filters converts to worktree version
 
-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 8010.5 'cat-file --filters --path=<path> works': 
+	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
+	git cat-file --filters --path=world.txt $sha1 >actual &&
+	has_cr actual
 
-expecting success of 8001.115 'blame progress on a single range': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (4/4), done.
-	EOF
+ok 5 - cat-file --filters --path=<path> works
 
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress -L 3,6 hello.c 2>stderr &&
+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)"
 
-	get_progress_result <stderr >actual &&
-	test_cmp expect actual
+ok 6 - cat-file --textconv --path=<path> works
 
-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 8010.7 '--path=<path> complains without --textconv/--filters': 
+	sha1=$(git rev-parse -q --verify HEAD:world.txt) &&
+	test_must_fail git cat-file --path=hello.txt blob $sha1 >actual 2>err &&
+	test_must_be_empty actual &&
+	grep "path.*needs.*filters" err
 
-expecting success of 8001.116 'blame progress on multiple ranges': 
-	cat >expect <<-\EOF &&
-	Blaming lines: 100% (7/7), done.
-	EOF
+fatal: '--path=<path|tree-ish>' needs '--filters' or '--textconv'
+ok 7 - --path=<path> complains without --textconv/--filters
 
-	GIT_PROGRESS_DELAY=0 \
-	git blame --progress -L 3,6 -L 8,10 hello.c 2>stderr &&
+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
 
-	get_progress_result <stderr >actual &&
+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
 
-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
+ok 9 - cat-file --textconv --batch works
 
-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)
+# passed all 9 test(s)
+1..9
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t8009-blame-vs-topicbranches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8009-blame-vs-topicbranches/.git/
+expecting success of 8009.1 'setup': 
+	test_commit A0 file.t line0 &&
+	test_commit A1 &&
+	git reset --hard A0 &&
+	test_commit B1 &&
+	test_commit B2 file.t line0changed &&
+	git reset --hard A1 &&
+	test_merge A2 B2 &&
+	git reset --hard A1 &&
+	test_commit C1 &&
+	git reset --hard A2 &&
+	test_merge A3 C1
+	
+[master (root-commit) 2152206] A0
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.t
+[master 5392e14] A1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A1.t
+HEAD is now at 2152206 A0
+[master 15a8c72] B1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B1.t
+[master e1433f5] B2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+HEAD is now at 5392e14 A1
+Merge made by the 'ort' strategy.
+ B1.t   | 1 +
+ file.t | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 B1.t
+HEAD is now at 5392e14 A1
+[master fa266ba] C1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C1.t
+HEAD is now at 6e3b304 A2
+Merge made by the 'ort' strategy.
+ C1.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C1.t
+ok 1 - setup
 
-ok 117 - annotate old revision
+expecting success of 8009.2 'blame --reverse --first-parent finds A1': 
+	git blame --porcelain --reverse --first-parent A0..A3 -- file.t >actual_full &&
+	head -n 1 <actual_full | sed -e "s/ .*//" >actual &&
+	git rev-parse A1 >expect &&
+	test_cmp expect actual
+	
+ok 2 - blame --reverse --first-parent finds A1
 
-# passed all 117 test(s)
-1..117
+# passed all 2 test(s)
+1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t8002-blame.sh ***
@@ -497821,8 +497057,8 @@
 	check_count A 1 "Not Committed Yet" 1
 
 git blame -c  file 
-Author A (expected 1, attributed 1) good
 Author Not Committed Yet (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 3 - blame working copy
 
 expecting success of 8002.4 'blame with --contents': 
@@ -497852,8 +497088,8 @@
 	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
+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': 
@@ -497901,16 +497137,16 @@
 	check_count A 2 B 2
 
 git blame -c  file 
-Author A (expected 2, attributed 2) good
 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 External file (--contents) (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author External file (--contents) (expected 2, attributed 2) good
 ok 11 - blame with --contents and revision
 
 expecting success of 8002.12 'setup B1 lines (branch1)': 
@@ -497930,9 +497166,9 @@
 	check_count A 2 B 2 B1 2
 
 git blame -c  file 
-Author A (expected 2, attributed 2) good
-Author B (expected 2, attributed 2) good
 Author B1 (expected 2, attributed 2) good
+Author B (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
 ok 13 - blame 2 authors + 1 branch1 author
 
 expecting success of 8002.14 'setup B2 lines (branch2)': 
@@ -497971,8 +497207,8 @@
 
 git blame -c  file 
 Author A (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 2, attributed 2) good
 ok 17 - blame 2 authors + 2 merged-in authors
 
@@ -497980,10 +497216,10 @@
 	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 A U Thor (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
 ok 18 - blame --first-parent blames merge for branch1
 
 expecting success of 8002.19 'blame ancestor': 
@@ -498014,11 +497250,11 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
 git blame -c  file 
+Author B1 (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author A U Thor (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author B1 (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 ok 22 - blame evil merge
 
 expecting success of 8002.23 'blame huge graft': 
@@ -498201,8 +497437,8 @@
 hint:
 hint: Turn this message off by running
 hint: "git config advice.graftFileDeprecated false"
-Author 01 (expected 1, attributed 1) good
 Author 10 (expected 1, attributed 1) good
+Author 01 (expected 1, attributed 1) good
 Switched to branch 'branch2'
 ok 23 - blame huge graft
 
@@ -498220,12 +497456,12 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1 C 1
 
 git blame -c  file 
-Author A (expected 2, attributed 2) good
-Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
 Author B1 (expected 2, attributed 2) good
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 25 - blame incomplete line
 
 expecting success of 8002.26 'setup edits': 
@@ -498247,13 +497483,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 B2 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 27 - blame edits
 
 expecting success of 8002.28 'setup obfuscated email': 
@@ -498272,42 +497508,42 @@
 	check_count A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  file 
-Author D (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
-Author E (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author D (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 B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B1 (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
 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 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
 Author E (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 A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 31 - blame -L , (all)
 
 expecting success of 8002.32 'blame -L X (X to end)': 
@@ -498315,8 +497551,8 @@
 
 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 B1 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
 ok 32 - blame -L X (X to end)
 
@@ -498324,10 +497560,10 @@
 	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L5, file 
-Author A U Thor (expected 1, attributed 1) good
+Author B1 (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 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)': 
@@ -498350,18 +497586,18 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,6 file 
-Author B (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (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 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
 ok 37 - blame -L Y,X (undocumented)
@@ -498407,10 +497643,10 @@
 	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,+4 file 
-Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 44 - blame -L X,+N
 
 expecting success of 8002.45 'blame -L ,-0': 
@@ -498436,10 +497672,10 @@
 	check_count -L6,-4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,-4 file 
-Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author 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)': 
@@ -498465,8 +497701,8 @@
 	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 A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 ok 51 - blame -L X,/RE/
 
@@ -498474,9 +497710,9 @@
 	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 B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 52 - blame -L /RE/,Y
 
 expecting success of 8002.53 'blame -L /RE/,+N': 
@@ -498484,17 +497720,17 @@
 
 git blame -c  -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
+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 B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 ok 54 - blame -L /RE/,-N
 
 expecting success of 8002.55 'blame -L X (X == nlines)': 
@@ -498523,14 +497759,14 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L,8 file 
-Author B (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 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 58 - blame -L ,Y (Y == nlines)
 
 expecting success of 8002.59 'blame -L ,Y (Y == nlines + 1)': 
@@ -498541,25 +497777,25 @@
 Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B (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 A (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 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
+Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
 ok 60 - blame -L ,Y (Y > nlines)
 
 expecting success of 8002.61 'blame -L multiple (disjoint)': 
@@ -498567,38 +497803,38 @@
 
 git blame -c  -L2,3 -L6,7 file 
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 ok 61 - blame -L multiple (disjoint)
 
 expecting success of 8002.62 'blame -L multiple (disjoint: unordered)': 
 	check_count -L6,7 -L2,3 A 1 B1 1 B2 1 "A U Thor" 1
 
 git blame -c  -L6,7 -L2,3 file 
-Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author A U Thor (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 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 D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author A (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 B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
 ok 64 - blame -L multiple (adjacent: unordered)
 
@@ -498606,70 +497842,70 @@
 	check_count -L2,4 -L3,5 A 1 B 1 B2 1 D 1
 
 git blame -c  -L2,4 -L3,5 file 
-Author B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 65 - blame -L multiple (overlapping)
 
 expecting success of 8002.66 'blame -L multiple (overlapping: unordered)': 
 	check_count -L3,5 -L2,4 A 1 B 1 B2 1 D 1
 
 git blame -c  -L3,5 -L2,4 file 
+Author 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 B2 (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 B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author C (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 D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author A (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 C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 69 - blame -L /RE/ (relative)
 
 expecting success of 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 C (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 Author B2 (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 70 - blame -L /RE/ (relative: no preceding range)
 
 expecting success of 8002.71 'blame -L /RE/ (relative: adjacent)': 
@@ -498769,8 +498005,8 @@
 	check_count -f hello.c -L:main F 4 G 1
 
 git blame -c  -L:main hello.c 
-Author F (expected 4, attributed 4) good
 Author G (expected 1, attributed 1) good
+Author F (expected 4, attributed 4) good
 ok 79 - blame -L :literal
 
 expecting success of 8002.80 'blame -L :regex': 
@@ -498790,16 +498026,16 @@
 	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 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
+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)': 
@@ -498818,16 +498054,16 @@
 	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
+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
+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)': 
@@ -498841,9 +498077,9 @@
 	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
 
 git blame -c  -L10 -L^:ma.. hello.c 
-Author G (expected 1, attributed 1) good
 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': 
@@ -499161,14 +498397,14 @@
 		"<E at test dot git>" 1
 
 git blame -c -e  file 
-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 <D@test.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 <E at test dot git> (expected 1, attributed 1) good
-Author <B1@test.git> (expected 1, attributed 1) good
+Author <B2@test.git> (expected 1, attributed 1) good
 Author <A@test.git> (expected 1, attributed 1) good
+Author <C@test.git> (expected 1, attributed 1) good
+Author <B@test.git> (expected 1, attributed 1) good
 ok 119 - blame --show-email
 
 expecting success of 8002.120 'setup showEmail tests': 
@@ -499340,13 +498576,169 @@
 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-12-18 01:39:32 +0000 2) bar
+00000000 (Not Committed Yet 2024-11-14 19:45:07 +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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t8011-blame-split-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8011-blame-split-file/.git/
+expecting success of 8011.1 'setup split file case': 
+	# use lines long enough to trigger content detection
+	test_seq 1000 1010 >one &&
+	test_seq 2000 2010 >two &&
+	git add one two &&
+	test_commit base &&
+
+	sed "6s/^/modified /" <one >one.tmp &&
+	mv one.tmp one &&
+	sed "6s/^/modified /" <two >two.tmp &&
+	mv two.tmp two &&
+	git add -u &&
+	test_commit modified &&
+
+	cat one two >combined &&
+	git add combined &&
+	git rm one two &&
+	test_commit combined
+
+[master (root-commit) ad6b874] base
+ Author: A U Thor <author@example.com>
+ 3 files changed, 23 insertions(+)
+ create mode 100644 base.t
+ create mode 100644 one
+ create mode 100644 two
+[master 9b55153] modified
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 modified.t
+rm 'one'
+rm 'two'
+[master cc1b823] combined
+ Author: A U Thor <author@example.com>
+ 3 files changed, 12 insertions(+), 11 deletions(-)
+ rename one => combined (50%)
+ create mode 100644 combined.t
+ delete mode 100644 two
+ok 1 - setup split file case
+
+expecting success of 8011.2 'setup simulated porcelain': 
+	# This just reads porcelain-ish output and tries
+	# to output the value of a given field for each line (either by
+	# reading the field that accompanies this line, or referencing
+	# the information found last time the commit was mentioned).
+	cat >read-porcelain.pl <<-\EOF
+	my $field = shift;
+	while (<>) {
+		if (/^[0-9a-f]{40,} /) {
+			flush();
+			$hash = $&;
+		} elsif (/^$field (.*)/) {
+			$cache{$hash} = $1;
+		}
+	}
+	flush();
+
+	sub flush {
+		return unless defined $hash;
+		if (defined $cache{$hash}) {
+			print "$cache{$hash}\n";
+		} else {
+			print "NONE\n";
+		}
+	}
+	EOF
+
+ok 2 - setup simulated porcelain
+
+expecting success of 8011.3 'generate --porcelain output': 
+		git blame --root -C --$output combined >output
+	
+ok 3 - generate --porcelain output
+
+expecting success of 8011.4 'porcelain output finds correct commits': 
+		generate_expect >expect <<-\EOF &&
+		5 base
+		1 modified
+		10 base
+		1 modified
+		5 base
+		EOF
+		perl read-porcelain.pl summary <output >actual &&
+		test_cmp expect actual
+	
+ok 4 - porcelain output finds correct commits
+
+expecting success of 8011.5 'porcelain output shows correct filenames': 
+		generate_expect >expect <<-\EOF &&
+		11 one
+		11 two
+		EOF
+		perl read-porcelain.pl filename <output >actual &&
+		test_cmp expect actual
+	
+ok 5 - porcelain output shows correct filenames
+
+expecting success of 8011.6 'porcelain output shows correct previous pointer': 
+		generate_expect >expect <<-EOF &&
+		5 NONE
+		1 $(git rev-parse modified^) one
+		10 NONE
+		1 $(git rev-parse modified^) two
+		5 NONE
+		EOF
+		perl read-porcelain.pl previous <output >actual &&
+		test_cmp expect actual
+	
+ok 6 - porcelain output shows correct previous pointer
+
+expecting success of 8011.7 'generate --line-porcelain output': 
+		git blame --root -C --$output combined >output
+	
+ok 7 - generate --line-porcelain output
+
+expecting success of 8011.8 'line-porcelain output finds correct commits': 
+		generate_expect >expect <<-\EOF &&
+		5 base
+		1 modified
+		10 base
+		1 modified
+		5 base
+		EOF
+		perl read-porcelain.pl summary <output >actual &&
+		test_cmp expect actual
+	
+ok 8 - line-porcelain output finds correct commits
+
+expecting success of 8011.9 'line-porcelain output shows correct filenames': 
+		generate_expect >expect <<-\EOF &&
+		11 one
+		11 two
+		EOF
+		perl read-porcelain.pl filename <output >actual &&
+		test_cmp expect actual
+	
+ok 9 - line-porcelain output shows correct filenames
+
+expecting success of 8011.10 'line-porcelain output shows correct previous pointer': 
+		generate_expect >expect <<-EOF &&
+		5 NONE
+		1 $(git rev-parse modified^) one
+		10 NONE
+		1 $(git rev-parse modified^) two
+		5 NONE
+		EOF
+		perl read-porcelain.pl previous <output >actual &&
+		test_cmp expect actual
+	
+ok 10 - line-porcelain output shows correct previous pointer
+
+# passed all 10 test(s)
+1..10
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t8013-blame-ignore-revs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8013-blame-ignore-revs/.git/
 expecting success of 8013.1 'setup': 
@@ -499546,13 +498938,13 @@
 [master d1e4550] Z
  Author: A U Thor <author@example.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
---- expect	2025-12-18 01:39:31.746773267 +0000
-+++ actual	2025-12-18 01:39:31.802773267 +0000
+--- expect	2024-11-14 19:45:08.671276784 +0000
++++ actual	2024-11-14 19:45:08.727277359 +0000
 @@ -1 +1 @@
 -?
 +e
---- expect	2025-12-18 01:39:31.746773267 +0000
-+++ actual	2025-12-18 01:39:31.826773267 +0000
+--- expect	2024-11-14 19:45:08.671276784 +0000
++++ actual	2024-11-14 19:45:08.755277646 +0000
 @@ -1 +1 @@
 -?
 +e
@@ -499873,17 +499265,6 @@
 1..16
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9004-example.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9004-example/.git/
-expecting success of 9004.1 'decorate': 
-	test-tool example-decorate
-
-ok 1 - decorate
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9003-help-autocorrect.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9003-help-autocorrect/.git/
 expecting success of 9003.1 'setup': 
@@ -499989,6 +499370,476 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t8014-blame-ignore-fuzzy.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9004-example.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9004-example/.git/
+expecting success of 9004.1 'decorate': 
+	test-tool example-decorate
+
+ok 1 - decorate
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t8012-blame-colors.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t8012-blame-colors/.git/
 expecting success of 8012.1 'setup A lines': 
@@ -500098,16 +499949,16 @@
 	check_count A 2 B 2
 
 git blame -c  file 
-Author A (expected 2, attributed 2) good
 Author B (expected 2, attributed 2) good
+Author A (expected 2, attributed 2) good
 ok 10 - blame 2 authors
 
 expecting success of 8012.11 'blame with --contents and revision': 
 	check_count -h testTag --contents=file A 2 "External file (--contents)" 2
 
 git blame -c  --contents=file file testTag
-Author External file (--contents) (expected 2, attributed 2) good
 Author A (expected 2, attributed 2) good
+Author External file (--contents) (expected 2, attributed 2) good
 ok 11 - blame with --contents and revision
 
 expecting success of 8012.12 'setup B1 lines (branch1)': 
@@ -500149,9 +500000,9 @@
 	check_count A 2 B 1 B2 1
 
 git blame -c  file 
-Author B2 (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 15 - blame 2 authors + 1 branch2 author
 
 expecting success of 8012.16 'merge branch1 & branch2': 
@@ -500177,10 +500028,10 @@
 	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 B2 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 Author A U Thor (expected 2, attributed 2) good
+Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author A (expected 2, attributed 2) good
 ok 18 - blame --first-parent blames merge for branch1
 
 expecting success of 8012.19 'blame ancestor': 
@@ -500211,11 +500062,11 @@
 	check_count A 2 B 1 B1 2 B2 1 "A U Thor" 1
 
 git blame -c  file 
+Author B1 (expected 2, attributed 2) good
+Author B2 (expected 1, attributed 1) good
 Author 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 22 - blame evil merge
 
 expecting success of 8012.23 'blame huge graft': 
@@ -500398,8 +500249,8 @@
 hint:
 hint: Turn this message off by running
 hint: "git config advice.graftFileDeprecated false"
-Author 01 (expected 1, attributed 1) good
 Author 10 (expected 1, attributed 1) good
+Author 01 (expected 1, attributed 1) good
 Switched to branch 'branch2'
 ok 23 - blame huge graft
 
@@ -500417,12 +500268,12 @@
 	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 B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author B1 (expected 2, attributed 2) good
 Author A U Thor (expected 1, attributed 1) good
 Author A (expected 2, attributed 2) good
-Author C (expected 1, attributed 1) good
 ok 25 - blame incomplete line
 
 expecting success of 8012.26 'setup edits': 
@@ -500444,12 +500295,12 @@
 	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 D (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 ok 27 - blame edits
 
@@ -500469,50 +500320,50 @@
 	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 E (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
 Author B2 (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 D (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 29 - blame obfuscated email
 
 expecting success of 8012.30 'blame -L 1 (all)': 
 	check_count -L1 A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L1 file 
-Author A U Thor (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 B (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 30 - blame -L 1 (all)
 
 expecting success of 8012.31 'blame -L , (all)': 
 	check_count -L, A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L, file 
-Author A U Thor (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author E (expected 1, attributed 1) good
+Author A (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 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
 Author C (expected 1, attributed 1) good
 ok 32 - blame -L X (X to end)
@@ -500521,18 +500372,18 @@
 	check_count -L5, B1 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L5, file 
+Author D (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 ok 33 - blame -L X, (X to end)
 
 expecting success of 8012.34 'blame -L ,Y (up to Y)': 
 	check_count -L,3 A 1 B2 1 E 1
 
 git blame -c  -L,3 file 
-Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 ok 34 - blame -L ,Y (up to Y)
 
@@ -500547,9 +500398,9 @@
 	check_count -L3,6 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,6 file 
+Author D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
 ok 36 - blame -L X,Y
 
@@ -500557,8 +500408,8 @@
 	check_count -L6,3 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,3 file 
-Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 ok 37 - blame -L Y,X (undocumented)
@@ -500604,10 +500455,10 @@
 	check_count -L3,+4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L3,+4 file 
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 ok 44 - blame -L X,+N
 
 expecting success of 8012.45 'blame -L ,-0': 
@@ -500633,18 +500484,18 @@
 	check_count -L6,-4 B 1 B1 1 B2 1 D 1
 
 git blame -c  -L6,-4 file 
-Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 48 - blame -L X,-N
 
 expecting success of 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 C (expected 1, attributed 1) good
 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 8012.50 'blame -L /RE/,/RE2/': 
@@ -500652,9 +500503,9 @@
 
 git blame -c  -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 D (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 ok 50 - blame -L /RE/,/RE2/
 
@@ -500663,16 +500514,16 @@
 
 git blame -c  -L5,/evil/ file 
 Author A U Thor (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 51 - blame -L X,/RE/
 
 expecting success of 8012.52 'blame -L /RE/,Y': 
 	check_count -L/99/,7 B1 1 D 1 "A U Thor" 1
 
 git blame -c  -L/99/,7 file 
-Author 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
 
@@ -500721,13 +500572,13 @@
 
 git blame -c  -L,8 file 
 Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author E (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
 Author A U Thor (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 B1 (expected 1, attributed 1) good
 ok 58 - blame -L ,Y (Y == nlines)
 
 expecting success of 8012.59 'blame -L ,Y (Y == nlines + 1)': 
@@ -500735,14 +500586,14 @@
 	check_count -L,$n A 1 B 1 B1 1 B2 1 "A U Thor" 1 C 1 D 1 E 1
 
 git blame -c  -L,9 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
+Author E (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 E (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 ok 59 - blame -L ,Y (Y == nlines + 1)
 
 expecting success of 8012.60 'blame -L ,Y (Y > nlines)': 
@@ -500751,62 +500602,62 @@
 git blame -c  -L,12345 file 
 Author B1 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 60 - blame -L ,Y (Y > nlines)
 
 expecting success of 8012.61 'blame -L multiple (disjoint)': 
 	check_count -L2,3 -L6,7 A 1 B1 1 B2 1 "A U Thor" 1
 
 git blame -c  -L2,3 -L6,7 file 
+Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
-Author A (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 A U Thor (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
 ok 62 - blame -L multiple (disjoint: unordered)
 
 expecting success of 8012.63 'blame -L multiple (adjacent)': 
 	check_count -L2,3 -L4,5 A 1 B 1 B2 1 D 1
 
 git blame -c  -L2,3 -L4,5 file 
-Author A (expected 1, attributed 1) good
-Author 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 A (expected 1, attributed 1) good
 ok 63 - blame -L multiple (adjacent)
 
 expecting success of 8012.64 'blame -L multiple (adjacent: unordered)': 
 	check_count -L4,5 -L2,3 A 1 B 1 B2 1 D 1
 
 git blame -c  -L4,5 -L2,3 file 
-Author D (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
-Author A (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 B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 Author B (expected 1, attributed 1) good
 Author D (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 ok 65 - blame -L multiple (overlapping)
 
 expecting success of 8012.66 'blame -L multiple (overlapping: unordered)': 
@@ -500814,67 +500665,67 @@
 
 git blame -c  -L3,5 -L2,4 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 B (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 66 - blame -L multiple (overlapping: unordered)
 
 expecting success of 8012.67 'blame -L multiple (superset/subset)': 
 	check_count -L2,8 -L3,5 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L2,8 -L3,5 file 
+Author B2 (expected 1, attributed 1) good
 Author A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author A (expected 1, attributed 1) good
 Author B1 (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
 Author C (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
 ok 67 - blame -L multiple (superset/subset)
 
 expecting success of 8012.68 'blame -L multiple (superset/subset: unordered)': 
 	check_count -L3,5 -L2,8 A 1 B 1 B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L3,5 -L2,8 file 
-Author C (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
-Author B1 (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author C (expected 1, attributed 1) good
+Author D (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
+Author B1 (expected 1, attributed 1) good
+Author A U Thor (expected 1, attributed 1) good
 ok 68 - blame -L multiple (superset/subset: unordered)
 
 expecting success of 8012.69 'blame -L /RE/ (relative)': 
 	check_count -L3,3 -L/fox/ B1 1 B2 1 C 1 D 1 "A U Thor" 1
 
 git blame -c  -L3,3 -L/fox/ file 
+Author A U Thor (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 C (expected 1, attributed 1) good
-Author D (expected 1, attributed 1) good
-Author A U Thor (expected 1, attributed 1) good
 ok 69 - blame -L /RE/ (relative)
 
 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 D (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author B2 (expected 1, attributed 1) good
+Author B (expected 1, attributed 1) good
 Author 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 A U Thor (expected 1, attributed 1) good
-Author B (expected 1, attributed 1) good
 ok 70 - blame -L /RE/ (relative: no preceding range)
 
 expecting success of 8012.71 'blame -L /RE/ (relative: adjacent)': 
 	check_count -L1,1 -L/dog/,+1 A 1 E 1
 
 git blame -c  -L1,1 -L/dog/,+1 file 
-Author A (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 71 - blame -L /RE/ (relative: adjacent)
 
 expecting success of 8012.72 'blame -L /RE/ (relative: not found)': 
@@ -500893,16 +500744,16 @@
 	check_count -L3,3 -L^/dog/,+2 A 1 B2 1
 
 git blame -c  -L3,3 -L^/dog/,+2 file 
-Author B2 (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
+Author B2 (expected 1, attributed 1) good
 ok 74 - blame -L ^/RE/ (absolute)
 
 expecting success of 8012.75 'blame -L ^/RE/ (absolute: no preceding range)': 
 	check_count -L^/dog/,+2 A 1 B2 1
 
 git blame -c  -L^/dog/,+2 file 
-Author A (expected 1, attributed 1) good
 Author B2 (expected 1, attributed 1) good
+Author A (expected 1, attributed 1) good
 ok 75 - blame -L ^/RE/ (absolute: no preceding range)
 
 expecting success of 8012.76 'blame -L ^/RE/ (absolute: not found)': 
@@ -500916,9 +500767,9 @@
 	check_count -L$n -L^/$/,+2 A 1 C 1 E 1
 
 git blame -c  -L8 -L^/$/,+2 file 
+Author C (expected 1, attributed 1) good
 Author E (expected 1, attributed 1) good
 Author A (expected 1, attributed 1) good
-Author C (expected 1, attributed 1) good
 ok 77 - blame -L ^/RE/ (absolute: end-of-file)
 
 expecting success of 8012.78 'setup -L :regex': 
@@ -500966,8 +500817,8 @@
 	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
+Author G (expected 1, attributed 1) good
 ok 79 - blame -L :literal
 
 expecting success of 8012.80 'blame -L :regex': 
@@ -501039,8 +500890,8 @@
 
 git blame -c  -L10 -L^:ma.. hello.c 
 Author F (expected 4, attributed 4) good
-Author G (expected 1, attributed 1) good
 Author H (expected 1, attributed 1) good
+Author G (expected 1, attributed 1) good
 ok 89 - blame -L ^:RE (absolute: end-of-file)
 
 expecting success of 8012.90 'blame -L :funcname with userdiff driver': 
@@ -501072,8 +500923,8 @@
  Author: B <B@test.git>
  1 file changed, 1 insertion(+), 1 deletion(-)
 git blame -c  -L:RIGHT file.f03 
-Author B (expected 1, attributed 1) good
 Author A (expected 3, attributed 3) good
+Author B (expected 1, attributed 1) good
 ok 90 - blame -L :funcname with userdiff driver
 
 expecting success of 8012.91 'setup incremental': 
@@ -501374,475 +501225,16 @@
 	test_line_count = 1 colored &&
 	grep qfunc colored
 
-[branch2 708bf21] new commit
+[branch2 fdbc5a7] new commit
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-<CYAN>708bf216 (A U Thor 2025-12-18 01:39:33 +0000 11) <RESET>void qfunc();
+<CYAN>fdbc5a75 (A U Thor 2024-11-14 19:45:14 +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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t8014-blame-ignore-fuzzy.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9102-git-svn-deep-rmdir.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9102-git-svn-deep-rmdir/.git/
 expecting success of 9102.1 'initialize repo': 
@@ -501875,7 +501267,7 @@
 	
 	A	deeply/nested/directory/number/1/file
 	A	deeply/nested/directory/number/2/another
-r1 = 4273de92dcb731855183987930776640f7bbb4f9 (refs/remotes/git-svn)
+r1 = 40ed6246970648135f705b2d8f5196004798c2e8 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9102-git-svn-deep-rmdir/svnrepo r1
 Switched to a new branch 'test-rmdir'
@@ -501888,7 +501280,7 @@
 	svn_cmd ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
 	
 rm 'deeply/nested/directory/number/2/another'
-[test-rmdir 978870c] remove another
+[test-rmdir c56172c] remove another
  Author: A U Thor <author@example.com>
  1 file changed, 1 deletion(-)
  delete mode 100644 deeply/nested/directory/number/2/another
@@ -501897,7 +501289,7 @@
 	D	deeply/nested/directory/number/2/another
 	D	deeply/nested/directory/number/2/
 W: -empty_dir: deeply/nested/directory/number/2
-r2 = 8bb370a50e62b38664700c72a20fcf9a0f5c1995 (refs/remotes/git-svn)
+r2 = d167be7a3ff2288c81c40f61eaa99502f14d6a64 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 deeply/nested/directory/number/1/
 deeply/nested/directory/number/1/file
@@ -501943,10 +501335,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9103-git-svn-tracked-directory-removed/x/.git/
 	A	README
-r1 = fe676a511be82d02b6c6418292887cf313fffdae (refs/remotes/origin/trunk)
+r1 = a1b56b96507f4d576da9cf6ebb95dc2ebddb26fb (refs/remotes/origin/trunk)
 	D	README
 	A	FOLLOWME
-r3 = eca42215af7a4503d476acbe8213a3935c8bac2b (refs/remotes/origin/trunk)
+r3 = 6421e085af9fcd83062aa79f842e3929976e26ca (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9103-git-svn-tracked-directory-removed/svnrepo/trunk r3
 ok 2 - clone repo with git
@@ -501961,13 +501353,367 @@
 		test -z "$(git svn find-rev r2)"
 	)
 
-HEAD is now at fe676a5 initial
+HEAD is now at a1b56b9 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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9101-git-svn-props.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9101-git-svn-props/.git/
+expecting success of 9101.1 'checkout working copy from svn': svn co "$svnrepo" test_wc
+A    test_wc/cr
+A    test_wc/crlf
+A    test_wc/empty
+A    test_wc/empty_cr
+A    test_wc/empty_crlf
+A    test_wc/empty_lf
+A    test_wc/kw.c
+A    test_wc/lf
+A    test_wc/ne_cr
+A    test_wc/ne_crlf
+A    test_wc/ne_lf
+Checked out revision 1.
+ok 1 - checkout working copy from svn
+
+expecting success of 9101.2 'setup some commits to svn': 
+	(
+		cd test_wc &&
+		echo Greetings >> kw.c &&
+		poke kw.c &&
+		svn_cmd commit -m "Not yet an Id" &&
+		echo Hello world >> kw.c &&
+		poke kw.c &&
+		svn_cmd commit -m "Modified file, but still not yet an Id" &&
+		svn_cmd propset svn:keywords Id kw.c &&
+		poke kw.c &&
+		svn_cmd commit -m "Propset Id"
+	)
+
+Sending        kw.c
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+Sending        kw.c
+Transmitting file data .done
+Committing transaction...
+Committed revision 3.
+property 'svn:keywords' set on 'kw.c'
+Sending        kw.c
+Committing transaction...
+Committed revision 4.
+ok 2 - setup some commits to svn
+
+expecting success of 9101.3 'initialize git svn': git svn init "$svnrepo"
+ok 3 - initialize git svn
+
+expecting success of 9101.4 'fetch revisions from svn': git svn fetch
+	A	cr
+	A	crlf
+	A	empty
+	A	empty_cr
+	A	empty_crlf
+	A	empty_lf
+	A	kw.c
+	A	lf
+	A	ne_cr
+	A	ne_crlf
+	A	ne_lf
+r1 = 16450acd45d3f6a58d16a1ac311f2dc6e9ee3d46 (refs/remotes/git-svn)
+	M	kw.c
+r2 = f93563e1ff8f3f7f886631b81a46eedf30635fc7 (refs/remotes/git-svn)
+	M	kw.c
+r3 = 46fb5a494554dfb32f5e67eee187ba42b90fd589 (refs/remotes/git-svn)
+	M	kw.c
+r4 = 05b3370889db4bd54278da3a4c60585f0c39c238 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9101-git-svn-props/svnrepo r4
+ok 4 - fetch revisions from svn
+
+expecting success of 9101.5 'test svn:keywords ignoring': git checkout -b mybranch remotes/git-svn &&
+	echo Hi again >> kw.c &&
+	git commit -a -m "test keywords ignoring" &&
+	git svn set-tree remotes/git-svn..mybranch &&
+	git pull . remotes/git-svn
+Switched to a new branch 'mybranch'
+[mybranch b5667b1] test keywords ignoring
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+	M	kw.c
+	M	kw.c
+r5 = 5718e2e8befd3479e0c6d199424291755bc5f972 (refs/remotes/git-svn)
+Done committing 1 revisions to SVN
+From .
+ * remote-tracking branch git-svn    -> FETCH_HEAD
+Updating b5667b1..5718e2e
+Fast-forward
+ok 5 - test svn:keywords ignoring
+
+expecting success of 9101.6 'raw $Id$ found in kw.c': test '/* $Id$ */' = '/* $Id$ */'
+ok 6 - raw $Id$ found in kw.c
+
+expecting success of 9101.7 'propset CR on crlf files': 
+	(
+		cd test_wc &&
+		svn_cmd propset svn:eol-style CR empty &&
+		svn_cmd propset svn:eol-style CR crlf &&
+		svn_cmd propset svn:eol-style CR ne_crlf &&
+		svn_cmd commit -m "propset CR on crlf files"
+	 )
+
+property 'svn:eol-style' set on 'empty'
+property 'svn:eol-style' set on 'crlf'
+property 'svn:eol-style' set on 'ne_crlf'
+Sending        crlf
+Sending        empty
+Sending        ne_crlf
+Transmitting file data ..done
+Committing transaction...
+Committed revision 6.
+ok 7 - propset CR on crlf files
+
+expecting success of 9101.8 'fetch and pull latest from svn and checkout a new wc': git svn fetch &&
+	 git pull . remotes/git-svn &&
+	 svn_cmd co "$svnrepo" new_wc
+	M	crlf
+	M	empty
+	M	ne_crlf
+r6 = 7cb849a1e2ce5297b09ea6e7509a17fea8476ec0 (refs/remotes/git-svn)
+From .
+ * remote-tracking branch git-svn    -> FETCH_HEAD
+Updating 5718e2e..7cb849a
+Fast-forward
+ crlf    | 3 +--
+ ne_crlf | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+A    new_wc/cr
+A    new_wc/crlf
+A    new_wc/empty
+A    new_wc/empty_cr
+A    new_wc/empty_crlf
+A    new_wc/empty_lf
+A    new_wc/kw.c
+A    new_wc/lf
+A    new_wc/ne_cr
+A    new_wc/ne_crlf
+A    new_wc/ne_lf
+Checked out revision 6.
+ok 8 - fetch and pull latest from svn and checkout a new wc
+
+expecting success of 9101.9 'Comparing crlf': cmp crlf new_wc/crlf
+ok 9 - Comparing crlf
+
+expecting success of 9101.10 'Comparing ne_crlf': cmp ne_crlf new_wc/ne_crlf
+ok 10 - Comparing ne_crlf
+
+expecting success of 9101.11 'Comparing lf': cmp lf new_wc/lf
+ok 11 - Comparing lf
+
+expecting success of 9101.12 'Comparing ne_lf': cmp ne_lf new_wc/ne_lf
+ok 12 - Comparing ne_lf
+
+expecting success of 9101.13 'Comparing cr': cmp cr new_wc/cr
+ok 13 - Comparing cr
+
+expecting success of 9101.14 'Comparing ne_cr': cmp ne_cr new_wc/ne_cr
+ok 14 - Comparing ne_cr
+
+expecting success of 9101.15 'Comparing empty_cr': cmp empty_cr new_wc/empty_cr
+ok 15 - Comparing empty_cr
+
+expecting success of 9101.16 'Comparing empty_lf': cmp empty_lf new_wc/empty_lf
+ok 16 - Comparing empty_lf
+
+expecting success of 9101.17 'Comparing empty': cmp empty new_wc/empty
+ok 17 - Comparing empty
+
+expecting success of 9101.18 'Comparing empty_crlf': cmp empty_crlf new_wc/empty_crlf
+ok 18 - Comparing empty_crlf
+
+expecting success of 9101.19 'Set CRLF on cr files': svn_cmd propset svn:eol-style CRLF cr &&
+	 svn_cmd propset svn:eol-style CRLF ne_cr &&
+	 svn_cmd propset svn:keywords Id cr &&
+	 svn_cmd propset svn:keywords Id ne_cr &&
+	 svn_cmd commit -m "propset CRLF on cr files"
+property 'svn:eol-style' set on 'cr'
+property 'svn:eol-style' set on 'ne_cr'
+property 'svn:keywords' set on 'cr'
+property 'svn:keywords' set on 'ne_cr'
+Sending        cr
+Sending        ne_cr
+Transmitting file data ..done
+Committing transaction...
+Committed revision 7.
+ok 19 - Set CRLF on cr files
+
+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 = fa67b0c17fb4c1f66733d3928d090914c2fd8210 (refs/remotes/git-svn)
+From .
+ * remote-tracking branch git-svn    -> FETCH_HEAD
+Updating 7cb849a..fa67b0c
+Fast-forward
+ cr    | 4 +++-
+ ne_cr | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+ok 20 - fetch and pull latest from svn
+
+expecting success of 9101.21 'CRLF + $Id$': test 'f39bd49beefa1dff130e47c7a24777dfc3657ba2' = 'f39bd49beefa1dff130e47c7a24777dfc3657ba2'
+ok 21 - CRLF + $Id$
+
+expecting success of 9101.22 'CRLF + $Id$ (no newline)': test '41c5e77993f143876592cd19b5e9a6f6d2e4ff8a' = '41c5e77993f143876592cd19b5e9a6f6d2e4ff8a'
+ok 22 - CRLF + $Id$ (no newline)
+
+expecting success of 9101.23 'test show-ignore': 
+	(
+		cd test_wc &&
+		mkdir -p deeply/nested/directory &&
+		touch deeply/nested/directory/.keep &&
+		svn_cmd add deeply &&
+		svn_cmd up &&
+		svn_cmd propset -R svn:ignore '
+no-such-file*
+' . &&
+		svn_cmd commit -m 'propset svn:ignore'
+	) &&
+	git svn show-ignore > show-ignore.got &&
+	cmp show-ignore.expect show-ignore.got
+
+A         deeply
+A         deeply/nested
+A         deeply/nested/directory
+A         deeply/nested/directory/.keep
+Updating '.':
+U    kw.c
+Updated to revision 7.
+property 'svn:ignore' set on '.'
+property 'svn:ignore' set on 'deeply'
+property 'svn:ignore' set on 'deeply/nested'
+property 'svn:ignore' set on 'deeply/nested/directory'
+Sending        .
+Adding         deeply
+Adding         deeply/nested
+Adding         deeply/nested/directory
+Adding         deeply/nested/directory/.keep
+Transmitting file data .done
+Committing transaction...
+Committed revision 8.
+ok 23 - test show-ignore
+
+expecting success of 9101.24 'test create-ignore': 
+	git svn fetch && git pull . remotes/git-svn &&
+	git svn create-ignore &&
+	cmp ./.gitignore create-ignore.expect &&
+	cmp ./deeply/.gitignore create-ignore.expect &&
+	cmp ./deeply/nested/.gitignore create-ignore.expect &&
+	cmp ./deeply/nested/directory/.gitignore create-ignore.expect &&
+	git ls-files -s >ls_files_result &&
+	grep gitignore ls_files_result | cmp - create-ignore-index.expect
+	
+	A	deeply/nested/directory/.keep
+r8 = 0507d9cd149c904db0d71798335f5295bde836bc (refs/remotes/git-svn)
+From .
+ * remote-tracking branch git-svn    -> FETCH_HEAD
+Updating fa67b0c..0507d9c
+Fast-forward
+ deeply/nested/directory/.keep | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 deeply/nested/directory/.keep
+ok 24 - test create-ignore
+
+expecting success of 9101.25 'test propget': 
+	test_propget () {
+		git svn propget $1 $2 >actual &&
+		cmp $3 actual
+	} &&
+	test_propget svn:ignore . prop.expect &&
+	cd deeply &&
+	test_propget svn:ignore . ../prop.expect &&
+	test_propget svn:entry:committed-rev nested/directory/.keep \
+		../prop2.expect &&
+	test_propget svn:ignore .. ../prop.expect &&
+	test_propget svn:ignore nested/ ../prop.expect &&
+	test_propget svn:ignore ./nested ../prop.expect &&
+	test_propget svn:ignore .././deeply/nested ../prop.expect
+	
+ok 25 - test propget
+
+expecting success of 9101.26 'test proplist': 
+	git svn proplist . >actual &&
+	cmp prop.expect actual &&
+
+	git svn proplist nested/directory/.keep >actual &&
+	cmp prop2.expect actual
+	
+ok 26 - test proplist
+
+# passed all 26 test(s)
+1..26
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9105-git-svn-commit-diff.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9105-git-svn-commit-diff/.git/
+expecting success of 9105.1 'initialize repo': 
+	mkdir import &&
+	(
+		cd import &&
+		echo hello >readme &&
+		svn_cmd import -m "initial" . "$svnrepo"
+	) &&
+	echo hello > readme &&
+	git update-index --add readme &&
+	git commit -a -m "initial" &&
+	echo world >> readme &&
+	git commit -a -m "another"
+	
+Adding         readme
+Committing transaction...
+Committed revision 1.
+[master (root-commit) ecebef3] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 readme
+[master 32e6dbc] another
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 1 - initialize repo
+
+expecting success of 9105.2 'test the commit-diff command': 
+	test -n "$prev" && test -n "$head" &&
+	git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
+	svn_cmd co "$svnrepo" wc &&
+	cmp readme wc/readme
+	
+	M	readme
+Committed r2
+A    wc/readme
+Checked out revision 2.
+ok 2 - test the commit-diff command
+
+expecting success of 9105.3 'commit-diff to a sub-directory (with git svn config)': 
+	svn_cmd import -m "sub-directory" import "$svnrepo"/subdir &&
+	git svn init --minimize-url "$svnrepo"/subdir &&
+	git svn fetch &&
+	git svn commit-diff -r3 "$prev" "$head" &&
+	svn_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
+	cmp readme readme.2
+	
+Adding         import/readme
+Committing transaction...
+Committed revision 3.
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
+	A	readme
+r3 = f2d1dbed9aa8d0486665e1beff19c25bf1bb9383 (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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t7610-mergetool.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t7610-mergetool/.git/
 expecting success of 7610.1 'setup': 
@@ -503428,9 +503174,9 @@
 Deleted merge conflict for 'a/a/file.txt':
   {local}: deleted
   {remote}: deleted
-Use (m)odified or (d)eleted file, or (a)bort? Removing a/a/file_BASE_25404.txt
-Removing a/a/file_LOCAL_25404.txt
-Removing a/a/file_REMOTE_25404.txt
+Use (m)odified or (d)eleted file, or (a)bort? Removing a/a/file_BASE_12750.txt
+Removing a/a/file_LOCAL_12750.txt
+Removing a/a/file_REMOTE_12750.txt
 Removing actual
 Removing both.orig
 Removing expect
@@ -504664,7 +504410,7 @@
 Resolved 'spaced name' using previous resolution.
 Resolved 'subdir/file3' using previous resolution.
 Automatic merge failed; fix conflicts and then commit the result.
-./both_LOCAL_8671
+./both_LOCAL_1935
 HEAD is now at b56897f branch1 changes
 ok 24 - filenames seen by tools start with ./
 
@@ -504726,7 +504472,7 @@
 Resolved 'spaced name' using previous resolution.
 Resolved 'subdir/file3' using previous resolution.
 Automatic merge failed; fix conflicts and then commit the result.
-/tmp/git-mergetool-ajLbMa/both_LOCAL_8856
+/tmp/git-mergetool-SScST7/both_LOCAL_2357
 HEAD is now at b56897f branch1 changes
 ok 25 - temporary filenames are used with mergetool.writeToTemp
 
@@ -505018,360 +504764,6 @@
 1..30
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9105-git-svn-commit-diff.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9105-git-svn-commit-diff/.git/
-expecting success of 9105.1 'initialize repo': 
-	mkdir import &&
-	(
-		cd import &&
-		echo hello >readme &&
-		svn_cmd import -m "initial" . "$svnrepo"
-	) &&
-	echo hello > readme &&
-	git update-index --add readme &&
-	git commit -a -m "initial" &&
-	echo world >> readme &&
-	git commit -a -m "another"
-	
-Adding         readme
-Committing transaction...
-Committed revision 1.
-[master (root-commit) ecebef3] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 readme
-[master 32e6dbc] another
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 1 - initialize repo
-
-expecting success of 9105.2 'test the commit-diff command': 
-	test -n "$prev" && test -n "$head" &&
-	git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
-	svn_cmd co "$svnrepo" wc &&
-	cmp readme wc/readme
-	
-	M	readme
-Committed r2
-A    wc/readme
-Checked out revision 2.
-ok 2 - test the commit-diff command
-
-expecting success of 9105.3 'commit-diff to a sub-directory (with git svn config)': 
-	svn_cmd import -m "sub-directory" import "$svnrepo"/subdir &&
-	git svn init --minimize-url "$svnrepo"/subdir &&
-	git svn fetch &&
-	git svn commit-diff -r3 "$prev" "$head" &&
-	svn_cmd cat "$svnrepo"/subdir/readme > readme.2 &&
-	cmp readme readme.2
-	
-Adding         import/readme
-Committing transaction...
-Committed revision 3.
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo/subdir => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9105-git-svn-commit-diff/svnrepo
-	A	readme
-r3 = 53a3aa1d73a2f06920c019e29af3501dd92a2e01 (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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9101-git-svn-props.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9101-git-svn-props/.git/
-expecting success of 9101.1 'checkout working copy from svn': svn co "$svnrepo" test_wc
-A    test_wc/cr
-A    test_wc/crlf
-A    test_wc/empty
-A    test_wc/empty_cr
-A    test_wc/empty_crlf
-A    test_wc/empty_lf
-A    test_wc/kw.c
-A    test_wc/lf
-A    test_wc/ne_cr
-A    test_wc/ne_crlf
-A    test_wc/ne_lf
-Checked out revision 1.
-ok 1 - checkout working copy from svn
-
-expecting success of 9101.2 'setup some commits to svn': 
-	(
-		cd test_wc &&
-		echo Greetings >> kw.c &&
-		poke kw.c &&
-		svn_cmd commit -m "Not yet an Id" &&
-		echo Hello world >> kw.c &&
-		poke kw.c &&
-		svn_cmd commit -m "Modified file, but still not yet an Id" &&
-		svn_cmd propset svn:keywords Id kw.c &&
-		poke kw.c &&
-		svn_cmd commit -m "Propset Id"
-	)
-
-Sending        kw.c
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Sending        kw.c
-Transmitting file data .done
-Committing transaction...
-Committed revision 3.
-property 'svn:keywords' set on 'kw.c'
-Sending        kw.c
-Committing transaction...
-Committed revision 4.
-ok 2 - setup some commits to svn
-
-expecting success of 9101.3 'initialize git svn': git svn init "$svnrepo"
-ok 3 - initialize git svn
-
-expecting success of 9101.4 'fetch revisions from svn': git svn fetch
-	A	cr
-	A	crlf
-	A	empty
-	A	empty_cr
-	A	empty_crlf
-	A	empty_lf
-	A	kw.c
-	A	lf
-	A	ne_cr
-	A	ne_crlf
-	A	ne_lf
-r1 = 7a32b78ed21baa39de1e544f8a8e7eee16dbe685 (refs/remotes/git-svn)
-	M	kw.c
-r2 = 35f0090003f34e7b2189507900b68d2532641594 (refs/remotes/git-svn)
-	M	kw.c
-r3 = ab8c73a204067564092af9385855fa39b287e80e (refs/remotes/git-svn)
-	M	kw.c
-r4 = 6a71d6db75624824b98f2d3820bd85480bbb8e2f (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9101-git-svn-props/svnrepo r4
-ok 4 - fetch revisions from svn
-
-expecting success of 9101.5 'test svn:keywords ignoring': git checkout -b mybranch remotes/git-svn &&
-	echo Hi again >> kw.c &&
-	git commit -a -m "test keywords ignoring" &&
-	git svn set-tree remotes/git-svn..mybranch &&
-	git pull . remotes/git-svn
-Switched to a new branch 'mybranch'
-[mybranch 847ebd9] test keywords ignoring
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-	M	kw.c
-	M	kw.c
-r5 = 7a72839377f9bc892e3d913d01fe2c7eecb217a9 (refs/remotes/git-svn)
-Done committing 1 revisions to SVN
-From .
- * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 847ebd9..7a72839
-Fast-forward
-ok 5 - test svn:keywords ignoring
-
-expecting success of 9101.6 'raw $Id$ found in kw.c': test '/* $Id$ */' = '/* $Id$ */'
-ok 6 - raw $Id$ found in kw.c
-
-expecting success of 9101.7 'propset CR on crlf files': 
-	(
-		cd test_wc &&
-		svn_cmd propset svn:eol-style CR empty &&
-		svn_cmd propset svn:eol-style CR crlf &&
-		svn_cmd propset svn:eol-style CR ne_crlf &&
-		svn_cmd commit -m "propset CR on crlf files"
-	 )
-
-property 'svn:eol-style' set on 'empty'
-property 'svn:eol-style' set on 'crlf'
-property 'svn:eol-style' set on 'ne_crlf'
-Sending        crlf
-Sending        empty
-Sending        ne_crlf
-Transmitting file data ..done
-Committing transaction...
-Committed revision 6.
-ok 7 - propset CR on crlf files
-
-expecting success of 9101.8 'fetch and pull latest from svn and checkout a new wc': git svn fetch &&
-	 git pull . remotes/git-svn &&
-	 svn_cmd co "$svnrepo" new_wc
-	M	crlf
-	M	empty
-	M	ne_crlf
-r6 = dc0bc2e7273136a398bd3ca2ee69e01b77315d4b (refs/remotes/git-svn)
-From .
- * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 7a72839..dc0bc2e
-Fast-forward
- crlf    | 3 +--
- ne_crlf | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-A    new_wc/cr
-A    new_wc/crlf
-A    new_wc/empty
-A    new_wc/empty_cr
-A    new_wc/empty_crlf
-A    new_wc/empty_lf
-A    new_wc/kw.c
-A    new_wc/lf
-A    new_wc/ne_cr
-A    new_wc/ne_crlf
-A    new_wc/ne_lf
-Checked out revision 6.
-ok 8 - fetch and pull latest from svn and checkout a new wc
-
-expecting success of 9101.9 'Comparing crlf': cmp crlf new_wc/crlf
-ok 9 - Comparing crlf
-
-expecting success of 9101.10 'Comparing ne_crlf': cmp ne_crlf new_wc/ne_crlf
-ok 10 - Comparing ne_crlf
-
-expecting success of 9101.11 'Comparing lf': cmp lf new_wc/lf
-ok 11 - Comparing lf
-
-expecting success of 9101.12 'Comparing ne_lf': cmp ne_lf new_wc/ne_lf
-ok 12 - Comparing ne_lf
-
-expecting success of 9101.13 'Comparing cr': cmp cr new_wc/cr
-ok 13 - Comparing cr
-
-expecting success of 9101.14 'Comparing ne_cr': cmp ne_cr new_wc/ne_cr
-ok 14 - Comparing ne_cr
-
-expecting success of 9101.15 'Comparing empty_cr': cmp empty_cr new_wc/empty_cr
-ok 15 - Comparing empty_cr
-
-expecting success of 9101.16 'Comparing empty_lf': cmp empty_lf new_wc/empty_lf
-ok 16 - Comparing empty_lf
-
-expecting success of 9101.17 'Comparing empty': cmp empty new_wc/empty
-ok 17 - Comparing empty
-
-expecting success of 9101.18 'Comparing empty_crlf': cmp empty_crlf new_wc/empty_crlf
-ok 18 - Comparing empty_crlf
-
-expecting success of 9101.19 'Set CRLF on cr files': svn_cmd propset svn:eol-style CRLF cr &&
-	 svn_cmd propset svn:eol-style CRLF ne_cr &&
-	 svn_cmd propset svn:keywords Id cr &&
-	 svn_cmd propset svn:keywords Id ne_cr &&
-	 svn_cmd commit -m "propset CRLF on cr files"
-property 'svn:eol-style' set on 'cr'
-property 'svn:eol-style' set on 'ne_cr'
-property 'svn:keywords' set on 'cr'
-property 'svn:keywords' set on 'ne_cr'
-Sending        cr
-Sending        ne_cr
-Transmitting file data ..done
-Committing transaction...
-Committed revision 7.
-ok 19 - Set CRLF on cr files
-
-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 = 249bb1c0a916889189ad3f2f7715c32e477ead38 (refs/remotes/git-svn)
-From .
- * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating dc0bc2e..249bb1c
-Fast-forward
- cr    | 4 +++-
- ne_cr | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-ok 20 - fetch and pull latest from svn
-
-expecting success of 9101.21 'CRLF + $Id$': test 'f39bd49beefa1dff130e47c7a24777dfc3657ba2' = 'f39bd49beefa1dff130e47c7a24777dfc3657ba2'
-ok 21 - CRLF + $Id$
-
-expecting success of 9101.22 'CRLF + $Id$ (no newline)': test '41c5e77993f143876592cd19b5e9a6f6d2e4ff8a' = '41c5e77993f143876592cd19b5e9a6f6d2e4ff8a'
-ok 22 - CRLF + $Id$ (no newline)
-
-expecting success of 9101.23 'test show-ignore': 
-	(
-		cd test_wc &&
-		mkdir -p deeply/nested/directory &&
-		touch deeply/nested/directory/.keep &&
-		svn_cmd add deeply &&
-		svn_cmd up &&
-		svn_cmd propset -R svn:ignore '
-no-such-file*
-' . &&
-		svn_cmd commit -m 'propset svn:ignore'
-	) &&
-	git svn show-ignore > show-ignore.got &&
-	cmp show-ignore.expect show-ignore.got
-
-A         deeply
-A         deeply/nested
-A         deeply/nested/directory
-A         deeply/nested/directory/.keep
-Updating '.':
-U    kw.c
-Updated to revision 7.
-property 'svn:ignore' set on '.'
-property 'svn:ignore' set on 'deeply'
-property 'svn:ignore' set on 'deeply/nested'
-property 'svn:ignore' set on 'deeply/nested/directory'
-Sending        .
-Adding         deeply
-Adding         deeply/nested
-Adding         deeply/nested/directory
-Adding         deeply/nested/directory/.keep
-Transmitting file data .done
-Committing transaction...
-Committed revision 8.
-ok 23 - test show-ignore
-
-expecting success of 9101.24 'test create-ignore': 
-	git svn fetch && git pull . remotes/git-svn &&
-	git svn create-ignore &&
-	cmp ./.gitignore create-ignore.expect &&
-	cmp ./deeply/.gitignore create-ignore.expect &&
-	cmp ./deeply/nested/.gitignore create-ignore.expect &&
-	cmp ./deeply/nested/directory/.gitignore create-ignore.expect &&
-	git ls-files -s >ls_files_result &&
-	grep gitignore ls_files_result | cmp - create-ignore-index.expect
-	
-	A	deeply/nested/directory/.keep
-r8 = b6787db43f59d9682705525e7bb0522d29d99c06 (refs/remotes/git-svn)
-From .
- * remote-tracking branch git-svn    -> FETCH_HEAD
-Updating 249bb1c..b6787db
-Fast-forward
- deeply/nested/directory/.keep | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 deeply/nested/directory/.keep
-ok 24 - test create-ignore
-
-expecting success of 9101.25 'test propget': 
-	test_propget () {
-		git svn propget $1 $2 >actual &&
-		cmp $3 actual
-	} &&
-	test_propget svn:ignore . prop.expect &&
-	cd deeply &&
-	test_propget svn:ignore . ../prop.expect &&
-	test_propget svn:entry:committed-rev nested/directory/.keep \
-		../prop2.expect &&
-	test_propget svn:ignore .. ../prop.expect &&
-	test_propget svn:ignore nested/ ../prop.expect &&
-	test_propget svn:ignore ./nested ../prop.expect &&
-	test_propget svn:ignore .././deeply/nested ../prop.expect
-	
-ok 25 - test propget
-
-expecting success of 9101.26 'test proplist': 
-	git svn proplist . >actual &&
-	cmp prop.expect actual &&
-
-	git svn proplist nested/directory/.keep >actual &&
-	cmp prop2.expect actual
-	
-ok 26 - test proplist
-
-# passed all 26 test(s)
-1..26
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9106-git-svn-commit-diff-clobber.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9106-git-svn-commit-diff-clobber/.git/
 expecting success of 9106.1 'initialize repo': 
@@ -505460,19 +504852,19 @@
 	test_must_fail git svn dcommit
 	
 	A	file
-r1 = d0e50dd9f9a3f7e3e28be996ec137c0c7c8c4c19 (refs/remotes/git-svn)
+r1 = eb43b4ee6690eedcb4c22acaa7013999f4b10163 (refs/remotes/git-svn)
 	M	file
-r2 = 5e6e0f031b8eb9f4bee6c2dae72752374df91dff (refs/remotes/git-svn)
+r2 = 72472cb228e6d7d57342f559dcfea744d6797433 (refs/remotes/git-svn)
 	M	file
-r3 = 850036915e17a014c61e5dbedded9457e535700a (refs/remotes/git-svn)
-HEAD is now at 8500369 third line from git
+r3 = 10833d263995c778cb85ac548f4c99cc3a45dce9 (refs/remotes/git-svn)
+HEAD is now at 10833d2 third line from git
 A    t.svn/file
 Checked out revision 3.
 Sending        file
 Transmitting file data .done
 Committing transaction...
 Committed revision 4.
-[master 9b63ea4] fourth line from git
+[master c64d256] fourth line from git
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -505480,7 +504872,7 @@
 
 ERROR from SVN:
 Transaction is out of date: File '/file' is out of date
-W: 9b63ea42d81451ca1dd4b9edd8482227c406e9b2 and refs/remotes/git-svn differ, using rebase:
+W: c64d25668c260d23a73648377f8176d61ead1bf9 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
@@ -505499,12 +504891,12 @@
 	git commit -a -m 'more changes' &&
 	git svn dcommit
 	
-HEAD is now at 8500369 third line from git
-[master 1716bcb] index merge
+HEAD is now at 10833d2 third line from git
+[master 51bb045] index merge
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 file2
-[master 7e47e0f] more changes
+[master 788f6d6] more changes
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -505512,20 +504904,20 @@
 	A	file2
 Committed r5
 	M	file
-r4 = 4fd07f374016784908aee7dd37caff031919e839 (refs/remotes/git-svn)
+r4 = af505e5a825f29be585ae8b1c4292f12d252cacf (refs/remotes/git-svn)
 	A	file2
-r5 = c61ce7aeca05f67ccf9602396ebcd9277e144d34 (refs/remotes/git-svn)
-W: 1716bcb3aee4d4b7fe23cef444822c6cb6646e1c and refs/remotes/git-svn differ, using rebase:
+r5 = 9eef5ea72a4fae59f34a4661d81ceecdb0048582 (refs/remotes/git-svn)
+W: 51bb0459400e07e4bf9608c0f621d887da8a42f2 and refs/remotes/git-svn differ, using rebase:
 :100644 100644 d270188940c824ce4f1e8aa864ca5d2f8c75f939 b349877e032add143a5dc286d30e523181dea4ef M	file
-warning: skipped previously applied commit 1716bcb
+warning: skipped previously applied commit 51bb045
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config advice.skippedCherryPicks false"
 Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/master.
 	M	file2
 Committed r6
 	M	file2
-r6 = 69e38e2631cc2bd0595cddf69f4d38eb30af6ebf (refs/remotes/git-svn)
-No changes between d7bc1ee3bbf19e873c6d640f4cf228359534193a and refs/remotes/git-svn
+r6 = 1e89f6a2cac3f14214619c3a0b7b9aa6e05533b8 (refs/remotes/git-svn)
+No changes between e00a3f3b90cb464ebee3c9575a6b42459515d421 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 6 - dcommit does the svn equivalent of an index merge
 
@@ -505557,12 +504949,12 @@
 	git commit -a -m 'clobber' &&
 	test_must_fail git svn dcommit
 	
-HEAD is now at 69e38e2 more changes
-[master 9de30f9] new file
+HEAD is now at 1e89f6a more changes
+[master 14a40c2] new file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 new-file
-[master 0d62c5f] clobber
+[master d1af968] clobber
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 4 deletions(-)
 Duplicate specification "id|i=s" for option "i"
@@ -505570,23 +504962,23 @@
 	A	new-file
 Committed r8
 	M	file
-r7 = 416e1348e7b472c7407c1e21123ade734781fccc (refs/remotes/git-svn)
+r7 = 8f3fda9a03f2e98ae9e43c4df2a69a518f79a094 (refs/remotes/git-svn)
 	A	new-file
-r8 = 4a3172e76b98f0b2d15a391d7cd16ea343f7b61d (refs/remotes/git-svn)
-W: 9de30f9b0d92bcb875fd4dc91c5aa2c866dbb4b3 and refs/remotes/git-svn differ, using rebase:
+r8 = 2ca978901a3ec3aecb60d4d09a17fd80a9e8c42a (refs/remotes/git-svn)
+W: 14a40c2bdf8f4c6ada310f4df31ab7bb0bfab526 and refs/remotes/git-svn differ, using rebase:
 :100644 100644 b349877e032add143a5dc286d30e523181dea4ef fad4bec9888fc6883cc5a8447f365d44b8e4ebba M	file
-warning: skipped previously applied commit 9de30f9
+warning: skipped previously applied commit 14a40c2
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config advice.skippedCherryPicks false"
 Rebasing (1/1)
Auto-merging file
 CONFLICT (content): Merge conflict in file
-error: could not apply 0d62c5f... clobber
+error: could not apply d1af968... clobber
 hint: Resolve all conflicts manually, mark them as resolved with
 hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
 hint: You can instead skip this commit: run "git rebase --skip".
 hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
 hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 0d62c5f... clobber
+Could not apply d1af968... clobber
 rebase refs/remotes/git-svn: command returned error: 1
 
 ok 8 - multiple dcommit from git svn will not clobber svn
@@ -505595,7 +504987,7 @@
 	git status >output &&
 	grep currently.rebasing output
 
-You are currently rebasing branch 'master' on '4a3172e'.
+You are currently rebasing branch 'master' on '2ca9789'.
 ok 9 - check that rebase really failed
 
 expecting success of 9106.10 'resolve, continue the rebase and dcommit': 
@@ -505604,7 +504996,7 @@
 	git rebase --continue &&
 	git svn dcommit
 	
-[detached HEAD 1a38485] clobber
+[detached HEAD 81eca93] clobber
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 5 deletions(-)
 
                                                                                
Successfully rebased and updated refs/heads/master.
@@ -505613,8 +505005,8 @@
 	M	file
 Committed r9
 	M	file
-r9 = 2012934887fc6b9bbb6bca48885ed32a42ba8aae (refs/remotes/git-svn)
-No changes between 1a38485370fca4cfcdb8f56008b3ed5d60c8583a and refs/remotes/git-svn
+r9 = e00ebf5240165bd3c529e6ddb60111e937f335d9 (refs/remotes/git-svn)
+No changes between 81eca93ed03b56e35755112e8195096f61100440 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 10 - resolve, continue the rebase and dcommit
 
@@ -505622,559 +505014,6 @@
 1..10
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9107-git-svn-migrate.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9107-git-svn-migrate/.git/
-expecting success of 9107.1 'setup old-looking metadata': 
-	cp "$GIT_DIR"/config "$GIT_DIR"/config-old-git-svn &&
-	mkdir import &&
-	(
-		cd import &&
-		for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
-		do
-			mkdir -p $i &&
-			echo hello >>$i/README ||
-			exit 1
-		done &&
-		svn_cmd import -m test . "$svnrepo"
-	) &&
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	rm -rf "$GIT_DIR"/svn &&
-	git update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
-	git update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
-	git update-ref -d refs/remotes/git-svn refs/remotes/git-svn
-	
-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	branches/a/README
-	A	branches/b/README
-	A	tags/0.1/README
-	A	tags/0.2/README
-	A	tags/0.3/README
-	A	trunk/README
-r1 = 65a39bfae479289c602b607876ef6e008efd2201 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo r1
-ok 1 - setup old-looking metadata
-
-expecting success of 9107.2 'git-svn-HEAD is a real HEAD': 
-	git rev-parse --verify refs/heads/git-svn-HEAD^0
-
-65a39bfae479289c602b607876ef6e008efd2201
-ok 2 - git-svn-HEAD is a real HEAD
-
-expecting success of 9107.3 'initialize old-style (v0) git svn layout': 
-	mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
-	echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
-	echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
-	git svn migrate &&
-	! test -d "$GIT_DIR"/git-svn &&
-	git rev-parse --verify refs/remotes/git-svn^0 &&
-	git rev-parse --verify refs/remotes/svn^0 &&
-	test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
-	test $(git config --get svn-remote.svn.fetch) = \
-		":refs/remotes/git-svn"
-	
-Migrating from v0 layout...
-Renaming ref: refs/heads/git-svn-HEAD => refs/remotes/git-svn
-Renaming ref: refs/heads/svn-HEAD => refs/remotes/svn
-Done migrating from v0 layout...
-Migrating from a git-svn v1 layout...
-Data from a previous version of git-svn exists, but
-	.git/svn
-	(required for this version (2.45.2) of git-svn) does not exist.
- - .git/git-svn => .git/svn/git-svn
- - .git/svn/info => .git/svn/svn/info
-Done migrating from a git-svn v1 layout
-65a39bfae479289c602b607876ef6e008efd2201
-65a39bfae479289c602b607876ef6e008efd2201
-ok 3 - initialize old-style (v0) git svn layout
-
-expecting success of 9107.4 'initialize a multi-repository repo': 
-	git svn init "$svnrepo" -T trunk -t tags -b branches &&
-	git config --get-all svn-remote.svn.fetch > fetch.out &&
-	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
-	test -n "$(git config --get svn-remote.svn.branches \
-		    "^branches/\*:refs/remotes/origin/\*$")" &&
-	test -n "$(git config --get svn-remote.svn.tags \
-		    "^tags/\*:refs/remotes/origin/tags/\*$")" &&
-	git config --unset svn-remote.svn.branches \
-	                        "^branches/\*:refs/remotes/origin/\*$" &&
-	git config --unset svn-remote.svn.tags \
-	                        "^tags/\*:refs/remotes/origin/tags/\*$" &&
-	git config --add svn-remote.svn.fetch "branches/a:refs/remotes/origin/a" &&
-	git config --add svn-remote.svn.fetch "branches/b:refs/remotes/origin/b" &&
-	for i in tags/0.1 tags/0.2 tags/0.3
-	do
-		git config --add svn-remote.svn.fetch \
-			$i:refs/remotes/origin/$i || return 1
-	done &&
-	git config --get-all svn-remote.svn.fetch > fetch.out &&
-	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
-	grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
-	grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
-	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
-	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
-	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
-	grep "^:refs/remotes/git-svn" fetch.out
-	
-Using existing [svn-remote "svn"]
-trunk:refs/remotes/origin/trunk
-trunk:refs/remotes/origin/trunk
-branches/a:refs/remotes/origin/a
-branches/b:refs/remotes/origin/b
-tags/0.1:refs/remotes/origin/tags/0.1
-tags/0.2:refs/remotes/origin/tags/0.2
-tags/0.3:refs/remotes/origin/tags/0.3
-:refs/remotes/git-svn
-ok 4 - initialize a multi-repository repo
-
-expecting success of 9107.5 'multi-fetch works on partial urls + paths': 
-	refs="trunk a b tags/0.1 tags/0.2 tags/0.3" &&
-	git svn multi-fetch &&
-	for i in $refs
-	do
-		git rev-parse --verify refs/remotes/origin/$i^0 || return 1;
-	done >refs.out &&
-	test -z "$(sort <refs.out | uniq -d)" &&
-	for i in $refs
-	do
-		for j in $refs
-		do
-			git diff --exit-code refs/remotes/origin/$i \
-					     refs/remotes/origin/$j ||
-				return 1
-		done
-	done
-
-Rebuilding .git/svn/git-svn/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc ...
-r1 = 65a39bfae479289c602b607876ef6e008efd2201
-Done rebuilding .git/svn/git-svn/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc
-	A	README
-r1 = c561370746d5de99c8f1fd8cbf859e61b5a6fccd (refs/remotes/origin/tags/0.3)
-	A	README
-r1 = e8d2aa56e6754bae39438a948dbe3ba36394d347 (refs/remotes/origin/trunk)
-	A	README
-r1 = 438ced168553fec73b6a76720b4a4af7d67d9a94 (refs/remotes/origin/a)
-	A	README
-r1 = c78ca88d9b1ff36498620f96f914ddcb9198fdad (refs/remotes/origin/tags/0.2)
-	A	README
-r1 = ab7a197b48194c1069bb64bc080ff3e6cfaa0d3f (refs/remotes/origin/b)
-	A	README
-r1 = 399abf83894face42b465d4f340ffb0e7222e876 (refs/remotes/origin/tags/0.1)
-ok 5 - multi-fetch works on partial urls + paths
-
-expecting success of 9107.6 'migrate --minimize on old inited layout': 
-	git config --unset-all svn-remote.svn.fetch &&
-	git config --unset-all svn-remote.svn.url &&
-	rm -rf "$GIT_DIR"/svn &&
-	for i in $(cat fetch.out)
-	do
-		path=${i%%:*} &&
-		ref=${i#*:} &&
-		if test "$ref" = "${ref#refs/remotes/}"; then continue; fi &&
-		if test -n "$path"; then path="/$path"; fi &&
-		mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
-		echo "$svnrepo"$path >"$GIT_DIR"/svn/$ref/info/url ||
-		return 1
-	done &&
-	git svn migrate --minimize &&
-	test -z "$(git config -l | grep "^svn-remote\.git-svn\.")" &&
-	git config --get-all svn-remote.svn.fetch > fetch.out &&
-	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
-	grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
-	grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
-	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
-	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
-	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
-	grep "^:refs/remotes/git-svn" fetch.out
-	
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/b => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.1 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.2 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.3 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-Using existing [svn-remote "svn"]
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
-trunk:refs/remotes/origin/trunk
-branches/a:refs/remotes/origin/a
-branches/b:refs/remotes/origin/b
-tags/0.1:refs/remotes/origin/tags/0.1
-tags/0.2:refs/remotes/origin/tags/0.2
-tags/0.3:refs/remotes/origin/tags/0.3
-:refs/remotes/git-svn
-ok 6 - migrate --minimize on old inited layout
-
-expecting success of 9107.7 '.rev_db auto-converted to .rev_map.UUID': 
-	git svn fetch -i trunk &&
-	test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
-	expect="$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_map.*)" &&
-	test -n "$expect" &&
-	rev_db="$(echo $expect | sed -e "s,_map,_db,")" &&
-	convert_to_rev_db "$expect" "$rev_db" &&
-	rm -f "$expect" &&
-	test -f "$rev_db" &&
-	git svn fetch -i trunk &&
-	test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
-	test ! -e "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db &&
-	test -f "$expect"
-	
-Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc ...
-r1 = 65a39bfae479289c602b607876ef6e008efd2201
-Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc
-Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc ...
-r1 = 438ced168553fec73b6a76720b4a4af7d67d9a94
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc
-Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc ...
-r1 = ab7a197b48194c1069bb64bc080ff3e6cfaa0d3f
-Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc
-Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc ...
-r1 = 399abf83894face42b465d4f340ffb0e7222e876
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc
-Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc ...
-r1 = c78ca88d9b1ff36498620f96f914ddcb9198fdad
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc
-Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc ...
-r1 = c561370746d5de99c8f1fd8cbf859e61b5a6fccd
-Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc ...
-r1 = e8d2aa56e6754bae39438a948dbe3ba36394d347
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc
-Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc ...
-r1 = e8d2aa56e6754bae39438a948dbe3ba36394d347
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.bf198ac9-62e5-4751-925d-64471abd8cdc
-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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9108-git-svn-glob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9108-git-svn-glob/.git/
-expecting success of 9108.1 'test refspec 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/start &&
-		svn_cmd commit -m "start a new branch" &&
-		svn_cmd up &&
-		echo "hi" >> branches/start/src/b/readme &&
-		poke branches/start/src/b/readme &&
-		echo "hey" >> branches/start/src/a/readme &&
-		poke branches/start/src/a/readme &&
-		svn_cmd commit -m "hi" &&
-		svn_cmd up &&
-		svn_cmd cp branches/start tags/end &&
-		echo "bye" >> tags/end/src/b/readme &&
-		poke tags/end/src/b/readme &&
-		echo "aye" >> tags/end/src/a/readme &&
-		poke tags/end/src/a/readme &&
-		svn_cmd commit -m "the end" &&
-		echo "byebye" >> tags/end/src/b/readme &&
-		poke tags/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/*/src/a:refs/remotes/branches/*" &&
-	git config --add svn-remote.svn.tags\
-	                 "tags/*/src/a:refs/remotes/tags/*" &&
-	git svn multi-fetch &&
-	git log --pretty=oneline refs/remotes/tags/end >actual &&
-	cut -d" " -f2- actual >output.end &&
-	test_cmp expect.end output.end &&
-	test "$(git rev-parse refs/remotes/tags/end~1)" = \
-		"$(git rev-parse refs/remotes/branches/start)" &&
-	test "$(git rev-parse refs/remotes/branches/start~2)" = \
-		"$(git rev-parse refs/remotes/trunk)" &&
-	test_must_fail git rev-parse refs/remotes/tags/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/start
-Adding         branches
-Adding         branches/start
-Adding         tags
-Committing transaction...
-Committed revision 2.
-Updating '.':
-At revision 2.
-Sending        branches/start/src/a/readme
-Sending        branches/start/src/b/readme
-Transmitting file data ..done
-Committing transaction...
-Committed revision 3.
-Updating '.':
-At revision 3.
-A         tags/end
-Adding         tags/end
-Sending        tags/end/src/a/readme
-Sending        tags/end/src/b/readme
-Transmitting file data ..done
-Committing transaction...
-Committed revision 4.
-Sending        tags/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.45.2) of git-svn) does not exist.
-Done migrating from a git-svn v1 layout
-	A	readme
-r1 = d23cb935da2b655d7070671978a987ddc73d75c2 (refs/remotes/trunk)
-branch_from: /trunk => /trunk/src/a
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a, 1
-Found branch parent: (refs/remotes/branches/start) d23cb935da2b655d7070671978a987ddc73d75c2
-Following parent with do_switch
-Successfully followed parent
-r2 = 8cd74154e7a41a00f75fb86bd671987bcd1b1420 (refs/remotes/branches/start)
-	M	readme
-r3 = 045f770ed777f0dac57b79e2f56075cf47dedf12 (refs/remotes/branches/start)
-branch_from: /branches/start => /branches/start/src/a
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) 045f770ed777f0dac57b79e2f56075cf47dedf12
-Following parent with do_switch
-	M	readme
-Successfully followed parent
-r4 = c55d8672708306d3ca6d5a5527078da536075f43 (refs/remotes/tags/end)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a r1
-fatal: ambiguous argument 'refs/remotes/tags/end@3': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-refs/remotes/tags/end@3
-ok 1 - test refspec globbing
-
-expecting success of 9108.2 'test left-hand-side only 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/*:refs/remotes/two/branches/*" &&
-	git config --add svn-remote.two.tags \
-	                 "tags/*:refs/remotes/two/tags/*" &&
-	(
-		cd tmp &&
-		echo "try try" >> tags/end/src/b/readme &&
-		poke tags/end/src/b/readme &&
-		svn_cmd commit -m "try to try"
-	) &&
-	git svn fetch two &&
-	git rev-list refs/remotes/two/tags/end >actual &&
-	test_line_count = 6 actual &&
-	git rev-list refs/remotes/two/branches/start >actual &&
-	test_line_count = 3 actual &&
-	test $(git rev-parse refs/remotes/two/branches/start~2) = \
-	     $(git rev-parse refs/remotes/two/trunk) &&
-	test $(git rev-parse refs/remotes/two/tags/end~3) = \
-	     $(git rev-parse refs/remotes/two/branches/start) &&
-	git log --pretty=oneline refs/remotes/two/tags/end >actual &&
-	cut -d" " -f2- actual >output.two &&
-	test_cmp expect.two output.two
-	
-Sending        tags/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 = c03c2a743ec16b6e012823bebc6d5c1c6d0f3294 (refs/remotes/two/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start, 1
-Found branch parent: (refs/remotes/two/branches/start) c03c2a743ec16b6e012823bebc6d5c1c6d0f3294
-Following parent with do_switch
-Successfully followed parent
-r2 = 9d3b3c6272a0b1607661dc8baea778fd64725a3e (refs/remotes/two/branches/start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = 5fbc88f737fdde6e3fb99895d3b58e2372ee988c (refs/remotes/two/branches/start)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) 5fbc88f737fdde6e3fb99895d3b58e2372ee988c
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = f8874e8509d16efe1b276b31d1087e056fd5648a (refs/remotes/two/tags/end)
-	M	src/b/readme
-r5 = 3a69e84f7e902ec85a9ffc42d41f7a415cea8b25 (refs/remotes/two/tags/end)
-	M	src/b/readme
-r6 = 9a206a6f64984882b97efe0548faa68f6c411851 (refs/remotes/two/tags/end)
-ok 2 - test left-hand-side only globbing
-
-expecting success of 9108.3 'prepare test disallow multi-globs': 
-cat >expect.three <<EOF
-Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
-
-EOF
-	
-ok 3 - prepare test disallow multi-globs
-
-expecting success of 9108.4 'test disallow multi-globs': 
-	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/*/t/*:refs/remotes/three/branches/*" &&
-	git config --add svn-remote.three.tags \
-	                 "tags/*/*:refs/remotes/three/tags/*" &&
-	(
-		cd tmp &&
-		echo "try try" >> tags/end/src/b/readme &&
-		poke tags/end/src/b/readme &&
-		svn_cmd commit -m "try to try"
-	) &&
-	test_must_fail git svn fetch three 2> stderr.three &&
-	test_cmp expect.three stderr.three
-	
-Sending        tags/end/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 7.
-ok 4 - test disallow multi-globs
-
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9110-git-svn-use-svm-props.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9110-git-svn-use-svm-props/.git/
-expecting success of 9110.1 'load svm repo': 
-	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9110/svm.dump &&
-	git svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
-	git svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
-	git svn init --minimize-url -R argh -i e \
-	  "$svnrepo"/mirror/argh/a/b/c/d/e &&
-	git config svn.useSvmProps true &&
-	git svn fetch --all
-	
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh/a/b/c/d/e => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
-	A	file
-r9 (@1) = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
-	A	a/b/c/d/e/file
-r9 (@1) = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
-	D	a/b/c/d/e/file
-	D	a/
-	A	file
-W: -empty_dir: mirror/argh/a
-r10 (@2) = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
-	A	zzz
-r2 (@1) = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
-	M	zzz
-r3 (@6) = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
-	A	d
-r4 (@9) = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
-	A	newdir/dir
-r5 (@10) = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
-	M	newdir/dir
-r6 (@11) = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
-	M	d
-r7 (@12) = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr r7
-ok 1 - load svm repo
-
-expecting success of 9110.2 'verify metadata for /bar': 
-	git cat-file commit refs/remotes/bar >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~1 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~2 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~3 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~4 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/bar~5 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
-	
-git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89
-ok 2 - verify metadata for /bar
-
-expecting success of 9110.3 'verify metadata for /dir/a/b/c/d/e': 
-	git cat-file commit refs/remotes/e >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
-	
-git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89
-ok 3 - verify metadata for /dir/a/b/c/d/e
-
-expecting success of 9110.4 'verify metadata for /dir': 
-	git cat-file commit refs/remotes/dir >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
-	git cat-file commit refs/remotes/dir~1 >actual &&
-	grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
-	
-git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89
-git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89
-ok 4 - verify metadata for /dir
-
-expecting success of 9110.5 'find commit based on SVN revision number': 
-	git svn find-rev r12 >actual &&
-	grep ab9ada04d293d792e2e941a664911858fe0167af actual
-        
-ab9ada04d293d792e2e941a664911858fe0167af
-ok 5 - find commit based on SVN revision number
-
-expecting success of 9110.6 'empty rebase': 
-	git svn rebase
-	
-Current branch master is up to date.
-ok 6 - empty rebase
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9001-send-email.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9001-send-email/.git/
 expecting success of 9001.1 'prepare reference tree': 
@@ -506252,8 +505091,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:31 +0000
-Message-ID: <20251218013931.4449-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:09 +0000
+Message-ID: <20241114194509.18238-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506292,8 +505131,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:31 +0000
-Message-ID: <20251218013931.4598-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:09 +0000
+Message-ID: <20241114194509.18384-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506334,8 +505173,8 @@
 	One <one@example.com>,
 	two@example.com
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:31 +0000
-Message-ID: <20251218013931.4742-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:09 +0000
+Message-ID: <20241114194509.18553-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506401,7 +505240,7 @@
  Date: Thu Apr 7 15:13:13 2005 -0700
  1 file changed, 1 insertion(+)
  create mode 100644 cc-trailer.t
-/tmp/6tc0JLwhSP/0001-Test-Cc-trailers.patch
+/tmp/66qak149M4/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'
@@ -506421,8 +505260,8 @@
 	five@example.com,
 	six@example.com
 Subject: [PATCH] Test Cc: trailers.
-Date: Thu, 18 Dec 2025 01:39:32 +0000
-Message-ID: <20251218013932.4954-1-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:10 +0000
+Message-ID: <20241114194510.18775-1-author@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506450,7 +505289,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" &&
 	test_cmp expected-cc commandline1
 
-/tmp/flMHcZh2b_/0001-Second.patch
+/tmp/NRSFrla5ac/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'
@@ -506470,8 +505309,8 @@
 	five@example.com (open list:FOR THING (FOO/bar)),
 	six@example.com (open list)
 Subject: [PATCH] Second.
-Date: Thu, 18 Dec 2025 01:39:32 +0000
-Message-ID: <20251218013932.5097-1-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:10 +0000
+Message-ID: <20241114194510.18896-1-author@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506533,8 +505372,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: Thu, 18 Dec 2025 01:39:32 +0000
-Message-ID: <20251218013932.5300-1-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:10 +0000
+Message-ID: <20241114194510.19055-1-author@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506561,8 +505400,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: Thu, 18 Dec 2025 01:39:32 +0000
-Message-ID: <20251218013932.5643-1-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:11 +0000
+Message-ID: <20241114194511.19259-1-author@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506589,8 +505428,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: Thu, 18 Dec 2025 01:39:32 +0000
-Message-ID: <20251218013932.6153-1-odd_?=mail@example.com>
+Date: Thu, 14 Nov 2024 19:45:11 +0000
+Message-ID: <20241114194511.19524-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -506618,8 +505457,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: Thu, 18 Dec 2025 01:39:32 +0000
-Message-ID: <20251218013932.6595-1-odd_?=mail@example.com>
+Date: Thu, 14 Nov 2024 19:45:12 +0000
+Message-ID: <20241114194512.19805-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -506647,8 +505486,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: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013933.6810-1-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:12 +0000
+Message-ID: <20241114194512.20071-1-author@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506700,8 +505539,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013933.7071-1-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:13 +0000
+Message-ID: <20241114194513.20367-1-author@example.com>
 X-Mailer: git-send-email 2.45.2
 In-Reply-To: <my-message-id@example.com>
 References: <my-message-id@example.com>
@@ -506724,38 +505563,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@infom08-i386.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@infom07-i386.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.45.2/t/trash directory.t9001-send-email/fake.sendmail -i to@example.com author@example.com one@example.com two@example.com committer@example.com
+From: second user <pbuilder2@infom07-i386.debian.net>
+To: to@example.com
+Cc: A <author@example.com>,
+	One <one@example.com>,
+	two@example.com,
+	C O Mitter <committer@example.com>
+Subject: [PATCH 1/1] Second.
+Date: Thu, 14 Nov 2024 19:45:13 +0000
+Message-ID: <20241114194513.20545-1-pbuilder2@infom07-i386.debian.net>
+X-Mailer: git-send-email 2.45.2
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+
+Result: OK
+ok 28 - implicit ident is allowed
+
+ok 29 # skip broken implicit ident aborts send-email (missing !AUTOIDENT of PERL,!AUTOIDENT)
 
 expecting success of 9001.30 'setup cmd scripts': 
 	write_script tocmd-sed <<-\EOF &&
@@ -506797,8 +505642,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013933.7348-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:14 +0000
+Message-ID: <20241114194514.20723-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506836,8 +505681,8 @@
 	C O Mitter <committer@example.com>,
 	cccmd@example.com
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013933.7463-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:14 +0000
+Message-ID: <20241114194514.20833-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506873,8 +505718,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013933.7610-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:14 +0000
+Message-ID: <20241114194514.20965-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 X-Debbugs-CC: dummy@example.com
@@ -506912,8 +505757,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013933.7737-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:14 +0000
+Message-ID: <20241114194514.21121-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -506952,8 +505797,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013933.7841-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:15 +0000
+Message-ID: <20241114194515.21186-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 X-Debbugs-CC: someone@example.com
@@ -507040,8 +505885,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013934.8280-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:16 +0000
+Message-ID: <20241114194516.21425-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -507074,8 +505919,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013934.8379-1-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:16 +0000
+Message-ID: <20241114194516.21531-1-author@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -507107,8 +505952,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013934.8478-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:15 +0000
+Message-ID: <20241114194516.21618-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -507127,11 +505972,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013934.8478-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:16 +0000
+Message-ID: <20241114194516.21618-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013934.8478-1-nobody@example.com>
-References: <20251218013934.8478-1-nobody@example.com>
+In-Reply-To: <20241114194516.21618-1-nobody@example.com>
+References: <20241114194516.21618-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -507162,8 +506007,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013934.8626-1-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:17 +0000
+Message-ID: <20241114194517.21842-1-author@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -507197,8 +506042,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013934.8725-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:17 +0000
+Message-ID: <20241114194517.21975-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -507234,8 +506079,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013934.8821-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:17 +0000
+Message-ID: <20241114194517.22076-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -507268,8 +506113,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013934.8922-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:17 +0000
+Message-ID: <20241114194518.22178-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -507288,11 +506133,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013934.8922-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:18 +0000
+Message-ID: <20241114194518.22178-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013934.8922-1-nobody@example.com>
-References: <20251218013934.8922-1-nobody@example.com>
+In-Reply-To: <20241114194518.22178-1-nobody@example.com>
+References: <20241114194518.22178-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -507323,8 +506168,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013934.9041-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:17 +0000
+Message-ID: <20241114194518.22281-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -507343,11 +506188,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013934.9041-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:18 +0000
+Message-ID: <20241114194518.22281-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013934.9041-1-nobody@example.com>
-References: <20251218013934.9041-1-nobody@example.com>
+In-Reply-To: <20241114194518.22281-1-nobody@example.com>
+References: <20241114194518.22281-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
 
@@ -507378,8 +506223,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013934.9152-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:18 +0000
+Message-ID: <20241114194519.22407-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -507398,11 +506243,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013934.9152-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:19 +0000
+Message-ID: <20241114194519.22407-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013934.9152-1-nobody@example.com>
-References: <20251218013934.9152-1-nobody@example.com>
+In-Reply-To: <20241114194519.22407-1-nobody@example.com>
+References: <20241114194519.22407-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
 
@@ -507509,8 +506354,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:36 +0000
-Message-ID: <20251218013935.9924-2-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:21 +0000
+Message-ID: <20241114194520.22924-2-author@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 X-test-header: v1.0
@@ -507547,8 +506392,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:36 +0000
-Message-ID: <20251218013935.10124-2-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:21 +0000
+Message-ID: <20241114194520.22995-2-author@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -507563,8 +506408,8 @@
 Cc: A <author@example.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH] Second.
-Date: Thu, 18 Dec 2025 01:39:37 +0000
-Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1766021971.git.committer@example.com>
+Date: Thu, 14 Nov 2024 19:45:22 +0000
+Message-ID: <60cacbfe300cd164f7b9f1654d3409ba2f8d8d0e.1731613508.git.committer@example.com>
 X-Mailer: git-send-email 2.45.2
 In-Reply-To: <format>
 References: <format>
@@ -507598,8 +506443,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:35 +0000
-Message-ID: <20251218013935.10436-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:21 +0000
+Message-ID: <20241114194521.23138-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
@@ -507632,8 +506477,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:35 +0000
-Message-ID: <20251218013935.10715-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:21 +0000
+Message-ID: <20241114194521.23192-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -507666,8 +506511,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:35 +0000
-Message-ID: <20251218013935.11032-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:22 +0000
+Message-ID: <20241114194522.23289-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: quoted-printable
@@ -507700,8 +506545,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:35 +0000
-Message-ID: <20251218013935.11378-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:22 +0000
+Message-ID: <20241114194522.23368-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: base64
@@ -507735,8 +506580,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:35 +0000
-Message-ID: <20251218013935.11684-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:22 +0000
+Message-ID: <20241114194522.23595-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -507768,8 +506613,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:35 +0000
-Message-ID: <20251218013935.11862-1-author@example.com>
+Date: Thu, 14 Nov 2024 19:45:22 +0000
+Message-ID: <20241114194522.23701-1-author@example.com>
 X-Mailer: git-send-email 2.45.2
 In-Reply-To: <To Example <to@example.com>
 References: <To Example <to@example.com>
@@ -507816,8 +506661,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:33 +0000
-Message-ID: <20251218013935.11975-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:21 +0000
+Message-ID: <20241114194523.23942-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -507838,12 +506683,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013935.11975-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:22 +0000
+Message-ID: <20241114194523.23942-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013935.11975-1-nobody@example.com>
+In-Reply-To: <20241114194523.23942-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20251218013935.11975-1-nobody@example.com>
+ <20241114194523.23942-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -507861,12 +506706,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:35 +0000
-Message-ID: <20251218013935.11975-3-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:23 +0000
+Message-ID: <20241114194523.23942-3-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013935.11975-1-nobody@example.com>
+In-Reply-To: <20241114194523.23942-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20251218013935.11975-1-nobody@example.com>
+ <20241114194523.23942-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -507909,8 +506754,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:34 +0000
-Message-ID: <20251218013936.12248-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:22 +0000
+Message-ID: <20241114194524.24557-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 In-Reply-To: <unique-message-id@example.com>
 References: <unique-message-id@example.com>
@@ -507931,12 +506776,12 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:35 +0000
-Message-ID: <20251218013936.12248-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:23 +0000
+Message-ID: <20241114194524.24557-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013936.12248-1-nobody@example.com>
+In-Reply-To: <20241114194524.24557-1-nobody@example.com>
 References: <unique-message-id@example.com>
- <20251218013936.12248-1-nobody@example.com>
+ <20241114194524.24557-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -507954,13 +506799,13 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:36 +0000
-Message-ID: <20251218013936.12248-3-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:24 +0000
+Message-ID: <20241114194524.24557-3-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013936.12248-2-nobody@example.com>
+In-Reply-To: <20241114194524.24557-2-nobody@example.com>
 References: <unique-message-id@example.com>
- <20251218013936.12248-1-nobody@example.com>
- <20251218013936.12248-2-nobody@example.com>
+ <20241114194524.24557-1-nobody@example.com>
+ <20241114194524.24557-2-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -508014,8 +506859,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Thu, 18 Dec 2025 01:39:36 +0000
-Message-ID: <20251218013936.12690-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:26 +0000
+Message-ID: <20241114194526.24879-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -508034,11 +506879,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:37 +0000
-Message-ID: <20251218013936.12690-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:27 +0000
+Message-ID: <20241114194526.24879-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013936.12690-1-nobody@example.com>
-References: <20251218013936.12690-1-nobody@example.com>
+In-Reply-To: <20241114194526.24879-1-nobody@example.com>
+References: <20241114194526.24879-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -508440,8 +507285,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Thu, 18 Dec 2025 01:39:36 +0000
-Message-ID: <20251218013937.14897-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:30 +0000
+Message-ID: <20241114194531.27899-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -508463,8 +507308,8 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 1/2] Initial.
-Date: Thu, 18 Dec 2025 01:39:36 +0000
-Message-ID: <20251218013937.14897-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:30 +0000
+Message-ID: <20241114194531.27899-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -508476,11 +507321,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Thu, 18 Dec 2025 01:39:37 +0000
-Message-ID: <20251218013937.14897-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:31 +0000
+Message-ID: <20241114194531.27899-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013937.14897-1-nobody@example.com>
-References: <20251218013937.14897-1-nobody@example.com>
+In-Reply-To: <20241114194531.27899-1-nobody@example.com>
+References: <20241114194531.27899-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -508491,11 +507336,11 @@
 To: nobody@example.com
 Cc: A <author@example.com>
 Subject: [PATCH 2/2] Second.
-Date: Thu, 18 Dec 2025 01:39:37 +0000
-Message-ID: <20251218013937.14897-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:31 +0000
+Message-ID: <20241114194531.27899-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013937.14897-1-nobody@example.com>
-References: <20251218013937.14897-1-nobody@example.com>
+In-Reply-To: <20241114194531.27899-1-nobody@example.com>
+References: <20241114194531.27899-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -508526,8 +507371,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:37 +0000
-Message-ID: <20251218013937.15075-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:31 +0000
+Message-ID: <20241114194531.28065-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -508560,8 +507405,8 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:37 +0000
-Message-ID: <20251218013937.15185-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:31 +0000
+Message-ID: <20241114194531.28173-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -508592,8 +507437,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: Thu, 18 Dec 2025 01:39:37 +0000
-Message-ID: <20251218013937.15354-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:32 +0000
+Message-ID: <20241114194532.28283-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -508623,8 +507468,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Thu, 18 Dec 2025 01:39:38 +0000
-Message-ID: <20251218013938.15526-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:32 +0000
+Message-ID: <20241114194532.28476-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -508644,11 +507489,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:39 +0000
-Message-ID: <20251218013938.15526-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:33 +0000
+Message-ID: <20241114194532.28476-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013938.15526-1-nobody@example.com>
-References: <20251218013938.15526-1-nobody@example.com>
+In-Reply-To: <20241114194532.28476-1-nobody@example.com>
+References: <20241114194532.28476-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -508686,8 +507531,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Thu, 18 Dec 2025 01:39:38 +0000
-Message-ID: <20251218013938.15721-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:32 +0000
+Message-ID: <20241114194532.28639-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -508707,11 +507552,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:39 +0000
-Message-ID: <20251218013938.15721-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:33 +0000
+Message-ID: <20241114194532.28639-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013938.15721-1-nobody@example.com>
-References: <20251218013938.15721-1-nobody@example.com>
+In-Reply-To: <20241114194532.28639-1-nobody@example.com>
+References: <20241114194532.28639-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -508738,8 +507583,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?UTF-8?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Thu, 18 Dec 2025 01:39:38 +0000
-Message-ID: <20251218013938.15904-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:33 +0000
+Message-ID: <20241114194533.28903-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -508759,11 +507604,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:39 +0000
-Message-ID: <20251218013938.15904-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:34 +0000
+Message-ID: <20241114194533.28903-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013938.15904-1-nobody@example.com>
-References: <20251218013938.15904-1-nobody@example.com>
+In-Reply-To: <20241114194533.28903-1-nobody@example.com>
+References: <20241114194533.28903-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -508801,8 +507646,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: Thu, 18 Dec 2025 01:39:38 +0000
-Message-ID: <20251218013938.16153-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:34 +0000
+Message-ID: <20241114194534.29169-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -508843,8 +507688,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: Thu, 18 Dec 2025 01:39:38 +0000
-Message-ID: <20251218013938.16407-1-odd_?=mail@example.com>
+Date: Thu, 14 Nov 2024 19:45:34 +0000
+Message-ID: <20241114194534.29447-1-odd_?=mail@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -508875,8 +507720,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Thu, 18 Dec 2025 01:39:38 +0000
-Message-ID: <20251218013938.16621-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:35 +0000
+Message-ID: <20241114194535.29675-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -508896,11 +507741,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:39 +0000
-Message-ID: <20251218013938.16621-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:36 +0000
+Message-ID: <20241114194535.29675-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013938.16621-1-nobody@example.com>
-References: <20251218013938.16621-1-nobody@example.com>
+In-Reply-To: <20241114194535.29675-1-nobody@example.com>
+References: <20241114194535.29675-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -508931,8 +507776,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Thu, 18 Dec 2025 01:39:38 +0000
-Message-ID: <20251218013938.16902-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:35 +0000
+Message-ID: <20241114194535.29914-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-1
@@ -508952,11 +507797,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:39 +0000
-Message-ID: <20251218013938.16902-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:36 +0000
+Message-ID: <20241114194535.29914-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013938.16902-1-nobody@example.com>
-References: <20251218013938.16902-1-nobody@example.com>
+In-Reply-To: <20241114194535.29914-1-nobody@example.com>
+References: <20241114194535.29914-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -508988,8 +507833,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: foo
-Date: Thu, 18 Dec 2025 01:39:38 +0000
-Message-ID: <20251218013938.17187-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:35 +0000
+Message-ID: <20241114194535.30127-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -509009,11 +507854,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:39 +0000
-Message-ID: <20251218013938.17187-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:36 +0000
+Message-ID: <20241114194535.30127-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013938.17187-1-nobody@example.com>
-References: <20251218013938.17187-1-nobody@example.com>
+In-Reply-To: <20241114194535.30127-1-nobody@example.com>
+References: <20241114194535.30127-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -509041,8 +507886,8 @@
 From: Example <nobody@example.com>
 To: nobody@example.com
 Subject: =?iso-8859-2?q?utf8-s=C3=BCbj=C3=ABct?=
-Date: Thu, 18 Dec 2025 01:39:38 +0000
-Message-ID: <20251218013938.17459-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:36 +0000
+Message-ID: <20241114194536.30411-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Type: text/plain; charset=iso-8859-2
@@ -509062,11 +507907,11 @@
 	two@example.com,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 1/1] Second.
-Date: Thu, 18 Dec 2025 01:39:39 +0000
-Message-ID: <20251218013938.17459-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:45:37 +0000
+Message-ID: <20241114194536.30411-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013938.17459-1-nobody@example.com>
-References: <20251218013938.17459-1-nobody@example.com>
+In-Reply-To: <20241114194536.30411-1-nobody@example.com>
+References: <20241114194536.30411-1-nobody@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -509139,7 +507984,7 @@
 		$patches $patches >stdout &&
 	grep "In-Reply-To: " stdout
 
-In-Reply-To: <20251218013939.18294-1-nobody@example.com>
+In-Reply-To: <20241114194537.31169-1-nobody@example.com>
 ok 108 - threading but no chain-reply-to
 
 expecting success of 9001.109 'override in-reply-to if no threading': 
@@ -510153,6 +508998,7 @@
 	>actual-list &&
 	test_cmp expected-list actual-list
 
+./test-lib.sh: line 1060: warning: command substitution: ignored null byte in input
 ok 184 - leading and trailing whitespaces are removed
 
 expecting success of 9001.185 'test using command name with --sendmail-cmd': 
@@ -510165,7 +509011,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/UOPoQQSp5e/0001-add-main.patch
+/tmp/NcSKjtMp50/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
@@ -510174,8 +509020,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:47 +0000
-Message-ID: <20251218013947.28681-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:46:09 +0000
+Message-ID: <20241114194609.11409-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510192,7 +509038,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/TfDNEes0jZ/0001-add-main.patch
+/tmp/1nKjHKyFxf/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
@@ -510201,8 +509047,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:47 +0000
-Message-ID: <20251218013947.28754-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:46:09 +0000
+Message-ID: <20241114194609.11480-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510219,7 +509065,7 @@
 		HEAD^ &&
 	test_path_is_file commandline1
 
-/tmp/JrZvaaoE73/0001-add-main.patch
+/tmp/TDCdwZs2HA/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
@@ -510228,8 +509074,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:47 +0000
-Message-ID: <20251218013947.28842-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:46:10 +0000
+Message-ID: <20241114194610.11587-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510278,7 +509124,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Thu, 18 Dec 2025 01:39:46 +0000
+Date: Thu, 14 Nov 2024 19:46:09 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.45.2
 In-Reply-To: <replied.to@example.com>
@@ -510295,7 +509141,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Thu, 18 Dec 2025 01:39:47 +0000
+Date: Thu, 14 Nov 2024 19:46:10 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
@@ -510329,7 +509175,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch with in-reply-to
-Date: Thu, 18 Dec 2025 01:39:47 +0000
+Date: Thu, 14 Nov 2024 19:46:09 +0000
 Message-ID: <patch.with.in.reply.to@example.com>
 X-Mailer: git-send-email 2.45.2
 In-Reply-To: <cmdline.reply@example.com>
@@ -510346,7 +509192,7 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: patch without in-reply-to
-Date: Thu, 18 Dec 2025 01:39:48 +0000
+Date: Thu, 14 Nov 2024 19:46:10 +0000
 Message-ID: <patch.without.in.reply.to@example.com>
 X-Mailer: git-send-email 2.45.2
 In-Reply-To: <cmdline.reply@example.com>
@@ -510408,8 +509254,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:49 +0000
-Message-ID: <20251218013948.29227-2-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:46:12 +0000
+Message-ID: <20241114194611.12185-2-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510439,10 +509285,10 @@
 		--validate -3 --cover-letter --force &&
 	test_cmp expect my-hooks.log
 
-/tmp/mNsShE3pTs/0000-cover-letter.patch
-/tmp/mNsShE3pTs/0001-Initial.patch
-/tmp/mNsShE3pTs/0002-Second.patch
-/tmp/mNsShE3pTs/0003-add-main.patch
+/tmp/3DTROBOCp6/0000-cover-letter.patch
+/tmp/3DTROBOCp6/0001-Initial.patch
+/tmp/3DTROBOCp6/0002-Second.patch
+/tmp/3DTROBOCp6/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.45.2/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com committer@example.com other@ex.com
@@ -510451,8 +509297,8 @@
 Cc: Somebody <somebody@ex.com>,
 	C O Mitter <committer@example.com>
 Subject: [PATCH 0/3] *** SUBJECT HERE ***
-Date: Thu, 18 Dec 2025 01:39:49 +0000
-Message-ID: <20251218013948.29571-5-from@example.com>
+Date: Thu, 14 Nov 2024 19:46:12 +0000
+Message-ID: <20241114194611.12510-5-from@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510466,11 +509312,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 1/3] Initial.
-Date: Thu, 18 Dec 2025 01:39:50 +0000
-Message-ID: <20251218013948.29571-6-from@example.com>
+Date: Thu, 14 Nov 2024 19:46:13 +0000
+Message-ID: <20241114194611.12510-6-from@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013948.29571-5-from@example.com>
-References: <20251218013948.29571-5-from@example.com>
+In-Reply-To: <20241114194611.12510-5-from@example.com>
+References: <20241114194611.12510-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -510483,11 +509329,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A <author@example.com>
 Subject: [PATCH 2/3] Second.
-Date: Thu, 18 Dec 2025 01:39:51 +0000
-Message-ID: <20251218013948.29571-7-from@example.com>
+Date: Thu, 14 Nov 2024 19:46:14 +0000
+Message-ID: <20241114194611.12510-7-from@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013948.29571-5-from@example.com>
-References: <20251218013948.29571-5-from@example.com>
+In-Reply-To: <20241114194611.12510-5-from@example.com>
+References: <20241114194611.12510-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -510500,11 +509346,11 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH 3/3] add main
-Date: Thu, 18 Dec 2025 01:39:52 +0000
-Message-ID: <20251218013948.29571-8-from@example.com>
+Date: Thu, 14 Nov 2024 19:46:15 +0000
+Message-ID: <20241114194611.12510-8-from@example.com>
 X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013948.29571-5-from@example.com>
-References: <20251218013948.29571-5-from@example.com>
+In-Reply-To: <20241114194611.12510-5-from@example.com>
+References: <20241114194611.12510-5-from@example.com>
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 
@@ -510525,8 +509371,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:48 +0000
-Message-ID: <20251218013948.29847-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:46:12 +0000
+Message-ID: <20241114194612.12786-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510548,8 +509394,8 @@
 To: nobody@example.com
 Cc: A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:48 +0000
-Message-ID: <20251218013948.29847-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:46:12 +0000
+Message-ID: <20241114194612.12786-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510585,7 +509431,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/Yht0FIIFtU/0001-add-main.patch
+/tmp/RTfLIEbgH3/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.45.2/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -510594,8 +509440,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:49 +0000
-Message-ID: <20251218013949.30097-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:46:13 +0000
+Message-ID: <20241114194613.13312-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510612,7 +509458,7 @@
 		--smtp-server="$(pwd)/fake.sendmail" \
 		HEAD^
 
-/tmp/sNUOcgAi9C/0001-add-main.patch
+/tmp/wUFweq8D5P/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.45.2/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com somebody@ex.com author@example.com other@ex.com
@@ -510621,8 +509467,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:49 +0000
-Message-ID: <20251218013949.30279-1-nobody@example.com>
+Date: Thu, 14 Nov 2024 19:46:14 +0000
+Message-ID: <20241114194614.13620-1-nobody@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510644,7 +509490,7 @@
 		HEAD^ &&
 	grep "From: edited-from@example.com" msgtxt1
 
-/tmp/vMPbHiQjWx/0001-add-main.patch
+/tmp/ymUBZ9YOtj/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:
@@ -510654,8 +509500,8 @@
 Cc: Somebody <somebody@ex.com>,
 	A U Thor <author@example.com>
 Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:49 +0000
-Message-ID: <20251218013949.30433-1-edited-from@example.com>
+Date: Thu, 14 Nov 2024 19:46:15 +0000
+Message-ID: <20241114194615.13828-1-edited-from@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510689,7 +509535,7 @@
 	grep -A1 "^To:" msgtxt2 >msgtxt2.to &&
 	test_cmp expect msgtxt2.to
 
-/tmp/TYaRVsjnlp/0001-add-main.patch
+/tmp/UNZ2C1X7YN/0001-add-main.patch
 OK. Log says:
 Sendmail: /build/reproducible-path/git-2.45.2/t/trash directory.t9001-send-email/fake.sendmail -i nobody@example.com edited-to@example.com somebody@ex.com
 From: Example <from@example.com>
@@ -510697,8 +509543,8 @@
 	edited-to@example.com
 Cc: Somebody <somebody@ex.com>
 Subject: 
-Date: Thu, 18 Dec 2025 01:39:49 +0000
-Message-ID: <20251218013950.30594-1-from@example.com>
+Date: Thu, 14 Nov 2024 19:46:16 +0000
+Message-ID: <20241114194616.14068-1-from@example.com>
 X-Mailer: git-send-email 2.45.2
 MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
@@ -510710,137 +509556,273 @@
 From: Example <from@example.com>
 To: nobody@example.com,
 	edited-to@example.com
-Cc: Somebody <somebody@ex.com>,
-	A U Thor <author@example.com>
-Subject: [PATCH] add main
-Date: Thu, 18 Dec 2025 01:39:50 +0000
-Message-ID: <20251218013950.30594-2-from@example.com>
-X-Mailer: git-send-email 2.45.2
-In-Reply-To: <20251218013950.30594-1-from@example.com>
-References: <20251218013950.30594-1-from@example.com>
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-
-Result: OK
-ok 199 - --compose handles to headers
-
-# passed all 199 test(s)
-1..199
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9112-git-svn-md5less-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9112-git-svn-md5less-file/.git/
-expecting success of 9112.1 'load svn dumpfile': svnadmin load "$rawsvnrepo" < dumpfile.svn
-<<< Started new transaction, based on original revision 1
-     * editing path : md5less-file ... done.
-
-------- Committed revision 1 >>>
-
-ok 1 - load svn dumpfile
-
-expecting success of 9112.2 'initialize git svn': git svn init "$svnrepo"
-ok 2 - initialize git svn
+Cc: Somebody <somebody@ex.com>,
+	A U Thor <author@example.com>
+Subject: [PATCH] add main
+Date: Thu, 14 Nov 2024 19:46:17 +0000
+Message-ID: <20241114194616.14068-2-from@example.com>
+X-Mailer: git-send-email 2.45.2
+In-Reply-To: <20241114194616.14068-1-from@example.com>
+References: <20241114194616.14068-1-from@example.com>
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
 
-expecting success of 9112.3 'fetch revisions from svn': git svn fetch
-	A	md5less-file
-r1 = 79492b0096d8e4cf013f4cf5c97fda2438c52289 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
-ok 3 - fetch revisions from svn
+Result: OK
+ok 199 - --compose handles to headers
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9113-git-svn-dcommit-new-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9113-git-svn-dcommit-new-file/.git/
-1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
+# passed all 199 test(s)
+1..199
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9111-git-svn-use-svnsync-props.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+*** t9107-git-svn-migrate.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9107-git-svn-migrate/.git/
+expecting success of 9107.1 'setup old-looking metadata': 
+	cp "$GIT_DIR"/config "$GIT_DIR"/config-old-git-svn &&
+	mkdir import &&
+	(
+		cd import &&
+		for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3
+		do
+			mkdir -p $i &&
+			echo hello >>$i/README ||
+			exit 1
+		done &&
+		svn_cmd import -m test . "$svnrepo"
+	) &&
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	rm -rf "$GIT_DIR"/svn &&
+	git update-ref refs/heads/git-svn-HEAD refs/remotes/git-svn &&
+	git update-ref refs/heads/svn-HEAD refs/remotes/git-svn &&
+	git update-ref -d refs/remotes/git-svn refs/remotes/git-svn
 	
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
-	A	file
-r1 = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
-	A	a/b/c/d/e/file
-r1 = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
-	D	a/b/c/d/e/file
-	D	a/
-	A	file
-W: -empty_dir: dir/a
-r2 = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
-	A	zzz
-r1 = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
-	M	zzz
-r6 = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
-	A	d
-r9 = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
-	A	newdir/dir
-r10 = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
-	M	newdir/dir
-r11 = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
-	M	d
-r12 = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
+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	branches/a/README
+	A	branches/b/README
+	A	tags/0.1/README
+	A	tags/0.2/README
+	A	tags/0.3/README
+	A	trunk/README
+r1 = b8fd3da96b4e5232b8d6eac5f70773173b6562b9 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar r12
-ok 1 - load svnsync repo
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo r1
+ok 1 - setup old-looking metadata
 
-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 9107.2 'git-svn-HEAD is a real HEAD': 
+	git rev-parse --verify refs/heads/git-svn-HEAD^0
+
+b8fd3da96b4e5232b8d6eac5f70773173b6562b9
+ok 2 - git-svn-HEAD is a real HEAD
+
+expecting success of 9107.3 'initialize old-style (v0) git svn layout': 
+	mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
+	echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
+	echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
+	git svn migrate &&
+	! test -d "$GIT_DIR"/git-svn &&
+	git rev-parse --verify refs/remotes/git-svn^0 &&
+	git rev-parse --verify refs/remotes/svn^0 &&
+	test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
+	test $(git config --get svn-remote.svn.fetch) = \
+		":refs/remotes/git-svn"
 	
-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
+Migrating from v0 layout...
+Renaming ref: refs/heads/git-svn-HEAD => refs/remotes/git-svn
+Renaming ref: refs/heads/svn-HEAD => refs/remotes/svn
+Done migrating from v0 layout...
+Migrating from a git-svn v1 layout...
+Data from a previous version of git-svn exists, but
+	.git/svn
+	(required for this version (2.45.2) of git-svn) does not exist.
+ - .git/git-svn => .git/svn/git-svn
+ - .git/svn/info => .git/svn/svn/info
+Done migrating from a git-svn v1 layout
+b8fd3da96b4e5232b8d6eac5f70773173b6562b9
+b8fd3da96b4e5232b8d6eac5f70773173b6562b9
+ok 3 - initialize old-style (v0) git svn layout
 
-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 9107.4 'initialize a multi-repository repo': 
+	git svn init "$svnrepo" -T trunk -t tags -b branches &&
+	git config --get-all svn-remote.svn.fetch > fetch.out &&
+	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
+	test -n "$(git config --get svn-remote.svn.branches \
+		    "^branches/\*:refs/remotes/origin/\*$")" &&
+	test -n "$(git config --get svn-remote.svn.tags \
+		    "^tags/\*:refs/remotes/origin/tags/\*$")" &&
+	git config --unset svn-remote.svn.branches \
+	                        "^branches/\*:refs/remotes/origin/\*$" &&
+	git config --unset svn-remote.svn.tags \
+	                        "^tags/\*:refs/remotes/origin/tags/\*$" &&
+	git config --add svn-remote.svn.fetch "branches/a:refs/remotes/origin/a" &&
+	git config --add svn-remote.svn.fetch "branches/b:refs/remotes/origin/b" &&
+	for i in tags/0.1 tags/0.2 tags/0.3
+	do
+		git config --add svn-remote.svn.fetch \
+			$i:refs/remotes/origin/$i || return 1
+	done &&
+	git config --get-all svn-remote.svn.fetch > fetch.out &&
+	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
+	grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
+	grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
+	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
+	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
+	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
+	grep "^:refs/remotes/git-svn" fetch.out
 	
-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
+Using existing [svn-remote "svn"]
+trunk:refs/remotes/origin/trunk
+trunk:refs/remotes/origin/trunk
+branches/a:refs/remotes/origin/a
+branches/b:refs/remotes/origin/b
+tags/0.1:refs/remotes/origin/tags/0.1
+tags/0.2:refs/remotes/origin/tags/0.2
+tags/0.3:refs/remotes/origin/tags/0.3
+:refs/remotes/git-svn
+ok 4 - initialize a multi-repository repo
 
-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
+expecting success of 9107.5 'multi-fetch works on partial urls + paths': 
+	refs="trunk a b tags/0.1 tags/0.2 tags/0.3" &&
+	git svn multi-fetch &&
+	for i in $refs
+	do
+		git rev-parse --verify refs/remotes/origin/$i^0 || return 1;
+	done >refs.out &&
+	test -z "$(sort <refs.out | uniq -d)" &&
+	for i in $refs
+	do
+		for j in $refs
+		do
+			git diff --exit-code refs/remotes/origin/$i \
+					     refs/remotes/origin/$j ||
+				return 1
+		done
+	done
+
+Rebuilding .git/svn/git-svn/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b ...
+r1 = b8fd3da96b4e5232b8d6eac5f70773173b6562b9
+Done rebuilding .git/svn/git-svn/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b
+	A	README
+r1 = a0969aab27f872e0184890ec7bbe7809fd31f4cf (refs/remotes/origin/tags/0.1)
+	A	README
+r1 = 4346f0b206704ee1afeb45a5bf45ae63c8f713b8 (refs/remotes/origin/b)
+	A	README
+r1 = adabed39a8b06a41de29950271c527d2002ea1ac (refs/remotes/origin/tags/0.3)
+	A	README
+r1 = 3da74ff1b366b7e5031897c902c2223d7b4fd66b (refs/remotes/origin/tags/0.2)
+	A	README
+r1 = c4395baedfe0724cf4eb68df5b67aeedc4dfe402 (refs/remotes/origin/a)
+	A	README
+r1 = 19336d7fce7a22a4f0d0a029660c54409aeb6cce (refs/remotes/origin/trunk)
+ok 5 - multi-fetch works on partial urls + paths
+
+expecting success of 9107.6 'migrate --minimize on old inited layout': 
+	git config --unset-all svn-remote.svn.fetch &&
+	git config --unset-all svn-remote.svn.url &&
+	rm -rf "$GIT_DIR"/svn &&
+	for i in $(cat fetch.out)
+	do
+		path=${i%%:*} &&
+		ref=${i#*:} &&
+		if test "$ref" = "${ref#refs/remotes/}"; then continue; fi &&
+		if test -n "$path"; then path="/$path"; fi &&
+		mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
+		echo "$svnrepo"$path >"$GIT_DIR"/svn/$ref/info/url ||
+		return 1
+	done &&
+	git svn migrate --minimize &&
+	test -z "$(git config -l | grep "^svn-remote\.git-svn\.")" &&
+	git config --get-all svn-remote.svn.fetch > fetch.out &&
+	grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
+	grep "^branches/a:refs/remotes/origin/a$" fetch.out &&
+	grep "^branches/b:refs/remotes/origin/b$" fetch.out &&
+	grep "^tags/0\.1:refs/remotes/origin/tags/0\.1$" fetch.out &&
+	grep "^tags/0\.2:refs/remotes/origin/tags/0\.2$" fetch.out &&
+	grep "^tags/0\.3:refs/remotes/origin/tags/0\.3$" fetch.out &&
+	grep "^:refs/remotes/git-svn" fetch.out
 	
-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
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/branches/b => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.1 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.2 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/tags/0.3 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+Using existing [svn-remote "svn"]
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9107-git-svn-migrate/svnrepo
+trunk:refs/remotes/origin/trunk
+branches/a:refs/remotes/origin/a
+branches/b:refs/remotes/origin/b
+tags/0.1:refs/remotes/origin/tags/0.1
+tags/0.2:refs/remotes/origin/tags/0.2
+tags/0.3:refs/remotes/origin/tags/0.3
+:refs/remotes/git-svn
+ok 6 - migrate --minimize on old inited layout
 
-# passed all 4 test(s)
-1..4
+expecting success of 9107.7 '.rev_db auto-converted to .rev_map.UUID': 
+	git svn fetch -i trunk &&
+	test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
+	expect="$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_map.*)" &&
+	test -n "$expect" &&
+	rev_db="$(echo $expect | sed -e "s,_map,_db,")" &&
+	convert_to_rev_db "$expect" "$rev_db" &&
+	rm -f "$expect" &&
+	test -f "$rev_db" &&
+	git svn fetch -i trunk &&
+	test -z "$(ls "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db.* 2>/dev/null)" &&
+	test ! -e "$GIT_DIR"/svn/refs/remotes/origin/trunk/.rev_db &&
+	test -f "$expect"
+	
+Rebuilding .git/svn/refs/remotes/git-svn/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b ...
+r1 = b8fd3da96b4e5232b8d6eac5f70773173b6562b9
+Done rebuilding .git/svn/refs/remotes/git-svn/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b
+Rebuilding .git/svn/refs/remotes/origin/a/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b ...
+r1 = c4395baedfe0724cf4eb68df5b67aeedc4dfe402
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b
+Rebuilding .git/svn/refs/remotes/origin/b/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b ...
+r1 = 4346f0b206704ee1afeb45a5bf45ae63c8f713b8
+Done rebuilding .git/svn/refs/remotes/origin/b/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b
+Rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b ...
+r1 = a0969aab27f872e0184890ec7bbe7809fd31f4cf
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.1/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b
+Rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b ...
+r1 = 3da74ff1b366b7e5031897c902c2223d7b4fd66b
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.2/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b
+Rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b ...
+r1 = adabed39a8b06a41de29950271c527d2002ea1ac
+Done rebuilding .git/svn/refs/remotes/origin/tags/0.3/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b ...
+r1 = 19336d7fce7a22a4f0d0a029660c54409aeb6cce
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b
+Rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b ...
+r1 = 19336d7fce7a22a4f0d0a029660c54409aeb6cce
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0421e5c3-7a29-40aa-ad39-b7b35afb703b
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9109-git-svn-multi-glob.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9109-git-svn-multi-glob/.git/
-expecting success of 9109.1 'test refspec globbing': 
+*** t9108-git-svn-glob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9108-git-svn-glob/.git/
+expecting success of 9108.1 'test refspec 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 &&
@@ -510848,18 +509830,18 @@
 	svn_cmd co "$svnrepo" tmp &&
 	(
 		cd tmp &&
-		mkdir branches branches/v1 tags &&
+		mkdir branches tags &&
 		svn_cmd add branches tags &&
-		svn_cmd cp trunk branches/v1/start &&
+		svn_cmd cp trunk branches/start &&
 		svn_cmd commit -m "start a new branch" &&
 		svn_cmd up &&
-		echo "hi" >> branches/v1/start/src/b/readme &&
-		poke branches/v1/start/src/b/readme &&
-		echo "hey" >> branches/v1/start/src/a/readme &&
-		poke branches/v1/start/src/a/readme &&
+		echo "hi" >> branches/start/src/b/readme &&
+		poke branches/start/src/b/readme &&
+		echo "hey" >> branches/start/src/a/readme &&
+		poke branches/start/src/a/readme &&
 		svn_cmd commit -m "hi" &&
 		svn_cmd up &&
-		svn_cmd cp branches/v1/start tags/end &&
+		svn_cmd cp branches/start tags/end &&
 		echo "bye" >> tags/end/src/b/readme &&
 		poke tags/end/src/b/readme &&
 		echo "aye" >> tags/end/src/a/readme &&
@@ -510873,7 +509855,7 @@
 	git config --add svn-remote.svn.fetch \
 	                 "trunk/src/a:refs/remotes/trunk" &&
 	git config --add svn-remote.svn.branches \
-	                 "branches/*/*/src/a:refs/remotes/branches/*/*" &&
+	                 "branches/*/src/a:refs/remotes/branches/*" &&
 	git config --add svn-remote.svn.tags\
 	                 "tags/*/src/a:refs/remotes/tags/*" &&
 	git svn multi-fetch &&
@@ -510881,8 +509863,8 @@
 	cut -d" " -f2- actual >output.end &&
 	test_cmp expect.end output.end &&
 	test "$(git rev-parse refs/remotes/tags/end~1)" = \
-		"$(git rev-parse refs/remotes/branches/v1/start)" &&
-	test "$(git rev-parse refs/remotes/branches/v1/start~2)" = \
+		"$(git rev-parse refs/remotes/branches/start)" &&
+	test "$(git rev-parse refs/remotes/branches/start~2)" = \
 		"$(git rev-parse refs/remotes/trunk)" &&
 	test_must_fail git rev-parse refs/remotes/tags/end@3
 	
@@ -510903,19 +509885,17 @@
 A    tmp/trunk/src/b/readme
 Checked out revision 1.
 A         branches
-A         branches/v1
 A         tags
-A         branches/v1/start
+A         branches/start
 Adding         branches
-Adding         branches/v1
-Adding         branches/v1/start
+Adding         branches/start
 Adding         tags
 Committing transaction...
 Committed revision 2.
 Updating '.':
 At revision 2.
-Sending        branches/v1/start/src/a/readme
-Sending        branches/v1/start/src/b/readme
+Sending        branches/start/src/a/readme
+Sending        branches/start/src/b/readme
 Transmitting file data ..done
 Committing transaction...
 Committed revision 3.
@@ -510938,35 +509918,35 @@
 	(required for this version (2.45.2) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = c9b9622223ca899e2e34c70a4dcdfd7584ccacba (refs/remotes/trunk)
+r1 = b994b9347443ab6b6fc906e90f6d775db683bf78 (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a, 1
-Found branch parent: (refs/remotes/branches/v1/start) c9b9622223ca899e2e34c70a4dcdfd7584ccacba
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a, 1
+Found branch parent: (refs/remotes/branches/start) b994b9347443ab6b6fc906e90f6d775db683bf78
 Following parent with do_switch
 Successfully followed parent
-r2 = 2d5f732d92afb47f060933085cb2a6b0f7ace9b0 (refs/remotes/branches/v1/start)
+r2 = a05a4f5e774aa9dc9d8cda4a5e8665d14549724c (refs/remotes/branches/start)
 	M	readme
-r3 = 66cf6809ed2ffa3aea14b201fb53b1ad192c7438 (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.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end/src/a, 3
-Found branch parent: (refs/remotes/tags/end) 66cf6809ed2ffa3aea14b201fb53b1ad192c7438
+r3 = 30ca52743e1ee8e173b62642085088333e72a248 (refs/remotes/branches/start)
+branch_from: /branches/start => /branches/start/src/a
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end/src/a, 3
+Found branch parent: (refs/remotes/tags/end) 30ca52743e1ee8e173b62642085088333e72a248
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = 61e2e2f1a7cad82eee35b698aee1c988a25acbd5 (refs/remotes/tags/end)
+r4 = 48b0577f15cfff4ef2942a232959a1c19f055031 (refs/remotes/tags/end)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a r1
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk/src/a r1
 fatal: ambiguous argument 'refs/remotes/tags/end@3': unknown revision or path not in the working tree.
 Use '--' to separate paths from revisions, like this:
 'git <command> [<revision>...] -- [<file>...]'
 refs/remotes/tags/end@3
 ok 1 - test refspec globbing
 
-expecting success of 9109.2 'test left-hand-side only globbing': 
+expecting success of 9108.2 'test left-hand-side only 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/*/*:refs/remotes/two/branches/*/*" &&
+	                 "branches/*:refs/remotes/two/branches/*" &&
 	git config --add svn-remote.two.tags \
 	                 "tags/*:refs/remotes/two/tags/*" &&
 	(
@@ -510978,12 +509958,12 @@
 	git svn fetch two &&
 	git rev-list refs/remotes/two/tags/end >actual &&
 	test_line_count = 6 actual &&
-	git rev-list refs/remotes/two/branches/v1/start >actual &&
+	git rev-list refs/remotes/two/branches/start >actual &&
 	test_line_count = 3 actual &&
-	test $(git rev-parse refs/remotes/two/branches/v1/start~2) = \
+	test $(git rev-parse refs/remotes/two/branches/start~2) = \
 	     $(git rev-parse refs/remotes/two/trunk) &&
 	test $(git rev-parse refs/remotes/two/tags/end~3) = \
-	     $(git rev-parse refs/remotes/two/branches/v1/start) &&
+	     $(git rev-parse refs/remotes/two/branches/start) &&
 	git log --pretty=oneline refs/remotes/two/tags/end >actual &&
 	cut -d" " -f2- actual >output.two &&
 	test_cmp expect.two output.two
@@ -510995,155 +509975,44 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = bac67860ebeb141b9fc9ab45b3936957ff3038ab (refs/remotes/two/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/two/branches/v1/start) bac67860ebeb141b9fc9ab45b3936957ff3038ab
+r1 = 5d87c15c7222a710e2b8dd860c287ee6b14ed4b3 (refs/remotes/two/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start, 1
+Found branch parent: (refs/remotes/two/branches/start) 5d87c15c7222a710e2b8dd860c287ee6b14ed4b3
 Following parent with do_switch
 Successfully followed parent
-r2 = 9a7b408d37f2656d8b91b1aad864d297cdb54841 (refs/remotes/two/branches/v1/start)
+r2 = 5bd90b40ecef07c7ea5f39e31b53ff93d5637af4 (refs/remotes/two/branches/start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = ff032338c202a55e3e5452d59e772ca36058a4d6 (refs/remotes/two/branches/v1/start)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/two/tags/end) ff032338c202a55e3e5452d59e772ca36058a4d6
+r3 = 4aabf7b9f564b65e69eda9cbe039420e064b3c0c (refs/remotes/two/branches/start)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/branches/start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9108-git-svn-glob/svnrepo/tags/end, 3
+Found branch parent: (refs/remotes/two/tags/end) 4aabf7b9f564b65e69eda9cbe039420e064b3c0c
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 8d6aa4f19e44ebfea4b1502f740055704197a816 (refs/remotes/two/tags/end)
+r4 = 4fb508af9208a76ceb43a5863bc36faffce8626a (refs/remotes/two/tags/end)
 	M	src/b/readme
-r5 = e895742558dc26f97743b405d356a00cc35083c2 (refs/remotes/two/tags/end)
+r5 = 7725e6f3a97117cddcfda7707bb146725e290ccf (refs/remotes/two/tags/end)
 	M	src/b/readme
-r6 = 409ce1311525ede4cfab10c00ba7e3aa85437045 (refs/remotes/two/tags/end)
+r6 = df2bd6da5566c556c959d2cbe73e997e166423c2 (refs/remotes/two/tags/end)
 ok 2 - test left-hand-side only globbing
 
-expecting success of 9109.3 'test another branch': 
-	(
-		cd tmp &&
-		mkdir branches/v2 &&
-		svn_cmd add branches/v2 &&
-		svn_cmd cp trunk branches/v2/start &&
-		svn_cmd commit -m "Another versioned branch" &&
-		svn_cmd up &&
-		echo "hello" >> branches/v2/start/src/b/readme &&
-		poke branches/v2/start/src/b/readme &&
-		echo "howdy" >> branches/v2/start/src/a/readme &&
-		poke branches/v2/start/src/a/readme &&
-		svn_cmd commit -m "Changed 2 in v2/start" &&
-		svn_cmd up &&
-		svn_cmd cp branches/v2/start tags/next &&
-		echo "bye" >> tags/next/src/b/readme &&
-		poke tags/next/src/b/readme &&
-		echo "aye" >> tags/next/src/a/readme &&
-		poke tags/next/src/a/readme &&
-		svn_cmd commit -m "adding more" &&
-		echo "byebye" >> tags/next/src/b/readme &&
-		poke tags/next/src/b/readme &&
-		svn_cmd commit -m "adios"
-	) &&
-	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/*/*:refs/remotes/four/branches/*/*" &&
-	git config --add svn-remote.four.tags \
-	                 "tags/*:refs/remotes/four/tags/*" &&
-	git svn fetch four &&
-	git rev-list refs/remotes/four/tags/next >actual &&
-	test_line_count = 5 actual &&
-	git rev-list refs/remotes/four/branches/v2/start >actual &&
-	test_line_count = 3 actual &&
-	test $(git rev-parse refs/remotes/four/branches/v2/start~2) = \
-	     $(git rev-parse refs/remotes/four/trunk) &&
-	test $(git rev-parse refs/remotes/four/tags/next~2) = \
-	     $(git rev-parse refs/remotes/four/branches/v2/start) &&
-	git log --pretty=oneline refs/remotes/four/tags/next >actual &&
-	cut -d" " -f2- actual >output.four &&
-	test_cmp expect.four output.four
-	
-A         branches/v2
-A         branches/v2/start
-Adding         branches/v2
-Adding         branches/v2/start
-Committing transaction...
-Committed revision 7.
-Updating '.':
-At revision 7.
-Sending        branches/v2/start/src/a/readme
-Sending        branches/v2/start/src/b/readme
-Transmitting file data ..done
-Committing transaction...
-Committed revision 8.
-Updating '.':
-At revision 8.
-A         tags/next
-Adding         tags/next
-Sending        tags/next/src/a/readme
-Sending        tags/next/src/b/readme
-Transmitting file data ..done
-Committing transaction...
-Committed revision 9.
-Sending        tags/next/src/b/readme
-Transmitting file data .done
-Committing transaction...
-Committed revision 10.
-	A	src/a/readme
-	A	src/b/readme
-W: +empty_dir: trunk/doc
-r1 = bac67860ebeb141b9fc9ab45b3936957ff3038ab (refs/remotes/four/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
-Found branch parent: (refs/remotes/four/branches/v1/start) bac67860ebeb141b9fc9ab45b3936957ff3038ab
-Following parent with do_switch
-Successfully followed parent
-r2 = 9a7b408d37f2656d8b91b1aad864d297cdb54841 (refs/remotes/four/branches/v1/start)
-	M	src/a/readme
-	M	src/b/readme
-r3 = ff032338c202a55e3e5452d59e772ca36058a4d6 (refs/remotes/four/branches/v1/start)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
-Found branch parent: (refs/remotes/four/tags/end) ff032338c202a55e3e5452d59e772ca36058a4d6
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r4 = 8d6aa4f19e44ebfea4b1502f740055704197a816 (refs/remotes/four/tags/end)
-	M	src/b/readme
-r5 = e895742558dc26f97743b405d356a00cc35083c2 (refs/remotes/four/tags/end)
-	M	src/b/readme
-r6 = 409ce1311525ede4cfab10c00ba7e3aa85437045 (refs/remotes/four/tags/end)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start, 3
-Found branch parent: (refs/remotes/four/branches/v2/start) bac67860ebeb141b9fc9ab45b3936957ff3038ab
-Following parent with do_switch
-Successfully followed parent
-r7 = 39f97b23cf620370188a89715dca363094b59b72 (refs/remotes/four/branches/v2/start)
-	M	src/a/readme
-	M	src/b/readme
-r8 = 4f5edef29c293a7f78a29f13ccbbc7d56ce18960 (refs/remotes/four/branches/v2/start)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/next, 8
-Found branch parent: (refs/remotes/four/tags/next) 4f5edef29c293a7f78a29f13ccbbc7d56ce18960
-Following parent with do_switch
-	M	src/a/readme
-	M	src/b/readme
-Successfully followed parent
-r9 = 73495f6048407aa458f4adf4ad6adad63d36998d (refs/remotes/four/tags/next)
-	M	src/b/readme
-r10 = e637da5fd6f341ffc2dec7f08a7c07975160d231 (refs/remotes/four/tags/next)
-ok 3 - test another branch
-
-expecting success of 9109.4 'prepare test disallow multiple globs': 
+expecting success of 9108.3 'prepare test disallow multi-globs': 
 cat >expect.three <<EOF
 Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
 
 EOF
 	
-ok 4 - prepare test disallow multiple globs
+ok 3 - prepare test disallow multi-globs
 
-expecting success of 9109.5 'test disallow multiple globs': 
+expecting success of 9108.4 'test disallow multi-globs': 
 	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/*/t/*:refs/remotes/three/branches/*/*" &&
+	                 "branches/*/t/*:refs/remotes/three/branches/*" &&
 	git config --add svn-remote.three.tags \
-	                 "tags/*:refs/remotes/three/tags/*" &&
+	                 "tags/*/*:refs/remotes/three/tags/*" &&
 	(
 		cd tmp &&
 		echo "try try" >> tags/end/src/b/readme &&
@@ -511156,127 +510025,11 @@
 Sending        tags/end/src/b/readme
 Transmitting file data .done
 Committing transaction...
-Committed revision 11.
-ok 5 - test disallow multiple globs
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9114-git-svn-dcommit-merge.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9114-git-svn-dcommit-merge/.git/
-expecting success of 9114.1 'setup svn repository': 
-	svn_cmd co "$svnrepo" mysvnwork &&
-	mkdir -p mysvnwork/trunk &&
-	(
-		cd mysvnwork &&
-		big_text_block >>trunk/README &&
-		svn_cmd add trunk &&
-		svn_cmd ci -m "first commit" trunk
-	)
-	
-Checked out revision 0.
-A         trunk
-A         trunk/README
-Adding         trunk
-Adding         trunk/README
-Transmitting file data .done
-Committing transaction...
-Committed revision 1.
-ok 1 - setup svn repository
-
-expecting success of 9114.2 'setup git mirror and merge': 
-	git svn init "$svnrepo" -t tags -T trunk -b branches &&
-	git svn fetch &&
-	git checkout -b svn remotes/origin/trunk &&
-	git checkout -b merge &&
-	echo new file > new_file &&
-	git add new_file &&
-	git commit -a -m "New file" &&
-	echo hello >> README &&
-	git commit -a -m "hello" &&
-	echo add some stuff >> new_file &&
-	git commit -a -m "add some stuff" &&
-	git checkout svn &&
-	mv -f README tmp &&
-	echo friend > README &&
-	cat tmp >> README &&
-	git commit -a -m "friend" &&
-	git merge merge
-	
-	A	README
-r1 = 18fe8971c565b957ca1d95883324908597579ee8 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
-Switched to a new branch 'svn'
-Switched to a new branch 'merge'
-[merge 60693ec] New file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 new_file
-[merge bc01f82] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[merge 82e60b9] add some stuff
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Switched to branch 'svn'
-[svn 210d5e9] 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.45.2/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
-	M	README
-Committed r2
-	M	README
-r2 = cedea696b178ca448368811abb51e1ab1ddcb485 (refs/remotes/origin/trunk)
-	A	new_file
-	M	README
-Committed r3
-	M	README
-	A	new_file
-r3 = 6eafc2a52412f7c5605cefb07c541cd7a2ceba36 (refs/remotes/origin/trunk)
-No changes between 7d2020128691cebf2843560cd6d4dfc82792cf46 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
+Committed revision 7.
+ok 4 - test disallow multi-globs
 
-# passed all 6 test(s)
-1..6
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9100-git-svn-basic.sh ***
@@ -511554,7 +510307,7 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 8bdf91fe95df9b24f8631d17a70cb3debe9e319b (refs/remotes/git-svn)
+r1 = 65966fe5d630407e0e9631bff53624f7069bff9f (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9100-git-svn-basic/svnrepo r1
 ok 4 - import an SVN revision into git
@@ -511586,7 +510339,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a
 Switched to a new branch 'mybranch'
-[mybranch 841c331] try a deep --rmdir with a commit
+[mybranch 85df7a9] 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%)
@@ -511603,7 +510356,7 @@
 	A	dir/file
 	A	file
 W: -empty_dir: dir/a
-r2 = 1f20aba407bad54da43ce3855032fc232b07028a (refs/remotes/git-svn)
+r2 = c1699a2aeb78e7463ebedb2694f37e0996062086 (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
@@ -511622,7 +510375,7 @@
 	test_must_fail git svn set-tree --find-copies-harder --rmdir \
 		remotes/git-svn..mybranch
 
-[mybranch c72872c] detect node change from file to directory #1
+[mybranch c7e4cc1] 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%)
@@ -511642,7 +510395,7 @@
 		remotes/git-svn..mybranch2
 
 Switched to a new branch 'mybranch2'
-[mybranch2 6a5e74e] detect node change from directory to file #1
+[mybranch2 88e92ff] 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%)
@@ -511666,7 +510419,7 @@
 	test -e "$SVN_TREE"/bar/zzz/yyy
 
 Switched to a new branch 'mybranch3'
-[mybranch3 d0e3684] detect node change from file to directory #2
+[mybranch3 c7385b1] 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
@@ -511675,7 +510428,7 @@
 	A	bar/zzz/yyy
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = 3569da96a719597a81c848d9d622552e8e7b3958 (refs/remotes/git-svn)
+r3 = 2833a7de62da17a98fa2c27288bdcc7a15821a54 (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
@@ -511697,13 +510450,13 @@
 		remotes/git-svn..mybranch4
 
 Switched to a new branch 'mybranch4'
-[mybranch4 906b1e1] detect node change from directory to file #2
+[mybranch4 61ad599] 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 '832a7d68-c222-4ae8-acea-bbba4b7ff4e3', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.45.2/perl/build/lib/Git/SVN.pm line 2079.
+Item already exists in filesystem: File already exists: filesystem '57102e9d-50a8-4bec-afba-3c9f574f0518', transaction '3-5', path '/dir' at /build/reproducible-path/git-2.45.2/perl/build/lib/Git/SVN.pm line 2079.
 
 ok 10 - detect node change from directory to file #2
 
@@ -511718,13 +510471,13 @@
 	svn_cmd up "$SVN_TREE" &&
 	test ! -x "$SVN_TREE"/exec.sh
 Switched to a new branch 'mybranch5'
-[mybranch5 949eb74] remove executable bit from a file
+[mybranch5 4119e7c] 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 = 50d2f012ca39a5ddc59f6117ab90d1986e2c3955 (refs/remotes/git-svn)
+r4 = 725f335f478a9317a2123b6cf66356c56ec71b00 (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
@@ -511739,13 +510492,13 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/exec.sh
-[mybranch5 e667f49] add executable bit back file
+[mybranch5 9d8186a] 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 = 7b4a858beb258beccfce05764cfacfcdcb8cca9d (refs/remotes/git-svn)
+r5 = 46bdd93723bc254087dc7ce2812629ba9d2e7f38 (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
@@ -511771,7 +510524,7 @@
 		remotes/git-svn..mybranch5 &&
 	svn_cmd up "$SVN_TREE" &&
 	test -h "$SVN_TREE"/exec.sh
-[mybranch5 5147d17] executable file becomes a symlink to file
+[mybranch5 f0701d9] 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
@@ -511780,7 +510533,7 @@
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = aea8b877bbd2d200f8f5493222afd3d54158f387 (refs/remotes/git-svn)
+r6 = 86b161089507c2aae771c3b1827acb12d93cefaf (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
@@ -511798,7 +510551,7 @@
 	svn_cmd up "$SVN_TREE" &&
 	test -x "$SVN_TREE"/file &&
 	test -h "$SVN_TREE"/exec-2.sh
-[mybranch5 db19b03] new symlink is added to a file that was also just made executable
+[mybranch5 d500c33] 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
@@ -511807,7 +510560,7 @@
 	M	file
 	A	exec-2.sh
 	M	file
-r7 = 1ccf80051822d76472c11369891e2784f3779b36 (refs/remotes/git-svn)
+r7 = 066e786b9325fd315117226e8e6cceb2b181f55a (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
@@ -511827,7 +510580,7 @@
 	test -f "$SVN_TREE"/exec-2.sh &&
 	test ! -h "$SVN_TREE"/exec-2.sh &&
 	test_cmp help "$SVN_TREE"/exec-2.sh
-[mybranch5 86030b5] modify a symlink to become a file
+[mybranch5 8a5366b] 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
@@ -511836,7 +510589,7 @@
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = 81fa4c6aa5e8fb10b941196029bcfe0f4515dc7e (refs/remotes/git-svn)
+r8 = 1bf7e1360e2b9e44c4369690a8279f77f07bd6d6 (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
@@ -511849,12 +510602,12 @@
 	git update-index exec-2.sh &&
 	git commit -m 'éï�' &&
 	git svn set-tree HEAD
-[mybranch5 9b2c844] éï�
+[mybranch5 4968d6e] éï�
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 	M	exec-2.sh
 	M	exec-2.sh
-r9 = 3e4c6bc88f3229b330754f83d17710aab19a9e24 (refs/remotes/git-svn)
+r9 = 0a18415ed6193489570d10b3eca3d7e4eadc5f32 (refs/remotes/git-svn)
 Done committing 1 revisions to SVN
 ok 16 - commit with UTF-8 message: locale: C.utf8
 
@@ -511869,33 +510622,33 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 8bdf91fe95df9b24f8631d17a70cb3debe9e319b (refs/remotes/alt)
+r1 = 65966fe5d630407e0e9631bff53624f7069bff9f (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 = 5b86cbfe100e0f144f5a9970645301c76247757f (refs/remotes/alt)
+r2 = 3b583fd687ee1fd86146936ebe7c0934a61ecc79 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = d739dad2eb72dd655feb9c0f9b4147ca965a9477 (refs/remotes/alt)
+r3 = a2c9387b282b72ae66253ea9a6cac731142889e2 (refs/remotes/alt)
 	M	exec.sh
-r4 = 9b10663247bdfce38aaa24971d289c8e3d74385a (refs/remotes/alt)
+r4 = 92e0531eb4dd4fcdb0ca4b9f68eff58b492e4810 (refs/remotes/alt)
 	M	exec.sh
-r5 = b5ce87b5ed527d67a8e764cc63c04bed3370fb84 (refs/remotes/alt)
+r5 = b989e717cf93adb2d1c76520b9aceb547807efee (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 4809bc4c62cea0e584f4a842f3ae1663fe692173 (refs/remotes/alt)
+r6 = 59a83f32543de4baa6f6b3429bd82ac60040c3db (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = b2bdd62ac13e1f21d41e4d64afa1c9272f6644ef (refs/remotes/alt)
+r7 = 6b9fa5c1b39952b6571d49e12531dd23ae2e408d (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = fcdc77a8e07ef6ce297d74423ff9a268e9092648 (refs/remotes/alt)
+r8 = 6a0d52387f36a635d383d0c04ff3170172590402 (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 371e7a00552096000bc72b6b89b235b9a618d8b6 (refs/remotes/alt)
+r9 = de35b90a175cba54ff22aa07928cef6296e2e836 (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': 
@@ -511962,16 +510715,16 @@
 	git branch -D my-bar
 	
 	A	zzz
-r1 = 68524a0e81e8351c84e1275e4d08fe0c9e4fd2d3 (refs/remotes/bar)
+r1 = b6dd84cd8c92b8f0eb99df256b512dae699e1f2d (refs/remotes/bar)
 	D	zzz
 	A	zzz/yyy
-r3 = 97b17ce07d68388ef000aeaa076a4bef1e809805 (refs/remotes/bar)
+r3 = 37d5ed920330bea8ec3f974807fcb758343d8113 (refs/remotes/bar)
 Switched to a new branch 'my-bar'
-[my-bar 3c01592] change 1
+[my-bar 7b7601a] change 1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo
-[my-bar 76e2e53] change 2
+[my-bar cdce002] change 2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 Duplicate specification "id|i=s" for option "i"
@@ -511979,14 +510732,14 @@
 	A	foo
 Committed r10
 	A	foo
-r10 = 1cdf38e488042e79b33d02b34eabbe74ba88621b (refs/remotes/bar)
-No changes between 3c01592b0a362695dad3f17059d97374ef89b0ee and refs/remotes/bar
+r10 = 5170286d40e6fd0f6bead928fb14b5372aa2cad4 (refs/remotes/bar)
+No changes between 7b7601a0bdd36901242f2c41566020f56cc086ec 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: 1cdf38e488042e79b33d02b34eabbe74ba88621b
+The rewritten commit is: 5170286d40e6fd0f6bead928fb14b5372aa2cad4
     change 1
 Switched to branch 'main'
-Deleted branch my-bar (was 76e2e53).
+Deleted branch my-bar (was cdce002).
 ok 22 - dcommit $rev does not clobber current branch
 
 expecting success of 9100.23 'able to dcommit to a subdirectory': 
@@ -512010,9 +510763,9 @@
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
 	A	bar/foo
-r10 = d97e08360c1abe0e6717ed25739854f0b3a5d424 (refs/remotes/alt)
+r10 = 2c84d7ab20706468c353f20f9b70e470d2d7c852 (refs/remotes/alt)
 Switched to a new branch 'my-bar'
-[my-bar df2ebe6] /bar/d should be in the log
+[my-bar cc96212] /bar/d should be in the log
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 d
@@ -512021,10 +510774,10 @@
 	A	d
 Committed r11
 	A	d
-r11 = 50bd72081d9405c5e5659d5c3cfa78b9fc613f1a (refs/remotes/bar)
-No changes between df2ebe60eaa28c56cee8bab1826ea8b9b026b8a4 and refs/remotes/bar
+r11 = 36c676f0de6db9cd139042159c2a058100b5f609 (refs/remotes/bar)
+No changes between cc962124311db82bc3824a58ea57656b7480adbf and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar 4ba427f] add a new directory
+[my-bar 4673cda] add a new directory
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 newdir/dir
@@ -512033,10 +510786,10 @@
 	A	newdir/dir
 Committed r12
 	A	newdir/dir
-r12 = 290b4b9ba3ed34038b551f65ee9c3695567f5c9a (refs/remotes/bar)
-No changes between 4ba427f081a53d4731aed8b01ae8c1d0b43b023c and refs/remotes/bar
+r12 = b334036c8c37165a2ae237ca766bda8a6092870b (refs/remotes/bar)
+No changes between 4673cdaa5d9393bc3ed3801b203217df3ebfc52b and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
-[my-bar 163f626] modify a file in new directory
+[my-bar 935a24a] 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"
@@ -512044,8 +510797,8 @@
 	M	newdir/dir
 Committed r13
 	M	newdir/dir
-r13 = b90215279335da5bf3b1a31631f0f12c2717c7d2 (refs/remotes/bar)
-No changes between 163f626d298e30bbe82eee52aa273411204de5f3 and refs/remotes/bar
+r13 = dee7f0dca6751b2118a257b2c464b3a3f1279e9b (refs/remotes/bar)
+No changes between 935a24afbfb9c8a51ee5bab56084c4eca3cd0beb and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 23 - able to dcommit to a subdirectory
 
@@ -512054,7 +510807,7 @@
 	test-tool chmtime =-60 foo &&
 	git svn dcommit
 
-[my-bar 0e26bf1] commit-new-file-foo2
+[my-bar 3536dda] commit-new-file-foo2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 foo2
@@ -512063,8 +510816,8 @@
 	A	foo2
 Committed r14
 	A	foo2
-r14 = 41aeaa571e7d14c0a341b7e25babeab859651628 (refs/remotes/bar)
-No changes between 0e26bf181a8879d837c05eaa71eef81e91ac7fcd and refs/remotes/bar
+r14 = 497a9f2622a8ef7527ebd5e298c12c84a9049d9a (refs/remotes/bar)
+No changes between 3536ddab25b652e016da45b0c64de62115f34b63 and refs/remotes/bar
 Resetting to the latest refs/remotes/bar
 ok 24 - dcommit should not fail with a touched file
 
@@ -512082,12 +510835,12 @@
 	git svn set-tree -i bar HEAD &&
 	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
 
-[my-bar 9479ad6] update /bar/d
+[my-bar 86b88d6] update /bar/d
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 	M	d
 	M	d
-r15 = 0f810781efb7ea7bd92d8c059097f7903e35f0dd (refs/remotes/bar)
+r15 = d6a9587bd89a543304d6b36ab8c9a490215a993e (refs/remotes/bar)
 Done committing 1 revisions to SVN
 ok 26 - able to set-tree to a subdirectory
 
@@ -512105,45 +510858,45 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 8bdf91fe95df9b24f8631d17a70cb3debe9e319b (refs/remotes/alt)
+r1 = 65966fe5d630407e0e9631bff53624f7069bff9f (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 = 5b86cbfe100e0f144f5a9970645301c76247757f (refs/remotes/alt)
+r2 = 3b583fd687ee1fd86146936ebe7c0934a61ecc79 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = d739dad2eb72dd655feb9c0f9b4147ca965a9477 (refs/remotes/alt)
+r3 = a2c9387b282b72ae66253ea9a6cac731142889e2 (refs/remotes/alt)
 	M	exec.sh
-r4 = 9b10663247bdfce38aaa24971d289c8e3d74385a (refs/remotes/alt)
+r4 = 92e0531eb4dd4fcdb0ca4b9f68eff58b492e4810 (refs/remotes/alt)
 	M	exec.sh
-r5 = b5ce87b5ed527d67a8e764cc63c04bed3370fb84 (refs/remotes/alt)
+r5 = b989e717cf93adb2d1c76520b9aceb547807efee (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 4809bc4c62cea0e584f4a842f3ae1663fe692173 (refs/remotes/alt)
+r6 = 59a83f32543de4baa6f6b3429bd82ac60040c3db (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = b2bdd62ac13e1f21d41e4d64afa1c9272f6644ef (refs/remotes/alt)
+r7 = 6b9fa5c1b39952b6571d49e12531dd23ae2e408d (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = fcdc77a8e07ef6ce297d74423ff9a268e9092648 (refs/remotes/alt)
+r8 = 6a0d52387f36a635d383d0c04ff3170172590402 (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 371e7a00552096000bc72b6b89b235b9a618d8b6 (refs/remotes/alt)
+r9 = de35b90a175cba54ff22aa07928cef6296e2e836 (refs/remotes/alt)
 	A	bar/foo
-r10 = d97e08360c1abe0e6717ed25739854f0b3a5d424 (refs/remotes/alt)
+r10 = 2c84d7ab20706468c353f20f9b70e470d2d7c852 (refs/remotes/alt)
 	A	bar/d
-r11 = 4dac7cff96925f5695ab1bac3e9247d638e2aba3 (refs/remotes/alt)
+r11 = 91187327bf79ce6cffa91707ef6a5c4b6f2f7c3c (refs/remotes/alt)
 	A	bar/newdir/dir
-r12 = a34f7bbd889cd1ca501ecdc1cd0b6b2639d64d3f (refs/remotes/alt)
+r12 = af28b84cd2899178f14f28979b9f116ec5f29905 (refs/remotes/alt)
 	M	bar/newdir/dir
-r13 = 7fe9b7248447ef1997fb3ce23246170e53f9cd13 (refs/remotes/alt)
+r13 = c76ea354c2814cbabfc33b8f15fc7f989621a9dc (refs/remotes/alt)
 	A	bar/foo2
-r14 = 124460a0d717bf13a75c3aa838d6ad9baf349979 (refs/remotes/alt)
+r14 = 8f67d0cd6f15256dc24aaf5d052c70c3010c0d97 (refs/remotes/alt)
 	M	bar/d
-r15 = f1f7179e7867a78c440639077924a5b66e676e8a (refs/remotes/alt)
+r15 = 35f162cbeb09cee134f6cbf925cfa2aca273e57c (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': 
@@ -512161,1130 +510914,695 @@
 	A	exec.sh
 	A	foo
 	A	foo.link
-r1 = 8bdf91fe95df9b24f8631d17a70cb3debe9e319b (refs/remotes/alt)
+r1 = 65966fe5d630407e0e9631bff53624f7069bff9f (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 = 5b86cbfe100e0f144f5a9970645301c76247757f (refs/remotes/alt)
+r2 = 3b583fd687ee1fd86146936ebe7c0934a61ecc79 (refs/remotes/alt)
 	D	bar/zzz
 	A	bar/zzz/yyy
-r3 = d739dad2eb72dd655feb9c0f9b4147ca965a9477 (refs/remotes/alt)
+r3 = a2c9387b282b72ae66253ea9a6cac731142889e2 (refs/remotes/alt)
 	M	exec.sh
-r4 = 9b10663247bdfce38aaa24971d289c8e3d74385a (refs/remotes/alt)
+r4 = 92e0531eb4dd4fcdb0ca4b9f68eff58b492e4810 (refs/remotes/alt)
 	M	exec.sh
-r5 = b5ce87b5ed527d67a8e764cc63c04bed3370fb84 (refs/remotes/alt)
+r5 = b989e717cf93adb2d1c76520b9aceb547807efee (refs/remotes/alt)
 	D	exec.sh
 	A	exec.sh
 W: -empty_dir: exec.sh
-r6 = 4809bc4c62cea0e584f4a842f3ae1663fe692173 (refs/remotes/alt)
+r6 = 59a83f32543de4baa6f6b3429bd82ac60040c3db (refs/remotes/alt)
 	A	exec-2.sh
 	M	file
-r7 = b2bdd62ac13e1f21d41e4d64afa1c9272f6644ef (refs/remotes/alt)
+r7 = 6b9fa5c1b39952b6571d49e12531dd23ae2e408d (refs/remotes/alt)
 	D	exec-2.sh
 	A	exec-2.sh
 W: -empty_dir: exec-2.sh
-r8 = fcdc77a8e07ef6ce297d74423ff9a268e9092648 (refs/remotes/alt)
+r8 = 6a0d52387f36a635d383d0c04ff3170172590402 (refs/remotes/alt)
 	M	exec-2.sh
-r9 = 371e7a00552096000bc72b6b89b235b9a618d8b6 (refs/remotes/alt)
+r9 = de35b90a175cba54ff22aa07928cef6296e2e836 (refs/remotes/alt)
 	A	bar/foo
-r10 = d97e08360c1abe0e6717ed25739854f0b3a5d424 (refs/remotes/alt)
+r10 = 2c84d7ab20706468c353f20f9b70e470d2d7c852 (refs/remotes/alt)
 	A	bar/d
-r11 = 4dac7cff96925f5695ab1bac3e9247d638e2aba3 (refs/remotes/alt)
+r11 = 91187327bf79ce6cffa91707ef6a5c4b6f2f7c3c (refs/remotes/alt)
 	A	bar/newdir/dir
-r12 = a34f7bbd889cd1ca501ecdc1cd0b6b2639d64d3f (refs/remotes/alt)
+r12 = af28b84cd2899178f14f28979b9f116ec5f29905 (refs/remotes/alt)
 	M	bar/newdir/dir
-r13 = 7fe9b7248447ef1997fb3ce23246170e53f9cd13 (refs/remotes/alt)
+r13 = c76ea354c2814cbabfc33b8f15fc7f989621a9dc (refs/remotes/alt)
 	A	bar/foo2
-r14 = 124460a0d717bf13a75c3aa838d6ad9baf349979 (refs/remotes/alt)
+r14 = 8f67d0cd6f15256dc24aaf5d052c70c3010c0d97 (refs/remotes/alt)
 	M	bar/d
-r15 = f1f7179e7867a78c440639077924a5b66e676e8a (refs/remotes/alt)
+r15 = 35f162cbeb09cee134f6cbf925cfa2aca273e57c (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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9119-git-svn-info.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9119-git-svn-info/.git/
-1..0 # SKIP skipping svn-info test (SVN version: 1.14.4 not supported)
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9117-git-svn-init-clone.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/.git/
-expecting success of 9117.1 'setup svnrepo': 
-	mkdir project project/trunk project/branches project/tags &&
-	echo foo > project/trunk/foo &&
-	svn_cmd import -m "$test_description" project "$svnrepo"/project &&
-	rm -rf project
-	
-Adding         project/branches
-Adding         project/tags
-Adding         project/trunk
-Adding         project/trunk/foo
-Committing transaction...
-Committed revision 1.
-ok 1 - setup svnrepo
+*** t9112-git-svn-md5less-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9112-git-svn-md5less-file/.git/
+expecting success of 9112.1 'load svn dumpfile': svnadmin load "$rawsvnrepo" < dumpfile.svn
+<<< Started new transaction, based on original revision 1
+     * editing path : md5less-file ... done.
 
-expecting success of 9117.2 'basic clone': 
-	test ! -d trunk &&
-	git svn clone "$svnrepo"/project/trunk &&
-	test_path_is_dir trunk/.git/svn &&
-	test_path_exists trunk/foo &&
-	rm -rf trunk
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
-	A	foo
-r1 = 46b10b377f01ace57e0334d38bcdac61d265600b (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
-ok 2 - basic clone
+------- Committed revision 1 >>>
 
-expecting success of 9117.3 'clone to target directory': 
-	test ! -d target &&
-	git svn clone "$svnrepo"/project/trunk target &&
-	test_path_is_dir target/.git/svn &&
-	test_path_exists target/foo &&
-	rm -rf target
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/target/.git/
-	A	foo
-r1 = 46b10b377f01ace57e0334d38bcdac61d265600b (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
-ok 3 - clone to target directory
+ok 1 - load svn dumpfile
 
-expecting success of 9117.4 'clone with --stdlayout': 
-	test ! -d project &&
-	git svn clone -s "$svnrepo"/project &&
-	test_path_is_dir project/.git/svn &&
-	test_path_exists project/foo &&
-	rm -rf project
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
-	A	foo
-r1 = 46b10b377f01ace57e0334d38bcdac61d265600b (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
-ok 4 - clone with --stdlayout
+expecting success of 9112.2 'initialize git svn': git svn init "$svnrepo"
+ok 2 - initialize git svn
 
-expecting success of 9117.5 'clone to target directory with --stdlayout': 
-	test ! -d target &&
-	git svn clone -s "$svnrepo"/project target &&
-	test_path_is_dir target/.git/svn &&
-	test_path_exists target/foo &&
-	rm -rf target
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/target/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
-	A	foo
-r1 = 46b10b377f01ace57e0334d38bcdac61d265600b (refs/remotes/origin/trunk)
+expecting success of 9112.3 'fetch revisions from svn': git svn fetch
+	A	md5less-file
+r1 = ca557273ebb04b11d8459b5ae3772312d28ab835 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
-ok 5 - clone to target directory with --stdlayout
-
-expecting success of 9117.6 'init without -s/-T/-b/-t does not warn': 
-	test ! -d trunk &&
-	git svn init "$svnrepo"/project/trunk trunk 2>warning &&
-	! grep -q prefix warning &&
-	rm -rf trunk &&
-	rm -f warning
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
-ok 6 - init without -s/-T/-b/-t does not warn
-
-expecting success of 9117.7 'clone without -s/-T/-b/-t does not warn': 
-	test ! -d trunk &&
-	git svn clone "$svnrepo"/project/trunk 2>warning &&
-	! grep -q prefix warning &&
-	rm -rf trunk &&
-	rm -f warning
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
-	A	foo
-r1 = 46b10b377f01ace57e0334d38bcdac61d265600b (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/': 
-	test ! -d project &&
-	git svn init -s "$svnrepo"/project project 2>warning &&
-	! grep -q prefix warning &&
-	test_svn_configured_prefix "origin/" &&
-	rm -rf project &&
-	rm -f warning
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
-ok 8 - init with -s/-T/-b/-t assumes --prefix=origin/
-
-expecting success of 9117.9 'clone with -s/-T/-b/-t assumes --prefix=origin/': 
-	test ! -d project &&
-	git svn clone -s "$svnrepo"/project 2>warning &&
-	! grep -q prefix warning &&
-	test_svn_configured_prefix "origin/" &&
-	rm -rf project &&
-	rm -f warning
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
-	A	foo
-r1 = 46b10b377f01ace57e0334d38bcdac61d265600b (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': 
-	test ! -d project &&
-	git svn init -s "$svnrepo"/project project --prefix "" 2>warning &&
-	! grep -q prefix warning &&
-	test_svn_configured_prefix "" &&
-	rm -rf project &&
-	rm -f warning
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
-ok 10 - init with -s/-T/-b/-t and --prefix "" still works
-
-expecting success of 9117.11 'clone with -s/-T/-b/-t and --prefix "" still works': 
-	test ! -d project &&
-	git svn clone -s "$svnrepo"/project --prefix "" 2>warning &&
-	! grep -q prefix warning &&
-	test_svn_configured_prefix "" &&
-	rm -rf project &&
-	rm -f warning
-	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
-	A	foo
-r1 = 46b10b377f01ace57e0334d38bcdac61d265600b (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': 
-	test ! -d project &&
-	git svn init -T "$svnrepo"/project/trunk project &&
-	rm -rf project
-	
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
-ok 12 - init with -T as a full url works
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9112-git-svn-md5less-file/svnrepo r1
+ok 3 - fetch revisions from svn
 
-# passed all 12 test(s)
-1..12
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9118-git-svn-funky-branch-names.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9118-git-svn-funky-branch-names/.git/
-expecting success of 9118.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" &&
-	rm -rf project &&
-	svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \
-	                "$svnrepo/pr ject/branches/fun plugin" &&
-	svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
-	                      "$svnrepo/pr ject/branches/more fun plugin!" &&
-	svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \
-	              "$svnrepo/pr ject/branches/$scary_uri" &&
-	svn_cmd cp -m "leading dot" "$svnrepo/pr ject/trunk" \
-			"$svnrepo/pr ject/branches/.leading_dot" &&
-	if test_have_prereq !MINGW
-	then
-		svn_cmd cp -m "trailing dot" "$svnrepo/pr ject/trunk" \
-			"$svnrepo/pr ject/branches/trailing_dot."
-	fi &&
-	svn_cmd cp -m "trailing .lock" "$svnrepo/pr ject/trunk" \
-			"$svnrepo/pr ject/branches/trailing_dotlock.lock" &&
-	svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \
-			"$svnrepo/pr ject/branches/not-a@{0}reflog@" &&
-	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.
-Committing transaction...
-Committed revision 4.
-Committing transaction...
-Committed revision 5.
-Committing transaction...
-Committed revision 6.
-Committing transaction...
-Committed revision 7.
-Committing transaction...
-Committed revision 8.
-ok 1 - setup svnrepo
-
-expecting success of 9118.2 'test clone with funky branch names': 
-	git svn clone -s "$svnrepo/pr ject" project &&
-	(
-		cd project &&
-		git rev-parse "refs/remotes/origin/fun%20plugin" &&
-		git rev-parse "refs/remotes/origin/more%20fun%20plugin!" &&
-		git rev-parse "refs/remotes/origin/$scary_ref" &&
-		git rev-parse "refs/remotes/origin/%2Eleading_dot" &&
-		if test_have_prereq !MINGW
-		then
-			git rev-parse "refs/remotes/origin/trailing_dot%2E"
-		fi &&
-		git rev-parse "refs/remotes/origin/trailing_dotlock%2Elock" &&
-		git rev-parse "refs/remotes/origin/$non_reflog"
-	)
+*** t9113-git-svn-dcommit-new-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9113-git-svn-dcommit-new-file/.git/
+1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9110-git-svn-use-svm-props.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9110-git-svn-use-svm-props/.git/
+expecting success of 9110.1 'load svm repo': 
+	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9110/svm.dump &&
+	git svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
+	git svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
+	git svn init --minimize-url -R argh -i e \
+	  "$svnrepo"/mirror/argh/a/b/c/d/e &&
+	git config svn.useSvmProps true &&
+	git svn fetch --all
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9118-git-svn-funky-branch-names/project/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo
-	A	foo
-r1 = e438c815717330a849dbd4c1052995493ba59a3e (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin, 1
-Found branch parent: (refs/remotes/origin/fun plugin) e438c815717330a849dbd4c1052995493ba59a3e
-Following parent with do_switch
-Successfully followed parent
-r2 = 50ca9aa21628016c7c834b6bf21f3dd0ab68bd1e (refs/remotes/origin/fun plugin)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/more%20fun%20plugin!, 2
-Found branch parent: (refs/remotes/origin/more fun plugin!) 50ca9aa21628016c7c834b6bf21f3dd0ab68bd1e
-Following parent with do_switch
-Successfully followed parent
-r3 = c8983989f18d204b0762a752f301fca320940e18 (refs/remotes/origin/more fun plugin!)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/Abo-Uebernahme%20(Bug%20%23994), 3
-Found branch parent: (refs/remotes/origin/Abo-Uebernahme (Bug #994)) 50ca9aa21628016c7c834b6bf21f3dd0ab68bd1e
-Following parent with do_switch
-Successfully followed parent
-r4 = 83e18856353666baf4b54717011816aa0eb9a0a4 (refs/remotes/origin/Abo-Uebernahme (Bug #994))
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/.leading_dot, 4
-Found branch parent: (refs/remotes/origin/.leading_dot) e438c815717330a849dbd4c1052995493ba59a3e
-Following parent with do_switch
-Successfully followed parent
-r5 = 23bf4dca96353e95bef39b17468a96eb269b486c (refs/remotes/origin/.leading_dot)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dot., 5
-Found branch parent: (refs/remotes/origin/trailing_dot.) e438c815717330a849dbd4c1052995493ba59a3e
-Following parent with do_switch
-Successfully followed parent
-r6 = 73973381670f35407826cda1c4bbba45e44df3a9 (refs/remotes/origin/trailing_dot.)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dotlock.lock, 6
-Found branch parent: (refs/remotes/origin/trailing_dotlock.lock) e438c815717330a849dbd4c1052995493ba59a3e
-Following parent with do_switch
-Successfully followed parent
-r7 = 739f03a78c78fd0c4f88056b1c7676883371025b (refs/remotes/origin/trailing_dotlock.lock)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/not-a@%7B0%7Dreflog, 7
-Found branch parent: (refs/remotes/origin/not-a@{0}reflog) e438c815717330a849dbd4c1052995493ba59a3e
-Following parent with do_switch
-Successfully followed parent
-r8 = 3fe61b823c708229d6df43c1c15528fdbd3dd568 (refs/remotes/origin/not-a@{0}reflog)
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/argh/a/b/c/d/e => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo
+	A	file
+r9 (@1) = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
+	A	a/b/c/d/e/file
+r9 (@1) = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
+	D	a/b/c/d/e/file
+	D	a/
+	A	file
+W: -empty_dir: mirror/argh/a
+r10 (@2) = c165f07c4c5694be18c9c28331ca7efd46d78417 (refs/remotes/dir)
+	A	zzz
+r2 (@1) = 44a982ce17928f9542c6f3fce48affc197150e1e (refs/remotes/bar)
+	M	zzz
+r3 (@6) = 2ebd1f75bc1fdd83dcbcdf6194f8b9a16e4fdeb0 (refs/remotes/bar)
+	A	d
+r4 (@9) = 07c2950915eb3ada192043ac2e5efcf9d9e07de3 (refs/remotes/bar)
+	A	newdir/dir
+r5 (@10) = 7b59bc03f91e595ef213c16f436644c05d922782 (refs/remotes/bar)
+	M	newdir/dir
+r6 (@11) = 8775e0be15e9c3fd282c6f4e71a82766ab3e9231 (refs/remotes/bar)
+	M	d
+r7 (@12) = ab9ada04d293d792e2e941a664911858fe0167af (refs/remotes/bar)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk r1
-50ca9aa21628016c7c834b6bf21f3dd0ab68bd1e
-c8983989f18d204b0762a752f301fca320940e18
-83e18856353666baf4b54717011816aa0eb9a0a4
-23bf4dca96353e95bef39b17468a96eb269b486c
-73973381670f35407826cda1c4bbba45e44df3a9
-739f03a78c78fd0c4f88056b1c7676883371025b
-3fe61b823c708229d6df43c1c15528fdbd3dd568
-ok 2 - test clone with funky branch names
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9110-git-svn-use-svm-props/svnrepo/mirror/arr r7
+ok 1 - load svm repo
 
-expecting success of 9118.3 'test dcommit to funky branch': 
-	(
-		cd project &&
-		git reset --hard 'refs/remotes/origin/more%20fun%20plugin!' &&
-		echo hello >> foo &&
-		git commit -m 'hello' -- foo &&
-		git svn dcommit
-	)
+expecting success of 9110.2 'verify metadata for /bar': 
+	git cat-file commit refs/remotes/bar >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@12 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~1 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@11 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~2 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@10 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~3 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@9 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~4 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@6 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/bar~5 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/bar@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
 	
-HEAD is now at c898398 more fun!
-[master 2a21766] hello
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/more%20fun%20plugin! ...
-	M	foo
-Committed r9
-	M	foo
-r9 = ed954b7aaa2d963db5af16c438c8ce7dc183e5fb (refs/remotes/origin/more fun plugin!)
-No changes between 2a21766fa27b88245a246a29aaf18eafd19f45c0 and refs/remotes/origin/more%20fun%20plugin!
-Resetting to the latest refs/remotes/origin/more%20fun%20plugin!
-ok 3 - test dcommit to funky branch
+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 9118.4 'test dcommit to scary branch': 
-	(
-		cd project &&
-		git reset --hard "refs/remotes/origin/$scary_ref" &&
-		echo urls are scary >> foo &&
-		git commit -m "eep" -- foo &&
-		git svn dcommit
-	)
+expecting success of 9110.3 'verify metadata for /dir/a/b/c/d/e': 
+	git cat-file commit refs/remotes/e >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
 	
-HEAD is now at 83e1885 scary
-[master fed5e99] eep
- 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.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/Abo-Uebernahme%20(Bug%20%23994) ...
-	M	foo
-Committed r10
-	M	foo
-r10 = 667efc75a4629eac453ac48401c7a215f832ca7c (refs/remotes/origin/Abo-Uebernahme (Bug #994))
-No changes between fed5e99e905675f4bab82a23ffab44aa423cf1dc 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
+git-svn-id: http://mayonaise/svnrepo/dir/a/b/c/d/e@1 161ce429-a9dd-4828-af4a-52023f968c89
+ok 3 - verify metadata for /dir/a/b/c/d/e
 
-expecting success of 9118.5 'test dcommit to trailing_dotlock branch': 
-	(
-		cd project &&
-		git reset --hard "refs/remotes/origin/trailing_dotlock%2Elock" &&
-		echo who names branches like this anyway? >> foo &&
-		git commit -m "bar" -- foo &&
-		git svn dcommit
-	)
+expecting success of 9110.4 'verify metadata for /dir': 
+	git cat-file commit refs/remotes/dir >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir@2 161ce429-a9dd-4828-af4a-52023f968c89$' actual &&
+	git cat-file commit refs/remotes/dir~1 >actual &&
+	grep '^git-svn-id: http://mayonaise/svnrepo/dir@1 161ce429-a9dd-4828-af4a-52023f968c89$' actual
 	
-HEAD is now at 739f03a trailing .lock
-[master 88a112f] bar
- 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.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dotlock.lock ...
-	M	foo
-Committed r11
-	M	foo
-r11 = 79e80c2f892ee189f0187e79928202d863fdea55 (refs/remotes/origin/trailing_dotlock.lock)
-No changes between 88a112f0fa1378c552fdf55b588c8cc43a10e160 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
+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 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9121-git-svn-fetch-renamed-dir.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9121-git-svn-fetch-renamed-dir/.git/
-expecting success of 9121.1 'load repository with renamed directory': 
-	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9121/renamed-dir.dump
-	
-ok 1 - load repository with renamed directory
+expecting success of 9110.5 'find commit based on SVN revision number': 
+	git svn find-rev r12 >actual &&
+	grep ab9ada04d293d792e2e941a664911858fe0167af actual
+        
+ab9ada04d293d792e2e941a664911858fe0167af
+ok 5 - find commit based on SVN revision number
 
-expecting success of 9121.2 'init and fetch repository': 
-	git svn init "$svnrepo/newname" &&
-	git svn fetch
+expecting success of 9110.6 'empty rebase': 
+	git svn rebase
 	
-	A	a.txt
-r2 = 30139ea92a1f2145db6cbad135b46c1d4ca2e458 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9121-git-svn-fetch-renamed-dir/svnrepo/newname r2
-ok 2 - init and fetch repository
+Current branch master is up to date.
+ok 6 - empty rebase
 
-# passed all 2 test(s)
-1..2
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9123-git-svn-rebuild-with-rewriteroot.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9123-git-svn-rebuild-with-rewriteroot/.git/
-expecting success of 9123.1 'init, fetch and checkout repository': 
-	git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
-	git svn fetch &&
-	git checkout -b mybranch remotes/git-svn
+*** t9111-git-svn-use-svnsync-props.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
 	
-	A	foo
-r1 = 8282d32dc8619f33aba200de0cbbb44ee35c3793 (refs/remotes/git-svn)
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/dir/a/b/c/d/e => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo
+	A	a/b/c/d/e/file
+r1 = 79a1181387506bdda9e0f310c40ddb3f4eed7179 (refs/remotes/dir)
+	A	file
+r1 = 6aadfc98d31cbed4e89c9d601491ad7b5c46d857 (refs/remotes/e)
+	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.45.2/t/trash%20directory.t9123-git-svn-rebuild-with-rewriteroot/svnrepo r1
-Switched to a new branch 'mybranch'
-ok 1 - init, fetch and checkout repository
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9111-git-svn-use-svnsync-props/svnrepo/bar r12
+ok 1 - load svnsync repo
 
-expecting success of 9123.2 'remove rev_map': 
-	rm "$GIT_SVN_DIR"/.rev_map.*
+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
 	
-ok 2 - remove rev_map
+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 9123.3 'rebuild rev_map': 
-	git svn rebase >/dev/null
+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
 	
-ok 3 - rebuild rev_map
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9115-git-svn-dcommit-funky-renames.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9115-git-svn-dcommit-funky-renames/.git/
-expecting success of 9115.1 'load repository with strange names': 
-	svnadmin load -q "$rawsvnrepo" <"$TEST_DIRECTORY"/t9115/funky-names.dump
-
-ok 1 - load repository with strange names
+*** t9114-git-svn-dcommit-merge.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9114-git-svn-dcommit-merge/.git/
+expecting success of 9114.1 'setup svn repository': 
+	svn_cmd co "$svnrepo" mysvnwork &&
+	mkdir -p mysvnwork/trunk &&
+	(
+		cd mysvnwork &&
+		big_text_block >>trunk/README &&
+		svn_cmd add trunk &&
+		svn_cmd ci -m "first commit" trunk
+	)
+	
+Checked out revision 0.
+A         trunk
+A         trunk/README
+Adding         trunk
+Adding         trunk/README
+Transmitting file data .done
+Committing transaction...
+Committed revision 1.
+ok 1 - setup svn repository
 
-expecting success of 9115.2 'init and fetch repository': 
-	git svn init "$svnrepo" &&
+expecting success of 9114.2 'setup git mirror and merge': 
+	git svn init "$svnrepo" -t tags -T trunk -b branches &&
 	git svn fetch &&
-	git reset --hard git-svn
+	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	 leading space file
-	A	#{cool_name}
-	A	file name with spaces
-W: +empty_dir:  leading space
-W: +empty_dir: #{bad_directory_name}
-W: +empty_dir: dir name with spaces
-W: +empty_dir: regular_dir_name
-r1 = fe3e666f2108d8ee9a05746cc6b083fe1de98a33 (refs/remotes/git-svn)
+	A	README
+r1 = 91114e851a541ee4224f14fcc33cfad0ce3f83a7 (refs/remotes/origin/trunk)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo r1
-creating empty directory:  leading space
-creating empty directory: #{bad_directory_name}
-creating empty directory: dir name with spaces
-creating empty directory: regular_dir_name
-HEAD is now at fe3e666 what will those wacky people think of next?
-ok 2 - init and fetch repository
-
-expecting success of 9115.3 'create file in existing ugly and empty dir': 
-	mkdir -p "#{bad_directory_name}" &&
-	echo hi > "#{bad_directory_name}/ foo" &&
-	git update-index --add "#{bad_directory_name}/ foo" &&
-	git commit -m "new file in ugly parent" &&
-	git svn dcommit
-	
-[master 7c586f3] new file in ugly parent
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk r1
+Switched to a new branch 'svn'
+Switched to a new branch 'merge'
+[merge 026a01a] New file
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 #{bad_directory_name}/ foo
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	#{bad_directory_name}/ foo
-Committed r2
-	A	#{bad_directory_name}/ foo
-r2 = 34d45814761fa776fba59ab6ca6ee2e01bd4ae4c (refs/remotes/git-svn)
-No changes between 7c586f3c6cb9090b584541e128161b66c5393faf and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 3 - create file in existing ugly and empty dir
-
-expecting success of 9115.4 'rename ugly file': 
-	git mv "#{bad_directory_name}/ foo" "file name with feces" &&
-	git commit -m "rename ugly file" &&
-	git svn dcommit
-	
-[master 85795a9] rename ugly file
+ create mode 100644 new_file
+[merge ff2bf9c] hello
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename #{bad_directory_name}/ foo => file name with feces (100%)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	R	#{bad_directory_name}/ foo => file name with feces
-Committed r3
-	D	#{bad_directory_name}/ foo
-	A	file name with feces
-W: -empty_dir: #{bad_directory_name}/ foo
-r3 = 0be29e10e48908120d0aebad3e3ced4e09bd5ea9 (refs/remotes/git-svn)
-No changes between 85795a93a19afac1db88f8676a095df3727a3d99 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 4 - rename ugly file
-
-expecting success of 9115.5 'rename pretty file': 
-	echo :x > pretty &&
-	git update-index --add pretty &&
-	git commit -m "pretty :x" &&
-	git svn dcommit &&
-	mkdir -p regular_dir_name &&
-	git mv pretty regular_dir_name/pretty &&
-	git commit -m "moved pretty file" &&
-	git svn dcommit
-	
-[master 0367a78] pretty :x
+ 1 file changed, 1 insertion(+)
+[merge 399ef35] add some stuff
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
- create mode 100644 pretty
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	pretty
-Committed r4
-	A	pretty
-r4 = 8255757250b0b1e2d6366891cac9d84dc4f7ddcf (refs/remotes/git-svn)
-No changes between 0367a78bab0d28e0fd8ba58a5bfd77f93bbcd1ae and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-[master 3244c13] moved pretty file
+Switched to branch 'svn'
+[svn 5a728ef] friend
  Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename pretty => regular_dir_name/pretty (100%)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	R	pretty => regular_dir_name/pretty
-Committed r5
-	D	pretty
-	A	regular_dir_name/pretty
-W: -empty_dir: pretty
-r5 = 508b25d687a693633b9c2a78781b66c9e4fc0125 (refs/remotes/git-svn)
-No changes between 3244c1376daffcf1b14ed8e1528f6c87b5e71977 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 5 - rename pretty file
+ 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 9115.6 'rename pretty file into ugly one': 
-	git mv regular_dir_name/pretty "#{bad_directory_name}/ booboo" &&
-	git commit -m booboo &&
-	git svn dcommit
+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
 	
-[master 329aa30] 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%)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	R	regular_dir_name/pretty => #{bad_directory_name}/ booboo
-Committed r6
-	A	#{bad_directory_name}/ booboo
-	D	regular_dir_name/pretty
-W: -empty_dir: regular_dir_name/pretty
-r6 = 633b34fec15b789ef81844b211ba3cc9e99afcad (refs/remotes/git-svn)
-No changes between 329aa30c58391870cfbb0522fe44327b915e620f and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 6 - rename pretty file into ugly one
+friend
+ok 3 - verify pre-merge ancestry
 
-expecting success of 9115.7 'add a file with plus signs': 
-	echo .. > +_+ &&
-	git update-index --add +_+ &&
-	git commit -m plus &&
-	mkdir gtk+ &&
-	git mv +_+ gtk+/_+_ &&
-	git commit -m plus_dir &&
+expecting success of 9114.4 'git svn dcommit merges': 
 	git svn dcommit
 	
-[master 0870b56] plus
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 +_+
-[master 117a6c5] plus_dir
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename +_+ => gtk+/_+_ (100%)
 Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	+_+
-Committed r7
-	A	+_+
-r7 = 9ea478876c23f5f3f7344a2e36937e7409232ad3 (refs/remotes/git-svn)
-	R	+_+ => gtk+/_+_
-Committed r8
-	D	+_+
-	A	gtk+/_+_
-W: -empty_dir: +_+
-r8 = 6307bcde941d884e013cc34411c6e5d50f5c6f12 (refs/remotes/git-svn)
-No changes between 117a6c52f830b91eb62520306566425f7317dbef and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 7 - add a file with plus signs
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9114-git-svn-dcommit-merge/svnrepo/trunk ...
+	M	README
+Committed r2
+	M	README
+r2 = d9b41900ae5ec2a41fff87528ace1fa0fc4f0def (refs/remotes/origin/trunk)
+	A	new_file
+	M	README
+Committed r3
+	M	README
+	A	new_file
+r3 = df9b11797263645802497794bd6c39286a99f4d4 (refs/remotes/origin/trunk)
+No changes between e1c180be630c65e050964340f9c3a95a4a5290e5 and refs/remotes/origin/trunk
+Resetting to the latest refs/remotes/origin/trunk
+ok 4 - git svn dcommit merges
 
-expecting success of 9115.8 'clone the repository to test rebase': 
-	git svn clone "$svnrepo" test-rebase &&
-	(
-		cd test-rebase &&
-		echo test-rebase >test-rebase &&
-		git add test-rebase &&
-		git commit -m test-rebase
-	)
+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
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9115-git-svn-dcommit-funky-renames/test-rebase/.git/
-	A	 leading space file
-	A	#{cool_name}
-	A	file name with spaces
-W: +empty_dir:  leading space
-W: +empty_dir: #{bad_directory_name}
-W: +empty_dir: dir name with spaces
-W: +empty_dir: regular_dir_name
-r1 = fe3e666f2108d8ee9a05746cc6b083fe1de98a33 (refs/remotes/git-svn)
-	A	#{bad_directory_name}/ foo
-r2 = 34d45814761fa776fba59ab6ca6ee2e01bd4ae4c (refs/remotes/git-svn)
-	D	#{bad_directory_name}/ foo
-	A	file name with feces
-W: -empty_dir: #{bad_directory_name}/ foo
-r3 = 0be29e10e48908120d0aebad3e3ced4e09bd5ea9 (refs/remotes/git-svn)
-	A	pretty
-r4 = 8255757250b0b1e2d6366891cac9d84dc4f7ddcf (refs/remotes/git-svn)
-	D	pretty
-	A	regular_dir_name/pretty
-W: -empty_dir: pretty
-r5 = 508b25d687a693633b9c2a78781b66c9e4fc0125 (refs/remotes/git-svn)
-	A	#{bad_directory_name}/ booboo
-	D	regular_dir_name/pretty
-W: -empty_dir: regular_dir_name/pretty
-r6 = 633b34fec15b789ef81844b211ba3cc9e99afcad (refs/remotes/git-svn)
-	A	+_+
-r7 = 9ea478876c23f5f3f7344a2e36937e7409232ad3 (refs/remotes/git-svn)
-	D	+_+
-	A	gtk+/_+_
-W: -empty_dir: +_+
-r8 = 6307bcde941d884e013cc34411c6e5d50f5c6f12 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo r8
-creating empty directory:  leading space
-creating empty directory: dir name with spaces
-creating empty directory: regular_dir_name
-[master aa35a2f] test-rebase
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-rebase
-ok 8 - clone the repository to test rebase
+friend
+ok 5 - verify post-merge ancestry
 
-expecting success of 9115.9 'make a commit to test rebase': 
-		echo test-rebase-main > test-rebase-main &&
-		git add test-rebase-main &&
-		git commit -m test-rebase-main &&
-		git svn dcommit
+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
 	
-[master 977c1ec] test-rebase-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 test-rebase-main
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	test-rebase-main
-Committed r9
-	A	test-rebase-main
-r9 = a67fa042aecb95cdefcadec7dfe801ec54f3e012 (refs/remotes/git-svn)
-No changes between 977c1ecbcfe216257c70b0297ac706afd1c6881b and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 9 - make a commit to test rebase
-
-expecting success of 9115.10 'git svn rebase works inside a fresh-cloned repository': 
-	(
-		cd test-rebase &&
-		git svn rebase &&
-		test -e test-rebase-main &&
-		test -e test-rebase
-	)
-	A	test-rebase-main
-r9 = a67fa042aecb95cdefcadec7dfe801ec54f3e012 (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
-
-checking prerequisite: UTF8_NFD_TO_NFC
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
-	# check whether FS converts nfd unicode to nfc
-	auml=$(printf "\303\244")
-	aumlcdiar=$(printf "\141\314\210")
-	>"$auml" &&
-	test -f "$aumlcdiar"
-
-)
-prerequisite UTF8_NFD_TO_NFC not satisfied
-expecting success of 9115.11 'svn.pathnameencoding=cp932 new file on dcommit': 
-	LC_ALL=$GIT_TEST_UTF8_LOCALE &&
-	export LC_ALL &&
-	neq=$(printf "\201\202") &&
-	git config svn.pathnameencoding cp932 &&
-	echo neq >"$neq" &&
-	git add "$neq" &&
-	git commit -m "neq" &&
-	git svn dcommit
-
-[master b921c70] neq
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\201\202"
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	�‚
-Committed r10
-	A	�‚
-r10 = 7b0a17b6d38fddc418f77da8868740753b0eca1c (refs/remotes/git-svn)
-No changes between b921c70dc545419a670116ad99db920bb4a1a814 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 11 - svn.pathnameencoding=cp932 new file on dcommit
-
-expecting success of 9115.12 'svn.pathnameencoding=cp932 rename on dcommit': 
-	LC_ALL=$GIT_TEST_UTF8_LOCALE &&
-	export LC_ALL &&
-	inf=$(printf "\201\207") &&
-	git config svn.pathnameencoding cp932 &&
-	echo inf >"$inf" &&
-	git add "$inf" &&
-	git commit -m "inf" &&
-	git svn dcommit &&
-	git mv "$inf" inf &&
-	git commit -m "inf rename" &&
-	git svn dcommit
-
-[master 6291075] inf
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 "\201\207"
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	A	�‡
-Committed r11
-	A	�‡
-r11 = 9c269337212ae868ceefac37cd423dbe9e9d9283 (refs/remotes/git-svn)
-No changes between 62910758079c1e5d1d0d7a64eb67c13afcd123ff and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-[master 140bf1d] inf rename
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- rename "\201\207" => inf (100%)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
-	R	�‡ => inf
-Committed r12
-	D	�‡
-	A	inf
-W: -empty_dir: ∞
-r12 = 3ad96aa1f460cdc6827c454d28db74590c584600 (refs/remotes/git-svn)
-No changes between 140bf1d3a085be6ecc3a0ed4c56da9fdf5bdb9c8 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 12 - svn.pathnameencoding=cp932 rename on dcommit
+    Merge branch 'merge' into svn
+ok 6 - verify merge commit message
 
-# passed all 12 test(s)
-1..12
+# passed all 6 test(s)
+1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9120-git-svn-clone-with-percent-escapes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/.git/
-expecting success of 9120.1 'setup svnrepo': 
-	mkdir project project/trunk project/branches project/tags &&
-	echo foo > project/trunk/foo &&
-	svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
-	svn_cmd cp -m "branch" "$svnrepo/pr ject/trunk" \
-	  "$svnrepo/pr ject/branches/b" &&
-	svn_cmd cp -m "tag" "$svnrepo/pr ject/trunk" \
-	  "$svnrepo/pr ject/tags/v1" &&
-	rm -rf project &&
-	maybe_start_httpd
-
-Adding         project/branches
-Adding         project/tags
-Adding         project/trunk
-Adding         project/trunk/foo
+*** t9109-git-svn-multi-glob.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9109-git-svn-multi-glob/.git/
+expecting success of 9109.1 'test refspec 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 branches/v1 tags &&
+		svn_cmd add branches tags &&
+		svn_cmd cp trunk branches/v1/start &&
+		svn_cmd commit -m "start a new branch" &&
+		svn_cmd up &&
+		echo "hi" >> branches/v1/start/src/b/readme &&
+		poke branches/v1/start/src/b/readme &&
+		echo "hey" >> branches/v1/start/src/a/readme &&
+		poke branches/v1/start/src/a/readme &&
+		svn_cmd commit -m "hi" &&
+		svn_cmd up &&
+		svn_cmd cp branches/v1/start tags/end &&
+		echo "bye" >> tags/end/src/b/readme &&
+		poke tags/end/src/b/readme &&
+		echo "aye" >> tags/end/src/a/readme &&
+		poke tags/end/src/a/readme &&
+		svn_cmd commit -m "the end" &&
+		echo "byebye" >> tags/end/src/b/readme &&
+		poke tags/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/*/*/src/a:refs/remotes/branches/*/*" &&
+	git config --add svn-remote.svn.tags\
+	                 "tags/*/src/a:refs/remotes/tags/*" &&
+	git svn multi-fetch &&
+	git log --pretty=oneline refs/remotes/tags/end >actual &&
+	cut -d" " -f2- actual >output.end &&
+	test_cmp expect.end output.end &&
+	test "$(git rev-parse refs/remotes/tags/end~1)" = \
+		"$(git rev-parse refs/remotes/branches/v1/start)" &&
+	test "$(git rev-parse refs/remotes/branches/v1/start~2)" = \
+		"$(git rev-parse refs/remotes/trunk)" &&
+	test_must_fail git rev-parse refs/remotes/tags/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         branches/v1
+A         tags
+A         branches/v1/start
+Adding         branches
+Adding         branches/v1
+Adding         branches/v1/start
+Adding         tags
 Committing transaction...
 Committed revision 2.
+Updating '.':
+At revision 2.
+Sending        branches/v1/start/src/a/readme
+Sending        branches/v1/start/src/b/readme
+Transmitting file data ..done
 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.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/clone/.git/
-	A	trunk/foo
-W: +empty_dir: branches
-W: +empty_dir: tags
-r1 = 432e9a5ac17ced1b22cc65fa6d222acdd7f75980 (refs/remotes/git-svn)
-	A	branches/b/foo
-r2 = 1228a1289d994e5f085ea1fc5e24c0a57f8db62b (refs/remotes/git-svn)
-	A	tags/v1/foo
-r3 = deeb95aa36c902bd22fe942c0efc87e3cc1463c1 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
-deeb95aa36c902bd22fe942c0efc87e3cc1463c1
-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.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = fb5f66810e7876d65f03941f27b6495be5692148 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-fb5f66810e7876d65f03941f27b6495be5692148
-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.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
-	A	foo
-r1 = fb5f66810e7876d65f03941f27b6495be5692148 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-fb5f66810e7876d65f03941f27b6495be5692148
-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.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = fb5f66810e7876d65f03941f27b6495be5692148 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) fb5f66810e7876d65f03941f27b6495be5692148
+Updating '.':
+At revision 3.
+A         tags/end
+Adding         tags/end
+Sending        tags/end/src/a/readme
+Sending        tags/end/src/b/readme
+Transmitting file data ..done
+Committing transaction...
+Committed revision 4.
+Sending        tags/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.45.2) of git-svn) does not exist.
+Done migrating from a git-svn v1 layout
+	A	readme
+r1 = 048838b1b0dec485fc27b014a200d9d584c2b180 (refs/remotes/trunk)
+branch_from: /trunk => /trunk/src/a
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a, 1
+Found branch parent: (refs/remotes/branches/v1/start) 048838b1b0dec485fc27b014a200d9d584c2b180
 Following parent with do_switch
 Successfully followed parent
-r2 = 6242c54e0e73289479686623e98bf2b23742a3e6 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) fb5f66810e7876d65f03941f27b6495be5692148
+r2 = f2df3cba756dfc4ca1f15301b12599e5e357a52e (refs/remotes/branches/v1/start)
+	M	readme
+r3 = f9de564cb0de79b57ad26bcb6a80e346598f6afa (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.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end/src/a, 3
+Found branch parent: (refs/remotes/tags/end) f9de564cb0de79b57ad26bcb6a80e346598f6afa
 Following parent with do_switch
+	M	readme
 Successfully followed parent
-r3 = 309578e395256101d46d4ce95ef3e138257069ae (refs/remotes/origin/tags/v1)
+r4 = 9dd2a6941c770e56f26de596ef05842627f22bb7 (refs/remotes/tags/end)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-fb5f66810e7876d65f03941f27b6495be5692148
-6242c54e0e73289479686623e98bf2b23742a3e6
-309578e395256101d46d4ce95ef3e138257069ae
-ok 7 - test clone --stdlayout with percent escapes
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk/src/a r1
+fatal: ambiguous argument 'refs/remotes/tags/end@3': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+refs/remotes/tags/end@3
+ok 1 - test refspec globbing
 
-expecting success of 9120.8 'test clone -s with unescaped space': 
-	git svn clone -s "$svnrepo/pr ject" --prefix origin/ space &&
+expecting success of 9109.2 'test left-hand-side only 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/*/*:refs/remotes/two/branches/*/*" &&
+	git config --add svn-remote.two.tags \
+	                 "tags/*:refs/remotes/two/tags/*" &&
 	(
-		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.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
-	A	foo
-r1 = fb5f66810e7876d65f03941f27b6495be5692148 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
-Found branch parent: (refs/remotes/origin/b) fb5f66810e7876d65f03941f27b6495be5692148
+		cd tmp &&
+		echo "try try" >> tags/end/src/b/readme &&
+		poke tags/end/src/b/readme &&
+		svn_cmd commit -m "try to try"
+	) &&
+	git svn fetch two &&
+	git rev-list refs/remotes/two/tags/end >actual &&
+	test_line_count = 6 actual &&
+	git rev-list refs/remotes/two/branches/v1/start >actual &&
+	test_line_count = 3 actual &&
+	test $(git rev-parse refs/remotes/two/branches/v1/start~2) = \
+	     $(git rev-parse refs/remotes/two/trunk) &&
+	test $(git rev-parse refs/remotes/two/tags/end~3) = \
+	     $(git rev-parse refs/remotes/two/branches/v1/start) &&
+	git log --pretty=oneline refs/remotes/two/tags/end >actual &&
+	cut -d" " -f2- actual >output.two &&
+	test_cmp expect.two output.two
+	
+Sending        tags/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 = 54c784e2f9469504e536efb586b0ed10bde6f126 (refs/remotes/two/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
+Found branch parent: (refs/remotes/two/branches/v1/start) 54c784e2f9469504e536efb586b0ed10bde6f126
 Following parent with do_switch
 Successfully followed parent
-r2 = 6242c54e0e73289479686623e98bf2b23742a3e6 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
-Found branch parent: (refs/remotes/origin/tags/v1) fb5f66810e7876d65f03941f27b6495be5692148
+r2 = 3000f6a4a75834361a4d9e1c1950c2a79f041e14 (refs/remotes/two/branches/v1/start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = e75dbf1429e07f5dd18fed36b9698a66d38e1007 (refs/remotes/two/branches/v1/start)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
+Found branch parent: (refs/remotes/two/tags/end) e75dbf1429e07f5dd18fed36b9698a66d38e1007
 Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
 Successfully followed parent
-r3 = 309578e395256101d46d4ce95ef3e138257069ae (refs/remotes/origin/tags/v1)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
-fb5f66810e7876d65f03941f27b6495be5692148
-6242c54e0e73289479686623e98bf2b23742a3e6
-309578e395256101d46d4ce95ef3e138257069ae
-ok 8 - test clone -s with unescaped space
+r4 = afc2efc0d178960c2c73553f86c641d22d955de7 (refs/remotes/two/tags/end)
+	M	src/b/readme
+r5 = 7f05d8760afa862578704ab1e182e2a9bebf9cfd (refs/remotes/two/tags/end)
+	M	src/b/readme
+r6 = 1baf71d7eade7fdd818f960eddd542215d338663 (refs/remotes/two/tags/end)
+ok 2 - test left-hand-side only globbing
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9126-git-svn-follow-deleted-readded-directory.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9126-git-svn-follow-deleted-readded-directory/.git/
-1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9122-git-svn-author.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9122-git-svn-author/.git/
-expecting success of 9122.1 'setup svn repository': 
-	svn_cmd checkout "$svnrepo" work.svn &&
+expecting success of 9109.3 'test another branch': 
 	(
-		cd work.svn &&
-		echo >file &&
-		svn_cmd add file &&
-		svn_cmd commit -m "first commit" file
-	)
-
-Checked out revision 0.
-A         file
-Adding         file
+		cd tmp &&
+		mkdir branches/v2 &&
+		svn_cmd add branches/v2 &&
+		svn_cmd cp trunk branches/v2/start &&
+		svn_cmd commit -m "Another versioned branch" &&
+		svn_cmd up &&
+		echo "hello" >> branches/v2/start/src/b/readme &&
+		poke branches/v2/start/src/b/readme &&
+		echo "howdy" >> branches/v2/start/src/a/readme &&
+		poke branches/v2/start/src/a/readme &&
+		svn_cmd commit -m "Changed 2 in v2/start" &&
+		svn_cmd up &&
+		svn_cmd cp branches/v2/start tags/next &&
+		echo "bye" >> tags/next/src/b/readme &&
+		poke tags/next/src/b/readme &&
+		echo "aye" >> tags/next/src/a/readme &&
+		poke tags/next/src/a/readme &&
+		svn_cmd commit -m "adding more" &&
+		echo "byebye" >> tags/next/src/b/readme &&
+		poke tags/next/src/b/readme &&
+		svn_cmd commit -m "adios"
+	) &&
+	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/*/*:refs/remotes/four/branches/*/*" &&
+	git config --add svn-remote.four.tags \
+	                 "tags/*:refs/remotes/four/tags/*" &&
+	git svn fetch four &&
+	git rev-list refs/remotes/four/tags/next >actual &&
+	test_line_count = 5 actual &&
+	git rev-list refs/remotes/four/branches/v2/start >actual &&
+	test_line_count = 3 actual &&
+	test $(git rev-parse refs/remotes/four/branches/v2/start~2) = \
+	     $(git rev-parse refs/remotes/four/trunk) &&
+	test $(git rev-parse refs/remotes/four/tags/next~2) = \
+	     $(git rev-parse refs/remotes/four/branches/v2/start) &&
+	git log --pretty=oneline refs/remotes/four/tags/next >actual &&
+	cut -d" " -f2- actual >output.four &&
+	test_cmp expect.four output.four
+	
+A         branches/v2
+A         branches/v2/start
+Adding         branches/v2
+Adding         branches/v2/start
+Committing transaction...
+Committed revision 7.
+Updating '.':
+At revision 7.
+Sending        branches/v2/start/src/a/readme
+Sending        branches/v2/start/src/b/readme
+Transmitting file data ..done
+Committing transaction...
+Committed revision 8.
+Updating '.':
+At revision 8.
+A         tags/next
+Adding         tags/next
+Sending        tags/next/src/a/readme
+Sending        tags/next/src/b/readme
+Transmitting file data ..done
+Committing transaction...
+Committed revision 9.
+Sending        tags/next/src/b/readme
 Transmitting file data .done
 Committing transaction...
-Committed revision 1.
-ok 1 - setup svn repository
-
-expecting success of 9122.2 'interact with it via git svn': 
-	mkdir work.git &&
-	(
-		cd work.git &&
-		git svn init "$svnrepo" &&
-		git svn fetch &&
-
-		echo modification >file &&
-		test_tick &&
-		git commit -a -m second &&
-
-		test_tick &&
-		git svn dcommit &&
-
-		echo "further modification" >file &&
-		test_tick &&
-		git commit -a -m third &&
-
-		test_tick &&
-		git svn --add-author-from dcommit &&
-
-		echo "yet further modification" >file &&
-		test_tick &&
-		git commit -a -m fourth &&
-
-		test_tick &&
-		git svn --add-author-from --use-log-author dcommit &&
-
-		git log &&
-
-		git show -s HEAD^^ >../actual.2 &&
-		git show -s HEAD^  >../actual.3 &&
-		git show -s HEAD   >../actual.4
-
-	) &&
-
-	# Make sure that --add-author-from without --use-log-author
-	# did not affect the authorship information
-	myself=$(grep "^Author: " actual.2) &&
-	unaffected=$(grep "^Author: " actual.3) &&
-	test "z$myself" = "z$unaffected" &&
-
-	# Make sure lack of --add-author-from did not add cruft
-	! grep "^    From: A U Thor " actual.2 &&
-
-	# Make sure --add-author-from added cruft
-	grep "^    From: A U Thor " actual.3 &&
-	grep "^    From: A U Thor " actual.4 &&
+Committed revision 10.
+	A	src/a/readme
+	A	src/b/readme
+W: +empty_dir: trunk/doc
+r1 = 54c784e2f9469504e536efb586b0ed10bde6f126 (refs/remotes/four/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start, 1
+Found branch parent: (refs/remotes/four/branches/v1/start) 54c784e2f9469504e536efb586b0ed10bde6f126
+Following parent with do_switch
+Successfully followed parent
+r2 = 3000f6a4a75834361a4d9e1c1950c2a79f041e14 (refs/remotes/four/branches/v1/start)
+	M	src/a/readme
+	M	src/b/readme
+r3 = e75dbf1429e07f5dd18fed36b9698a66d38e1007 (refs/remotes/four/branches/v1/start)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v1/start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/end, 3
+Found branch parent: (refs/remotes/four/tags/end) e75dbf1429e07f5dd18fed36b9698a66d38e1007
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r4 = afc2efc0d178960c2c73553f86c641d22d955de7 (refs/remotes/four/tags/end)
+	M	src/b/readme
+r5 = 7f05d8760afa862578704ab1e182e2a9bebf9cfd (refs/remotes/four/tags/end)
+	M	src/b/readme
+r6 = 1baf71d7eade7fdd818f960eddd542215d338663 (refs/remotes/four/tags/end)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start, 3
+Found branch parent: (refs/remotes/four/branches/v2/start) 54c784e2f9469504e536efb586b0ed10bde6f126
+Following parent with do_switch
+Successfully followed parent
+r7 = 839aef5b6729acbe7d63830eb913e150950e4b54 (refs/remotes/four/branches/v2/start)
+	M	src/a/readme
+	M	src/b/readme
+r8 = 5856fdf6626793a145303a8a08a27bde2ab4db24 (refs/remotes/four/branches/v2/start)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/branches/v2/start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9109-git-svn-multi-glob/svnrepo/tags/next, 8
+Found branch parent: (refs/remotes/four/tags/next) 5856fdf6626793a145303a8a08a27bde2ab4db24
+Following parent with do_switch
+	M	src/a/readme
+	M	src/b/readme
+Successfully followed parent
+r9 = 69182006fa973e63812d0301f9e461434a2e58c9 (refs/remotes/four/tags/next)
+	M	src/b/readme
+r10 = 70808d9b5fffe66eac9d95d0cca9a6f86c2393b8 (refs/remotes/four/tags/next)
+ok 3 - test another branch
 
-	# Make sure --add-author-from with --use-log-author affected
-	# the authorship information
-	grep "^Author: A U Thor " actual.4 &&
+expecting success of 9109.4 'prepare test disallow multiple globs': 
+cat >expect.three <<EOF
+Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
 
-	# Make sure there are no commit messages with excess blank lines
-	test $(grep "^ " actual.2 | wc -l) = 3 &&
-	test $(grep "^ " actual.3 | wc -l) = 5 &&
-	test $(grep "^ " actual.4 | wc -l) = 5 &&
+EOF
+	
+ok 4 - prepare test disallow multiple globs
 
-	# Make sure there are no svn commit messages with excess blank lines
+expecting success of 9109.5 'test disallow multiple globs': 
+	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/*/t/*:refs/remotes/three/branches/*/*" &&
+	git config --add svn-remote.three.tags \
+	                 "tags/*:refs/remotes/three/tags/*" &&
 	(
-		cd work.svn &&
-		svn_cmd up &&
-		
-		test $(svn_cmd log -r2:2 | wc -l) = 5 &&
-		test $(svn_cmd log -r4:4 | wc -l) = 7
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9122-git-svn-author/work.git/.git/
-	A	file
-r1 = c8f6fb653fe41ccd4e82fc7fbfab5141c7c744a0 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo r1
-[master b991b29] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
-	M	file
-Committed r2
-	M	file
-r2 = e087bb87ebbb9cda047ff970758a0ba5b9762ec4 (refs/remotes/git-svn)
-No changes between b991b2954da0471926a4c79d099216cdb063b341 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-[master 04da0a1] third
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
-	M	file
-Committed r3
-	M	file
-r3 = 507e29a7b833346571e2c3d691f614e0bdd6f9cc (refs/remotes/git-svn)
-No changes between 04da0a1d64d5ba190cd4e1340d2c279059c3e8d1 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-[master 81c2182] fourth
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
-	M	file
-Committed r4
-	M	file
-r4 = c2f1839abb8dd894c90521559c8f5bd4ffe32d11 (refs/remotes/git-svn)
-No changes between 81c21827a9e9e556f52b5c0102762cb5dde5b63b and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-commit c2f1839abb8dd894c90521559c8f5bd4ffe32d11
-Author: A U Thor <author@example.com>
-Date:   Thu Dec 18 01:40:10 2025 +0000
-
-    fourth
-    
-    From: A U Thor <author@example.com>
-    
-    git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo@4 83caa96e-c6b6-4bb2-8686-890f3e291ab1
-
-commit 507e29a7b833346571e2c3d691f614e0bdd6f9cc
-Author: pbuilder1 <pbuilder1@83caa96e-c6b6-4bb2-8686-890f3e291ab1>
-Date:   Thu Dec 18 01:40:09 2025 +0000
-
-    third
-    
-    From: A U Thor <author@example.com>
-    
-    git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo@3 83caa96e-c6b6-4bb2-8686-890f3e291ab1
-
-commit e087bb87ebbb9cda047ff970758a0ba5b9762ec4
-Author: pbuilder1 <pbuilder1@83caa96e-c6b6-4bb2-8686-890f3e291ab1>
-Date:   Thu Dec 18 01:40:07 2025 +0000
-
-    second
-    
-    git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo@2 83caa96e-c6b6-4bb2-8686-890f3e291ab1
-
-commit c8f6fb653fe41ccd4e82fc7fbfab5141c7c744a0
-Author: pbuilder1 <pbuilder1@83caa96e-c6b6-4bb2-8686-890f3e291ab1>
-Date:   Thu Dec 18 01:40:05 2025 +0000
-
-    first commit
-    
-    git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo@1 83caa96e-c6b6-4bb2-8686-890f3e291ab1
-    From: A U Thor <author@example.com>
-    From: A U Thor <author@example.com>
-Author: A U Thor <author@example.com>
-Updating '.':
-U    file
-Updated to revision 4.
-ok 2 - interact with it via git svn
+		cd tmp &&
+		echo "try try" >> tags/end/src/b/readme &&
+		poke tags/end/src/b/readme &&
+		svn_cmd commit -m "try to try"
+	) &&
+	test_must_fail git svn fetch three 2> stderr.three &&
+	test_cmp expect.three stderr.three
+	
+Sending        tags/end/src/b/readme
+Transmitting file data .done
+Committing transaction...
+Committed revision 11.
+ok 5 - test disallow multiple globs
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9128-git-svn-cmd-branch.sh ***
-skipping test t9128 altogether
-1..0 # SKIP skip all tests in t9128
+# passed all 5 test(s)
+1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9104-git-svn-follow-parent.sh ***
@@ -513348,14 +511666,14 @@
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
 Initializing parent: refs/remotes/thunk@2
 	A	readme
-r1 = 519da253e2fc1be682b89bb69d83ae1b7d2788c4 (refs/remotes/thunk@2)
+r1 = 13a187400ace1ef887993f040eee7edef6876d90 (refs/remotes/thunk@2)
 	M	readme
-r2 = dd7b8c807a2d4872338e362095f166c5eacaca3d (refs/remotes/thunk@2)
-Found branch parent: (refs/remotes/thunk) dd7b8c807a2d4872338e362095f166c5eacaca3d
+r2 = bb740214ba38c36372c5b2af34d65660ea9ebc83 (refs/remotes/thunk@2)
+Found branch parent: (refs/remotes/thunk) bb740214ba38c36372c5b2af34d65660ea9ebc83
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 2c45f775b2086d5344bcc69b2827e7f1ca8e8d07 (refs/remotes/thunk)
+r3 = 8f74451914e6cbaa4614cc20f728c03b78ba5256 (refs/remotes/thunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk r3
 ok 2 - init and fetch a moved directory
@@ -513373,15 +511691,15 @@
 	test "$(sed -n -e "3p" actual)" = goodbye
 
 	A	readme
-r1 = 519da253e2fc1be682b89bb69d83ae1b7d2788c4 (refs/remotes/svn/trunk)
+r1 = 13a187400ace1ef887993f040eee7edef6876d90 (refs/remotes/svn/trunk)
 	M	readme
-r2 = dd7b8c807a2d4872338e362095f166c5eacaca3d (refs/remotes/svn/trunk)
+r2 = bb740214ba38c36372c5b2af34d65660ea9ebc83 (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) dd7b8c807a2d4872338e362095f166c5eacaca3d
+Found branch parent: (refs/remotes/svn/thunk) bb740214ba38c36372c5b2af34d65660ea9ebc83
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 2c45f775b2086d5344bcc69b2827e7f1ca8e8d07 (refs/remotes/svn/thunk)
+r3 = 8f74451914e6cbaa4614cc20f728c03b78ba5256 (refs/remotes/svn/thunk)
 ok 3 - init and fetch from one svn-remote
 
 expecting success of 9104.4 'follow deleted parent': 
@@ -513400,10 +511718,10 @@
 Committing transaction...
 Committed revision 4.
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) dd7b8c807a2d4872338e362095f166c5eacaca3d
+Found branch parent: (refs/remotes/svn/junk) bb740214ba38c36372c5b2af34d65660ea9ebc83
 Following parent with do_switch
 Successfully followed parent
-r4 = 4eb3e70754c91d9c26d005fcac010977e8985ec6 (refs/remotes/svn/junk)
+r4 = a1701f13dfa9746ebb793f22a408d21dccf9bf57 (refs/remotes/svn/junk)
 ok 4 - follow deleted parent
 
 expecting success of 9104.5 'follow larger parent': 
@@ -513438,17 +511756,17 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	file
-r5 = fa313cf7b9cee5c98a6d02dd73e44e3e2cbf5753 (refs/remotes/larger)
+r5 = 0b13006e11b3453c8da65b8546c06b4a5a76a087 (refs/remotes/larger)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 branch_from: /larger-parent => /larger-parent/trunk/thunk/bump/thud
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) fa313cf7b9cee5c98a6d02dd73e44e3e2cbf5753
+Found branch parent: (refs/remotes/larger-parent) 0b13006e11b3453c8da65b8546c06b4a5a76a087
 Following parent with do_switch
 Successfully followed parent
-r6 = 798e051ef82a6aa03851935ab449421e02faa0e5 (refs/remotes/larger-parent)
-fa313cf7b9cee5c98a6d02dd73e44e3e2cbf5753
-798e051ef82a6aa03851935ab449421e02faa0e5
+r6 = fb6a01fd12064144fdc9fbbe481ac0e47e95d925 (refs/remotes/larger-parent)
+0b13006e11b3453c8da65b8546c06b4a5a76a087
+fb6a01fd12064144fdc9fbbe481ac0e47e95d925
 ok 5 - follow larger parent
 
 expecting success of 9104.6 'follow higher-level parent': 
@@ -513481,13 +511799,13 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 8223e5ae0f867b9e9912e9255e657fc303d5fbdd (refs/remotes/blob@9)
+r7 = 485d3b4ccecc70a76435973a88646dc06cc7e281 (refs/remotes/blob@9)
 	A	hi
-r8 = f31b6c98d1c912a6cbc06052961c8ee8aaea2745 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) f31b6c98d1c912a6cbc06052961c8ee8aaea2745
+r8 = dc42f8ee24eafa013d9449a19f2b12c8a1baf9f1 (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) dc42f8ee24eafa013d9449a19f2b12c8a1baf9f1
 Following parent with do_switch
 Successfully followed parent
-r10 = cf922adfb9675dbf82c87e190d5a5c0a5f25a707 (refs/remotes/blob)
+r10 = 550b675533fde1c3b96fb3a586bab0b06ff08c00 (refs/remotes/blob)
 ok 6 - follow higher-level parent
 
 expecting success of 9104.7 'follow deleted directory': 
@@ -513505,17 +511823,17 @@
 Committed revision 12.
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
-r9 = cbda6790a19742f79caefe227b57834cffc849b6 (refs/remotes/glob)
+r9 = 80135ceae4e268aabea0c86a15cb41000f5762c8 (refs/remotes/glob)
 	A	blob/hi
-r10 = 801f7149646ddba12057647bb0cdc0414f18023b (refs/remotes/glob)
-	D	blob/hi
-	A	blob/bye
-W: -empty_dir: glob/blob/hi
-r11 = 14d9b49effedf24617fdfd46794b82a9ce73ad80 (refs/remotes/glob)
+r10 = 528ca0dc68ebaa10f6746f6945076b3b631f802c (refs/remotes/glob)
 	D	hi
 	A	bye
 W: -empty_dir: glob/blob/hi
-r11 = b33f5e43905af7835ff58dc90253cd0b8a5f9f97 (refs/remotes/blob)
+r11 = e9d5fbeb24cbd837f0837241b88c31a29adbb7c5 (refs/remotes/blob)
+	D	blob/hi
+	A	blob/bye
+W: -empty_dir: glob/blob/hi
+r11 = 8530f1c86d96a3e30ca50c01bf4efcf199a442c7 (refs/remotes/glob)
 ok 7 - follow deleted directory
 
 expecting success of 9104.8 'follow-parent avoids deleting relevant info': 
@@ -513617,12 +511935,12 @@
 	A	b.t
 	A	c.t
 	A	larger-parent
-r13 = 0aa8bae0355747d0fe4071517301dab12434b421 (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 0aa8bae0355747d0fe4071517301dab12434b421
+r13 = 54df41cb1567fa046c86af71d4e9a174835b1a57 (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 54df41cb1567fa046c86af71d4e9a174835b1a57
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = b0660af580c5d5d9a1ec11074a7c7222f2c18f58 (refs/remotes/r9270-t)
+r14 = 6ec0476d690adc9b037c3e52f393d1753ae14226 (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': 
@@ -513642,10 +511960,10 @@
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 branch_from: /r9270/trunk => /r9270/trunk/subversion/bindings/swig/perl/native/t
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t, 14
-Found branch parent: (refs/remotes/r9270-d) b0660af580c5d5d9a1ec11074a7c7222f2c18f58
+Found branch parent: (refs/remotes/r9270-d) 6ec0476d690adc9b037c3e52f393d1753ae14226
 Following parent with do_switch
 Successfully followed parent
-r15 = 50d70cc59ccc9585e5e84c5a6fea46cb7cb90aa4 (refs/remotes/r9270-d)
+r15 = 8004e3e062baaae5645e25934e3fcd1de7508b2c (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': 
@@ -513771,41 +512089,41 @@
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = b02f62782461c81f4fde6f852c02d4ea61a5fe22 (refs/remotes/stunk)
+r16 = ff8ffca38c5bbb6924e5bda7cd17b8caa125a184 (refs/remotes/stunk)
 	M	readme
-r17 = 19fdb50118d9ed0d2817b557286130257552cc75 (refs/remotes/stunk)
+r17 = 52459b7ef82f87f767ac5858f7443a124961355a (refs/remotes/stunk)
 	M	readme
-r18 = 9ffa79bc8116189134aabd3b8f66e026ae845ae0 (refs/remotes/stunk)
+r18 = f5faf0de488ac9f907525ba5e39c00827f50f158 (refs/remotes/stunk)
 1+0 records in
 1+0 records out
-24 bytes copied, 3.976e-05 s, 604 kB/s
+24 bytes copied, 0.00282986 s, 8.5 kB/s
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
 Initializing parent: refs/remotes/flunk@18
 	M	readme
-r17 = 19fdb50118d9ed0d2817b557286130257552cc75 (refs/remotes/flunk@18)
+r17 = 52459b7ef82f87f767ac5858f7443a124961355a (refs/remotes/flunk@18)
 	M	readme
-r18 = 9ffa79bc8116189134aabd3b8f66e026ae845ae0 (refs/remotes/flunk@18)
-Found branch parent: (refs/remotes/flunk) 9ffa79bc8116189134aabd3b8f66e026ae845ae0
+r18 = f5faf0de488ac9f907525ba5e39c00827f50f158 (refs/remotes/flunk@18)
+Found branch parent: (refs/remotes/flunk) f5faf0de488ac9f907525ba5e39c00827f50f158
 Following parent with do_switch
 Successfully followed parent
-r19 = 5f45fe78db1b2faa44ede5e40eac67220701a297 (refs/remotes/flunk)
+r19 = a0ff5c24b5894789cd7dae5c7e21a6002cee3c86 (refs/remotes/flunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 	A	readme
-r16 = b02f62782461c81f4fde6f852c02d4ea61a5fe22 (refs/remotes/stunk)
+r16 = ff8ffca38c5bbb6924e5bda7cd17b8caa125a184 (refs/remotes/stunk)
 	M	readme
-r17 = 19fdb50118d9ed0d2817b557286130257552cc75 (refs/remotes/stunk)
+r17 = 52459b7ef82f87f767ac5858f7443a124961355a (refs/remotes/stunk)
 	M	readme
-r18 = 9ffa79bc8116189134aabd3b8f66e026ae845ae0 (refs/remotes/stunk)
+r18 = f5faf0de488ac9f907525ba5e39c00827f50f158 (refs/remotes/stunk)
 Using existing [svn-remote "svn"]
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 19fdb50118d9ed0d2817b557286130257552cc75
+Found branch parent: (refs/remotes/flunked) 52459b7ef82f87f767ac5858f7443a124961355a
 Following parent with do_switch
 Successfully followed parent
-r20 = 49a0db8309e751ffb04ad1c0be2786cc5b336bb8 (refs/remotes/flunked)
+r20 = 333e037e840c37042a05eec48cd03f9b086b490b (refs/remotes/flunked)
 ok 10 - follow-parent is atomic
 
 expecting success of 9104.11 'track multi-parent paths': 
@@ -513829,7 +512147,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 = d258b9952a9a97c8fc95b13eb2134f6d2bbebcba (refs/remotes/glob@20)
+r13 = 264d972df3089422cc89b91d7a6e6a9d7ab0c973 (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
@@ -513849,7 +512167,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 = 396e1ee19130d74aa27d2a8afefa828df81a9710 (refs/remotes/glob@20)
+r14 = ed0891fb75419e007ccdfdab30a86ed3400a3508 (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -513860,13 +512178,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 = 3f08ec8016336f32a2684271a3f771fbd822b03d (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) 3f08ec8016336f32a2684271a3f771fbd822b03d
+r15 = ce37ac011d180fba9be5b9ad9938e59054850e0e (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) ce37ac011d180fba9be5b9ad9938e59054850e0e
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading 3f08ec8016336f32a2684271a3f771fbd822b03d
+rereading ce37ac011d180fba9be5b9ad9938e59054850e0e
 Following parent with do_switch
 Successfully followed parent
-r21 = 9f8f0b1c5930dccfec46296aebe317f2f6108922 (refs/remotes/glob)
+r21 = 1456b2f0cf8f95c00217d80bb3c5650dc609bc8d (refs/remotes/glob)
 ok 11 - track multi-parent paths
 
 expecting success of 9104.12 'multi-fetch continues to work': 
@@ -513883,82 +512201,82 @@
 	git svn multi-fetch
 	
 	A	readme
-r1 = 519da253e2fc1be682b89bb69d83ae1b7d2788c4 (refs/remotes/svn/trunk)
+r1 = 13a187400ace1ef887993f040eee7edef6876d90 (refs/remotes/svn/trunk)
 	M	readme
-r2 = dd7b8c807a2d4872338e362095f166c5eacaca3d (refs/remotes/svn/trunk)
+r2 = bb740214ba38c36372c5b2af34d65660ea9ebc83 (refs/remotes/svn/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/thunk, 2
-Found branch parent: (refs/remotes/svn/thunk) dd7b8c807a2d4872338e362095f166c5eacaca3d
+Found branch parent: (refs/remotes/svn/thunk) bb740214ba38c36372c5b2af34d65660ea9ebc83
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r3 = 2c45f775b2086d5344bcc69b2827e7f1ca8e8d07 (refs/remotes/svn/thunk)
+r3 = 8f74451914e6cbaa4614cc20f728c03b78ba5256 (refs/remotes/svn/thunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/junk, 2
-Found branch parent: (refs/remotes/svn/junk) dd7b8c807a2d4872338e362095f166c5eacaca3d
+Found branch parent: (refs/remotes/svn/junk) bb740214ba38c36372c5b2af34d65660ea9ebc83
 Following parent with do_switch
 Successfully followed parent
-r4 = 4eb3e70754c91d9c26d005fcac010977e8985ec6 (refs/remotes/svn/junk)
+r4 = a1701f13dfa9746ebb793f22a408d21dccf9bf57 (refs/remotes/svn/junk)
 	A	file
-r5 = fa313cf7b9cee5c98a6d02dd73e44e3e2cbf5753 (refs/remotes/larger)
+r5 = 0b13006e11b3453c8da65b8546c06b4a5a76a087 (refs/remotes/larger)
 branch_from: /larger-parent => /larger-parent/trunk/thunk/bump/thud
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/larger-parent/trunk/thunk/bump/thud => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/another-larger/trunk/thunk/bump/thud, 5
-Found branch parent: (refs/remotes/larger-parent) fa313cf7b9cee5c98a6d02dd73e44e3e2cbf5753
+Found branch parent: (refs/remotes/larger-parent) 0b13006e11b3453c8da65b8546c06b4a5a76a087
 Following parent with do_switch
 Successfully followed parent
-r6 = 798e051ef82a6aa03851935ab449421e02faa0e5 (refs/remotes/larger-parent)
-r9 = cbda6790a19742f79caefe227b57834cffc849b6 (refs/remotes/glob)
-	A	blob/hi
-r10 = 801f7149646ddba12057647bb0cdc0414f18023b (refs/remotes/glob)
+r6 = fb6a01fd12064144fdc9fbbe481ac0e47e95d925 (refs/remotes/larger-parent)
+r9 = 80135ceae4e268aabea0c86a15cb41000f5762c8 (refs/remotes/glob)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/blob => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob/blob, 9
 Initializing parent: refs/remotes/blob@9
-r7 = 8223e5ae0f867b9e9912e9255e657fc303d5fbdd (refs/remotes/blob@9)
+r7 = 485d3b4ccecc70a76435973a88646dc06cc7e281 (refs/remotes/blob@9)
 	A	hi
-r8 = f31b6c98d1c912a6cbc06052961c8ee8aaea2745 (refs/remotes/blob@9)
-Found branch parent: (refs/remotes/blob) f31b6c98d1c912a6cbc06052961c8ee8aaea2745
+r8 = dc42f8ee24eafa013d9449a19f2b12c8a1baf9f1 (refs/remotes/blob@9)
+Found branch parent: (refs/remotes/blob) dc42f8ee24eafa013d9449a19f2b12c8a1baf9f1
 Following parent with do_switch
 Successfully followed parent
-r10 = cf922adfb9675dbf82c87e190d5a5c0a5f25a707 (refs/remotes/blob)
-	D	blob/hi
-	A	blob/bye
-W: -empty_dir: glob/blob/hi
-r11 = 14d9b49effedf24617fdfd46794b82a9ce73ad80 (refs/remotes/glob)
+r10 = 550b675533fde1c3b96fb3a586bab0b06ff08c00 (refs/remotes/blob)
+	A	blob/hi
+r10 = 528ca0dc68ebaa10f6746f6945076b3b631f802c (refs/remotes/glob)
 	D	hi
 	A	bye
 W: -empty_dir: glob/blob/hi
-r11 = b33f5e43905af7835ff58dc90253cd0b8a5f9f97 (refs/remotes/blob)
+r11 = e9d5fbeb24cbd837f0837241b88c31a29adbb7c5 (refs/remotes/blob)
+	D	blob/hi
+	A	blob/bye
+W: -empty_dir: glob/blob/hi
+r11 = 8530f1c86d96a3e30ca50c01bf4efcf199a442c7 (refs/remotes/glob)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/t => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t, 13
 Initializing parent: refs/remotes/r9270-t@13
 	A	a.t
 	A	b.t
 	A	c.t
 	A	larger-parent
-r13 = 0aa8bae0355747d0fe4071517301dab12434b421 (refs/remotes/r9270-t@13)
-Found branch parent: (refs/remotes/r9270-t) 0aa8bae0355747d0fe4071517301dab12434b421
+r13 = 54df41cb1567fa046c86af71d4e9a174835b1a57 (refs/remotes/r9270-t@13)
+Found branch parent: (refs/remotes/r9270-t) 54df41cb1567fa046c86af71d4e9a174835b1a57
 Following parent with do_switch
 	M	c.t
 Successfully followed parent
-r14 = b0660af580c5d5d9a1ec11074a7c7222f2c18f58 (refs/remotes/r9270-t)
+r14 = 6ec0476d690adc9b037c3e52f393d1753ae14226 (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.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t, 14
-Found branch parent: (refs/remotes/r9270-d) b0660af580c5d5d9a1ec11074a7c7222f2c18f58
+Found branch parent: (refs/remotes/r9270-d) 6ec0476d690adc9b037c3e52f393d1753ae14226
 Following parent with do_switch
 Successfully followed parent
-r15 = 50d70cc59ccc9585e5e84c5a6fea46cb7cb90aa4 (refs/remotes/r9270-d)
+r15 = 8004e3e062baaae5645e25934e3fcd1de7508b2c (refs/remotes/r9270-d)
 	A	readme
-r16 = b02f62782461c81f4fde6f852c02d4ea61a5fe22 (refs/remotes/stunk)
+r16 = ff8ffca38c5bbb6924e5bda7cd17b8caa125a184 (refs/remotes/stunk)
 	M	readme
-r17 = 19fdb50118d9ed0d2817b557286130257552cc75 (refs/remotes/stunk)
+r17 = 52459b7ef82f87f767ac5858f7443a124961355a (refs/remotes/stunk)
 	M	readme
-r18 = 9ffa79bc8116189134aabd3b8f66e026ae845ae0 (refs/remotes/stunk)
+r18 = f5faf0de488ac9f907525ba5e39c00827f50f158 (refs/remotes/stunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunk, 18
-Found branch parent: (refs/remotes/flunk) 9ffa79bc8116189134aabd3b8f66e026ae845ae0
+Found branch parent: (refs/remotes/flunk) f5faf0de488ac9f907525ba5e39c00827f50f158
 Following parent with do_switch
 Successfully followed parent
-r19 = 5f45fe78db1b2faa44ede5e40eac67220701a297 (refs/remotes/flunk)
+r19 = a0ff5c24b5894789cd7dae5c7e21a6002cee3c86 (refs/remotes/flunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/stunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/flunked, 17
-Found branch parent: (refs/remotes/flunked) 19fdb50118d9ed0d2817b557286130257552cc75
+Found branch parent: (refs/remotes/flunked) 52459b7ef82f87f767ac5858f7443a124961355a
 Following parent with do_switch
 Successfully followed parent
-r20 = 49a0db8309e751ffb04ad1c0be2786cc5b336bb8 (refs/remotes/flunked)
+r20 = 333e037e840c37042a05eec48cd03f9b086b490b (refs/remotes/flunked)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/r9270 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9104-git-svn-follow-parent/svnrepo/glob, 20
 Initializing parent: refs/remotes/glob@20
 	A	trunk/readme
@@ -513971,7 +512289,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 = d258b9952a9a97c8fc95b13eb2134f6d2bbebcba (refs/remotes/glob@20)
+r13 = 264d972df3089422cc89b91d7a6e6a9d7ab0c973 (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
@@ -513991,7 +512309,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 = 396e1ee19130d74aa27d2a8afefa828df81a9710 (refs/remotes/glob@20)
+r14 = ed0891fb75419e007ccdfdab30a86ed3400a3508 (refs/remotes/glob@20)
 	A	drunk/readme
 	A	drunk/subversion/bindings/swig/perl/another-larger
 	A	drunk/subversion/bindings/swig/perl/native/a.pm
@@ -514002,34 +512320,51 @@
 	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 = 3f08ec8016336f32a2684271a3f771fbd822b03d (refs/remotes/glob@20)
-Found branch parent: (refs/remotes/glob) 3f08ec8016336f32a2684271a3f771fbd822b03d
+r15 = ce37ac011d180fba9be5b9ad9938e59054850e0e (refs/remotes/glob@20)
+Found branch parent: (refs/remotes/glob) ce37ac011d180fba9be5b9ad9938e59054850e0e
 Index mismatch: 3cd9c37c278d8b60927f43385900d57622921efe != b80e441d0bfb8031c1110b908fb333507c1b9180
-rereading 3f08ec8016336f32a2684271a3f771fbd822b03d
+rereading ce37ac011d180fba9be5b9ad9938e59054850e0e
 Following parent with do_switch
 Successfully followed parent
-r21 = 9f8f0b1c5930dccfec46296aebe317f2f6108922 (refs/remotes/glob)
+r21 = 1456b2f0cf8f95c00217d80bb3c5650dc609bc8d (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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9125-git-svn-multi-glob-branch-names.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9125-git-svn-multi-glob-branch-names/.git/
-expecting success of 9125.1 'setup svnrepo': 
-	mkdir project project/trunk project/branches \
-			project/branches/v14.1 project/tags &&
+*** t9119-git-svn-info.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9119-git-svn-info/.git/
+1..0 # SKIP skipping svn-info test (SVN version: 1.14.4 not supported)
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9118-git-svn-funky-branch-names.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9118-git-svn-funky-branch-names/.git/
+expecting success of 9118.1 'setup svnrepo': 
+	mkdir project project/trunk project/branches project/tags &&
 	echo foo > project/trunk/foo &&
-	svn_cmd import -m "$test_description" project "$svnrepo/project" &&
+	svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
 	rm -rf project &&
-	svn_cmd cp -m "fun" "$svnrepo/project/trunk" \
-	                "$svnrepo/project/branches/v14.1/beta" &&
-	svn_cmd cp -m "more fun!" "$svnrepo/project/branches/v14.1/beta" \
-	                      "$svnrepo/project/branches/v14.1/gold"
+	svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \
+	                "$svnrepo/pr ject/branches/fun plugin" &&
+	svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \
+	                      "$svnrepo/pr ject/branches/more fun plugin!" &&
+	svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \
+	              "$svnrepo/pr ject/branches/$scary_uri" &&
+	svn_cmd cp -m "leading dot" "$svnrepo/pr ject/trunk" \
+			"$svnrepo/pr ject/branches/.leading_dot" &&
+	if test_have_prereq !MINGW
+	then
+		svn_cmd cp -m "trailing dot" "$svnrepo/pr ject/trunk" \
+			"$svnrepo/pr ject/branches/trailing_dot."
+	fi &&
+	svn_cmd cp -m "trailing .lock" "$svnrepo/pr ject/trunk" \
+			"$svnrepo/pr ject/branches/trailing_dotlock.lock" &&
+	svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \
+			"$svnrepo/pr ject/branches/not-a@{0}reflog@" &&
+	maybe_start_httpd
 	
 Adding         project/branches
-Adding         project/branches/v14.1
 Adding         project/tags
 Adding         project/trunk
 Adding         project/trunk/foo
@@ -514039,60 +512374,311 @@
 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.
+Committing transaction...
+Committed revision 8.
 ok 1 - setup svnrepo
 
-expecting success of 9125.2 'test clone with multi-glob in branch names': 
-	git svn clone -T trunk -b branches/*/* -t tags \
-	              "$svnrepo/project" project &&
-	(cd project &&
-		git rev-parse "refs/remotes/origin/v14.1/beta" &&
-		git rev-parse "refs/remotes/origin/v14.1/gold"
+expecting success of 9118.2 'test clone with funky branch names': 
+	git svn clone -s "$svnrepo/pr ject" project &&
+	(
+		cd project &&
+		git rev-parse "refs/remotes/origin/fun%20plugin" &&
+		git rev-parse "refs/remotes/origin/more%20fun%20plugin!" &&
+		git rev-parse "refs/remotes/origin/$scary_ref" &&
+		git rev-parse "refs/remotes/origin/%2Eleading_dot" &&
+		if test_have_prereq !MINGW
+		then
+			git rev-parse "refs/remotes/origin/trailing_dot%2E"
+		fi &&
+		git rev-parse "refs/remotes/origin/trailing_dotlock%2Elock" &&
+		git rev-parse "refs/remotes/origin/$non_reflog"
 	)
 	
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9125-git-svn-multi-glob-branch-names/project/.git/
-Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9118-git-svn-funky-branch-names/project/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo
 	A	foo
-r1 = a41291bf392a80d89bb551c884394b67f5586ab8 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta, 1
-Found branch parent: (refs/remotes/origin/v14.1/beta) a41291bf392a80d89bb551c884394b67f5586ab8
+r1 = ff8dfbcee8f5353a2abd8527a15febe6cb97da4f (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin, 1
+Found branch parent: (refs/remotes/origin/fun plugin) ff8dfbcee8f5353a2abd8527a15febe6cb97da4f
 Following parent with do_switch
 Successfully followed parent
-r2 = 440be497ca3540f501098ae9a10a964f5e4cb0ed (refs/remotes/origin/v14.1/beta)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/gold, 2
-Found branch parent: (refs/remotes/origin/v14.1/gold) 440be497ca3540f501098ae9a10a964f5e4cb0ed
+r2 = 45985860227f61b277bb62f078a6e3f4b03ad6e4 (refs/remotes/origin/fun plugin)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/more%20fun%20plugin!, 2
+Found branch parent: (refs/remotes/origin/more fun plugin!) 45985860227f61b277bb62f078a6e3f4b03ad6e4
+Following parent with do_switch
+Successfully followed parent
+r3 = 37fc0cbbae725ef901823cb2f6e0eac6a2bf857e (refs/remotes/origin/more fun plugin!)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/fun%20plugin => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/Abo-Uebernahme%20(Bug%20%23994), 3
+Found branch parent: (refs/remotes/origin/Abo-Uebernahme (Bug #994)) 45985860227f61b277bb62f078a6e3f4b03ad6e4
+Following parent with do_switch
+Successfully followed parent
+r4 = 533f527175a04cc7004226c76eaac7c9105a335a (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/.leading_dot, 4
+Found branch parent: (refs/remotes/origin/.leading_dot) ff8dfbcee8f5353a2abd8527a15febe6cb97da4f
 Following parent with do_switch
 Successfully followed parent
-r3 = c130cc4e3525cdcc57dfa04b4f29c8f4fe7328a1 (refs/remotes/origin/v14.1/gold)
+r5 = 12455410257d5e66888c143fa1b59a57877b705e (refs/remotes/origin/.leading_dot)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dot., 5
+Found branch parent: (refs/remotes/origin/trailing_dot.) ff8dfbcee8f5353a2abd8527a15febe6cb97da4f
+Following parent with do_switch
+Successfully followed parent
+r6 = 23d66a2f2fedc8b0bb7239ca7b6e24662573ff39 (refs/remotes/origin/trailing_dot.)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dotlock.lock, 6
+Found branch parent: (refs/remotes/origin/trailing_dotlock.lock) ff8dfbcee8f5353a2abd8527a15febe6cb97da4f
+Following parent with do_switch
+Successfully followed parent
+r7 = 9d413bae0c8a82ef0f71af2e48d2bb333773641e (refs/remotes/origin/trailing_dotlock.lock)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/not-a@%7B0%7Dreflog, 7
+Found branch parent: (refs/remotes/origin/not-a@{0}reflog) ff8dfbcee8f5353a2abd8527a15febe6cb97da4f
+Following parent with do_switch
+Successfully followed parent
+r8 = 41e5b1d97dafb1fe906ec46d03b1f5182543b907 (refs/remotes/origin/not-a@{0}reflog)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk r1
-440be497ca3540f501098ae9a10a964f5e4cb0ed
-c130cc4e3525cdcc57dfa04b4f29c8f4fe7328a1
-ok 2 - test clone with multi-glob in branch names
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/trunk r1
+45985860227f61b277bb62f078a6e3f4b03ad6e4
+37fc0cbbae725ef901823cb2f6e0eac6a2bf857e
+533f527175a04cc7004226c76eaac7c9105a335a
+12455410257d5e66888c143fa1b59a57877b705e
+23d66a2f2fedc8b0bb7239ca7b6e24662573ff39
+9d413bae0c8a82ef0f71af2e48d2bb333773641e
+41e5b1d97dafb1fe906ec46d03b1f5182543b907
+ok 2 - test clone with funky branch names
 
-expecting success of 9125.3 'test dcommit to multi-globbed branch': 
-	(cd project &&
-	git reset --hard 'refs/remotes/origin/v14.1/gold' &&
-	echo hello >> foo &&
-	git commit -m 'hello' -- foo &&
-	git svn dcommit
+expecting success of 9118.3 'test dcommit to funky branch': 
+	(
+		cd project &&
+		git reset --hard 'refs/remotes/origin/more%20fun%20plugin!' &&
+		echo hello >> foo &&
+		git commit -m 'hello' -- foo &&
+		git svn dcommit
 	)
 	
-HEAD is now at c130cc4 more fun!
-[master 1f2b8db] hello
+HEAD is now at 37fc0cb more fun!
+[master b128466] hello
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/gold ...
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/more%20fun%20plugin! ...
 	M	foo
-Committed r4
+Committed r9
 	M	foo
-r4 = 015ce216a340de8537877b59cce5410c6e2a9777 (refs/remotes/origin/v14.1/gold)
-No changes between 1f2b8db8e4219de806fa5d86e28e951d0a07faaa 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
+r9 = 3119a53d3d3a10901b5ac53fc98361b455e796d3 (refs/remotes/origin/more fun plugin!)
+No changes between b1284665abbf2fc68f5df89c63d2e26af2e19df1 and refs/remotes/origin/more%20fun%20plugin!
+Resetting to the latest refs/remotes/origin/more%20fun%20plugin!
+ok 3 - test dcommit to funky branch
 
-# passed all 3 test(s)
-1..3
+expecting success of 9118.4 'test dcommit to scary branch': 
+	(
+		cd project &&
+		git reset --hard "refs/remotes/origin/$scary_ref" &&
+		echo urls are scary >> foo &&
+		git commit -m "eep" -- foo &&
+		git svn dcommit
+	)
+	
+HEAD is now at 533f527 scary
+[master 254ea7b] eep
+ 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.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/Abo-Uebernahme%20(Bug%20%23994) ...
+	M	foo
+Committed r10
+	M	foo
+r10 = d740d987b1ffd9f4a785ff28545c9fae95d5d21e (refs/remotes/origin/Abo-Uebernahme (Bug #994))
+No changes between 254ea7b9953ea41e8b7042c97dde62082340c98c 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
+
+expecting success of 9118.5 'test dcommit to trailing_dotlock branch': 
+	(
+		cd project &&
+		git reset --hard "refs/remotes/origin/trailing_dotlock%2Elock" &&
+		echo who names branches like this anyway? >> foo &&
+		git commit -m "bar" -- foo &&
+		git svn dcommit
+	)
+	
+HEAD is now at 9d413ba trailing .lock
+[master 54232ba] bar
+ 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.45.2/t/trash%20directory.t9118-git-svn-funky-branch-names/svnrepo/pr%20ject/branches/trailing_dotlock.lock ...
+	M	foo
+Committed r11
+	M	foo
+r11 = 8180cde0144ed636e5929b0f0e1c929f77e9e3f8 (refs/remotes/origin/trailing_dotlock.lock)
+No changes between 54232ba9d51c09e4198ea0abc24368d234bf4a42 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
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9117-git-svn-init-clone.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/.git/
+expecting success of 9117.1 'setup svnrepo': 
+	mkdir project project/trunk project/branches project/tags &&
+	echo foo > project/trunk/foo &&
+	svn_cmd import -m "$test_description" project "$svnrepo"/project &&
+	rm -rf project
+	
+Adding         project/branches
+Adding         project/tags
+Adding         project/trunk
+Adding         project/trunk/foo
+Committing transaction...
+Committed revision 1.
+ok 1 - setup svnrepo
+
+expecting success of 9117.2 'basic clone': 
+	test ! -d trunk &&
+	git svn clone "$svnrepo"/project/trunk &&
+	test_path_is_dir trunk/.git/svn &&
+	test_path_exists trunk/foo &&
+	rm -rf trunk
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
+	A	foo
+r1 = 4071efe9cce2c7d3ec34741d714a3ac66755751c (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
+ok 2 - basic clone
+
+expecting success of 9117.3 'clone to target directory': 
+	test ! -d target &&
+	git svn clone "$svnrepo"/project/trunk target &&
+	test_path_is_dir target/.git/svn &&
+	test_path_exists target/foo &&
+	rm -rf target
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/target/.git/
+	A	foo
+r1 = 4071efe9cce2c7d3ec34741d714a3ac66755751c (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
+ok 3 - clone to target directory
+
+expecting success of 9117.4 'clone with --stdlayout': 
+	test ! -d project &&
+	git svn clone -s "$svnrepo"/project &&
+	test_path_is_dir project/.git/svn &&
+	test_path_exists project/foo &&
+	rm -rf project
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
+	A	foo
+r1 = 4071efe9cce2c7d3ec34741d714a3ac66755751c (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
+ok 4 - clone with --stdlayout
+
+expecting success of 9117.5 'clone to target directory with --stdlayout': 
+	test ! -d target &&
+	git svn clone -s "$svnrepo"/project target &&
+	test_path_is_dir target/.git/svn &&
+	test_path_exists target/foo &&
+	rm -rf target
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/target/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
+	A	foo
+r1 = 4071efe9cce2c7d3ec34741d714a3ac66755751c (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk r1
+ok 5 - clone to target directory with --stdlayout
+
+expecting success of 9117.6 'init without -s/-T/-b/-t does not warn': 
+	test ! -d trunk &&
+	git svn init "$svnrepo"/project/trunk trunk 2>warning &&
+	! grep -q prefix warning &&
+	rm -rf trunk &&
+	rm -f warning
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
+ok 6 - init without -s/-T/-b/-t does not warn
+
+expecting success of 9117.7 'clone without -s/-T/-b/-t does not warn': 
+	test ! -d trunk &&
+	git svn clone "$svnrepo"/project/trunk 2>warning &&
+	! grep -q prefix warning &&
+	rm -rf trunk &&
+	rm -f warning
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/trunk/.git/
+	A	foo
+r1 = 4071efe9cce2c7d3ec34741d714a3ac66755751c (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/': 
+	test ! -d project &&
+	git svn init -s "$svnrepo"/project project 2>warning &&
+	! grep -q prefix warning &&
+	test_svn_configured_prefix "origin/" &&
+	rm -rf project &&
+	rm -f warning
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
+ok 8 - init with -s/-T/-b/-t assumes --prefix=origin/
+
+expecting success of 9117.9 'clone with -s/-T/-b/-t assumes --prefix=origin/': 
+	test ! -d project &&
+	git svn clone -s "$svnrepo"/project 2>warning &&
+	! grep -q prefix warning &&
+	test_svn_configured_prefix "origin/" &&
+	rm -rf project &&
+	rm -f warning
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
+	A	foo
+r1 = 4071efe9cce2c7d3ec34741d714a3ac66755751c (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': 
+	test ! -d project &&
+	git svn init -s "$svnrepo"/project project --prefix "" 2>warning &&
+	! grep -q prefix warning &&
+	test_svn_configured_prefix "" &&
+	rm -rf project &&
+	rm -f warning
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
+ok 10 - init with -s/-T/-b/-t and --prefix "" still works
+
+expecting success of 9117.11 'clone with -s/-T/-b/-t and --prefix "" still works': 
+	test ! -d project &&
+	git svn clone -s "$svnrepo"/project --prefix "" 2>warning &&
+	! grep -q prefix warning &&
+	test_svn_configured_prefix "" &&
+	rm -rf project &&
+	rm -f warning
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9117-git-svn-init-clone/project/.git/
+	A	foo
+r1 = 4071efe9cce2c7d3ec34741d714a3ac66755751c (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': 
+	test ! -d project &&
+	git svn init -T "$svnrepo"/project/trunk project &&
+	rm -rf project
+	
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9117-git-svn-init-clone/svnrepo
+ok 12 - init with -T as a full url works
+
+# passed all 12 test(s)
+1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9116-git-svn-log.sh ***
@@ -514148,21 +512734,21 @@
 Committing transaction...
 Committed revision 1.
 	A	README
-r1 = fa2c4f0a11e5a20dfba806bbec147780cdaddf60 (refs/remotes/origin/tags/0.3)
+r1 = a37ad4746961df34a69d734d91ff273535c5b058 (refs/remotes/origin/b)
 	A	README
-r1 = 59996117558abdece00941ffb80b877de25208a4 (refs/remotes/origin/tags/0.2)
+r1 = 20a8e39e4064606d1e0d48d3c712c110b13a4425 (refs/remotes/origin/tags/0.1)
 	A	README
-r1 = 465bf821b6a3f16b3ff0386a3fb21e89202ec7cd (refs/remotes/origin/a)
+r1 = df253d93a2a5d2a33039fc5c6ef6ef93b928f43c (refs/remotes/origin/tags/0.2)
 	A	README
-r1 = 930b748184083308d9ff1c1765f6494f224a8506 (refs/remotes/origin/tags/0.1)
+r1 = 435818190325e8be111f0f30b7d4ce03e5cd20bd (refs/remotes/origin/trunk)
 	A	README
-r1 = 4e32bbc08298f0963b2351477922930a43bac160 (refs/remotes/origin/trunk)
+r1 = 938cad86b2e418103ec809f50535960bfb593dea (refs/remotes/origin/tags/0.3)
 	A	README
-r1 = 8b9a2b8eadc74a9f7bbde6707113a4b5976b08a6 (refs/remotes/origin/b)
+r1 = 1ff63613923cc484a316a79ad4b826595229d14a (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9116-git-svn-log/svnrepo/trunk r1
-HEAD is now at 4e32bbc test
-[master 0c9f22d] bye
+HEAD is now at 4358181 test
+[master 339e5d4] bye
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -514170,11 +512756,11 @@
 	M	README
 Committed r2
 	M	README
-r2 = a35f7df2edfc832a345d099989c83cab0bf114b8 (refs/remotes/origin/trunk)
-No changes between 0c9f22db594d5a81a48850510980a87e5d690f91 and refs/remotes/origin/trunk
+r2 = a08c70dbcd76287064ee1417683bd5d2727cfd08 (refs/remotes/origin/trunk)
+No changes between 339e5d4d4df1ce09202a15f71c1a44fa6b9fa8d5 and refs/remotes/origin/trunk
 Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at 465bf82 test
-[master da33b13] feedme
+HEAD is now at 1ff6361 test
+[master 040828d] feedme
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 FEEDME
@@ -514183,11 +512769,11 @@
 	A	FEEDME
 Committed r3
 	A	FEEDME
-r3 = 52777313e27fd0be3386d19714a1c476898ba4b9 (refs/remotes/origin/a)
-No changes between da33b1341e70a7d65e5da1c295011ab470601dab and refs/remotes/origin/a
+r3 = 588ab525c56184947d14eb2a2cff6dd090c18736 (refs/remotes/origin/a)
+No changes between 040828de557524ab0762723f4935b8c6037bc9da and refs/remotes/origin/a
 Resetting to the latest refs/remotes/origin/a
-HEAD is now at a35f7df bye
-[master 04113f8] aye
+HEAD is now at a08c70d bye
+[master c97eb03] aye
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -514195,14 +512781,14 @@
 	M	README
 Committed r4
 	M	README
-r4 = 8bacd6ab2b038a0cc912b0a51fa8d944fffc6d30 (refs/remotes/origin/trunk)
-No changes between 04113f87925b63f3f6949693ab1d4dd414d52def and refs/remotes/origin/trunk
+r4 = 174cefd85bcf160eccccf9951462a8b1fff5ed5c (refs/remotes/origin/trunk)
+No changes between c97eb03c18ff9cba33789d11f9d8272dce3e798e and refs/remotes/origin/trunk
 Resetting to the latest refs/remotes/origin/trunk
-HEAD is now at 8b9a2b8 test
-[master 8317b43] spy
+HEAD is now at a37ad47 test
+[master 2c00623] spy
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master f010929] try
+[master 19128f7] try
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
 Duplicate specification "id|i=s" for option "i"
@@ -514210,12 +512796,12 @@
 	M	README
 Committed r5
 	M	README
-r5 = b5d12dd51ff187da37fb36a84410a20da8615ff9 (refs/remotes/origin/b)
+r5 = 12b1278bffb539caedc11a12686218cc34957e06 (refs/remotes/origin/b)
 	M	README
 Committed r6
 	M	README
-r6 = 4fa78a4604eb9d9cc124bf04b5cc86f226e301d9 (refs/remotes/origin/b)
-No changes between f010929dee88feb8fa3f53c4cb60dc845c2590e9 and refs/remotes/origin/b
+r6 = e4c60296cf92ca01e712fa4412abe735634556a8 (refs/remotes/origin/b)
+No changes between 19128f70dee0d68cbcbc66d4e483d57a136e55f2 and refs/remotes/origin/b
 Resetting to the latest refs/remotes/origin/b
 ok 1 - setup repository and import
 
@@ -514228,10 +512814,10 @@
 	git svn log -r3 >out &&
 	grep ^r3 out
 	
-HEAD is now at 5277731 feedme
-r2 | pbuilder1 | 2025-12-18 01:39:56 +0000 (Thu, 18 Dec 2025) | 2 lines
-r4 | pbuilder1 | 2025-12-18 01:40:00 +0000 (Thu, 18 Dec 2025) | 2 lines
-r3 | pbuilder1 | 2025-12-18 01:39:58 +0000 (Thu, 18 Dec 2025) | 2 lines
+HEAD is now at 588ab52 feedme
+r2 | pbuilder2 | 2024-11-14 19:46:46 +0000 (Thu, 14 Nov 2024) | 2 lines
+r4 | pbuilder2 | 2024-11-14 19:46:50 +0000 (Thu, 14 Nov 2024) | 2 lines
+r3 | pbuilder2 | 2024-11-14 19:46:48 +0000 (Thu, 14 Nov 2024) | 2 lines
 ok 2 - run log
 
 expecting success of 9116.3 'run log against a from trunk': 
@@ -514239,22 +512825,22 @@
 	git svn log -r3 origin/a >out &&
 	grep ^r3 out
 	
-HEAD is now at 8bacd6a aye
-r3 | pbuilder1 | 2025-12-18 01:39:58 +0000 (Thu, 18 Dec 2025) | 2 lines
+HEAD is now at 174cefd aye
+r3 | pbuilder2 | 2024-11-14 19:46:48 +0000 (Thu, 14 Nov 2024) | 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd aye
 ok 5 - test ascending revision range with --show-commit
 
 expecting success of 9116.6 'test ascending revision range with --show-commit (sha1)': 
@@ -514266,90 +512852,903 @@
 	git rev-parse $(cat out) >actual &&
 	test_cmp expected-range-r1-r2-r4-sha1 actual
 	
-HEAD is now at 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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 8bacd6a aye
+HEAD is now at 174cefd 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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9121-git-svn-fetch-renamed-dir.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9121-git-svn-fetch-renamed-dir/.git/
+expecting success of 9121.1 'load repository with renamed directory': 
+	svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9121/renamed-dir.dump
+	
+ok 1 - load repository with renamed directory
+
+expecting success of 9121.2 'init and fetch repository': 
+	git svn init "$svnrepo/newname" &&
+	git svn fetch
+	
+	A	a.txt
+r2 = 30139ea92a1f2145db6cbad135b46c1d4ca2e458 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9121-git-svn-fetch-renamed-dir/svnrepo/newname r2
+ok 2 - init and fetch repository
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9115-git-svn-dcommit-funky-renames.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9115-git-svn-dcommit-funky-renames/.git/
+expecting success of 9115.1 'load repository with strange names': 
+	svnadmin load -q "$rawsvnrepo" <"$TEST_DIRECTORY"/t9115/funky-names.dump
+
+ok 1 - load repository with strange names
+
+expecting success of 9115.2 'init and fetch repository': 
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	git reset --hard git-svn
+	
+	A	 leading space file
+	A	#{cool_name}
+	A	file name with spaces
+W: +empty_dir:  leading space
+W: +empty_dir: #{bad_directory_name}
+W: +empty_dir: dir name with spaces
+W: +empty_dir: regular_dir_name
+r1 = fe3e666f2108d8ee9a05746cc6b083fe1de98a33 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo r1
+creating empty directory:  leading space
+creating empty directory: #{bad_directory_name}
+creating empty directory: dir name with spaces
+creating empty directory: regular_dir_name
+HEAD is now at fe3e666 what will those wacky people think of next?
+ok 2 - init and fetch repository
+
+expecting success of 9115.3 'create file in existing ugly and empty dir': 
+	mkdir -p "#{bad_directory_name}" &&
+	echo hi > "#{bad_directory_name}/ foo" &&
+	git update-index --add "#{bad_directory_name}/ foo" &&
+	git commit -m "new file in ugly parent" &&
+	git svn dcommit
+	
+[master 7c586f3] new file in ugly parent
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 #{bad_directory_name}/ foo
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	#{bad_directory_name}/ foo
+Committed r2
+	A	#{bad_directory_name}/ foo
+r2 = 2896db8c49b224c1caae23deb38b016121b1a780 (refs/remotes/git-svn)
+No changes between 7c586f3c6cb9090b584541e128161b66c5393faf and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 3 - create file in existing ugly and empty dir
+
+expecting success of 9115.4 'rename ugly file': 
+	git mv "#{bad_directory_name}/ foo" "file name with feces" &&
+	git commit -m "rename ugly file" &&
+	git svn dcommit
+	
+[master 473c997] 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%)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	R	#{bad_directory_name}/ foo => file name with feces
+Committed r3
+	D	#{bad_directory_name}/ foo
+	A	file name with feces
+W: -empty_dir: #{bad_directory_name}/ foo
+r3 = feea5614060648a620ea4590f0d5816d0565acce (refs/remotes/git-svn)
+No changes between 473c997a067dc17dc18cab8c996c075a4056c4ec and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 4 - rename ugly file
+
+expecting success of 9115.5 'rename pretty file': 
+	echo :x > pretty &&
+	git update-index --add pretty &&
+	git commit -m "pretty :x" &&
+	git svn dcommit &&
+	mkdir -p regular_dir_name &&
+	git mv pretty regular_dir_name/pretty &&
+	git commit -m "moved pretty file" &&
+	git svn dcommit
+	
+[master a6c634e] pretty :x
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 pretty
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	pretty
+Committed r4
+	A	pretty
+r4 = f25d9082328f8a98ca5742091a31dc555c395829 (refs/remotes/git-svn)
+No changes between a6c634e09f2c26d72f30f676b2c202a784c96f18 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+[master f023815] moved pretty file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename pretty => regular_dir_name/pretty (100%)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	R	pretty => regular_dir_name/pretty
+Committed r5
+	D	pretty
+	A	regular_dir_name/pretty
+W: -empty_dir: pretty
+r5 = 553c3efd6b4b735152f35e24c69ff7413acc5833 (refs/remotes/git-svn)
+No changes between f02381568af06057a8a011e5a6371f5e81d6ecb2 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 5 - rename pretty file
+
+expecting success of 9115.6 'rename pretty file into ugly one': 
+	git mv regular_dir_name/pretty "#{bad_directory_name}/ booboo" &&
+	git commit -m booboo &&
+	git svn dcommit
+	
+[master 0aac961] 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%)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	R	regular_dir_name/pretty => #{bad_directory_name}/ booboo
+Committed r6
+	A	#{bad_directory_name}/ booboo
+	D	regular_dir_name/pretty
+W: -empty_dir: regular_dir_name/pretty
+r6 = f6af4806bb476a585e2263ad440409b789d77c6f (refs/remotes/git-svn)
+No changes between 0aac961531bf2d7d1c917422648a4107f52b79cf and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 6 - rename pretty file into ugly one
+
+expecting success of 9115.7 'add a file with plus signs': 
+	echo .. > +_+ &&
+	git update-index --add +_+ &&
+	git commit -m plus &&
+	mkdir gtk+ &&
+	git mv +_+ gtk+/_+_ &&
+	git commit -m plus_dir &&
+	git svn dcommit
+	
+[master 05b70d9] plus
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 +_+
+[master ac88c30] plus_dir
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename +_+ => gtk+/_+_ (100%)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	+_+
+Committed r7
+	A	+_+
+r7 = 924e391fc5fc90135a67ac2e1207fdb01488814a (refs/remotes/git-svn)
+	R	+_+ => gtk+/_+_
+Committed r8
+	D	+_+
+	A	gtk+/_+_
+W: -empty_dir: +_+
+r8 = c6b943c8697390008409a948d661abf88a33b4ee (refs/remotes/git-svn)
+No changes between ac88c3057938d5fea2630073aaf57a4f06443eb5 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 7 - add a file with plus signs
+
+expecting success of 9115.8 'clone the repository to test rebase': 
+	git svn clone "$svnrepo" test-rebase &&
+	(
+		cd test-rebase &&
+		echo test-rebase >test-rebase &&
+		git add test-rebase &&
+		git commit -m test-rebase
+	)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9115-git-svn-dcommit-funky-renames/test-rebase/.git/
+	A	 leading space file
+	A	#{cool_name}
+	A	file name with spaces
+W: +empty_dir:  leading space
+W: +empty_dir: #{bad_directory_name}
+W: +empty_dir: dir name with spaces
+W: +empty_dir: regular_dir_name
+r1 = fe3e666f2108d8ee9a05746cc6b083fe1de98a33 (refs/remotes/git-svn)
+	A	#{bad_directory_name}/ foo
+r2 = 2896db8c49b224c1caae23deb38b016121b1a780 (refs/remotes/git-svn)
+	D	#{bad_directory_name}/ foo
+	A	file name with feces
+W: -empty_dir: #{bad_directory_name}/ foo
+r3 = feea5614060648a620ea4590f0d5816d0565acce (refs/remotes/git-svn)
+	A	pretty
+r4 = f25d9082328f8a98ca5742091a31dc555c395829 (refs/remotes/git-svn)
+	D	pretty
+	A	regular_dir_name/pretty
+W: -empty_dir: pretty
+r5 = 553c3efd6b4b735152f35e24c69ff7413acc5833 (refs/remotes/git-svn)
+	A	#{bad_directory_name}/ booboo
+	D	regular_dir_name/pretty
+W: -empty_dir: regular_dir_name/pretty
+r6 = f6af4806bb476a585e2263ad440409b789d77c6f (refs/remotes/git-svn)
+	A	+_+
+r7 = 924e391fc5fc90135a67ac2e1207fdb01488814a (refs/remotes/git-svn)
+	D	+_+
+	A	gtk+/_+_
+W: -empty_dir: +_+
+r8 = c6b943c8697390008409a948d661abf88a33b4ee (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo r8
+creating empty directory:  leading space
+creating empty directory: dir name with spaces
+creating empty directory: regular_dir_name
+[master 5839015] test-rebase
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-rebase
+ok 8 - clone the repository to test rebase
+
+expecting success of 9115.9 'make a commit to test rebase': 
+		echo test-rebase-main > test-rebase-main &&
+		git add test-rebase-main &&
+		git commit -m test-rebase-main &&
+		git svn dcommit
+	
+[master cd380d4] test-rebase-main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 test-rebase-main
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	test-rebase-main
+Committed r9
+	A	test-rebase-main
+r9 = 63f2c838120babf9884abcb84baae608f64283e7 (refs/remotes/git-svn)
+No changes between cd380d4518bc07ac075167867e81f4334c6f54f8 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 9 - make a commit to test rebase
+
+expecting success of 9115.10 'git svn rebase works inside a fresh-cloned repository': 
+	(
+		cd test-rebase &&
+		git svn rebase &&
+		test -e test-rebase-main &&
+		test -e test-rebase
+	)
+	A	test-rebase-main
+r9 = 63f2c838120babf9884abcb84baae608f64283e7 (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
+
+checking prerequisite: UTF8_NFD_TO_NFC
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-UTF8_NFD_TO_NFC" &&
+	# check whether FS converts nfd unicode to nfc
+	auml=$(printf "\303\244")
+	aumlcdiar=$(printf "\141\314\210")
+	>"$auml" &&
+	test -f "$aumlcdiar"
+
+)
+prerequisite UTF8_NFD_TO_NFC not satisfied
+expecting success of 9115.11 'svn.pathnameencoding=cp932 new file on dcommit': 
+	LC_ALL=$GIT_TEST_UTF8_LOCALE &&
+	export LC_ALL &&
+	neq=$(printf "\201\202") &&
+	git config svn.pathnameencoding cp932 &&
+	echo neq >"$neq" &&
+	git add "$neq" &&
+	git commit -m "neq" &&
+	git svn dcommit
+
+[master b4f8eeb] neq
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\201\202"
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	�‚
+Committed r10
+	A	�‚
+r10 = b26845c0ea28855d0fdc08b0fa34bf87f04e6c1e (refs/remotes/git-svn)
+No changes between b4f8eeb177af9a85b80cd24b61bfbaa758d3c404 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+ok 11 - svn.pathnameencoding=cp932 new file on dcommit
+
+expecting success of 9115.12 'svn.pathnameencoding=cp932 rename on dcommit': 
+	LC_ALL=$GIT_TEST_UTF8_LOCALE &&
+	export LC_ALL &&
+	inf=$(printf "\201\207") &&
+	git config svn.pathnameencoding cp932 &&
+	echo inf >"$inf" &&
+	git add "$inf" &&
+	git commit -m "inf" &&
+	git svn dcommit &&
+	git mv "$inf" inf &&
+	git commit -m "inf rename" &&
+	git svn dcommit
+
+[master 9d5535a] inf
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 "\201\207"
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	A	�‡
+Committed r11
+	A	�‡
+r11 = 8d523638b945511afb0ce07e599f9610a8edcbaf (refs/remotes/git-svn)
+No changes between 9d5535ab26ee6e7b9963e51b4652f08476931c82 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+[master d727dc8] inf rename
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ rename "\201\207" => inf (100%)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9115-git-svn-dcommit-funky-renames/svnrepo ...
+	R	�‡ => inf
+Committed r12
+	D	�‡
+	A	inf
+W: -empty_dir: ∞
+r12 = 1f161e37a5f22c1ebbfdfafa705becc41e8ad798 (refs/remotes/git-svn)
+No changes between d727dc8250301cfa16c05c35a5eee0135798cd55 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9123-git-svn-rebuild-with-rewriteroot.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9123-git-svn-rebuild-with-rewriteroot/.git/
+expecting success of 9123.1 'init, fetch and checkout repository': 
+	git svn init --rewrite-root=http://invalid.invalid/ "$svnrepo" &&
+	git svn fetch &&
+	git checkout -b mybranch remotes/git-svn
+	
+	A	foo
+r1 = 841d9d14a4d17966d6356de0c7b839870dcc2767 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9123-git-svn-rebuild-with-rewriteroot/svnrepo r1
+Switched to a new branch 'mybranch'
+ok 1 - init, fetch and checkout repository
+
+expecting success of 9123.2 'remove rev_map': 
+	rm "$GIT_SVN_DIR"/.rev_map.*
+	
+ok 2 - remove rev_map
+
+expecting success of 9123.3 'rebuild rev_map': 
+	git svn rebase >/dev/null
+	
+ok 3 - rebuild rev_map
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9126-git-svn-follow-deleted-readded-directory.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9126-git-svn-follow-deleted-readded-directory/.git/
+1..0 # SKIP skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9120-git-svn-clone-with-percent-escapes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/.git/
+expecting success of 9120.1 'setup svnrepo': 
+	mkdir project project/trunk project/branches project/tags &&
+	echo foo > project/trunk/foo &&
+	svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
+	svn_cmd cp -m "branch" "$svnrepo/pr ject/trunk" \
+	  "$svnrepo/pr ject/branches/b" &&
+	svn_cmd cp -m "tag" "$svnrepo/pr ject/trunk" \
+	  "$svnrepo/pr ject/tags/v1" &&
+	rm -rf project &&
+	maybe_start_httpd
+
+Adding         project/branches
+Adding         project/tags
+Adding         project/trunk
+Adding         project/trunk/foo
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Committing transaction...
+Committed revision 3.
+ok 1 - setup svnrepo
+
+expecting success of 9120.2 'test clone with percent escapes': 
+	git svn clone "$svnrepo/pr%20ject" clone &&
+	(
+		cd clone &&
+		git rev-parse refs/remotes/git-svn
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/clone/.git/
+	A	trunk/foo
+W: +empty_dir: branches
+W: +empty_dir: tags
+r1 = b5f752b87bb362984bdeadd4147bfa4d91ae8f85 (refs/remotes/git-svn)
+	A	branches/b/foo
+r2 = 82ef5309a956d40ac1cca63aae8ad18b1dc5986f (refs/remotes/git-svn)
+	A	tags/v1/foo
+r3 = b65a5cf6a0e0cc082cadd1437a8c146bb5a3fe27 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject r3
+b65a5cf6a0e0cc082cadd1437a8c146bb5a3fe27
+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.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/minimize/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = 109a55c8c1b3a2688d8b8b3fe33b541c3789bea8 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+109a55c8c1b3a2688d8b8b3fe33b541c3789bea8
+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.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/trunk/.git/
+	A	foo
+r1 = 109a55c8c1b3a2688d8b8b3fe33b541c3789bea8 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+109a55c8c1b3a2688d8b8b3fe33b541c3789bea8
+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.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/percent/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = 109a55c8c1b3a2688d8b8b3fe33b541c3789bea8 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
+Found branch parent: (refs/remotes/origin/b) 109a55c8c1b3a2688d8b8b3fe33b541c3789bea8
+Following parent with do_switch
+Successfully followed parent
+r2 = 511d91668fa311fa08c1026ce25cda71b04775c0 (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
+Found branch parent: (refs/remotes/origin/tags/v1) 109a55c8c1b3a2688d8b8b3fe33b541c3789bea8
+Following parent with do_switch
+Successfully followed parent
+r3 = e20a9eabb97e84a61760a85efe577599430c1954 (refs/remotes/origin/tags/v1)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+109a55c8c1b3a2688d8b8b3fe33b541c3789bea8
+511d91668fa311fa08c1026ce25cda71b04775c0
+e20a9eabb97e84a61760a85efe577599430c1954
+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.45.2/t/trash directory.t9120-git-svn-clone-with-percent-escapes/space/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo
+	A	foo
+r1 = 109a55c8c1b3a2688d8b8b3fe33b541c3789bea8 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/branches/b, 1
+Found branch parent: (refs/remotes/origin/b) 109a55c8c1b3a2688d8b8b3fe33b541c3789bea8
+Following parent with do_switch
+Successfully followed parent
+r2 = 511d91668fa311fa08c1026ce25cda71b04775c0 (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/tags/v1, 2
+Found branch parent: (refs/remotes/origin/tags/v1) 109a55c8c1b3a2688d8b8b3fe33b541c3789bea8
+Following parent with do_switch
+Successfully followed parent
+r3 = e20a9eabb97e84a61760a85efe577599430c1954 (refs/remotes/origin/tags/v1)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9120-git-svn-clone-with-percent-escapes/svnrepo/pr%20ject/trunk r1
+109a55c8c1b3a2688d8b8b3fe33b541c3789bea8
+511d91668fa311fa08c1026ce25cda71b04775c0
+e20a9eabb97e84a61760a85efe577599430c1954
+ok 8 - test clone -s with unescaped space
+
+# passed all 8 test(s)
+1..8
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9128-git-svn-cmd-branch.sh ***
+skipping test t9128 altogether
+1..0 # SKIP skip all tests in t9128
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9122-git-svn-author.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9122-git-svn-author/.git/
+expecting success of 9122.1 'setup svn repository': 
+	svn_cmd checkout "$svnrepo" work.svn &&
+	(
+		cd work.svn &&
+		echo >file &&
+		svn_cmd add file &&
+		svn_cmd commit -m "first commit" file
+	)
+
+Checked out revision 0.
+A         file
+Adding         file
+Transmitting file data .done
+Committing transaction...
+Committed revision 1.
+ok 1 - setup svn repository
+
+expecting success of 9122.2 'interact with it via git svn': 
+	mkdir work.git &&
+	(
+		cd work.git &&
+		git svn init "$svnrepo" &&
+		git svn fetch &&
+
+		echo modification >file &&
+		test_tick &&
+		git commit -a -m second &&
+
+		test_tick &&
+		git svn dcommit &&
+
+		echo "further modification" >file &&
+		test_tick &&
+		git commit -a -m third &&
+
+		test_tick &&
+		git svn --add-author-from dcommit &&
+
+		echo "yet further modification" >file &&
+		test_tick &&
+		git commit -a -m fourth &&
+
+		test_tick &&
+		git svn --add-author-from --use-log-author dcommit &&
+
+		git log &&
+
+		git show -s HEAD^^ >../actual.2 &&
+		git show -s HEAD^  >../actual.3 &&
+		git show -s HEAD   >../actual.4
+
+	) &&
+
+	# Make sure that --add-author-from without --use-log-author
+	# did not affect the authorship information
+	myself=$(grep "^Author: " actual.2) &&
+	unaffected=$(grep "^Author: " actual.3) &&
+	test "z$myself" = "z$unaffected" &&
+
+	# Make sure lack of --add-author-from did not add cruft
+	! grep "^    From: A U Thor " actual.2 &&
+
+	# Make sure --add-author-from added cruft
+	grep "^    From: A U Thor " actual.3 &&
+	grep "^    From: A U Thor " actual.4 &&
+
+	# Make sure --add-author-from with --use-log-author affected
+	# the authorship information
+	grep "^Author: A U Thor " actual.4 &&
+
+	# Make sure there are no commit messages with excess blank lines
+	test $(grep "^ " actual.2 | wc -l) = 3 &&
+	test $(grep "^ " actual.3 | wc -l) = 5 &&
+	test $(grep "^ " actual.4 | wc -l) = 5 &&
+
+	# Make sure there are no svn commit messages with excess blank lines
+	(
+		cd work.svn &&
+		svn_cmd up &&
+		
+		test $(svn_cmd log -r2:2 | wc -l) = 5 &&
+		test $(svn_cmd log -r4:4 | wc -l) = 7
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9122-git-svn-author/work.git/.git/
+	A	file
+r1 = 5915628d3dcc36b52389c5c4e5633fa89e6d3fe0 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo r1
+[master 7a45ff2] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
+	M	file
+Committed r2
+	M	file
+r2 = 0d5adbc46d7082f52c2e29019a1888c284d987ae (refs/remotes/git-svn)
+No changes between 7a45ff2c24f305098a428a1e3895435e54d6cf6f and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+[master 76f5d26] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
+	M	file
+Committed r3
+	M	file
+r3 = b545057f48c7efd379ddc8023fad090abdcf0090 (refs/remotes/git-svn)
+No changes between 76f5d260e61dec702dfb767dd2fabd35ecd3cf44 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+[master 1b5398b] fourth
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo ...
+	M	file
+Committed r4
+	M	file
+r4 = 2e941ced769a2bda07eb1e3898f740973d785305 (refs/remotes/git-svn)
+No changes between 1b5398b4bf2c216fcdbb23a36848b970c9b81112 and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+commit 2e941ced769a2bda07eb1e3898f740973d785305
+Author: A U Thor <author@example.com>
+Date:   Thu Nov 14 19:47:23 2024 +0000
+
+    fourth
+    
+    From: A U Thor <author@example.com>
+    
+    git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo@4 84bede6d-0bd1-42af-90cf-25e1303553ad
+
+commit b545057f48c7efd379ddc8023fad090abdcf0090
+Author: pbuilder2 <pbuilder2@84bede6d-0bd1-42af-90cf-25e1303553ad>
+Date:   Thu Nov 14 19:47:20 2024 +0000
+
+    third
+    
+    From: A U Thor <author@example.com>
+    
+    git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo@3 84bede6d-0bd1-42af-90cf-25e1303553ad
+
+commit 0d5adbc46d7082f52c2e29019a1888c284d987ae
+Author: pbuilder2 <pbuilder2@84bede6d-0bd1-42af-90cf-25e1303553ad>
+Date:   Thu Nov 14 19:47:17 2024 +0000
+
+    second
+    
+    git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo@2 84bede6d-0bd1-42af-90cf-25e1303553ad
+
+commit 5915628d3dcc36b52389c5c4e5633fa89e6d3fe0
+Author: pbuilder2 <pbuilder2@84bede6d-0bd1-42af-90cf-25e1303553ad>
+Date:   Thu Nov 14 19:47:11 2024 +0000
+
+    first commit
+    
+    git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9122-git-svn-author/svnrepo@1 84bede6d-0bd1-42af-90cf-25e1303553ad
+    From: A U Thor <author@example.com>
+    From: A U Thor <author@example.com>
+Author: A U Thor <author@example.com>
+Updating '.':
+U    file
+Updated to revision 4.
+ok 2 - interact with it via git svn
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9125-git-svn-multi-glob-branch-names.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9125-git-svn-multi-glob-branch-names/.git/
+expecting success of 9125.1 'setup svnrepo': 
+	mkdir project project/trunk project/branches \
+			project/branches/v14.1 project/tags &&
+	echo foo > project/trunk/foo &&
+	svn_cmd import -m "$test_description" project "$svnrepo/project" &&
+	rm -rf project &&
+	svn_cmd cp -m "fun" "$svnrepo/project/trunk" \
+	                "$svnrepo/project/branches/v14.1/beta" &&
+	svn_cmd cp -m "more fun!" "$svnrepo/project/branches/v14.1/beta" \
+	                      "$svnrepo/project/branches/v14.1/gold"
+	
+Adding         project/branches
+Adding         project/branches/v14.1
+Adding         project/tags
+Adding         project/trunk
+Adding         project/trunk/foo
+Committing transaction...
+Committed revision 1.
+Committing transaction...
+Committed revision 2.
+Committing transaction...
+Committed revision 3.
+ok 1 - setup svnrepo
+
+expecting success of 9125.2 'test clone with multi-glob in branch names': 
+	git svn clone -T trunk -b branches/*/* -t tags \
+	              "$svnrepo/project" project &&
+	(cd project &&
+		git rev-parse "refs/remotes/origin/v14.1/beta" &&
+		git rev-parse "refs/remotes/origin/v14.1/gold"
+	)
+	
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9125-git-svn-multi-glob-branch-names/project/.git/
+Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo
+	A	foo
+r1 = 6c1e352ff5b38685b52154af638fcf2c28e15ee3 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta, 1
+Found branch parent: (refs/remotes/origin/v14.1/beta) 6c1e352ff5b38685b52154af638fcf2c28e15ee3
+Following parent with do_switch
+Successfully followed parent
+r2 = 1f8fe5743b615587e9295a93c16e678ad83af546 (refs/remotes/origin/v14.1/beta)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/beta => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/gold, 2
+Found branch parent: (refs/remotes/origin/v14.1/gold) 1f8fe5743b615587e9295a93c16e678ad83af546
+Following parent with do_switch
+Successfully followed parent
+r3 = af3ba449d858fde7117b02512fec2fe5b11fa73a (refs/remotes/origin/v14.1/gold)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/trunk r1
+1f8fe5743b615587e9295a93c16e678ad83af546
+af3ba449d858fde7117b02512fec2fe5b11fa73a
+ok 2 - test clone with multi-glob in branch names
+
+expecting success of 9125.3 'test dcommit to multi-globbed branch': 
+	(cd project &&
+	git reset --hard 'refs/remotes/origin/v14.1/gold' &&
+	echo hello >> foo &&
+	git commit -m 'hello' -- foo &&
+	git svn dcommit
+	)
+	
+HEAD is now at af3ba44 more fun!
+[master 33c744a] hello
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9125-git-svn-multi-glob-branch-names/svnrepo/project/branches/v14.1/gold ...
+	M	foo
+Committed r4
+	M	foo
+r4 = a048680bb46dd33cafabea4ce3d3f8457999c06d (refs/remotes/origin/v14.1/gold)
+No changes between 33c744aaf450340ff6ad9b364765865551009d6f and refs/remotes/origin/v14.1/gold
+Resetting to the latest refs/remotes/origin/v14.1/gold
+ok 3 - test dcommit to multi-globbed branch
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9124-git-svn-dcommit-auto-props.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9124-git-svn-dcommit-auto-props/.git/
 expecting success of 9124.1 'initialize git svn': 
@@ -514367,7 +513766,7 @@
 Committing transaction...
 Committed revision 1.
 	A	foo
-r1 = e3d2d344bd0fb4d2737df48818830cb74d88c6f5 (refs/remotes/git-svn)
+r1 = 7d808534473529a361cb22663e3ddc455076f5f3 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9124-git-svn-dcommit-auto-props/svnrepo r1
 ok 1 - initialize git svn
@@ -514386,7 +513785,7 @@
 	git commit -m "files for enabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master 9ac050c] files for enabled auto-props
+[master f545964] files for enabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100644 bar
@@ -514401,8 +513800,8 @@
 	A	bar
 	A	exec1.sh
 	A	hello.txt
-r2 = 8d63d183ad9fa0fa17bccfeef6956e923e270931 (refs/remotes/git-svn)
-No changes between 9ac050cbb63c3bbc210bb992f10ed9924f22da08 and refs/remotes/git-svn
+r2 = 7e57b6477d51958732de2e3202a1f393dd1fc281 (refs/remotes/git-svn)
+No changes between f54596494ca1a080d9a4eada803cfe8b447cf2ef and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - add files matching auto-props
 
@@ -514419,7 +513818,7 @@
 	git commit -m "files for disabled auto-props" &&
 	git svn dcommit --config-dir=user
 
-[master 6152b22] files for disabled auto-props
+[master dde4646] files for disabled auto-props
  Author: A U Thor <author@example.com>
  3 files changed, 3 insertions(+)
  create mode 100755 exec2.sh
@@ -514434,8 +513833,8 @@
 	A	exec2.sh
 	A	world.txt
 	A	zot
-r3 = ab0447a350a0070cfe289bb90f7d188982cb02fa (refs/remotes/git-svn)
-No changes between 6152b22a5bc02af475fe33688d30ed1d7294c753 and refs/remotes/git-svn
+r3 = e01e6ffc0fcb8e37ca99140f1667f156f6afb8a8 (refs/remotes/git-svn)
+No changes between dde4646ab5e6f30df17f384f57939b4705027e2f and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - add files matching disabled auto-props
 
@@ -514504,7 +513903,7 @@
 		test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF"
 	)
 
-[master fbf065a] foo => foo.sh
+[master 5ecc8e9] foo => foo.sh
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  rename foo => foo.sh (100%)
@@ -514515,8 +513914,8 @@
 	D	foo
 	A	foo.sh
 W: -empty_dir: foo
-r4 = 6bf8e952bf55faf017412e00f8b93f475cdfd9d5 (refs/remotes/git-svn)
-No changes between fbf065ae699d412b08403efa7cb34a576adb934e and refs/remotes/git-svn
+r4 = 35167c9af5076d4d55152df52bd6f6e8b1f5b802 (refs/remotes/git-svn)
+No changes between 5ecc8e91b4abc42f1d3c4c1973eaf74c0e827829 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 Updating '.':
 D    foo
@@ -514718,12 +514117,12 @@
 	git svn fetch -r1:2
 
 	A	foo
-r1 = 5e93dd110fe7703f63f46fba552a02c6013d952a (refs/remotes/origin/trunk)
+r1 = 23d586bcc2c736fdc2aac9e3211da01f39ac0b03 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 5e93dd110fe7703f63f46fba552a02c6013d952a
+Found branch parent: (refs/remotes/origin/a) 23d586bcc2c736fdc2aac9e3211da01f39ac0b03
 Following parent with do_switch
 Successfully followed parent
-r2 = 3ae6faa4fd9801b655da8e4c141649852a552640 (refs/remotes/origin/a)
+r2 = a9ecbd8dccc5fcfd79415d45f32296fcfcc3bb31 (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r1
 ok 2 - import an early SVN revision into git
@@ -514740,16 +514139,16 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9127-git-svn-partial-rebuild/mirror/.git/
 	A	foo
-r1 = 5e93dd110fe7703f63f46fba552a02c6013d952a (refs/remotes/origin/trunk)
+r1 = 23d586bcc2c736fdc2aac9e3211da01f39ac0b03 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 5e93dd110fe7703f63f46fba552a02c6013d952a
+Found branch parent: (refs/remotes/origin/a) 23d586bcc2c736fdc2aac9e3211da01f39ac0b03
 Following parent with do_switch
 Successfully followed parent
-r2 = 3ae6faa4fd9801b655da8e4c141649852a552640 (refs/remotes/origin/a)
+r2 = a9ecbd8dccc5fcfd79415d45f32296fcfcc3bb31 (refs/remotes/origin/a)
 	M	foo
-r3 = 8f31e56d447620e5dee18644841087fcc0acd727 (refs/remotes/origin/trunk)
+r3 = 569ec67a1ae30c191793b016990171f429391d42 (refs/remotes/origin/trunk)
 	A	a
-r4 = 4bffa31a0fb664c50dcace085b92a07a58af7331 (refs/remotes/origin/a)
+r4 = aee7c74a58322b76406e6420d8e3c78066ed4105 (refs/remotes/origin/a)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9127-git-svn-partial-rebuild/svnrepo/trunk r3
 ok 3 - make full git mirror of SVN
@@ -514761,16 +514160,16 @@
 	git svn fetch
 
 From file:///build/reproducible-path/git-2.45.2/t/trash directory.t9127-git-svn-partial-rebuild/mirror/
-   3ae6faa..4bffa31  origin/a     -> origin/a
-   5e93dd1..8f31e56  origin/trunk -> origin/trunk
-Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0e4566a9-105d-4ad1-bb8f-300589b85d9d ...
-Currently at 1 = 5e93dd110fe7703f63f46fba552a02c6013d952a
-r3 = 8f31e56d447620e5dee18644841087fcc0acd727
-Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.0e4566a9-105d-4ad1-bb8f-300589b85d9d
-Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.0e4566a9-105d-4ad1-bb8f-300589b85d9d ...
-Currently at 2 = 3ae6faa4fd9801b655da8e4c141649852a552640
-r4 = 4bffa31a0fb664c50dcace085b92a07a58af7331
-Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.0e4566a9-105d-4ad1-bb8f-300589b85d9d
+   a9ecbd8..aee7c74  origin/a     -> origin/a
+   23d586b..569ec67  origin/trunk -> origin/trunk
+Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.55c48c4d-26d7-4302-8501-ca6059c2d4e8 ...
+Currently at 1 = 23d586bcc2c736fdc2aac9e3211da01f39ac0b03
+r3 = 569ec67a1ae30c191793b016990171f429391d42
+Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.55c48c4d-26d7-4302-8501-ca6059c2d4e8
+Partial-rebuilding .git/svn/refs/remotes/origin/a/.rev_map.55c48c4d-26d7-4302-8501-ca6059c2d4e8 ...
+Currently at 2 = a9ecbd8dccc5fcfd79415d45f32296fcfcc3bb31
+r4 = aee7c74a58322b76406e6420d8e3c78066ed4105
+Done rebuilding .git/svn/refs/remotes/origin/a/.rev_map.55c48c4d-26d7-4302-8501-ca6059c2d4e8
 ok 4 - fetch from git mirror and partial-rebuild
 
 # passed all 4 test(s)
@@ -514968,7 +514367,7 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO8859-1/.git/
-r1 = 9d3202f59c7792e87101111d63dab9f240bb54db (refs/remotes/git-svn)
+r1 = 4bafe68ad5cdfe9e7d11f35bfc12fb35f2b1f6d0 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1 r1
 ok 1 - ISO8859-1 setup
@@ -514981,7 +514380,7 @@
 Committing transaction...
 Committed revision 2.
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9129-git-svn-i18n-commitencoding/eucJP/.git/
-r2 = c95440d909e575bfa94bc72919e2ba388e5d443c (refs/remotes/git-svn)
+r2 = 32be9fe6fc23d3518b1dec459adc21167fd7075f (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP r2
 ok 2 - eucJP setup
@@ -514994,7 +514393,7 @@
 Committing transaction...
 Committed revision 3.
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9129-git-svn-i18n-commitencoding/ISO-2022-JP/.git/
-r3 = 0084dcc820e5d9d5c308ea89e4b06cdbaec63583 (refs/remotes/git-svn)
+r3 = b805d3e74593e1276e4bad7c5c250422ba98ff9a (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP r3
 ok 3 - ISO-2022-JP setup
@@ -515013,7 +514412,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 2b687a1] ÄËÑÏÖ
+[t 1868f78] ÄËÑÏÖ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -515033,7 +514432,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 10b9cff] ¤Ï¤ì¤Ò¤Û¤Õ
+[t c82e20e] ¤Ï¤ì¤Ò¤Û¤Õ
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -515053,7 +514452,7 @@
 	)
 	
 Switched to a new branch 't'
-[t 1f93934] $B$O$l$R$[$U(B
+[t 39d9ca3] $B$O$l$R$[$U(B
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
  create mode 100644 F
@@ -515074,10 +514473,10 @@
 	A	F
 Committed r4
 	A	F
-r4 = 00872b92cc5d355073fa4ee7c6f104cbe243b815 (refs/remotes/git-svn)
-No changes between 2b687a1391d775f5e664b4fd44186675b043e7b2 and refs/remotes/git-svn
+r4 = 8eec747a6f8fc7a61c2edd205a2e8d7d5ccac5ee (refs/remotes/git-svn)
+No changes between 1868f78b5533a6637c4a3f328e54e16eb0f8b770 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 b91efbf8-7aed-44a1-bdf2-782fe2bc561a
+git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO8859-1@4 49d08f54-1565-4973-9d1b-ad3e26345538
 ok 7 - ISO8859-1 dcommit to svn
 
 expecting success of 9129.8 'eucJP dcommit to svn': 
@@ -515095,10 +514494,10 @@
 	A	F
 Committed r5
 	A	F
-r5 = 938d13629f385cc87dc8d0790fa01e33114d8280 (refs/remotes/git-svn)
-No changes between 10b9cff64d99aa09892da32360bde05e8aeee878 and refs/remotes/git-svn
+r5 = 343ff72ede0beee878f445acc4fccd0b7d5c2cc9 (refs/remotes/git-svn)
+No changes between c82e20e5686d33657532ae3be3b9a2a0f5ac1c1a and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 b91efbf8-7aed-44a1-bdf2-782fe2bc561a
+git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/eucJP@5 49d08f54-1565-4973-9d1b-ad3e26345538
 ok 8 - eucJP dcommit to svn
 
 expecting success of 9129.9 'ISO-2022-JP dcommit to svn': 
@@ -515116,10 +514515,10 @@
 	A	F
 Committed r6
 	A	F
-r6 = 992546c6df244af9753c0406a8bc43d8b2d405ff (refs/remotes/git-svn)
-No changes between 1f9393422a210a865d6947093e13662e1187aa5c and refs/remotes/git-svn
+r6 = 4a1a8f971f3c38a006a3b83b7ee2eaac5116e967 (refs/remotes/git-svn)
+No changes between 39d9ca35ef3f4156b4e7aa4e9f2e97e8c2ff4350 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 b91efbf8-7aed-44a1-bdf2-782fe2bc561a
+git-svn-id: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9129-git-svn-i18n-commitencoding/svnrepo/ISO-2022-JP@6 49d08f54-1565-4973-9d1b-ad3e26345538
 ok 9 - ISO-2022-JP dcommit to svn
 
 expecting success of 9129.10 'ISO-8859-1 should match UTF-8 in svn': 
@@ -515150,84 +514549,6 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9135-git-svn-moved-branch-empty-file.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9135-git-svn-moved-branch-empty-file/.git/
-expecting success of 9135.1 'load svn dumpfile': 
-	svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9135/svn.dump"
-	
-<<< Started new transaction, based on original revision 1
-     * editing path : branches ... done.
-     * editing path : trunk ... done.
-
-------- Committed revision 1 >>>
-
-<<< Started new transaction, based on original revision 2
-     * editing path : branches/branch-b ...COPIED... done.
-
-------- Committed revision 2 >>>
-
-<<< Started new transaction, based on original revision 3
-     * editing path : branches/branch-b/b1 ... done.
-
-------- Committed revision 3 >>>
-
-<<< Started new transaction, based on original revision 4
-     * editing path : branches/branch-c ...COPIED... done.
-
-------- Committed revision 4 >>>
-
-<<< Started new transaction, based on original revision 5
-     * editing path : branches/branch-c ... done.
-
-------- Committed revision 5 >>>
-
-<<< Started new transaction, based on original revision 6
-     * editing path : branches/branch-c ...COPIED... done.
-
-------- Committed revision 6 >>>
-
-ok 1 - load svn dumpfile
-
-expecting success of 9135.2 'clone using git svn': git svn clone -s "$svnrepo" x
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9135-git-svn-moved-branch-empty-file/x/.git/
-r1 = c5abb1de18d0357091ee8ffa38791b8f9e5d7301 (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b, 1
-Found branch parent: (refs/remotes/origin/branch-b) c5abb1de18d0357091ee8ffa38791b8f9e5d7301
-Following parent with do_switch
-Successfully followed parent
-r2 = b5ca68d867f07d551c6825a40571de3cfc2701c2 (refs/remotes/origin/branch-b)
-	A	b1
-r3 = 4e48dba90803c31e67d945455e889eec9a7671d1 (refs/remotes/origin/branch-b)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 3
-Found branch parent: (refs/remotes/origin/branch-c) c5abb1de18d0357091ee8ffa38791b8f9e5d7301
-Following parent with do_switch
-Successfully followed parent
-r4 = 3098637ce712e27fb64ac472851b8921ad73e54b (refs/remotes/origin/branch-c)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 5
-Found branch parent: (refs/remotes/origin/branch-c) 4e48dba90803c31e67d945455e889eec9a7671d1
-Index mismatch: 934e48f4addc4882a9b7b99615348569d531c873 != 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-rereading 4e48dba90803c31e67d945455e889eec9a7671d1
-Following parent with do_switch
-Successfully followed parent
-r6 = d4e8f35672abbbd0e5dcc3f097b09d51473469df (refs/remotes/origin/branch-c)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk r1
-ok 2 - clone using git svn
-
-expecting success of 9135.3 'test that b1 exists and is empty': 
-	(
-		cd x &&
-		git reset --hard origin/branch-c &&
-		test_must_be_empty b1
-	)
-	
-HEAD is now at d4e8f35 branch-c off of branch-b
-ok 3 - test that b1 exists and is empty
-
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9133-git-svn-nested-git-repo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9133-git-svn-nested-git-repo/.git/
 expecting success of 9133.1 'setup repo with a git repo inside it': 
@@ -515250,34 +514571,34 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9133-git-svn-nested-git-repo/s/.git/
 refs/heads/master
 A         .git
+A         .git/info
+A         .git/info/exclude
+A         .git/refs
+A         .git/refs/tags
+A         .git/refs/heads
+A         .git/a
 A         .git/HEAD
+A         .git/description
 A         .git/hooks
+A         .git/hooks/sendemail-validate.sample
+A         .git/hooks/prepare-commit-msg.sample
+A         .git/hooks/pre-merge-commit.sample
+A         .git/hooks/applypatch-msg.sample
+A         .git/hooks/pre-applypatch.sample
+A         .git/hooks/commit-msg.sample
+A         .git/hooks/pre-commit.sample
 A         .git/hooks/fsmonitor-watchman.sample
-A         .git/hooks/update.sample
 A         .git/hooks/push-to-checkout.sample
+A         .git/hooks/update.sample
 A         .git/hooks/pre-push.sample
 A         .git/hooks/post-update.sample
 A         .git/hooks/pre-rebase.sample
 A         .git/hooks/pre-receive.sample
-A         .git/hooks/prepare-commit-msg.sample
-A         .git/hooks/sendemail-validate.sample
-A         .git/hooks/applypatch-msg.sample
-A         .git/hooks/pre-merge-commit.sample
-A         .git/hooks/pre-applypatch.sample
-A         .git/hooks/pre-commit.sample
-A         .git/hooks/commit-msg.sample
-A         .git/description
 A         .git/config
 A         .git/branches
 A         .git/objects
 A         .git/objects/info
 A         .git/objects/pack
-A         .git/info
-A         .git/info/exclude
-A         .git/refs
-A         .git/refs/tags
-A         .git/refs/heads
-A         .git/a
 A         a
 Adding         .git
 Adding         .git/HEAD
@@ -515329,8 +514650,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9133-git-svn-nested-git-repo/g/.git/
 	A	a
-r1 = 87113de847f3cdc9c8eceec86ff967f8bcf04e56 (refs/remotes/git-svn)
-r2 = 452ac1036aaa309ccf89844e125529e8f6f9adf6 (refs/remotes/git-svn)
+r1 = 6647fb0110761e900feef145700adffceb021c76 (refs/remotes/git-svn)
+r2 = 69600b0d1ff765e2520c10030367add29a20771c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9133-git-svn-nested-git-repo/svnrepo r2
 ok 2 - clone an SVN repo containing a git repo
@@ -515364,7 +514685,7 @@
 	)
 
 	M	a
-r3 = 536e8cfa0972e6222ae8b46331d9d66d2c94d2c4 (refs/remotes/git-svn)
+r3 = 6635e6b99c6143cd644ea7e2800bf182740c97e7 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 4 - update git svn-cloned repo
 
@@ -515390,12 +514711,12 @@
 
     add a inside an SVN repo
 A         .git/refs/heads/master
+A         .git/COMMIT_EDITMSG
 A         .git/logs
-A         .git/logs/HEAD
 A         .git/logs/refs
 A         .git/logs/refs/heads
 A         .git/logs/refs/heads/master
-A         .git/COMMIT_EDITMSG
+A         .git/logs/HEAD
 A  (bin)  .git/index
 A         .git/objects/a3
 A  (bin)  .git/objects/a3/8e8ab7e857af7a7ac6f49fa3d3821f26fedca8
@@ -515435,7 +514756,7 @@
 		rm expect
 	)
 
-r4 = 3d6d477eebe053234540ef1671f2189218aa614f (refs/remotes/git-svn)
+r4 = c0f3077b621f2ae14d8fa5831da7f672f94382aa (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 6 - update git svn-cloned repo
 
@@ -515478,7 +514799,7 @@
 	)
 
 	M	a
-r5 = 2bad9b00c2c186d5e16626068904ccab8102f711 (refs/remotes/git-svn)
+r5 = c881e36569182527a1c6a564845127173ddf7e9e (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 8 - update git svn-cloned repo again
 
@@ -515509,9 +514830,9 @@
 	
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9130-git-svn-authors-file/x/.git/
 W: +empty_dir: aa
-r1 = 9d9962971f330d1abd0b9f7bfadead9e8480a82a (refs/remotes/git-svn)
+r1 = 9ce90de4004fa332befde5c580b2e60887243449 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = f282375d0febf526c0dea07cabf18f34e736f42f (refs/remotes/git-svn)
+r2 = f2e831b3bc58fc2d01b7254c9c0f00141187f3f0 (refs/remotes/git-svn)
 W: +empty_dir: cc
 Author: cc not defined in svn-authors file
 
@@ -515528,8 +514849,8 @@
 		grep "^author AAAAAAA AAAAAAA <aa@example\.com> " actual
 	)
 	
-author BBBBBBB BBBBBBB <bb@example.com> 1766022012 +0000
-author AAAAAAA AAAAAAA <aa@example.com> 1766022012 +0000
+author BBBBBBB BBBBBBB <bb@example.com> 1731613646 +0000
+author AAAAAAA AAAAAAA <aa@example.com> 1731613646 +0000
 ok 3 - imported 2 revisions successfully
 
 expecting success of 9130.4 'continues to import once authors have been added': 
@@ -515545,17 +514866,17 @@
 	)
 	
 W: +empty_dir: cc
-r3 = c88be0e643b1ab2bd20a4d081cf3b957d67fd7e2 (refs/remotes/git-svn)
+r3 = 80b9be9794a836b18e11bc332ebfc5e53c723655 (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = 8efd364fdcd025084ee922606e6530330909b514 (refs/remotes/git-svn)
+r4 = cd6c0fe39442e4f9eec9a42d2392e89b53f5250c (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9130-git-svn-authors-file/svnrepo r4
 creating empty directory: aa
 creating empty directory: bb
 creating empty directory: cc
 creating empty directory: dd
-author DDDDDDD DDDDDDD <dd@example.com> 1766022012 +0000
-author CCCCCCC CCCCCCC <cc@example.com> 1766022012 +0000
+author DDDDDDD DDDDDDD <dd@example.com> 1731613647 +0000
+author CCCCCCC CCCCCCC <cc@example.com> 1731613647 +0000
 ok 4 - continues to import once authors have been added
 
 expecting success of 9130.5 'authors-file against globs': 
@@ -515572,7 +514893,7 @@
 Committed revision 5.
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9130-git-svn-authors-file/aa-work/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9130-git-svn-authors-file/svnrepo
-r5 = 9181080c899bc3d65ba40d2e3b147f737ca9431b (refs/remotes/origin/trunk)
+r5 = 29ad392ab64032989b8f34657fcf37bb5bfc3507 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9130-git-svn-authors-file/svnrepo/aa/trunk r5
 Committing transaction...
@@ -515586,7 +514907,7 @@
 expecting success of 9130.6 'fetch fails on ee': 
 	( cd aa-work && test_must_fail git svn fetch --authors-file=../svn-authors )
 	
-r6 = 0128d1fb5908358fb6544e2fe79ecc3468a66e15 (refs/remotes/origin/bb)
+r6 = d95bd76747188cc7dd85ab240fa7af639c9c7a93 (refs/remotes/origin/bb)
 Author: ee not defined in ../svn-authors file
 
 ok 6 - fetch fails on ee
@@ -515608,8 +514929,8 @@
 		test 8 -eq "$(tmp_config_get svn-remote.svn.tags-maxRev)"
 	)
 	
-r7 = b1579747c39cdd739317103167413a11649ca862 (refs/remotes/origin/ee)
-r8 = c5e9fa98d5a28fa9864f928c6c5ed669a1287c10 (refs/remotes/origin/cc)
+r7 = b8b3ac2e64dc846a9c518108038a6abb3686d66b (refs/remotes/origin/ee)
+r8 = 626bfbd0491265980596b7c32e5f757e09c7b870 (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': 
@@ -515632,23 +514953,23 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9130-git-svn-authors-file/gitconfig.clone/.git/
 W: +empty_dir: aa
-r1 = 9d9962971f330d1abd0b9f7bfadead9e8480a82a (refs/remotes/git-svn)
+r1 = 9ce90de4004fa332befde5c580b2e60887243449 (refs/remotes/git-svn)
 W: +empty_dir: bb
-r2 = f282375d0febf526c0dea07cabf18f34e736f42f (refs/remotes/git-svn)
+r2 = f2e831b3bc58fc2d01b7254c9c0f00141187f3f0 (refs/remotes/git-svn)
 W: +empty_dir: cc
-r3 = c88be0e643b1ab2bd20a4d081cf3b957d67fd7e2 (refs/remotes/git-svn)
+r3 = 80b9be9794a836b18e11bc332ebfc5e53c723655 (refs/remotes/git-svn)
 W: +empty_dir: dd
-r4 = 8efd364fdcd025084ee922606e6530330909b514 (refs/remotes/git-svn)
+r4 = cd6c0fe39442e4f9eec9a42d2392e89b53f5250c (refs/remotes/git-svn)
 W: +empty_dir: aa/branches
 W: +empty_dir: aa/tags
 W: +empty_dir: aa/trunk
-r5 = f94fa4862e07139baefd436127f0be23891c23a9 (refs/remotes/git-svn)
+r5 = c946cfe17525f6ee4a168e4f2ea1a1b51c309f6c (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/bb
-r6 = d1ea3f7c447188f2bccd32f33c6b29d7553249b6 (refs/remotes/git-svn)
+r6 = 14249e6db625bc03727b25321c9dc7dbc1355a16 (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/ee
-r7 = 600b945a8c44c7d9a9261b1765261ccb622471f4 (refs/remotes/git-svn)
+r7 = 9ba0acd4c0adb58b6943f1d87f4f4b5bffcca90e (refs/remotes/git-svn)
 W: +empty_dir: aa/branches/cc
-r8 = 50905b664d14f3fa8e40ea289ca0849a209334e2 (refs/remotes/git-svn)
+r8 = 7230f58bf11dd1e50efafb6c171f907797a3d838 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9130-git-svn-authors-file/svnrepo r8
 creating empty directory: aa
@@ -515674,14 +514995,92 @@
 	
 Committing transaction...
 Committed revision 9.
-r9 = c6022c285f4dfbba21ea0124643ff16264b156e0 (refs/remotes/origin/ff)
-author FFFFFFF FFFFFFF <> 1766022020 +0000
+r9 = 9e6b69f157ca8ca25cb317537272414a8cdd3044 (refs/remotes/origin/ff)
+author FFFFFFF FFFFFFF <> 1731613665 +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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9135-git-svn-moved-branch-empty-file.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9135-git-svn-moved-branch-empty-file/.git/
+expecting success of 9135.1 'load svn dumpfile': 
+	svnadmin load "$rawsvnrepo" < "${TEST_DIRECTORY}/t9135/svn.dump"
+	
+<<< Started new transaction, based on original revision 1
+     * editing path : branches ... done.
+     * editing path : trunk ... done.
+
+------- Committed revision 1 >>>
+
+<<< Started new transaction, based on original revision 2
+     * editing path : branches/branch-b ...COPIED... done.
+
+------- Committed revision 2 >>>
+
+<<< Started new transaction, based on original revision 3
+     * editing path : branches/branch-b/b1 ... done.
+
+------- Committed revision 3 >>>
+
+<<< Started new transaction, based on original revision 4
+     * editing path : branches/branch-c ...COPIED... done.
+
+------- Committed revision 4 >>>
+
+<<< Started new transaction, based on original revision 5
+     * editing path : branches/branch-c ... done.
+
+------- Committed revision 5 >>>
+
+<<< Started new transaction, based on original revision 6
+     * editing path : branches/branch-c ...COPIED... done.
+
+------- Committed revision 6 >>>
+
+ok 1 - load svn dumpfile
+
+expecting success of 9135.2 'clone using git svn': git svn clone -s "$svnrepo" x
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9135-git-svn-moved-branch-empty-file/x/.git/
+r1 = c5abb1de18d0357091ee8ffa38791b8f9e5d7301 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b, 1
+Found branch parent: (refs/remotes/origin/branch-b) c5abb1de18d0357091ee8ffa38791b8f9e5d7301
+Following parent with do_switch
+Successfully followed parent
+r2 = b5ca68d867f07d551c6825a40571de3cfc2701c2 (refs/remotes/origin/branch-b)
+	A	b1
+r3 = 4e48dba90803c31e67d945455e889eec9a7671d1 (refs/remotes/origin/branch-b)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 3
+Found branch parent: (refs/remotes/origin/branch-c) c5abb1de18d0357091ee8ffa38791b8f9e5d7301
+Following parent with do_switch
+Successfully followed parent
+r4 = 3098637ce712e27fb64ac472851b8921ad73e54b (refs/remotes/origin/branch-c)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-b => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/branches/branch-c, 5
+Found branch parent: (refs/remotes/origin/branch-c) 4e48dba90803c31e67d945455e889eec9a7671d1
+Index mismatch: 934e48f4addc4882a9b7b99615348569d531c873 != 4b825dc642cb6eb9a060e54bf8d69288fbee4904
+rereading 4e48dba90803c31e67d945455e889eec9a7671d1
+Following parent with do_switch
+Successfully followed parent
+r6 = d4e8f35672abbbd0e5dcc3f097b09d51473469df (refs/remotes/origin/branch-c)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9135-git-svn-moved-branch-empty-file/svnrepo/trunk r1
+ok 2 - clone using git svn
+
+expecting success of 9135.3 'test that b1 exists and is empty': 
+	(
+		cd x &&
+		git reset --hard origin/branch-c &&
+		test_must_be_empty b1
+	)
+	
+HEAD is now at d4e8f35 branch-c off of branch-b
+ok 3 - test that b1 exists and is empty
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9136-git-svn-recreated-branch-empty-file.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9136-git-svn-recreated-branch-empty-file/.git/
 expecting success of 9136.1 'load svn dumpfile': 
@@ -515754,385 +515153,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9139-git-svn-non-utf8-commitencoding.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9139-git-svn-non-utf8-commitencoding/.git/
-expecting success of 9139.1 'ISO8859-1 setup': 
-		mkdir $H &&
-		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
-		git svn clone "$svnrepo"/$H $H
-	
-Committing transaction...
-Committed revision 1.
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9139-git-svn-non-utf8-commitencoding/ISO8859-1/.git/
-r1 = c85feb737b72ace932545a64fa1fd3cd69626071 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 r1
-ok 1 - ISO8859-1 setup
-
-expecting success of 9139.2 'eucJP setup': 
-		mkdir $H &&
-		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
-		git svn clone "$svnrepo"/$H $H
-	
-Committing transaction...
-Committed revision 2.
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9139-git-svn-non-utf8-commitencoding/eucJP/.git/
-r2 = 8120d6b18d8feae1485080133fc4f53fbd01facf (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP r2
-ok 2 - eucJP setup
-
-expecting success of 9139.3 'ISO8859-1 commit on git side': 
-	(
-		cd $H &&
-		git config i18n.commitencoding $H &&
-		git checkout -b t refs/remotes/git-svn &&
-		echo $H >F &&
-		git add F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H"
-	)
-	
-Switched to a new branch 't'
-[t 2058eeb] ÄËÑÏÖ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 3 - ISO8859-1 commit on git side
-
-expecting success of 9139.4 'eucJP commit on git side': 
-	(
-		cd $H &&
-		git config i18n.commitencoding $H &&
-		git checkout -b t refs/remotes/git-svn &&
-		echo $H >F &&
-		git add F &&
-		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
-		test "z$E" = "z$H"
-	)
-	
-Switched to a new branch 't'
-[t 0deb91c] ¤Ï¤ì¤Ò¤Û¤Õ
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 F
-ok 4 - eucJP commit on git side
-
-expecting success of 9139.5 'ISO8859-1 dcommit to svn': 
-	(
-		cd $H &&
-		git config --unset i18n.commitencoding &&
-		test_must_fail git svn dcommit
-	)
-	
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 ...
-Could not decode as UTF-8:
-ÄËÑÏÖ
-
-Ábçdèfg
-Perhaps you need to set i18n.commitencoding
-
-ok 5 - ISO8859-1 dcommit to svn
-
-expecting success of 9139.6 'eucJP dcommit to svn': 
-	(
-		cd $H &&
-		git config --unset i18n.commitencoding &&
-		test_must_fail git svn dcommit
-	)
-	
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP ...
-Could not decode as UTF-8:
-¤Ï¤ì¤Ò¤Û¤Õ
-
-¤·¤Æ¤¤¤ë¤Î¤¬¡¢¤¤¤ë¤Î¤Ç¡£
-ßÀÉͤۤì¤×¤ê¤Ý¤ì¤Þ¤Ó¤°¤ê¤í¤Ø¡£
-Perhaps you need to set i18n.commitencoding
-
-ok 6 - eucJP dcommit to svn
-
-# passed all 6 test(s)
-1..6
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9137-git-svn-dcommit-clobber-series.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9137-git-svn-dcommit-clobber-series/.git/
-expecting success of 9137.1 'initialize repo': 
-	mkdir import &&
-	(cd import &&
-	awk "BEGIN { for (i = 1; i < 64; i++) { print i } }" > file &&
-	svn_cmd import -m "initial" . "$svnrepo"
-	) &&
-	git svn init "$svnrepo" &&
-	git svn fetch &&
-	test -e file
-	
-Adding         file
-Committing transaction...
-Committed revision 1.
-	A	file
-r1 = 841ad3be544b0f02fe34d2c9d87b72e38f3ba5f7 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo r1
-ok 1 - initialize repo
-
-expecting success of 9137.2 '(supposedly) non-conflicting change from SVN': 
-	test x"$(sed -n -e 58p < file)" = x58 &&
-	test x"$(sed -n -e 61p < file)" = x61 &&
-	svn_cmd co "$svnrepo" tmp &&
-	(cd tmp &&
-		perl -i.bak -p -e "s/^58$/5588/" file &&
-		perl -i.bak -p -e "s/^61$/6611/" file &&
-		poke file &&
-		test x"$(sed -n -e 58p < file)" = x5588 &&
-		test x"$(sed -n -e 61p < file)" = x6611 &&
-		svn_cmd commit -m "58 => 5588, 61 => 6611"
-	)
-	
-A    tmp/file
-Checked out revision 1.
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-ok 2 - (supposedly) non-conflicting change from SVN
-
-expecting success of 9137.3 'some unrelated changes to git': 
-	echo hi > life &&
-	git update-index --add life &&
-	git commit -m hi-life &&
-	echo bye >> life &&
-	git commit -m bye-life life
-	
-[master 0e3459e] hi-life
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 life
-[master efae73e] bye-life
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 3 - some unrelated changes to git
-
-expecting success of 9137.4 'change file but in unrelated area': 
-	test x"$(sed -n -e 4p < file)" = x4 &&
-	test x"$(sed -n -e 7p < file)" = x7 &&
-	perl -i.bak -p -e 's/^4$/4444/' file &&
-	perl -i.bak -p -e 's/^7$/7777/' file &&
-	test x"$(sed -n -e 4p < file)" = x4444 &&
-	test x"$(sed -n -e 7p < file)" = x7777 &&
-	git commit -m '4 => 4444, 7 => 7777' file &&
-	git svn dcommit &&
-	svn_cmd up tmp &&
-	cd tmp &&
-		test x"$(sed -n -e 4p < file)" = x4444 &&
-		test x"$(sed -n -e 7p < file)" = x7777 &&
-		test x"$(sed -n -e 58p < file)" = x5588 &&
-		test x"$(sed -n -e 61p < file)" = x6611
-	
-[master ff2c802] 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"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo ...
-	A	life
-Committed r3
-	M	file
-r2 = 744f03e8dab113cf60f95dc4c95c80d6c0c0e2ef (refs/remotes/git-svn)
-	A	life
-r3 = a61e76d30325d277ed498ebe2804213036ca6e63 (refs/remotes/git-svn)
-W: 0e3459e50d863b1eecdb1687b00af9420ef08b53 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 55200b3d5d7c0e515eaccaf8465a295017e88249 15dcf092297e5fcea41cadcc3eb0a689aaa3e65e M	file
-warning: skipped previously applied commit 0e3459e
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/master.
-	M	life
-Committed r4
-	M	life
-r4 = 722319fc15db45d391d613663da46b73d45d0501 (refs/remotes/git-svn)
-	M	file
-Committed r5
-	M	file
-r5 = ffc86fcfadae01012241ba4d3fab41a22f2abf4b (refs/remotes/git-svn)
-No changes between a04eafc952d876a148d04b0420f3c7bc08120954 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-Updating 'tmp':
-U    tmp/file
-A    tmp/life
-Updated to revision 5.
-ok 4 - change file but in unrelated area
-
-expecting success of 9137.5 'attempt to dcommit with a dirty index': 
-	echo foo >>file &&
-	git add file &&
-	test_must_fail git svn dcommit
-
-Duplicate specification "id|i=s" for option "i"
-Cannot dcommit with a dirty index.  Commit your changes first, or stash them with `git stash'.
- at /build/reproducible-path/git-2.45.2/git-svn line 839.
-
-ok 5 - attempt to dcommit with a dirty index
-
-# passed all 5 test(s)
-1..5
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9138-git-svn-authors-prog.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9138-git-svn-authors-prog/.git/
-expecting success of 9138.1 'svn-authors setup': 
-	cat >svn-authors <<-\EOF
-	ff = FFFFFFF FFFFFFF <fFf@other.example.com>
-	EOF
-
-ok 1 - svn-authors setup
-
-expecting success of 9138.2 'setup svnrepo': 
-	for i in aa bb cc-sub dd-sub ee-foo ff
-	do
-		svn mkdir -m $i --username $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.
-ok 2 - setup svnrepo
-
-expecting success of 9138.3 'import authors with prog and file': 
-	git svn clone --authors-prog=./svn-authors-prog \
-	    --authors-file=svn-authors "$svnrepo" x
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9138-git-svn-authors-prog/x/.git/
-W: +empty_dir: aa
-r1 = 4949ea125221a93884e9376076845b209234e6a3 (refs/remotes/git-svn)
-W: +empty_dir: bb
-r2 = 9a8dbb2d9c38928253c9c021c97097dff7f4ad57 (refs/remotes/git-svn)
-W: +empty_dir: cc-sub
-r3 = d3a7b8b45437bd316f495a82eb16d944461ff26c (refs/remotes/git-svn)
-W: +empty_dir: dd-sub
-r4 = 0027c464876159de9e03440f9ca78765e0596403 (refs/remotes/git-svn)
-W: +empty_dir: ee-foo
-r5 = b2860dd5d980c45e9f6a7ff53bab9b2e6c58d4e0 (refs/remotes/git-svn)
-W: +empty_dir: ff
-r6 = c8c6da8f9e6c08a137f8638509207d3ad280285a (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9138-git-svn-authors-prog/svnrepo r6
-creating empty directory: aa
-creating empty directory: bb
-creating empty directory: cc-sub
-creating empty directory: dd-sub
-creating empty directory: ee-foo
-creating empty directory: ff
-ok 3 - import authors with prog and file
-
-expecting success of 9138.4 'imported 6 revisions successfully': 
-	(
-		cd x &&
-		git rev-list refs/remotes/git-svn >actual &&
-		test_line_count = 6 actual
-	)
-
-ok 4 - imported 6 revisions successfully
-
-expecting success of 9138.5 'authors-prog ran correctly': 
-	(
-		cd x &&
-		git rev-list -1 --pretty=raw refs/remotes/git-svn~1 >actual &&
-		grep "^author ee-foo <ee-foo@example\.com> " actual &&
-		git rev-list -1 --pretty=raw refs/remotes/git-svn~2 >actual &&
-		grep "^author dd <dd@sub\.example\.com> " actual &&
-		git rev-list -1 --pretty=raw refs/remotes/git-svn~3 >actual &&
-		grep "^author cc <cc@sub\.example\.com> " actual &&
-		git rev-list -1 --pretty=raw refs/remotes/git-svn~4 >actual &&
-		grep "^author bb <bb@example\.com> " actual &&
-		git rev-list -1 --pretty=raw refs/remotes/git-svn~5 >actual &&
-		grep "^author aa <aa@example\.com> " actual
-	)
-
-author ee-foo <ee-foo@example.com> 1766022020 +0000
-author dd <dd@sub.example.com> 1766022020 +0000
-author cc <cc@sub.example.com> 1766022020 +0000
-author bb <bb@example.com> 1766022020 +0000
-author aa <aa@example.com> 1766022020 +0000
-ok 5 - authors-prog ran correctly
-
-expecting success of 9138.6 'authors-file overrode authors-prog': 
-	(
-		cd x &&
-		git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&
-		grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
-	)
-
-author FFFFFFF FFFFFFF <fFf@other.example.com> 1766022021 +0000
-ok 6 - authors-file overrode authors-prog
-
-expecting success of 9138.7 'authors-prog imported user without email': 
-	svn mkdir -m gg --username gg-hermit "$svnrepo"/gg &&
-	(
-		cd x &&
-		git svn fetch --authors-prog=../svn-authors-prog &&
-		git rev-list -1 --pretty=raw refs/remotes/git-svn | \
-		  grep "^author gg <> "
-	)
-
-Committing transaction...
-Committed revision 7.
-W: +empty_dir: gg
-r7 = 6c0d80834573e212ca3cb30d9be045431f0f2c82 (refs/remotes/git-svn)
-author gg <> 1766022023 +0000
-ok 7 - authors-prog imported user without email
-
-expecting success of 9138.8 'imported without authors-prog and authors-file': 
-	svn mkdir -m hh --username hh "$svnrepo"/hh &&
-	(
-		uuid=$(svn info "$svnrepo" |
-			sed -n "s/^Repository UUID: //p") &&
-		cd x &&
-		git svn fetch &&
-		git rev-list -1 --pretty=raw refs/remotes/git-svn | \
-		  grep "^author hh <hh@$uuid> "
-	)
-
-Committing transaction...
-Committed revision 8.
-W: +empty_dir: hh
-r8 = 8dba8e4d92dec54c7986bab78f83a0e8b91852f1 (refs/remotes/git-svn)
-author hh <hh@a4fcb434-4dbf-4c83-a3eb-fb3d7527724b> 1766022023 +0000
-ok 8 - imported without authors-prog and authors-file
-
-expecting success of 9138.9 'authors-prog handled special characters in username': 
-	svn mkdir -m bad --username "xyz; touch evil" "$svnrepo"/bad &&
-	(
-		cd x &&
-		git svn --authors-prog=../svn-authors-prog fetch &&
-		git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&
-		grep "^author xyz; touch evil <xyz; touch evil@example\.com> " actual &&
-		! test -f evil
-	)
-
-Committing transaction...
-Committed revision 9.
-W: +empty_dir: bad
-r9 = 62f6bf62beb5ad44e42bb91816710baee71f46c3 (refs/remotes/git-svn)
-author xyz; touch evil <xyz; touch evil@example.com> 1766022024 +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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9134-git-svn-ignore-paths.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9134-git-svn-ignore-paths/.git/
 expecting success of 9134.1 'setup test repository': 
@@ -516181,8 +515201,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9134-git-svn-ignore-paths/g/.git/
 	A	qqq/test_qqq.txt
-r1 = 7805b2b625abcfc15128be3b588b49525cd81d95 (refs/remotes/git-svn)
-r2 = 6e9e7138a4177314b3719a6a290198fe18914789 (refs/remotes/git-svn)
+r1 = ecc83901690a5d32d777a4bfeed299fd88f12e07 (refs/remotes/git-svn)
+r2 = 9c2123051d7036c7e6178f12663c4b46852840e1 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
 ok 2 - clone an SVN repository with ignored www directory
@@ -516197,8 +515217,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9134-git-svn-ignore-paths/c/.git/
 	A	qqq/test_qqq.txt
-r1 = 7805b2b625abcfc15128be3b588b49525cd81d95 (refs/remotes/git-svn)
-r2 = 6e9e7138a4177314b3719a6a290198fe18914789 (refs/remotes/git-svn)
+r1 = ecc83901690a5d32d777a4bfeed299fd88f12e07 (refs/remotes/git-svn)
+r2 = 9c2123051d7036c7e6178f12663c4b46852840e1 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9134-git-svn-ignore-paths/svnrepo r2
 ok 3 - init+fetch an SVN repository with ignored www directory
@@ -516241,7 +515261,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 2295549f2699c915a3bf10e69b1d31b7eaac97ff (refs/remotes/git-svn)
+r3 = c6c3947d3611088cbb7ad9585aa6c9a361c051b5 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 6 - update git svn-cloned repo (config ignore)
 
@@ -516256,7 +515276,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = 2295549f2699c915a3bf10e69b1d31b7eaac97ff (refs/remotes/git-svn)
+r3 = c6c3947d3611088cbb7ad9585aa6c9a361c051b5 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 7 - update git svn-cloned repo (option ignore)
 
@@ -516288,7 +515308,7 @@
 		rm expect expect2
 	)
 
-r4 = 86053033bb3ddccbd5837ac2496bbaea8394e723 (refs/remotes/git-svn)
+r4 = 0f829f6dad5beab387bd45a8ad5b3c03467b0955 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 9 - update git svn-cloned repo (config ignore)
 
@@ -516302,7 +515322,7 @@
 		rm expect expect2
 	)
 
-r4 = 86053033bb3ddccbd5837ac2496bbaea8394e723 (refs/remotes/git-svn)
+r4 = 0f829f6dad5beab387bd45a8ad5b3c03467b0955 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 10 - update git svn-cloned repo (option ignore)
 
@@ -516337,7 +515357,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = d040438bd30069729757cba57f2f8d0b20fe8897 (refs/remotes/git-svn)
+r5 = fd5f2164e1a11952981d43a682af258ced0c07c6 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 12 - update git svn-cloned repo again (config ignore)
 
@@ -516352,7 +515372,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = d040438bd30069729757cba57f2f8d0b20fe8897 (refs/remotes/git-svn)
+r5 = fd5f2164e1a11952981d43a682af258ced0c07c6 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 13 - update git svn-cloned repo again (option ignore)
 
@@ -516360,6 +515380,385 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9138-git-svn-authors-prog.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9138-git-svn-authors-prog/.git/
+expecting success of 9138.1 'svn-authors setup': 
+	cat >svn-authors <<-\EOF
+	ff = FFFFFFF FFFFFFF <fFf@other.example.com>
+	EOF
+
+ok 1 - svn-authors setup
+
+expecting success of 9138.2 'setup svnrepo': 
+	for i in aa bb cc-sub dd-sub ee-foo ff
+	do
+		svn mkdir -m $i --username $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.
+ok 2 - setup svnrepo
+
+expecting success of 9138.3 'import authors with prog and file': 
+	git svn clone --authors-prog=./svn-authors-prog \
+	    --authors-file=svn-authors "$svnrepo" x
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9138-git-svn-authors-prog/x/.git/
+W: +empty_dir: aa
+r1 = 861682000d8558b68f245d140f3eb2253f938b3e (refs/remotes/git-svn)
+W: +empty_dir: bb
+r2 = 23207430599b8137950db373663b4d1cf3dd23c8 (refs/remotes/git-svn)
+W: +empty_dir: cc-sub
+r3 = 66868986d26b573c1a79c1e7550c0a94522cf345 (refs/remotes/git-svn)
+W: +empty_dir: dd-sub
+r4 = a916dbb1670aae2d21b6bf06b3188017483bc084 (refs/remotes/git-svn)
+W: +empty_dir: ee-foo
+r5 = dc5abdd631667c6da101c92c1c199da711a08dd9 (refs/remotes/git-svn)
+W: +empty_dir: ff
+r6 = 01908037667f370ea20d0375d7d57d50527bcfe3 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9138-git-svn-authors-prog/svnrepo r6
+creating empty directory: aa
+creating empty directory: bb
+creating empty directory: cc-sub
+creating empty directory: dd-sub
+creating empty directory: ee-foo
+creating empty directory: ff
+ok 3 - import authors with prog and file
+
+expecting success of 9138.4 'imported 6 revisions successfully': 
+	(
+		cd x &&
+		git rev-list refs/remotes/git-svn >actual &&
+		test_line_count = 6 actual
+	)
+
+ok 4 - imported 6 revisions successfully
+
+expecting success of 9138.5 'authors-prog ran correctly': 
+	(
+		cd x &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn~1 >actual &&
+		grep "^author ee-foo <ee-foo@example\.com> " actual &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn~2 >actual &&
+		grep "^author dd <dd@sub\.example\.com> " actual &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn~3 >actual &&
+		grep "^author cc <cc@sub\.example\.com> " actual &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn~4 >actual &&
+		grep "^author bb <bb@example\.com> " actual &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn~5 >actual &&
+		grep "^author aa <aa@example\.com> " actual
+	)
+
+author ee-foo <ee-foo@example.com> 1731613667 +0000
+author dd <dd@sub.example.com> 1731613667 +0000
+author cc <cc@sub.example.com> 1731613667 +0000
+author bb <bb@example.com> 1731613667 +0000
+author aa <aa@example.com> 1731613667 +0000
+ok 5 - authors-prog ran correctly
+
+expecting success of 9138.6 'authors-file overrode authors-prog': 
+	(
+		cd x &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&
+		grep "^author FFFFFFF FFFFFFF <fFf@other\.example\.com> " actual
+	)
+
+author FFFFFFF FFFFFFF <fFf@other.example.com> 1731613667 +0000
+ok 6 - authors-file overrode authors-prog
+
+expecting success of 9138.7 'authors-prog imported user without email': 
+	svn mkdir -m gg --username gg-hermit "$svnrepo"/gg &&
+	(
+		cd x &&
+		git svn fetch --authors-prog=../svn-authors-prog &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn | \
+		  grep "^author gg <> "
+	)
+
+Committing transaction...
+Committed revision 7.
+W: +empty_dir: gg
+r7 = f26a4f1ccf33d8b1b24c9c62adedfbf162dcf246 (refs/remotes/git-svn)
+author gg <> 1731613670 +0000
+ok 7 - authors-prog imported user without email
+
+expecting success of 9138.8 'imported without authors-prog and authors-file': 
+	svn mkdir -m hh --username hh "$svnrepo"/hh &&
+	(
+		uuid=$(svn info "$svnrepo" |
+			sed -n "s/^Repository UUID: //p") &&
+		cd x &&
+		git svn fetch &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn | \
+		  grep "^author hh <hh@$uuid> "
+	)
+
+Committing transaction...
+Committed revision 8.
+W: +empty_dir: hh
+r8 = 82fcd8a520038c11eef465796bcbd49273bd1bc9 (refs/remotes/git-svn)
+author hh <hh@161136b5-f834-4a7b-9fa5-0d412ad02dd6> 1731613671 +0000
+ok 8 - imported without authors-prog and authors-file
+
+expecting success of 9138.9 'authors-prog handled special characters in username': 
+	svn mkdir -m bad --username "xyz; touch evil" "$svnrepo"/bad &&
+	(
+		cd x &&
+		git svn --authors-prog=../svn-authors-prog fetch &&
+		git rev-list -1 --pretty=raw refs/remotes/git-svn >actual &&
+		grep "^author xyz; touch evil <xyz; touch evil@example\.com> " actual &&
+		! test -f evil
+	)
+
+Committing transaction...
+Committed revision 9.
+W: +empty_dir: bad
+r9 = 41426034c7377fa5c7691b01f282308556a315d1 (refs/remotes/git-svn)
+author xyz; touch evil <xyz; touch evil@example.com> 1731613673 +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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9137-git-svn-dcommit-clobber-series.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9137-git-svn-dcommit-clobber-series/.git/
+expecting success of 9137.1 'initialize repo': 
+	mkdir import &&
+	(cd import &&
+	awk "BEGIN { for (i = 1; i < 64; i++) { print i } }" > file &&
+	svn_cmd import -m "initial" . "$svnrepo"
+	) &&
+	git svn init "$svnrepo" &&
+	git svn fetch &&
+	test -e file
+	
+Adding         file
+Committing transaction...
+Committed revision 1.
+	A	file
+r1 = eefee06a191db8559cf6ea430d22dffbac85e462 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo r1
+ok 1 - initialize repo
+
+expecting success of 9137.2 '(supposedly) non-conflicting change from SVN': 
+	test x"$(sed -n -e 58p < file)" = x58 &&
+	test x"$(sed -n -e 61p < file)" = x61 &&
+	svn_cmd co "$svnrepo" tmp &&
+	(cd tmp &&
+		perl -i.bak -p -e "s/^58$/5588/" file &&
+		perl -i.bak -p -e "s/^61$/6611/" file &&
+		poke file &&
+		test x"$(sed -n -e 58p < file)" = x5588 &&
+		test x"$(sed -n -e 61p < file)" = x6611 &&
+		svn_cmd commit -m "58 => 5588, 61 => 6611"
+	)
+	
+A    tmp/file
+Checked out revision 1.
+Sending        file
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+ok 2 - (supposedly) non-conflicting change from SVN
+
+expecting success of 9137.3 'some unrelated changes to git': 
+	echo hi > life &&
+	git update-index --add life &&
+	git commit -m hi-life &&
+	echo bye >> life &&
+	git commit -m bye-life life
+	
+[master b0837b0] hi-life
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 life
+[master e18f443] bye-life
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 3 - some unrelated changes to git
+
+expecting success of 9137.4 'change file but in unrelated area': 
+	test x"$(sed -n -e 4p < file)" = x4 &&
+	test x"$(sed -n -e 7p < file)" = x7 &&
+	perl -i.bak -p -e 's/^4$/4444/' file &&
+	perl -i.bak -p -e 's/^7$/7777/' file &&
+	test x"$(sed -n -e 4p < file)" = x4444 &&
+	test x"$(sed -n -e 7p < file)" = x7777 &&
+	git commit -m '4 => 4444, 7 => 7777' file &&
+	git svn dcommit &&
+	svn_cmd up tmp &&
+	cd tmp &&
+		test x"$(sed -n -e 4p < file)" = x4444 &&
+		test x"$(sed -n -e 7p < file)" = x7777 &&
+		test x"$(sed -n -e 58p < file)" = x5588 &&
+		test x"$(sed -n -e 61p < file)" = x6611
+	
+[master 22fcceb] 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"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9137-git-svn-dcommit-clobber-series/svnrepo ...
+	A	life
+Committed r3
+	M	file
+r2 = b93fe23f56a3f008cf48d33422f5db85147fa6fc (refs/remotes/git-svn)
+	A	life
+r3 = 1bacbee4c6c4441e5158c2c2461dba0cd388d2bb (refs/remotes/git-svn)
+W: b0837b02f85a50d6d556087cbfbb31830598e108 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 55200b3d5d7c0e515eaccaf8465a295017e88249 15dcf092297e5fcea41cadcc3eb0a689aaa3e65e M	file
+warning: skipped previously applied commit b0837b0
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/master.
+	M	life
+Committed r4
+	M	life
+r4 = d7e04976327ee1ed83be33ecfc0cb8cef1e64d88 (refs/remotes/git-svn)
+	M	file
+Committed r5
+	M	file
+r5 = 2d970addf5a0e4106e3326fcb9a6ee8557499dcd (refs/remotes/git-svn)
+No changes between 853d13f87b40d9385970db2be9ed394e728c095b and refs/remotes/git-svn
+Resetting to the latest refs/remotes/git-svn
+Updating 'tmp':
+U    tmp/file
+A    tmp/life
+Updated to revision 5.
+ok 4 - change file but in unrelated area
+
+expecting success of 9137.5 'attempt to dcommit with a dirty index': 
+	echo foo >>file &&
+	git add file &&
+	test_must_fail git svn dcommit
+
+Duplicate specification "id|i=s" for option "i"
+Cannot dcommit with a dirty index.  Commit your changes first, or stash them with `git stash'.
+ at /build/reproducible-path/git-2.45.2/git-svn line 839.
+
+ok 5 - attempt to dcommit with a dirty index
+
+# passed all 5 test(s)
+1..5
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9139-git-svn-non-utf8-commitencoding.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9139-git-svn-non-utf8-commitencoding/.git/
+expecting success of 9139.1 'ISO8859-1 setup': 
+		mkdir $H &&
+		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
+		git svn clone "$svnrepo"/$H $H
+	
+Committing transaction...
+Committed revision 1.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9139-git-svn-non-utf8-commitencoding/ISO8859-1/.git/
+r1 = 3026f08832dd35122641877b491d507fa4f7a0d8 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 r1
+ok 1 - ISO8859-1 setup
+
+expecting success of 9139.2 'eucJP setup': 
+		mkdir $H &&
+		svn_cmd import -m "$H test" $H "$svnrepo"/$H &&
+		git svn clone "$svnrepo"/$H $H
+	
+Committing transaction...
+Committed revision 2.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9139-git-svn-non-utf8-commitencoding/eucJP/.git/
+r2 = 292235afb447b92c8eb290b82c8b567a123a1d51 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP r2
+ok 2 - eucJP setup
+
+expecting success of 9139.3 'ISO8859-1 commit on git side': 
+	(
+		cd $H &&
+		git config i18n.commitencoding $H &&
+		git checkout -b t refs/remotes/git-svn &&
+		echo $H >F &&
+		git add F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H"
+	)
+	
+Switched to a new branch 't'
+[t 9d3ffbd] ÄËÑÏÖ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 3 - ISO8859-1 commit on git side
+
+expecting success of 9139.4 'eucJP commit on git side': 
+	(
+		cd $H &&
+		git config i18n.commitencoding $H &&
+		git checkout -b t refs/remotes/git-svn &&
+		echo $H >F &&
+		git add F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
+		E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
+		test "z$E" = "z$H"
+	)
+	
+Switched to a new branch 't'
+[t f1e5ebc] ¤Ï¤ì¤Ò¤Û¤Õ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 F
+ok 4 - eucJP commit on git side
+
+expecting success of 9139.5 'ISO8859-1 dcommit to svn': 
+	(
+		cd $H &&
+		git config --unset i18n.commitencoding &&
+		test_must_fail git svn dcommit
+	)
+	
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/ISO8859-1 ...
+Could not decode as UTF-8:
+ÄËÑÏÖ
+
+Ábçdèfg
+Perhaps you need to set i18n.commitencoding
+
+ok 5 - ISO8859-1 dcommit to svn
+
+expecting success of 9139.6 'eucJP dcommit to svn': 
+	(
+		cd $H &&
+		git config --unset i18n.commitencoding &&
+		test_must_fail git svn dcommit
+	)
+	
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9139-git-svn-non-utf8-commitencoding/svnrepo/eucJP ...
+Could not decode as UTF-8:
+¤Ï¤ì¤Ò¤Û¤Õ
+
+¤·¤Æ¤¤¤ë¤Î¤¬¡¢¤¤¤ë¤Î¤Ç¡£
+ßÀÉͤۤì¤×¤ê¤Ý¤ì¤Þ¤Ó¤°¤ê¤í¤Ø¡£
+Perhaps you need to set i18n.commitencoding
+
+ok 6 - eucJP dcommit to svn
+
+# passed all 6 test(s)
+1..6
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9142-git-svn-shallow-clone.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9142-git-svn-shallow-clone/.git/
 expecting success of 9142.1 'setup test repository': 
@@ -516393,7 +515792,7 @@
 	( cd g && git rev-parse --symbolic --verify HEAD )
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9142-git-svn-shallow-clone/g/.git/
-r1 = c8a9840c9ce20f8dfbdb7978eb6e3976ebc371ca (refs/remotes/git-svn)
+r1 = 3c02f133d8b7c72f35427823ddf243f0b7089a1b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9142-git-svn-shallow-clone/svnrepo/trunk r1
 HEAD
@@ -516403,6 +515802,73 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9143-git-svn-gc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 = 9e479aa8c6aab84d9eee35d7a4b03116ae4ee898 (refs/remotes/git-svn)
+	M	test.txt
+r2 = ce24d679331be38324e84422b8072dd8ca2bb28d (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9140-git-svn-reset.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9140-git-svn-reset/.git/
 expecting success of 9140.1 'setup test repository': 
@@ -516454,10 +515920,10 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9140-git-svn-reset/g/.git/
 	A	vis/vis.txt
-r1 = c3ee6ad893c96e7d81b09e0eeb30765fe9a50a7b (refs/remotes/git-svn)
-r2 = 81ef6aa8292856889bfdd9db6e4306582417b68f (refs/remotes/git-svn)
+r1 = 0d662ac24dcea7821f668d9e50424e399f722818 (refs/remotes/git-svn)
+r2 = 7384d34db78d528a0fb37da53a60f8fbd13c9c11 (refs/remotes/git-svn)
 	M	vis/vis.txt
-r3 = e2a655431c3e9d41fb1e45d325c3c967c674e4cb (refs/remotes/git-svn)
+r3 = e2db39ef2e19eb8e1c1e46b950b4658d0db52e5b (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9140-git-svn-reset/svnrepo r3
 ok 2 - clone SVN repository with hidden directory
@@ -516485,7 +515951,7 @@
 	grep "not found in commit" errors &&
 	test_cmp expect expect2
 
-hid/hid.txt was not found in commit e2a655431c3e9d41fb1e45d325c3c967c674e4cb (r3)
+hid/hid.txt was not found in commit e2db39ef2e19eb8e1c1e46b950b4658d0db52e5b (r3)
 ok 4 - fetch fails on modified hidden file
 
 expecting success of 9140.5 'reset unwinds back to r1': 
@@ -516495,7 +515961,7 @@
 	echo 1 >expect &&
 	test_cmp expect expect2
 
-r1 = c3ee6ad893c96e7d81b09e0eeb30765fe9a50a7b (refs/remotes/git-svn)
+r1 = 0d662ac24dcea7821f668d9e50424e399f722818 (refs/remotes/git-svn)
 ok 5 - reset unwinds back to r1
 
 expecting success of 9140.6 'refetch succeeds not ignoring any files': 
@@ -516506,14 +515972,14 @@
 	)
 
 Index mismatch: a4b5c203f79112e92d530cb82366ca4d706fa4a8 != 6b5a1244749c8cdb5442eefd0abc3689d666322d
-rereading c3ee6ad893c96e7d81b09e0eeb30765fe9a50a7b
+rereading 0d662ac24dcea7821f668d9e50424e399f722818
 	A	hid/hid.txt
-r2 = b2f941979a6855db7bea5fd98952b33b375b4588 (refs/remotes/git-svn)
+r2 = 7432445358a58afc8d396036b1721b341c8bae10 (refs/remotes/git-svn)
 	M	vis/vis.txt
-r3 = 03e0f02ce0243c91eff32f450d2e28638b94183e (refs/remotes/git-svn)
+r3 = 2c1413f9a1946ad9fa0907b13e8767a786a17fc3 (refs/remotes/git-svn)
 	M	hid/hid.txt
-r4 = 24d0edd572ef5db3196a3ec0d61f8662069f14a6 (refs/remotes/git-svn)
-warning: skipped previously applied commit e2a6554
+r4 = 7fb0be383a30191fbb7c5a572b5206d7c450ced4 (refs/remotes/git-svn)
+warning: skipped previously applied commit e2db39e
 hint: use --reapply-cherry-picks to include skipped commits
 hint: Disable this message with "git config advice.skippedCherryPicks false"
 Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/master.
@@ -516524,116 +515990,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9143-git-svn-gc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 = 454942d7f9cdae9dbcd6bbc7bb220545c886f1d7 (refs/remotes/git-svn)
-	M	test.txt
-r2 = cd268b5528995cf79452e0a41c5793f1450b4192 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9145-git-svn-master-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9145-git-svn-master-branch/g/.git/
-	A	a
-r1 = bae7ee436c2d27b967ef55b86810a9e73d4dde8f (refs/remotes/origin/trunk)
-	A	a
-r2 = 378f1c8566bd6761f97dd12bd73b519692055e77 (refs/remotes/origin/a)
-	A	a
-r3 = 5154dc6a6f54e62db74ae34ffd9247d86be7be48 (refs/remotes/origin/b)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9144-git-svn-old-rev_map.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9144-git-svn-old-rev_map/.git/
 expecting success of 9144.1 'setup test repository with old layout': 
@@ -516651,7 +516007,7 @@
 Committing transaction...
 Committed revision 1.
 	A	a
-r1 = 9512ee48c898dde353decf2bacd6dd9e9e275a31 (refs/remotes/git-svn)
+r1 = 20b51d1052f34263e38a14585ddff7f725bf78a3 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo r1
 ok 1 - setup test repository with old layout
@@ -516666,24 +516022,67 @@
 	! test -d .git/svn/refs/ &&
 	test -e .git/svn/git-svn/
 
-Adding         i/a
-Committing transaction...
-Committed revision 2.
-	A	b/a
-r2 = 5db7a9773bacb28f38aa0407b9dd99409427ce9b (refs/remotes/git-svn)
-
                                                                                
Successfully rebased and updated refs/heads/master.
-[master 182585c] -
- 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.45.2/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
-	M	b/a
-Committed r3
-	M	b/a
-r3 = e01356a812874fd7ff4e2974cdabb1352e17a4f9 (refs/remotes/git-svn)
-No changes between 182585c6a5808a60b65a9e426fae087da4914ea5 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 2 - old layout continues to work
+Adding         i/a
+Committing transaction...
+Committed revision 2.
+	A	b/a
+r2 = 8af1b0ee5fbc288756b006967b13f3ed29b5272f (refs/remotes/git-svn)
+
                                                                                
Successfully rebased and updated refs/heads/master.
+[master 1c079fe] -
+ 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.45.2/t/trash%20directory.t9144-git-svn-old-rev_map/svnrepo ...
+	M	b/a
+Committed r3
+	M	b/a
+r3 = 9de13caa6da9904251272a9d3d20f8dd1f43d6a6 (refs/remotes/git-svn)
+No changes between 1c079fe6c16b366e780fa6054c4716a6c2274d19 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9145-git-svn-master-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9145-git-svn-master-branch/g/.git/
+	A	a
+r1 = fab7a4e8e7e588f251562c42301f637eeef45afc (refs/remotes/origin/trunk)
+	A	a
+r2 = 2f054e5ca9a9c5f111e330a8a8b6ab624da08d83 (refs/remotes/origin/a)
+	A	a
+r3 = d31042129ff58dafd20754df84924f1f73868932 (refs/remotes/origin/b)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/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
@@ -516726,248 +516125,6 @@
 1..2
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9148-git-svn-propset.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 = b7f75493e725e2a7aa90c7bc6d7f250b9e1126d6 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/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 11ddc50] 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.45.2/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	foo
-Committed r2
-	M	foo
-r2 = 0cc798f619503bc312bb19542a74bacd455b6a46 (refs/remotes/git-svn)
-No changes between 11ddc50319000bdad62d4547a45693ebc93741ef 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 30dd69b] 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.45.2/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	foo
-Committed r3
-	M	foo
-r3 = d1bd06c22c920f7ff3b75afed0aaa5968b8b25be (refs/remotes/git-svn)
-No changes between 30dd69be7fe047dd3040cddd61ccedae5e2b65f7 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 312aa90] 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.45.2/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	subdir/subdir2/foo_subdir2
-Committed r4
-	M	subdir/subdir2/foo_subdir2
-r4 = 8c934218e6ae55be13a10c2022d5ca54aba32ba7 (refs/remotes/git-svn)
-No changes between 312aa904299df45a1b68548cd2e7b30f67c4a36f 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 bc627e9] 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.45.2/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
-	M	subdir/foo_subdir
-Committed r5
-	M	subdir/foo_subdir
-r5 = 092a92370e86118cddcf5dba66ab364eb90525af (refs/remotes/git-svn)
-No changes between bc627e99661bdfac6763bbf050a28bda1c99b74f 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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9152-svn-empty-dirs-after-gc.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9152-svn-empty-dirs-after-gc/cloned/.git/
-W: +empty_dir: a
-r1 = d3a961aaad256957d5d13c6a1019ebd2e21f12af (refs/remotes/git-svn)
-W: +empty_dir: b
-r2 = 7c51992ce237d88fbdef756f20c0376ea52a4aee (refs/remotes/git-svn)
-W: +empty_dir: c
-r3 = 9f80379ffad3d6fc1da326ed9c7d453e051ddfe0 (refs/remotes/git-svn)
-W: +empty_dir: d
-r4 = f2283dd7c50ef6c3f899696ca3ba5b589398b9fb (refs/remotes/git-svn)
-W: +empty_dir: d/e
-r5 = 4047d8704cf6ebdcbb33f2adcebd13ae77a83058 (refs/remotes/git-svn)
-W: +empty_dir: d/e/f
-r6 = 0291e432d283815712446364e1f692d5ad19d237 (refs/remotes/git-svn)
-W: +empty_dir: weird file name
-r7 = 580d87e43439516b4de214b9930664cc5ec59172 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9147-git-svn-include-paths.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9147-git-svn-include-paths/.git/
 expecting success of 9147.1 'setup test repository': 
@@ -517022,8 +516179,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9147-git-svn-include-paths/g/.git/
 	A	qqq/test_qqq.txt
-r1 = 6a0b545fc9c1f5e42a2c43901fbf8aba76faebd1 (refs/remotes/git-svn)
-r2 = e22540e0b001b9fcc04828a9a0a0c6107cc825c7 (refs/remotes/git-svn)
+r1 = c0ef86393e2a22a1af7f299d44ec21a6ac70217f (refs/remotes/git-svn)
+r2 = 86752bea4b4049de07e7119098bf3698589fc1fe (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 2 - clone an SVN repository with filter to include qqq directory
@@ -517038,8 +516195,8 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9147-git-svn-include-paths/c/.git/
 	A	qqq/test_qqq.txt
-r1 = 6a0b545fc9c1f5e42a2c43901fbf8aba76faebd1 (refs/remotes/git-svn)
-r2 = e22540e0b001b9fcc04828a9a0a0c6107cc825c7 (refs/remotes/git-svn)
+r1 = c0ef86393e2a22a1af7f299d44ec21a6ac70217f (refs/remotes/git-svn)
+r2 = 86752bea4b4049de07e7119098bf3698589fc1fe (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9147-git-svn-include-paths/svnrepo r2
 ok 3 - init+fetch an SVN repository with included qqq directory
@@ -517082,7 +516239,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = f40db5bb218eb9af093f6f06e4d440949efc4e80 (refs/remotes/git-svn)
+r3 = f565477ced2baa89db1c353d0f1e26ff2043c9b4 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 6 - update git svn-cloned repo (config include)
 
@@ -517097,7 +516254,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r3 = f40db5bb218eb9af093f6f06e4d440949efc4e80 (refs/remotes/git-svn)
+r3 = f565477ced2baa89db1c353d0f1e26ff2043c9b4 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 7 - update git svn-cloned repo (option include)
 
@@ -517129,7 +516286,7 @@
 		rm expect expect2
 	)
 
-r4 = 7049bbde6856970f1911fb6bd650710665b29107 (refs/remotes/git-svn)
+r4 = 54958879ac7b670d9ab06e8b1564830a0806e027 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 9 - update git svn-cloned repo (config include)
 
@@ -517143,7 +516300,7 @@
 		rm expect expect2
 	)
 
-r4 = 7049bbde6856970f1911fb6bd650710665b29107 (refs/remotes/git-svn)
+r4 = 54958879ac7b670d9ab06e8b1564830a0806e027 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 10 - update git svn-cloned repo (option include)
 
@@ -517178,7 +516335,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = 88524e5d0104a932ad866f531ce94eb693298f5f (refs/remotes/git-svn)
+r5 = 6fbbe1bf7a905d175aef660c7a5c1d8b03edb58d (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 12 - update git svn-cloned repo again (config include)
 
@@ -517193,7 +516350,7 @@
 	)
 
 	M	qqq/test_qqq.txt
-r5 = 88524e5d0104a932ad866f531ce94eb693298f5f (refs/remotes/git-svn)
+r5 = 6fbbe1bf7a905d175aef660c7a5c1d8b03edb58d (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 13 - update git svn-cloned repo again (option include)
 
@@ -517201,310 +516358,159 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9153-git-svn-rewrite-uuid.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/reproducible-path/git-2.45.2/t/t9153/svn.dump' &&
-	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
-	git svn fetch
-	
-	A	foo
-r1 = 4635c28435c689a762d9ad2843c5fb878149903a (refs/remotes/git-svn)
-	M	foo
-r2 = d71123b5602acff9d0d97ee59472f3bd866bf215 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/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.45.2/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
-git-svn-id: file:///build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9146-git-svn-empty-dirs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/.git/
-expecting success of 9146.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 9146.2 'clone': git svn clone "$svnrepo" cloned
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/cloned/.git/
-W: +empty_dir: a
-r1 = c9e92af79ac0ee000f4345c16504e3a4ff9b0725 (refs/remotes/git-svn)
-W: +empty_dir: b
-r2 = 2329c029a1ea8fa288952a58e6cfa7d1b8461e40 (refs/remotes/git-svn)
-W: +empty_dir: c
-r3 = 2ffcea04060d5bfe65b98ee3ace21b64f4ba5889 (refs/remotes/git-svn)
-W: +empty_dir: d
-r4 = bb24601898dcb234f9a37b5173a62b9012633c3a (refs/remotes/git-svn)
-W: +empty_dir: d/e
-r5 = a1919a118cefeb51f439e3fe8bf166638239275a (refs/remotes/git-svn)
-W: +empty_dir: d/e/f
-r6 = 2ff53a5fe32c29815b0c05fdcac4c7af5fdb8f6f (refs/remotes/git-svn)
-W: +empty_dir: weird file name
-r7 = d67fac3f03d54eb6f4c8f9f346601257ffa4b59e (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9146-git-svn-empty-dirs/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 9146.3 'empty directories exist': 
-	(
-		cd cloned &&
-		for i in a b c d d/e d/e/f "weird file name"
-		do
-			test_path_is_dir "$i" || exit 1
-		done
-	)
-
-ok 3 - empty directories exist
+*** t9148-git-svn-propset.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9148-git-svn-propset/.git/
+expecting success of 9148.1 'setup propset via import': 
+	test_when_finished "rm -rf import" &&
 
-expecting success of 9146.4 'option automkdirs set to false': 
+	foo_subdir2="subdir/subdir2/foo_subdir2" &&
+	mkdir -p import/subdir/subdir2 &&
 	(
-		git svn init "$svnrepo" cloned-no-mkdirs &&
-		cd cloned-no-mkdirs &&
-		git config svn-remote.svn.automkdirs false &&
-		git svn fetch &&
-		for i in a b c d d/e d/e/f "weird file name"
-		do
-			test_path_is_missing "$i" || exit 1
-		done
+		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"
 	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/cloned-no-mkdirs/.git/
-W: +empty_dir: a
-r1 = c9e92af79ac0ee000f4345c16504e3a4ff9b0725 (refs/remotes/git-svn)
-W: +empty_dir: b
-r2 = 2329c029a1ea8fa288952a58e6cfa7d1b8461e40 (refs/remotes/git-svn)
-W: +empty_dir: c
-r3 = 2ffcea04060d5bfe65b98ee3ace21b64f4ba5889 (refs/remotes/git-svn)
-W: +empty_dir: d
-r4 = bb24601898dcb234f9a37b5173a62b9012633c3a (refs/remotes/git-svn)
-W: +empty_dir: d/e
-r5 = a1919a118cefeb51f439e3fe8bf166638239275a (refs/remotes/git-svn)
-W: +empty_dir: d/e/f
-r6 = 2ff53a5fe32c29815b0c05fdcac4c7af5fdb8f6f (refs/remotes/git-svn)
-W: +empty_dir: weird file name
-r7 = d67fac3f03d54eb6f4c8f9f346601257ffa4b59e (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
-ok 4 - option automkdirs set to false
-
-expecting success of 9146.5 'more emptiness': 
-	svn_cmd mkdir -m "bang bang"  "$svnrepo"/"! !"
-
+Adding         foo
+Adding         subdir
+Adding         subdir/foo_subdir
+Adding         subdir/subdir2
+Adding         subdir/subdir2/foo_subdir2
 Committing transaction...
-Committed revision 8.
-ok 5 - more emptiness
-
-expecting success of 9146.6 'git svn rebase creates empty directory': 
-	( cd cloned && git svn rebase ) &&
-	test_path_is_dir cloned/"! !"
-
-W: +empty_dir: ! !
-r8 = cdf0625df8ba6b3e8e3a3229e645d85c669d23d2 (refs/remotes/git-svn)
-
                                                                                
Successfully rebased and updated refs/heads/master.
-creating empty directory: ! !
-ok 6 - git svn rebase creates empty directory
-
-expecting success of 9146.7 'git svn mkdirs recreates empty directories': 
-	(
-		cd cloned &&
-		rm -r * &&
-		git svn mkdirs &&
-		for i in a b c d d/e d/e/f "weird file name" "! !"
-		do
-			test_path_is_dir "$i" || exit 1
-		done
-	)
-
-creating empty directory: ! !
-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 7 - git svn mkdirs recreates empty directories
-
-expecting success of 9146.8 'git svn mkdirs -r works': 
-	(
-		cd cloned &&
-		rm -r * &&
-		git svn mkdirs -r7 &&
-		for i in a b c d d/e d/e/f "weird file name"
-		do
-			test_path_is_dir "$i" || exit 1
-		done &&
-
-		test_path_is_missing "! !" || exit 1 &&
-
-		git svn mkdirs -r8 &&
-		test_path_is_dir "! !" || exit 1
-	)
-
-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
-creating empty directory: ! !
-ok 8 - git svn mkdirs -r works
-
-expecting success of 9146.9 'initialize trunk': 
-	for i in trunk trunk/a trunk/"weird file name"
-	do
-		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
-	done
+Committed revision 1.
+ok 1 - setup propset via import
 
-Committing transaction...
-Committed revision 9.
-Committing transaction...
-Committed revision 10.
-Committing transaction...
-Committed revision 11.
-ok 9 - initialize trunk
+expecting success of 9148.2 'initialize git svn': 
+	git svn init "$svnrepo"
+	
+ok 2 - initialize git svn
 
-expecting success of 9146.10 'clone trunk': git svn clone -s "$svnrepo" trunk
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/trunk/.git/
-r9 = 99ba119e0bcc1f9d8255985e940f909784640a7b (refs/remotes/origin/trunk)
-W: +empty_dir: trunk/a
-r10 = cb66a06957e38529b4caaa56dcec702e9e1861f8 (refs/remotes/origin/trunk)
-W: +empty_dir: trunk/weird file name
-r11 = 19a410dbf34dc2024f55de6a8f31303297f53c0c (refs/remotes/origin/trunk)
+expecting success of 9148.3 'fetch revisions from svn': 
+	git svn fetch
+	
+	A	foo
+	A	subdir/foo_subdir
+	A	subdir/subdir2/foo_subdir2
+r1 = 35f64bcfe7290be733f3b6607f9594081a6a09e7 (refs/remotes/git-svn)
 Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo/trunk r11
-creating empty directory: a
-creating empty directory: weird file name
-ok 10 - clone trunk
-
-expecting success of 9146.11 'empty directories in trunk exist': 
-	(
-		cd trunk &&
-		for i in a "weird file name"
-		do
-			test_path_is_dir "$i" || exit 1
-		done
-	)
-
-ok 11 - empty directories in trunk exist
-
-expecting success of 9146.12 'remove a top-level directory from svn': 
-	svn_cmd rm -m "remove d" "$svnrepo"/d
-
-Committing transaction...
-Committed revision 12.
-ok 12 - remove a top-level directory from svn
-
-expecting success of 9146.13 'removed top-level directory does not exist': 
-	git svn clone "$svnrepo" removed &&
-	test_path_is_missing removed/d
+  file:///build/reproducible-path/git-2.45.2/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 79b8c47] 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.45.2/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	foo
+Committed r2
+	M	foo
+r2 = 43e554644097334aa1541f6cfdf36055e710a05c (refs/remotes/git-svn)
+No changes between 79b8c47d96909f3389ec8f345d5db98264b554d5 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/removed/.git/
-W: +empty_dir: a
-r1 = c9e92af79ac0ee000f4345c16504e3a4ff9b0725 (refs/remotes/git-svn)
-W: +empty_dir: b
-r2 = 2329c029a1ea8fa288952a58e6cfa7d1b8461e40 (refs/remotes/git-svn)
-W: +empty_dir: c
-r3 = 2ffcea04060d5bfe65b98ee3ace21b64f4ba5889 (refs/remotes/git-svn)
-W: +empty_dir: d
-r4 = bb24601898dcb234f9a37b5173a62b9012633c3a (refs/remotes/git-svn)
-W: +empty_dir: d/e
-r5 = a1919a118cefeb51f439e3fe8bf166638239275a (refs/remotes/git-svn)
-W: +empty_dir: d/e/f
-r6 = 2ff53a5fe32c29815b0c05fdcac4c7af5fdb8f6f (refs/remotes/git-svn)
-W: +empty_dir: weird file name
-r7 = d67fac3f03d54eb6f4c8f9f346601257ffa4b59e (refs/remotes/git-svn)
-W: +empty_dir: ! !
-r8 = cdf0625df8ba6b3e8e3a3229e645d85c669d23d2 (refs/remotes/git-svn)
-W: +empty_dir: trunk
-r9 = db4b183e85c9033775901333d2f0970f26715577 (refs/remotes/git-svn)
-W: +empty_dir: trunk/a
-r10 = faa73f69024c01c79be801943b064ac6e3359949 (refs/remotes/git-svn)
-W: +empty_dir: trunk/weird file name
-r11 = 56134d3cbc6f879a51096928d7931b0f08f5f001 (refs/remotes/git-svn)
-	D	d
-W: -empty_dir: d
-r12 = e8dac9482693640a3556d620cc8b7aa110cb95ab (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r12
-creating empty directory: ! !
-creating empty directory: a
-creating empty directory: b
-creating empty directory: c
-creating empty directory: trunk
-creating empty directory: trunk/a
-creating empty directory: trunk/weird file name
-creating empty directory: weird file name
-ok 13 - removed top-level directory does not exist
+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 6fcfe37] 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.45.2/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	foo
+Committed r3
+	M	foo
+r3 = 50c1b7d601ddf6c84a4003f80ba0808f0f94c6b6 (refs/remotes/git-svn)
+No changes between 6fcfe37611b8895782855d3f8840443a74fa0ea0 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 9146.14 'git svn gc-ed files work': 
-	(
-		cd removed &&
-		git svn gc &&
-		: Compress::Zlib may not be available &&
-		if test -f "$unhandled".gz
-		then
-			svn_cmd mkdir -m gz "$svnrepo"/gz &&
-			git reset --hard $(git rev-list HEAD | tail -1) &&
-			git svn rebase &&
-			test_path_is_file "$unhandled".gz &&
-			test_path_is_file "$unhandled" &&
-			for i in a b c "weird file name" gz "! !"
-			do
-				test_path_is_dir "$i" || exit 1
-			done
-		fi
-	)
+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 02a58fd] 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.45.2/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	subdir/subdir2/foo_subdir2
+Committed r4
+	M	subdir/subdir2/foo_subdir2
+r4 = 071473003a6153e6881ffbe07da57fb7422d3964 (refs/remotes/git-svn)
+No changes between 02a58fd9c3574ca86e0aaca023e07623e8bcbb4d 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
 
-Committing transaction...
-Committed revision 13.
-HEAD is now at c9e92af mkdir a
-W: +empty_dir: gz
-r13 = 69b049bbad4f754e8a0e961dffc0b6d9f2c0ad98 (refs/remotes/git-svn)
-
                                                                                
Successfully rebased and updated refs/heads/master.
-creating empty directory: gz
-ok 14 - git svn gc-ed files work
+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 f0d0940] 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.45.2/t/trash%20directory.t9148-git-svn-propset/svnrepo ...
+	M	subdir/foo_subdir
+Committed r5
+	M	subdir/foo_subdir
+r5 = 0da99444ace415a78f053229d9ca0993b35186a3 (refs/remotes/git-svn)
+No changes between f0d0940806e8c50cf9214d2ff5ab2b25f4f346ac 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 14 test(s)
-1..14
+# passed all 7 test(s)
+1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9141-git-svn-multiple-branches.sh ***
@@ -517672,95 +516678,95 @@
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9141-git-svn-multiple-branches/git_project/.git/
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo
 	A	a.file
-r1 = fa9d207a4d10eea8e7a00d265d90404b44487aa6 (refs/remotes/origin/trunk)
+r1 = 86437666aed211b29a2233f61cfebb10d9d799c8 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first, 1
-Found branch parent: (refs/remotes/origin/first) fa9d207a4d10eea8e7a00d265d90404b44487aa6
+Found branch parent: (refs/remotes/origin/first) 86437666aed211b29a2233f61cfebb10d9d799c8
 Following parent with do_switch
 Successfully followed parent
-r2 = f0156ec7383888b30e1eeca0c2e58004a5a015fb (refs/remotes/origin/first)
+r2 = 35269097daf6ca1511fa8bd618b9e4c86a83601c (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/1.0, 2
-Found branch parent: (refs/remotes/origin/tags/1.0) fa9d207a4d10eea8e7a00d265d90404b44487aa6
+Found branch parent: (refs/remotes/origin/tags/1.0) 86437666aed211b29a2233f61cfebb10d9d799c8
 Following parent with do_switch
 Successfully followed parent
-r3 = 81247bfe46ff69c6e096765549bf7049d722a1dc (refs/remotes/origin/tags/1.0)
+r3 = c60587ba1b4c0dcf314783b54c433f9c8459d25b (refs/remotes/origin/tags/1.0)
 	M	a.file
-r4 = 0ca9a89f0813ee1a48304f04c8c2f7c190c3554d (refs/remotes/origin/trunk)
+r4 = 3a893d8a16f2f4ccbd2ca21f48c82d17b2cb0e0d (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second, 4
-Found branch parent: (refs/remotes/origin/second) 0ca9a89f0813ee1a48304f04c8c2f7c190c3554d
+Found branch parent: (refs/remotes/origin/second) 3a893d8a16f2f4ccbd2ca21f48c82d17b2cb0e0d
 Following parent with do_switch
 Successfully followed parent
-r5 = 4cb964ba2075e5ef3e196a9738806fcccc5022f6 (refs/remotes/origin/second)
+r5 = 28208d53f8933ef084c98e8fe39a376e8bd20efc (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/2.0, 5
-Found branch parent: (refs/remotes/origin/tags/2.0) 0ca9a89f0813ee1a48304f04c8c2f7c190c3554d
+Found branch parent: (refs/remotes/origin/tags/2.0) 3a893d8a16f2f4ccbd2ca21f48c82d17b2cb0e0d
 Following parent with do_switch
 Successfully followed parent
-r6 = 9d7544b806515f9d9a8e40781008d53458d5e3f2 (refs/remotes/origin/tags/2.0)
+r6 = 8eba5e672a4c575e97fc6f8e632dedf745ee65a3 (refs/remotes/origin/tags/2.0)
 	M	a.file
-r7 = a2efb555ad3b078b6933edcef9e1ef5811bdc47c (refs/remotes/origin/trunk)
+r7 = 68438bfc19784a97a6f014715738ad9382d87d41 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1, 7
-Found branch parent: (refs/remotes/origin/1) a2efb555ad3b078b6933edcef9e1ef5811bdc47c
+Found branch parent: (refs/remotes/origin/1) 68438bfc19784a97a6f014715738ad9382d87d41
 Following parent with do_switch
 Successfully followed parent
-r8 = 64cc2b1ca8a82639a01d700b07116fce6f94fb28 (refs/remotes/origin/1)
+r8 = da453c79db8633f5844744420e134f94a8f79f46 (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/3.0, 8
-Found branch parent: (refs/remotes/origin/tags/3.0) a2efb555ad3b078b6933edcef9e1ef5811bdc47c
+Found branch parent: (refs/remotes/origin/tags/3.0) 68438bfc19784a97a6f014715738ad9382d87d41
 Following parent with do_switch
 Successfully followed parent
-r9 = 2272f20f8eb829a4c4c80bf18c7bd610d63c7a52 (refs/remotes/origin/tags/3.0)
+r9 = 9b748af34df13af01fdec04933c70b1bf6d1083b (refs/remotes/origin/tags/3.0)
 	M	a.file
-r10 = 4d1d18e53946b4d7bb7f63d4d3eb59b7843a8432 (refs/remotes/origin/trunk)
+r10 = 87a3fe7a3a928c7e1f22fa5f17ceaf87d4e21b32 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2, 10
-Found branch parent: (refs/remotes/origin/2) 4d1d18e53946b4d7bb7f63d4d3eb59b7843a8432
+Found branch parent: (refs/remotes/origin/2) 87a3fe7a3a928c7e1f22fa5f17ceaf87d4e21b32
 Following parent with do_switch
 Successfully followed parent
-r11 = 000abc704ae39c06f6ae914a15a902a757d888ee (refs/remotes/origin/2)
+r11 = dca8cf845b585ce6941576335725468d2433966b (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/4.0, 11
-Found branch parent: (refs/remotes/origin/tags/4.0) 4d1d18e53946b4d7bb7f63d4d3eb59b7843a8432
+Found branch parent: (refs/remotes/origin/tags/4.0) 87a3fe7a3a928c7e1f22fa5f17ceaf87d4e21b32
 Following parent with do_switch
 Successfully followed parent
-r12 = 7c65b5bfa5460d9095250e15e2d6996a92fe5a40 (refs/remotes/origin/tags/4.0)
+r12 = 187383eea2ed8eb518080e3fc3b1cc23c30581f3 (refs/remotes/origin/tags/4.0)
 	M	a.file
-r13 = c50879f6ef86733acf0896ddf02ed2f5a27fbaac (refs/remotes/origin/first)
+r13 = 5ef405cd60ba630978f9c78480ab5a96808b67a7 (refs/remotes/origin/first)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/first => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v5, 13
-Found branch parent: (refs/remotes/origin/tags/v5) c50879f6ef86733acf0896ddf02ed2f5a27fbaac
+Found branch parent: (refs/remotes/origin/tags/v5) 5ef405cd60ba630978f9c78480ab5a96808b67a7
 Following parent with do_switch
 Successfully followed parent
-r14 = 14e151104551c95dad5c5fc94d99147842065289 (refs/remotes/origin/tags/v5)
+r14 = 10c08923a15164ac920ce4adaf991382aceded4e (refs/remotes/origin/tags/v5)
 	M	a.file
-r15 = c7233db00a71965e536d3fc69a8363ec4b79c306 (refs/remotes/origin/second)
+r15 = 23e5ee8bd53acfd02384f8d8fd56c34f61d011c4 (refs/remotes/origin/second)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/second => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v6, 15
-Found branch parent: (refs/remotes/origin/tags/v6) c7233db00a71965e536d3fc69a8363ec4b79c306
+Found branch parent: (refs/remotes/origin/tags/v6) 23e5ee8bd53acfd02384f8d8fd56c34f61d011c4
 Following parent with do_switch
 Successfully followed parent
-r16 = 5c41cd64682d72e9048ffb109a50ac88e058e0dc (refs/remotes/origin/tags/v6)
+r16 = 1228eeec5cf40a8aaa8b4b4fbe22e116aadf14d0 (refs/remotes/origin/tags/v6)
 	M	a.file
-r17 = 3139260818f8ea40fc462c2e4c808e55035e0044 (refs/remotes/origin/1)
+r17 = 993a11cda6ed08766fffcf18e89b2aecf12ba6fc (refs/remotes/origin/1)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/1 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v7, 17
-Found branch parent: (refs/remotes/origin/tags/v7) 3139260818f8ea40fc462c2e4c808e55035e0044
+Found branch parent: (refs/remotes/origin/tags/v7) 993a11cda6ed08766fffcf18e89b2aecf12ba6fc
 Following parent with do_switch
 Successfully followed parent
-r18 = 37b920890f4400549238d1e7ed5201b65ec60653 (refs/remotes/origin/tags/v7)
+r18 = c41b2205885d005acc2dd099861124360ecf8868 (refs/remotes/origin/tags/v7)
 	M	a.file
-r19 = 553dd0a7a37e665e8f406a29b684d4fa8c719a17 (refs/remotes/origin/2)
+r19 = cd29b6d62ff0cee290a09cc8f692e415448bc3a7 (refs/remotes/origin/2)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/2 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/v8, 19
-Found branch parent: (refs/remotes/origin/tags/v8) 553dd0a7a37e665e8f406a29b684d4fa8c719a17
+Found branch parent: (refs/remotes/origin/tags/v8) cd29b6d62ff0cee290a09cc8f692e415448bc3a7
 Following parent with do_switch
 Successfully followed parent
-r20 = a67bf5097eb29964f5f422eaaf4ce4db519cd870 (refs/remotes/origin/tags/v8)
+r20 = b4ea939c6e202900399fc16ce17ad1a1b56bc643 (refs/remotes/origin/tags/v8)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk r10
-c50879f6ef86733acf0896ddf02ed2f5a27fbaac
-c7233db00a71965e536d3fc69a8363ec4b79c306
-3139260818f8ea40fc462c2e4c808e55035e0044
-553dd0a7a37e665e8f406a29b684d4fa8c719a17
-81247bfe46ff69c6e096765549bf7049d722a1dc
-9d7544b806515f9d9a8e40781008d53458d5e3f2
-2272f20f8eb829a4c4c80bf18c7bd610d63c7a52
-7c65b5bfa5460d9095250e15e2d6996a92fe5a40
-14e151104551c95dad5c5fc94d99147842065289
-5c41cd64682d72e9048ffb109a50ac88e058e0dc
-37b920890f4400549238d1e7ed5201b65ec60653
-a67bf5097eb29964f5f422eaaf4ce4db519cd870
+5ef405cd60ba630978f9c78480ab5a96808b67a7
+23e5ee8bd53acfd02384f8d8fd56c34f61d011c4
+993a11cda6ed08766fffcf18e89b2aecf12ba6fc
+cd29b6d62ff0cee290a09cc8f692e415448bc3a7
+c60587ba1b4c0dcf314783b54c433f9c8459d25b
+8eba5e672a4c575e97fc6f8e632dedf745ee65a3
+9b748af34df13af01fdec04933c70b1bf6d1083b
+187383eea2ed8eb518080e3fc3b1cc23c30581f3
+10c08923a15164ac920ce4adaf991382aceded4e
+1228eeec5cf40a8aaa8b4b4fbe22e116aadf14d0
+c41b2205885d005acc2dd099861124360ecf8868
+b4ea939c6e202900399fc16ce17ad1a1b56bc643
 ok 2 - clone multiple branch and tag paths
 
 expecting success of 9141.3 'Multiple branch or tag paths require -d': 
@@ -517827,40 +516833,40 @@
 
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_one/New1, 10
-Found branch parent: (refs/remotes/origin/New1) 4d1d18e53946b4d7bb7f63d4d3eb59b7843a8432
+Found branch parent: (refs/remotes/origin/New1) 87a3fe7a3a928c7e1f22fa5f17ceaf87d4e21b32
 Following parent with do_switch
 Successfully followed parent
-r21 = b9bfde4f41cb2e2b08dcd8d3d17c579e4073fd6f (refs/remotes/origin/New1)
+r21 = 78527df9d0376693ad602df7d7553b0775ddade5 (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.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/b_two/New2, 10
-Found branch parent: (refs/remotes/origin/New2) 4d1d18e53946b4d7bb7f63d4d3eb59b7843a8432
+Found branch parent: (refs/remotes/origin/New2) 87a3fe7a3a928c7e1f22fa5f17ceaf87d4e21b32
 Following parent with do_switch
 Successfully followed parent
-r22 = 9774a1937310f5fcc97384528dada3e42079dfda (refs/remotes/origin/New2)
+r22 = a8c4495a921f198baac125b91049eea101e03574 (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.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_A/Tag1, 10
-Found branch parent: (refs/remotes/origin/tags/Tag1) 4d1d18e53946b4d7bb7f63d4d3eb59b7843a8432
+Found branch parent: (refs/remotes/origin/tags/Tag1) 87a3fe7a3a928c7e1f22fa5f17ceaf87d4e21b32
 Following parent with do_switch
 Successfully followed parent
-r23 = ae715fd99a336dfc00b1e960b1310f606ae33568 (refs/remotes/origin/tags/Tag1)
+r23 = 6dc1b098484a160a7b1feeb6f8f68f09df355f86 (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.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk at r10 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9141-git-svn-multiple-branches/svnrepo/project/tags_B/Tag2, 10
-Found branch parent: (refs/remotes/origin/tags/Tag2) 4d1d18e53946b4d7bb7f63d4d3eb59b7843a8432
+Found branch parent: (refs/remotes/origin/tags/Tag2) 87a3fe7a3a928c7e1f22fa5f17ceaf87d4e21b32
 Following parent with do_switch
 Successfully followed parent
-r24 = 39e6c968464f39c8b1fdcbbfbc78948b93e46074 (refs/remotes/origin/tags/Tag2)
+r24 = d70c89a6fb3856091c1e9de8873befe9d2b586f7 (refs/remotes/origin/tags/Tag2)
 Updating '.':
 A    tags_B/Tag2
 A    tags_B/Tag2/a.file
@@ -517871,6 +516877,399 @@
 1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9153-git-svn-rewrite-uuid.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' < '/build/reproducible-path/git-2.45.2/t/t9153/svn.dump' &&
+	git svn init --minimize-url --rewrite-uuid='6cc8ada4-5932-4b4a-8242-3534ed8a3232' 'file:///build/reproducible-path/git-2.45.2/t/trash directory.t9153-git-svn-rewrite-uuid/svnrepo' &&
+	git svn fetch
+	
+	A	foo
+r1 = 4635c28435c689a762d9ad2843c5fb878149903a (refs/remotes/git-svn)
+	M	foo
+r2 = d71123b5602acff9d0d97ee59472f3bd866bf215 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/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.45.2/t/trash%20directory.t9153-git-svn-rewrite-uuid/svnrepo@2 6cc8ada4-5932-4b4a-8242-3534ed8a3232
+git-svn-id: file:///build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9152-svn-empty-dirs-after-gc.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9152-svn-empty-dirs-after-gc/cloned/.git/
+W: +empty_dir: a
+r1 = 7a24d17019a5c1de4f0d7028dd8df1c2fecb6314 (refs/remotes/git-svn)
+W: +empty_dir: b
+r2 = 1efbd2b69268042850c36b8a7c5e20209162c02c (refs/remotes/git-svn)
+W: +empty_dir: c
+r3 = b4923ab6c6da5a3f66eb89424c223c813fe415cd (refs/remotes/git-svn)
+W: +empty_dir: d
+r4 = 3ca689c283c707dde8f7b0dc85954cd5edc5f2d8 (refs/remotes/git-svn)
+W: +empty_dir: d/e
+r5 = 1e6f94f13afe28ca9e73dbf11ab2115b466065fa (refs/remotes/git-svn)
+W: +empty_dir: d/e/f
+r6 = 6094bdfc9a21837a49918e613266a583c6af67a7 (refs/remotes/git-svn)
+W: +empty_dir: weird file name
+r7 = fc1b38a1073cc3720e728e0c3faf7e0c074a4c26 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9146-git-svn-empty-dirs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/.git/
+expecting success of 9146.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 9146.2 'clone': git svn clone "$svnrepo" cloned
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/cloned/.git/
+W: +empty_dir: a
+r1 = e4a71cc40a7bc445c0057eedadfce18fe76c174a (refs/remotes/git-svn)
+W: +empty_dir: b
+r2 = cdd934e445f528b50b9999db4465deca8f76b292 (refs/remotes/git-svn)
+W: +empty_dir: c
+r3 = 8fc1c6f722871e9ae324fdea861fc46f64ec66d2 (refs/remotes/git-svn)
+W: +empty_dir: d
+r4 = 13fc2b5dc37772db43853486d3c47b56f85be718 (refs/remotes/git-svn)
+W: +empty_dir: d/e
+r5 = 967c23a86fab040d3f676400f7e08a44c917d04d (refs/remotes/git-svn)
+W: +empty_dir: d/e/f
+r6 = 579ccc3320704646aa7091380f3e767b149fc494 (refs/remotes/git-svn)
+W: +empty_dir: weird file name
+r7 = a7dcb25368a5d15f438b4ff81685881246ec3a53 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9146-git-svn-empty-dirs/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 9146.3 'empty directories exist': 
+	(
+		cd cloned &&
+		for i in a b c d d/e d/e/f "weird file name"
+		do
+			test_path_is_dir "$i" || exit 1
+		done
+	)
+
+ok 3 - empty directories exist
+
+expecting success of 9146.4 'option automkdirs set to false': 
+	(
+		git svn init "$svnrepo" cloned-no-mkdirs &&
+		cd cloned-no-mkdirs &&
+		git config svn-remote.svn.automkdirs false &&
+		git svn fetch &&
+		for i in a b c d d/e d/e/f "weird file name"
+		do
+			test_path_is_missing "$i" || exit 1
+		done
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/cloned-no-mkdirs/.git/
+W: +empty_dir: a
+r1 = e4a71cc40a7bc445c0057eedadfce18fe76c174a (refs/remotes/git-svn)
+W: +empty_dir: b
+r2 = cdd934e445f528b50b9999db4465deca8f76b292 (refs/remotes/git-svn)
+W: +empty_dir: c
+r3 = 8fc1c6f722871e9ae324fdea861fc46f64ec66d2 (refs/remotes/git-svn)
+W: +empty_dir: d
+r4 = 13fc2b5dc37772db43853486d3c47b56f85be718 (refs/remotes/git-svn)
+W: +empty_dir: d/e
+r5 = 967c23a86fab040d3f676400f7e08a44c917d04d (refs/remotes/git-svn)
+W: +empty_dir: d/e/f
+r6 = 579ccc3320704646aa7091380f3e767b149fc494 (refs/remotes/git-svn)
+W: +empty_dir: weird file name
+r7 = a7dcb25368a5d15f438b4ff81685881246ec3a53 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r7
+ok 4 - option automkdirs set to false
+
+expecting success of 9146.5 'more emptiness': 
+	svn_cmd mkdir -m "bang bang"  "$svnrepo"/"! !"
+
+Committing transaction...
+Committed revision 8.
+ok 5 - more emptiness
+
+expecting success of 9146.6 'git svn rebase creates empty directory': 
+	( cd cloned && git svn rebase ) &&
+	test_path_is_dir cloned/"! !"
+
+W: +empty_dir: ! !
+r8 = 7d9d993e1344e822a4e54af06fdf0e8fb817759f (refs/remotes/git-svn)
+
                                                                                
Successfully rebased and updated refs/heads/master.
+creating empty directory: ! !
+ok 6 - git svn rebase creates empty directory
+
+expecting success of 9146.7 'git svn mkdirs recreates empty directories': 
+	(
+		cd cloned &&
+		rm -r * &&
+		git svn mkdirs &&
+		for i in a b c d d/e d/e/f "weird file name" "! !"
+		do
+			test_path_is_dir "$i" || exit 1
+		done
+	)
+
+creating empty directory: ! !
+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 7 - git svn mkdirs recreates empty directories
+
+expecting success of 9146.8 'git svn mkdirs -r works': 
+	(
+		cd cloned &&
+		rm -r * &&
+		git svn mkdirs -r7 &&
+		for i in a b c d d/e d/e/f "weird file name"
+		do
+			test_path_is_dir "$i" || exit 1
+		done &&
+
+		test_path_is_missing "! !" || exit 1 &&
+
+		git svn mkdirs -r8 &&
+		test_path_is_dir "! !" || exit 1
+	)
+
+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
+creating empty directory: ! !
+ok 8 - git svn mkdirs -r works
+
+expecting success of 9146.9 'initialize trunk': 
+	for i in trunk trunk/a trunk/"weird file name"
+	do
+		svn_cmd mkdir -m "mkdir $i" "$svnrepo"/"$i" || return 1
+	done
+
+Committing transaction...
+Committed revision 9.
+Committing transaction...
+Committed revision 10.
+Committing transaction...
+Committed revision 11.
+ok 9 - initialize trunk
+
+expecting success of 9146.10 'clone trunk': git svn clone -s "$svnrepo" trunk
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/trunk/.git/
+r9 = d7700d3aa332bb63e3cf7dc5046017d9352b17fa (refs/remotes/origin/trunk)
+W: +empty_dir: trunk/a
+r10 = cc52a86ce0a757a7c62ecec6b4f33f5ef652ed4f (refs/remotes/origin/trunk)
+W: +empty_dir: trunk/weird file name
+r11 = c89ac95806d71615fa48d6fb80eed936a9f75df8 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo/trunk r11
+creating empty directory: a
+creating empty directory: weird file name
+ok 10 - clone trunk
+
+expecting success of 9146.11 'empty directories in trunk exist': 
+	(
+		cd trunk &&
+		for i in a "weird file name"
+		do
+			test_path_is_dir "$i" || exit 1
+		done
+	)
+
+ok 11 - empty directories in trunk exist
+
+expecting success of 9146.12 'remove a top-level directory from svn': 
+	svn_cmd rm -m "remove d" "$svnrepo"/d
+
+Committing transaction...
+Committed revision 12.
+ok 12 - remove a top-level directory from svn
+
+expecting success of 9146.13 'removed top-level directory does not exist': 
+	git svn clone "$svnrepo" removed &&
+	test_path_is_missing removed/d
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9146-git-svn-empty-dirs/removed/.git/
+W: +empty_dir: a
+r1 = e4a71cc40a7bc445c0057eedadfce18fe76c174a (refs/remotes/git-svn)
+W: +empty_dir: b
+r2 = cdd934e445f528b50b9999db4465deca8f76b292 (refs/remotes/git-svn)
+W: +empty_dir: c
+r3 = 8fc1c6f722871e9ae324fdea861fc46f64ec66d2 (refs/remotes/git-svn)
+W: +empty_dir: d
+r4 = 13fc2b5dc37772db43853486d3c47b56f85be718 (refs/remotes/git-svn)
+W: +empty_dir: d/e
+r5 = 967c23a86fab040d3f676400f7e08a44c917d04d (refs/remotes/git-svn)
+W: +empty_dir: d/e/f
+r6 = 579ccc3320704646aa7091380f3e767b149fc494 (refs/remotes/git-svn)
+W: +empty_dir: weird file name
+r7 = a7dcb25368a5d15f438b4ff81685881246ec3a53 (refs/remotes/git-svn)
+W: +empty_dir: ! !
+r8 = 7d9d993e1344e822a4e54af06fdf0e8fb817759f (refs/remotes/git-svn)
+W: +empty_dir: trunk
+r9 = a34a1758b999b1608b0a64854f5a71b4e7b19071 (refs/remotes/git-svn)
+W: +empty_dir: trunk/a
+r10 = 5fd785e64321ce25f7a278e29eb8c658c56a1378 (refs/remotes/git-svn)
+W: +empty_dir: trunk/weird file name
+r11 = 058440f722ff8b11bf31fdc79837e96e8f4f80f4 (refs/remotes/git-svn)
+	D	d
+W: -empty_dir: d
+r12 = 469fa4fdc4c66d67fd5916177ff817b594de6e7c (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9146-git-svn-empty-dirs/svnrepo r12
+creating empty directory: ! !
+creating empty directory: a
+creating empty directory: b
+creating empty directory: c
+creating empty directory: trunk
+creating empty directory: trunk/a
+creating empty directory: trunk/weird file name
+creating empty directory: weird file name
+ok 13 - removed top-level directory does not exist
+
+expecting success of 9146.14 'git svn gc-ed files work': 
+	(
+		cd removed &&
+		git svn gc &&
+		: Compress::Zlib may not be available &&
+		if test -f "$unhandled".gz
+		then
+			svn_cmd mkdir -m gz "$svnrepo"/gz &&
+			git reset --hard $(git rev-list HEAD | tail -1) &&
+			git svn rebase &&
+			test_path_is_file "$unhandled".gz &&
+			test_path_is_file "$unhandled" &&
+			for i in a b c "weird file name" gz "! !"
+			do
+				test_path_is_dir "$i" || exit 1
+			done
+		fi
+	)
+
+Committing transaction...
+Committed revision 13.
+HEAD is now at e4a71cc mkdir a
+W: +empty_dir: gz
+r13 = 8263fb3e2de46fcc4ce169a1a942644cbc6fb35a (refs/remotes/git-svn)
+
                                                                                
Successfully rebased and updated refs/heads/master.
+creating empty directory: gz
+ok 14 - git svn gc-ed files work
+
+# passed all 14 test(s)
+1..14
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9155-git-svn-fetch-deleted-tag.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9155-git-svn-fetch-deleted-tag/.git/
 expecting success of 9155.1 'setup svn repo': 
@@ -517940,43 +517339,43 @@
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9155-git-svn-fetch-deleted-tag/git_project/.git/
 	A	subdir/file
-r1 = abec947b70248ca7755f67c8655858692219de6b (refs/remotes/origin/trunk)
-r2 = 6cd9f7afc1c21cd3922df84adb022fa7886fa8c3 (refs/remotes/origin/mybranch)
+r1 = 66c459f971d954a8410e0c8fc7fc07c883c3266a (refs/remotes/origin/trunk)
+r2 = f4531a380dc083f3edc143f73466549c526f384b (refs/remotes/origin/mybranch)
 	A	trunk/subdir/file
-r3 = d131427928631412f297e27923f6ae305a6850e1 (refs/remotes/origin/mybranch)
+r3 = 01e441ba782d9af71456102f1e538cbe1b346bb6 (refs/remotes/origin/mybranch)
 	M	subdir/file
-r4 = c98502e519f2004c3c633b47087dd260d1137734 (refs/remotes/origin/trunk)
+r4 = b0ab19185f0986f9ce45c58a6908ca6b876dff45 (refs/remotes/origin/trunk)
 	M	trunk/subdir/file
-r5 = f94a2fa3a223513a5bc39768f2533a41aae45cce (refs/remotes/origin/mybranch)
+r5 = 8a5e206516aeca9749a3857d2fd6659e93f0debc (refs/remotes/origin/mybranch)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
 Initializing parent: refs/remotes/origin/tags/mytag@5
 	A	file
-r1 = 020740b45ef928184b6c5fe921bc88799df04d92 (refs/remotes/origin/tags/mytag@5)
+r1 = efb261d047adc8d07508c0870ba2410e051002ac (refs/remotes/origin/tags/mytag@5)
 	M	file
-r4 = dca996a7821a55e2e1dd1b002453382970a1c607 (refs/remotes/origin/tags/mytag@5)
-Found branch parent: (refs/remotes/origin/tags/mytag) dca996a7821a55e2e1dd1b002453382970a1c607
+r4 = 8d4ebf3e6a4fe60ef3002bc8791e0f1386285794 (refs/remotes/origin/tags/mytag@5)
+Found branch parent: (refs/remotes/origin/tags/mytag) 8d4ebf3e6a4fe60ef3002bc8791e0f1386285794
 Following parent with do_switch
 Successfully followed parent
-r6 = 85aa1e35137e5879c3686058c0be1a3420ec77a6 (refs/remotes/origin/tags/mytag)
+r6 = 0c73a5dd95753a1334b8681b9c8eab3e22fa0436 (refs/remotes/origin/tags/mytag)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/tags/mytag, 5
 Initializing parent: refs/remotes/origin/tags/mytag@5-
 branch_from: /trunk => /trunk/subdir
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk/subdir => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/branches/mybranch/trunk/subdir, 2
 Initializing parent: refs/remotes/origin/tags/mytag@2
 	A	file
-r1 = 020740b45ef928184b6c5fe921bc88799df04d92 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag@5-) 020740b45ef928184b6c5fe921bc88799df04d92
+r1 = efb261d047adc8d07508c0870ba2410e051002ac (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag@5-) efb261d047adc8d07508c0870ba2410e051002ac
 Following parent with do_switch
 Successfully followed parent
-r3 = 65c5bc3b94cd63309ac73555ab042be0fa3e9908 (refs/remotes/origin/tags/mytag@5-)
+r3 = 937a8cb7c84acfdebc31343d3041923e13d64e8d (refs/remotes/origin/tags/mytag@5-)
 	M	file
-r5 = c385d9fae0a411a3909350622ab52e445f1b0c5f (refs/remotes/origin/tags/mytag@5-)
-Found branch parent: (refs/remotes/origin/tags/mytag) c385d9fae0a411a3909350622ab52e445f1b0c5f
+r5 = 8916c53fa71986a4e28301dbccdb30a9268ddbb7 (refs/remotes/origin/tags/mytag@5-)
+Found branch parent: (refs/remotes/origin/tags/mytag) 8916c53fa71986a4e28301dbccdb30a9268ddbb7
 Index mismatch: 13f9c6ca01f81b94d8eca8eba510eafa2445e890 != 343cf4718d6a013cf33cf3cea8e0dc0a8efa64dc
-rereading c385d9fae0a411a3909350622ab52e445f1b0c5f
+rereading 8916c53fa71986a4e28301dbccdb30a9268ddbb7
 Following parent with do_switch
 Successfully followed parent
-r8 = 223ddec4627b8cbd87916e6488d549d36e265cbb (refs/remotes/origin/tags/mytag)
+r8 = 665649a36e2ce3d8f209c6588fc83516c47e9b57 (refs/remotes/origin/tags/mytag)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9155-git-svn-fetch-deleted-tag/svnrepo/trunk r4
 ok 2 - fetch deleted tags from same revision with checksum error
@@ -518062,45 +517461,45 @@
 	A	subdir1/file
 	A	subdir2/file
 	A	subdir3/file
-r1 = 611991eba117c58969af68b4074ecded982135bb (refs/remotes/origin/trunk)
+r1 = 6a8e2ab44f3edf87bacf01f5aa00e253593988ef (refs/remotes/origin/trunk)
 	M	subdir1/file
 	M	subdir2/file
 	M	subdir3/file
-r2 = 434e61c88401809605253eda3ab986a556434169 (refs/remotes/origin/trunk)
+r2 = 313edfaf7a4d31b9496dac263690dd0122814cb3 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir1 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/tags/mytag, 2
 Initializing parent: refs/remotes/origin/tags/mytag@2
 	A	file
-r1 = a0cadb7e1ea09e865cf11239b8ce9efba92d3002 (refs/remotes/origin/tags/mytag@2)
+r1 = 0a7899b660a63b8932c69a880da867f0f4aae2d5 (refs/remotes/origin/tags/mytag@2)
 	M	file
-r2 = 33f6d25f0f8c63fd98406f6b83e98e8daa434c89 (refs/remotes/origin/tags/mytag@2)
-Found branch parent: (refs/remotes/origin/tags/mytag) 33f6d25f0f8c63fd98406f6b83e98e8daa434c89
+r2 = 8d7f19f5c057fa9ff00534551e7d355215758df0 (refs/remotes/origin/tags/mytag@2)
+Found branch parent: (refs/remotes/origin/tags/mytag) 8d7f19f5c057fa9ff00534551e7d355215758df0
 Following parent with do_switch
 Successfully followed parent
-r3 = e34c26dbbe7609cec9cb51b24922533ba5d92e22 (refs/remotes/origin/tags/mytag)
+r3 = f53412abfe173a4a51094ade0da7e97a83ba9055 (refs/remotes/origin/tags/mytag)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir2 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/tags/mytag, 2
 Initializing parent: refs/remotes/origin/tags/mytag@2-
 	A	file
-r1 = 7afbe23188dbe9aac8799421b7bcc39402e725e5 (refs/remotes/origin/tags/mytag@2-)
+r1 = 612bb5398f660240bf951b876418716169b8324e (refs/remotes/origin/tags/mytag@2-)
 	M	file
-r2 = 4b5911b3dc72b66695ebe015a01bdaf7a2849fba (refs/remotes/origin/tags/mytag@2-)
-Found branch parent: (refs/remotes/origin/tags/mytag) 4b5911b3dc72b66695ebe015a01bdaf7a2849fba
+r2 = d3e4e48be2755dd1630413f31790d31d677b0075 (refs/remotes/origin/tags/mytag@2-)
+Found branch parent: (refs/remotes/origin/tags/mytag) d3e4e48be2755dd1630413f31790d31d677b0075
 Index mismatch: 03a4eca29b077f8b0867e84854a2c6e71eeac380 != 7745dab6988f4d78b3241eec1b66b56c15e67e83
-rereading 4b5911b3dc72b66695ebe015a01bdaf7a2849fba
+rereading d3e4e48be2755dd1630413f31790d31d677b0075
 Following parent with do_switch
 Successfully followed parent
-r5 = c1d6907da115838e26f2eaeebb826997492eba55 (refs/remotes/origin/tags/mytag)
+r5 = 8001d496d0dc7761147b401ecc6d6509b8fc681c (refs/remotes/origin/tags/mytag)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk/subdir3 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/tags/mytag, 2
 Initializing parent: refs/remotes/origin/tags/mytag@2--
 	A	file
-r1 = 21093e17fb7141a1537d2cf3ef0cc8de2ba16ffa (refs/remotes/origin/tags/mytag@2--)
+r1 = cea7477db6dc3d1a9b3dc5b058a353c7d5b36af9 (refs/remotes/origin/tags/mytag@2--)
 	M	file
-r2 = 0c2d27bfffd65d778b5c3e03f2365e9e04db6e57 (refs/remotes/origin/tags/mytag@2--)
-Found branch parent: (refs/remotes/origin/tags/mytag) 0c2d27bfffd65d778b5c3e03f2365e9e04db6e57
+r2 = 36394c4f0681c17670f0ac5bdc0e03a54dc88d70 (refs/remotes/origin/tags/mytag@2--)
+Found branch parent: (refs/remotes/origin/tags/mytag) 36394c4f0681c17670f0ac5bdc0e03a54dc88d70
 Index mismatch: de577018db9919b0130637aa9ac28b5dabe70913 != 03a4eca29b077f8b0867e84854a2c6e71eeac380
-rereading 0c2d27bfffd65d778b5c3e03f2365e9e04db6e57
+rereading 36394c4f0681c17670f0ac5bdc0e03a54dc88d70
 Following parent with do_switch
 Successfully followed parent
-r7 = 14f0f008f4e4c657e9864b6b343f4b684651d83a (refs/remotes/origin/tags/mytag)
+r7 = b115777ad6e28c1d5fef9d53b5e7738e904ff873 (refs/remotes/origin/tags/mytag)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9156-git-svn-fetch-deleted-tag-2/svnrepo/trunk r2
 ok 2 - fetch deleted tags from same revision with no checksum error
@@ -518322,40 +517721,40 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = a2cf1f930b55a10eecc924a4fdbf8895a3741b27 (refs/remotes/origin/trunk)
+r1 = 754a8ee594706cecaee0ed65a85c341b815f8a49 (refs/remotes/origin/trunk)
 	A	foo
-r3 = 69a5210ca46d883a5708d94fcd8a2ca71dff2b3f (refs/remotes/origin/trunk)
+r3 = 378a7e465856886b180edb5b738424b40f8532eb (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 69a5210ca46d883a5708d94fcd8a2ca71dff2b3f
+Found branch parent: (refs/remotes/origin/branch1) 378a7e465856886b180edb5b738424b40f8532eb
 Following parent with do_switch
 Successfully followed parent
-r4 = 6aac982089056945d3b39ca8738e363506838725 (refs/remotes/origin/branch1)
+r4 = 42ec61148aa37ef512d6508e1cfc6d2b5ff59fff (refs/remotes/origin/branch1)
 	A	bar
-r5 = 939f661fae2f295ed28800a3208950717ef9f8ed (refs/remotes/origin/trunk)
+r5 = 84552fdae74fda86113085a49756a6f77a3f7d86 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) 939f661fae2f295ed28800a3208950717ef9f8ed
+Found branch parent: (refs/remotes/origin/branch2) 84552fdae74fda86113085a49756a6f77a3f7d86
 Following parent with do_switch
 Successfully followed parent
-r6 = 6b3094d85f4bfdd27e9c14045ba1e6b7bf1fa7bb (refs/remotes/origin/branch2)
+r6 = 2826958289f02b7e1e6e37f8d11803b77772d7a5 (refs/remotes/origin/branch2)
 	A	baz
-r7 = cadbd611f6d4552726a0cce2a84f6767bd0ae1cf (refs/remotes/origin/branch1)
+r7 = dd2c453bfb1fb13fbbe701e3339a49ffbd25455e (refs/remotes/origin/branch1)
 	A	baz
 Checking svn:mergeinfo changes since r5: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-7): cadbd611f6d4552726a0cce2a84f6767bd0ae1cf
-r8 = a302eba9b00dfc3be842dbd27e7a746089b0eb2d (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-7): dd2c453bfb1fb13fbbe701e3339a49ffbd25455e
+r8 = f8714da499015b7a3a8da9002c1a6feabc2d15b0 (refs/remotes/origin/trunk)
 	A	baz
 Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-8): cadbd611f6d4552726a0cce2a84f6767bd0ae1cf
-r9 = 6bd595eca942b70e3b281dffb31b5625cac2d6bb (refs/remotes/origin/branch2)
+Found merge parent (/branches/branch1:4-8): dd2c453bfb1fb13fbbe701e3339a49ffbd25455e
+r9 = 90fbdf0707008f72b88399b97aa832017f137757 (refs/remotes/origin/branch2)
 Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
-Found merge parent (/branches/branch2:6-9): 6bd595eca942b70e3b281dffb31b5625cac2d6bb
-r10 = 7ed8055bf31f5c5d77cd5846c6c610be6ac181da (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch2:6-9): 90fbdf0707008f72b88399b97aa832017f137757
+r10 = 2865fbf69653ca24f3f1bf419863af496fcc62e7 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9157-git-svn-fetch-merge/svnrepo/trunk r10
 ok 2 - clone svn repo
 
 expecting success of 9157.3 'verify merge commit': git rev-parse HEAD^2
-6bd595eca942b70e3b281dffb31b5625cac2d6bb
+90fbdf0707008f72b88399b97aa832017f137757
 ok 3 - verify merge commit
 
 # passed all 3 test(s)
@@ -518389,9 +517788,9 @@
 	git svn init "$svnrepo"/trunk &&
 	git svn fetch
 
-r1 = b9e381f2a1c436833846cfc5ce1bb9f1cb368abc (refs/remotes/git-svn)
+r1 = 730b34b941aba6ac1729264490b201edb97ed206 (refs/remotes/git-svn)
 	A	foo
-r2 = 3e136a503afb4d71336fc01dc8c91ec009d389ce (refs/remotes/git-svn)
+r2 = d1ef9801fff3e164891b0f4bc2e6c809d79e1d92 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk r2
 ok 2 - clone svn repo
@@ -518402,7 +517801,7 @@
 	git commit -m "bar" &&
 	git svn dcommit --mergeinfo="/branches/foo:1-10"
 
-[master 13cd9bb] bar
+[master 829a200] bar
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 bar
@@ -518413,8 +517812,8 @@
 	A	bar
 Checking svn:mergeinfo changes since r2: 1 sources, 1 changed
 Couldn't find revmap for file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/foo
-r3 = 8200eead66136f73e3fe02e9a33e997c66464024 (refs/remotes/git-svn)
-No changes between 13cd9bb697f6bcee843e48d00f3a0da4c2c93cfd and refs/remotes/git-svn
+r3 = 89c5c63f59753b98b1202e3dddb3e5702b1e1826 (refs/remotes/git-svn)
+No changes between 829a200be898823cdcf5d011bd046283fd96171d and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 3 - change svn:mergeinfo
 
@@ -518430,7 +517829,7 @@
 	git commit -m "baz" &&
 	git svn dcommit --mergeinfo="/branches/bar:1-10 /branches/other:3-5,8,10-11"
 
-[master b832d19] baz
+[master f2d775b] baz
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 baz
@@ -518442,8 +517841,8 @@
 Checking svn:mergeinfo changes since r3: 2 sources, 2 changed
 Couldn't find revmap for file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/bar
 Couldn't find revmap for file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9158-git-svn-mergeinfo/svnrepo/trunk/branches/other
-r4 = d75a102e26238de1744223b20033a962f61f9c56 (refs/remotes/git-svn)
-No changes between b832d19338ddb0a52d7bfe51ec4028be09fca24a and refs/remotes/git-svn
+r4 = b1eab0b07e48b688500de15e2bd0979c943cae07 (refs/remotes/git-svn)
+No changes between f2d775b22c98f4f1719052ae7f753ed9a580c589 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 5 - change svn:mergeinfo multiline
 
@@ -518458,111 +517857,6 @@
 1..6
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9159-git-svn-no-parent-mergeinfo.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9159-git-svn-no-parent-mergeinfo/.git/
-expecting success of 9159.1 'test handling of root commits in merge ranges': 
-	mkdir -p init/trunk init/branches init/tags &&
-	echo "r1" > init/trunk/file.txt &&
-	svn_cmd import -m "initial import" init "$svnrepo" &&
-	svn_cmd co "$svnrepo" tmp &&
-	(
-		cd tmp &&
-		echo "r2" > trunk/file.txt &&
-		svn_cmd commit -m "Modify file.txt on trunk" &&
-		svn_cmd cp trunk@1 branches/a &&
-		svn_cmd commit -m "Create branch a from trunk r1" &&
-		svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
-		svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
-		mkdir branches/b &&
-		echo "r5" > branches/b/file2.txt &&
-		svn_cmd add branches/b &&
-		svn_cmd commit -m "Create branch b from thin air" &&
-		echo "r6" > branches/b/file2.txt &&
-		svn_cmd commit -m "Modify file2.txt on branch b" &&
-		svn_cmd cp branches/b@5 branches/c &&
-		svn_cmd commit -m "Create branch c from branch b r5" &&
-		svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
-		svn_cmd commit -m "Fake merge of branch b r6 into branch c"
-	) &&
-	git svn init -s "$svnrepo" &&
-	git svn fetch
-	
-Adding         init/branches
-Adding         init/tags
-Adding         init/trunk
-Adding         init/trunk/file.txt
-Committing transaction...
-Committed revision 1.
-A    tmp/branches
-A    tmp/tags
-A    tmp/trunk
-A    tmp/trunk/file.txt
-Checked out revision 1.
-Sending        trunk/file.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-A         branches/a
-A         branches/a/file.txt
-Adding         branches/a
-Committing transaction...
-Committed revision 3.
-property 'svn:mergeinfo' set on 'branches/a'
-Sending        branches/a
-Committing transaction...
-Committed revision 4.
-A         branches/b
-A         branches/b/file2.txt
-Adding         branches/b
-Adding         branches/b/file2.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 5.
-Sending        branches/b/file2.txt
-Transmitting file data .done
-Committing transaction...
-Committed revision 6.
-A         branches/c
-A         branches/c/file2.txt
-Adding         branches/c
-Committing transaction...
-Committed revision 7.
-property 'svn:mergeinfo' set on 'branches/c'
-Sending        branches/c
-Committing transaction...
-Committed revision 8.
-	A	file.txt
-r1 = 2a221c5be6a720ef79e6f663cf2b6e6d62c84453 (refs/remotes/origin/trunk)
-	M	file.txt
-r2 = c0c7b14f3ebbdeaf26770297e5ef403a44bb922c (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
-Found branch parent: (refs/remotes/origin/a) 2a221c5be6a720ef79e6f663cf2b6e6d62c84453
-Following parent with do_switch
-Successfully followed parent
-r3 = 3402efdda31f6d41273ea692fa16f65717bf03c4 (refs/remotes/origin/a)
-Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
-Found merge parent (/trunk:1-2): c0c7b14f3ebbdeaf26770297e5ef403a44bb922c
-r4 = bfae9a8e2f83e8c400bf506d304c7adb86ba0411 (refs/remotes/origin/a)
-	A	file2.txt
-r5 = 170945aa485fe1f8fe771dd447049149181efa2a (refs/remotes/origin/b)
-	M	file2.txt
-r6 = 04e0ef06c7ccd19712668eb800ed183bc3266f87 (refs/remotes/origin/b)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
-Found branch parent: (refs/remotes/origin/c) 170945aa485fe1f8fe771dd447049149181efa2a
-Following parent with do_switch
-Successfully followed parent
-r7 = 4bc997aef02c307e46ef4e16a129935bf6e8493e (refs/remotes/origin/c)
-Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/branches/b:5-6): 04e0ef06c7ccd19712668eb800ed183bc3266f87
-r8 = a795a478138b6db39065920e7b2c663a37c4c53c (refs/remotes/origin/c)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk r2
-ok 1 - test handling of root commits in merge ranges
-
-# passed all 1 test(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9151-svn-mergeinfo.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9151-svn-mergeinfo/.git/
 expecting success of 9151.1 'load svn dump': 
@@ -518798,6 +518092,111 @@
 1..7
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9159-git-svn-no-parent-mergeinfo.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9159-git-svn-no-parent-mergeinfo/.git/
+expecting success of 9159.1 'test handling of root commits in merge ranges': 
+	mkdir -p init/trunk init/branches init/tags &&
+	echo "r1" > init/trunk/file.txt &&
+	svn_cmd import -m "initial import" init "$svnrepo" &&
+	svn_cmd co "$svnrepo" tmp &&
+	(
+		cd tmp &&
+		echo "r2" > trunk/file.txt &&
+		svn_cmd commit -m "Modify file.txt on trunk" &&
+		svn_cmd cp trunk@1 branches/a &&
+		svn_cmd commit -m "Create branch a from trunk r1" &&
+		svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
+		svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
+		mkdir branches/b &&
+		echo "r5" > branches/b/file2.txt &&
+		svn_cmd add branches/b &&
+		svn_cmd commit -m "Create branch b from thin air" &&
+		echo "r6" > branches/b/file2.txt &&
+		svn_cmd commit -m "Modify file2.txt on branch b" &&
+		svn_cmd cp branches/b@5 branches/c &&
+		svn_cmd commit -m "Create branch c from branch b r5" &&
+		svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
+		svn_cmd commit -m "Fake merge of branch b r6 into branch c"
+	) &&
+	git svn init -s "$svnrepo" &&
+	git svn fetch
+	
+Adding         init/branches
+Adding         init/tags
+Adding         init/trunk
+Adding         init/trunk/file.txt
+Committing transaction...
+Committed revision 1.
+A    tmp/branches
+A    tmp/tags
+A    tmp/trunk
+A    tmp/trunk/file.txt
+Checked out revision 1.
+Sending        trunk/file.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 2.
+A         branches/a
+A         branches/a/file.txt
+Adding         branches/a
+Committing transaction...
+Committed revision 3.
+property 'svn:mergeinfo' set on 'branches/a'
+Sending        branches/a
+Committing transaction...
+Committed revision 4.
+A         branches/b
+A         branches/b/file2.txt
+Adding         branches/b
+Adding         branches/b/file2.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 5.
+Sending        branches/b/file2.txt
+Transmitting file data .done
+Committing transaction...
+Committed revision 6.
+A         branches/c
+A         branches/c/file2.txt
+Adding         branches/c
+Committing transaction...
+Committed revision 7.
+property 'svn:mergeinfo' set on 'branches/c'
+Sending        branches/c
+Committing transaction...
+Committed revision 8.
+	A	file.txt
+r1 = 518728b3ee4b39e78c6c552cfd1c5bdf5ab91c91 (refs/remotes/origin/trunk)
+	M	file.txt
+r2 = 55e21ed8dccad1020bff02b1d4fc8e80c74b89c2 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/a, 1
+Found branch parent: (refs/remotes/origin/a) 518728b3ee4b39e78c6c552cfd1c5bdf5ab91c91
+Following parent with do_switch
+Successfully followed parent
+r3 = 1444b39d9e8895a1b37b1bd555836d04c6f8a61f (refs/remotes/origin/a)
+Checking svn:mergeinfo changes since r3: 1 sources, 1 changed
+Found merge parent (/trunk:1-2): 55e21ed8dccad1020bff02b1d4fc8e80c74b89c2
+r4 = 68182decab56b0baf5b1f85ecc0c0f36d1dc0de7 (refs/remotes/origin/a)
+	A	file2.txt
+r5 = fb427c98a666283ad81874c90586dbb24d958cff (refs/remotes/origin/b)
+	M	file2.txt
+r6 = 0cd27122da7497c409c658135f5eab452bc1dc0d (refs/remotes/origin/b)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/b => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/branches/c, 5
+Found branch parent: (refs/remotes/origin/c) fb427c98a666283ad81874c90586dbb24d958cff
+Following parent with do_switch
+Successfully followed parent
+r7 = c4879dd0bfc7ad5edc4335bba002e16a55c25f64 (refs/remotes/origin/c)
+Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
+Found merge parent (/branches/b:5-6): 0cd27122da7497c409c658135f5eab452bc1dc0d
+r8 = adb93063b1fe0496d40649f790d2be8a1803d566 (refs/remotes/origin/c)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9159-git-svn-no-parent-mergeinfo/svnrepo/trunk r2
+ok 1 - test handling of root commits in merge ranges
+
+# passed all 1 test(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9160-git-svn-preserve-empty-dirs.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9160-git-svn-preserve-empty-dirs/.git/
 expecting success of 9160.1 'initialize source svn repo containing empty dirs': 
@@ -518849,10 +518248,10 @@
 A         2/file1.txt
 A         2/file2.txt
 A         3
-A         3/a
-A         3/a/file1.txt
 A         3/b
 A         3/b/file1.txt
+A         3/a
+A         3/a/file1.txt
 A         4
 A         5
 A         6
@@ -518915,43 +518314,43 @@
 	git svn clone "$svnrepo"/trunk --preserve-empty-dirs "$GIT_REPO"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 55b03a8212dc8551e9cf1eb1693328de6ec52d97 (refs/remotes/git-svn)
+r1 = 011c73822a87b1efa10fd30a1bd3f15b2a59d5d5 (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = 5e67f643734c52bd8ec693fefe778ee97d8567fa (refs/remotes/git-svn)
+r2 = 3d9e311f6732826a6f2d374eb65c3bb630d267d2 (refs/remotes/git-svn)
 	D	4/.gitignore
 W: -empty_dir: 4/.gitignore
-r3 = 2b5a49f6f09e94142673289737b1cbc2aba26886 (refs/remotes/git-svn)
+r3 = 75b6bc539cc6c4eed1df0dbac52a04731a47b9c0 (refs/remotes/git-svn)
 	D	4/a/.gitignore
 W: -empty_dir: 4/a/.gitignore
-r4 = c6628a5672f2a91367a36584b032cd5ad58d24a9 (refs/remotes/git-svn)
+r4 = de2de0a3cb470c4d46504c3a022d262514972974 (refs/remotes/git-svn)
 	D	4/a/b/.gitignore
 W: -empty_dir: 4/a/b/.gitignore
-r5 = d8b151d0df4e9b2ea9484e3852dd6542db9805e5 (refs/remotes/git-svn)
+r5 = dfed9ccd898a44a8431e04774108978abe702839 (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 = 8c028de20c743edba831a0f86bec9d863d332e27 (refs/remotes/git-svn)
+r6 = 4364b0fdc67de00521327af2c03a33209beb5d24 (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 = 025fcf26e9a91bb79a1d0a61a8d33259a2e3cb0a (refs/remotes/git-svn)
+r7 = ca8442c54c3ae1a7029b7878a4b33b1a9e1051ad (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 = 3bffbfc179c2887e9f12b004b5ed2f4ad7e60701 (refs/remotes/git-svn)
+r8 = 9e3ca5ba42062b56916e362dfd02ddbe74282c2e (refs/remotes/git-svn)
 	D	5/.gitignore
 	A	5/.placeholder
 	D	6/.gitignore
 W: -empty_dir: 5/.gitignore
 W: -empty_dir: 6/.gitignore
-r9 = b5071657c42d1333affa4cbc2fee4f551ed7a840 (refs/remotes/git-svn)
+r9 = 296cbe667db7ce8311f8b696704056d634668fe6 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
 ok 2 - clone svn repo with --preserve-empty-dirs
@@ -519001,7 +518400,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 025fcf2 delete non-last entry in directory
+HEAD is now at ca8442c 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': 
@@ -519012,47 +518411,47 @@
 	test $(find "$GIT_REPO" -type f -name ".placeholder" | wc -l) = "5"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9160-git-svn-preserve-empty-dirs/git-svn-repo/.git/
-r1 = 55b03a8212dc8551e9cf1eb1693328de6ec52d97 (refs/remotes/git-svn)
+r1 = 011c73822a87b1efa10fd30a1bd3f15b2a59d5d5 (refs/remotes/git-svn)
 	A	2/file1.txt
 	A	2/file2.txt
 	A	3/a/file1.txt
 	A	3/b/file1.txt
-r2 = bbf4ed16fed82bf1882ccddb75e6bb8d75f606bb (refs/remotes/git-svn)
+r2 = c815622cde98e77a7f0859b61bcdcf8bf0ea5e35 (refs/remotes/git-svn)
 	D	4/.placeholder
 W: -empty_dir: 4/.placeholder
-r3 = 2a22edcd308f6cb64edebf419e18d1ac425e9d88 (refs/remotes/git-svn)
+r3 = 2afd1f1f6f7ef2895c986f92f3867727008ea75b (refs/remotes/git-svn)
 	D	4/a/.placeholder
 W: -empty_dir: 4/a/.placeholder
-r4 = 99b3866b6a9b7c3300531a167412314b03783e40 (refs/remotes/git-svn)
+r4 = 57e70b65e12d9d2c836d589925d5ee90d607c453 (refs/remotes/git-svn)
 	D	4/a/b/.placeholder
 W: -empty_dir: 4/a/b/.placeholder
-r5 = 51a927fd7c874a5542ffb8b6fd41b54b04acf216 (refs/remotes/git-svn)
+r5 = a9aabfa3cf9ad1301d180a6761a5105856db32ef (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 = 03b4f151839f9d544b719d6fe514cd495d8fdbee (refs/remotes/git-svn)
+r6 = e5d9ca8b99f3a3742b9ccb5296bc0608897b62ff (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 = 0eff4d08098edad6ed394f4d7b0af00d985684d5 (refs/remotes/git-svn)
+r7 = 539190d20c0e825eb844a09bf06792b88a1c2586 (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 = 452f14a29bcc09192f88fe56a1bcfb00b2119251 (refs/remotes/git-svn)
+r8 = 229d096a7c19042678e4c1d9e16a1b914cc2175e (refs/remotes/git-svn)
 	A	5/.placeholder
 	D	6/.placeholder
-r9 = 5b71ed8e91fedad75ab76d2a815d662ef547a5ce (refs/remotes/git-svn)
+r9 = 9fb2e32e82bbf559dfcb35077779ce8a5cd5eff8 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9160-git-svn-preserve-empty-dirs/svnrepo/trunk r9
-git-svn-repo/5/.placeholder
-git-svn-repo/2/.placeholder
 git-svn-repo/6/.placeholder/.placeholder
 git-svn-repo/3/.placeholder
 git-svn-repo/1/.placeholder
+git-svn-repo/2/.placeholder
+git-svn-repo/5/.placeholder
 ok 7 - clone svn repo with --placeholder-file specified
 
 expecting success of 9160.8 'placeholder namespace conflict with file': 
@@ -519109,7 +518508,7 @@
 	A	1/file1.txt
 	A	5/file1.txt
 W: -empty_dir: 1/.placeholder
-r10 = 663d9a6309629d0c504f30812a017dd0ea693879 (refs/remotes/git-svn)
+r10 = 41936b706e0a10f544a39849484ceee13a267cf9 (refs/remotes/git-svn)
 
                                                                                
Successfully rebased and updated refs/heads/master.
 ok 10 - second set of svn commits and rebase
 
@@ -519133,37 +518532,29 @@
 1..12
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9165-git-svn-fetch-merge-branch-of-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9165-git-svn-fetch-merge-branch-of-branch/.git/
-expecting success of 9165.1 'initialize source svn repo': 
-	svn_cmd mkdir -m x "$svnrepo"/trunk &&
-	svn_cmd mkdir -m x "$svnrepo"/branches &&
+*** t9163-git-svn-reset-clears-caches.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 "initial commit" &&
+		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 branch1 &&
-		svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 &&
-		svn_cmd switch "$svnrepo"/branches/branch2 &&
+		svn_cmd commit -m b &&
+		svn_cmd switch "$svnrepo"/trunk &&
 		touch baz &&
 		svn_cmd add baz &&
-		svn_cmd commit -m branch2 &&
-		svn_cmd switch "$svnrepo"/trunk &&
-		touch bar2 &&
-		svn_cmd add bar2 &&
-		svn_cmd commit -m trunk &&
-		svn_cmd switch "$svnrepo"/branches/branch2 &&
-		svn_cmd merge "$svnrepo"/trunk &&
-		svn_cmd commit -m "merge trunk" &&
-		svn_cmd switch "$svnrepo"/trunk &&
-		svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
-		svn_cmd commit -m "merge branch2"
+		svn_cmd commit -m c &&
+		svn_cmd up &&
+		svn_cmd merge "$svnrepo"/branches/branch1 &&
+		svn_cmd commit -m "m"
 	) &&
 	rm -rf "$SVN_TREE"
 
@@ -519185,100 +518576,77 @@
 Transmitting file data .done
 Committing transaction...
 Committed revision 5.
-Committing transaction...
-Committed revision 6.
-At revision 6.
+D    bar
+Updated to revision 5.
 A         baz
 Adding         baz
 Transmitting file data .done
 Committing transaction...
-Committed revision 7.
-D    baz
-D    bar
-Updated to revision 7.
-A         bar2
-Adding         bar2
-Transmitting file data .done
-Committing transaction...
-Committed revision 8.
-D    bar2
-A    bar
-A    baz
-Updated to revision 8.
---- Merging r4 through r8 into '.':
-A    bar2
---- Recording mergeinfo for merge of r4 through r8 into '.':
- U   .
-Sending        .
-Adding         bar2
-Committing transaction...
-Committed revision 9.
-D    baz
-D    bar
- U   .
-Updated to revision 9.
---- Merging differences between repository URLs into '.':
+Committed revision 6.
+Updating '.':
+At revision 6.
+--- Merging r4 through r6 into '.':
 A    bar
-A    baz
---- Recording mergeinfo for merge between repository URLs into '.':
+--- Recording mergeinfo for merge of r4 through r6 into '.':
  U   .
 Sending        .
 Adding         bar
-Adding         baz
 Committing transaction...
-Committed revision 10.
+Committed revision 7.
 ok 1 - initialize source svn repo
 
-expecting success of 9165.2 'clone svn repo': 
+expecting success of 9163.2 'fetch to merge-base (a)': 
 	git svn init -s "$svnrepo" &&
-	git svn fetch
+	git svn fetch --revision BASE:3
 
-r1 = eba5c7e5705f0b429ac96161c69afb58279806ce (refs/remotes/origin/trunk)
+r1 = 8a97184286a36b94ab8285570ca770401db7c85e (refs/remotes/origin/trunk)
 	A	foo
-r3 = 869c90ecad3a9991d36d76707f09498f81836a5a (refs/remotes/origin/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 869c90ecad3a9991d36d76707f09498f81836a5a
-Following parent with do_switch
-Successfully followed parent
-r4 = 7fb553f8de141183a6c3a162cc23198f896aab91 (refs/remotes/origin/branch1)
+r3 = fa3629464299001e845beb383d04fa6ec1a79f6c (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/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 = 387fb0bab0ff0d756cc0f9b10cbb56f18d4d983c (refs/remotes/origin/trunk)
 	A	bar
-r5 = fe56d47cefa3db1baa42eefac44946c3d1474802 (refs/remotes/origin/branch1)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) fe56d47cefa3db1baa42eefac44946c3d1474802
+Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
+Couldn't find revmap for file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
+r7 = 7ad233e65c3b0a7c535213ba62b906f90c31df76 (refs/remotes/origin/trunk)
+
                                                                                
Successfully rebased and updated refs/heads/main.
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
+Found branch parent: (refs/remotes/origin/branch1) fa3629464299001e845beb383d04fa6ec1a79f6c
 Following parent with do_switch
 Successfully followed parent
-r6 = c1d02ddf9973675e552205fc77e8ef71a87de171 (refs/remotes/origin/branch2)
-	A	baz
-r7 = 67d9764c0464a3994fa15c5121b32638e80197f1 (refs/remotes/origin/branch2)
-	A	bar2
-r8 = 40c403cbf10c1cbaee25b6727f46d31563987566 (refs/remotes/origin/trunk)
-	A	bar2
-Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
-Found merge parent (/trunk:4-8): 40c403cbf10c1cbaee25b6727f46d31563987566
-r9 = 32fc0f958708c6bb0f9d37458b311886eb5fe080 (refs/remotes/origin/branch2)
+r4 = 16ba420702a00ec4b475bd0a85118372716d3bd4 (refs/remotes/origin/branch1)
 	A	bar
-	A	baz
-Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
-Found merge parent (/branches/branch1:4-5): fe56d47cefa3db1baa42eefac44946c3d1474802
-Found merge parent (/branches/branch2:6-9): 32fc0f958708c6bb0f9d37458b311886eb5fe080
-r10 = bf96c8e28889f33f4f91cea0c994518de0ea67ae (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk r10
-ok 2 - clone svn repo
+r5 = 27720466a20a8d5fa2d75ad0bb98e1b42c1390ea (refs/remotes/origin/branch1)
+ok 3 - rebase looses SVN merge (m)
 
-expecting success of 9165.3 'verify merge commit': x=$(git rev-parse HEAD^2) &&
-	y=$(git rev-parse origin/branch2) &&
-	test "x$x" = "x$y"
+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)
 
-ok 3 - verify merge commit
+r3 = fa3629464299001e845beb383d04fa6ec1a79f6c (refs/remotes/origin/trunk)
+HEAD is now at fa36294 a
+Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
+rereading fa3629464299001e845beb383d04fa6ec1a79f6c
+	A	baz
+r6 = 387fb0bab0ff0d756cc0f9b10cbb56f18d4d983c (refs/remotes/origin/trunk)
+	A	bar
+Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
+Found merge parent (/branches/branch1:4-6): 27720466a20a8d5fa2d75ad0bb98e1b42c1390ea
+r7 = e14a05c9ec62c2e87dda028d96026c74c6b63131 (refs/remotes/origin/trunk)
+ok 4 - reset and fetch gets the SVN merge (m) correctly
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9167-git-svn-cmd-branch-subproject.sh ***
-skipping test t9167 altogether
-1..0 # SKIP skip all tests in t9167
+# passed all 4 test(s)
+1..4
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9162-git-svn-dcommit-interactive.sh ***
@@ -519293,10 +518661,10 @@
 Committing transaction...
 Committed revision 1.
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9162-git-svn-dcommit-interactive/test-interactive/.git/
-r1 = 0a075f28c3fc08b865ce8cf5db91dad6c5413cff (refs/remotes/git-svn)
+r1 = 8f1d6a9e1f01c1e67fb87fc09f88c117ecc32b39 (refs/remotes/git-svn)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive r1
-[master 8f4ec75] foo: first commit
+[master 7eab959] foo: first commit
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 foo
@@ -519305,8 +518673,8 @@
 	A	foo
 Committed r2
 	A	foo
-r2 = 4b53846c5c2c2e06d178015e0030769558dd7eaf (refs/remotes/git-svn)
-No changes between 8f4ec75208e51193b616cc944fdbeb39f6385215 and refs/remotes/git-svn
+r2 = 9fa4d6d76bb2642bef37ada00403646f9a6fd942 (refs/remotes/git-svn)
+No changes between 7eab95910a7eb72e74ee8ba6c7048631e93873b2 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 1 - initialize repo
 
@@ -519321,30 +518689,30 @@
 		test $(git rev-parse HEAD) = $(git rev-parse remotes/git-svn)
 	)
 	
-[master 02e69e4] change #1
+[master 3c1b084] change #1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master d3767ee] change #2
+[master 54548b3] change #2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 783f3b7] change #3
+[master 2bd044b] 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.45.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 02e69e4bbe8ef9ccd7dffd4d98dfbc1423b0bef8
+commit 3c1b084e0bc270ba8a57c33221c6499de2bd61f5
 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 d3767ee250e500c235507187fba6132a247ae488
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 54548b36b06d4e5b2439dc7166923e8150199e19
 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 783f3b79eb8ec10214b8a5949f734422dfe93094
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 2bd044b1cee5a1dbc5b2924ff5710503ecc6da0d
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
@@ -519353,16 +518721,16 @@
 Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): 	M	foo
 Committed r3
 	M	foo
-r3 = 221f3b1d971e3ac648ddb9e7b1f0753f4f370d6f (refs/remotes/git-svn)
+r3 = 65fc2e51a3107ce494f97e0c33704a804a207b2f (refs/remotes/git-svn)
 	M	foo
 Committed r4
 	M	foo
-r4 = b4c6447667c536cc52ed479a04d806f6863ef1ba (refs/remotes/git-svn)
+r4 = 0bca3b57696e4491e0f5d862e1cfc8b57d0d41e6 (refs/remotes/git-svn)
 	M	foo
 Committed r5
 	M	foo
-r5 = e3518c235af1c75f92affd1c93f99b3a6a8175ae (refs/remotes/git-svn)
-No changes between 783f3b79eb8ec10214b8a5949f734422dfe93094 and refs/remotes/git-svn
+r5 = 319c3b0841cd5ee2c5a8c24cb4f90da54171f7f8 (refs/remotes/git-svn)
+No changes between 2bd044b1cee5a1dbc5b2924ff5710503ecc6da0d and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
 ok 2 - answers: y [\n] yes
 
@@ -519378,36 +518746,36 @@
 		git reset --hard remotes/git-svn
 	)
 	
-[master 1f1737a] change #1
+[master bf94d8d] change #1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 65c7e05] change #2
+[master 89ea86c] change #2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c8c8530] change #3
+[master e2ba254] 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.45.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 1f1737a3eb057ef0192a98f390f8c66533179d1a
+commit bf94d8d796c980bd501880f1245c7fa8e3726457
 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 65c7e056cc98b7eefdd87c532f40bab792031c52
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 89ea86c9d0b472114248d25766f362a627f2b562
 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 c8c85301e1d1b7f5d58b547a0170550029d846c7
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit e2ba2549cbab03af04a4fa3647e466e20eda90c7
 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 e3518c2 change #3
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at 319c3b0 change #3
 ok 3 - answers: yes yes no
 
 expecting success of 9162.4 'answers: yes quit': 
@@ -519421,30 +518789,30 @@
 		git reset --hard remotes/git-svn
 	)
 	
-[master 1f1737a] change #1
+[master bf94d8d] change #1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 65c7e05] change #2
+[master 89ea86c] change #2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c8c8530] change #3
+[master e2ba254] 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.45.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 1f1737a3eb057ef0192a98f390f8c66533179d1a
+commit bf94d8d796c980bd501880f1245c7fa8e3726457
 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 65c7e056cc98b7eefdd87c532f40bab792031c52
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): commit 89ea86c9d0b472114248d25766f362a627f2b562
 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 e3518c2 change #3
+Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): HEAD is now at 319c3b0 change #3
 ok 4 - answers: yes quit
 
 expecting success of 9162.5 'answers: all': 
@@ -519457,18 +518825,18 @@
 		git reset --hard remotes/git-svn
 	)
 	
-[master 1f1737a] change #1
+[master bf94d8d] change #1
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master 65c7e05] change #2
+[master 89ea86c] change #2
  Author: A U Thor <author@example.com>
  1 file changed, 1 insertion(+)
-[master c8c8530] change #3
+[master e2ba254] 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.45.2/t/trash%20directory.t9162-git-svn-dcommit-interactive/svnrepo/test-interactive ...
-commit 1f1737a3eb057ef0192a98f390f8c66533179d1a
+commit bf94d8d796c980bd501880f1245c7fa8e3726457
 Author: A U Thor <author@example.com>
 Date:   Fri Apr 1 13:14:15 2005 +0200
 
@@ -519477,47 +518845,60 @@
 Commit this patch to SVN? ([y]es (default)|[n]o|[q]uit|[a]ll): 	M	foo
 Committed r6
 	M	foo
-r6 = d168bed920b5bc72dac1138123513ca6230b5792 (refs/remotes/git-svn)
+r6 = 14507c99341bf0395076d708b7f538e84bb82886 (refs/remotes/git-svn)
 	M	foo
 Committed r7
 	M	foo
-r7 = 2966fc11f0c30d4a8be8d6454b1b2ade6711ed85 (refs/remotes/git-svn)
+r7 = 4b00e68dcebb8545bea56efeb8a0ae18089094fb (refs/remotes/git-svn)
 	M	foo
 Committed r8
 	M	foo
-r8 = 7df3303122a05e0e0adb74f010ab1ea07b049ad9 (refs/remotes/git-svn)
-No changes between c8c85301e1d1b7f5d58b547a0170550029d846c7 and refs/remotes/git-svn
+r8 = 7b47b85418d767737f04ff1b4c6a2aacc965f293 (refs/remotes/git-svn)
+No changes between e2ba2549cbab03af04a4fa3647e466e20eda90c7 and refs/remotes/git-svn
 Resetting to the latest refs/remotes/git-svn
-HEAD is now at 7df3303 change #3
+HEAD is now at 7b47b85 change #3
 ok 5 - answers: all
 
 # passed all 5 test(s)
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9163-git-svn-reset-clears-caches.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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" &&
+*** 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9165-git-svn-fetch-merge-branch-of-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9165-git-svn-fetch-merge-branch-of-branch/.git/
+expecting success of 9165.1 'initialize source svn repo': 
+	svn_cmd mkdir -m x "$svnrepo"/trunk &&
+	svn_cmd mkdir -m x "$svnrepo"/branches &&
 	svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
 	(
 		cd "$SVN_TREE" &&
 		touch foo &&
 		svn_cmd add foo &&
-		svn_cmd commit -m "a" &&
+		svn_cmd commit -m "initial commit" &&
 		svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
 		svn_cmd switch "$svnrepo"/branches/branch1 &&
 		touch bar &&
 		svn_cmd add bar &&
-		svn_cmd commit -m b &&
-		svn_cmd switch "$svnrepo"/trunk &&
+		svn_cmd commit -m branch1 &&
+		svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 &&
+		svn_cmd switch "$svnrepo"/branches/branch2 &&
 		touch baz &&
 		svn_cmd add baz &&
-		svn_cmd commit -m c &&
-		svn_cmd up &&
-		svn_cmd merge "$svnrepo"/branches/branch1 &&
-		svn_cmd commit -m "m"
+		svn_cmd commit -m branch2 &&
+		svn_cmd switch "$svnrepo"/trunk &&
+		touch bar2 &&
+		svn_cmd add bar2 &&
+		svn_cmd commit -m trunk &&
+		svn_cmd switch "$svnrepo"/branches/branch2 &&
+		svn_cmd merge "$svnrepo"/trunk &&
+		svn_cmd commit -m "merge trunk" &&
+		svn_cmd switch "$svnrepo"/trunk &&
+		svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
+		svn_cmd commit -m "merge branch2"
 	) &&
 	rm -rf "$SVN_TREE"
 
@@ -519539,121 +518920,95 @@
 Transmitting file data .done
 Committing transaction...
 Committed revision 5.
-D    bar
-Updated to revision 5.
+Committing transaction...
+Committed revision 6.
+At revision 6.
 A         baz
 Adding         baz
 Transmitting file data .done
 Committing transaction...
-Committed revision 6.
-Updating '.':
-At revision 6.
---- Merging r4 through r6 into '.':
+Committed revision 7.
+D    baz
+D    bar
+Updated to revision 7.
+A         bar2
+Adding         bar2
+Transmitting file data .done
+Committing transaction...
+Committed revision 8.
+D    bar2
 A    bar
---- Recording mergeinfo for merge of r4 through r6 into '.':
+A    baz
+Updated to revision 8.
+--- Merging r4 through r8 into '.':
+A    bar2
+--- Recording mergeinfo for merge of r4 through r8 into '.':
+ U   .
+Sending        .
+Adding         bar2
+Committing transaction...
+Committed revision 9.
+D    bar
+D    baz
+ U   .
+Updated to revision 9.
+--- Merging differences between repository URLs into '.':
+A    bar
+A    baz
+--- Recording mergeinfo for merge between repository URLs into '.':
  U   .
 Sending        .
 Adding         bar
+Adding         baz
 Committing transaction...
-Committed revision 7.
+Committed revision 10.
 ok 1 - initialize source svn repo
 
-expecting success of 9163.2 'fetch to merge-base (a)': 
+expecting success of 9165.2 'clone svn repo': 
 	git svn init -s "$svnrepo" &&
-	git svn fetch --revision BASE:3
+	git svn fetch
 
-r1 = 0f3fecb17a076ff047ec9424de0422e7558dddb6 (refs/remotes/origin/trunk)
+r1 = a60bfb4f7b14673817907c13e83276684fa71ba2 (refs/remotes/origin/trunk)
 	A	foo
-r3 = aefad41fb5c4817b84ecf09bf8a5b8bfe360c9a6 (refs/remotes/origin/trunk)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/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 = c7da687e7d6407f5adebd427b73d4cac072ed40e (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.45.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1
-r7 = 9829ca326fa37d6d56561cda4df05690f855b925 (refs/remotes/origin/trunk)
-
                                                                                
Successfully rebased and updated refs/heads/main.
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9163-git-svn-reset-clears-caches/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) aefad41fb5c4817b84ecf09bf8a5b8bfe360c9a6
+r3 = a4cc9fe48f075c2a17ad27344fc8b0d6aad366a7 (refs/remotes/origin/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1, 3
+Found branch parent: (refs/remotes/origin/branch1) a4cc9fe48f075c2a17ad27344fc8b0d6aad366a7
 Following parent with do_switch
 Successfully followed parent
-r4 = 233455473c6f42a4c69942370cdfac10a4f604af (refs/remotes/origin/branch1)
+r4 = d7a76f4d073c64d656953c348c1e67cb6a17dc0f (refs/remotes/origin/branch1)
 	A	bar
-r5 = 4b7455b1ace6bd41b039c5f6b8e4a684e41b3f6f (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 = aefad41fb5c4817b84ecf09bf8a5b8bfe360c9a6 (refs/remotes/origin/trunk)
-HEAD is now at aefad41 a
-Index mismatch: 4d5fcadc293a348e88f777dc0920f11e7d71441c != 4e126a1a1821dd5763468eb219c1ecdb6f7f0fda
-rereading aefad41fb5c4817b84ecf09bf8a5b8bfe360c9a6
+r5 = d8b66cbb531f36609e697a4ef32302958bb769dc (refs/remotes/origin/branch1)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/branches/branch2, 5
+Found branch parent: (refs/remotes/origin/branch2) d8b66cbb531f36609e697a4ef32302958bb769dc
+Following parent with do_switch
+Successfully followed parent
+r6 = ea81db4803bbb874cace7a500c9286a376f70e14 (refs/remotes/origin/branch2)
 	A	baz
-r6 = c7da687e7d6407f5adebd427b73d4cac072ed40e (refs/remotes/origin/trunk)
+r7 = cbaf92753fc488ee95ed2af105b579bcb884186a (refs/remotes/origin/branch2)
+	A	bar2
+r8 = ed8589c28e700b50508fa7c5ebb5a8b3898d8074 (refs/remotes/origin/trunk)
+	A	bar2
+Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
+Found merge parent (/trunk:4-8): ed8589c28e700b50508fa7c5ebb5a8b3898d8074
+r9 = ccb14a72ea5afb1a11acbb2722fd7db53292421c (refs/remotes/origin/branch2)
 	A	bar
-Checking svn:mergeinfo changes since r6: 1 sources, 1 changed
-Found merge parent (/branches/branch1:4-6): 4b7455b1ace6bd41b039c5f6b8e4a684e41b3f6f
-r7 = 6e8fed34fb4993573e5af7192954ac0e28b154ca (refs/remotes/origin/trunk)
-ok 4 - reset and fetch gets the SVN merge (m) correctly
+	A	baz
+Checking svn:mergeinfo changes since r8: 2 sources, 2 changed
+Found merge parent (/branches/branch1:4-5): d8b66cbb531f36609e697a4ef32302958bb769dc
+Found merge parent (/branches/branch2:6-9): ccb14a72ea5afb1a11acbb2722fd7db53292421c
+r10 = bb17ab2603469cdff90423f8fb095de86a4ab751 (refs/remotes/origin/trunk)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9165-git-svn-fetch-merge-branch-of-branch/svnrepo/trunk r10
+ok 2 - clone svn repo
 
-# passed all 4 test(s)
-1..4
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9169-git-svn-dcommit-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9169-git-svn-dcommit-crlf/.git/
-expecting success of 9169.1 'setup commit repository': 
-	svn_cmd mkdir -m "$test_description" "$svnrepo/dir" &&
-	git svn clone "$svnrepo" work &&
-	(
-		cd work &&
-		echo foo >>foo &&
-		git update-index --add foo &&
-		printf "a\\r\\n\\r\\nb\\r\\nc\\r\\n" >cmt &&
-		p=$(git rev-parse HEAD) &&
-		t=$(git write-tree) &&
-		cmt=$(git commit-tree -p $p $t <cmt) &&
-		git update-ref refs/heads/main $cmt &&
-		git cat-file commit HEAD | tail -n4 >out &&
-		test_cmp cmt out &&
-		git svn dcommit &&
-		printf "a\\n\\nb\\nc\\n" >exp &&
-		git cat-file commit HEAD | sed -ne 6,9p >out &&
-		test_cmp exp out
-	)
+expecting success of 9165.3 'verify merge commit': x=$(git rev-parse HEAD^2) &&
+	y=$(git rev-parse origin/branch2) &&
+	test "x$x" = "x$y"
 
-Committing transaction...
-Committed revision 1.
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
-W: +empty_dir: dir
-r1 = 24bd3b8ac0f84dbb357a2b501b64d25d837c9fb7 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo r1
-creating empty directory: dir
-Duplicate specification "id|i=s" for option "i"
-Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo ...
-	A	foo
-Committed r2
-	A	foo
-r2 = 4c966dcada7c491ec6ae7bc083f369d1aadf0dfc (refs/remotes/git-svn)
-No changes between 6579b2d284e7d976c98a6bc7190cf0243bd85dd4 and refs/remotes/git-svn
-Resetting to the latest refs/remotes/git-svn
-ok 1 - setup commit repository
+ok 3 - verify merge commit
 
-# passed all 1 test(s)
-1..1
+# passed all 3 test(s)
+1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9166-git-svn-fetch-merge-branch-of-branch2.sh ***
@@ -519728,29 +519083,29 @@
 	git svn init -s "$svnrepo" &&
 	git svn fetch
 
-r1 = 25d36826d3d8c70367fe4f768a2353a66b7bbd8b (refs/remotes/origin/trunk)
+r1 = 5d05b103a7a9ad0d643e203f6efeda29cdbb1de5 (refs/remotes/origin/trunk)
 	A	foo
-r3 = 6fed1ce4d434e7efb656fac616d96b23d7556a7b (refs/remotes/origin/trunk)
+r3 = 578c351be8b817236d3e0e209962771d78b821c1 (refs/remotes/origin/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1, 3
-Found branch parent: (refs/remotes/origin/branch1) 6fed1ce4d434e7efb656fac616d96b23d7556a7b
+Found branch parent: (refs/remotes/origin/branch1) 578c351be8b817236d3e0e209962771d78b821c1
 Following parent with do_switch
 Successfully followed parent
-r4 = 30bc3129effe2a2cc4806661793dc65644223035 (refs/remotes/origin/branch1)
+r4 = f134f686ed9ecb12d13c827b91c26764b7899177 (refs/remotes/origin/branch1)
 	A	bar
-r5 = f5fe30a769f03393644a1dfc97bce23387f87f42 (refs/remotes/origin/branch1)
+r5 = b7450de429b61a065b81ec3b7229e9d89f47867e (refs/remotes/origin/branch1)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch1 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/branches/branch2, 5
-Found branch parent: (refs/remotes/origin/branch2) f5fe30a769f03393644a1dfc97bce23387f87f42
+Found branch parent: (refs/remotes/origin/branch2) b7450de429b61a065b81ec3b7229e9d89f47867e
 Following parent with do_switch
 Successfully followed parent
-r6 = ee7ed9d30f840a3174ec0dcf055d78fc60f72b92 (refs/remotes/origin/branch2)
+r6 = 99d268ffae4850ba08c7bc59dc9d0ba130955633 (refs/remotes/origin/branch2)
 	A	baz
-r7 = 8cc2330e0f437714ba826f3131d11d23c8cb0179 (refs/remotes/origin/branch2)
+r7 = 8bd7d6fda3717e6886854c4a6285b729e2eb0047 (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): f5fe30a769f03393644a1dfc97bce23387f87f42
-Found merge parent (/branches/branch2:6-7): 8cc2330e0f437714ba826f3131d11d23c8cb0179
-r8 = b0045bb57b36a500ff2cb29ef5f9abed603bf719 (refs/remotes/origin/trunk)
+Found merge parent (/branches/branch1:4-5): b7450de429b61a065b81ec3b7229e9d89f47867e
+Found merge parent (/branches/branch2:6-7): 8bd7d6fda3717e6886854c4a6285b729e2eb0047
+r8 = 7886abf092790a536ae775f3464c01a06b76fbf8 (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9166-git-svn-fetch-merge-branch-of-branch2/svnrepo/trunk r8
 ok 2 - clone svn repo
@@ -519765,6 +519120,50 @@
 1..3
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9169-git-svn-dcommit-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9169-git-svn-dcommit-crlf/.git/
+expecting success of 9169.1 'setup commit repository': 
+	svn_cmd mkdir -m "$test_description" "$svnrepo/dir" &&
+	git svn clone "$svnrepo" work &&
+	(
+		cd work &&
+		echo foo >>foo &&
+		git update-index --add foo &&
+		printf "a\\r\\n\\r\\nb\\r\\nc\\r\\n" >cmt &&
+		p=$(git rev-parse HEAD) &&
+		t=$(git write-tree) &&
+		cmt=$(git commit-tree -p $p $t <cmt) &&
+		git update-ref refs/heads/main $cmt &&
+		git cat-file commit HEAD | tail -n4 >out &&
+		test_cmp cmt out &&
+		git svn dcommit &&
+		printf "a\\n\\nb\\nc\\n" >exp &&
+		git cat-file commit HEAD | sed -ne 6,9p >out &&
+		test_cmp exp out
+	)
+
+Committing transaction...
+Committed revision 1.
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9169-git-svn-dcommit-crlf/work/.git/
+W: +empty_dir: dir
+r1 = 57d5584ac0908866d4c6b9a567fc4cc20044a073 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo r1
+creating empty directory: dir
+Duplicate specification "id|i=s" for option "i"
+Committing to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9169-git-svn-dcommit-crlf/svnrepo ...
+	A	foo
+Committed r2
+	A	foo
+r2 = 26c62c0336922a36c9d8553b136c7078423e5447 (refs/remotes/git-svn)
+No changes between 71bc18db68f62d998702383086cbf91e21112077 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9161-git-svn-mergeinfo-push.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9161-git-svn-mergeinfo-push/.git/
 expecting success of 9161.1 'load svn dump': 
@@ -519851,7 +519250,7 @@
 	A	b2file
 Checking svn:mergeinfo changes since r7: 1 sources, 1 changed
 Found merge parent (/branches/svnb2:3,8): 6e0c6a3bbe80e2aeab5114620467dd28e33b59aa
-r13 = 1e74f7ae89cdbf1ea4b3c83526a68c56828c9376 (refs/remotes/origin/svnb1)
+r13 = d3c86597e6f376ce99ff4abb2073deec368ff495 (refs/remotes/origin/svnb1)
 No changes between f17a9158396d7027d84d227e0a22fdfafbf33957 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 2 - propagate merge information
@@ -519877,8 +519276,8 @@
 	A	b3file
 Checking svn:mergeinfo changes since r13: 2 sources, 1 changed
 Found merge parent (/branches/svnb3:4,9): 0962ced60e9e8aafa12ed5d71ec600b0f0c24c58
-r14 = 7dd8ac4ac8d30535214c8cef3438fda1f44f23f8 (refs/remotes/origin/svnb1)
-No changes between 31b5dff49f97976494b489c0e23212219631799a and refs/remotes/origin/svnb1
+r14 = 6a3bbe48e763fedc753d3ac0410d2a411d5ff544 (refs/remotes/origin/svnb1)
+No changes between 0c84a9cb6911ecd9aa52b23d01dfc27873e91489 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 4 - merge another branch
 
@@ -519909,8 +519308,8 @@
 Checking svn:mergeinfo changes since r14: 4 sources, 2 changed
 Found merge parent (/branches/svnb4:5-6,10-12): 9ee00d4516038bbf3bd18dd2f2a8c9aac2f7a475
 Found merge parent (/branches/svnb5:6,11): 8b16b29140882196f5422b94cd7264edd71e77c3
-r15 = 9d7eb2a2ac19986013a3d52b06b0aa612a097d39 (refs/remotes/origin/svnb1)
-No changes between c5de8ea0c302108709903b4b9fb4847335aa16f6 and refs/remotes/origin/svnb1
+r15 = 340fde4d3db81969e934da29398d3ab666c6fffe (refs/remotes/origin/svnb1)
+No changes between 6e2a9be7b3d7041b5aec2a855f0024e804038284 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 6 - merge existing merge
 
@@ -519933,7 +519332,7 @@
 	git commit -m "later b2 commit 2" &&
 	git svn dcommit
 	
-Previous HEAD position was 9d7eb2a Merge remote-tracking branch 'origin/svnb4' into HEAD
+Previous HEAD position was 340fde4 Merge remote-tracking branch 'origin/svnb4' into HEAD
 HEAD is now at 6e0c6a3 b2 commit
 [detached HEAD c4fc437] later b2 commit
  Author: A U Thor <author@example.com>
@@ -519948,11 +519347,11 @@
 	A	newb2file
 Committed r16
 	A	newb2file
-r16 = 355cdd7955b72aad1b5ba64badca98da73892323 (refs/remotes/origin/svnb2)
+r16 = bdd0d6322214cf1ddb68170a059ee992430e1168 (refs/remotes/origin/svnb2)
 	A	newb2file-2
 Committed r17
 	A	newb2file-2
-r17 = 563401a605d415a49def9ac2a7e77e0c2754cf90 (refs/remotes/origin/svnb2)
+r17 = 3379fe4f97e95c1f1c38722baa6b3476450cb9a0 (refs/remotes/origin/svnb2)
 No changes between 3f8d65ca7ae29498a7bc2e34054b91d16a8d76f3 and refs/remotes/origin/svnb2
 Resetting to the latest refs/remotes/origin/svnb2
 ok 8 - make further commits to branch
@@ -519962,8 +519361,8 @@
 	git merge --no-ff origin/svnb2 &&
 	git svn dcommit
 	
-Previous HEAD position was 563401a later b2 commit 2
-HEAD is now at 9d7eb2a Merge remote-tracking branch 'origin/svnb4' into HEAD
+Previous HEAD position was 3379fe4 later b2 commit 2
+HEAD is now at 340fde4 Merge remote-tracking branch 'origin/svnb4' into HEAD
 Merge made by the 'ort' strategy.
  newb2file   | 0
  newb2file-2 | 0
@@ -519978,9 +519377,9 @@
 	A	newb2file
 	A	newb2file-2
 Checking svn:mergeinfo changes since r15: 4 sources, 1 changed
-Found merge parent (/branches/svnb2:8,16-17): 563401a605d415a49def9ac2a7e77e0c2754cf90
-r18 = bdfe6ced5828136573d4a1c6280426be9069c105 (refs/remotes/origin/svnb1)
-No changes between 4f6ccc36efd5154766d8cdd1b6b9c7f7da3958e9 and refs/remotes/origin/svnb1
+Found merge parent (/branches/svnb2:8,16-17): 3379fe4f97e95c1f1c38722baa6b3476450cb9a0
+r18 = bdcc5df4dacafd9140a232f61fda1bc2bcd136bc (refs/remotes/origin/svnb1)
+No changes between 479a581912f10f5a52787c28abb1a9d93419fd54 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 9 - second forward merge
 
@@ -519998,7 +519397,7 @@
 	git merge --no-ff origin/svnb1 &&
 	git svn dcommit
 	
-Previous HEAD position was bdfe6ce Merge remote-tracking branch 'origin/svnb2' into HEAD
+Previous HEAD position was bdcc5df Merge remote-tracking branch 'origin/svnb2' into HEAD
 HEAD is now at 9ee00d4 Merge remote-tracking branch 'svnb5' into HEAD
 Merge made by the 'ort' strategy.
  b1file      | 0
@@ -520026,11 +519425,11 @@
 	A	newb2file
 	A	newb2file-2
 Checking svn:mergeinfo changes since r12: 4 sources, 3 changed
-Found merge parent (/branches/svnb1:2-4,7-9,13-18): bdfe6ced5828136573d4a1c6280426be9069c105
-Found merge parent (/branches/svnb2:3,8,16-17): 563401a605d415a49def9ac2a7e77e0c2754cf90
+Found merge parent (/branches/svnb1:2-4,7-9,13-18): bdcc5df4dacafd9140a232f61fda1bc2bcd136bc
+Found merge parent (/branches/svnb2:3,8,16-17): 3379fe4f97e95c1f1c38722baa6b3476450cb9a0
 Found merge parent (/branches/svnb3:4,9): 0962ced60e9e8aafa12ed5d71ec600b0f0c24c58
-r19 = da27fa4b0938b58f5c6c45d276fc9433c8e3ca96 (refs/remotes/origin/svnb4)
-No changes between 7dea2052836f25b7a386753884cd5eb11d6b6ec8 and refs/remotes/origin/svnb4
+r19 = 799dee42520bd0baa70016326a9409e1fc4b8b0d (refs/remotes/origin/svnb4)
+No changes between 02f91d40762b1798ef5bf4fc730b1b71927474b6 and refs/remotes/origin/svnb4
 Resetting to the latest refs/remotes/origin/svnb4
 ok 11 - reintegration merge
 
@@ -520051,9 +519450,9 @@
 	git merge origin/svnb4 &&
 	git svn dcommit
 	
-Previous HEAD position was da27fa4 Merge remote-tracking branch 'origin/svnb1' into HEAD
-HEAD is now at bdfe6ce Merge remote-tracking branch 'origin/svnb2' into HEAD
-[detached HEAD a29539d] a commit
+Previous HEAD position was 799dee4 Merge remote-tracking branch 'origin/svnb1' into HEAD
+HEAD is now at bdcc5df Merge remote-tracking branch 'origin/svnb2' into HEAD
+[detached HEAD 565dadd] a commit
  Author: A U Thor <author@example.com>
  1 file changed, 0 insertions(+), 0 deletions(-)
  create mode 100644 anotherfile
@@ -520063,14 +519462,14 @@
 	A	anotherfile
 Committed r20
 	A	anotherfile
-r20 = 77fe0c81a01c3998ac9d345179c29463ac369ed2 (refs/remotes/origin/svnb1)
+r20 = b1bdff46520eb4e81decfcdf62d26dce192787eb (refs/remotes/origin/svnb1)
 Committed r21
 No changes
-8b881d56aae92d7fb90968aebb583dced2df1caf~1 == 8b881d56aae92d7fb90968aebb583dced2df1caf
+175e713d9dd1990c9779d6f462954e050e057e86~1 == 175e713d9dd1990c9779d6f462954e050e057e86
 Checking svn:mergeinfo changes since r20: 4 sources, 1 changed
-Found merge parent (/branches/svnb4:10-12,19): da27fa4b0938b58f5c6c45d276fc9433c8e3ca96
-r21 = 97b8357d49502b225e3c17bead373692a4668556 (refs/remotes/origin/svnb1)
-No changes between 8b881d56aae92d7fb90968aebb583dced2df1caf and refs/remotes/origin/svnb1
+Found merge parent (/branches/svnb4:10-12,19): 799dee42520bd0baa70016326a9409e1fc4b8b0d
+r21 = 1eacc9ab3fc37fae633299405c8db1a9a9b69f8f (refs/remotes/origin/svnb1)
+No changes between 175e713d9dd1990c9779d6f462954e050e057e86 and refs/remotes/origin/svnb1
 Resetting to the latest refs/remotes/origin/svnb1
 ok 13 - dcommit a merge at the top of a stack
 
@@ -520483,42 +519882,42 @@
  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.45.2/t/trash directory.t9210-scalar/cloned/src': 176.31 GiB (mount flags 0x1000)
-Archive:  /build/reproducible-path/git-2.45.2/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20251218_014102.zip
+Available space on '/build/reproducible-path/git-2.45.2/t/trash directory.t9210-scalar/cloned/src': 177.41 GiB (mount flags 0x1000)
+Archive:  /build/reproducible-path/git-2.45.2/t/trash directory.t9210-scalar/cloned/.scalarDiagnostics/git-diagnostics-20241114_194900.zip
  Length   Method    Size  Cmpr    Date    Time   CRC-32   Name
 --------  ------  ------- ---- ---------- ----- --------  ----
-     373  Defl:N      226  39% 2025-12-18 01:41 e9d19190  diagnostics.log
-    1087  Defl:N      262  76% 2025-12-18 01:41 46d263c2  packs-local.txt
-     198  Defl:N      132  33% 2025-12-18 01:41 fdf5f4b0  objects-local.txt
-      25  Stored       25   0% 2025-12-18 01:41 7ce4afd6  .git/HEAD
-     425  Defl:N      177  58% 2025-12-18 01:41 1b76dce1  .git/FETCH_HEAD
-      57  Defl:N       39  32% 2025-12-18 01:41 795d289e  .git/config.worktree
-    1123  Defl:N      577  49% 2025-12-18 01:41 f00f4473  .git/config
-      73  Defl:N       63  14% 2025-12-18 01:41 1f078b37  .git/description
-     602  Defl:N      416  31% 2025-12-18 01:41 677dc1d2  .git/index
-       6  Stored        6   0% 2025-12-18 01:41 183bc9be  .git/COMMIT_EDITMSG
-    1492  Defl:N      744  50% 2025-12-18 01:41 303613ed  .git/hooks/prepare-commit-msg.sample
-     189  Defl:N      138  27% 2025-12-18 01:41 c0f70c9a  .git/hooks/post-update.sample
-    3650  Defl:N     1173  68% 2025-12-18 01:41 06fcf0d9  .git/hooks/update.sample
-     478  Defl:N      279  42% 2025-12-18 01:41 09f84f85  .git/hooks/applypatch-msg.sample
-    1649  Defl:N      907  45% 2025-12-18 01:41 1b0e50ae  .git/hooks/pre-commit.sample
-    2308  Defl:N      975  58% 2025-12-18 01:41 4b9edd4e  .git/hooks/sendemail-validate.sample
-     544  Defl:N      329  40% 2025-12-18 01:41 96f8c492  .git/hooks/pre-receive.sample
-     416  Defl:N      255  39% 2025-12-18 01:41 5ef33f44  .git/hooks/pre-merge-commit.sample
-    4726  Defl:N     1814  62% 2025-12-18 01:41 793c7cef  .git/hooks/fsmonitor-watchman.sample
-    4898  Defl:N     2015  59% 2025-12-18 01:41 5158ec84  .git/hooks/pre-rebase.sample
-     896  Defl:N      503  44% 2025-12-18 01:41 10caf8e9  .git/hooks/commit-msg.sample
-    2783  Defl:N     1254  55% 2025-12-18 01:41 f00806d3  .git/hooks/push-to-checkout.sample
-    1374  Defl:N      701  49% 2025-12-18 01:41 f90a0f0f  .git/hooks/pre-push.sample
-     424  Defl:N      265  38% 2025-12-18 01:41 024cc0cf  .git/hooks/pre-applypatch.sample
-     240  Defl:N      173  28% 2025-12-18 01:41 21cd3d77  .git/info/exclude
-       8  Stored        8   0% 2025-12-18 01:41 4cc141be  .git/info/sparse-checkout
-     319  Defl:N      164  49% 2025-12-18 01:41 b5b10679  .git/logs/refs/heads/parallel
-     183  Defl:N      131  28% 2025-12-18 01:41 07235502  .git/logs/refs/remotes/origin/parallel
-     323  Defl:N      167  48% 2025-12-18 01:41 df9daca2  .git/logs/refs/remotes/origin/HEAD
-      81  Defl:N       77   5% 2025-12-18 01:41 1476ecd1  .git/objects/info/alternates
+     373  Defl:N      227  39% 2024-11-14 19:49 d1b881cb  diagnostics.log
+    1087  Defl:N      263  76% 2024-11-14 19:49 03f3e267  packs-local.txt
+     198  Defl:N      132  33% 2024-11-14 19:49 76b71d3e  objects-local.txt
+       6  Stored        6   0% 2024-11-14 19:49 183bc9be  .git/COMMIT_EDITMSG
+    1123  Defl:N      577  49% 2024-11-14 19:49 f00f4473  .git/config
+      73  Defl:N       63  14% 2024-11-14 19:49 1f078b37  .git/description
+      57  Defl:N       39  32% 2024-11-14 19:49 795d289e  .git/config.worktree
+      25  Stored       25   0% 2024-11-14 19:49 7ce4afd6  .git/HEAD
+     425  Defl:N      177  58% 2024-11-14 19:49 1b76dce1  .git/FETCH_HEAD
+     602  Defl:N      418  31% 2024-11-14 19:49 c17b8db3  .git/index
+     416  Defl:N      255  39% 2024-11-14 19:49 5ef33f44  .git/hooks/pre-merge-commit.sample
+     544  Defl:N      329  40% 2024-11-14 19:49 96f8c492  .git/hooks/pre-receive.sample
+    2308  Defl:N      975  58% 2024-11-14 19:49 4b9edd4e  .git/hooks/sendemail-validate.sample
+     896  Defl:N      503  44% 2024-11-14 19:49 10caf8e9  .git/hooks/commit-msg.sample
+     478  Defl:N      279  42% 2024-11-14 19:49 09f84f85  .git/hooks/applypatch-msg.sample
+    1374  Defl:N      701  49% 2024-11-14 19:49 f90a0f0f  .git/hooks/pre-push.sample
+    1492  Defl:N      744  50% 2024-11-14 19:49 303613ed  .git/hooks/prepare-commit-msg.sample
+    2783  Defl:N     1254  55% 2024-11-14 19:49 f00806d3  .git/hooks/push-to-checkout.sample
+    1649  Defl:N      907  45% 2024-11-14 19:49 1b0e50ae  .git/hooks/pre-commit.sample
+     189  Defl:N      138  27% 2024-11-14 19:49 c0f70c9a  .git/hooks/post-update.sample
+     424  Defl:N      265  38% 2024-11-14 19:49 024cc0cf  .git/hooks/pre-applypatch.sample
+    4726  Defl:N     1814  62% 2024-11-14 19:49 793c7cef  .git/hooks/fsmonitor-watchman.sample
+    4898  Defl:N     2015  59% 2024-11-14 19:49 5158ec84  .git/hooks/pre-rebase.sample
+    3650  Defl:N     1173  68% 2024-11-14 19:49 06fcf0d9  .git/hooks/update.sample
+     240  Defl:N      173  28% 2024-11-14 19:49 21cd3d77  .git/info/exclude
+       8  Stored        8   0% 2024-11-14 19:49 4cc141be  .git/info/sparse-checkout
+     319  Defl:N      164  49% 2024-11-14 19:49 b5b10679  .git/logs/refs/heads/parallel
+     183  Defl:N      131  28% 2024-11-14 19:49 07235502  .git/logs/refs/remotes/origin/parallel
+     323  Defl:N      167  48% 2024-11-14 19:49 df9daca2  .git/logs/refs/remotes/origin/HEAD
+      81  Defl:N       77   5% 2024-11-14 19:49 1476ecd1  .git/objects/info/alternates
 --------          -------  ---                            -------
-   30950            13995  55%                            30 files
+   30950            13999  55%                            30 files
 Contents of /build/reproducible-path/git-2.45.2/t/trash directory.t9210-scalar/.git/objects:
 Total: 3 loose objects
 ok 18 - scalar diagnose
@@ -520811,6 +520210,7 @@
 		sh -c "test -t 1 && test -t 2"
 
 )
+died of signal 15 at /build/reproducible-path/git-2.45.2/t/test-terminal.perl line 35.
 prerequisite TTY ok
 expecting success of 9211.10 'progress with tty': 
 	enlistment=progress1 &&
@@ -520895,201 +520295,6 @@
 1..13
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9302-fast-import-unpack-limit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2340 KiB
-       pools:          2048 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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:          2340 KiB
-       pools:          2048 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9168-git-svn-partially-globbed-names.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9168-git-svn-partially-globbed-names/.git/
 expecting success of 9168.1 'prepare test refspec prefixed globbing': 
@@ -521198,22 +520403,22 @@
 	(required for this version (2.45.2) of git-svn) does not exist.
 Done migrating from a git-svn v1 layout
 	A	readme
-r1 = fcf8d784a75d3d0d354a3c0dc16fceadf73313d0 (refs/remotes/trunk)
+r1 = 1c8bea0dbf27eae2a61812a4715e99b9bcee5562 (refs/remotes/trunk)
 branch_from: /trunk => /trunk/src/a
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a, 1
-Found branch parent: (refs/remotes/branches/b_start) fcf8d784a75d3d0d354a3c0dc16fceadf73313d0
+Found branch parent: (refs/remotes/branches/b_start) 1c8bea0dbf27eae2a61812a4715e99b9bcee5562
 Following parent with do_switch
 Successfully followed parent
-r2 = 0dffd9cae20282143f56cb74c9a3ed5a08517af6 (refs/remotes/branches/b_start)
+r2 = fca227ecc6628bff2f8f39d96aff83ffc1dc4cb0 (refs/remotes/branches/b_start)
 	M	readme
-r3 = 4d7be7be5e6a061449380a182eec9a48bd4f38e3 (refs/remotes/branches/b_start)
+r3 = a24b3fb87aecff391469966bdaecafbbe2e894c6 (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.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start/src/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end/src/a, 3
-Found branch parent: (refs/remotes/tags/t_end) 4d7be7be5e6a061449380a182eec9a48bd4f38e3
+Found branch parent: (refs/remotes/tags/t_end) a24b3fb87aecff391469966bdaecafbbe2e894c6
 Following parent with do_switch
 	M	readme
 Successfully followed parent
-r4 = b5acc571b542093d085f5ffc44b2aa914042b18e (refs/remotes/tags/t_end)
+r4 = e8f8d93fba32db849ebce8851c1ce2be1c5ae2ac (refs/remotes/tags/t_end)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk/src/a r1
 fatal: ambiguous argument 'refs/remotes/tags/t_end@3': unknown revision or path not in the working tree.
@@ -521262,26 +520467,26 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = d6180301f5ccc8491cae6105d12d5eacac4601d5 (refs/remotes/two/trunk)
+r1 = cb519b27a5ad252125d3725b5611fb1f010d7859 (refs/remotes/two/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/two/branches/b_start) d6180301f5ccc8491cae6105d12d5eacac4601d5
+Found branch parent: (refs/remotes/two/branches/b_start) cb519b27a5ad252125d3725b5611fb1f010d7859
 Following parent with do_switch
 Successfully followed parent
-r2 = 8a0a80fafb53d753127154e7a37dd69530121edb (refs/remotes/two/branches/b_start)
+r2 = 8fa127aa4545bd9caca39d248b14e191554a611a (refs/remotes/two/branches/b_start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = c0443198daf127e1a31110878003b733f9b5e226 (refs/remotes/two/branches/b_start)
+r3 = 5be3d6492412cdc973f65907ea5d9a429f904ac8 (refs/remotes/two/branches/b_start)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/two/tags/t_end) c0443198daf127e1a31110878003b733f9b5e226
+Found branch parent: (refs/remotes/two/tags/t_end) 5be3d6492412cdc973f65907ea5d9a429f904ac8
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 9adbeb5ea66f7f57eb6d4b81fe478993318b00c3 (refs/remotes/two/tags/t_end)
+r4 = dcf3cdce159af403f4691ca79a3756f8d9ff522c (refs/remotes/two/tags/t_end)
 	M	src/b/readme
-r5 = 86da4ce14e07b24482e0adfe4f5a61f4fbfc92fa (refs/remotes/two/tags/t_end)
+r5 = cdee7546a99e8e84adfaaed5b5e48b771d66600d (refs/remotes/two/tags/t_end)
 	M	src/b/readme
-r6 = b7cc8d8dccc09abef3e58da2646f5a5c2aead63e (refs/remotes/two/tags/t_end)
+r6 = ecf569b8bbdcddd3e91fe785c080713a798142fe (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': 
@@ -521345,272 +520550,2880 @@
 	A	src/a/readme
 	A	src/b/readme
 W: +empty_dir: trunk/doc
-r1 = d6180301f5ccc8491cae6105d12d5eacac4601d5 (refs/remotes/three/trunk)
+r1 = cb519b27a5ad252125d3725b5611fb1f010d7859 (refs/remotes/three/trunk)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start, 1
-Found branch parent: (refs/remotes/three/branches/b_start) d6180301f5ccc8491cae6105d12d5eacac4601d5
+Found branch parent: (refs/remotes/three/branches/b_start) cb519b27a5ad252125d3725b5611fb1f010d7859
 Following parent with do_switch
 Successfully followed parent
-r2 = 8a0a80fafb53d753127154e7a37dd69530121edb (refs/remotes/three/branches/b_start)
+r2 = 8fa127aa4545bd9caca39d248b14e191554a611a (refs/remotes/three/branches/b_start)
 	M	src/a/readme
 	M	src/b/readme
-r3 = c0443198daf127e1a31110878003b733f9b5e226 (refs/remotes/three/branches/b_start)
+r3 = 5be3d6492412cdc973f65907ea5d9a429f904ac8 (refs/remotes/three/branches/b_start)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_start => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_end, 3
-Found branch parent: (refs/remotes/three/tags/t_end) c0443198daf127e1a31110878003b733f9b5e226
+Found branch parent: (refs/remotes/three/tags/t_end) 5be3d6492412cdc973f65907ea5d9a429f904ac8
 Following parent with do_switch
 	M	src/a/readme
 	M	src/b/readme
 Successfully followed parent
-r4 = 9adbeb5ea66f7f57eb6d4b81fe478993318b00c3 (refs/remotes/three/tags/t_end)
+r4 = dcf3cdce159af403f4691ca79a3756f8d9ff522c (refs/remotes/three/tags/t_end)
 	M	src/b/readme
-r5 = 86da4ce14e07b24482e0adfe4f5a61f4fbfc92fa (refs/remotes/three/tags/t_end)
+r5 = cdee7546a99e8e84adfaaed5b5e48b771d66600d (refs/remotes/three/tags/t_end)
 	M	src/b/readme
-r6 = b7cc8d8dccc09abef3e58da2646f5a5c2aead63e (refs/remotes/three/tags/t_end)
+r6 = ecf569b8bbdcddd3e91fe785c080713a798142fe (refs/remotes/three/tags/t_end)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_, 3
-Found branch parent: (refs/remotes/three/branches/b_) d6180301f5ccc8491cae6105d12d5eacac4601d5
+Found branch parent: (refs/remotes/three/branches/b_) cb519b27a5ad252125d3725b5611fb1f010d7859
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r7 = 0d7d1ce5818d5959f509b657f53e44c4b742f8a5 (refs/remotes/three/branches/b_)
+r7 = ff8e3a468fe4748eb7ca730ca85905bd2eae0b72 (refs/remotes/three/branches/b_)
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/b_ => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/t_, 7
-Found branch parent: (refs/remotes/three/tags/t_) 0d7d1ce5818d5959f509b657f53e44c4b742f8a5
+Found branch parent: (refs/remotes/three/tags/t_) ff8e3a468fe4748eb7ca730ca85905bd2eae0b72
 Following parent with do_switch
 	M	src/a/readme
 Successfully followed parent
-r8 = cb1b37c71b6c07ec8b2357125f07dd71b624b7ee (refs/remotes/three/tags/t_)
+r8 = 9dc00e947aee3d6e66af27ab44854ce857933f63 (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/*
+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 = cb519b27a5ad252125d3725b5611fb1f010d7859 (refs/remotes/five/trunk)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
+Found branch parent: (refs/remotes/five/branches/abcde) cb519b27a5ad252125d3725b5611fb1f010d7859
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r10 = 6462c143d5bbc1aeea42ceba4b1af6f230da5108 (refs/remotes/five/branches/abcde)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
+Found branch parent: (refs/remotes/five/tags/fghij) 6462c143d5bbc1aeea42ceba4b1af6f230da5108
+Following parent with do_switch
+	M	src/a/readme
+Successfully followed parent
+r11 = d5a382121d653f98e7a59b465a121a3b2458bced (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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9302-fast-import-unpack-limit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9164-git-svn-dcommit-concurrent.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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	2024-11-14 19:48:36.569409761 +0000
++++ au_file_saved	2024-11-14 19:48:36.313407136 +0000
+@@ -1,2 +1 @@
+ 
+-727
+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.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work1.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = fdd9d6ae6b9a5ba7b0d8d4c5f5bba41ac1b7d356 (refs/remotes/git-svn)
+	M	file
+r2 = ce82b3c1943e2c982893ca8e7d74f4ab02cc21c8 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = cab38305d6f40b5950712fbac52baa0ac72c70a4 (refs/remotes/git-svn)
+	M	file
+r4 = 522ef78b3f9bb249eb71301e7255692bc47d1606 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r4
+[master cd68efa] commit change 1.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 98ab8d5] commit change 1.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master b27a57f] 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.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
+	M	file
+Committed r5
+	M	file
+r5 = 6bc490ddaaa60fbca8b760b77e4290af124c764a (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: b27a57f21f30707409d2c4513ff486bb38b26a9a and refs/remotes/git-svn differ, using rebase:
+:100644 100644 fb014dd41485c73acf40cd9548cd4cd812fee4ec e6ac0ef8373861d92d8eecf8d88e592606a70872 M	file
+warning: skipped previously applied commit cd68efa
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/master.
+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.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work2.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = fdd9d6ae6b9a5ba7b0d8d4c5f5bba41ac1b7d356 (refs/remotes/git-svn)
+	M	file
+r2 = ce82b3c1943e2c982893ca8e7d74f4ab02cc21c8 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = cab38305d6f40b5950712fbac52baa0ac72c70a4 (refs/remotes/git-svn)
+	M	file
+r4 = 522ef78b3f9bb249eb71301e7255692bc47d1606 (refs/remotes/git-svn)
+	M	file
+r5 = 6bc490ddaaa60fbca8b760b77e4290af124c764a (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r5
+[master c9199c0] commit change 2.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master f6267cf] commit change 2.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 4c4fb19] 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.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
+	M	file
+Committed r6
+	M	file
+r6 = 8d6127899cfb8bffa3d3181fe45baf5749a52c34 (refs/remotes/git-svn)
+	M	file
+Committed r7
+	M	file
+r7 = 4268cfdaf50913aaf3b9f912e9256e6c7a113724 (refs/remotes/git-svn)
+	M	auto_updated_file
+r8 = 9a8a771321ee44210a72647b48cb227e72cbbde5 (refs/remotes/git-svn)
+W: f6267cfabfa01ec38e4cac50a973e1edfdd6c44e and refs/remotes/git-svn differ, using rebase:
+:100644 100644 98c0f659f0c5acbb4eab528ccdcd7cd94c0655a3 98498365c244824c50c59332416a0f086ea29db0 M	auto_updated_file
+warning: skipped previously applied commit c9199c0
+warning: skipped previously applied commit f6267cf
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/master.
+	M	file
+Committed r9
+	M	file
+r9 = 65b6c23ae527345395b81986a41ca52167ed0431 (refs/remotes/git-svn)
+No changes between 695a3ebb3b78fa92214682ff0bcad8045fa092ba 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.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work3.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = fdd9d6ae6b9a5ba7b0d8d4c5f5bba41ac1b7d356 (refs/remotes/git-svn)
+	M	file
+r2 = ce82b3c1943e2c982893ca8e7d74f4ab02cc21c8 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = cab38305d6f40b5950712fbac52baa0ac72c70a4 (refs/remotes/git-svn)
+	M	file
+r4 = 522ef78b3f9bb249eb71301e7255692bc47d1606 (refs/remotes/git-svn)
+	M	file
+r5 = 6bc490ddaaa60fbca8b760b77e4290af124c764a (refs/remotes/git-svn)
+	M	file
+r6 = 8d6127899cfb8bffa3d3181fe45baf5749a52c34 (refs/remotes/git-svn)
+	M	file
+r7 = 4268cfdaf50913aaf3b9f912e9256e6c7a113724 (refs/remotes/git-svn)
+	M	auto_updated_file
+r8 = 9a8a771321ee44210a72647b48cb227e72cbbde5 (refs/remotes/git-svn)
+	M	file
+r9 = 65b6c23ae527345395b81986a41ca52167ed0431 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r9
+[master 27e8018] commit change 3.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+[master 9da428d] commit change 3.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master d670d2a] 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.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
+	M	auto_updated_file
+Committed r10
+	M	auto_updated_file
+r10 = 40987a09dcd89ccf9a8771daaa8ee0940c6080d9 (refs/remotes/git-svn)
+	M	auto_updated_file
+Committed r11
+	M	auto_updated_file
+r11 = 285439d517167ba10d318c7e91dc070a2bc0c70e (refs/remotes/git-svn)
+	M	auto_updated_file
+r12 = 3e1123c7381aa64c2bf5e5ac6da3b088db6924e9 (refs/remotes/git-svn)
+W: 9da428d86850880278e727c87f0d200342590900 and refs/remotes/git-svn differ, using rebase:
+:100644 100644 640512b05a29489f5a5cc0e015e1b845c835d580 a26a9166589aed415bbd600363149e9d84888b9e M	auto_updated_file
+warning: skipped previously applied commit 27e8018
+warning: skipped previously applied commit 9da428d
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/master.
+	M	auto_updated_file
+Committed r13
+	M	auto_updated_file
+r13 = d4c52a9bde8a474f542412143e86d5bfe254aa4c (refs/remotes/git-svn)
+No changes between ce94c65102e61bccda7c0e528551686980c200fc 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.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work4.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = fdd9d6ae6b9a5ba7b0d8d4c5f5bba41ac1b7d356 (refs/remotes/git-svn)
+	M	file
+r2 = ce82b3c1943e2c982893ca8e7d74f4ab02cc21c8 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = cab38305d6f40b5950712fbac52baa0ac72c70a4 (refs/remotes/git-svn)
+	M	file
+r4 = 522ef78b3f9bb249eb71301e7255692bc47d1606 (refs/remotes/git-svn)
+	M	file
+r5 = 6bc490ddaaa60fbca8b760b77e4290af124c764a (refs/remotes/git-svn)
+	M	file
+r6 = 8d6127899cfb8bffa3d3181fe45baf5749a52c34 (refs/remotes/git-svn)
+	M	file
+r7 = 4268cfdaf50913aaf3b9f912e9256e6c7a113724 (refs/remotes/git-svn)
+	M	auto_updated_file
+r8 = 9a8a771321ee44210a72647b48cb227e72cbbde5 (refs/remotes/git-svn)
+	M	file
+r9 = 65b6c23ae527345395b81986a41ca52167ed0431 (refs/remotes/git-svn)
+	M	auto_updated_file
+r10 = 40987a09dcd89ccf9a8771daaa8ee0940c6080d9 (refs/remotes/git-svn)
+	M	auto_updated_file
+r11 = 285439d517167ba10d318c7e91dc070a2bc0c70e (refs/remotes/git-svn)
+	M	auto_updated_file
+r12 = 3e1123c7381aa64c2bf5e5ac6da3b088db6924e9 (refs/remotes/git-svn)
+	M	auto_updated_file
+r13 = d4c52a9bde8a474f542412143e86d5bfe254aa4c (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r13
+[master 5fc3bc6] commit change 4.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 7 insertions(+)
+[master 56767af] commit change 4.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 deletion(-)
+[master b5b514b] 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.45.2/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.45.2/git-svn line 879.
+	M	auto_updated_file
+Committed r14
+	M	auto_updated_file
+r14 = e7cf0315756533d9002e72abac53112c14e07ff3 (refs/remotes/git-svn)
+	M	auto_updated_file
+Committed r15
+	M	auto_updated_file
+r15 = dd3e345e71f02cc9c01e1509b8d6aa3d67246398 (refs/remotes/git-svn)
+	M	auto_updated_file
+r16 = c02ec71cbe19a83542fdc31afc8058cda080e9e8 (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.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work5.git/.git/
+	A	auto_updated_file
+	A	file
+r1 = fdd9d6ae6b9a5ba7b0d8d4c5f5bba41ac1b7d356 (refs/remotes/git-svn)
+	M	file
+r2 = ce82b3c1943e2c982893ca8e7d74f4ab02cc21c8 (refs/remotes/git-svn)
+	M	auto_updated_file
+r3 = cab38305d6f40b5950712fbac52baa0ac72c70a4 (refs/remotes/git-svn)
+	M	file
+r4 = 522ef78b3f9bb249eb71301e7255692bc47d1606 (refs/remotes/git-svn)
+	M	file
+r5 = 6bc490ddaaa60fbca8b760b77e4290af124c764a (refs/remotes/git-svn)
+	M	file
+r6 = 8d6127899cfb8bffa3d3181fe45baf5749a52c34 (refs/remotes/git-svn)
+	M	file
+r7 = 4268cfdaf50913aaf3b9f912e9256e6c7a113724 (refs/remotes/git-svn)
+	M	auto_updated_file
+r8 = 9a8a771321ee44210a72647b48cb227e72cbbde5 (refs/remotes/git-svn)
+	M	file
+r9 = 65b6c23ae527345395b81986a41ca52167ed0431 (refs/remotes/git-svn)
+	M	auto_updated_file
+r10 = 40987a09dcd89ccf9a8771daaa8ee0940c6080d9 (refs/remotes/git-svn)
+	M	auto_updated_file
+r11 = 285439d517167ba10d318c7e91dc070a2bc0c70e (refs/remotes/git-svn)
+	M	auto_updated_file
+r12 = 3e1123c7381aa64c2bf5e5ac6da3b088db6924e9 (refs/remotes/git-svn)
+	M	auto_updated_file
+r13 = d4c52a9bde8a474f542412143e86d5bfe254aa4c (refs/remotes/git-svn)
+	M	auto_updated_file
+r14 = e7cf0315756533d9002e72abac53112c14e07ff3 (refs/remotes/git-svn)
+	M	auto_updated_file
+r15 = dd3e345e71f02cc9c01e1509b8d6aa3d67246398 (refs/remotes/git-svn)
+	M	auto_updated_file
+r16 = c02ec71cbe19a83542fdc31afc8058cda080e9e8 (refs/remotes/git-svn)
+Checked out HEAD:
+  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r16
+[master 52ffb2d] commit change 5.1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 2d48983] commit change 5.2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master e9e464e] 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.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
+	M	file
+Committed r17
+	M	file
+r17 = d6929cd5a60403ae6120f9fea4db509ccd4aa8c3 (refs/remotes/git-svn)
+	M	auto_updated_file
+r18 = 84bad8495c06fcd522001fac1b872c69e5736838 (refs/remotes/git-svn)
+W: 52ffb2dd46d3e5562ee7d31ea85c9cebb5c9563a and refs/remotes/git-svn differ, using rebase:
+:100644 100644 ffab72afad4686ec8d7b704fc0ebbbe7951efcdf fac8113fc1c0ae6373319811db7c34522e535956 M	auto_updated_file
+warning: skipped previously applied commit 52ffb2d
+hint: use --reapply-cherry-picks to include skipped commits
+hint: Disable this message with "git config advice.skippedCherryPicks false"
+Rebasing (1/2)
Auto-merging auto_updated_file
+CONFLICT (content): Merge conflict in auto_updated_file
+error: could not apply 2d48983... commit change 5.2
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
+hint: You can instead skip this commit: run "git rebase --skip".
+hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
+hint: Disable this message with "git config advice.mergeConflict false"
+Could not apply 2d48983... 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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9304-fast-import-marks.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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.45.2/t/trash directory.t9304-fast-import-marks/sub'...
+done.
+[master fa05818] 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.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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.45.2/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:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9303-fast-import-compression.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+	
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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
+
+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
+	
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 2 - fast-import (packed) with -c core.compression=9
+
+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
+	
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 - fast-import (packed) with -c core.compression=0 -c pack.compression=0
+
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 - fast-import (packed) with -c core.compression=9 -c pack.compression=0
+
+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
+	
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 - fast-import (packed) with -c core.compression=0 -c pack.compression=9
+
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 6 - fast-import (packed) with -c core.compression=9 -c pack.compression=9
+
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 - fast-import (packed) with -c pack.compression=0
+
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 - fast-import (packed) with -c pack.compression=9
+
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 - fast-import (loose) with -c core.compression=0
+
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 - 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 (         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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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 11 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=0
+
+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:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 12 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=0
+
+expecting success of 9303.13 'fast-import (loose) with -c core.compression=0 -c core.loosecompression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=9 $config &&
+		sz=$(test_file_size .git/objects/??/????*) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 13 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=9
+
+expecting success of 9303.14 'fast-import (loose) with -c core.compression=9 -c core.loosecompression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=9 $config &&
+		sz=$(test_file_size .git/objects/??/????*) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 14 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=9
+
+expecting success of 9303.15 'fast-import (loose) with -c core.loosecompression=0': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=9 $config &&
+		sz=$(test_file_size .git/objects/??/????*) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 15 - fast-import (loose) with -c core.loosecompression=0
+
+expecting success of 9303.16 'fast-import (loose) with -c core.loosecompression=9': 
+		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
+		test_when_finished "rm -rf .git/objects/??" &&
+		import_large -c fastimport.unpacklimit=9 $config &&
+		sz=$(test_file_size .git/objects/??/????*) &&
+		case "$expect" in
+		small) test "$sz" -le 100000 ;;
+		large) test "$sz" -ge 100000 ;;
+		esac
+	
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 16 - fast-import (loose) with -c core.loosecompression=9
+
+# passed all 16 test(s)
+1..16
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9351-fast-export-anonymize.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9351-fast-export-anonymize/.git/
+expecting success of 9351.1 'setup simple repo': 
+	test_commit base &&
+	test_commit foo &&
+	test_commit retain-me &&
+	git checkout -b other HEAD^ &&
+	mkdir subdir &&
+	test_commit subdir/bar &&
+	test_commit subdir/xyzzy &&
+	fake_commit=$(echo $ZERO_OID | sed s/0/a/) &&
+	git update-index --add --cacheinfo 160000,$fake_commit,link1 &&
+	git update-index --add --cacheinfo 160000,$fake_commit,link2 &&
+	git commit -m "add gitlink" &&
+	git tag -m "annotated tag" mytag &&
+	git tag -m "annotated tag with long message" longtag
+
+[main (root-commit) d1ff1c9] base
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 base.t
+[main 64bd085] foo
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 foo.t
+[main 98733ca] retain-me
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 retain-me.t
+Switched to a new branch 'other'
+[other 7ff9039] subdir/bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/bar.t
+[other 1427cb1] subdir/xyzzy
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 subdir/xyzzy.t
+[other 73eb103] add gitlink
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 160000 link1
+ create mode 160000 link2
+ok 1 - setup simple repo
+
+expecting success of 9351.2 'export anonymized stream': 
+	git fast-export --anonymize --all \
+		--anonymize-map=retain-me \
+		--anonymize-map=xyzzy:should-not-appear \
+		--anonymize-map=xyzzy:custom-name \
+		--anonymize-map=other \
+		>stream
+
+ok 2 - export anonymized stream
+
+expecting success of 9351.3 'stream omits path names': 
+	! grep base stream &&
+	! grep foo stream &&
+	! grep subdir stream &&
+	! grep bar stream &&
+	! grep xyzzy stream
+
+ok 3 - stream omits path names
+
+expecting success of 9351.4 'stream contains user-specified names': 
+	grep retain-me stream &&
+	! grep should-not-appear stream &&
+	grep custom-name stream
+
+reset refs/tags/retain-me
+commit refs/tags/ref3/custom-name
+ok 4 - stream contains user-specified names
+
+expecting success of 9351.5 'stream omits gitlink oids': 
+	# avoid relying on the whole oid to remain hash-agnostic; this is
+	# plenty to be unique within our test case
+	! grep a000000000000000000 stream
+
+ok 5 - stream omits gitlink oids
+
+expecting success of 9351.6 'stream retains other as refname': 
+	grep other stream
+
+commit refs/heads/other
+ok 6 - stream retains other as refname
+
+expecting success of 9351.7 'stream omits other refnames': 
+	! grep main stream &&
+	! grep mytag stream &&
+	! grep longtag stream
+
+ok 7 - stream omits other refnames
+
+expecting success of 9351.8 'stream omits identities': 
+	! grep "$GIT_COMMITTER_NAME" stream &&
+	! grep "$GIT_COMMITTER_EMAIL" stream &&
+	! grep "$GIT_AUTHOR_NAME" stream &&
+	! grep "$GIT_AUTHOR_EMAIL" stream
+
+ok 8 - stream omits identities
+
+expecting success of 9351.9 'stream omits tag message': 
+	! grep "annotated tag" stream
+
+ok 9 - stream omits tag message
+
+expecting success of 9351.10 'import stream to new repository': 
+	git init new &&
+	cd new &&
+	git fast-import <../stream
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9351-fast-export-anonymize/new/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           21 (         0 duplicates                  )
+      blobs  :            5 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            8 (         0 duplicates          6 deltas of          6 attempts)
+      commits:            6 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           7 (         6 loads     )
+      marks:           1024 (        11 unique    )
+      atoms:              8
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+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	2024-11-14 19:49:10.801760849 +0000
++++ committers	2024-11-14 19:49:10.841761259 +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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9350-fast-export.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/.git/
+expecting success of 9350.1 'setup': 
+
+	echo break it > file0 &&
+	git add file0 &&
+	test_tick &&
+	echo Wohlauf > file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	echo die Luft > file &&
+	echo geht frisch > file2 &&
+	git add file file2 &&
+	test_tick &&
+	git commit -m second &&
+	echo und > file2 &&
+	test_tick &&
+	git commit -m third file2 &&
+	test_tick &&
+	git tag rein &&
+	git checkout -b wer HEAD^ &&
+	echo lange > file2 &&
+	test_tick &&
+	git commit -m sitzt file2 &&
+	test_tick &&
+	git tag -a -m valentin muss &&
+	git merge -s ours main
+
+
+[main (root-commit) 283ea05] initial
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file
+ create mode 100644 file0
+[main 300cb83] second
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+ create mode 100644 file2
+[main 80f15f4] third
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Switched to a new branch 'wer'
+[wer 708f3c9] sitzt
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merge made by the 'ours' strategy.
+ok 1 - setup
+
+expecting success of 9350.2 'fast-export | fast-import': 
+
+	MAIN=$(git rev-parse --verify main) &&
+	REIN=$(git rev-parse --verify rein) &&
+	WER=$(git rev-parse --verify wer) &&
+	MUSS=$(git rev-parse --verify muss) &&
+	mkdir new &&
+	git --git-dir=new/.git init &&
+	git fast-export --all >actual &&
+	(cd new &&
+	 git fast-import &&
+	 test $MAIN = $(git rev-parse --verify refs/heads/main) &&
+	 test $REIN = $(git rev-parse --verify refs/tags/rein) &&
+	 test $WER = $(git rev-parse --verify refs/heads/wer) &&
+	 test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/new/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           16 (         0 duplicates                  )
+      blobs  :            6 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
+      commits:            5 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           4 (         3 loads     )
+      marks:           1024 (        11 unique    )
+      atoms:              3
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          5
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1158
+---------------------------------------------------------------------
+
+ok 2 - fast-export | fast-import
+
+expecting success of 9350.3 'fast-export ^muss^{commit} muss': 
+	git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
+	cat >expected <<-EOF &&
+	tag muss
+	from $(git rev-parse --verify muss^{commit})
+	$(git cat-file tag muss | grep tagger)
+	data 9
+	valentin
+
+	EOF
+	test_cmp expected actual
+
+ok 3 - fast-export ^muss^{commit} muss
+
+expecting success of 9350.4 'fast-export --mark-tags ^muss^{commit} muss': 
+	git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
+	cat >expected <<-EOF &&
+	tag muss
+	mark :1
+	from $(git rev-parse --verify muss^{commit})
+	$(git cat-file tag muss | grep tagger)
+	data 9
+	valentin
+
+	EOF
+	test_cmp expected actual
+
+ok 4 - fast-export --mark-tags ^muss^{commit} muss
+
+expecting success of 9350.5 'fast-export main~2..main': 
+
+	git fast-export main~2..main >actual &&
+	sed "s/main/partial/" actual |
+		(cd new &&
+		 git fast-import &&
+		 test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
+		 git diff --exit-code main partial &&
+		 git diff --exit-code main^ partial^ &&
+		 test_must_fail git rev-parse partial~2)
+
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            8 (         0 duplicates                  )
+      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         6 unique    )
+      atoms:              3
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+fatal: ambiguous argument 'partial~2': unknown revision or path not in the working tree.
+Use '--' to separate paths from revisions, like this:
+'git <command> [<revision>...] -- [<file>...]'
+partial~2
+ok 5 - fast-export main~2..main
+
+expecting success of 9350.6 'fast-export --reference-excluded-parents main~2..main': 
+
+	git fast-export --reference-excluded-parents main~2..main >actual &&
+	grep commit.refs/heads/main actual >commit-count &&
+	test_line_count = 2 commit-count &&
+	sed "s/main/rewrite/" actual |
+		(cd new &&
+		 git fast-import &&
+		 test $MAIN = $(git rev-parse --verify refs/heads/rewrite))
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            7 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            2 (         0 duplicates          1 deltas of          1 attempts)
+      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         5 unique    )
+      atoms:              3
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 6 - fast-export --reference-excluded-parents main~2..main
+
+expecting success of 9350.7 'fast-export --show-original-ids': 
+
+	git fast-export --show-original-ids main >output &&
+	grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
+	git rev-list --objects main muss >objects-and-names &&
+	awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
+	comm -23 actual commits-trees-blobs >unfound &&
+	test_must_be_empty unfound
+
+ok 7 - fast-export --show-original-ids
+
+expecting success of 9350.8 'fast-export --show-original-ids | git fast-import': 
+
+	git fast-export --show-original-ids main muss | git fast-import --quiet &&
+	test $MAIN = $(git rev-parse --verify refs/heads/main) &&
+	test $MUSS = $(git rev-parse --verify refs/tags/muss)
+
+ok 8 - fast-export --show-original-ids | git fast-import
+
+expecting success of 9350.9 'reencoding iso-8859-7': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	test_tick &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+	sed "s/wer/i18n/" iso-8859-7.fi |
+		(cd new &&
+		 git fast-import &&
+		 # The commit object, if not re-encoded, would be 200 bytes plus hash.
+		 # Removing the "encoding iso-8859-7\n" header drops 20 bytes.
+		 # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7
+		 # to \xCF\x80 (\317\200) in UTF-8 adds a byte.  Check for
+		 # the expected size.
+		 test $(($(test_oid hexsz) + 181)) -eq "$(git cat-file -s i18n)" &&
+		 # ...and for the expected translation of bytes.
+		 git cat-file commit i18n >actual &&
+		 grep $(printf "\317\200") actual &&
+		 # Also make sure the commit does not have the "encoding" header
+		 ! grep ^encoding actual)
+
+[wer 6941255] Pi: ð
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            5 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+Pi: π
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 9 - reencoding iso-8859-7
+
+expecting success of 9350.10 'aborting on iso-8859-7': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+	test_must_fail git fast-export --reencode=abort wer^..wer >iso-8859-7.fi
+
+[wer 6941255] Pi: ð
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fatal: Encountered commit-specific encoding iso-8859-7 in commit 69412559de66ce43db5f4d5fd25191a3ab0b1823; use --reencode=[yes|no] to handle it
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 10 - aborting on iso-8859-7
+
+expecting success of 9350.11 'preserving iso-8859-7': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
+	git fast-export --reencode=no wer^..wer >iso-8859-7.fi &&
+	sed "s/wer/i18n-no-recoding/" iso-8859-7.fi |
+		(cd new &&
+		 git fast-import &&
+		 # The commit object, if not re-encoded, is 200 bytes plus hash.
+		 # Removing the "encoding iso-8859-7\n" header would drops 20
+		 # bytes.  Re-encoding the Pi character from \xF0 (\360) in
+		 # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte.
+		 # Check for the expected size...
+		 test $(($(test_oid hexsz) + 200)) -eq "$(git cat-file -s i18n-no-recoding)" &&
+		 # ...as well as the expected byte.
+		 git cat-file commit i18n-no-recoding >actual &&
+		 grep $(printf "\360") actual &&
+		 # Also make sure the commit has the "encoding" header
+		 grep ^encoding actual)
+
+[wer 6941255] Pi: ð
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            5 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+Pi: ð
+encoding iso-8859-7
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 11 - preserving iso-8859-7
+
+expecting success of 9350.12 'encoding preserved if reencoding fails': 
+
+	test_when_finished "git reset --hard HEAD~1" &&
+	test_config i18n.commitencoding iso-8859-7 &&
+	echo rosten >file &&
+	git commit -s -F "$TEST_DIRECTORY/t9350/broken-iso-8859-7-commit-message.txt" file &&
+	git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
+	sed "s/wer/i18n-invalid/" iso-8859-7.fi |
+		(cd new &&
+		 git fast-import &&
+		 git cat-file commit i18n-invalid >actual &&
+		 # Make sure the commit still has the encoding header
+		 grep ^encoding actual &&
+		 # Verify that the commit has the expected size; i.e.
+		 # that no bytes were re-encoded to a different encoding.
+		 test $(($(test_oid hexsz) + 212)) -eq "$(git cat-file -s i18n-invalid)" &&
+		 # ...and check for the original special bytes
+		 grep $(printf "\360") actual &&
+		 grep $(printf "\377") actual)
+
+[wer 5cc588f] Pi: ð; Invalid: ÿ
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            5 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              3
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+encoding iso-8859-7
+Pi: ð; Invalid: ÿ
+Pi: ð; Invalid: ÿ
+HEAD is now at 8954980 Merge branch 'main' into wer
+ok 12 - encoding preserved if reencoding fails
+
+expecting success of 9350.13 'import/export-marks': 
+
+	git checkout -b marks main &&
+	git fast-export --export-marks=tmp-marks HEAD &&
+	test -s tmp-marks &&
+	test_line_count = 3 tmp-marks &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks HEAD >actual &&
+	test $(grep ^commit actual | wc -l) -eq 0 &&
+	echo change > file &&
+	git commit -m "last commit" file &&
+	git fast-export --import-marks=tmp-marks \
+		--export-marks=tmp-marks HEAD >actual &&
+	test $(grep ^commit\  actual | wc -l) -eq 1 &&
+	test_line_count = 4 tmp-marks
+
+
+Switched to a new branch 'marks'
+blob
+mark :1
+data 8
+Wohlauf
+
+blob
+mark :2
+data 9
+break it
+
+reset refs/heads/marks
+commit refs/heads/marks
+mark :3
+author A U Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+data 8
+initial
+M 100644 :2 file0
+M 100644 :1 file
+
+blob
+mark :4
+data 9
+die Luft
+
+blob
+mark :5
+data 12
+geht frisch
+
+commit refs/heads/marks
+mark :6
+author A U Thor <author@example.com> 1112912113 -0700
+committer C O Mitter <committer@example.com> 1112912113 -0700
+data 7
+second
+from :3
+M 100644 :5 file2
+M 100644 :4 file
+
+blob
+mark :7
+data 4
+und
+
+commit refs/heads/marks
+mark :8
+author A U Thor <author@example.com> 1112912173 -0700
+committer C O Mitter <committer@example.com> 1112912173 -0700
+data 6
+third
+from :6
+M 100644 :7 file2
+
+[marks 00d551b] last commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 13 - import/export-marks
+
+expecting success of 9350.14 'set up faked signed tag': 
+
+	git fast-import <signed-tag-import
+
+
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:            1 (         0 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            1 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          0
+pack_report: pack_mmap_calls          =          0
+pack_report: pack_open_windows        =          0 /          0
+pack_report: pack_mapped              =          0 /          0
+---------------------------------------------------------------------
+
+ok 14 - set up faked signed tag
+
+expecting success of 9350.15 'signed-tags=abort': 
+
+	test_must_fail git fast-export --signed-tags=abort sign-your-name
+
+
+fatal: encountered signed tag a3638f8ba890fd4c674f4a3c04947833ab5dcd43; use --signed-tags=<mode> to handle it
+blob
+mark :1
+data 8
+Wohlauf
+
+blob
+mark :2
+data 9
+break it
+
+reset refs/tags/sign-your-name
+commit refs/tags/sign-your-name
+mark :3
+author A U Thor <author@example.com> 1112912053 -0700
+committer C O Mitter <committer@example.com> 1112912053 -0700
+data 8
+initial
+M 100644 :2 file0
+M 100644 :1 file
+
+blob
+mark :4
+data 9
+die Luft
+
+blob
+mark :5
+data 12
+geht frisch
+
+commit refs/tags/sign-your-name
+mark :6
+author A U Thor <author@example.com> 1112912113 -0700
+committer C O Mitter <committer@example.com> 1112912113 -0700
+data 7
+second
+from :3
+M 100644 :5 file2
+M 100644 :4 file
+
+blob
+mark :7
+data 4
+und
+
+commit refs/tags/sign-your-name
+mark :8
+author A U Thor <author@example.com> 1112912173 -0700
+committer C O Mitter <committer@example.com> 1112912173 -0700
+data 6
+third
+from :6
+M 100644 :7 file2
+
+blob
+mark :9
+data 7
+change
+
+commit refs/tags/sign-your-name
+mark :10
+author A U Thor <author@example.com> 1112912413 -0700
+committer C O Mitter <committer@example.com> 1112912413 -0700
+data 12
+last commit
+from :8
+M 100644 :9 file
+
+ok 15 - signed-tags=abort
+
+expecting success of 9350.16 'signed-tags=verbatim': 
+
+	git fast-export --signed-tags=verbatim sign-your-name > output &&
+	grep PGP output
+
+
+-----BEGIN PGP SIGNATURE-----
+-----END PGP SIGNATURE-----
+ok 16 - signed-tags=verbatim
+
+expecting success of 9350.17 'signed-tags=strip': 
+
+	git fast-export --signed-tags=strip sign-your-name > output &&
+	! grep PGP output
+
+
+ok 17 - signed-tags=strip
+
+expecting success of 9350.18 'signed-tags=warn-strip': 
+	git fast-export --signed-tags=warn-strip sign-your-name >output 2>err &&
+	! grep PGP output &&
+	test -s err
+
+ok 18 - signed-tags=warn-strip
+
+expecting success of 9350.19 'setup submodule': 
+
+	test_config_global protocol.file.allow always &&
+	git checkout -f main &&
+	mkdir sub &&
+	(
+		cd sub &&
+		git init  &&
+		echo test file > file &&
+		git add file &&
+		git commit -m sub_initial
+	) &&
+	git submodule add "$(pwd)/sub" sub &&
+	git commit -m initial &&
+	test_tick &&
+	(
+		cd sub &&
+		echo more data >> file &&
+		git add file &&
+		git commit -m sub_second
+	) &&
+	git add sub &&
+	git commit -m second
+
+
+Switched to branch 'main'
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/sub/.git/
+[main (root-commit) 075e849] sub_initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file
+Adding existing repo at 'sub' to the index
+[main 32ea4ff] 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 bb8b8e2] second
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 19 - setup submodule
+
+expecting success of 9350.20 'submodule fast-export | fast-import': 
+
+	test_config_global protocol.file.allow always &&
+	SUBENT1=$(git ls-tree main^ sub) &&
+	SUBENT2=$(git ls-tree main sub) &&
+	rm -rf new &&
+	mkdir new &&
+	git --git-dir=new/.git init &&
+	git fast-export --signed-tags=strip --all >actual &&
+	(cd new &&
+	 git fast-import &&
+	 test "$SUBENT1" = "$(git ls-tree refs/heads/main^ sub)" &&
+	 test "$SUBENT2" = "$(git ls-tree refs/heads/main sub)" &&
+	 git checkout main &&
+	 git submodule init &&
+	 git submodule update &&
+	 cmp sub/file ../sub/file) <actual
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/new/.git/
+fast-import statistics:
+---------------------------------------------------------------------
+Alloc'd objects:       5000
+Total objects:           25 (         0 duplicates                  )
+      blobs  :            8 (         0 duplicates          0 deltas of          1 attempts)
+      trees  :            7 (         0 duplicates          6 deltas of          6 attempts)
+      commits:            8 (         0 duplicates          0 deltas of          0 attempts)
+      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
+Total branches:           5 (         5 loads     )
+      marks:           1024 (        16 unique    )
+      atoms:              5
+Memory total:          2426 KiB
+       pools:          2133 KiB
+     objects:           292 KiB
+---------------------------------------------------------------------
+pack_report: getpagesize()            =       4096
+pack_report: core.packedGitWindowSize =   33554432
+pack_report: core.packedGitLimit      =  268435456
+pack_report: pack_used_ctr            =          8
+pack_report: pack_mmap_calls          =          4
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1493
+---------------------------------------------------------------------
+
+Already on 'main'
+Submodule 'sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/sub) registered for path 'sub'
+Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/new/sub'...
+done.
+Submodule path 'sub': checked out '53da5af386a666416b61517c3f90dafe75821d2b'
+ok 20 - submodule fast-export | fast-import
 
-EOF
-	
-ok 7 - prepare test disallow prefixed multi-globs
+expecting success of 9350.21 'setup copies': 
 
-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
+	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
 
-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 = d6180301f5ccc8491cae6105d12d5eacac4601d5 (refs/remotes/five/trunk)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde, 8
-Found branch parent: (refs/remotes/five/branches/abcde) d6180301f5ccc8491cae6105d12d5eacac4601d5
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r10 = a0d13ab9f55f2b41864a7e49c6a034c0810225b2 (refs/remotes/five/branches/abcde)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/branches/abcde => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9168-git-svn-partially-globbed-names/svnrepo/tags/fghij, 10
-Found branch parent: (refs/remotes/five/tags/fghij) a0d13ab9f55f2b41864a7e49c6a034c0810225b2
-Following parent with do_switch
-	M	src/a/readme
-Successfully followed parent
-r11 = 2fff2a004f007e02c197d07b57a4eed70fde68ad (refs/remotes/five/tags/fghij)
-ok 10 - test globbing in the middle of the word
+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 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 9350.22 'fast-export -C -C | fast-import': 
 
-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
+	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))
 
-# passed all 12 test(s)
-1..12
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9303-fast-import-compression.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
-	
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/new/.git/
+C file2 file4
 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:          2340 KiB
-       pools:          2048 KiB
+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:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =         10
+pack_report: pack_mmap_calls          =          5
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1939
 ---------------------------------------------------------------------
 
-ok 1 - fast-import (packed) with -c core.compression=0
+ok 22 - fast-export -C -C | fast-import
 
-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.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.45.2/t/trash directory.t9350-fast-export/limit-by-paths/.git/
+[main (root-commit) c4bb517] First file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 there
+[main 5b2b7c2] Second file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar
+[main 49ac088] Change to second file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ok 25 - setup for limiting exports by PATH
+
+expecting success of 9350.26 'dropping tag of filtered out object': 
+(
+	cd limit-by-paths &&
+	git fast-export --tag-of-filtered-object=drop mytag -- there > output &&
+	test_cmp expected output
+)
+
+ok 26 - dropping tag of filtered out object
+
+expecting success of 9350.27 'rewriting tag of filtered out object': 
+(
+	cd limit-by-paths &&
+	git fast-export --tag-of-filtered-object=rewrite mytag -- there > output &&
+	test_cmp expected output
+)
+
+ok 27 - rewriting tag of filtered out object
+
+expecting success of 9350.28 'rewrite tag predating pathspecs to nothing': 
+	test_create_repo rewrite_tag_predating_pathspecs &&
+	(
+		cd rewrite_tag_predating_pathspecs &&
+
+		test_commit initial &&
+
+		git tag -a -m "Some old tag" v0.0.0.0.0.0.1 &&
+
+		test_commit bar &&
+
+		git fast-export --tag-of-filtered-object=rewrite --all -- bar.t >output &&
+		grep from.$ZERO_OID output
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/rewrite_tag_predating_pathspecs/.git/
+[main (root-commit) f175d86] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+[main 3f8d6f0] bar
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 bar.t
+from 0000000000000000000000000000000000000000
+from 0000000000000000000000000000000000000000
+ok 28 - rewrite tag predating pathspecs to nothing
+
+checking known breakage of 9350.29 'no exact-ref revisions included': 
+	(
+		cd limit-by-paths &&
+		git fast-export main~2..main~1 > output &&
+		test_cmp expected output
+	)
+
+--- expected	2024-11-14 19:49:12.389777134 +0000
++++ output	2024-11-14 19:49:12.401777257 +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.45.2/t/trash directory.t9350-fast-export/avoid_non_existent_mark/.git/
+[main (root-commit) 8503f52] important-path
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 important-path.t
+[main f2403bd] ignored
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 ignored.t
+[main 0864148] more
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 changes
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            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:          2340 KiB
-       pools:          2048 KiB
+Total branches:           6 (         2 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              1
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          6
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /        486
 ---------------------------------------------------------------------
 
-ok 2 - fast-import (packed) with -c core.compression=9
+ok 32 - avoid corrupt stream with non-existent mark
 
-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.33 'full-tree re-shows unmodified files': 
+	git checkout -f simple &&
+	git fast-export --full-tree simple >actual &&
+	test $(grep -c file0 actual) -eq 3
+
+Already on 'simple'
+ok 33 - full-tree re-shows unmodified files
+
+expecting success of 9350.34 'set-up a few more tags for tag export tests': 
+	git checkout -f main &&
+	HEAD_TREE=$(git show -s --pretty=raw HEAD | sed -n "/tree/s/tree //p") &&
+	git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
+	git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
+	git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj &&
+	git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
+
+Switched to branch 'main'
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f tag-obj_tag tree_tag-obj^{}
+hint: Disable this message with "git config advice.nestedTag false"
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f tag-obj_tag-obj tree_tag-obj^{}
+hint: Disable this message with "git config advice.nestedTag false"
+ok 34 - set-up a few more tags for tag export tests
+
+expecting success of 9350.35 'tree_tag': 
+	mkdir result &&
+	(cd result && git init) &&
+	git fast-export tree_tag > fe-stream &&
+	(cd result && git fast-import < ../fe-stream)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/result/.git/
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 33214dceb4fbcefe85fe878f546967509523d243,
+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)
@@ -521630,31 +523443,164 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 3 - fast-import (packed) with -c core.compression=0 -c pack.compression=0
+ok 35 - tree_tag
 
-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.36 'tree_tag-obj': git fast-export tree_tag-obj
+warning: Tag points to object of unexpected type tree, skipping.
+warning: Omitting tag 1c9e543c652174b3adba927fe5b56f5bef97ea21,
+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 1c9e543c652174b3adba927fe5b56f5bef97ea21,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+warning: Omitting tag 635997f61a7cce86851271fb30ba353dae1bd000,
+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 1c9e543c652174b3adba927fe5b56f5bef97ea21,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+warning: Omitting tag f5a91c72e8c7475c77964e76cb4f1b6115dbfc4b,
+since tags of trees (or tags of tags of trees, etc.) are not supported.
+ok 38 - tag-obj_tag-obj
+
+expecting success of 9350.39 'handling tags of blobs': 
+	git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
+	git fast-export blobtag >actual &&
+	cat >expect <<-EOF &&
+	blob
+	mark :1
+	data 9
+	die Luft
+
+	tag blobtag
+	from :1
+	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 14
+	Tag of a blob
+
+	EOF
+	test_cmp expect actual
+
+ok 39 - handling tags of blobs
+
+expecting success of 9350.40 'handling nested tags': 
+	git tag -a -m "This is a nested tag" nested muss &&
+	git fast-export --mark-tags nested >output &&
+	grep "^from $ZERO_OID$" output &&
+	grep "^tag nested$" output >tag_lines &&
+	test_line_count = 2 tag_lines
+
+hint: You have created a nested tag. The object referred to by your new tag is
+hint: already a tag. If you meant to tag the object that it points to, use:
+hint:
+hint: 	git tag -f nested muss^{}
+hint: Disable this message with "git config advice.nestedTag false"
+from 0000000000000000000000000000000000000000
+ok 40 - handling nested tags
+
+expecting success of 9350.41 'directory becomes symlink': 
+	git init dirtosymlink &&
+	git init result &&
+	(
+		cd dirtosymlink &&
+		mkdir foo &&
+		mkdir bar &&
+		echo hello > foo/world &&
+		echo hello > bar/world &&
+		git add foo/world bar/world &&
+		git commit -q -mone &&
+		git rm -r foo &&
+		test_ln_s_add bar foo &&
+		git commit -q -mtwo
+	) &&
+	(
+		cd dirtosymlink &&
+		git fast-export main -- foo |
+		(cd ../result && git fast-import --quiet)
+	) &&
+	(cd result && git show main:foo)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/dirtosymlink/.git/
+Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/result/.git/
+rm 'foo/world'
+checking prerequisite: SYMLINKS
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
+	# test whether the filesystem supports symbolic links
+	ln -s x y && test -h y
+
+)
+prerequisite SYMLINKS ok
+barok 41 - directory becomes symlink
+
+expecting success of 9350.42 'fast-export quotes pathnames': 
+	git init crazy-paths &&
+	test_config -C crazy-paths core.protectNTFS false &&
+	(cd crazy-paths &&
+	 blob=$(echo foo | git hash-object -w --stdin) &&
+	 git -c core.protectNTFS=false update-index --add \
+		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
+		--cacheinfo 100644 $blob "path with \"quote\"" \
+		--cacheinfo 100644 $blob "path with \\backslash" \
+		--cacheinfo 100644 $blob "path with space" &&
+	 git commit -m addition &&
+	 git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
+	 git read-tree --empty &&
+	 git update-index -z --index-info <index &&
+	 git commit -m rename &&
+	 git read-tree --empty &&
+	 git commit -m deletion &&
+	 git fast-export -M HEAD >export.out &&
+	 git rev-list HEAD >expect &&
+	 git init result &&
+	 cd result &&
+	 git fast-import <../export.out &&
+	 git rev-list HEAD >actual &&
+	 test_cmp ../expect actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/crazy-paths/.git/
+[main (root-commit) deac6af] addition
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 "path with\nnewline"
+ create mode 100644 "path with \"quote\""
+ create mode 100644 "path with \\backslash"
+ create mode 100644 path with space
+[main 89b4a6a] rename
+ Author: A U Thor <author@example.com>
+ 4 files changed, 0 insertions(+), 0 deletions(-)
+ rename "path with\nnewline" => "subdir/path with\nnewline" (100%)
+ rename "path with \"quote\"" => "subdir/path with \"quote\"" (100%)
+ rename "path with \\backslash" => "subdir/path with \\backslash" (100%)
+ rename path with space => subdir/path with space (100%)
+[main 39f052a] deletion
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 deletions(-)
+ delete mode 100644 "subdir/path with\nnewline"
+ delete mode 100644 "subdir/path with \"quote\""
+ delete mode 100644 "subdir/path with \\backslash"
+ delete mode 100644 subdir/path with space
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/crazy-paths/result/.git/
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
+Total objects:            7 (         1 duplicates                  )
       blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            3 (         1 duplicates          0 deltas of          1 attempts)
+      commits:            3 (         0 duplicates          0 deltas of          0 attempts)
       tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              5
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -521666,67 +523612,61 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 4 - fast-import (packed) with -c core.compression=9 -c pack.compression=0
+ok 42 - fast-export quotes pathnames
 
-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.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.45.2/t/trash directory.t9350-fast-export/marks-test/.git/
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+Total objects:           38 (         0 duplicates                  )
+      blobs  :           11 (         0 duplicates          1 deltas of          4 attempts)
+      trees  :           13 (         0 duplicates         12 deltas of         12 attempts)
+      commits:           14 (         0 duplicates          0 deltas of          0 attempts)
       tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+Total branches:           5 (         5 loads     )
+      marks:           1024 (        25 unique    )
+      atoms:             10
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          8
+pack_report: pack_mmap_calls          =          4
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       1493
 ---------------------------------------------------------------------
 
-ok 5 - fast-import (packed) with -c core.compression=0 -c pack.compression=9
-
-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
-	
+HEAD is now at bb8b8e2 second
+[main d085d4e] back in time
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
+Total objects:            3 (         0 duplicates                  )
       blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      commits:            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+      commits:            1 (         0 duplicates          0 deltas of          0 attempts)
       tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+Total branches:           5 (         1 loads     )
+      marks:           1024 (        16 unique    )
+      atoms:              5
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -521738,31 +523678,107 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 6 - fast-import (packed) with -c core.compression=9 -c pack.compression=9
+ok 43 - test bidirectionality
 
-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
-	
+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 ba31be1] 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.45.2/t/trash directory.t9350-fast-export/src/.git/
+[main (root-commit) b469450] 1st_commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 file.txt
+[main 85ccff7] 2nd_commit
+ Author: A U Thor <author@example.com>
+ 2 files changed, 2 insertions(+)
+ create mode 100644 file2.txt
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2340 KiB
-       pools:          2048 KiB
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         4 unique    )
+      atoms:              2
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -521774,31 +523790,120 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 7 - fast-import (packed) with -c pack.compression=0
+ok 49 - when using -C, do not declare copy when source of copy is also modified
 
-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
-	
+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.45.2/t/trash directory.t9350-fast-export/merging/.git/
+[main (root-commit) 1aef781] initial
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 initial.t
+Switched to a new branch 'topic'
+[topic bb9f331] on-topic
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 on-topic.t
+Switched to branch 'main'
+[main a2e3e6b] on-main
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 on-main.t
+Merge made by the 'ort' strategy.
+ on-topic.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 on-topic.t
+Yeah
+ok 50 - merge commit gets exported with --import-marks
+
+expecting success of 9350.51 'fast-export --first-parent outputs all revisions output by revision walk': 
+	git init first-parent &&
+	(
+		cd first-parent &&
+		test_commit A &&
+		git checkout -b topic1 &&
+		test_commit B &&
+		git checkout main &&
+		git merge --no-ff topic1 &&
+
+		git checkout -b topic2 &&
+		test_commit C &&
+		git checkout main &&
+		git merge --no-ff topic2 &&
+
+		test_commit D &&
+
+		git fast-export main -- --first-parent >first-parent-export &&
+		git fast-export main -- --first-parent --reverse >first-parent-reverse-export &&
+		test_cmp first-parent-export first-parent-reverse-export &&
+
+		git init import &&
+		git -C import fast-import <first-parent-export &&
+
+		git log --format="%ad %s" --first-parent main >expected &&
+		git -C import log --format="%ad %s" --all >actual &&
+		test_cmp expected actual &&
+		test_line_count = 4 actual
+	)
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/first-parent/.git/
+[main (root-commit) 40531c9] A
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 A.t
+Switched to a new branch 'topic1'
+[topic1 26bf445] B
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ B.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 B.t
+Switched to a new branch 'topic2'
+[topic2 3d54688] C
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+Switched to branch 'main'
+Merge made by the 'ort' strategy.
+ C.t | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 C.t
+[main 0270458] D
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 D.t
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2340 KiB
-       pools:          2048 KiB
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         8 unique    )
+      atoms:              4
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -521810,31 +523915,44 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 8 - fast-import (packed) with -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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9301-fast-import-notes.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9301-fast-import-notes/.git/
+expecting success of 9301.1 'set up main branch': 
+
+	git fast-import <input &&
+	git whatchanged main
 
-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)
+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:           0 (         0 loads     )
+Total branches:           1 (         1 loads     )
       marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+      atoms:              4
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -521846,31 +523964,62 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 9 - fast-import (loose) with -c core.compression=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
+
+commit bcc89d2db5d163929b6fbd169c2559b47a076acb
+Author: C O Mitter <committer@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    second commit
+
+:100644 100755 532386d be960bf M	baz/xyzzy
+:100644 100644 df023b2 215df20 M	foo
+
+commit 49f8b007d515fc33aed8245ee498753d4270cc78
+Author: C O Mitter <committer@example.com>
+Date:   Thu Apr 7 15:13:13 2005 -0700
+
+    first commit
+
+: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 9301.2 'add notes with simple M command': 
+
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
+	test_cmp expect actual
+
 
-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)
+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:           0 (         0 loads     )
+Total branches:           1 (         1 loads     )
       marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+      atoms:              2
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -521882,31 +524031,28 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 10 - fast-import (loose) with -c core.compression=9
+ok 2 - add notes with simple M command
+
+expecting success of 9301.3 'add notes with simple N command': 
+
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
+	test_cmp expect actual
+
 
-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)
+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:           0 (         0 loads     )
+Total branches:           1 (         1 loads     )
       marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+      atoms:              4
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -521918,31 +524064,28 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 11 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=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
+
 
-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)
+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:           0 (         0 loads     )
+Total branches:           1 (         1 loads     )
       marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+      atoms:              4
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -521954,31 +524097,28 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 12 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=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
+
 
-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)
+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:           0 (         0 loads     )
+Total branches:           1 (         1 loads     )
       marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+      atoms:             10
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -521990,31 +524130,28 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 13 - fast-import (loose) with -c core.compression=0 -c core.loosecompression=9
+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
+
 
-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)
+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:           0 (         0 loads     )
+Total branches:           1 (         1 loads     )
       marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+      atoms:              6
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -522026,31 +524163,28 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 14 - fast-import (loose) with -c core.compression=9 -c core.loosecompression=9
+ok 6 - verify that deleteall also removes notes
+
+expecting success of 9301.7 'verify that later N commands override earlier M commands': 
+
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
+	test_cmp expect actual
+
 
-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)
+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:           0 (         0 loads     )
+Total branches:           1 (         1 loads     )
       marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+      atoms:              2
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -522062,147 +524196,128 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 15 - fast-import (loose) with -c core.loosecompression=0
+ok 7 - verify that later N commands override earlier M commands
+
+expecting success of 9301.8 'add lots of commits and notes': 
+
+	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 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)
+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:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
+Total branches:           2 (         2 loads     )
+      marks:           1024 (       400 unique    )
+      atoms:            864
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          4
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     129374 /     129374
 ---------------------------------------------------------------------
 
-ok 16 - fast-import (loose) with -c core.loosecompression=9
-
-# passed all 16 test(s)
-1..16
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9304-fast-import-marks.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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 - add lots of commits and notes
 
-[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 9301.9 'verify that lots of notes trigger a fanout scheme': 
+	hexsz=$(test_oid hexsz) &&
 
-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)
+	# 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
-		echo ":$i $blob" || return 1
-	done >>marks
+		if test $(expr length "$path") -ge $hexsz
+		then
+			return 1
+		fi
+	done
 
-ok 2 - setup large marks file
 
-expecting success of 9304.3 'import with large marks file': 
-	git fast-import --import-marks=marks <dump
+ok 9 - verify that lots of notes trigger a fanout scheme
+
+expecting success of 9301.10 'verify that importing a notes tree respects the fanout scheme': 
+	git fast-import <input &&
+
+	# 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
 
 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:            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:           1 (         1 loads     )
-      marks:        1048576 (     15363 unique    )
-      atoms:              1
-Memory total:          2426 KiB
-       pools:          2133 KiB
+Total branches:           4 (         4 loads     )
+      marks:           1024 (       400 unique    )
+      atoms:            864
+Memory total:          2512 KiB
+       pools:          2219 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =        212
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     129374 /     129374
 ---------------------------------------------------------------------
 
-ok 3 - import with large marks file
+ok 10 - verify that importing a notes tree respects the fanout scheme
 
-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
+expecting success of 9301.11 'verify that non-notes are untouched by a fanout change': 
 
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t9304-fast-import-marks/sub'...
-done.
-[master fa05818] 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
+	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 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
+ok 11 - verify that non-notes are untouched by a fanout change
 
-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 &&
+expecting success of 9301.12 'change a few existing notes': 
+
+	git fast-import <input &&
+	GIT_NOTES_REF=refs/notes/many_notes git log -n3 refs/heads/many_commits |
+	    grep "^    " > actual &&
 	test_cmp expect actual
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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)
+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 (         6 unique    )
-      atoms:              3
+      marks:           1024 (         0 unique    )
+      atoms:            608
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -522210,43 +524325,48 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =        216
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     129374 /     129374
 ---------------------------------------------------------------------
 
-ok 6 - import with submodule mapping
+ok 12 - change a few existing notes
+
+expecting success of 9301.13 'verify that changing notes respect existing fanout': 
+
+	# 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
+
+
+ok 13 - verify that changing notes respect existing fanout
+
+expecting success of 9301.14 'remove lots of notes': 
+
+	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 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.45.2/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)
+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 (         6 unique    )
-      atoms:              3
+      marks:           1024 (         0 unique    )
+      atoms:            618
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -522254,36 +524374,64 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =        593
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =     129374 /     129374
 ---------------------------------------------------------------------
 
-ok 7 - paths adjusted for relative subdir
+ok 14 - remove lots of notes
+
+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
+
+		if test $(expr length "$path") -ne $hexsz
+		then
+			return 1
+		fi
+	done
+
+
+ok 15 - verify that removing notes trigger fanout consolidation
+
+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
+
+
+ok 16 - verify that non-notes are untouched by a fanout change
+
+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
 
-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.45.2/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)
+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:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              3
+Total branches:          11 (        21 loads     )
+      marks:           1024 (        16 unique    )
+      atoms:             17
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -522291,16 +524439,735 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =         10
+pack_report: pack_mmap_calls          =         10
+pack_report: pack_open_windows        =          0 /          1
+pack_report: pack_mapped              =          0 /       6351
 ---------------------------------------------------------------------
 
-ok 8 - relative marks are not affected by subdir
+ok 17 - add notes to 16 commits in each of 10 refs
 
-# passed all 8 test(s)
-1..8
+# passed all 17 test(s)
+1..17
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9200-git-cvsexportcommit.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/.git/
+checking prerequisite: NOT_ROOT
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
+	uid=$(id -u) &&
+	test "$uid" != 0
+
+)
+prerequisite NOT_ROOT ok
+expecting success of 9200.1 'New file': 
+	mkdir A B C D E F &&
+	echo hello1 >A/newfile1.txt &&
+	echo hello2 >B/newfile2.txt &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
+	git add A/newfile1.txt &&
+	git add B/newfile2.txt &&
+	git add C/newfile3.png &&
+	git add D/newfile4.png &&
+	git commit -a -m "Test: New file" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "newfile1.txt/1.1/" &&
+	check_entries B "newfile2.txt/1.1/" &&
+	check_entries C "newfile3.png/1.1/-kb" &&
+	check_entries D "newfile4.png/1.1/-kb" &&
+	test_cmp A/newfile1.txt ../A/newfile1.txt &&
+	test_cmp B/newfile2.txt ../B/newfile2.txt &&
+	test_cmp C/newfile3.png ../C/newfile3.png &&
+	test_cmp D/newfile4.png ../D/newfile4.png
+	)
+
+[master 288d750] Test: New file
+ Author: A U Thor <author@example.com>
+ 4 files changed, 2 insertions(+)
+ create mode 100644 A/newfile1.txt
+ create mode 100644 B/newfile2.txt
+ create mode 100644 C/newfile3.png
+ create mode 100644 D/newfile4.png
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D put under version control
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C put under version control
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B put under version control
+Directory /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
+initial revision: 1.1
+/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
+initial revision: 1.1
+Committed successfully to CVS
+ok 1 - New file
+
+expecting success of 9200.2 'Remove two files, add two and update two': 
+	echo Hello1 >>A/newfile1.txt &&
+	rm -f B/newfile2.txt &&
+	rm -f C/newfile3.png &&
+	echo Hello5  >E/newfile5.txt &&
+	cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
+	git add E/newfile5.txt &&
+	git add F/newfile6.png &&
+	git commit -a -m "Test: Remove, add and update" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "newfile1.txt/1.2/" &&
+	check_entries B "" &&
+	check_entries C "" &&
+	check_entries D "newfile4.png/1.2/-kb" &&
+	check_entries E "newfile5.txt/1.1/" &&
+	check_entries F "newfile6.png/1.1/-kb" &&
+	test_cmp A/newfile1.txt ../A/newfile1.txt &&
+	test_cmp D/newfile4.png ../D/newfile4.png &&
+	test_cmp E/newfile5.txt ../E/newfile5.txt &&
+	test_cmp F/newfile6.png ../F/newfile6.png
+	)
+
+[master 69b0239] Test: Remove, add and update
+ Author: A U Thor <author@example.com>
+ 5 files changed, 2 insertions(+), 1 deletion(-)
+ delete mode 100644 B/newfile2.txt
+ create mode 100644 E/newfile5.txt
+ rename C/newfile3.png => F/newfile6.png (100%)
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F put under version control
+Directory /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/newfile5.txt,v  <--  E/newfile5.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F/newfile6.png,v  <--  F/newfile6.png
+initial revision: 1.1
+Committed successfully to CVS
+ok 2 - Remove two files, add two and update two
+
+expecting success of 9200.3 'Fail to change binary more than one generation old': cat F/newfile6.png >>D/newfile4.png &&
+     git commit -a -m "generatiion 1" &&
+     cat F/newfile6.png >>D/newfile4.png &&
+     git commit -a -m "generation 2" &&
+     id=$(git rev-list --max-count=1 HEAD) &&
+     (cd "$CVSWORK" &&
+     test_must_fail git cvsexportcommit -c $id
+     )
+[master 70e0115] generatiion 1
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+[master d73a469] generation 2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+Checking if patch will apply
+Applying
+error: the patch applies to 'D/newfile4.png' (ac22ccbd3ee9f03a3b38249ac8efdbe96b5da2cd), which does not match the current contents.
+error: D/newfile4.png: patch does not apply
+cannot patch at /build/reproducible-path/git-2.45.2/git-cvsexportcommit line 338.
+ok 3 - Fail to change binary more than one generation old
+
+expecting success of 9200.4 'Remove only binary files': 
+	git reset --hard HEAD^^ &&
+	rm -f D/newfile4.png &&
+	git commit -a -m "test: remove only a binary file" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "newfile1.txt/1.2/" &&
+	check_entries B "" &&
+	check_entries C "" &&
+	check_entries D "" &&
+	check_entries E "newfile5.txt/1.1/" &&
+	check_entries F "newfile6.png/1.1/-kb" &&
+	test_cmp A/newfile1.txt ../A/newfile1.txt &&
+	test_cmp E/newfile5.txt ../E/newfile5.txt &&
+	test_cmp F/newfile6.png ../F/newfile6.png
+	)
+
+HEAD is now at 69b0239 Test: Remove, add and update
+[master 2a45f53] test: remove only a binary file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ delete mode 100644 D/newfile4.png
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs remove: scheduling `D/newfile4.png' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+Commit to CVS
+Patch title (first comment line): test: remove only a binary file
+Autocommit
+  cvs commit -F .msg 'D/newfile4.png'
+/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
+new revision: delete; previous revision: 1.2
+Committed successfully to CVS
+ok 4 - Remove only binary files
+
+expecting success of 9200.5 'Remove only a text file': 
+	rm -f A/newfile1.txt &&
+	git commit -a -m "test: remove only a binary file" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries A "" &&
+	check_entries B "" &&
+	check_entries C "" &&
+	check_entries D "" &&
+	check_entries E "newfile5.txt/1.1/" &&
+	check_entries F "newfile6.png/1.1/-kb" &&
+	test_cmp E/newfile5.txt ../E/newfile5.txt &&
+	test_cmp F/newfile6.png ../F/newfile6.png
+	)
+
+[master fa834fd] test: remove only a binary file
+ Author: A U Thor <author@example.com>
+ 1 file changed, 2 deletions(-)
+ delete mode 100644 A/newfile1.txt
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs remove: scheduling `A/newfile1.txt' for removal
+cvs remove: use `cvs commit' to remove this file permanently
+Commit to CVS
+Patch title (first comment line): test: remove only a binary file
+Autocommit
+  cvs commit -F .msg 'A/newfile1.txt'
+/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
+new revision: delete; previous revision: 1.2
+Committed successfully to CVS
+ok 5 - Remove only a text file
+
+expecting success of 9200.6 'New file with spaces in file name': 
+	mkdir "G g" &&
+	echo ok then >"G g/with spaces.txt" &&
+	git add "G g/with spaces.txt" && \
+	cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
+	git add "G g/with spaces.png" &&
+	git commit -a -m "With spaces" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/"
+	)
+
+[master 7dad360] With spaces
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 G g/with spaces.png
+ create mode 100644 G g/with spaces.txt
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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 9200.7 'Update file with spaces in file name': 
+	echo Ok then >>"G g/with spaces.txt" &&
+	cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
+	git add "G g/with spaces.png" &&
+	git commit -a -m "Update with spaces" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -c $id &&
+	check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
+	)
+
+[master 200512b] Update with spaces
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Commit to CVS
+Patch title (first comment line): Update with spaces
+Autocommit
+  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
+/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
+new revision: 1.2; previous revision: 1.1
+Committed successfully to CVS
+ok 7 - Update file with spaces in file name
+
+expecting success of 9200.8 'File with non-ascii file name': 
+	mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
+	echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
+	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
+	cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
+	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
+	git commit -a -m "Går det så går det" && \
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	git cvsexportcommit -v -c $id &&
+	check_entries \
+	"Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \
+	"gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/"
+	)
+
+[master 2dba919] Går det så går det
+ Author: A U Thor <author@example.com>
+ 2 files changed, 1 insertion(+)
+ create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.png"
+ create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.txt"
+Applying to CVS commit 2dba9190cda577aa84017fec4349519cd1aadafb from parent 200512bccb19b444ac4f1e098c7d7d3578864bb4
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã… put under version control
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo put under version control
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a put under version control
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b put under version control
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c put under version control
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d put under version control
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e put under version control
+Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f put under version control
+Directory /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt,v  <--  Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt
+initial revision: 1.1
+Committed successfully to CVS
+ok 8 - File with non-ascii file name
+
+expecting success of 9200.9 'Mismatching patch should fail': 
+	date >>"E/newfile5.txt" &&
+	git add "E/newfile5.txt" &&
+	git commit -a -m "Update one" &&
+	date >>"E/newfile5.txt" &&
+	git add "E/newfile5.txt" &&
+	git commit -a -m "Update two" &&
+	id=$(git rev-list --max-count=1 HEAD) &&
+	(cd "$CVSWORK" &&
+	test_must_fail git cvsexportcommit -c $id
+	)
+
+[master a225852] Update one
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+[master 485a361] 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.45.2/git-cvsexportcommit line 338.
+ok 9 - Mismatching patch should fail
+
+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 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
+	)
+
+[master a3919d6] 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.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/off,v  <--  G/off
+initial revision: 1.1
+/build/reproducible-path/git-2.45.2/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 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
+	)
+
+[master 28ab3f7] 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.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file1.txt,v  <--  W/file1.txt
+initial revision: 1.1
+/build/reproducible-path/git-2.45.2/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 9200.12 'check files before directories': 
+
+	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 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
+
+
+[master e7ecdab] 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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
+initial revision: 1.1
+Committed successfully to CVS
+[master 67b709b] Add two files with the same basename
+ Author: A U Thor <author@example.com>
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ create mode 100644 DS
+ create mode 100644 E/DS
+Checking if patch will apply
+cvs status: nothing known about `DS'
+cvs status: nothing known about `E/DS'
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+cvs add: scheduling file `DS' for addition
+cvs add: use `cvs commit' to add this file permanently
+cvs add: scheduling file `E/DS' for addition
+cvs add: use `cvs commit' to add this file permanently
+Commit to CVS
+Patch title (first comment line): Add two files with the same basename
+Autocommit
+  cvs commit -F .msg 'DS' 'E/DS' 'release-notes'
+/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/DS,v  <--  DS
+initial revision: 1.1
+/build/reproducible-path/git-2.45.2/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.45.2/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 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") &&
+
+	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"
+
+[master 6fea91f] 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.45.2/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 9200.14 'commit a file with leading spaces in the name': 
+
+	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"
+
+
+[master 9a9f93b] 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.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/shared/.git/
+[master (root-commit) 93a1e74] fake initial commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644  space
+[master 6935f1b] Another change
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+Checking if patch will apply
+Applying
+Patch applied successfully. Adding new files and directories to CVS
+Commit to CVS
+Patch title (first comment line): Another change
+Autocommit
+  cvs commit -F .msg  space
+Committed successfully to CVS
+HEAD is now at 6935f1b Another change
+Hello
+ok 15 - use the same checkout for Git and CVS
+
+# passed all 15 test(s)
+1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9300-fast-import.sh ***
@@ -522339,7 +525206,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_26928
+fast-import: dumping crash report to .git/fast_import_crash_11492
 ok 2 - truncated stream complains
 
 expecting success of 9300.3 'A: create pack from stdin': 
@@ -522833,7 +525700,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_27326
+fast-import: dumping crash report to .git/fast_import_crash_12064
 ok 20 - B: fail on invalid blob sha1
 
 expecting success of 9300.21 'B: accept branch name "TEMP_TAG"': 
@@ -522941,7 +525808,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_27496
+fast-import: dumping crash report to .git/fast_import_crash_12288
 ok 23 - B: reject invalid timezone
 
 expecting success of 9300.24 'B: accept invalid timezone with raw-permissive': 
@@ -523049,7 +525916,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_27597
+fast-import: dumping crash report to .git/fast_import_crash_12497
 ok 26 - B: fail on invalid committer (1)
 
 expecting success of 9300.27 'B: fail on invalid committer (2)': 
@@ -523065,7 +525932,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_27619
+fast-import: dumping crash report to .git/fast_import_crash_12530
 ok 27 - B: fail on invalid committer (2)
 
 expecting success of 9300.28 'B: fail on invalid committer (3)': 
@@ -523081,7 +525948,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_27634
+fast-import: dumping crash report to .git/fast_import_crash_12573
 ok 28 - B: fail on invalid committer (3)
 
 expecting success of 9300.29 'B: fail on invalid committer (4)': 
@@ -523097,7 +525964,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_27658
+fast-import: dumping crash report to .git/fast_import_crash_12616
 ok 29 - B: fail on invalid committer (4)
 
 expecting success of 9300.30 'B: fail on invalid committer (5)': 
@@ -523113,7 +525980,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_27674
+fast-import: dumping crash report to .git/fast_import_crash_12642
 ok 30 - B: fail on invalid committer (5)
 
 expecting success of 9300.31 'C: incremental import create pack from stdin': 
@@ -523346,7 +526213,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_27876
+fast-import: dumping crash report to .git/fast_import_crash_13026
 ok 41 - E: rfc2822 date, --date-format=raw
 
 expecting success of 9300.42 'E: rfc2822 date, --date-format=rfc2822': 
@@ -523745,7 +526612,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_28383
+fast-import: dumping crash report to .git/fast_import_crash_13665
 ok 59 - J: tag must fail on empty branch
 
 expecting success of 9300.60 'K: reinit branch with from': 
@@ -524860,7 +527727,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_29376
+fast-import: dumping crash report to .git/fast_import_crash_14569
 ok 81 - N: reject foo/ syntax
 
 expecting success of 9300.82 'N: reject foo/ syntax in copy source': 
@@ -524876,7 +527743,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_29391
+fast-import: dumping crash report to .git/fast_import_crash_14574
 ok 82 - N: reject foo/ syntax in copy source
 
 expecting success of 9300.83 'N: reject foo/ syntax in rename source': 
@@ -524892,7 +527759,7 @@
 	INPUT_END
 
 fatal: Path file2/ not in branch
-fast-import: dumping crash report to .git/fast_import_crash_29408
+fast-import: dumping crash report to .git/fast_import_crash_14576
 ok 83 - N: reject foo/ syntax in rename source
 
 expecting success of 9300.84 'N: reject foo/ syntax in ls argument': 
@@ -524908,7 +527775,7 @@
 	INPUT_END
 
 fatal: Empty path component found in input
-fast-import: dumping crash report to .git/fast_import_crash_29422
+fast-import: dumping crash report to .git/fast_import_crash_14585
 ok 84 - N: reject foo/ syntax in ls argument
 
 expecting success of 9300.85 'N: copy to root ("") by id and modify': 
@@ -525745,7 +528612,7 @@
 pack_report: pack_used_ctr            =          4
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7997 /       7997
+pack_report: pack_mapped              =       8138 /       8138
 ---------------------------------------------------------------------
 
 ok 97 - P: verbatim SHA gitlinks
@@ -525771,7 +528638,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_30382
+fast-import: dumping crash report to .git/fast_import_crash_15849
 ok 98 - P: fail on inline gitlink
 
 expecting success of 9300.99 'P: fail on blob mark in gitlink': 
@@ -525798,7 +528665,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_30395
+fast-import: dumping crash report to .git/fast_import_crash_15871
 ok 99 - P: fail on blob mark in gitlink
 
 expecting success of 9300.100 'Q: commit notes': 
@@ -526185,7 +529052,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_30810
+fast-import: dumping crash report to .git/fast_import_crash_16494
 ok 121 - Q: deny note on empty branch
 
 expecting success of 9300.122 'R: abort on unsupported feature': 
@@ -526196,7 +529063,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_30817
+fast-import: dumping crash report to .git/fast_import_crash_16504
 ok 122 - R: abort on unsupported feature
 
 expecting success of 9300.123 'R: supported feature is accepted': 
@@ -526243,7 +529110,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_30831
+fast-import: dumping crash report to .git/fast_import_crash_16539
 ok 124 - R: abort on receiving feature after data command
 
 expecting success of 9300.125 'R: import-marks features forbidden by default': 
@@ -526254,9 +529121,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_30835
+fast-import: dumping crash report to .git/fast_import_crash_16555
 fatal: feature 'import-marks-if-exists' forbidden in input without --allow-unsafe-features
-fast-import: dumping crash report to .git/fast_import_crash_30840
+fast-import: dumping crash report to .git/fast_import_crash_16559
 ok 125 - R: import-marks features forbidden by default
 
 expecting success of 9300.126 'R: only one import-marks feature allowed per stream': 
@@ -526270,7 +529137,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_30846
+fast-import: dumping crash report to .git/fast_import_crash_16579
 ok 126 - R: only one import-marks feature allowed per stream
 
 expecting success of 9300.127 'R: export-marks feature forbidden by default': 
@@ -526278,7 +529145,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_30851
+fast-import: dumping crash report to .git/fast_import_crash_16595
 ok 127 - R: export-marks feature forbidden by default
 
 expecting success of 9300.128 'R: export-marks feature results in a marks file being created': 
@@ -526368,9 +529235,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_30873
+fast-import: dumping crash report to .git/fast_import_crash_16690
 fatal: cannot read 'nonexistent.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_30879
+fast-import: dumping crash report to .git/fast_import_crash_16704
 ok 130 - R: catch typo in marks file name
 
 expecting success of 9300.131 'R: import and output marks can be the same file': 
@@ -526457,7 +529324,7 @@
 	EOF
 
 fatal: cannot read 'io.marks': No such file or directory
-fast-import: dumping crash report to .git/fast_import_crash_30906
+fast-import: dumping crash report to .git/fast_import_crash_16807
 ok 132 - R: --import-marks=foo --output-marks=foo to create foo fails
 
 expecting success of 9300.133 'R: --import-marks-if-exists': 
@@ -526674,7 +529541,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7997 /       7997
+pack_report: pack_mapped              =       8138 /       8138
 ---------------------------------------------------------------------
 
 ok 135 - R: import to output marks works without any content
@@ -526709,7 +529576,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7997 /       7997
+pack_report: pack_mapped              =       8138 /       8138
 ---------------------------------------------------------------------
 
 ok 136 - R: import marks prefers commandline marks file over the stream
@@ -526747,7 +529614,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7997 /       7997
+pack_report: pack_mapped              =       8138 /       8138
 ---------------------------------------------------------------------
 
 ok 137 - R: multiple --import-marks= should be honoured
@@ -526785,7 +529652,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7997 /       7997
+pack_report: pack_mapped              =       8138 /       8138
 ---------------------------------------------------------------------
 
 ok 138 - R: feature relative-marks should be honoured
@@ -526822,7 +529689,7 @@
 pack_report: pack_used_ctr            =          6
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7997 /       7997
+pack_report: pack_mapped              =       8138 /       8138
 ---------------------------------------------------------------------
 
 ok 139 - R: feature no-relative-marks should be honoured
@@ -526891,7 +529758,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_31014
+fast-import: dumping crash report to .git/fast_import_crash_17071
 ok 142 - R: cat-blob-fd must be a nonnegative integer
 
 expecting success of 9300.143 'R: print old blob': 
@@ -526972,7 +529839,7 @@
 pack_report: pack_used_ctr            =          1
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7997 /       7997
+pack_report: pack_mapped              =       8138 /       8138
 ---------------------------------------------------------------------
 
 fast-import statistics:
@@ -526996,7 +529863,7 @@
 pack_report: pack_used_ctr            =          1
 pack_report: pack_mmap_calls          =          1
 pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =       7997 /       7997
+pack_report: pack_mapped              =       8138 /       8138
 ---------------------------------------------------------------------
 
 ok 144 - R: in-stream cat-blob-fd not respected
@@ -527193,7 +530060,7 @@
 pack_report: pack_used_ctr            =          2
 pack_report: pack_mmap_calls          =          2
 pack_report: pack_open_windows        =          1 /          2
-pack_report: pack_mapped              =       7997 /       8622
+pack_report: pack_mapped              =       8138 /       8763
 ---------------------------------------------------------------------
 
 ok 149 - R: print two blobs to stdout
@@ -527403,9 +530270,9 @@
 	test_must_fail git fast-import --done </dev/null
 
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_31362
+fast-import: dumping crash report to .git/fast_import_crash_17548
 fatal: stream ends early
-fast-import: dumping crash report to .git/fast_import_crash_31369
+fast-import: dumping crash report to .git/fast_import_crash_17555
 ok 154 - R: feature done means terminating "done" is mandatory
 
 expecting success of 9300.155 'R: terminating "done" with trailing gibberish is ok': 
@@ -527527,14 +530394,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_31429
+fast-import: dumping crash report to .git/fast_import_crash_17596
 ok 157 - R: die on unknown option
 
 expecting success of 9300.158 'R: unknown commandline options are rejected': \
 	test_must_fail git fast-import --non-existing-option < /dev/null
 
 fatal: unknown option --non-existing-option
-fast-import: dumping crash report to .git/fast_import_crash_31440
+fast-import: dumping crash report to .git/fast_import_crash_17612
 ok 158 - R: unknown commandline options are rejected
 
 expecting success of 9300.159 'R: die on invalid option argument': 
@@ -527545,11 +530412,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_31450
+fast-import: dumping crash report to .git/fast_import_crash_17633
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_31463
+fast-import: dumping crash report to .git/fast_import_crash_17642
 fatal: --depth: argument must be a non-negative integer
-fast-import: dumping crash report to .git/fast_import_crash_31472
+fast-import: dumping crash report to .git/fast_import_crash_17648
 ok 159 - R: die on invalid option argument
 
 expecting success of 9300.160 'R: ignore non-git options': 
@@ -527600,7 +530467,7 @@
 	test_cmp expect io.marks
 
 fatal: object not found: 0000000000000000000000000000000000000000
-fast-import: dumping crash report to .git/fast_import_crash_31510
+fast-import: dumping crash report to .git/fast_import_crash_17673
 ok 161 - R: corrupt lines do not mess marks file
 
 expecting success of 9300.162 'R: blob bigger than threshold': 
@@ -529257,2413 +532124,396 @@
 		data <<COMMIT
 		commit with bad path
 		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: NUL in dest: R hello.c "hello\000"
-ok 213 - S: filerename with escaped NUL in quoted dest must fail
-
-expecting success of 9300.214 'S: filerename with garbage after quoted dest must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Garbage after dest: R hello.c "hello.c"x
-ok 214 - S: filerename with garbage after quoted dest must fail
-
-expecting success of 9300.215 'S: filerename with space after quoted dest must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Garbage after dest: R hello.c "hello.c" 
-ok 215 - S: filerename with space after quoted dest must fail
-
-expecting success of 9300.216 'S: ls (in commit) with unclosed " in path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Invalid path: ls :2 "hello.c
-ok 216 - S: ls (in commit) with unclosed " in path must fail
-
-expecting success of 9300.217 'S: ls (in commit) with invalid escape in quoted path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Invalid path: ls :2 "hello\xff"
-ok 217 - S: ls (in commit) with invalid escape in quoted path must fail
-
-expecting success of 9300.218 'S: ls (in commit) with escaped NUL in quoted path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: NUL in path: ls :2 "hello\000"
-ok 218 - S: ls (in commit) with escaped NUL in quoted path must fail
-
-expecting success of 9300.219 'S: ls (in commit) with garbage after quoted path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Garbage after path: ls :2 "hello.c"x
-ok 219 - S: ls (in commit) with garbage after quoted path must fail
-
-expecting success of 9300.220 'S: ls (in commit) with space after quoted path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Garbage after path: ls :2 "hello.c" 
-ok 220 - S: ls (in commit) with space after quoted path must fail
-
-expecting success of 9300.221 'S: ls (without dataref in commit) with unclosed " in path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Invalid path: ls "hello.c
-ok 221 - S: ls (without dataref in commit) with unclosed " in path must fail
-
-expecting success of 9300.222 'S: ls (without dataref in commit) with invalid escape in quoted path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Invalid path: ls "hello\xff"
-ok 222 - S: ls (without dataref in commit) with invalid escape in quoted path must fail
-
-expecting success of 9300.223 'S: ls (without dataref in commit) with escaped NUL in quoted path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: NUL in path: ls "hello\000"
-ok 223 - S: ls (without dataref in commit) with escaped NUL in quoted path must fail
-
-expecting success of 9300.224 'S: ls (without dataref in commit) with garbage after quoted path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Garbage after path: ls "hello.c"x
-ok 224 - S: ls (without dataref in commit) with garbage after quoted path must fail
-
-expecting success of 9300.225 'S: ls (without dataref in commit) with space after quoted path must fail': 
-		test_must_fail git fast-import <<-EOF 2>err &&
-		blob
-		mark :1
-		data <<BLOB
-		hello world
-		BLOB
-
-		commit refs/heads/S-path-fail
-		mark :2
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit setup
-		COMMIT
-		M 100644 :1 hello.c
-
-		commit refs/heads/S-path-fail
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		commit with bad path
-		COMMIT
-		from :2
-		$prefix$path$suffix
-		EOF
-
-		test_grep "$err_grep" err
-	
-fatal: Garbage after path: ls "hello.c" 
-ok 225 - S: ls (without dataref in commit) with space after quoted path must fail
-
-expecting success of 9300.226 'T: ls root ("") tree': 
-		sed -e "s/Z\$//" >expect <<-EOF &&
-		040000 tree $(git rev-parse S^{tree})	Z
-		EOF
-		sha1=$(git rev-parse --verify S) &&
-		git fast-import --import-marks=marks <<-EOF >actual &&
-		ls $sha1 $root
-		EOF
-		test_cmp expect actual
-	
-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 (         5 unique    )
-      atoms:              1
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          8
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        678 /        678
----------------------------------------------------------------------
-
-ok 226 - T: ls root ("") tree
-
-expecting success of 9300.227 'T: ls root () tree': 
-		sed -e "s/Z\$//" >expect <<-EOF &&
-		040000 tree $(git rev-parse S^{tree})	Z
-		EOF
-		sha1=$(git rev-parse --verify S) &&
-		git fast-import --import-marks=marks <<-EOF >actual &&
-		ls $sha1 $root
-		EOF
-		test_cmp expect actual
-	
-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 (         5 unique    )
-      atoms:              1
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          8
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        678 /        678
----------------------------------------------------------------------
-
-ok 227 - T: ls root () tree
-
-expecting success of 9300.228 'T: delete branch': 
-	git branch to-delete &&
-	git fast-import <<-EOF &&
-	reset refs/heads/to-delete
-	from $ZERO_OID
-	EOF
-	test_must_fail git rev-parse --verify refs/heads/to-delete
-
-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:           1 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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: Needed a single revision
-ok 228 - T: delete branch
-
-expecting success of 9300.229 'T: empty reset doesnt delete branch': 
-	git branch not-to-delete &&
-	git fast-import <<-EOF &&
-	reset refs/heads/not-to-delete
-	EOF
-	git show-ref &&
-	git rev-parse --verify refs/heads/not-to-delete
-
-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:           1 (         0 loads     )
-      marks:           1024 (         0 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
----------------------------------------------------------------------
-
-8c1bf1b9f891df8805c27a54986e5043829939ad refs/heads/H
-45b12606bd487d1bc687864db7641b9bfd4ddcd0 refs/heads/J
-c85b9f480bbc2f7616de78fc96c08204e0f5b70e refs/heads/K
-8cecdab6b3e4062de5b06ad3accf5bff1449e99b refs/heads/L
-7144e0bde79efa21349b6a09f1b68b74e59da773 refs/heads/M1
-0641406b2b83a2c327e6950aa51f13010fe647b1 refs/heads/M2
-b258d10cb71ac72904c40ef2d07b67e3f444ce19 refs/heads/M3
-afc4da065d1be07543ab49500b355f7342f5a0bf refs/heads/M4
-d80c4052a8e9a163f90de3fa74ec993595d7f0b3 refs/heads/N-copy-root-path
-d3d6f982387839292885129c8f925f0437fe8f8f refs/heads/N-delete
-3a992f7db92c8513f272cb38ecd20b1891ea3618 refs/heads/N1
-c5e590066ca8fc360460c8c12cb33cb852fe8d0e refs/heads/N10
-0d366d7b90432787294f20469f92247cd2951e56 refs/heads/N11
-feb51e70222384549d211ed8556032a4d8de86d5 refs/heads/N2
-c9fa8f49cd89b0c79e2653acbf382fc67897cacc refs/heads/N3
-9d4aea7a2664059c10686d61ddd966f87bb2e5e1 refs/heads/N4
-72ab72aa5baed6139c0e3d8e970743a3b95c04ff refs/heads/N5
-0cc1189ab86929904ba103aecb7d99a9f4ceefb0 refs/heads/N6
-94c8d03670e041ed0d66ff5434e05078c76fe308 refs/heads/N7
-6377394cead24e0a81b85518dd6aae87af60b2d5 refs/heads/N8
-50a2b9031b6d523dbb219a9618b84e771592ce06 refs/heads/N9
-c9fa8f49cd89b0c79e2653acbf382fc67897cacc refs/heads/O1
-c9fa8f49cd89b0c79e2653acbf382fc67897cacc refs/heads/O2
-5fda0e679bf57704417152105e584e0a694c013c refs/heads/O3
-5fda0e679bf57704417152105e584e0a694c013c refs/heads/O4
-09b8212d623219bb80c949d5065e559b231d90ad refs/heads/S
-08ce2f4d8b480172783d3891735f90a7d7e00607 refs/heads/S2
-f9eb178a57581c4b6ee59a2a22ee91689c065e26 refs/heads/branch
-e539ffaa4ddf139e244fadc551da26e24df78619 refs/heads/copied
-c04abfe6415075f472cd37c5c8655c105f9934e6 refs/heads/done-ends
-d892dc32fa7a52ea3a397cfc4449e9df8a39becf refs/heads/export-boundary
-5ba2d0485e3e071f4ccbfdb22c474b305ebd159c refs/heads/main
-994b824fbe51b899f546383c3ba14a28a07c1022 refs/heads/new_blob
-3bf5032c8aeaf06910440dc0feb88390925a9405 refs/heads/not-to-delete
-7aa420e73b93d5b69059a2ff8e850a2ed9411187 refs/heads/notes-test
-fb7baf16109664b6b1d3b3c98d6c252fa7051ae5 refs/heads/other
-e908a53cdb6af68565f1b355f92ce0fc768a58b1 refs/heads/read-empty
-3bf5032c8aeaf06910440dc0feb88390925a9405 refs/heads/subuse1
-3bf5032c8aeaf06910440dc0feb88390925a9405 refs/heads/subuse2
-65eaf13fb93713eb9d3f5e4e899ade4effc77e3e refs/heads/temporary
-6b33e55cd592e91710d6c0afef1b0e6e3406a2a7 refs/heads/verify--dump-marks
-ac2b62088fe0283163c00fa7856bcd0489cf30de refs/heads/verify--import-marks
-65eaf13fb93713eb9d3f5e4e899ade4effc77e3e refs/heads/within
-b8613b3cac8d5f3f8aecc431636e4c27c64699dc refs/notes/foobar
-e684625a6e98f3faaa87d19d490e005e375de0e3 refs/notes/foobar2
-c713cf4a9446ade70da02a4734370997de4d36e6 refs/tags/O3-2nd
-c713cf4a9446ade70da02a4734370997de4d36e6 refs/tags/O3-3rd
-0e22025f0f5cea5d83b68c3dc9fc334571f7196c refs/tags/nested
-103553a16e02d76e288cec0f76240f1ad97caeb9 refs/tags/series-A
-42d861d649a1b87eb8083ad1d94d9220ecf2c35f refs/tags/series-A-blob
-3750af27267cae07dd3f8b7a9aac2291e374a66a refs/tags/series-A-blob-2
-56c14ce987117cf2e391ebef3dbab65e4c1ed202 refs/tags/series-A-blob-3
-3bf5032c8aeaf06910440dc0feb88390925a9405
-ok 229 - T: empty reset doesnt delete branch
-
-expecting success of 9300.230 'U: initialize for U tests': 
-	cat >input <<-INPUT_END &&
-	commit refs/heads/U
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data <<COMMIT
-	test setup
-	COMMIT
-	M 100644 inline hello.c
-	data <<BLOB
-	blob 1
-	BLOB
-	M 100644 inline good/night.txt
-	data <<BLOB
-	sleep well
-	BLOB
-	M 100644 inline good/bye.txt
-	data <<BLOB
-	au revoir
-	BLOB
-
-	INPUT_END
-
-	f7id=$(echo "blob 1" | git hash-object --stdin) &&
-	f8id=$(echo "sleep well" | git hash-object --stdin) &&
-	f9id=$(echo "au revoir" | git hash-object --stdin) &&
-	git fast-import <input
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            5 (         1 duplicates                  )
-      blobs  :            2 (         1 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:              4
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        348 /        348
----------------------------------------------------------------------
-
-ok 230 - U: initialize for U tests
-
-expecting success of 9300.231 'U: filedelete file succeeds': 
-	cat >input <<-INPUT_END &&
-	commit refs/heads/U
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data <<COMMIT
-	delete good/night.txt
-	COMMIT
-	from refs/heads/U^0
-	D good/night.txt
-
-	INPUT_END
-
-	git fast-import <input
-
-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:              4
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          7
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        660 /        660
----------------------------------------------------------------------
-
-ok 231 - U: filedelete file succeeds
-
-expecting success of 9300.232 'U: validate file delete result': 
-	cat >expect <<-EOF &&
-	:100644 000000 $f8id $ZERO_OID D	good/night.txt
-	EOF
-
-	git diff-tree -M -r U^1 U >actual &&
-
-	compare_diff_raw expect actual
-
-ok 232 - U: validate file delete result
-
-expecting success of 9300.233 'U: filedelete directory succeeds': 
-	cat >input <<-INPUT_END &&
-	commit refs/heads/U
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data <<COMMIT
-	delete good dir
-	COMMIT
-	from refs/heads/U^0
-	D good
-
-	INPUT_END
-
-	git fast-import <input
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            1 (         1 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         1 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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          6
-pack_report: pack_mmap_calls          =          2
-pack_report: pack_open_windows        =          2 /          2
-pack_report: pack_mapped              =        498 /        498
----------------------------------------------------------------------
-
-ok 233 - U: filedelete directory succeeds
-
-expecting success of 9300.234 'U: validate directory delete result': 
-	cat >expect <<-EOF &&
-	:100644 000000 $f9id $ZERO_OID D	good/bye.txt
-	EOF
-
-	git diff-tree -M -r U^1 U >actual &&
-
-	compare_diff_raw expect actual
-
-ok 234 - U: validate directory delete result
-
-expecting success of 9300.235 'U: filedelete root ("") succeeds': 
-		cat >input <<-INPUT_END &&
-		commit refs/heads/U-delete-root
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		must succeed
-		COMMIT
-		from refs/heads/U^0
-		D $root
-
-		INPUT_END
-
-		git fast-import <input
-	
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            1 (         1 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         1 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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          6
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =        824 /        824
----------------------------------------------------------------------
-
-ok 235 - U: filedelete root ("") succeeds
-
-expecting success of 9300.236 'U: validate root ("") delete result': 
-		cat >expect <<-EOF &&
-		:100644 000000 $f7id $ZERO_OID D	hello.c
-		EOF
-
-		git diff-tree -M -r U U-delete-root >actual &&
-
-		compare_diff_raw expect actual
-	
-ok 236 - U: validate root ("") delete result
-
-expecting success of 9300.237 'U: filedelete root () succeeds': 
-		cat >input <<-INPUT_END &&
-		commit refs/heads/U-delete-root
-		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-		data <<COMMIT
-		must succeed
-		COMMIT
-		from refs/heads/U^0
-		D $root
-
-		INPUT_END
-
-		git fast-import <input
-	
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            0 (         2 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         1 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:           1024 (         0 unique    )
-      atoms:              1
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          6
-pack_report: pack_mmap_calls          =          3
-pack_report: pack_open_windows        =          3 /          3
-pack_report: pack_mapped              =        824 /        824
----------------------------------------------------------------------
-
-ok 237 - U: filedelete root () succeeds
-
-expecting success of 9300.238 'U: validate root () delete result': 
-		cat >expect <<-EOF &&
-		:100644 000000 $f7id $ZERO_OID D	hello.c
-		EOF
-
-		git diff-tree -M -r U U-delete-root >actual &&
-
-		compare_diff_raw expect actual
-	
-ok 238 - U: validate root () delete result
-
-expecting success of 9300.239 'V: checkpoint helper does not get stuck with extra output': 
-	cat >input <<-INPUT_END &&
-	progress foo
-	progress bar
-
-	INPUT_END
-
-	background_import_then_checkpoint "" input &&
-	background_import_still_running
-
-cruft: progress foo
-cruft: progress bar
-Terminated
-ok 239 - V: checkpoint helper does not get stuck with extra output
-
-expecting success of 9300.240 'V: checkpoint updates refs after reset': 
-	cat >input <<-\INPUT_END &&
-	reset refs/heads/V
-	from refs/heads/U
-
-	INPUT_END
-
-	background_import_then_checkpoint "" input &&
-	test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
-	background_import_still_running
-
-Terminated
-ok 240 - V: checkpoint updates refs after reset
-
-expecting success of 9300.241 'V: checkpoint updates refs and marks after commit': 
-	cat >input <<-INPUT_END &&
-	commit refs/heads/V
-	mark :1
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data 0
-	from refs/heads/U
-
-	INPUT_END
-
-	background_import_then_checkpoint "--export-marks=marks.actual" input &&
-
-	echo ":1 $(git rev-parse --verify V)" >marks.expected &&
-
-	test "$(git rev-parse --verify V^)" = "$(git rev-parse --verify U)" &&
-	test_cmp marks.expected marks.actual &&
-	background_import_still_running
-
-Terminated
-ok 241 - V: checkpoint updates refs and marks after commit
-
-expecting success of 9300.242 'V: checkpoint updates refs and marks after commit (no new objects)': 
-	cat >input <<-INPUT_END &&
-	commit refs/heads/V2
-	mark :2
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data 0
-	from refs/heads/U
-
-	INPUT_END
-
-	background_import_then_checkpoint "--export-marks=marks.actual" input &&
-
-	echo ":2 $(git rev-parse --verify V2)" >marks.expected &&
-
-	test "$(git rev-parse --verify V2)" = "$(git rev-parse --verify V)" &&
-	test_cmp marks.expected marks.actual &&
-	background_import_still_running
-
-Terminated
-ok 242 - V: checkpoint updates refs and marks after commit (no new objects)
-
-expecting success of 9300.243 'V: checkpoint updates tags after tag': 
-	cat >input <<-INPUT_END &&
-	tag Vtag
-	from refs/heads/V
-	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data 0
-
-	INPUT_END
-
-	background_import_then_checkpoint "" input &&
-	git show-ref -d Vtag &&
-	background_import_still_running
-
-257d40767a41942fd4cbdd546e6183e743d96bbf refs/tags/Vtag
-114b4ec89664abe96ffe4873754fefc6aff6c1a2 refs/tags/Vtag^{}
-Terminated
-ok 243 - V: checkpoint updates tags after tag
-
-expecting success of 9300.244 'W: get-mark & empty orphan commit with no newlines': 
-	sed -e s/LFs// W-input | tr L "\n" | git fast-import
-
-b5522bde54855bd5378728a9119bd1941276b996
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            1 (         1 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         1 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 (         1 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        161 /        161
----------------------------------------------------------------------
-
-ok 244 - W: get-mark & empty orphan commit with no newlines
-
-expecting success of 9300.245 'W: get-mark & empty orphan commit with one newline': 
-	sed -e s/LFs/L/ W-input | tr L "\n" | git fast-import
-
-b5522bde54855bd5378728a9119bd1941276b996
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            0 (         2 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         1 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:           1024 (         1 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        161 /        161
----------------------------------------------------------------------
-
-ok 245 - W: get-mark & empty orphan commit with one newline
-
-expecting success of 9300.246 'W: get-mark & empty orphan commit with ugly second newline': 
-	# Technically, this should fail as it has too many linefeeds
-	# according to the grammar in fast-import.txt.  But, for whatever
-	# reason, it works.  Since using the correct number of newlines
-	# does not work with older (pre-2.22) versions of git, allow apps
-	# that used this second-newline workaround to keep working by
-	# checking it with this test...
-	sed -e s/LFs/LL/ W-input | tr L "\n" | git fast-import
-
-b5522bde54855bd5378728a9119bd1941276b996
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            0 (         2 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         1 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:           1024 (         1 unique    )
-      atoms:              0
-Memory total:          2340 KiB
-       pools:          2048 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        161 /        161
----------------------------------------------------------------------
-
-ok 246 - W: get-mark & empty orphan commit with ugly second newline
-
-expecting success of 9300.247 'W: get-mark & empty orphan commit with erroneous third newline': 
-	# ...but do NOT allow more empty lines than that (see previous test).
-	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_1898
-ok 247 - W: get-mark & empty orphan commit with erroneous third newline
-
-expecting success of 9300.248 'X: handling encoding': 
-	test_tick &&
-	cat >input <<-INPUT_END &&
-	commit refs/heads/encoding
-	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	encoding iso-8859-7
-	data <<COMMIT
-	INPUT_END
-
-	printf "Pi: \360\nCOMMIT\n" >>input &&
-
-	git fast-import <input &&
-	git cat-file -p encoding | grep $(printf "\360") &&
-	git log -1 --format=%B encoding | grep $(printf "\317\200")
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            1 (         1 duplicates                  )
-      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            0 (         1 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:          2340 KiB
-       pools:          2048 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          2
-pack_report: pack_mmap_calls          =          1
-pack_report: pack_open_windows        =          1 /          1
-pack_report: pack_mapped              =        169 /        169
----------------------------------------------------------------------
-
-Pi: ð
-Pi: π
-ok 248 - X: handling encoding
-
-expecting success of 9300.249 'Y: setup': 
-	test_oid_cache <<-EOF
-	Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
-	Ymain sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3
-	EOF
-
-ok 249 - Y: setup
-
-expecting success of 9300.250 'Y: rewrite submodules': 
-	git init main1 &&
-	(
-		cd main1 &&
-		git init sub2 &&
-		git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input &&
-		git fast-import --rewrite-submodules-from=sub:../Y-marks \
-			--rewrite-submodules-to=sub:sub2-marks <../Y-main-input &&
-		test "$(git rev-parse main)" = "$(test_oid Ymain)"
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9300-fast-import/main1/.git/
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9300-fast-import/main1/sub2/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            6 (         0 duplicates                  )
-      blobs  :            2 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            2 (         0 duplicates          0 deltas of          1 attempts)
-      commits:            2 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              1
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
----------------------------------------------------------------------
-
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:            9 (         0 duplicates                  )
-      blobs  :            3 (         0 duplicates          0 deltas of          1 attempts)
-      trees  :            3 (         0 duplicates          2 deltas of          2 attempts)
-      commits:            3 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           1 (         1 loads     )
-      marks:           1024 (        12 unique    )
-      atoms:              3
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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 250 - Y: rewrite submodules
-
-# passed all 250 test(s)
-1..250
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9351-fast-export-anonymize.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9351-fast-export-anonymize/.git/
-expecting success of 9351.1 'setup simple repo': 
-	test_commit base &&
-	test_commit foo &&
-	test_commit retain-me &&
-	git checkout -b other HEAD^ &&
-	mkdir subdir &&
-	test_commit subdir/bar &&
-	test_commit subdir/xyzzy &&
-	fake_commit=$(echo $ZERO_OID | sed s/0/a/) &&
-	git update-index --add --cacheinfo 160000,$fake_commit,link1 &&
-	git update-index --add --cacheinfo 160000,$fake_commit,link2 &&
-	git commit -m "add gitlink" &&
-	git tag -m "annotated tag" mytag &&
-	git tag -m "annotated tag with long message" longtag
-
-[main (root-commit) d1ff1c9] base
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 base.t
-[main 64bd085] foo
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 foo.t
-[main 98733ca] retain-me
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 retain-me.t
-Switched to a new branch 'other'
-[other 7ff9039] subdir/bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/bar.t
-[other 1427cb1] subdir/xyzzy
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 subdir/xyzzy.t
-[other 73eb103] add gitlink
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 160000 link1
- create mode 160000 link2
-ok 1 - setup simple repo
-
-expecting success of 9351.2 'export anonymized stream': 
-	git fast-export --anonymize --all \
-		--anonymize-map=retain-me \
-		--anonymize-map=xyzzy:should-not-appear \
-		--anonymize-map=xyzzy:custom-name \
-		--anonymize-map=other \
-		>stream
-
-ok 2 - export anonymized stream
-
-expecting success of 9351.3 'stream omits path names': 
-	! grep base stream &&
-	! grep foo stream &&
-	! grep subdir stream &&
-	! grep bar stream &&
-	! grep xyzzy stream
-
-ok 3 - stream omits path names
-
-expecting success of 9351.4 'stream contains user-specified names': 
-	grep retain-me stream &&
-	! grep should-not-appear stream &&
-	grep custom-name stream
-
-reset refs/tags/retain-me
-commit refs/tags/ref3/custom-name
-ok 4 - stream contains user-specified names
-
-expecting success of 9351.5 'stream omits gitlink oids': 
-	# avoid relying on the whole oid to remain hash-agnostic; this is
-	# plenty to be unique within our test case
-	! grep a000000000000000000 stream
-
-ok 5 - stream omits gitlink oids
-
-expecting success of 9351.6 'stream retains other as refname': 
-	grep other stream
-
-commit refs/heads/other
-ok 6 - stream retains other as refname
-
-expecting success of 9351.7 'stream omits other refnames': 
-	! grep main stream &&
-	! grep mytag stream &&
-	! grep longtag stream
-
-ok 7 - stream omits other refnames
-
-expecting success of 9351.8 'stream omits identities': 
-	! grep "$GIT_COMMITTER_NAME" stream &&
-	! grep "$GIT_COMMITTER_EMAIL" stream &&
-	! grep "$GIT_AUTHOR_NAME" stream &&
-	! grep "$GIT_AUTHOR_EMAIL" stream
-
-ok 8 - stream omits identities
-
-expecting success of 9351.9 'stream omits tag message': 
-	! grep "annotated tag" stream
-
-ok 9 - stream omits tag message
-
-expecting success of 9351.10 'import stream to new repository': 
-	git init new &&
-	cd new &&
-	git fast-import <../stream
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9351-fast-export-anonymize/new/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           21 (         0 duplicates                  )
-      blobs  :            5 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            8 (         0 duplicates          6 deltas of          6 attempts)
-      commits:            6 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            2 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           7 (         6 loads     )
-      marks:           1024 (        11 unique    )
-      atoms:              8
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         12
-pack_report: pack_mmap_calls          =          6
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1442
----------------------------------------------------------------------
-
-ok 10 - import stream to new repository
-
-expecting success of 9351.11 'result has two branches': 
-	git for-each-ref --format="%(refname)" refs/heads >branches &&
-	test_line_count = 2 branches &&
-	other_branch=refs/heads/other &&
-	main_branch=$(grep -v $other_branch branches)
-
-ok 11 - result has two branches
-
-expecting success of 9351.12 'repo has original shape and timestamps': 
-	shape () {
-		git log --format="%m %ct" --left-right --boundary "$@"
-	} &&
-	(cd .. && shape main...other) >expect &&
-	shape $main_branch...$other_branch >actual &&
-	test_cmp expect actual
-
-ok 12 - repo has original shape and timestamps
-
-expecting success of 9351.13 'root tree has original shape': 
-	# the output entries are not necessarily in the same
-	# order, but we should at least have the same set of
-	# object types.
-	git -C .. ls-tree HEAD >orig-root &&
-	cut -d" " -f2 <orig-root | sort >expect &&
-	git ls-tree $other_branch >root &&
-	cut -d" " -f2 <root | sort >actual &&
-	test_cmp expect actual
-
-ok 13 - root tree has original shape
-
-expecting success of 9351.14 'paths in subdir ended up in one tree': 
-	git -C .. ls-tree other:subdir >orig-subdir &&
-	cut -d" " -f2 <orig-subdir | sort >expect &&
-	tree=$(grep tree root | cut -f2) &&
-	git ls-tree $other_branch:$tree >tree &&
-	cut -d" " -f2 <tree >actual &&
-	test_cmp expect actual
-
-ok 14 - paths in subdir ended up in one tree
-
-expecting success of 9351.15 'identical gitlinks got identical oid': 
-	awk "/commit/ { print \$3 }" <root | sort -u >commits &&
-	test_line_count = 1 commits
-
-ok 15 - identical gitlinks got identical oid
-
-expecting success of 9351.16 'all tags point to branch tip': 
-	git rev-parse $other_branch >expect &&
-	git for-each-ref --format="%(*objectname)" | grep . | uniq >actual &&
-	test_cmp expect actual
-
-ok 16 - all tags point to branch tip
-
-expecting success of 9351.17 'idents are shared': 
-	git log --all --format="%an <%ae>" >authors &&
-	sort -u authors >unique &&
-	test_line_count = 1 unique &&
-	git log --all --format="%cn <%ce>" >committers &&
-	sort -u committers >unique &&
-	test_line_count = 1 unique &&
-	! test_cmp authors committers
-
---- authors	2025-12-18 01:41:05.898773267 +0000
-+++ committers	2025-12-18 01:41:05.906773267 +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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9301-fast-import-notes.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
-
-commit bcc89d2db5d163929b6fbd169c2559b47a076acb
-Author: C O Mitter <committer@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    second commit
-
-:100644 100755 532386d be960bf M	baz/xyzzy
-:100644 100644 df023b2 215df20 M	foo
-
-commit 49f8b007d515fc33aed8245ee498753d4270cc78
-Author: C O Mitter <committer@example.com>
-Date:   Thu Apr 7 15:13:13 2005 -0700
-
-    first commit
-
-: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 9301.2 'add notes with simple 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:            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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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 2 - add notes with simple M command
-
-expecting success of 9301.3 'add notes with simple 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:            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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
-
-
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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 - verify that deleteall also removes notes
-
-expecting success of 9301.7 'verify that later N commands override earlier M commands': 
-
-	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:              2
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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 - verify that later N commands override earlier M commands
-
-expecting success of 9301.8 'add lots of commits and notes': 
-
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/many_notes git log refs/heads/many_commits |
-	    grep "^    " > actual &&
-	test_cmp expect actual
-
-
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
----------------------------------------------------------------------
-
-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) &&
-
-	# 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
-
-
-ok 9 - verify that lots of notes trigger a fanout scheme
-
-expecting success of 9301.10 'verify that importing a notes tree respects the fanout scheme': 
-	git fast-import <input &&
-
-	# 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
-
-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:          2512 KiB
-       pools:          2219 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
-
-expecting success of 9301.11 '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
-
-
-ok 11 - verify that non-notes are untouched by a fanout change
-
-expecting success of 9301.12 'change a few existing notes': 
-
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/many_notes git log -n3 refs/heads/many_commits |
-	    grep "^    " > actual &&
-	test_cmp expect actual
-
-
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
----------------------------------------------------------------------
-
-ok 12 - change a few existing notes
-
-expecting success of 9301.13 'verify that changing notes respect existing fanout': 
+		from :2
+		$prefix$path$suffix
+		EOF
 
-	# 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
+		test_grep "$err_grep" err
+	
+fatal: NUL in dest: R hello.c "hello\000"
+ok 213 - S: filerename with escaped NUL in quoted dest must fail
 
+expecting success of 9300.214 'S: filerename with garbage after quoted dest must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
-ok 13 - verify that changing notes respect existing fanout
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-expecting success of 9301.14 'remove lots of notes': 
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-	git fast-import <input &&
-	GIT_NOTES_REF=refs/notes/many_notes git log refs/heads/many_commits |
-	    grep "^    " > actual &&
-	test_cmp expect actual
+		test_grep "$err_grep" err
+	
+fatal: Garbage after dest: R hello.c "hello.c"x
+ok 214 - S: filerename with garbage after quoted dest must fail
 
+expecting success of 9300.215 'S: filerename with space after quoted dest must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
----------------------------------------------------------------------
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-ok 14 - remove lots of notes
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-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
+		test_grep "$err_grep" err
+	
+fatal: Garbage after dest: R hello.c "hello.c" 
+ok 215 - S: filerename with space after quoted dest must fail
 
-		if test $(expr length "$path") -ne $hexsz
-		then
-			return 1
-		fi
-	done
+expecting success of 9300.216 'S: ls (in commit) with unclosed " in path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-ok 15 - verify that removing notes trigger fanout consolidation
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-expecting success of 9301.16 'verify that non-notes are untouched by a fanout change': 
+		test_grep "$err_grep" err
+	
+fatal: Invalid path: ls :2 "hello.c
+ok 216 - S: ls (in commit) with unclosed " in path must fail
 
-	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 9300.217 'S: ls (in commit) with invalid escape in quoted path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-ok 16 - verify that non-notes are untouched by a fanout change
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-expecting success of 9301.17 'add notes to 16 commits in each of 10 refs': 
+		test_grep "$err_grep" err
+	
+fatal: Invalid path: ls :2 "hello\xff"
+ok 217 - S: ls (in commit) with invalid escape in quoted path must fail
 
-	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 9300.218 'S: ls (in commit) with escaped NUL in quoted path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-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:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-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
----------------------------------------------------------------------
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-ok 17 - add notes to 16 commits in each of 10 refs
+		test_grep "$err_grep" err
+	
+fatal: NUL in path: ls :2 "hello\000"
+ok 218 - S: ls (in commit) with escaped NUL in quoted path must fail
 
-# passed all 17 test(s)
-1..17
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9164-git-svn-dcommit-concurrent.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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
+expecting success of 9300.219 'S: ls (in commit) with garbage after quoted path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
-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
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-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
-	)
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-Sending        file
-Transmitting file data .done
-Committing transaction...
-Committed revision 2.
-Updating '.':
-U    auto_updated_file
-Updated to revision 3.
---- auto_updated_file	2025-12-18 01:40:50.766773267 +0000
-+++ au_file_saved	2025-12-18 01:40:50.482773267 +0000
-@@ -1,2 +1 @@
- 
--11868
-ok 2 - check if post-commit hook creates a concurrent commit
+		test_grep "$err_grep" err
+	
+fatal: Garbage after path: ls :2 "hello.c"x
+ok 219 - S: ls (in commit) with garbage after quoted path must fail
 
-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
-	)
+expecting success of 9300.220 'S: ls (in commit) with space after quoted path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
-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
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-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 refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work1.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 6f068486c1da0645b0401d3145e46833f8a26638 (refs/remotes/git-svn)
-	M	file
-r2 = 6debd15ad42ce7dfd0e96634f2c01bdce1449c6a (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = 6050b7c0e53c3fb142d5995f3fe174c3030859c9 (refs/remotes/git-svn)
-	M	file
-r4 = e514064634a82b4ee5b216d7c24e340ccec74bc3 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r4
-[master 0389273] commit change 1.1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 48d5698] commit change 1.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 7b0fa4b] 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.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
-	M	file
-Committed r5
-	M	file
-r5 = 7fc52030d0e67c2e7583f5536e95a69619667184 (refs/remotes/git-svn)
-	M	file
+		test_grep "$err_grep" err
+	
+fatal: Garbage after path: ls :2 "hello.c" 
+ok 220 - S: ls (in commit) with space after quoted path must fail
 
-ERROR from SVN:
-A repository hook failed: Commit blocked by pre-commit hook (exit code 1) with no output.
-W: 7b0fa4b318d6d6449874da60b1c4eec25f81f6e8 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 fb014dd41485c73acf40cd9548cd4cd812fee4ec e6ac0ef8373861d92d8eecf8d88e592606a70872 M	file
-warning: skipped previously applied commit 0389273
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Rebasing (2/2)

                                                                                
Successfully rebased and updated refs/heads/master.
-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 9300.221 'S: ls (without dataref in commit) with unclosed " in path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
-ok 4 - dcommit error handling
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-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
-	)
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work2.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 6f068486c1da0645b0401d3145e46833f8a26638 (refs/remotes/git-svn)
-	M	file
-r2 = 6debd15ad42ce7dfd0e96634f2c01bdce1449c6a (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = 6050b7c0e53c3fb142d5995f3fe174c3030859c9 (refs/remotes/git-svn)
-	M	file
-r4 = e514064634a82b4ee5b216d7c24e340ccec74bc3 (refs/remotes/git-svn)
-	M	file
-r5 = 7fc52030d0e67c2e7583f5536e95a69619667184 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r5
-[master fcf70bf] commit change 2.1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master e4c3a27] commit change 2.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master c7d7b63] 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.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
-	M	file
-Committed r6
-	M	file
-r6 = 39a46a1cded804bd067da2652e1c555604753e07 (refs/remotes/git-svn)
-	M	file
-Committed r7
-	M	file
-r7 = 1c3c0beb47b0796ac70721df613a48e1a1945037 (refs/remotes/git-svn)
-	M	auto_updated_file
-r8 = 4608311a1553e3f5905aa32ea938a78c77166d3f (refs/remotes/git-svn)
-W: e4c3a27415e7b0cf77db7df254dee4e730c40230 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 6a4428cca3ff095ad3bc7be7221183a26f28feb0 bba5894934b93f318c08c21ac657468a98c64060 M	auto_updated_file
-warning: skipped previously applied commit fcf70bf
-warning: skipped previously applied commit e4c3a27
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/master.
-	M	file
-Committed r9
-	M	file
-r9 = 9cb96ec679d7b69b7583b71202e10ea5dec8f390 (refs/remotes/git-svn)
-No changes between 7f4b6bbc22aa1e3fb81bbb244a20e614e27a31ff 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
+		test_grep "$err_grep" err
+	
+fatal: Invalid path: ls "hello.c
+ok 221 - S: ls (without dataref in commit) with unclosed " in path must fail
 
-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
-	)
+expecting success of 9300.222 'S: ls (without dataref in commit) with invalid escape in quoted path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work3.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 6f068486c1da0645b0401d3145e46833f8a26638 (refs/remotes/git-svn)
-	M	file
-r2 = 6debd15ad42ce7dfd0e96634f2c01bdce1449c6a (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = 6050b7c0e53c3fb142d5995f3fe174c3030859c9 (refs/remotes/git-svn)
-	M	file
-r4 = e514064634a82b4ee5b216d7c24e340ccec74bc3 (refs/remotes/git-svn)
-	M	file
-r5 = 7fc52030d0e67c2e7583f5536e95a69619667184 (refs/remotes/git-svn)
-	M	file
-r6 = 39a46a1cded804bd067da2652e1c555604753e07 (refs/remotes/git-svn)
-	M	file
-r7 = 1c3c0beb47b0796ac70721df613a48e1a1945037 (refs/remotes/git-svn)
-	M	auto_updated_file
-r8 = 4608311a1553e3f5905aa32ea938a78c77166d3f (refs/remotes/git-svn)
-	M	file
-r9 = 9cb96ec679d7b69b7583b71202e10ea5dec8f390 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r9
-[master c74d655] commit change 3.1
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-[master d96056b] commit change 3.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-[master 83e36e9] 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.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
-	M	auto_updated_file
-Committed r10
-	M	auto_updated_file
-r10 = 53007d5855df22867fa102ad88c3c1edeb8c83bf (refs/remotes/git-svn)
-	M	auto_updated_file
-Committed r11
-	M	auto_updated_file
-r11 = e7267929de2a43c0ee11a6440560fbb2888b347e (refs/remotes/git-svn)
-	M	auto_updated_file
-r12 = ea6422968c1037faa38e378322fb2c879ef1fc37 (refs/remotes/git-svn)
-W: d96056bd6966645451e6e1136742d84c0fbb0e0a and refs/remotes/git-svn differ, using rebase:
-:100644 100644 15fbb124e089c21acbcb78df69240e5a4ed871f4 77c6b124102bddce2ce3be842ebfe4c482c782a0 M	auto_updated_file
-warning: skipped previously applied commit c74d655
-warning: skipped previously applied commit d96056b
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/1)

                                                                                
Successfully rebased and updated refs/heads/master.
-	M	auto_updated_file
-Committed r13
-	M	auto_updated_file
-r13 = d5da70a951ac71f6a0d140415393d7ea643b9c6a (refs/remotes/git-svn)
-No changes between c034dc3de165770956ec9284915c93d49f47f4ac 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
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-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
-	)
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work4.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 6f068486c1da0645b0401d3145e46833f8a26638 (refs/remotes/git-svn)
-	M	file
-r2 = 6debd15ad42ce7dfd0e96634f2c01bdce1449c6a (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = 6050b7c0e53c3fb142d5995f3fe174c3030859c9 (refs/remotes/git-svn)
-	M	file
-r4 = e514064634a82b4ee5b216d7c24e340ccec74bc3 (refs/remotes/git-svn)
-	M	file
-r5 = 7fc52030d0e67c2e7583f5536e95a69619667184 (refs/remotes/git-svn)
-	M	file
-r6 = 39a46a1cded804bd067da2652e1c555604753e07 (refs/remotes/git-svn)
-	M	file
-r7 = 1c3c0beb47b0796ac70721df613a48e1a1945037 (refs/remotes/git-svn)
-	M	auto_updated_file
-r8 = 4608311a1553e3f5905aa32ea938a78c77166d3f (refs/remotes/git-svn)
-	M	file
-r9 = 9cb96ec679d7b69b7583b71202e10ea5dec8f390 (refs/remotes/git-svn)
-	M	auto_updated_file
-r10 = 53007d5855df22867fa102ad88c3c1edeb8c83bf (refs/remotes/git-svn)
-	M	auto_updated_file
-r11 = e7267929de2a43c0ee11a6440560fbb2888b347e (refs/remotes/git-svn)
-	M	auto_updated_file
-r12 = ea6422968c1037faa38e378322fb2c879ef1fc37 (refs/remotes/git-svn)
-	M	auto_updated_file
-r13 = d5da70a951ac71f6a0d140415393d7ea643b9c6a (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r13
-[master c794977] commit change 4.1
- Author: A U Thor <author@example.com>
- 1 file changed, 7 insertions(+)
-[master e88207c] commit change 4.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 deletion(-)
-[master 6853611] 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.45.2/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.45.2/git-svn line 879.
-	M	auto_updated_file
-Committed r14
-	M	auto_updated_file
-r14 = edc85fe0100c540409655198e18555c66d6f820a (refs/remotes/git-svn)
-	M	auto_updated_file
-Committed r15
-	M	auto_updated_file
-r15 = 5182550c5df69661324095c762799eb4d740e9c6 (refs/remotes/git-svn)
-	M	auto_updated_file
-r16 = 950972f1b6ab884815d4e77c5ba103a70d68fe74 (refs/remotes/git-svn)
+		test_grep "$err_grep" err
+	
+fatal: Invalid path: ls "hello\xff"
+ok 222 - S: ls (without dataref in commit) with invalid escape in quoted path must fail
 
-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.
+expecting success of 9300.223 'S: ls (without dataref in commit) with escaped NUL in quoted path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
-ok 7 - dcommit --no-rebase concurrent non-conflicting change
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-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
-	)
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9164-git-svn-dcommit-concurrent/work5.git/.git/
-	A	auto_updated_file
-	A	file
-r1 = 6f068486c1da0645b0401d3145e46833f8a26638 (refs/remotes/git-svn)
-	M	file
-r2 = 6debd15ad42ce7dfd0e96634f2c01bdce1449c6a (refs/remotes/git-svn)
-	M	auto_updated_file
-r3 = 6050b7c0e53c3fb142d5995f3fe174c3030859c9 (refs/remotes/git-svn)
-	M	file
-r4 = e514064634a82b4ee5b216d7c24e340ccec74bc3 (refs/remotes/git-svn)
-	M	file
-r5 = 7fc52030d0e67c2e7583f5536e95a69619667184 (refs/remotes/git-svn)
-	M	file
-r6 = 39a46a1cded804bd067da2652e1c555604753e07 (refs/remotes/git-svn)
-	M	file
-r7 = 1c3c0beb47b0796ac70721df613a48e1a1945037 (refs/remotes/git-svn)
-	M	auto_updated_file
-r8 = 4608311a1553e3f5905aa32ea938a78c77166d3f (refs/remotes/git-svn)
-	M	file
-r9 = 9cb96ec679d7b69b7583b71202e10ea5dec8f390 (refs/remotes/git-svn)
-	M	auto_updated_file
-r10 = 53007d5855df22867fa102ad88c3c1edeb8c83bf (refs/remotes/git-svn)
-	M	auto_updated_file
-r11 = e7267929de2a43c0ee11a6440560fbb2888b347e (refs/remotes/git-svn)
-	M	auto_updated_file
-r12 = ea6422968c1037faa38e378322fb2c879ef1fc37 (refs/remotes/git-svn)
-	M	auto_updated_file
-r13 = d5da70a951ac71f6a0d140415393d7ea643b9c6a (refs/remotes/git-svn)
-	M	auto_updated_file
-r14 = edc85fe0100c540409655198e18555c66d6f820a (refs/remotes/git-svn)
-	M	auto_updated_file
-r15 = 5182550c5df69661324095c762799eb4d740e9c6 (refs/remotes/git-svn)
-	M	auto_updated_file
-r16 = 950972f1b6ab884815d4e77c5ba103a70d68fe74 (refs/remotes/git-svn)
-Checked out HEAD:
-  file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo r16
-[master 7d880b1] commit change 5.1
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 749cc94] commit change 5.2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 18f84cb] 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.45.2/t/trash%20directory.t9164-git-svn-dcommit-concurrent/svnrepo ...
-	M	file
-Committed r17
-	M	file
-r17 = 4506e7a8a1ca6b775f504a00e2720e08ee11e7e8 (refs/remotes/git-svn)
-	M	auto_updated_file
-r18 = 49d91b72a024af3e7a6b7b393efdfb7f8921f233 (refs/remotes/git-svn)
-W: 7d880b15f0f928c541ae262fe614072ad6c9a472 and refs/remotes/git-svn differ, using rebase:
-:100644 100644 b14112c9750857b30dedba67e7c0ffd56bee8881 d6488ff3977510968a51e96da45a273c01178c72 M	auto_updated_file
-warning: skipped previously applied commit 7d880b1
-hint: use --reapply-cherry-picks to include skipped commits
-hint: Disable this message with "git config advice.skippedCherryPicks false"
-Rebasing (1/2)
Auto-merging auto_updated_file
-CONFLICT (content): Merge conflict in auto_updated_file
-error: could not apply 749cc94... commit change 5.2
-hint: Resolve all conflicts manually, mark them as resolved with
-hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
-hint: You can instead skip this commit: run "git rebase --skip".
-hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
-hint: Disable this message with "git config advice.mergeConflict false"
-Could not apply 749cc94... commit change 5.2
-rebase refs/remotes/git-svn: command returned error: 1
+		test_grep "$err_grep" err
+	
+fatal: NUL in path: ls "hello\000"
+ok 223 - S: ls (without dataref in commit) with escaped NUL in quoted path must fail
 
-auto_updated_file: needs merge
-ok 8 - dcommit fails on concurrent conflicting change
+expecting success of 9300.224 'S: ls (without dataref in commit) with garbage after quoted path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
-# passed all 8 test(s)
-1..8
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9350-fast-export.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/.git/
-expecting success of 9350.1 'setup': 
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-	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
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
+		test_grep "$err_grep" err
+	
+fatal: Garbage after path: ls "hello.c"x
+ok 224 - S: ls (without dataref in commit) with garbage after quoted path must fail
 
-[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 9300.225 'S: ls (without dataref in commit) with space after quoted path must fail': 
+		test_must_fail git fast-import <<-EOF 2>err &&
+		blob
+		mark :1
+		data <<BLOB
+		hello world
+		BLOB
 
-expecting success of 9350.2 'fast-export | fast-import': 
+		commit refs/heads/S-path-fail
+		mark :2
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit setup
+		COMMIT
+		M 100644 :1 hello.c
 
-	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
+		commit refs/heads/S-path-fail
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		commit with bad path
+		COMMIT
+		from :2
+		$prefix$path$suffix
+		EOF
 
+		test_grep "$err_grep" err
+	
+fatal: Garbage after path: ls "hello.c" 
+ok 225 - S: ls (without dataref in commit) with space after quoted path must fail
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/new/.git/
+expecting success of 9300.226 'T: ls root ("") tree': 
+		sed -e "s/Z\$//" >expect <<-EOF &&
+		040000 tree $(git rev-parse S^{tree})	Z
+		EOF
+		sha1=$(git rev-parse --verify S) &&
+		git fast-import --import-marks=marks <<-EOF >actual &&
+		ls $sha1 $root
+		EOF
+		test_cmp expect actual
+	
 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
+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 (         5 unique    )
+      atoms:              1
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -531671,66 +532521,35 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-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
+pack_report: pack_used_ctr            =          8
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        678 /        678
 ---------------------------------------------------------------------
 
-ok 2 - fast-export | fast-import
-
-expecting success of 9350.3 'fast-export ^muss^{commit} muss': 
-	git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
-	cat >expected <<-EOF &&
-	tag muss
-	from $(git rev-parse --verify muss^{commit})
-	$(git cat-file tag muss | grep tagger)
-	data 9
-	valentin
-
-	EOF
-	test_cmp expected actual
-
-ok 3 - fast-export ^muss^{commit} muss
-
-expecting success of 9350.4 'fast-export --mark-tags ^muss^{commit} muss': 
-	git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
-	cat >expected <<-EOF &&
-	tag muss
-	mark :1
-	from $(git rev-parse --verify muss^{commit})
-	$(git cat-file tag muss | grep tagger)
-	data 9
-	valentin
-
-	EOF
-	test_cmp expected actual
-
-ok 4 - fast-export --mark-tags ^muss^{commit} muss
-
-expecting success of 9350.5 'fast-export main~2..main': 
-
-	git fast-export main~2..main >actual &&
-	sed "s/main/partial/" actual |
-		(cd new &&
-		 git fast-import &&
-		 test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
-		 git diff --exit-code main partial &&
-		 git diff --exit-code main^ partial^ &&
-		 test_must_fail git rev-parse partial~2)
-
+ok 226 - T: ls root ("") tree
 
+expecting success of 9300.227 'T: ls root () tree': 
+		sed -e "s/Z\$//" >expect <<-EOF &&
+		040000 tree $(git rev-parse S^{tree})	Z
+		EOF
+		sha1=$(git rev-parse --verify S) &&
+		git fast-import --import-marks=marks <<-EOF >actual &&
+		ls $sha1 $root
+		EOF
+		test_cmp expect actual
+	
 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)
+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:           1 (         1 loads     )
-      marks:           1024 (         6 unique    )
-      atoms:              3
+Total branches:           0 (         0 loads     )
+      marks:           1024 (         5 unique    )
+      atoms:              1
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -531738,41 +532557,35 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          8
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        678 /        678
 ---------------------------------------------------------------------
 
-fatal: ambiguous argument 'partial~2': unknown revision or path not in the working tree.
-Use '--' to separate paths from revisions, like this:
-'git <command> [<revision>...] -- [<file>...]'
-partial~2
-ok 5 - fast-export main~2..main
-
-expecting success of 9350.6 'fast-export --reference-excluded-parents main~2..main': 
+ok 227 - T: ls root () tree
 
-	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))
+expecting success of 9300.228 'T: delete branch': 
+	git branch to-delete &&
+	git fast-import <<-EOF &&
+	reset refs/heads/to-delete
+	from $ZERO_OID
+	EOF
+	test_must_fail git rev-parse --verify refs/heads/to-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)
+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:           1 (         1 loads     )
-      marks:           1024 (         5 unique    )
-      atoms:              3
-Memory total:          2426 KiB
-       pools:          2133 KiB
+Total branches:           1 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -531784,66 +532597,30 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 6 - fast-export --reference-excluded-parents main~2..main
-
-expecting success of 9350.7 'fast-export --show-original-ids': 
-
-	git fast-export --show-original-ids main >output &&
-	grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
-	git rev-list --objects main muss >objects-and-names &&
-	awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
-	comm -23 actual commits-trees-blobs >unfound &&
-	test_must_be_empty unfound
-
-ok 7 - fast-export --show-original-ids
-
-expecting success of 9350.8 'fast-export --show-original-ids | git fast-import': 
-
-	git fast-export --show-original-ids main muss | git fast-import --quiet &&
-	test $MAIN = $(git rev-parse --verify refs/heads/main) &&
-	test $MUSS = $(git rev-parse --verify refs/tags/muss)
-
-ok 8 - fast-export --show-original-ids | git fast-import
-
-expecting success of 9350.9 'reencoding iso-8859-7': 
+fatal: Needed a single revision
+ok 228 - T: delete branch
 
-	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 9300.229 'T: empty reset doesnt delete branch': 
+	git branch not-to-delete &&
+	git fast-import <<-EOF &&
+	reset refs/heads/not-to-delete
+	EOF
+	git show-ref &&
+	git rev-parse --verify refs/heads/not-to-delete
 
-[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)
+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:           1 (         1 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              3
-Memory total:          2426 KiB
-       pools:          2133 KiB
+Total branches:           1 (         0 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
@@ -531855,61 +532632,99 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-Pi: π
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 9 - reencoding iso-8859-7
-
-expecting success of 9350.10 'aborting on iso-8859-7': 
-
-	test_when_finished "git reset --hard HEAD~1" &&
-	test_config i18n.commitencoding iso-8859-7 &&
-	echo rosten >file &&
-	git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
-	test_must_fail git fast-export --reencode=abort wer^..wer >iso-8859-7.fi
+8c1bf1b9f891df8805c27a54986e5043829939ad refs/heads/H
+45b12606bd487d1bc687864db7641b9bfd4ddcd0 refs/heads/J
+c85b9f480bbc2f7616de78fc96c08204e0f5b70e refs/heads/K
+8cecdab6b3e4062de5b06ad3accf5bff1449e99b refs/heads/L
+7144e0bde79efa21349b6a09f1b68b74e59da773 refs/heads/M1
+0641406b2b83a2c327e6950aa51f13010fe647b1 refs/heads/M2
+b258d10cb71ac72904c40ef2d07b67e3f444ce19 refs/heads/M3
+afc4da065d1be07543ab49500b355f7342f5a0bf refs/heads/M4
+d80c4052a8e9a163f90de3fa74ec993595d7f0b3 refs/heads/N-copy-root-path
+d3d6f982387839292885129c8f925f0437fe8f8f refs/heads/N-delete
+3a992f7db92c8513f272cb38ecd20b1891ea3618 refs/heads/N1
+c5e590066ca8fc360460c8c12cb33cb852fe8d0e refs/heads/N10
+0d366d7b90432787294f20469f92247cd2951e56 refs/heads/N11
+feb51e70222384549d211ed8556032a4d8de86d5 refs/heads/N2
+c9fa8f49cd89b0c79e2653acbf382fc67897cacc refs/heads/N3
+9d4aea7a2664059c10686d61ddd966f87bb2e5e1 refs/heads/N4
+72ab72aa5baed6139c0e3d8e970743a3b95c04ff refs/heads/N5
+0cc1189ab86929904ba103aecb7d99a9f4ceefb0 refs/heads/N6
+94c8d03670e041ed0d66ff5434e05078c76fe308 refs/heads/N7
+6377394cead24e0a81b85518dd6aae87af60b2d5 refs/heads/N8
+50a2b9031b6d523dbb219a9618b84e771592ce06 refs/heads/N9
+c9fa8f49cd89b0c79e2653acbf382fc67897cacc refs/heads/O1
+c9fa8f49cd89b0c79e2653acbf382fc67897cacc refs/heads/O2
+5fda0e679bf57704417152105e584e0a694c013c refs/heads/O3
+5fda0e679bf57704417152105e584e0a694c013c refs/heads/O4
+09b8212d623219bb80c949d5065e559b231d90ad refs/heads/S
+08ce2f4d8b480172783d3891735f90a7d7e00607 refs/heads/S2
+f9eb178a57581c4b6ee59a2a22ee91689c065e26 refs/heads/branch
+e539ffaa4ddf139e244fadc551da26e24df78619 refs/heads/copied
+c04abfe6415075f472cd37c5c8655c105f9934e6 refs/heads/done-ends
+d892dc32fa7a52ea3a397cfc4449e9df8a39becf refs/heads/export-boundary
+5ba2d0485e3e071f4ccbfdb22c474b305ebd159c refs/heads/main
+994b824fbe51b899f546383c3ba14a28a07c1022 refs/heads/new_blob
+3bf5032c8aeaf06910440dc0feb88390925a9405 refs/heads/not-to-delete
+7aa420e73b93d5b69059a2ff8e850a2ed9411187 refs/heads/notes-test
+fb7baf16109664b6b1d3b3c98d6c252fa7051ae5 refs/heads/other
+e908a53cdb6af68565f1b355f92ce0fc768a58b1 refs/heads/read-empty
+3bf5032c8aeaf06910440dc0feb88390925a9405 refs/heads/subuse1
+3bf5032c8aeaf06910440dc0feb88390925a9405 refs/heads/subuse2
+65eaf13fb93713eb9d3f5e4e899ade4effc77e3e refs/heads/temporary
+6b33e55cd592e91710d6c0afef1b0e6e3406a2a7 refs/heads/verify--dump-marks
+ac2b62088fe0283163c00fa7856bcd0489cf30de refs/heads/verify--import-marks
+65eaf13fb93713eb9d3f5e4e899ade4effc77e3e refs/heads/within
+b8613b3cac8d5f3f8aecc431636e4c27c64699dc refs/notes/foobar
+e684625a6e98f3faaa87d19d490e005e375de0e3 refs/notes/foobar2
+c713cf4a9446ade70da02a4734370997de4d36e6 refs/tags/O3-2nd
+c713cf4a9446ade70da02a4734370997de4d36e6 refs/tags/O3-3rd
+0e22025f0f5cea5d83b68c3dc9fc334571f7196c refs/tags/nested
+103553a16e02d76e288cec0f76240f1ad97caeb9 refs/tags/series-A
+42d861d649a1b87eb8083ad1d94d9220ecf2c35f refs/tags/series-A-blob
+3750af27267cae07dd3f8b7a9aac2291e374a66a refs/tags/series-A-blob-2
+56c14ce987117cf2e391ebef3dbab65e4c1ed202 refs/tags/series-A-blob-3
+3bf5032c8aeaf06910440dc0feb88390925a9405
+ok 229 - T: empty reset doesnt delete branch
 
-[wer 6941255] Pi: ð
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-fatal: Encountered commit-specific encoding iso-8859-7 in commit 69412559de66ce43db5f4d5fd25191a3ab0b1823; use --reencode=[yes|no] to handle it
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 10 - aborting on iso-8859-7
+expecting success of 9300.230 'U: initialize for U tests': 
+	cat >input <<-INPUT_END &&
+	commit refs/heads/U
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	test setup
+	COMMIT
+	M 100644 inline hello.c
+	data <<BLOB
+	blob 1
+	BLOB
+	M 100644 inline good/night.txt
+	data <<BLOB
+	sleep well
+	BLOB
+	M 100644 inline good/bye.txt
+	data <<BLOB
+	au revoir
+	BLOB
 
-expecting success of 9350.11 'preserving iso-8859-7': 
+	INPUT_END
 
-	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)
+	f7id=$(echo "blob 1" | git hash-object --stdin) &&
+	f8id=$(echo "sleep well" | git hash-object --stdin) &&
+	f9id=$(echo "au revoir" | git hash-object --stdin) &&
+	git fast-import <input
 
-[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)
+Total objects:            5 (         1 duplicates                  )
+      blobs  :            2 (         1 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 (         4 unique    )
-      atoms:              3
+      marks:           1024 (         0 unique    )
+      atoms:              4
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -531917,51 +532732,39 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        348 /        348
 ---------------------------------------------------------------------
 
-Pi: ð
-encoding iso-8859-7
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 11 - preserving iso-8859-7
+ok 230 - U: initialize for U tests
 
-expecting success of 9350.12 'encoding preserved if reencoding fails': 
+expecting success of 9300.231 'U: filedelete file succeeds': 
+	cat >input <<-INPUT_END &&
+	commit refs/heads/U
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	delete good/night.txt
+	COMMIT
+	from refs/heads/U^0
+	D good/night.txt
 
-	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)
+	INPUT_END
+
+	git fast-import <input
 
-[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)
+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 (         4 unique    )
-      atoms:              3
+      marks:           1024 (         0 unique    )
+      atoms:              4
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -531969,303 +532772,101 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          7
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        660 /        660
 ---------------------------------------------------------------------
 
-encoding iso-8859-7
-Pi: ð; Invalid: ÿ
-Pi: ð; Invalid: ÿ
-HEAD is now at 8954980 Merge branch 'main' into wer
-ok 12 - encoding preserved if reencoding fails
-
-expecting success of 9350.13 'import/export-marks': 
-
-	git checkout -b marks main &&
-	git fast-export --export-marks=tmp-marks HEAD &&
-	test -s tmp-marks &&
-	test_line_count = 3 tmp-marks &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks HEAD >actual &&
-	test $(grep ^commit actual | wc -l) -eq 0 &&
-	echo change > file &&
-	git commit -m "last commit" file &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks HEAD >actual &&
-	test $(grep ^commit\  actual | wc -l) -eq 1 &&
-	test_line_count = 4 tmp-marks
-
-
-Switched to a new branch 'marks'
-blob
-mark :1
-data 8
-Wohlauf
-
-blob
-mark :2
-data 9
-break it
-
-reset refs/heads/marks
-commit refs/heads/marks
-mark :3
-author A U Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-data 8
-initial
-M 100644 :2 file0
-M 100644 :1 file
-
-blob
-mark :4
-data 9
-die Luft
-
-blob
-mark :5
-data 12
-geht frisch
+ok 231 - U: filedelete file succeeds
 
-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
+expecting success of 9300.232 'U: validate file delete result': 
+	cat >expect <<-EOF &&
+	:100644 000000 $f8id $ZERO_OID D	good/night.txt
+	EOF
 
-blob
-mark :7
-data 4
-und
+	git diff-tree -M -r U^1 U >actual &&
 
-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
+	compare_diff_raw expect actual
 
-[marks 00d551b] last commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 13 - import/export-marks
+ok 232 - U: validate file delete result
 
-expecting success of 9350.14 'set up faked signed tag': 
+expecting success of 9300.233 'U: filedelete directory succeeds': 
+	cat >input <<-INPUT_END &&
+	commit refs/heads/U
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	delete good dir
+	COMMIT
+	from refs/heads/U^0
+	D good
 
-	git fast-import <signed-tag-import
+	INPUT_END
 
+	git fast-import <input
 
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            1 (         0 duplicates                  )
+Total objects:            1 (         1 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     )
+      trees  :            0 (         1 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:          2340 KiB
-       pools:          2048 KiB
+      atoms:              2
+Memory total:          2426 KiB
+       pools:          2133 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          6
+pack_report: pack_mmap_calls          =          2
+pack_report: pack_open_windows        =          2 /          2
+pack_report: pack_mapped              =        498 /        498
 ---------------------------------------------------------------------
 
-ok 14 - set up faked signed tag
-
-expecting success of 9350.15 'signed-tags=abort': 
-
-	test_must_fail git fast-export --signed-tags=abort sign-your-name
-
-
-fatal: encountered signed tag a3638f8ba890fd4c674f4a3c04947833ab5dcd43; use --signed-tags=<mode> to handle it
-blob
-mark :1
-data 8
-Wohlauf
-
-blob
-mark :2
-data 9
-break it
-
-reset refs/tags/sign-your-name
-commit refs/tags/sign-your-name
-mark :3
-author A U Thor <author@example.com> 1112912053 -0700
-committer C O Mitter <committer@example.com> 1112912053 -0700
-data 8
-initial
-M 100644 :2 file0
-M 100644 :1 file
-
-blob
-mark :4
-data 9
-die Luft
-
-blob
-mark :5
-data 12
-geht frisch
-
-commit refs/tags/sign-your-name
-mark :6
-author A U Thor <author@example.com> 1112912113 -0700
-committer C O Mitter <committer@example.com> 1112912113 -0700
-data 7
-second
-from :3
-M 100644 :5 file2
-M 100644 :4 file
-
-blob
-mark :7
-data 4
-und
-
-commit refs/tags/sign-your-name
-mark :8
-author A U Thor <author@example.com> 1112912173 -0700
-committer C O Mitter <committer@example.com> 1112912173 -0700
-data 6
-third
-from :6
-M 100644 :7 file2
-
-blob
-mark :9
-data 7
-change
-
-commit refs/tags/sign-your-name
-mark :10
-author A U Thor <author@example.com> 1112912413 -0700
-committer C O Mitter <committer@example.com> 1112912413 -0700
-data 12
-last commit
-from :8
-M 100644 :9 file
-
-ok 15 - signed-tags=abort
-
-expecting success of 9350.16 'signed-tags=verbatim': 
-
-	git fast-export --signed-tags=verbatim sign-your-name > output &&
-	grep PGP output
-
-
------BEGIN PGP SIGNATURE-----
------END PGP SIGNATURE-----
-ok 16 - signed-tags=verbatim
-
-expecting success of 9350.17 'signed-tags=strip': 
-
-	git fast-export --signed-tags=strip sign-your-name > output &&
-	! grep PGP output
-
-
-ok 17 - signed-tags=strip
-
-expecting success of 9350.18 'signed-tags=warn-strip': 
-	git fast-export --signed-tags=warn-strip sign-your-name >output 2>err &&
-	! grep PGP output &&
-	test -s err
-
-ok 18 - signed-tags=warn-strip
-
-expecting success of 9350.19 'setup submodule': 
+ok 233 - U: filedelete directory succeeds
 
-	test_config_global protocol.file.allow always &&
-	git checkout -f main &&
-	mkdir sub &&
-	(
-		cd sub &&
-		git init  &&
-		echo test file > file &&
-		git add file &&
-		git commit -m sub_initial
-	) &&
-	git submodule add "$(pwd)/sub" sub &&
-	git commit -m initial &&
-	test_tick &&
-	(
-		cd sub &&
-		echo more data >> file &&
-		git add file &&
-		git commit -m sub_second
-	) &&
-	git add sub &&
-	git commit -m second
+expecting success of 9300.234 'U: validate directory delete result': 
+	cat >expect <<-EOF &&
+	:100644 000000 $f9id $ZERO_OID D	good/bye.txt
+	EOF
 
+	git diff-tree -M -r U^1 U >actual &&
 
-Switched to branch 'main'
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/sub/.git/
-[main (root-commit) 075e849] sub_initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file
-Adding existing repo at 'sub' to the index
-[main 32ea4ff] 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 bb8b8e2] second
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
-ok 19 - setup submodule
+	compare_diff_raw expect actual
 
-expecting success of 9350.20 'submodule fast-export | fast-import': 
+ok 234 - U: validate directory delete result
 
-	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
+expecting success of 9300.235 'U: filedelete root ("") succeeds': 
+		cat >input <<-INPUT_END &&
+		commit refs/heads/U-delete-root
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		must succeed
+		COMMIT
+		from refs/heads/U^0
+		D $root
 
+		INPUT_END
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/new/.git/
+		git fast-import <input
+	
 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
+Total objects:            1 (         1 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         1 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:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -532273,96 +532874,50 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          8
-pack_report: pack_mmap_calls          =          4
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1493
+pack_report: pack_used_ctr            =          6
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =        824 /        824
 ---------------------------------------------------------------------
 
-Already on 'main'
-Submodule 'sub' (/build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/sub) registered for path 'sub'
-Cloning into '/build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/new/sub'...
-done.
-Submodule path 'sub': checked out '53da5af386a666416b61517c3f90dafe75821d2b'
-ok 20 - submodule fast-export | fast-import
-
-expecting success of 9350.21 'setup copies': 
-
-	git checkout -b copy rein &&
-	git mv file file3 &&
-	git commit -m move1 &&
-	test_tick &&
-	cp file2 file4 &&
-	git add file4 &&
-	git mv file2 file5 &&
-	git commit -m copy1 &&
-	test_tick &&
-	cp file3 file6 &&
-	git add file6 &&
-	git commit -m copy2 &&
-	test_tick &&
-	echo more text >> file6 &&
-	echo even more text >> file6 &&
-	git add file6 &&
-	git commit -m modify &&
-	test_tick &&
-	cp file6 file7 &&
-	echo test >> file7 &&
-	git add file7 &&
-	git commit -m copy_modify
+ok 235 - U: filedelete root ("") succeeds
 
+expecting success of 9300.236 'U: validate root ("") delete result': 
+		cat >expect <<-EOF &&
+		:100644 000000 $f7id $ZERO_OID D	hello.c
+		EOF
 
-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
+		git diff-tree -M -r U U-delete-root >actual &&
 
-expecting success of 9350.22 'fast-export -C -C | fast-import': 
+		compare_diff_raw expect actual
+	
+ok 236 - U: validate root ("") delete result
 
-	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))
+expecting success of 9300.237 'U: filedelete root () succeeds': 
+		cat >input <<-INPUT_END &&
+		commit refs/heads/U-delete-root
+		committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+		data <<COMMIT
+		must succeed
+		COMMIT
+		from refs/heads/U^0
+		D $root
 
+		INPUT_END
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/new/.git/
-C file2 file4
+		git fast-import <input
+	
 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
+Total objects:            0 (         2 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         1 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:           1024 (         0 unique    )
+      atoms:              1
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -532370,268 +532925,158 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =         10
-pack_report: pack_mmap_calls          =          5
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1939
+pack_report: pack_used_ctr            =          6
+pack_report: pack_mmap_calls          =          3
+pack_report: pack_open_windows        =          3 /          3
+pack_report: pack_mapped              =        824 /        824
 ---------------------------------------------------------------------
 
-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
+ok 237 - U: filedelete root () succeeds
 
-expecting success of 9350.24 'cope with tagger-less tags': 
+expecting success of 9300.238 'U: validate root () delete result': 
+		cat >expect <<-EOF &&
+		:100644 000000 $f7id $ZERO_OID D	hello.c
+		EOF
 
-	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
+		git diff-tree -M -r U U-delete-root >actual &&
 
+		compare_diff_raw expect actual
+	
+ok 238 - U: validate root () delete result
 
-tagger Unspecified Tagger <unspecified-tagger> 0 +0000
-ok 24 - cope with tagger-less tags
+expecting success of 9300.239 'V: checkpoint helper does not get stuck with extra output': 
+	cat >input <<-INPUT_END &&
+	progress foo
+	progress bar
 
-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"
-	)
+	INPUT_END
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/limit-by-paths/.git/
-[main (root-commit) c4bb517] First file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 there
-[main 5b2b7c2] Second file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar
-[main 49ac088] Change to second file
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-ok 25 - setup for limiting exports by PATH
+	background_import_then_checkpoint "" input &&
+	background_import_still_running
 
-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
-)
+cruft: progress foo
+cruft: progress bar
+./test-lib.sh: line 1055: wait: pid 22267 is not a child of this shell
+ok 239 - V: checkpoint helper does not get stuck with extra output
 
-ok 26 - dropping tag of filtered out object
+expecting success of 9300.240 'V: checkpoint updates refs after reset': 
+	cat >input <<-\INPUT_END &&
+	reset refs/heads/V
+	from refs/heads/U
 
-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
-)
+	INPUT_END
 
-ok 27 - rewriting tag of filtered out object
+	background_import_then_checkpoint "" input &&
+	test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
+	background_import_still_running
 
-expecting success of 9350.28 'rewrite tag predating pathspecs to nothing': 
-	test_create_repo rewrite_tag_predating_pathspecs &&
-	(
-		cd rewrite_tag_predating_pathspecs &&
+./test-lib.sh: line 1055: wait: pid 22323 is not a child of this shell
+ok 240 - V: checkpoint updates refs after reset
 
-		test_commit initial &&
+expecting success of 9300.241 'V: checkpoint updates refs and marks after commit': 
+	cat >input <<-INPUT_END &&
+	commit refs/heads/V
+	mark :1
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 0
+	from refs/heads/U
 
-		git tag -a -m "Some old tag" v0.0.0.0.0.0.1 &&
+	INPUT_END
 
-		test_commit bar &&
+	background_import_then_checkpoint "--export-marks=marks.actual" input &&
 
-		git fast-export --tag-of-filtered-object=rewrite --all -- bar.t >output &&
-		grep from.$ZERO_OID output
-	)
+	echo ":1 $(git rev-parse --verify V)" >marks.expected &&
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/rewrite_tag_predating_pathspecs/.git/
-[main (root-commit) f175d86] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-[main 3f8d6f0] bar
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 bar.t
-from 0000000000000000000000000000000000000000
-from 0000000000000000000000000000000000000000
-ok 28 - rewrite tag predating pathspecs to nothing
+	test "$(git rev-parse --verify V^)" = "$(git rev-parse --verify U)" &&
+	test_cmp marks.expected marks.actual &&
+	background_import_still_running
 
-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
-	)
+./test-lib.sh: line 1055: wait: pid 22349 is not a child of this shell
+ok 241 - V: checkpoint updates refs and marks after commit
 
---- expected	2025-12-18 01:41:06.466773267 +0000
-+++ output	2025-12-18 01:41:06.470773267 +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 9300.242 'V: checkpoint updates refs and marks after commit (no new objects)': 
+	cat >input <<-INPUT_END &&
+	commit refs/heads/V2
+	mark :2
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 0
+	from refs/heads/U
 
-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
+	INPUT_END
 
-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
+	background_import_then_checkpoint "--export-marks=marks.actual" input &&
 
-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
+	echo ":2 $(git rev-parse --verify V2)" >marks.expected &&
 
-ok 31 - path limiting works
+	test "$(git rev-parse --verify V2)" = "$(git rev-parse --verify V)" &&
+	test_cmp marks.expected marks.actual &&
+	background_import_still_running
 
-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-lib.sh: line 1055: wait: pid 22394 is not a child of this shell
+ok 242 - V: checkpoint updates refs and marks after commit (no new objects)
 
-		test_commit important-path &&
+expecting success of 9300.243 'V: checkpoint updates tags after tag': 
+	cat >input <<-INPUT_END &&
+	tag Vtag
+	from refs/heads/V
+	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data 0
 
-		test_commit ignored &&
+	INPUT_END
 
-		git branch A &&
-		git branch B &&
+	background_import_then_checkpoint "" input &&
+	git show-ref -d Vtag &&
+	background_import_still_running
 
-		echo foo >>important-path.t &&
-		git add important-path.t &&
-		test_commit more changes &&
+257d40767a41942fd4cbdd546e6183e743d96bbf refs/tags/Vtag
+114b4ec89664abe96ffe4873754fefc6aff6c1a2 refs/tags/Vtag^{}
+./test-lib.sh: line 1055: wait: pid 22492 is not a child of this shell
+ok 243 - V: checkpoint updates tags after tag
 
-		git fast-export --all -- important-path.t | git fast-import --force
-	)
+expecting success of 9300.244 'W: get-mark & empty orphan commit with no newlines': 
+	sed -e s/LFs// W-input | tr L "\n" | git fast-import
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/avoid_non_existent_mark/.git/
-[main (root-commit) 8503f52] important-path
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 important-path.t
-[main f2403bd] ignored
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 ignored.t
-[main 0864148] more
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 changes
+b5522bde54855bd5378728a9119bd1941276b996
 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)
+Total objects:            1 (         1 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         1 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:           6 (         2 loads     )
-      marks:           1024 (         4 unique    )
-      atoms:              1
-Memory total:          2426 KiB
-       pools:          2133 KiB
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         1 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-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
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        161 /        161
 ---------------------------------------------------------------------
 
-ok 32 - avoid corrupt stream with non-existent mark
-
-expecting success of 9350.33 'full-tree re-shows unmodified files': 
-	git checkout -f simple &&
-	git fast-export --full-tree simple >actual &&
-	test $(grep -c file0 actual) -eq 3
-
-Already on 'simple'
-ok 33 - full-tree re-shows unmodified files
-
-expecting success of 9350.34 'set-up a few more tags for tag export tests': 
-	git checkout -f main &&
-	HEAD_TREE=$(git show -s --pretty=raw HEAD | sed -n "/tree/s/tree //p") &&
-	git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
-	git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
-	git tag    tag-obj_tag     -m "tagging a tag" tree_tag-obj &&
-	git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
-
-Switched to branch 'main'
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f tag-obj_tag tree_tag-obj^{}
-hint: Disable this message with "git config advice.nestedTag false"
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f tag-obj_tag-obj tree_tag-obj^{}
-hint: Disable this message with "git config advice.nestedTag false"
-ok 34 - set-up a few more tags for tag export tests
+ok 244 - W: get-mark & empty orphan commit with no newlines
 
-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)
+expecting success of 9300.245 'W: get-mark & empty orphan commit with one newline': 
+	sed -e s/LFs/L/ W-input | tr L "\n" | git fast-import
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/result/.git/
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 33214dceb4fbcefe85fe878f546967509523d243,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
+b5522bde54855bd5378728a9119bd1941276b996
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            0 (         0 duplicates                  )
+Total objects:            0 (         2 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)
+      trees  :            0 (         1 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:           0 (         0 loads     )
-      marks:           1024 (         0 unique    )
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         1 unique    )
       atoms:              0
 Memory total:          2340 KiB
        pools:          2048 KiB
@@ -532640,335 +533085,122 @@
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        161 /        161
 ---------------------------------------------------------------------
 
-ok 35 - tree_tag
-
-expecting success of 9350.36 'tree_tag-obj': git fast-export tree_tag-obj
-warning: Tag points to object of unexpected type tree, skipping.
-warning: Omitting tag 1c9e543c652174b3adba927fe5b56f5bef97ea21,
-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 1c9e543c652174b3adba927fe5b56f5bef97ea21,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-warning: Omitting tag 635997f61a7cce86851271fb30ba353dae1bd000,
-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 1c9e543c652174b3adba927fe5b56f5bef97ea21,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-warning: Omitting tag f5a91c72e8c7475c77964e76cb4f1b6115dbfc4b,
-since tags of trees (or tags of tags of trees, etc.) are not supported.
-ok 38 - tag-obj_tag-obj
-
-expecting success of 9350.39 'handling tags of blobs': 
-	git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
-	git fast-export blobtag >actual &&
-	cat >expect <<-EOF &&
-	blob
-	mark :1
-	data 9
-	die Luft
-
-	tag blobtag
-	from :1
-	tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	data 14
-	Tag of a blob
-
-	EOF
-	test_cmp expect actual
-
-ok 39 - handling tags of blobs
-
-expecting success of 9350.40 'handling nested tags': 
-	git tag -a -m "This is a nested tag" nested muss &&
-	git fast-export --mark-tags nested >output &&
-	grep "^from $ZERO_OID$" output &&
-	grep "^tag nested$" output >tag_lines &&
-	test_line_count = 2 tag_lines
-
-hint: You have created a nested tag. The object referred to by your new tag is
-hint: already a tag. If you meant to tag the object that it points to, use:
-hint:
-hint: 	git tag -f nested muss^{}
-hint: Disable this message with "git config advice.nestedTag false"
-from 0000000000000000000000000000000000000000
-ok 40 - handling nested tags
-
-expecting success of 9350.41 'directory becomes symlink': 
-	git init dirtosymlink &&
-	git init result &&
-	(
-		cd dirtosymlink &&
-		mkdir foo &&
-		mkdir bar &&
-		echo hello > foo/world &&
-		echo hello > bar/world &&
-		git add foo/world bar/world &&
-		git commit -q -mone &&
-		git rm -r foo &&
-		test_ln_s_add bar foo &&
-		git commit -q -mtwo
-	) &&
-	(
-		cd dirtosymlink &&
-		git fast-export main -- foo |
-		(cd ../result && git fast-import --quiet)
-	) &&
-	(cd result && git show main:foo)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/dirtosymlink/.git/
-Reinitialized existing Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/result/.git/
-rm 'foo/world'
-checking prerequisite: SYMLINKS
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-SYMLINKS" &&
-	# test whether the filesystem supports symbolic links
-	ln -s x y && test -h y
-
-)
-prerequisite SYMLINKS ok
-barok 41 - directory becomes symlink
+ok 245 - W: get-mark & empty orphan commit with one newline
 
-expecting success of 9350.42 'fast-export quotes pathnames': 
-	git init crazy-paths &&
-	test_config -C crazy-paths core.protectNTFS false &&
-	(cd crazy-paths &&
-	 blob=$(echo foo | git hash-object -w --stdin) &&
-	 git -c core.protectNTFS=false update-index --add \
-		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
-		--cacheinfo 100644 $blob "path with \"quote\"" \
-		--cacheinfo 100644 $blob "path with \\backslash" \
-		--cacheinfo 100644 $blob "path with space" &&
-	 git commit -m addition &&
-	 git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
-	 git read-tree --empty &&
-	 git update-index -z --index-info <index &&
-	 git commit -m rename &&
-	 git read-tree --empty &&
-	 git commit -m deletion &&
-	 git fast-export -M HEAD >export.out &&
-	 git rev-list HEAD >expect &&
-	 git init result &&
-	 cd result &&
-	 git fast-import <../export.out &&
-	 git rev-list HEAD >actual &&
-	 test_cmp ../expect actual
-	)
+expecting success of 9300.246 'W: get-mark & empty orphan commit with ugly second newline': 
+	# Technically, this should fail as it has too many linefeeds
+	# according to the grammar in fast-import.txt.  But, for whatever
+	# reason, it works.  Since using the correct number of newlines
+	# does not work with older (pre-2.22) versions of git, allow apps
+	# that used this second-newline workaround to keep working by
+	# checking it with this test...
+	sed -e s/LFs/LL/ W-input | tr L "\n" | git fast-import
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/crazy-paths/.git/
-[main (root-commit) deac6af] addition
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 "path with\nnewline"
- create mode 100644 "path with \"quote\""
- create mode 100644 "path with \\backslash"
- create mode 100644 path with space
-[main 89b4a6a] rename
- Author: A U Thor <author@example.com>
- 4 files changed, 0 insertions(+), 0 deletions(-)
- rename "path with\nnewline" => "subdir/path with\nnewline" (100%)
- rename "path with \"quote\"" => "subdir/path with \"quote\"" (100%)
- rename "path with \\backslash" => "subdir/path with \\backslash" (100%)
- rename path with space => subdir/path with space (100%)
-[main 39f052a] deletion
- Author: A U Thor <author@example.com>
- 4 files changed, 4 deletions(-)
- delete mode 100644 "subdir/path with\nnewline"
- delete mode 100644 "subdir/path with \"quote\""
- delete mode 100644 "subdir/path with \\backslash"
- delete mode 100644 subdir/path with space
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/crazy-paths/result/.git/
+b5522bde54855bd5378728a9119bd1941276b996
 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)
+Total objects:            0 (         2 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         1 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:           1024 (         4 unique    )
-      atoms:              5
-Memory total:          2426 KiB
-       pools:          2133 KiB
+      marks:           1024 (         1 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        161 /        161
 ---------------------------------------------------------------------
 
-ok 42 - fast-export quotes pathnames
+ok 246 - W: get-mark & empty orphan commit with ugly second newline
 
-expecting success of 9350.43 'test bidirectionality': 
-	git init marks-test &&
-	git fast-export --export-marks=marks-cur --import-marks-if-exists=marks-cur --branches | \
-	git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks-if-exists=marks-new &&
-	(cd marks-test &&
-	git reset --hard &&
-	echo Wohlauf > file &&
-	git commit -a -m "back in time") &&
-	git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks-if-exists=marks-new --branches | \
-	git fast-import --export-marks=marks-cur --import-marks-if-exists=marks-cur
+expecting success of 9300.247 'W: get-mark & empty orphan commit with erroneous third newline': 
+	# ...but do NOT allow more empty lines than that (see previous test).
+	sed -e s/LFs/LLL/ W-input | tr L "\n" | test_must_fail git fast-import
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/marks-test/.git/
-fast-import statistics:
----------------------------------------------------------------------
-Alloc'd objects:       5000
-Total objects:           38 (         0 duplicates                  )
-      blobs  :           11 (         0 duplicates          1 deltas of          4 attempts)
-      trees  :           13 (         0 duplicates         12 deltas of         12 attempts)
-      commits:           14 (         0 duplicates          0 deltas of          0 attempts)
-      tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
-Total branches:           5 (         5 loads     )
-      marks:           1024 (        25 unique    )
-      atoms:             10
-Memory total:          2426 KiB
-       pools:          2133 KiB
-     objects:           292 KiB
----------------------------------------------------------------------
-pack_report: getpagesize()            =       4096
-pack_report: core.packedGitWindowSize =   33554432
-pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          8
-pack_report: pack_mmap_calls          =          4
-pack_report: pack_open_windows        =          0 /          1
-pack_report: pack_mapped              =          0 /       1493
----------------------------------------------------------------------
+fatal: Unsupported command: 
+fast-import: dumping crash report to .git/fast_import_crash_22543
+ok 247 - W: get-mark & empty orphan commit with erroneous third newline
+
+expecting success of 9300.248 'X: handling encoding': 
+	test_tick &&
+	cat >input <<-INPUT_END &&
+	commit refs/heads/encoding
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	encoding iso-8859-7
+	data <<COMMIT
+	INPUT_END
+
+	printf "Pi: \360\nCOMMIT\n" >>input &&
+
+	git fast-import <input &&
+	git cat-file -p encoding | grep $(printf "\360") &&
+	git log -1 --format=%B encoding | grep $(printf "\317\200")
 
-HEAD is now at bb8b8e2 second
-[main d085d4e] back in time
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+), 1 deletion(-)
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:            3 (         0 duplicates                  )
-      blobs  :            1 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            1 (         0 duplicates          0 deltas of          0 attempts)
+Total objects:            1 (         1 duplicates                  )
+      blobs  :            0 (         0 duplicates          0 deltas of          0 attempts)
+      trees  :            0 (         1 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:          2426 KiB
-       pools:          2133 KiB
+Total branches:           1 (         1 loads     )
+      marks:           1024 (         0 unique    )
+      atoms:              0
+Memory total:          2340 KiB
+       pools:          2048 KiB
      objects:           292 KiB
 ---------------------------------------------------------------------
 pack_report: getpagesize()            =       4096
 pack_report: core.packedGitWindowSize =   33554432
 pack_report: core.packedGitLimit      =  268435456
-pack_report: pack_used_ctr            =          0
-pack_report: pack_mmap_calls          =          0
-pack_report: pack_open_windows        =          0 /          0
-pack_report: pack_mapped              =          0 /          0
+pack_report: pack_used_ctr            =          2
+pack_report: pack_mmap_calls          =          1
+pack_report: pack_open_windows        =          1 /          1
+pack_report: pack_mapped              =        169 /        169
 ---------------------------------------------------------------------
 
-ok 43 - test bidirectionality
-
-expecting success of 9350.44 'avoid uninteresting refs': 
-	> tmp-marks &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks main > /dev/null &&
-	git tag v1.0 &&
-	git branch uninteresting &&
-	echo bump > file &&
-	git commit -a -m bump &&
-	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks ^uninteresting ^v1.0 main > actual &&
-	test_cmp expected actual
-
-[main ba31be1] 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
+Pi: ð
+Pi: π
+ok 248 - X: handling encoding
 
+expecting success of 9300.249 'Y: setup': 
+	test_oid_cache <<-EOF
+	Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
+	Ymain sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3
 	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 &&
+ok 249 - Y: setup
 
-	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 9300.250 'Y: rewrite submodules': 
+	git init main1 &&
+	(
+		cd main1 &&
+		git init sub2 &&
+		git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input &&
+		git fast-import --rewrite-submodules-from=sub:../Y-marks \
+			--rewrite-submodules-to=sub:sub2-marks <../Y-main-input &&
+		test "$(git rev-parse main)" = "$(test_oid Ymain)"
+	)
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/src/.git/
-[main (root-commit) b469450] 1st_commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 file.txt
-[main 85ccff7] 2nd_commit
- Author: A U Thor <author@example.com>
- 2 files changed, 2 insertions(+)
- create mode 100644 file2.txt
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/dst/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9300-fast-import/main1/.git/
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9300-fast-import/main1/sub2/.git/
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
@@ -532979,7 +533211,7 @@
       tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
 Total branches:           1 (         1 loads     )
       marks:           1024 (         4 unique    )
-      atoms:              2
+      atoms:              1
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -532993,118 +533225,17 @@
 pack_report: pack_mapped              =          0 /          0
 ---------------------------------------------------------------------
 
-ok 49 - when using -C, do not declare copy when source of copy is also modified
-
-expecting success of 9350.50 'merge commit gets exported with --import-marks': 
-	test_create_repo merging &&
-	(
-		cd merging &&
-		test_commit initial &&
-		git checkout -b topic &&
-		test_commit on-topic &&
-		git checkout main &&
-		test_commit on-main &&
-		test_tick &&
-		git merge --no-ff -m Yeah topic &&
-
-		echo ":1 $(git rev-parse HEAD^^)" >marks &&
-		git fast-export --import-marks=marks main >out &&
-		grep Yeah out
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/merging/.git/
-[main (root-commit) 1aef781] initial
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 initial.t
-Switched to a new branch 'topic'
-[topic bb9f331] on-topic
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 on-topic.t
-Switched to branch 'main'
-[main a2e3e6b] on-main
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 on-main.t
-Merge made by the 'ort' strategy.
- on-topic.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 on-topic.t
-Yeah
-ok 50 - merge commit gets exported with --import-marks
-
-expecting success of 9350.51 'fast-export --first-parent outputs all revisions output by revision walk': 
-	git init first-parent &&
-	(
-		cd first-parent &&
-		test_commit A &&
-		git checkout -b topic1 &&
-		test_commit B &&
-		git checkout main &&
-		git merge --no-ff topic1 &&
-
-		git checkout -b topic2 &&
-		test_commit C &&
-		git checkout main &&
-		git merge --no-ff topic2 &&
-
-		test_commit D &&
-
-		git fast-export main -- --first-parent >first-parent-export &&
-		git fast-export main -- --first-parent --reverse >first-parent-reverse-export &&
-		test_cmp first-parent-export first-parent-reverse-export &&
-
-		git init import &&
-		git -C import fast-import <first-parent-export &&
-
-		git log --format="%ad %s" --first-parent main >expected &&
-		git -C import log --format="%ad %s" --all >actual &&
-		test_cmp expected actual &&
-		test_line_count = 4 actual
-	)
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/first-parent/.git/
-[main (root-commit) 40531c9] A
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 A.t
-Switched to a new branch 'topic1'
-[topic1 26bf445] B
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- B.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 B.t
-Switched to a new branch 'topic2'
-[topic2 3d54688] C
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-Switched to branch 'main'
-Merge made by the 'ort' strategy.
- C.t | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 C.t
-[main 0270458] D
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 D.t
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9350-fast-export/first-parent/import/.git/
 fast-import statistics:
 ---------------------------------------------------------------------
 Alloc'd objects:       5000
-Total objects:           12 (         0 duplicates                  )
-      blobs  :            4 (         0 duplicates          0 deltas of          0 attempts)
-      trees  :            4 (         0 duplicates          3 deltas of          3 attempts)
-      commits:            4 (         0 duplicates          0 deltas of          0 attempts)
+Total objects:            9 (         0 duplicates                  )
+      blobs  :            3 (         0 duplicates          0 deltas of          1 attempts)
+      trees  :            3 (         0 duplicates          2 deltas of          2 attempts)
+      commits:            3 (         0 duplicates          0 deltas of          0 attempts)
       tags   :            0 (         0 duplicates          0 deltas of          0 attempts)
 Total branches:           1 (         1 loads     )
-      marks:           1024 (         8 unique    )
-      atoms:              4
+      marks:           1024 (        12 unique    )
+      atoms:              3
 Memory total:          2426 KiB
        pools:          2133 KiB
      objects:           292 KiB
@@ -533118,22 +533249,10 @@
 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
+ok 250 - Y: rewrite submodules
 
-# still have 1 known breakage(s)
-# passed all remaining 51 test(s)
-1..52
+# passed all 250 test(s)
+1..250
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9501-gitweb-standalone-http-status.sh ***
@@ -533502,32 +533621,32 @@
 <td></td>
 <td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
-<td><i></i></td>
-<td class="age2">20 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
 <td class="link"><a href="/gitweb.cgi?p=.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=.git;a=log">log</a> | <a href="/gitweb.cgi?p=.git;a=tree">tree</a></td>
 </tr>
 <tr class="light">
 <td></td>
 <td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary">foo.bar.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
-<td><i></i></td>
-<td class="age2">20 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
 <td class="link"><a href="/gitweb.cgi?p=foo.bar.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=tree">tree</a></td>
 </tr>
 <tr class="dark">
 <td><a href="/gitweb.cgi?p=foo.git;a=forks" title="1 forks">+</a></td>
 <td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary">foo.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary" title="foo">foo</a></td>
-<td><i></i></td>
-<td class="age2">20 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
 <td class="link"><a href="/gitweb.cgi?p=foo.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.git;a=tree">tree</a> | <a href="/gitweb.cgi?p=foo.git;a=forks">forks</a></td>
 </tr>
 <tr class="light">
 <td></td>
 <td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary">foo_baz.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
-<td><i></i></td>
-<td class="age2">20 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
 <td class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
 </tr>
 </table>
@@ -533584,32 +533703,32 @@
 <td></td>
 <td><a class="list" href="/gitweb.cgi?p=.git;a=summary">.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=.git;a=summary" title="t9502-gitweb-standalone-parse-output.sh test repository">t9502-gitweb-standalone-parse... </a></td>
-<td><i></i></td>
-<td class="age2">20 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
 <td class="link"><a href="/gitweb.cgi?p=.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=.git;a=log">log</a> | <a href="/gitweb.cgi?p=.git;a=tree">tree</a></td>
 </tr>
 <tr class="light">
 <td></td>
 <td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary">foo.bar.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=foo.bar.git;a=summary" title="foo.bar">foo.bar</a></td>
-<td><i></i></td>
-<td class="age2">20 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
 <td class="link"><a href="/gitweb.cgi?p=foo.bar.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.bar.git;a=tree">tree</a></td>
 </tr>
 <tr class="dark">
 <td><a href="/gitweb.cgi?p=foo.git;a=forks" title="1 forks">+</a></td>
 <td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary">foo.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=foo.git;a=summary" title="foo">foo</a></td>
-<td><i></i></td>
-<td class="age2">20 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
 <td class="link"><a href="/gitweb.cgi?p=foo.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo.git;a=tree">tree</a> | <a href="/gitweb.cgi?p=foo.git;a=forks">forks</a></td>
 </tr>
 <tr class="light">
 <td></td>
 <td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary">foo_baz.git</a></td>
 <td><a class="list" href="/gitweb.cgi?p=foo_baz.git;a=summary" title="foo_baz">foo_baz</a></td>
-<td><i></i></td>
-<td class="age2">20 years ago</td>
+<td><i>second user</i></td>
+<td class="age2">19 years ago</td>
 <td class="link"><a href="/gitweb.cgi?p=foo_baz.git;a=summary">summary</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=shortlog">shortlog</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=log">log</a> | <a href="/gitweb.cgi?p=foo_baz.git;a=tree">tree</a></td>
 </tr>
 </table>
@@ -533698,6 +533817,976 @@
 1..20
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9400-git-cvsserver-server.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1312.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1312.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1312.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9401-git-cvsserver-crlf.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1312.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1267.
+Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9600-cvsimport.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9600-cvsimport/.git/
 checking prerequisite: NOT_ROOT
@@ -533820,7 +534909,7 @@
 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
 
 
-Updating 6c92cac..d7184e3
+Updating bb7f1c3..696a336
 Fast-forward (no commit created; -m option ignored)
  o_fortuna | 24 ++++++++++++------------
  1 file changed, 12 insertions(+), 12 deletions(-)
@@ -533862,7 +534951,7 @@
 	test_cmp module-cvs/tick module-git/tick
 
 
-Updating d7184e3..27b8bd2
+Updating 696a336..5439b9d
 Fast-forward (no commit created; -m option ignored)
  tick | 1 +
  1 file changed, 1 insertion(+)
@@ -533916,6 +535005,367 @@
 1..15
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9601-cvsimport-vendor-branch.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9601-cvsimport-vendor-branch/.git/
+expecting success of 9601.1 'import a module with a vendor branch': 
+
+	git cvsimport -C module-git module
+
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9601-cvsimport-vendor-branch/module-git/.git/
+Skipping #CVSPS_NO_BRANCH
+ok 1 - import a module with a vendor branch
+
+expecting success of 9601.2 'check HEAD out of cvs repository': test_cvs_co main
+cvs checkout: Updating module-cvs-main
+U module-cvs-main/added-imported.txt
+U module-cvs-main/imported-anonymously.txt
+U module-cvs-main/imported-modified-imported.txt
+U module-cvs-main/imported-modified.txt
+U module-cvs-main/imported-once.txt
+U module-cvs-main/imported-twice.txt
+ok 2 - check HEAD out of cvs repository
+
+expecting success of 9601.3 'check main out of git repository': test_git_co main
+Already on 'main'
+ok 3 - check main out of git repository
+
+expecting success of 9601.4 'check a file that was imported once': 
+
+	test_cmp_branch_file main imported-once.txt
+
+
+ok 4 - check a file that was imported once
+
+checking known breakage of 9601.5 'check a file that was imported twice': 
+
+	test_cmp_branch_file main imported-twice.txt
+
+
+--- module-cvs-main/imported-twice.txt	2004-02-09 15:43:13.000000000 +0000
++++ module-git/imported-twice.txt	2024-11-14 19:49:41.538076051 +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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9603-cvsimport-patchsets.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9603-cvsimport-patchsets/.git/
+checking known breakage of 9603.1 'import with criss cross times on revisions': 
+	git cvsimport -p"-x" -C module-git module &&
+	(
+		cd module-git &&
+		git log --pretty=format:%s > ../actual-main &&
+		git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
+		echo "" >> ../actual-main &&
+		echo "" >> ../actual-A
+	) &&
+	echo "Rev 4
+Rev 3
+Rev 2
+Rev 1" > expect-main &&
+	test_cmp expect-main actual-main &&
+
+	echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
+Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
+	test_cmp expect-A actual-A
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
+--- expect-main	2024-11-14 19:49:44.574107184 +0000
++++ actual-main	2024-11-14 19:49:44.570107143 +0000
+@@ -1,4 +1,4 @@
+ Rev 4
+ Rev 3
+-Rev 2
+ Rev 1
++Rev 2
+not ok 1 - import with criss cross times on revisions # TODO known breakage
+
+# still have 1 known breakage(s)
+1..1
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9700-perl-git.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9700-perl-git/.git/
+checking prerequisite: PERL_TEST_MORE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
+	perl -MTest::More -e 0
+
+)
+prerequisite PERL_TEST_MORE ok
+expecting success of 9700.1 'set up test repository': 
+	echo "test file 1" >file1 &&
+	echo "test file 2" >file2 &&
+	mkdir directory1 &&
+	echo "in directory1" >>directory1/file &&
+	mkdir directory2 &&
+	echo "in directory2" >>directory2/file &&
+	git add . &&
+	git commit -m "first commit" &&
+
+	echo "new file in subdir 2" >directory2/file2 &&
+	git add . &&
+	git commit -m "commit in directory2" &&
+
+	echo "changed file 1" >file1 &&
+	git commit -a -m "second commit" &&
+
+	git config --add color.test.slot1 green &&
+	git config --add test.string value &&
+	git config --add test.dupstring value1 &&
+	git config --add test.dupstring value2 &&
+	git config --add test.booltrue true &&
+	git config --add test.boolfalse no &&
+	git config --add test.boolother other &&
+	git config --add test.int 2k &&
+	git config --add test.path "~/foo" &&
+	git config --add test.pathexpanded "$HOME/foo" &&
+	git config --add test.pathmulti foo &&
+	git config --add test.pathmulti bar
+
+[master (root-commit) 0e23d58] first commit
+ Author: A U Thor <author@example.com>
+ 4 files changed, 4 insertions(+)
+ create mode 100644 directory1/file
+ create mode 100644 directory2/file
+ create mode 100644 file1
+ create mode 100644 file2
+[master ffba337] commit in directory2
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+)
+ create mode 100644 directory2/file2
+[master 5d924b7] second commit
+ Author: A U Thor <author@example.com>
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+ok 1 - set up test repository
+
+expecting success of 9700.2 'set up bare repository': 
+	git init --bare bare.git
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9700-perl-git/bare.git/
+ok 2 - set up bare repository
+
+expecting success of 9700.3 'use t9700/test.pl to test Git.pm': 
+	"$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl 2>stderr &&
+	test_must_be_empty stderr
+
+ok 2 - use Git;
+ok 3 - open repository
+ok 4 - reject unsafe non-bare repository
+ok 5 - unsafe error message
+ok 6 - reject unsafe bare repository
+ok 7 - unsafe error message
+ok 8 - config scalar: string
+ok 9 - config array: string
+ok 10 - config scalar: nonexistent
+ok 11 - config array: nonexistent
+ok 12 - config_int: integer
+ok 13 - config_int: nonexistent
+ok 14 - config_bool: true
+ok 15 - config_bool: false
+ok 16 - config_path: ~/foo expansion
+ok 17 - config_path: multiple values
+ok 18 - get_color
+ok 19 - config: multivar
+ok 20 - config_bool: non-boolean values fail
+ok 21 - ident scalar: author (type)
+ok 22 - ident scalar: committer (type)
+ok 23 - ident scalar: invalid ident string (no parsing)
+ok 24 - ident array: author
+ok 25 - ident array: author
+ok 26 - ident array: ident string
+ok 27 - ident array: invalid ident string
+ok 28 - ident_person: author (type)
+ok 29 - ident_person: ident string
+ok 30 - ident_person: array
+ok 31 - (get file hash)
+ok 32 - cat_blob: size
+ok 33 - cat_blob: data
+ok 34 - hash_object: roundtrip
+ok 35 - hash_and_insert_object: returns hash
+ok 36 - cat_blob: roundtrip size
+ok 37 - cat_blob: roundtrip data
+ok 38 - repo_path
+ok 39 - wc_path
+ok 40 - wc_subdir initial
+ok 41 - wc_subdir after wc_chdir
+ok 42 - config after wc_chdir
+ok 43 - repo_path (2)
+ok 44 - wc_path (2)
+ok 45 - wc_subdir initial (2)
+ok 46 - rev-parse returned hash
+ok 47 - log . does not show last commit
+ok 48 - cat_blob(outside): size
+ok 49 - unquote unquoted path
+ok 50 - unquote simple quoted path
+ok 51 - unquote escape sequences
+1..51
+ok 3 - use t9700/test.pl to test Git.pm
+
+# passed all 3 test(s)
+1..3
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9800-git-p4-basic.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9801-git-p4-branch.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9802-git-p4-filetype.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9604-cvsimport-timestamps.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9604-cvsimport-timestamps/.git/
+checking prerequisite: POSIX_TIMEZONE
+
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-POSIX_TIMEZONE" &&
+(
+	cd "$TRASH_DIRECTORY/prereq-test-dir-POSIX_TIMEZONE" &&
+	local tz=XST-1XDT,M3.5.0,M11.1.0
+	echo "1711846799 -> 2024-03-31 01:59:59 +0100" >expected &&
+	TZ="$tz" test-tool date show:iso-local 1711846799 >actual &&
+	test_cmp expected actual &&
+	echo "1711846800 -> 2024-03-31 03:00:00 +0200" >expected &&
+	TZ="$tz" test-tool date show:iso-local 1711846800 >actual &&
+	test_cmp expected actual &&
+	echo "1730591999 -> 2024-11-03 01:59:59 +0200" >expected &&
+	TZ="$tz" test-tool date show:iso-local 1730591999 >actual &&
+	test_cmp expected actual &&
+	echo "1730592000 -> 2024-11-03 01:00:00 +0100" >expected &&
+	TZ="$tz" test-tool date show:iso-local 1730592000 >actual &&
+	test_cmp expected actual
+
+)
+prerequisite POSIX_TIMEZONE ok
+expecting success of 9604.1 'check timestamps are UTC': 
+
+	TZ=CST6CDT,M4.1.0,M10.5.0 \
+	git cvsimport -p"-x" -C module-1 module &&
+	git cvsimport -p"-x" -C module-1 module &&
+	(
+		cd module-1 &&
+		git log --format="%s %ai"
+	) >actual-1 &&
+	cat >expect-1 <<-EOF &&
+	Rev 16 2006-10-29 07:00:01 +0000
+	Rev 15 2006-10-29 06:59:59 +0000
+	Rev 14 2006-04-02 08:00:01 +0000
+	Rev 13 2006-04-02 07:59:59 +0000
+	Rev 12 2005-12-01 00:00:00 +0000
+	Rev 11 2005-11-01 00:00:00 +0000
+	Rev 10 2005-10-01 00:00:00 +0000
+	Rev  9 2005-09-01 00:00:00 +0000
+	Rev  8 2005-08-01 00:00:00 +0000
+	Rev  7 2005-07-01 00:00:00 +0000
+	Rev  6 2005-06-01 00:00:00 +0000
+	Rev  5 2005-05-01 00:00:00 +0000
+	Rev  4 2005-04-01 00:00:00 +0000
+	Rev  3 2005-03-01 00:00:00 +0000
+	Rev  2 2005-02-01 00:00:00 +0000
+	Rev  1 2005-01-01 00:00:00 +0000
+	EOF
+	test_cmp expect-1 actual-1
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9604-cvsimport-timestamps/module-1/.git/
+Already up to date.
+ok 1 - check timestamps are UTC
+
+expecting success of 9604.2 'check timestamps with author-specific timezones': 
+
+	cat >cvs-authors <<-EOF &&
+	user1=User One <user1@domain.org>
+	user2=User Two <user2@domain.org> CST6CDT,M4.1.0,M10.5.0
+	user3=User Three <user3@domain.org> EST5EDT,M4.1.0,M10.5.0
+	user4=User Four <user4@domain.org> MST7MDT,M4.1.0,M10.5.0
+	EOF
+	git cvsimport -p"-x" -A cvs-authors -C module-2 module &&
+	(
+		cd module-2 &&
+		git log --format="%s %ai %an"
+	) >actual-2 &&
+	cat >expect-2 <<-EOF &&
+	Rev 16 2006-10-29 01:00:01 -0600 User Two
+	Rev 15 2006-10-29 01:59:59 -0500 User Two
+	Rev 14 2006-04-02 03:00:01 -0500 User Two
+	Rev 13 2006-04-02 01:59:59 -0600 User Two
+	Rev 12 2005-11-30 17:00:00 -0700 User Four
+	Rev 11 2005-10-31 19:00:00 -0500 User Three
+	Rev 10 2005-09-30 19:00:00 -0500 User Two
+	Rev  9 2005-09-01 00:00:00 +0000 User One
+	Rev  8 2005-07-31 18:00:00 -0600 User Four
+	Rev  7 2005-06-30 20:00:00 -0400 User Three
+	Rev  6 2005-05-31 19:00:00 -0500 User Two
+	Rev  5 2005-05-01 00:00:00 +0000 User One
+	Rev  4 2005-03-31 17:00:00 -0700 User Four
+	Rev  3 2005-02-28 19:00:00 -0500 User Three
+	Rev  2 2005-01-31 18:00:00 -0600 User Two
+	Rev  1 2005-01-01 00:00:00 +0000 User One
+	EOF
+	test_cmp expect-2 actual-2
+
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9604-cvsimport-timestamps/module-2/.git/
+ok 2 - check timestamps with author-specific timezones
+
+# passed all 2 test(s)
+1..2
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/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.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9804-git-p4-label.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9805-git-p4-skip-submit-edit.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9806-git-p4-options.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9500-gitweb-standalone-no-errors.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9500-gitweb-standalone-no-errors/.git/
 expecting success of 9500.1 'no commits: projects_list (implicit)': gitweb_run
@@ -534559,460 +536009,99 @@
 expecting success of 9500.101 'search: preparation': echo "1st MATCH" >>file &&
 	 echo "2nd MATCH" >>file &&
 	 echo "MATCH" >>bar &&
-	 git add file bar &&
-	 git commit -m "Added MATCH word"
-[main 13113e4] Added MATCH word
- Author: A U Thor <author@example.com>
- 2 files changed, 3 insertions(+)
-ok 101 - search: preparation
-
-expecting success of 9500.102 'search: commit author': gitweb_run "p=.git;a=search;h=HEAD;st=author;s=A+U+Thor"
-ok 102 - search: commit author
-
-expecting success of 9500.103 'search: commit message': gitweb_run "p=.git;a=search;h=HEAD;st=commitr;s=MATCH"
-ok 103 - search: commit message
-
-expecting success of 9500.104 'search: grep': gitweb_run "p=.git;a=search;h=HEAD;st=grep;s=MATCH"
-ok 104 - search: grep
-
-expecting success of 9500.105 'search: pickaxe': gitweb_run "p=.git;a=search;h=HEAD;st=pickaxe;s=MATCH"
-ok 105 - search: pickaxe
-
-expecting success of 9500.106 'search: projects': gitweb_run "a=project_list;s=.git"
-ok 106 - search: projects
-
-expecting success of 9500.107 'README.html with non-ASCII characters (utf-8)': echo "<b>UTF-8 example:</b><br />" >.git/README.html &&
-	 cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >>.git/README.html &&
-	 gitweb_run "p=.git;a=summary"
-ok 107 - README.html with non-ASCII characters (utf-8)
-
-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.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9601-cvsimport-vendor-branch.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9601-cvsimport-vendor-branch/.git/
-expecting success of 9601.1 'import a module with a vendor branch': 
-
-	git cvsimport -C module-git module
-
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9601-cvsimport-vendor-branch/module-git/.git/
-Skipping #CVSPS_NO_BRANCH
-ok 1 - import a module with a vendor branch
-
-expecting success of 9601.2 'check HEAD out of cvs repository': test_cvs_co main
-cvs checkout: Updating module-cvs-main
-U module-cvs-main/added-imported.txt
-U module-cvs-main/imported-anonymously.txt
-U module-cvs-main/imported-modified-imported.txt
-U module-cvs-main/imported-modified.txt
-U module-cvs-main/imported-once.txt
-U module-cvs-main/imported-twice.txt
-ok 2 - check HEAD out of cvs repository
-
-expecting success of 9601.3 'check main out of git repository': test_git_co main
-Already on 'main'
-ok 3 - check main out of git repository
-
-expecting success of 9601.4 'check a file that was imported once': 
-
-	test_cmp_branch_file main imported-once.txt
-
-
-ok 4 - check a file that was imported once
-
-checking known breakage of 9601.5 'check a file that was imported twice': 
-
-	test_cmp_branch_file main imported-twice.txt
-
-
---- module-cvs-main/imported-twice.txt	2004-02-09 15:43:13.000000000 +0000
-+++ module-git/imported-twice.txt	2025-12-18 01:41:18.582773267 +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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9603-cvsimport-patchsets.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9603-cvsimport-patchsets/.git/
-checking known breakage of 9603.1 'import with criss cross times on revisions': 
-	git cvsimport -p"-x" -C module-git module &&
-	(
-		cd module-git &&
-		git log --pretty=format:%s > ../actual-main &&
-		git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
-		echo "" >> ../actual-main &&
-		echo "" >> ../actual-A
-	) &&
-	echo "Rev 4
-Rev 3
-Rev 2
-Rev 1" > expect-main &&
-	test_cmp expect-main actual-main &&
-
-	echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
-Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
-	test_cmp expect-A actual-A
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9603-cvsimport-patchsets/module-git/.git/
---- expect-main	2025-12-18 01:41:19.430773267 +0000
-+++ actual-main	2025-12-18 01:41:19.430773267 +0000
-@@ -1,4 +1,4 @@
- Rev 4
- Rev 3
--Rev 2
- Rev 1
-+Rev 2
-not ok 1 - import with criss cross times on revisions # TODO known breakage
-
-# still have 1 known breakage(s)
-1..1
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9604-cvsimport-timestamps.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9604-cvsimport-timestamps/.git/
-checking prerequisite: POSIX_TIMEZONE
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-POSIX_TIMEZONE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-POSIX_TIMEZONE" &&
-	local tz=XST-1XDT,M3.5.0,M11.1.0
-	echo "1711846799 -> 2024-03-31 01:59:59 +0100" >expected &&
-	TZ="$tz" test-tool date show:iso-local 1711846799 >actual &&
-	test_cmp expected actual &&
-	echo "1711846800 -> 2024-03-31 03:00:00 +0200" >expected &&
-	TZ="$tz" test-tool date show:iso-local 1711846800 >actual &&
-	test_cmp expected actual &&
-	echo "1730591999 -> 2024-11-03 01:59:59 +0200" >expected &&
-	TZ="$tz" test-tool date show:iso-local 1730591999 >actual &&
-	test_cmp expected actual &&
-	echo "1730592000 -> 2024-11-03 01:00:00 +0100" >expected &&
-	TZ="$tz" test-tool date show:iso-local 1730592000 >actual &&
-	test_cmp expected actual
-
-)
-prerequisite POSIX_TIMEZONE ok
-expecting success of 9604.1 'check timestamps are UTC': 
-
-	TZ=CST6CDT,M4.1.0,M10.5.0 \
-	git cvsimport -p"-x" -C module-1 module &&
-	git cvsimport -p"-x" -C module-1 module &&
-	(
-		cd module-1 &&
-		git log --format="%s %ai"
-	) >actual-1 &&
-	cat >expect-1 <<-EOF &&
-	Rev 16 2006-10-29 07:00:01 +0000
-	Rev 15 2006-10-29 06:59:59 +0000
-	Rev 14 2006-04-02 08:00:01 +0000
-	Rev 13 2006-04-02 07:59:59 +0000
-	Rev 12 2005-12-01 00:00:00 +0000
-	Rev 11 2005-11-01 00:00:00 +0000
-	Rev 10 2005-10-01 00:00:00 +0000
-	Rev  9 2005-09-01 00:00:00 +0000
-	Rev  8 2005-08-01 00:00:00 +0000
-	Rev  7 2005-07-01 00:00:00 +0000
-	Rev  6 2005-06-01 00:00:00 +0000
-	Rev  5 2005-05-01 00:00:00 +0000
-	Rev  4 2005-04-01 00:00:00 +0000
-	Rev  3 2005-03-01 00:00:00 +0000
-	Rev  2 2005-02-01 00:00:00 +0000
-	Rev  1 2005-01-01 00:00:00 +0000
-	EOF
-	test_cmp expect-1 actual-1
-
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9604-cvsimport-timestamps/module-1/.git/
-Already up to date.
-ok 1 - check timestamps are UTC
-
-expecting success of 9604.2 'check timestamps with author-specific timezones': 
-
-	cat >cvs-authors <<-EOF &&
-	user1=User One <user1@domain.org>
-	user2=User Two <user2@domain.org> CST6CDT,M4.1.0,M10.5.0
-	user3=User Three <user3@domain.org> EST5EDT,M4.1.0,M10.5.0
-	user4=User Four <user4@domain.org> MST7MDT,M4.1.0,M10.5.0
-	EOF
-	git cvsimport -p"-x" -A cvs-authors -C module-2 module &&
-	(
-		cd module-2 &&
-		git log --format="%s %ai %an"
-	) >actual-2 &&
-	cat >expect-2 <<-EOF &&
-	Rev 16 2006-10-29 01:00:01 -0600 User Two
-	Rev 15 2006-10-29 01:59:59 -0500 User Two
-	Rev 14 2006-04-02 03:00:01 -0500 User Two
-	Rev 13 2006-04-02 01:59:59 -0600 User Two
-	Rev 12 2005-11-30 17:00:00 -0700 User Four
-	Rev 11 2005-10-31 19:00:00 -0500 User Three
-	Rev 10 2005-09-30 19:00:00 -0500 User Two
-	Rev  9 2005-09-01 00:00:00 +0000 User One
-	Rev  8 2005-07-31 18:00:00 -0600 User Four
-	Rev  7 2005-06-30 20:00:00 -0400 User Three
-	Rev  6 2005-05-31 19:00:00 -0500 User Two
-	Rev  5 2005-05-01 00:00:00 +0000 User One
-	Rev  4 2005-03-31 17:00:00 -0700 User Four
-	Rev  3 2005-02-28 19:00:00 -0500 User Three
-	Rev  2 2005-01-31 18:00:00 -0600 User Two
-	Rev  1 2005-01-01 00:00:00 +0000 User One
-	EOF
-	test_cmp expect-2 actual-2
+	 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
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9604-cvsimport-timestamps/module-2/.git/
-ok 2 - check timestamps with author-specific timezones
+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
 
-# passed all 2 test(s)
-1..2
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9700-perl-git.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9700-perl-git/.git/
-checking prerequisite: PERL_TEST_MORE
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-PERL_TEST_MORE" &&
-	perl -MTest::More -e 0
+expecting success of 9500.104 'search: grep': gitweb_run "p=.git;a=search;h=HEAD;st=grep;s=MATCH"
+ok 104 - search: grep
 
-)
-prerequisite PERL_TEST_MORE ok
-expecting success of 9700.1 'set up test repository': 
-	echo "test file 1" >file1 &&
-	echo "test file 2" >file2 &&
-	mkdir directory1 &&
-	echo "in directory1" >>directory1/file &&
-	mkdir directory2 &&
-	echo "in directory2" >>directory2/file &&
-	git add . &&
-	git commit -m "first commit" &&
+expecting success of 9500.105 'search: pickaxe': gitweb_run "p=.git;a=search;h=HEAD;st=pickaxe;s=MATCH"
+ok 105 - search: pickaxe
 
-	echo "new file in subdir 2" >directory2/file2 &&
-	git add . &&
-	git commit -m "commit in directory2" &&
+expecting success of 9500.106 'search: projects': gitweb_run "a=project_list;s=.git"
+ok 106 - search: projects
 
-	echo "changed file 1" >file1 &&
-	git commit -a -m "second commit" &&
+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)
 
-	git config --add color.test.slot1 green &&
-	git config --add test.string value &&
-	git config --add test.dupstring value1 &&
-	git config --add test.dupstring value2 &&
-	git config --add test.booltrue true &&
-	git config --add test.boolfalse no &&
-	git config --add test.boolother other &&
-	git config --add test.int 2k &&
-	git config --add test.path "~/foo" &&
-	git config --add test.pathexpanded "$HOME/foo" &&
-	git config --add test.pathmulti foo &&
-	git config --add test.pathmulti bar
+Skipping syntax highlighting tests: 'highlight' not found
+ok 108 # skip syntax highlighting (no highlight, unknown syntax) (missing HIGHLIGHT)
 
-[master (root-commit) 0e23d58] first commit
- Author: A U Thor <author@example.com>
- 4 files changed, 4 insertions(+)
- create mode 100644 directory1/file
- create mode 100644 directory2/file
- create mode 100644 file1
- create mode 100644 file2
-[master ffba337] commit in directory2
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644 directory2/file2
-[master 5d924b7] second commit
+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.45.2/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, 1 insertion(+), 1 deletion(-)
-ok 1 - set up test repository
+ 1 file changed, 5 insertions(+)
+ create mode 100644 file
+Cloning into bare repository 'foo-forked.git'...
+done.
+ok 111 - forks: prepare
 
-expecting success of 9700.2 'set up bare repository': 
-	git init --bare bare.git
+expecting success of 9500.112 'forks: projects list': gitweb_run
+ok 112 - forks: projects list
 
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9700-perl-git/bare.git/
-ok 2 - set up bare repository
+expecting success of 9500.113 'forks: forks action': gitweb_run "p=foo.git;a=forks"
+ok 113 - forks: forks action
 
-expecting success of 9700.3 'use t9700/test.pl to test Git.pm': 
-	"$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl 2>stderr &&
-	test_must_be_empty stderr
+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 2 - use Git;
-ok 3 - open repository
-ok 4 - reject unsafe non-bare repository
-ok 5 - unsafe error message
-ok 6 - reject unsafe bare repository
-ok 7 - unsafe error message
-ok 8 - config scalar: string
-ok 9 - config array: string
-ok 10 - config scalar: nonexistent
-ok 11 - config array: nonexistent
-ok 12 - config_int: integer
-ok 13 - config_int: nonexistent
-ok 14 - config_bool: true
-ok 15 - config_bool: false
-ok 16 - config_path: ~/foo expansion
-ok 17 - config_path: multiple values
-ok 18 - get_color
-ok 19 - config: multivar
-ok 20 - config_bool: non-boolean values fail
-ok 21 - ident scalar: author (type)
-ok 22 - ident scalar: committer (type)
-ok 23 - ident scalar: invalid ident string (no parsing)
-ok 24 - ident array: author
-ok 25 - ident array: author
-ok 26 - ident array: ident string
-ok 27 - ident array: invalid ident string
-ok 28 - ident_person: author (type)
-ok 29 - ident_person: ident string
-ok 30 - ident_person: array
-ok 31 - (get file hash)
-ok 32 - cat_blob: size
-ok 33 - cat_blob: data
-ok 34 - hash_object: roundtrip
-ok 35 - hash_and_insert_object: returns hash
-ok 36 - cat_blob: roundtrip size
-ok 37 - cat_blob: roundtrip data
-ok 38 - repo_path
-ok 39 - wc_path
-ok 40 - wc_subdir initial
-ok 41 - wc_subdir after wc_chdir
-ok 42 - config after wc_chdir
-ok 43 - repo_path (2)
-ok 44 - wc_path (2)
-ok 45 - wc_subdir initial (2)
-ok 46 - rev-parse returned hash
-ok 47 - log . does not show last commit
-ok 48 - cat_blob(outside): size
-ok 49 - unquote unquoted path
-ok 50 - unquote simple quoted path
-ok 51 - unquote escape sequences
-1..51
-ok 3 - use t9700/test.pl to test Git.pm
+expecting success of 9500.115 'ctags: search projects by existing tag': gitweb_run "by_tag=foo"
+ok 115 - ctags: search projects by existing tag
 
-# passed all 3 test(s)
-1..3
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9800-git-p4-basic.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9801-git-p4-branch.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9802-git-p4-filetype.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9804-git-p4-label.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9805-git-p4-skip-submit-edit.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9806-git-p4-options.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
+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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9807-git-p4-submit.sh ***
@@ -535023,10 +536112,6 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9809-git-p4-client-view.sh ***
-1..0 # SKIP skipping git p4 tests; no p4 or p4d
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9810-git-p4-rcs.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
@@ -535039,6 +536124,10 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
+*** t9809-git-p4-client-view.sh ***
+1..0 # SKIP skipping git p4 tests; no p4 or p4d
+make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
+make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9813-git-p4-preserve-users.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
@@ -535047,23 +536136,23 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9815-git-p4-submit-fail.sh ***
+*** t9817-git-p4-exclude.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9816-git-p4-locked.sh ***
+*** t9815-git-p4-submit-fail.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9817-git-p4-exclude.sh ***
+*** t9816-git-p4-locked.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9818-git-p4-block.sh ***
+*** t9819-git-p4-case-folding.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9819-git-p4-case-folding.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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
@@ -535091,11 +536180,11 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9826-git-p4-keep-empty-commits.sh ***
+*** t9827-git-p4-change-filetype.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9827-git-p4-change-filetype.sh ***
+*** t9826-git-p4-keep-empty-commits.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
@@ -535111,23 +536200,23 @@
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9831-git-p4-triggers.sh ***
+*** t9832-unshelve.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9832-unshelve.sh ***
+*** t9831-git-p4-triggers.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9833-errors.sh ***
+*** t9835-git-p4-metadata-encoding-python2.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9834-git-p4-file-dir-bug.sh ***
+*** t9833-errors.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9835-git-p4-metadata-encoding-python2.sh ***
+*** t9834-git-p4-file-dir-bug.sh ***
 1..0 # SKIP skipping git p4 tests; no p4 or p4d
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
@@ -535182,353 +536271,272 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9401-git-cvsserver-crlf.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
+*** t9602-cvsimport-branches-tags.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9602-cvsimport-branches-tags/.git/
+expecting success of 9602.1 'import module': 
 
-ok 1 - setup
+	git cvsimport -C module-git module
 
-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)
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9602-cvsimport-branches-tags/module-git/.git/
+ok 1 - import module
 
-expecting success of 9401.3 'cvs co (allbinary)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary true &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c -kb &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes -kb &&
-    marked_as cvswork mixedUp.c -kb &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h -kb &&
-    marked_as cvswork/subdir unspecified.other -kb
+expecting success of 9602.2 'test branch main': 
 
-ok 3 - cvs co (allbinary)
+	test_cmp_branch_tree main
 
-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)
+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 9401.5 'cvs co (use attributes)': 
-    GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary false &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
-    marked_as cvswork textfile.c "" &&
-    marked_as cvswork binfile.bin -kb &&
-    marked_as cvswork .gitattributes "" &&
-    marked_as cvswork mixedUp.c "" &&
-    marked_as cvswork/subdir withCr.bin -kb &&
-    marked_as cvswork/subdir file.h "" &&
-    marked_as cvswork/subdir unspecified.other ""
+expecting success of 9602.3 'test branch vendorbranch': 
 
-ok 5 - cvs co (use attributes)
+	test_cmp_branch_tree vendorbranch
 
-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
+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 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
+checking known breakage of 9602.4 'test branch B_FROM_INITIALS': 
 
-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.45.2/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1312.
-U binfile.bin
-cvs update: `cvs.log' is no longer in the repository
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1312.
-cvs update: `subdir/cvs.log' is no longer in the repository
-U subdir/file.h
-U subdir/newfile.bin
-U subdir/newfile.c
-ok 7 - updating
+	test_cmp_branch_tree B_FROM_INITIALS
 
-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)
+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 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
+checking known breakage of 9602.5 'test branch B_FROM_INITIALS_BUT_ONE': 
 
-To gitcvs.git
-   faca8d4..509c7f1  main -> main
-ok 9 - setup multi-line files
+	test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE
 
-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)
+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 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 ""
+checking known breakage of 9602.6 'test branch B_MIXED': 
 
-ok 11 - cvs co another copy (guess)
+	test_cmp_branch_tree B_MIXED
 
-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
+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	2024-11-14 19:49:51.038173469 +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 9401.13 'add text (guess)': 
-    (cd cvswork &&
-    echo "simpleText" > simpleText.c &&
-    GIT_CONFIG="$git_config" cvs -Q add simpleText.c
-    ) &&
-    marked_as cvswork simpleText.c ""
+expecting success of 9602.7 'test branch B_SPLIT': 
 
-cvs add: scheduling file `simpleText.c' for addition
-cvs add: use `cvs commit' to add this file permanently
-ok 13 - add text (guess)
+	test_cmp_branch_tree B_SPLIT
 
-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)
+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 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 ""
+checking known breakage of 9602.8 'test tag vendortag': 
 
-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)
+	test_cmp_branch_tree vendortag
 
-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)
+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 9401.17 'update subdir of other copy (guess)': 
-    (cd cvswork2/subdir &&
-    GIT_CONFIG="$git_config" cvs -Q update
-    ) &&
-    marked_as cvswork2 textfile.c "" &&
-    marked_as cvswork2 binfile.bin -kb &&
-    marked_as cvswork2 .gitattributes "" &&
-    marked_as cvswork2 mixedUp.c -kb &&
-    marked_as cvswork2 multiline.c -kb &&
-    marked_as cvswork2 multilineTxt.c "" &&
-    not_present cvswork2/subdir withCr.bin &&
-    not_present cvswork2/subdir file.h &&
-    marked_as cvswork2/subdir unspecified.other "" &&
-    marked_as cvswork2/subdir newfile.bin "" &&
-    marked_as cvswork2/subdir newfile.c "" &&
-    not_present cvswork2 simpleBin.bin &&
-    not_present cvswork2 simpleText.c
+expecting success of 9602.9 'test tag T_ALL_INITIAL_FILES': 
 
-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)
+	test_cmp_branch_tree T_ALL_INITIAL_FILES
 
-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)
+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'.
 
-# passed all 18 test(s)
-1..18
+You are in 'detached HEAD' state. You can look around, make experimental
+changes and commit them, and you can discard any commits you make in this
+state without impacting any branches by switching back to a branch.
+
+If you want to create a new branch to retain commits you create, you may
+do so (now or later) by using -c with the switch command. Example:
+
+  git switch -c <new-branch-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	2024-11-14 19:49:56.030224659 +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.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9901-git-web--browse.sh ***
@@ -535583,1344 +536591,538 @@
 1..5
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9200-git-cvsexportcommit.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/.git/
-checking prerequisite: NOT_ROOT
-
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-NOT_ROOT" &&
-	uid=$(id -u) &&
-	test "$uid" != 0
-
-)
-prerequisite NOT_ROOT ok
-expecting success of 9200.1 'New file': 
-	mkdir A B C D E F &&
-	echo hello1 >A/newfile1.txt &&
-	echo hello2 >B/newfile2.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png C/newfile3.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png D/newfile4.png &&
-	git add A/newfile1.txt &&
-	git add B/newfile2.txt &&
-	git add C/newfile3.png &&
-	git add D/newfile4.png &&
-	git commit -a -m "Test: New file" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "newfile1.txt/1.1/" &&
-	check_entries B "newfile2.txt/1.1/" &&
-	check_entries C "newfile3.png/1.1/-kb" &&
-	check_entries D "newfile4.png/1.1/-kb" &&
-	test_cmp A/newfile1.txt ../A/newfile1.txt &&
-	test_cmp B/newfile2.txt ../B/newfile2.txt &&
-	test_cmp C/newfile3.png ../C/newfile3.png &&
-	test_cmp D/newfile4.png ../D/newfile4.png
-	)
-
-[master 288d750] Test: New file
- Author: A U Thor <author@example.com>
- 4 files changed, 2 insertions(+)
- create mode 100644 A/newfile1.txt
- create mode 100644 B/newfile2.txt
- create mode 100644 C/newfile3.png
- create mode 100644 D/newfile4.png
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D put under version control
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C put under version control
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B put under version control
-Directory /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/B/newfile2.txt,v  <--  B/newfile2.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/C/newfile3.png,v  <--  C/newfile3.png
-initial revision: 1.1
-/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
-initial revision: 1.1
-Committed successfully to CVS
-ok 1 - New file
-
-expecting success of 9200.2 'Remove two files, add two and update two': 
-	echo Hello1 >>A/newfile1.txt &&
-	rm -f B/newfile2.txt &&
-	rm -f C/newfile3.png &&
-	echo Hello5  >E/newfile5.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-2.png D/newfile4.png &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png F/newfile6.png &&
-	git add E/newfile5.txt &&
-	git add F/newfile6.png &&
-	git commit -a -m "Test: Remove, add and update" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "newfile1.txt/1.2/" &&
-	check_entries B "" &&
-	check_entries C "" &&
-	check_entries D "newfile4.png/1.2/-kb" &&
-	check_entries E "newfile5.txt/1.1/" &&
-	check_entries F "newfile6.png/1.1/-kb" &&
-	test_cmp A/newfile1.txt ../A/newfile1.txt &&
-	test_cmp D/newfile4.png ../D/newfile4.png &&
-	test_cmp E/newfile5.txt ../E/newfile5.txt &&
-	test_cmp F/newfile6.png ../F/newfile6.png
-	)
-
-[master 69b0239] Test: Remove, add and update
- Author: A U Thor <author@example.com>
- 5 files changed, 2 insertions(+), 1 deletion(-)
- delete mode 100644 B/newfile2.txt
- create mode 100644 E/newfile5.txt
- rename C/newfile3.png => F/newfile6.png (100%)
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F put under version control
-Directory /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/E/newfile5.txt,v  <--  E/newfile5.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/F/newfile6.png,v  <--  F/newfile6.png
-initial revision: 1.1
-Committed successfully to CVS
-ok 2 - Remove two files, add two and update two
-
-expecting success of 9200.3 'Fail to change binary more than one generation old': cat F/newfile6.png >>D/newfile4.png &&
-     git commit -a -m "generatiion 1" &&
-     cat F/newfile6.png >>D/newfile4.png &&
-     git commit -a -m "generation 2" &&
-     id=$(git rev-list --max-count=1 HEAD) &&
-     (cd "$CVSWORK" &&
-     test_must_fail git cvsexportcommit -c $id
-     )
-[master 70e0115] generatiion 1
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-[master d73a469] generation 2
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
-Checking if patch will apply
-Applying
-error: the patch applies to 'D/newfile4.png' (ac22ccbd3ee9f03a3b38249ac8efdbe96b5da2cd), which does not match the current contents.
-error: D/newfile4.png: patch does not apply
-cannot patch at /build/reproducible-path/git-2.45.2/git-cvsexportcommit line 338.
-ok 3 - Fail to change binary more than one generation old
-
-expecting success of 9200.4 'Remove only binary files': 
-	git reset --hard HEAD^^ &&
-	rm -f D/newfile4.png &&
-	git commit -a -m "test: remove only a binary file" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "newfile1.txt/1.2/" &&
-	check_entries B "" &&
-	check_entries C "" &&
-	check_entries D "" &&
-	check_entries E "newfile5.txt/1.1/" &&
-	check_entries F "newfile6.png/1.1/-kb" &&
-	test_cmp A/newfile1.txt ../A/newfile1.txt &&
-	test_cmp E/newfile5.txt ../E/newfile5.txt &&
-	test_cmp F/newfile6.png ../F/newfile6.png
-	)
-
-HEAD is now at 69b0239 Test: Remove, add and update
-[master 2a45f53] test: remove only a binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 0 insertions(+), 0 deletions(-)
- delete mode 100644 D/newfile4.png
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs remove: scheduling `D/newfile4.png' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-Commit to CVS
-Patch title (first comment line): test: remove only a binary file
-Autocommit
-  cvs commit -F .msg 'D/newfile4.png'
-/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/D/newfile4.png,v  <--  D/newfile4.png
-new revision: delete; previous revision: 1.2
-Committed successfully to CVS
-ok 4 - Remove only binary files
-
-expecting success of 9200.5 'Remove only a text file': 
-	rm -f A/newfile1.txt &&
-	git commit -a -m "test: remove only a binary file" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries A "" &&
-	check_entries B "" &&
-	check_entries C "" &&
-	check_entries D "" &&
-	check_entries E "newfile5.txt/1.1/" &&
-	check_entries F "newfile6.png/1.1/-kb" &&
-	test_cmp E/newfile5.txt ../E/newfile5.txt &&
-	test_cmp F/newfile6.png ../F/newfile6.png
-	)
-
-[master fa834fd] test: remove only a binary file
- Author: A U Thor <author@example.com>
- 1 file changed, 2 deletions(-)
- delete mode 100644 A/newfile1.txt
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-cvs remove: scheduling `A/newfile1.txt' for removal
-cvs remove: use `cvs commit' to remove this file permanently
-Commit to CVS
-Patch title (first comment line): test: remove only a binary file
-Autocommit
-  cvs commit -F .msg 'A/newfile1.txt'
-/build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/A/newfile1.txt,v  <--  A/newfile1.txt
-new revision: delete; previous revision: 1.2
-Committed successfully to CVS
-ok 5 - Remove only a text file
-
-expecting success of 9200.6 'New file with spaces in file name': 
-	mkdir "G g" &&
-	echo ok then >"G g/with spaces.txt" &&
-	git add "G g/with spaces.txt" && \
-	cp "$TEST_DIRECTORY"/test-binary-1.png "G g/with spaces.png" && \
-	git add "G g/with spaces.png" &&
-	git commit -a -m "With spaces" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/"
-	)
-
-[master 7dad360] With spaces
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
- create mode 100644 G g/with spaces.png
- create mode 100644 G g/with spaces.txt
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Directory /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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 9200.7 'Update file with spaces in file name': 
-	echo Ok then >>"G g/with spaces.txt" &&
-	cat "$TEST_DIRECTORY"/test-binary-1.png >>"G g/with spaces.png" && \
-	git add "G g/with spaces.png" &&
-	git commit -a -m "Update with spaces" &&
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c $id &&
-	check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/"
-	)
-
-[master 200512b] Update with spaces
- Author: A U Thor <author@example.com>
- 2 files changed, 1 insertion(+)
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Commit to CVS
-Patch title (first comment line): Update with spaces
-Autocommit
-  cvs commit -F .msg G g/with spaces.png G g/with spaces.txt
-/build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G g/with spaces.txt,v  <--  G g/with spaces.txt
-new revision: 1.2; previous revision: 1.1
-Committed successfully to CVS
-ok 7 - Update file with spaces in file name
-
-expecting success of 9200.8 'File with non-ascii file name': 
-	mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
-	echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
-	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&
-	cp "$TEST_DIRECTORY"/test-binary-1.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
-	git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png &&
-	git commit -a -m "Går det så går det" && \
-	id=$(git rev-list --max-count=1 HEAD) &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -v -c $id &&
-	check_entries \
-	"Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \
-	"gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/"
-	)
+*** t9402-git-cvsserver-refs.sh ***
+Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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"
 
-[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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã… put under version control
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo put under version control
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a put under version control
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b put under version control
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c put under version control
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d put under version control
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e put under version control
-Directory /build/reproducible-path/git-2.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/Ã…/goo/a/b/c/d/e/f put under version control
-Directory /build/reproducible-path/git-2.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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.45.2/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 1 - setup v1, b1
 
-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 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
 
-[master 7e019fa] Update one
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-[master 73bd62a] 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.45.2/git-cvsexportcommit line 338.
-ok 9 - Mismatching patch should fail
+ok 2 - cvs co v1
 
-checking prerequisite: FILEMODE
+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
 
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-(
-	cd "$TRASH_DIRECTORY/prereq-test-dir-FILEMODE" &&
-	test "$(git config --bool core.filemode)" = true
+ok 3 - cvs co b1
 
-)
-prerequisite FILEMODE ok
-expecting success of 9200.10 'Retain execute bit': 
-	mkdir G &&
-	echo executeon >G/on &&
-	chmod +x G/on &&
-	echo executeoff >G/off &&
-	git add G/on &&
-	git add G/off &&
-	git commit -a -m "Execute test" &&
-	(cd "$CVSWORK" &&
-	git cvsexportcommit -c HEAD &&
-	test -x G/on &&
-	! test -x G/off
-	)
+expecting success of 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
 
-[master 95d6f25] 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.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/G/off,v  <--  G/off
-initial revision: 1.1
-/build/reproducible-path/git-2.45.2/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
+ok 4 - cvs co b1 [cvswork3]
 
-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
+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"
 	)
 
-[master 7fe663b] 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.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/W/file1.txt,v  <--  W/file1.txt
-initial revision: 1.1
-/build/reproducible-path/git-2.45.2/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 9200.12 'check files before directories': 
-
-	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 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
-
-
-[master 2a9c83a] 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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/release-notes,v  <--  release-notes
-initial revision: 1.1
-Committed successfully to CVS
-[master c70914f] 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.45.2/t/trash directory.t9200-git-cvsexportcommit/tmpcvsroot/DS,v  <--  DS
-initial revision: 1.1
-/build/reproducible-path/git-2.45.2/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.45.2/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 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") &&
-
-	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"
-
-[master 52a8f56] 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.45.2/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 9200.14 'commit a file with leading spaces in the name': 
-
-	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"
-
-
-[master d3c30b9] 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: scheduling file `adir/afile5' 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.45.2/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.45.2/t/trash directory.t9200-git-cvsexportcommit/shared/.git/
-[master (root-commit) 93a1e74] fake initial commit
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
- create mode 100644  space
-[master 6935f1b] Another change
- Author: A U Thor <author@example.com>
- 1 file changed, 1 insertion(+)
-Checking if patch will apply
-Applying
-Patch applied successfully. Adding new files and directories to CVS
-Commit to CVS
-Patch title (first comment line): Another change
-Autocommit
-  cvs commit -F .msg  space
-Committed successfully to CVS
-HEAD is now at 6935f1b Another change
-Hello
-ok 15 - use the same checkout for Git and CVS
-
-# passed all 15 test(s)
-1..15
-make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9400-git-cvsserver-server.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/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)
+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 9400.15 'req_Root failure (base-path)': 
-	! git-cvsserver --strict-paths --base-path "$WORKDIR" pserver "$SERVERDIR" <request-anonymous >log 2>&1
+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 15 - req_Root failure (base-path)
+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 9400.16 'req_Root (export-all)': 
-	git-cvsserver --export-all pserver "$WORKDIR" <request-anonymous >log 2>&1 &&
-	sed -ne \$p log | grep "^I LOVE YOU\$"
+expecting success of 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
 
-I LOVE YOU
-ok 16 - req_Root (export-all)
+ok 7 - cvs -f up (on b1 adir)
 
-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 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
 
-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\$"
+ok 8 - cvs up (on b1 /)
 
-I LOVE YOU
-ok 18 - req_Root (everything together)
+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
 
-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
+ok 9 - cvs up (on b1 /) (again; check CVS/Tag files)
 
-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
+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
 
-Common subdirectories: cvswork/CVS and cvswork2/CVS
-ok 20 - gitcvs.ext.enabled = true
+ok 10 - cvs up -r v1
 
-expecting success of 9400.21 'gitcvs.ext.enabled = false': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
-	if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
-	then
-		echo unexpected cvs success
-		false
-	else
-		true
-	fi &&
-	grep "GITCVS emulation disabled" cvs.log &&
-	test ! -d cvswork2
+expecting success of 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
 
-GITCVS emulation disabled
-ok 21 - gitcvs.ext.enabled = false
+ok 11 - cvs up
 
-expecting success of 9400.22 'gitcvs.dbname': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-	test_cmp cvswork cvswork2 &&
-	test -f "$SERVERDIR/gitcvs.ext.main.sqlite" &&
-	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs.ext.main.sqlite"
+expecting success of 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
 
-Common subdirectories: cvswork/CVS and cvswork2/CVS
-ok 22 - gitcvs.dbname
+ok 12 - cvs up (again; check CVS/Tag files)
 
-expecting success of 9400.23 'gitcvs.ext.dbname': 
-	GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
-	GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
-	GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
-	test_cmp cvswork cvswork2 &&
-	test -f "$SERVERDIR/gitcvs1.ext.main.sqlite" &&
-	test ! -f "$SERVERDIR/gitcvs2.ext.main.sqlite" &&
-	cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs1.ext.main.sqlite"
+expecting success of 9402.13 'setup simple b2': 
+	git branch b2 v1 &&
+	git push --tags gitcvs.git b2:b2
 
-Common subdirectories: cvswork/CVS and cvswork2/CVS
-ok 23 - gitcvs.ext.dbname
+To gitcvs.git
+ * [new branch]      b2 -> b2
+ok 13 - setup simple b2
 
-expecting success of 9400.24 'cvs update (create new file)': 
-	echo testfile1 >testfile1 &&
-	git add testfile1 &&
-	git commit -q -m "Add testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.1/" &&
-	test_cmp testfile1 ../testfile1
+expecting success of 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
 
-To gitcvs.git
-   4ea9390..3c6a419  main -> main
-U testfile1
-ok 24 - cvs update (create new file)
+ok 14 - cvs co b2 [into cvswork2]
 
-expecting success of 9400.25 'cvs update (update existing file)': 
-	echo line 2 >>testfile1 &&
-	git add testfile1 &&
-	git commit -q -m "Append to testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.2/" &&
-	test_cmp testfile1 ../testfile1
+expecting success of 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
 
-To gitcvs.git
-   3c6a419..696e081  main -> main
-U testfile1
-ok 25 - cvs update (update existing file)
+ok 15 - root dir edit [cvswork2]
 
-checking known breakage of 9400.26 'cvs update w/o -d doesn't create subdir (TODO)': 
-	mkdir test &&
-	echo >test/empty &&
-	git add test &&
-	git commit -q -m "Single Subdirectory" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test ! -d test
+expecting success of 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
 
-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
+ok 16 - root dir rm file [cvswork2]
 
-expecting success of 9400.27 'cvs update (subdirectories)': 
-	(for dir in A A/B A/B/C A/D E; do
-		mkdir $dir &&
-		echo "test file in $dir" >"$dir/file_in_$(echo $dir|sed -e "s#/# #g")"  &&
-		git add $dir || exit 1
-	done) &&
-	git commit -q -m "deep sub directory structure" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update -d &&
-	(for dir in A A/B A/B/C A/D E; do
-		filename="file_in_$(echo $dir|sed -e "s#/# #g")" &&
-		if test "$(echo $(grep -v ^D $dir/CVS/Entries|cut -d/ -f2,3,5))" = "$filename/1.1/" &&
-			test_cmp "$dir/$filename" "../$dir/$filename"; then
-		:
-		else
-			exit 1
-		fi
-	done)
+expecting success of 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
 
-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)
+ok 17 - subdir edit/add/rm files [cvswork2]
 
-expecting success of 9400.28 'cvs update (delete file)': 
-	git rm testfile1 &&
-	git commit -q -m "Remove testfile1" &&
-	git push gitcvs.git >/dev/null &&
-	cd cvswork &&
-	GIT_CONFIG="$git_config" cvs -Q update &&
-	test -z "$(grep testfile1 CVS/Entries)" &&
-	test ! -f testfile1
+expecting success of 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
 
-rm 'testfile1'
+From gitcvs
+   8bc3df8..2f22978  b2         -> b2
 To gitcvs.git
-   9436d83..09366c6  main -> main
-cvs update: `testfile1' is no longer in the repository
-ok 28 - cvs update (delete file)
+ * [new tag]         v2 -> v2
+ok 18 - validate result of edits [cvswork2]
 
-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 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
 
-To gitcvs.git
-   09366c6..8ea0549  main -> main
-U testfile1
-ok 29 - cvs update (re-add deleted file)
+ok 19 - validate basic diffs saved during above cvswork2 edits
 
-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 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
 
-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 20 - validate v1.2 diff saved during last cvswork2 edit
 
-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 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
 
-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 21 - validate v1.2 v1 diff saved during last cvswork2 edit
 
-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 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
 
-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 22 - cvs up [cvswork2]
 
-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 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
 
-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 23 - cvs up -r b2 [back to cvswork]
 
-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 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
 
-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 24 - cvs up -r b1
 
-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 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
 
-cvs update: New directory `main'
-ok 35 - cvs update (module list supports packed refs)
+ok 25 - cvs up -A
 
-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 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
 
-To gitcvs.git
-   9cef819..590c22f  main -> main
-cvs update: Updating .
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/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.45.2/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/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.45.2/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/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.45.2/git-cvsserver line 1267.
-Use of uninitialized value $wrev in string ne at /build/reproducible-path/git-2.45.2/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 26 - cvs up (check CVS/Tag files)
 
-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 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 37 - cvs status (nonrecursive)
+ok 27 - cvs up -r heads/b1
 
-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 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 38 - cvs status (no subdirs in header)
+ok 28 - cvs up -r heads_-s-b2 (cvsserver escape mechanism)
 
-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 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
 
-main	main
-ok 39 - cvs co -c (shows module database)
+ok 29 - cvs up -r $(git rev-parse v1)
 
-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 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 40 - cvs log
+ok 30 - cvs diff -r v1 -u
 
-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 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
 
-Annotations for merge
-***************
-ok 41 - cvs annotate
+ok 31 - cvs diff -N -r v2 -u
 
-expecting success of 9400.42 'create remote-cvs helper': 
-	write_script remote-cvs <<-\EOF
-	exec git shell -c "cvs server"
-	EOF
+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 42 - create remote-cvs helper
+ok 32 - cvs diff -N -r v2 -r v1.2
 
-expecting success of 9400.43 'cvs server does not run with vanilla git-shell': 
+expecting success of 9402.33 'apply early [cvswork3] diff to b3': 
+	git clone -q . gitwork3 &&
 	(
-		cd cvswork &&
-		CVS_SERVER=$WORKDIR/remote-cvs &&
-		export CVS_SERVER &&
-		! cvs log merge
-	)
+		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
 
-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
+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 9400.44 'configure git shell to run cvs server': 
-	mkdir "$HOME"/git-shell-commands &&
+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
 
-	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
+ok 34 - check [cvswork3] diff
 
-	# 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
+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
 
-ok 44 - configure git shell to run cvs server
+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 9400.45 'cvs server can run with recommended config': 
+expecting success of 9402.36 'cvs up dirty [cvswork3]': 
 	(
-		cd cvswork &&
-		CVS_SERVER=$WORKDIR/remote-cvs &&
-		export CVS_SERVER &&
-		cvs log merge
-	)
-
-
-RCS file: /build/reproducible-path/git-2.45.2/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
+		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
 
-Merge test (conflict)
- 
-----------------------------
-revision 1.2
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+ok 36 - cvs up dirty [cvswork3]
 
-Merge test (merge)
- 
-----------------------------
-revision 1.1
-date: 2005/04/01 13:14:15;  author: author;  state: Exp;  lines: +2 -3
+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
 
-Merge test (pre-merge)
- 
-=============================================================================
-ok 45 - cvs server can run with recommended config
+From gitcvs
+ * [new branch]      b3         -> b4
+ok 37 - cvs commit [cvswork3]
 
-# still have 1 known breakage(s)
-# passed all remaining 44 test(s)
-1..45
+# passed all 37 test(s)
+1..37
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9903-bash-prompt.sh ***
@@ -538045,274 +538247,6 @@
 1..67
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
 make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9602-cvsimport-branches-tags.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t/trash directory.t9602-cvsimport-branches-tags/module-git/.git/
-ok 1 - import module
-
-expecting success of 9602.2 'test branch main': 
-
-	test_cmp_branch_tree main
-
-
-cvs checkout: Updating module-cvs-main
-U module-cvs-main/default
-cvs checkout: Updating module-cvs-main/sub1
-U module-cvs-main/sub1/default
-cvs checkout: Updating module-cvs-main/sub1/subsubA
-U module-cvs-main/sub1/subsubA/default
-cvs checkout: Updating module-cvs-main/sub1/subsubB
-U module-cvs-main/sub1/subsubB/default
-cvs checkout: Updating module-cvs-main/sub2
-U module-cvs-main/sub2/default
-cvs checkout: Updating module-cvs-main/sub2/subsubA
-U module-cvs-main/sub2/subsubA/default
-cvs checkout: Updating module-cvs-main/sub3
-U module-cvs-main/sub3/default
-Already on 'main'
-ok 2 - test branch main
-
-expecting success of 9602.3 'test branch vendorbranch': 
-
-	test_cmp_branch_tree vendorbranch
-
-
-cvs checkout: Updating module-cvs-vendorbranch
-U module-cvs-vendorbranch/default
-cvs checkout: Updating module-cvs-vendorbranch/sub1
-U module-cvs-vendorbranch/sub1/default
-cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubA
-U module-cvs-vendorbranch/sub1/subsubA/default
-cvs checkout: Updating module-cvs-vendorbranch/sub1/subsubB
-U module-cvs-vendorbranch/sub1/subsubB/default
-cvs checkout: Updating module-cvs-vendorbranch/sub2
-U module-cvs-vendorbranch/sub2/default
-cvs checkout: Updating module-cvs-vendorbranch/sub2/subsubA
-U module-cvs-vendorbranch/sub2/subsubA/default
-cvs checkout: Updating module-cvs-vendorbranch/sub3
-U module-cvs-vendorbranch/sub3/default
-Switched to branch 'vendorbranch'
-ok 3 - test branch vendorbranch
-
-checking known breakage of 9602.4 'test branch B_FROM_INITIALS': 
-
-	test_cmp_branch_tree B_FROM_INITIALS
-
-
-cvs checkout: Updating module-cvs-B_FROM_INITIALS
-U module-cvs-B_FROM_INITIALS/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1
-U module-cvs-B_FROM_INITIALS/sub1/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubA
-U module-cvs-B_FROM_INITIALS/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub1/subsubB
-U module-cvs-B_FROM_INITIALS/sub1/subsubB/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2
-U module-cvs-B_FROM_INITIALS/sub2/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub2/subsubA
-U module-cvs-B_FROM_INITIALS/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS/sub3
-U module-cvs-B_FROM_INITIALS/sub3/default
-error: pathspec 'B_FROM_INITIALS' did not match any file(s) known to git
-not ok 4 - test branch B_FROM_INITIALS # TODO known breakage
-
-checking known breakage of 9602.5 'test branch B_FROM_INITIALS_BUT_ONE': 
-
-	test_cmp_branch_tree B_FROM_INITIALS_BUT_ONE
-
-
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE
-U module-cvs-B_FROM_INITIALS_BUT_ONE/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub1/subsubB
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_FROM_INITIALS_BUT_ONE/sub3
-U module-cvs-B_FROM_INITIALS_BUT_ONE/sub3/default
-error: pathspec 'B_FROM_INITIALS_BUT_ONE' did not match any file(s) known to git
-not ok 5 - test branch B_FROM_INITIALS_BUT_ONE # TODO known breakage
-
-checking known breakage of 9602.6 'test branch B_MIXED': 
-
-	test_cmp_branch_tree B_MIXED
-
-
-cvs checkout: Updating module-cvs-B_MIXED
-U module-cvs-B_MIXED/default
-cvs checkout: Updating module-cvs-B_MIXED/sub1
-U module-cvs-B_MIXED/sub1/default
-cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubA
-U module-cvs-B_MIXED/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_MIXED/sub1/subsubB
-U module-cvs-B_MIXED/sub1/subsubB/default
-cvs checkout: Updating module-cvs-B_MIXED/sub2
-U module-cvs-B_MIXED/sub2/branch_B_MIXED_only
-U module-cvs-B_MIXED/sub2/default
-cvs checkout: Updating module-cvs-B_MIXED/sub2/subsubA
-U module-cvs-B_MIXED/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_MIXED/sub3
-U module-cvs-B_MIXED/sub3/default
-Switched to branch 'B_MIXED'
---- module-cvs-B_MIXED/./sub3/default	2003-05-23 00:15:26.000000000 +0000
-+++ module-git/./sub3/default	2025-12-18 01:41:24.018773267 +0000
-@@ -3,3 +3,5 @@
- Every directory in the `proj' project has a file named `default'.
- 
- This line was added by the first commit (affecting two files).
-+
-+This line was added in the second commit (affecting all 7 files).
-not ok 6 - test branch B_MIXED # TODO known breakage
-
-expecting success of 9602.7 'test branch B_SPLIT': 
-
-	test_cmp_branch_tree B_SPLIT
-
-
-cvs checkout: Updating module-cvs-B_SPLIT
-U module-cvs-B_SPLIT/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub1
-U module-cvs-B_SPLIT/sub1/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubA
-U module-cvs-B_SPLIT/sub1/subsubA/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub1/subsubB
-U module-cvs-B_SPLIT/sub1/subsubB/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub2
-U module-cvs-B_SPLIT/sub2/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub2/subsubA
-U module-cvs-B_SPLIT/sub2/subsubA/default
-cvs checkout: Updating module-cvs-B_SPLIT/sub3
-U module-cvs-B_SPLIT/sub3/default
-Switched to branch 'B_SPLIT'
-ok 7 - test branch B_SPLIT
-
-checking known breakage of 9602.8 'test tag vendortag': 
-
-	test_cmp_branch_tree vendortag
-
-
-cvs checkout: Updating module-cvs-vendortag
-U module-cvs-vendortag/default
-cvs checkout: Updating module-cvs-vendortag/sub1
-U module-cvs-vendortag/sub1/default
-cvs checkout: Updating module-cvs-vendortag/sub1/subsubA
-U module-cvs-vendortag/sub1/subsubA/default
-cvs checkout: Updating module-cvs-vendortag/sub1/subsubB
-U module-cvs-vendortag/sub1/subsubB/default
-cvs checkout: Updating module-cvs-vendortag/sub2
-U module-cvs-vendortag/sub2/default
-cvs checkout: Updating module-cvs-vendortag/sub2/subsubA
-U module-cvs-vendortag/sub2/subsubA/default
-cvs checkout: Updating module-cvs-vendortag/sub3
-U module-cvs-vendortag/sub3/default
-error: pathspec 'vendortag' did not match any file(s) known to git
-not ok 8 - test tag vendortag # TODO known breakage
-
-expecting success of 9602.9 'test tag T_ALL_INITIAL_FILES': 
-
-	test_cmp_branch_tree T_ALL_INITIAL_FILES
-
-
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES
-U module-cvs-T_ALL_INITIAL_FILES/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1
-U module-cvs-T_ALL_INITIAL_FILES/sub1/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA
-U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB
-U module-cvs-T_ALL_INITIAL_FILES/sub1/subsubB/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2
-U module-cvs-T_ALL_INITIAL_FILES/sub2/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA
-U module-cvs-T_ALL_INITIAL_FILES/sub2/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES/sub3
-U module-cvs-T_ALL_INITIAL_FILES/sub3/default
-Note: switching to 'T_ALL_INITIAL_FILES'.
-
-You are in 'detached HEAD' state. You can look around, make experimental
-changes and commit them, and you can discard any commits you make in this
-state without impacting any branches by switching back to a branch.
-
-If you want to create a new branch to retain commits you create, you may
-do so (now or later) by using -c with the switch command. Example:
-
-  git switch -c <new-branch-name>
-
-Or undo this operation with:
-
-  git switch -
-
-Turn off this advice by setting config variable advice.detachedHead to false
-
-HEAD is now at e9bb65d Initial import.
-ok 9 - test tag T_ALL_INITIAL_FILES
-
-checking known breakage of 9602.10 'test tag T_ALL_INITIAL_FILES_BUT_ONE': 
-
-	test_cmp_branch_tree T_ALL_INITIAL_FILES_BUT_ONE
-
-
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub1/subsubB
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub2/subsubA/default
-cvs checkout: Updating module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3
-U module-cvs-T_ALL_INITIAL_FILES_BUT_ONE/sub3/default
-error: pathspec 'T_ALL_INITIAL_FILES_BUT_ONE' did not match any file(s) known to git
-not ok 10 - test tag T_ALL_INITIAL_FILES_BUT_ONE # TODO known breakage
-
-checking known breakage of 9602.11 'test tag T_MIXED': 
-
-	test_cmp_branch_tree T_MIXED
-
-
-cvs checkout: Updating module-cvs-T_MIXED
-U module-cvs-T_MIXED/default
-cvs checkout: Updating module-cvs-T_MIXED/sub1
-U module-cvs-T_MIXED/sub1/default
-cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubA
-U module-cvs-T_MIXED/sub1/subsubA/default
-cvs checkout: Updating module-cvs-T_MIXED/sub1/subsubB
-U module-cvs-T_MIXED/sub1/subsubB/default
-cvs checkout: Updating module-cvs-T_MIXED/sub2
-U module-cvs-T_MIXED/sub2/default
-cvs checkout: Updating module-cvs-T_MIXED/sub2/subsubA
-U module-cvs-T_MIXED/sub2/subsubA/default
-cvs checkout: Updating module-cvs-T_MIXED/sub3
-U module-cvs-T_MIXED/sub3/default
-Previous HEAD position was e9bb65d Initial import.
-HEAD is now at d875d54 Second commit to proj, affecting all 7 files.
---- module-cvs-T_MIXED/./sub2/subsubA/default	2003-05-22 23:20:19.000000000 +0000
-+++ module-git/./sub2/subsubA/default	2025-12-18 01:41:29.018773267 +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.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 *** t9902-completion.sh ***
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9902-completion/.git/
 expecting success of 9902.1 'setup for __git_find_repo_path/__gitdir tests': 
@@ -541158,8 +541092,8 @@
 	test_completion "git add ~/tmp/" "~/tmp/file"
 
 Initialized empty Git repository in /build/reproducible-path/git-2.45.2/t/trash directory.t9902-completion/tmp/.git/
---- expected	2025-12-18 01:41:30.354773267 +0000
-+++ out_sorted	2025-12-18 01:41:30.362773267 +0000
+--- expected	2024-11-14 19:50:02.642292460 +0000
++++ out_sorted	2024-11-14 19:50:02.650292542 +0000
 @@ -1 +1 @@
 -~/tmp/file
 +
@@ -541203,8 +541137,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2025-12-18 01:41:30.402773267 +0000
-+++ out	2025-12-18 01:41:30.410773267 +0000
+--- expected	2024-11-14 19:50:02.698293034 +0000
++++ out	2024-11-14 19:50:02.706293116 +0000
 @@ -1 +1 @@
 -main-in-other 
 +main 
@@ -541238,8 +541172,8 @@
 		) &&
 		test_cmp expected out
 	
---- expected	2025-12-18 01:41:30.430773267 +0000
-+++ out	2025-12-18 01:41:30.438773267 +0000
+--- expected	2024-11-14 19:50:02.730293362 +0000
++++ out	2024-11-14 19:50:02.734293403 +0000
 @@ -1 +1 @@
 -main-in-other 
 +main 
@@ -541550,547 +541484,13 @@
 # passed all remaining 247 test(s)
 1..250
 make[4]: Leaving directory '/build/reproducible-path/git-2.45.2/t'
-make[4]: Entering directory '/build/reproducible-path/git-2.45.2/t'
-*** t9402-git-cvsserver-refs.sh ***
-Initialized empty Git repository in /build/reproducible-path/git-2.45.2/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.45.2/t'
 /usr/bin/make aggregate-results
 make[5]: Entering directory '/build/reproducible-path/git-2.45.2/t'
 
-missing prereq: !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 LONG_IS_64BIT MINGW NATIVE_CRLF PERLJSON RFC1991 RUNTIME_PREFIX SETFACL SIZE_T_IS_64BIT SYMLINKS_WINDOWS TAR_NEEDS_PAX_FALLBACK TIME_T_IS_64BIT USR_BIN_TIME UTF8_NFD_TO_NFC WINDOWS
+missing prereq: !AUTOIDENT !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 LONG_IS_64BIT MINGW NATIVE_CRLF PERLJSON RFC1991 RUNTIME_PREFIX SETFACL SIZE_T_IS_64BIT SYMLINKS_WINDOWS TAR_NEEDS_PAX_FALLBACK TIME_T_IS_64BIT USR_BIN_TIME UTF8_NFD_TO_NFC WINDOWS
 
 fixed   0
-success 29382
+success 29381
 failed  0
 broken  278
 total   30183
@@ -542151,9 +541551,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = 4e9c3945d467e88accbc98dd900e40bed6bec3cc (refs/remotes/origin/trunk)
+r1 = 3ce1e5b7d2877b6ddd301c2d26425053b3af3f34 (refs/remotes/origin/trunk)
 	M	foo
-r2 = 7e8ed55f49258c88406af8110752e18dfb87d41d (refs/remotes/origin/trunk)
+r2 = 58fa1832a6b33e9a2b58b947fc08cf64014ef77f (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project r2
 Note: switching to 'remotes/origin/trunk'.
@@ -542173,7 +541573,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at 7e8ed55 updated trunk
+HEAD is now at 58fa183 updated trunk
 ok 2 - import into git
 
 expecting success of 9167.3 'git svn branch tests': 
@@ -542192,40 +541592,40 @@
 Creating parent folder file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a ...
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/branches/a/project, 2
-Found branch parent: (refs/remotes/origin/a) 7e8ed55f49258c88406af8110752e18dfb87d41d
+Found branch parent: (refs/remotes/origin/a) 58fa1832a6b33e9a2b58b947fc08cf64014ef77f
 Following parent with do_switch
 Successfully followed parent
-r4 = 40eaca7e91a6a43b83fe81ed34f955f1fcb0962a (refs/remotes/origin/a)
+r4 = 7b4f1b3e81d85220f813d5b56c8170751da72a71 (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project...
 Filesystem has no item: File not found: transaction '4-5', path '/tags/tag1/project' at /build/reproducible-path/git-2.45.2/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1 ...
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag1/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) 7e8ed55f49258c88406af8110752e18dfb87d41d
+Found branch parent: (refs/remotes/origin/tags/tag1) 58fa1832a6b33e9a2b58b947fc08cf64014ef77f
 Following parent with do_switch
 Successfully followed parent
-r6 = 177b96634e316229a700dafbbaa9fadd3f4195fa (refs/remotes/origin/tags/tag1)
+r6 = 21173596b9da9bffe5d5aac0d1a01dac1f04735c (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project...
 Filesystem has no item: File not found: transaction '6-8', path '/tags/tag2/project' at /build/reproducible-path/git-2.45.2/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2 ...
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag2/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) 7e8ed55f49258c88406af8110752e18dfb87d41d
+Found branch parent: (refs/remotes/origin/tags/tag2) 58fa1832a6b33e9a2b58b947fc08cf64014ef77f
 Following parent with do_switch
 Successfully followed parent
-r8 = 197df45d9952e420c86c64f14749aeef0a5792ee (refs/remotes/origin/tags/tag2)
+r8 = d8761263adbb0da1cdc20f089528859861145ab8 (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project...
 Filesystem has no item: File not found: transaction '8-b', path '/tags/tag3/project' at /build/reproducible-path/git-2.45.2/git-svn line 1190.
 
 Creating parent folder file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3 ...
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/trunk/project => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9167-git-svn-cmd-branch-subproject/svnrepo/tags/tag3/project, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) 7e8ed55f49258c88406af8110752e18dfb87d41d
+Found branch parent: (refs/remotes/origin/tags/tag3) 58fa1832a6b33e9a2b58b947fc08cf64014ef77f
 Following parent with do_switch
 Successfully followed parent
-r10 = 0b43a0d061983cbfb61ddda0e29c1104437408b3 (refs/remotes/origin/tags/tag3)
+r10 = bd8024d4f56f3ae2da4c6a353f3c650445c8d440 (refs/remotes/origin/tags/tag3)
 ok 3 - git svn branch tests
 
 # passed all 3 test(s)
@@ -542267,9 +541667,9 @@
 	git checkout remotes/origin/trunk
 
 	A	foo
-r1 = 452d87a06d85379d36a9dc9dc70917fcd8d3f8e3 (refs/remotes/origin/trunk)
+r1 = b7808e0e1445ac53500bc72e783bda6f0349bcd2 (refs/remotes/origin/trunk)
 	M	foo
-r2 = d1447f29ef173f5445cdf442103c87226185f665 (refs/remotes/origin/trunk)
+r2 = 6ae7346f0dd4fa2e08e9d5f699a6346513e90a3c (refs/remotes/origin/trunk)
 Checked out HEAD:
   file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk r2
 Note: switching to 'remotes/origin/trunk'.
@@ -542289,7 +541689,7 @@
 
 Turn off this advice by setting config variable advice.detachedHead to false
 
-HEAD is now at d1447f2 updated trunk
+HEAD is now at 6ae7346 updated trunk
 ok 2 - import into git
 
 expecting success of 9128.3 'git svn branch tests': 
@@ -542317,16 +541717,16 @@
 
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a, 2
-Found branch parent: (refs/remotes/origin/a) d1447f29ef173f5445cdf442103c87226185f665
+Found branch parent: (refs/remotes/origin/a) 6ae7346f0dd4fa2e08e9d5f699a6346513e90a3c
 Following parent with do_switch
 Successfully followed parent
-r3 = 3c83947806f4372fb7e78c640c4254bb3b2c296c (refs/remotes/origin/a)
+r3 = a969eabe300d4e768b6c45f03d57547dc601301b (refs/remotes/origin/a)
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b, 2
-Found branch parent: (refs/remotes/origin/b) d1447f29ef173f5445cdf442103c87226185f665
+Found branch parent: (refs/remotes/origin/b) 6ae7346f0dd4fa2e08e9d5f699a6346513e90a3c
 Following parent with do_switch
 Successfully followed parent
-r4 = a0b9cd21ee347bfe30f2ed0a07292ea8e56d788d (refs/remotes/origin/b)
+r4 = e5d51d719622e7370d2fc2780b913ad412cdf2f9 (refs/remotes/origin/b)
 fatal: cannot rename the current branch while not on any
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/c...
 fatal: ambiguous argument 'remotes/origin/c': unknown revision or path not in the working tree.
@@ -542337,28 +541737,28 @@
 
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1, 2
-Found branch parent: (refs/remotes/origin/tags/tag1) d1447f29ef173f5445cdf442103c87226185f665
+Found branch parent: (refs/remotes/origin/tags/tag1) 6ae7346f0dd4fa2e08e9d5f699a6346513e90a3c
 Following parent with do_switch
 Successfully followed parent
-r5 = 535c8da4bc5e16770e23ac882d5b5ebf533508fa (refs/remotes/origin/tags/tag1)
+r5 = d4f7520d2d9bf283da77ac4c1ca55e56e95e3888 (refs/remotes/origin/tags/tag1)
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2, 2
-Found branch parent: (refs/remotes/origin/tags/tag2) d1447f29ef173f5445cdf442103c87226185f665
+Found branch parent: (refs/remotes/origin/tags/tag2) 6ae7346f0dd4fa2e08e9d5f699a6346513e90a3c
 Following parent with do_switch
 Successfully followed parent
-r6 = de02b0251da1432c1f6d8b2d37d41b26e3daed6a (refs/remotes/origin/tags/tag2)
+r6 = 44bc68ef3d7cfee78b12e145812ce4bc8e8679c5 (refs/remotes/origin/tags/tag2)
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3, 2
-Found branch parent: (refs/remotes/origin/tags/tag3) d1447f29ef173f5445cdf442103c87226185f665
+Found branch parent: (refs/remotes/origin/tags/tag3) 6ae7346f0dd4fa2e08e9d5f699a6346513e90a3c
 Following parent with do_switch
 Successfully followed parent
-r7 = 0c11f17c2974db99de8c5f3764c92b677418cdc8 (refs/remotes/origin/tags/tag3)
+r7 = e32efec5a314aba0997500df7cbc34787724f97c (refs/remotes/origin/tags/tag3)
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4, 2
-Found branch parent: (refs/remotes/origin/tags/tag4) d1447f29ef173f5445cdf442103c87226185f665
+Found branch parent: (refs/remotes/origin/tags/tag4) 6ae7346f0dd4fa2e08e9d5f699a6346513e90a3c
 Following parent with do_switch
 Successfully followed parent
-r8 = 5272bffd58d61a74c02253c7f8bb547b79f080f1 (refs/remotes/origin/tags/tag4)
+r8 = 736fa77c73b883286a8c99951d84e58af48ff44b (refs/remotes/origin/tags/tag4)
 tag name required
 
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk at r2 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag5...
@@ -542416,55 +541816,55 @@
 Committing transaction...
 Committed revision 9.
 Using higher level of URL: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo
-branch_from: /branches => /branches/b
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
-Found branch parent: (refs/remotes/mirror/b) a0b9cd21ee347bfe30f2ed0a07292ea8e56d788d
+branch_from: /branches => /branches/a
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
+Found branch parent: (refs/remotes/mirror/a) a969eabe300d4e768b6c45f03d57547dc601301b
 Following parent with do_switch
 Successfully followed parent
-r9 = 27fcb8f33c58830be1cfbe41d419f52b4c8651a4 (refs/remotes/mirror/b)
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
-Found branch parent: (refs/remotes/mirror/trunk) d1447f29ef173f5445cdf442103c87226185f665
+r9 = f568fa111ddd1c7272c461aae407f0c495fa6e16 (refs/remotes/mirror/a)
+branch_from: /tags => /tags/tag3
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
+Found branch parent: (refs/remotes/mirror/tags/tag3) e32efec5a314aba0997500df7cbc34787724f97c
 Following parent with do_switch
 Successfully followed parent
-r9 = 3cadf193ef010acc955579fc6cb303e4adc78e53 (refs/remotes/mirror/trunk)
+r9 = a54b74b74aad133b8e998ead7ce1087009d88a80 (refs/remotes/mirror/tags/tag3)
 branch_from: /tags => /tags/tag4
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag4 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag4, 8
-Found branch parent: (refs/remotes/mirror/tags/tag4) 5272bffd58d61a74c02253c7f8bb547b79f080f1
+Found branch parent: (refs/remotes/mirror/tags/tag4) 736fa77c73b883286a8c99951d84e58af48ff44b
 Following parent with do_switch
 Successfully followed parent
-r9 = c05da938ffc930bd3bb794d217f40b1f073572b5 (refs/remotes/mirror/tags/tag4)
-branch_from: /tags => /tags/tag1
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
-Found branch parent: (refs/remotes/mirror/tags/tag1) 535c8da4bc5e16770e23ac882d5b5ebf533508fa
+r9 = 0cb0fddea8b44bc51ca40ceab7d4798dee3e87ba (refs/remotes/mirror/tags/tag4)
+branch_from: /tags => /tags/tag2
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag2, 8
+Found branch parent: (refs/remotes/mirror/tags/tag2) 44bc68ef3d7cfee78b12e145812ce4bc8e8679c5
 Following parent with do_switch
 Successfully followed parent
-r9 = c61c1db229b4073d8ff0d672e6c1f6c337587292 (refs/remotes/mirror/tags/tag1)
-branch_from: /tags => /tags/tag3
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag3 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag3, 8
-Found branch parent: (refs/remotes/mirror/tags/tag3) 0c11f17c2974db99de8c5f3764c92b677418cdc8
+r9 = 368c483a2df9811f8c050462e1929fcb50aab1c7 (refs/remotes/mirror/tags/tag2)
+branch_from: /tags => /tags/tag1
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag1 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag1, 8
+Found branch parent: (refs/remotes/mirror/tags/tag1) d4f7520d2d9bf283da77ac4c1ca55e56e95e3888
 Following parent with do_switch
 Successfully followed parent
-r9 = bdd34142f5473a57a3786e09aec14ef5039f52b7 (refs/remotes/mirror/tags/tag3)
-branch_from: /branches => /branches/a
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/a => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/a, 8
-Found branch parent: (refs/remotes/mirror/a) 3c83947806f4372fb7e78c640c4254bb3b2c296c
+r9 = d48091c2ebda87ec5ca5e5ddf1d2dc5790fd22cb (refs/remotes/mirror/tags/tag1)
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk, 8
+Found branch parent: (refs/remotes/mirror/trunk) 6ae7346f0dd4fa2e08e9d5f699a6346513e90a3c
 Following parent with do_switch
 Successfully followed parent
-r9 = d91a85bc897db2d9fae9d89d71eb79bfc9adf15d (refs/remotes/mirror/a)
-branch_from: /tags => /tags/tag2
-Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/tags/tag2 => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/tags/tag2, 8
-Found branch parent: (refs/remotes/mirror/tags/tag2) de02b0251da1432c1f6d8b2d37d41b26e3daed6a
+r9 = 9d97ed830589ce88f5da361a4e0696edfa5605f1 (refs/remotes/mirror/trunk)
+branch_from: /branches => /branches/b
+Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/branches/b => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/b, 8
+Found branch parent: (refs/remotes/mirror/b) e5d51d719622e7370d2fc2780b913ad412cdf2f9
 Following parent with do_switch
 Successfully followed parent
-r9 = 8572cfcef2f3e6a17d799bfa5a54e37f20b56ec2 (refs/remotes/mirror/tags/tag2)
-Previous HEAD position was d1447f2 updated trunk
-HEAD is now at 3cadf19 made mirror
+r9 = ca44b649a4e85d0d868865db32f9714b0e0924c7 (refs/remotes/mirror/b)
+Previous HEAD position was 6ae7346 updated trunk
+HEAD is now at 9d97ed8 made mirror
 Copying file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk at r9 to file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d...
 Found possible branch point: file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/trunk => file:///build/reproducible-path/git-2.45.2/t/trash%20directory.t9128-git-svn-cmd-branch/svnrepo/mirror/branches/d, 9
-Found branch parent: (refs/remotes/mirror/d) 3cadf193ef010acc955579fc6cb303e4adc78e53
+Found branch parent: (refs/remotes/mirror/d) 9d97ed830589ce88f5da361a4e0696edfa5605f1
 Following parent with do_switch
 Successfully followed parent
-r10 = d245bfa48725e1cc367cad9c7ef60bfdd3a75015 (refs/remotes/mirror/d)
+r10 = 199b58e3bfbb3074ba6d270aa76896578ce33495 (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>...]'
@@ -545998,9 +545398,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-cvsexportcommit.perl >git-cvsexportcommit+ && \
-chmod +x git-cvsexportcommit+ && \
-mv git-cvsexportcommit+ git-cvsexportcommit
+    git-send-email.perl >git-send-email+ && \
+chmod +x git-send-email+ && \
+mv git-send-email+ git-send-email
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
@@ -546010,9 +545410,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-cvsimport.perl >git-cvsimport+ && \
-chmod +x git-cvsimport+ && \
-mv git-cvsimport+ git-cvsimport
+    git-cvsexportcommit.perl >git-cvsexportcommit+ && \
+chmod +x git-cvsexportcommit+ && \
+mv git-cvsexportcommit+ git-cvsexportcommit
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
@@ -546022,9 +545422,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-send-email.perl >git-send-email+ && \
-chmod +x git-send-email+ && \
-mv git-send-email+ git-send-email
+    git-cvsimport.perl >git-cvsimport+ && \
+chmod +x git-cvsimport+ && \
+mv git-cvsimport+ git-cvsimport
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
@@ -546034,9 +545434,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-svn.perl >git-svn+ && \
-chmod +x git-svn+ && \
-mv git-svn+ git-svn
+    git-cvsserver.perl >git-cvsserver+ && \
+chmod +x git-cvsserver+ && \
+mv git-cvsserver+ git-cvsserver
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
@@ -546046,9 +545446,9 @@
     -e '	G' \
     -e '}' \
     -e 's/@@GIT_VERSION@@/2.45.2/g' \
-    git-cvsserver.perl >git-cvsserver+ && \
-chmod +x git-cvsserver+ && \
-mv git-cvsserver+ git-cvsserver
+    git-svn.perl >git-svn+ && \
+chmod +x git-svn+ && \
+mv git-svn+ git-svn
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 \
@@ -546192,6 +545592,11 @@
 	'/build/reproducible-path/git-2.45.2/debian/tmp/usr/share/gitweb/static'
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
 /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.45.2/templates'
+: no custom templates yet
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/templates'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2'
 pod2man perl/Git.pm perl/build/man/man3/Git.3pm
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2'
@@ -546204,12 +545609,7 @@
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: git: No such file or directory
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-/usr/bin/make -C gitk-git  all
 /usr/bin/make -C ../  GIT-VERSION-FILE
-/usr/bin/make -C templates  SHELL_PATH='/bin/sh' PERL_PATH='/usr/bin/perl'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/templates'
-: no custom templates yet
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/templates'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 /usr/bin/perl ./build-docdep.perl >doc.dep 
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -546319,19 +545719,19 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-archimport.xml git-archimport.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-archive.xml git-archive.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-annotate.xml git-annotate.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-annotate.xml git-annotate.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-am.xml git-am.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-apply.xml git-apply.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-am.xml git-am.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-add.xml git-add.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-add.xml git-add.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-archive.xml git-archive.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-bugreport.xml git-bugreport.txt
@@ -546340,13 +545740,10 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-bisect.xml git-bisect.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-bundle.xml git-bundle.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-blame.xml git-blame.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-bundle.xml git-bundle.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-branch.xml git-branch.txt
@@ -546355,22 +545752,25 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-attr.xml git-check-attr.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cat-file.xml git-cat-file.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-mailmap.xml git-check-mailmap.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-ignore.xml git-check-ignore.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-check-ref-format.xml git-check-ref-format.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-checkout-index.xml git-checkout-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-citool.xml git-citool.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cherry.xml git-cherry.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cherry.xml git-cherry.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-citool.xml git-citool.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-cherry-pick.xml git-cherry-pick.txt
@@ -546382,10 +545782,10 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-clean.xml git-clean.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-column.xml git-column.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-column.xml git-column.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-commit-graph.xml git-commit-graph.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-clone.xml git-clone.txt
@@ -546397,13 +545797,13 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-count-objects.xml git-count-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-commit.xml git-commit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-credential-cache--daemon.xml git-credential-cache--daemon.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-commit.xml git-commit.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-credential-cache.xml git-credential-cache.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-credential-store.xml git-credential-store.txt
@@ -546424,34 +545824,37 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-daemon.xml git-daemon.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-describe.xml git-describe.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-difftool.xml git-difftool.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diagnose.xml git-diagnose.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff-files.xml git-diff-files.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff-index.xml git-diff-index.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff.xml git-diff.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-difftool.xml git-difftool.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fast-export.xml git-fast-export.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff-tree.xml git-diff-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-diff.xml git-diff.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-config.xml git-config.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fetch-pack.xml git-fetch-pack.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-filter-branch.xml git-filter-branch.txt
@@ -546460,13 +545863,13 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fetch.xml git-fetch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fmt-merge-msg.xml git-fmt-merge-msg.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fast-import.xml git-fast-import.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-for-each-repo.xml git-for-each-repo.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-for-each-ref.xml git-for-each-ref.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fsck-objects.xml git-fsck-objects.txt
@@ -546475,70 +545878,67 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fsmonitor--daemon.xml git-fsmonitor--daemon.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fsck.xml git-fsck.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-gc.xml git-gc.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-fsck.xml git-fsck.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-get-tar-commit-id.xml git-get-tar-commit-id.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-gc.xml git-gc.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-gui.xml git-gui.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-format-patch.xml git-format-patch.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-grep.xml git-grep.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-hash-object.xml git-hash-object.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-grep.xml git-grep.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-hook.xml git-hook.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-help.xml git-help.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-hook.xml git-hook.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-fetch.xml git-http-fetch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-push.xml git-http-push.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-backend.xml git-http-backend.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-http-push.xml git-http-push.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-imap-send.xml git-imap-send.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-config.xml git-config.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-index-pack.xml git-index-pack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-instaweb.xml git-instaweb.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-init-db.xml git-init-db.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-instaweb.xml git-instaweb.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-init.xml git-init.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-interpret-trailers.xml git-interpret-trailers.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-remote.xml git-ls-remote.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-files.xml git-ls-files.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-files.xml git-ls-files.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-ls-tree.xml git-ls-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mailinfo.xml git-mailinfo.txt
@@ -546547,6 +545947,12 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mailsplit.xml git-mailsplit.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-index.xml git-merge-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -546556,57 +545962,51 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-one-file.xml git-merge-one-file.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-base.xml git-merge-base.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-log.xml git-log.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-maintenance.xml git-maintenance.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mergetool--lib.xml git-mergetool--lib.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mktag.xml git-mktag.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge-tree.xml git-merge-tree.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge.xml git-merge.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mergetool.xml git-mergetool.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mktag.xml git-mktag.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mktree.xml git-mktree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mv.xml git-mv.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-multi-pack-index.xml git-multi-pack-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-mv.xml git-mv.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-merge.xml git-merge.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-name-rev.xml git-name-rev.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-notes.xml git-notes.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-objects.xml git-pack-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-log.xml git-log.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-redundant.xml git-pack-redundant.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-p4.xml git-p4.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pack-refs.xml git-pack-refs.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-patch-id.xml git-patch-id.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -546622,37 +546022,37 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-range-diff.xml git-range-diff.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-push.xml git-push.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-push.xml git-push.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pull.xml git-pull.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-read-tree.xml git-read-tree.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-pull.xml git-pull.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-reflog.xml git-reflog.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote-ext.xml git-remote-ext.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-receive-pack.xml git-receive-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rebase.xml git-rebase.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-reflog.xml git-reflog.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote-fd.xml git-remote-fd.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rebase.xml git-rebase.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-remote.xml git-remote.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-replace.xml git-replace.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-repack.xml git-repack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-repack.xml git-repack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-replace.xml git-replace.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-request-pull.xml git-request-pull.txt
@@ -546664,27 +546064,30 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-restore.xml git-restore.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-revert.xml git-revert.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-replay.xml git-replay.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-reset.xml git-reset.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-replay.xml git-replay.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-revert.xml git-revert.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rm.xml git-rm.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rm.xml git-rm.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rev-parse.xml git-rev-parse.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-send-email.xml git-send-email.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-send-pack.xml git-send-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sh-i18n--envsubst.xml git-sh-i18n--envsubst.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-rev-list.xml git-rev-list.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -546694,9 +546097,6 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sh-setup.xml git-sh-setup.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-send-email.xml git-send-email.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-shell.xml git-shell.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -546712,46 +546112,46 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-shortlog.xml git-shortlog.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-stage.xml git-stage.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-stash.xml git-stash.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-sparse-checkout.xml git-sparse-checkout.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-stripspace.xml git-stripspace.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-status.xml git-status.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-stash.xml git-stash.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-show.xml git-show.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-status.xml git-status.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-submodule.xml git-submodule.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-show.xml git-show.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-switch.xml git-switch.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-symbolic-ref.xml git-symbolic-ref.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-unpack-file.xml git-unpack-file.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-tag.xml git-tag.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-svn.xml git-svn.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-svn.xml git-svn.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-ref.xml git-update-ref.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-unpack-objects.xml git-unpack-objects.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-server-info.xml git-update-server-info.txt
@@ -546763,10 +546163,10 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-update-index.xml git-update-index.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-var.xml git-var.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-var.xml git-var.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-upload-pack.xml git-upload-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git-verify-commit.xml git-verify-commit.txt
@@ -546799,10 +546199,10 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o scalar.xml scalar.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitweb.xml gitweb.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-bundle.xml gitformat-bundle.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitweb.xml gitweb.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-chunk.xml gitformat-chunk.txt
@@ -546820,28 +546220,28 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o git.xml git.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-pack.xml gitformat-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitignore.xml gitignore.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitformat-signature.xml gitformat-signature.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitmailmap.xml gitmailmap.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitmodules.xml gitmodules.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitignore.xml gitignore.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o githooks.xml githooks.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-common.xml gitprotocol-common.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitmodules.xml gitmodules.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-capabilities.xml gitprotocol-capabilities.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-http.xml gitprotocol-http.txt
@@ -546850,25 +546250,28 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-pack.xml gitprotocol-pack.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitrepository-layout.xml gitrepository-layout.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcli.xml gitcli.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitprotocol-v2.xml gitprotocol-v2.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitweb.conf.xml gitweb.conf.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcvs-migration.xml gitcvs-migration.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcredentials.xml gitcredentials.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitdiffcore.xml gitdiffcore.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o giteveryday.xml giteveryday.txt
@@ -546877,25 +546280,22 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitfaq.xml gitfaq.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitcore-tutorial.xml gitcore-tutorial.txt
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitnamespaces.xml gitnamespaces.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitrevisions.xml gitrevisions.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitglossary.xml gitglossary.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitremote-helpers.xml gitremote-helpers.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitrevisions.xml gitrevisions.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitsubmodules.xml gitsubmodules.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gittutorial-2.xml gittutorial-2.txt
+asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitglossary.xml gitglossary.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gittutorial.xml gittutorial.txt
@@ -546904,25 +546304,22 @@
 asciidoc -a 'git-default-pager=pager' -a 'git-default-editor=editor' -f asciidoc.conf -amanmanual='Git Manual' -amansource='Git 2.45.2' -arevdate='' -b docbook -d manpage -o gitworkflows.xml gitworkflows.txt
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-annotate.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-archive.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-archimport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-archive.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -546931,34 +546328,31 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-blame.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-branch.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-bugreport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-cat-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-ignore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-citool.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-checkout-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -546967,27 +546361,33 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cherry-pick.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-clean.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-commit-graph.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-count-objects.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547009,52 +546409,52 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-cvsserver.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-config.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-diff-tree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-fast-export.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fmt-merge-msg.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-fetch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-fast-import.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-filter-branch.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-fmt-merge-msg.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-for-each-ref.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -547075,19 +546475,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-gc.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-help.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-hash-object.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-grep.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -547099,15 +546499,15 @@
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547117,13 +546517,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-instaweb.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-interpret-trailers.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-interpret-trailers.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-ls-files.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -547132,40 +546532,40 @@
 xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-mailinfo.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-log.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-base.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-index.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-base.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-index.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-file.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-merge-one-file.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-mergetool--lib.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-mergetool.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-mktag.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -547177,15 +546577,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-mv.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-refs.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547195,22 +546589,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[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-prune-packed.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-redundant.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-pack-refs.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-pull.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-quiltimport.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -547225,10 +546625,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-reflog.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-rebase.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-remote-ext.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -547252,10 +546652,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-rerere.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-reset.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-reset.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-restore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -547267,9 +546667,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-rm.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547279,6 +546676,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-sh-i18n--envsubst.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547306,10 +546706,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-sparse-checkout.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-show.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-show.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-stash.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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
@@ -547321,30 +546721,30 @@
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-svn.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-svn.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-update-ref.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-unpack-objects.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547354,24 +546754,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 git-upload-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-pack.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man git-verify-commit.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -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-var.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+xmlto -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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 xmlto -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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547381,13 +546781,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-worktree.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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 gitk.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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
@@ -547396,13 +546793,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.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitattributes.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-bundle.xml
+make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitformat-chunk.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitattributes.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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
@@ -547414,10 +546814,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 gitformat-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitignore.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man githooks.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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
@@ -547432,43 +546832,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[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitweb.conf.xml
-make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-v2.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-http.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitrepository-layout.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-pack.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-http.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitprotocol-v2.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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 gitweb.conf.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-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 gitcredentials.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man giteveryday.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitdiffcore.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitfaq.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man giteveryday.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitglossary.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitfaq.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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
@@ -547477,7 +546874,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 gitremote-helpers.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gittutorial-2.xml
+xmlto -m manpage-normal.xsl -m manpage-bold-literal.xsl --stringparam man.base.url.for.relative.links='file:///usr/share/doc/git/html/' man gitglossary.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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
@@ -547486,6 +546883,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 gitsubmodules.xml
 make[3]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+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.45.2/Documentation'
+make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
 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.45.2/Documentation'
 make[3]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547547,13 +546947,10 @@
     ASCIIDOC git-archimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-am.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-annotate.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-archive.html
+    ASCIIDOC git-am.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-add.html
@@ -547562,22 +546959,22 @@
     ASCIIDOC git-apply.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-bisect.html
+    ASCIIDOC git-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-branch.html
+    ASCIIDOC git-bisect.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-cat-file.html
+    ASCIIDOC git-bugreport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-check-attr.html
+    ASCIIDOC git-blame.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-bugreport.html
+    ASCIIDOC git-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-blame.html
+    ASCIIDOC git-cat-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-bundle.html
@@ -547586,6 +546983,9 @@
     ASCIIDOC git-check-mailmap.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+    ASCIIDOC git-check-attr.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-check-ignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547595,6 +546995,9 @@
     ASCIIDOC git-checkout-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+    ASCIIDOC git-cherry.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-cherry-pick.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547604,9 +547007,6 @@
     ASCIIDOC git-citool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-cherry.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-clean.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
@@ -547616,40 +547016,40 @@
     ASCIIDOC git-commit-graph.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-clone.html
+    ASCIIDOC git-commit-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-commit-tree.html
+    ASCIIDOC git-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-count-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-credential-cache--daemon.html
+    ASCIIDOC git-commit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-credential-cache.html
+    ASCIIDOC git-credential-cache--daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-commit.html
+    ASCIIDOC git-credential-cache.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-credential-store.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-cvsexportcommit.html
+    ASCIIDOC git-credential.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-credential.html
+    ASCIIDOC git-cvsexportcommit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-cvsimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-cvsserver.html
+    ASCIIDOC git-daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-daemon.html
+    ASCIIDOC git-cvsserver.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-describe.html
@@ -547661,25 +547061,22 @@
     ASCIIDOC git-diff-files.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-difftool.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-diff-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-fast-export.html
+    ASCIIDOC git-diff.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-diff-tree.html
+    ASCIIDOC git-difftool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-diff.html
+    ASCIIDOC git-fast-export.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-fetch-pack.html
+    ASCIIDOC git-diff-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-fast-import.html
+    ASCIIDOC git-fetch-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-fmt-merge-msg.html
@@ -547688,16 +547085,19 @@
     ASCIIDOC git-filter-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-fetch.html
+    ASCIIDOC git-config.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+    ASCIIDOC git-fast-import.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-for-each-repo.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-for-each-ref.html
+    ASCIIDOC git-fetch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-config.html
+    ASCIIDOC git-for-each-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-fsck-objects.html
@@ -547706,34 +547106,34 @@
     ASCIIDOC git-fsmonitor--daemon.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-get-tar-commit-id.html
+    ASCIIDOC git-fsck.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-format-patch.html
+    ASCIIDOC git-get-tar-commit-id.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-fsck.html
+    ASCIIDOC git-gc.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-gc.html
+    ASCIIDOC git-format-patch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-grep.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-gui.html
+    ASCIIDOC git-hash-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-hash-object.html
+    ASCIIDOC git-gui.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-http-backend.html
+    ASCIIDOC git-help.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-help.html
+    ASCIIDOC git-http-backend.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-http-fetch.html
@@ -547745,10 +547145,10 @@
     ASCIIDOC git-imap-send.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-index-pack.html
+    ASCIIDOC git-init-db.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-init-db.html
+    ASCIIDOC git-index-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-instaweb.html
@@ -547763,25 +547163,25 @@
     ASCIIDOC git-ls-remote.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-mailinfo.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-ls-files.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-ls-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+    ASCIIDOC git-mailinfo.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-mailsplit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-maintenance.html
+    ASCIIDOC git-merge-base.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-merge-index.html
+    ASCIIDOC git-maintenance.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-merge-base.html
+    ASCIIDOC git-merge-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-merge-file.html
@@ -547790,34 +547190,34 @@
     ASCIIDOC git-merge-one-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-mergetool--lib.html
+    ASCIIDOC git-merge-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-merge-tree.html
+    ASCIIDOC git-mergetool--lib.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-mktag.html
+    ASCIIDOC git-log.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-mergetool.html
+    ASCIIDOC git-mktag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-mktree.html
+    ASCIIDOC git-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-log.html
+    ASCIIDOC git-mergetool.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-merge.html
+    ASCIIDOC git-mktree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-multi-pack-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-mv.html
+    ASCIIDOC git-name-rev.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-name-rev.html
+    ASCIIDOC git-mv.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-notes.html
@@ -547832,19 +547232,22 @@
     ASCIIDOC git-pack-refs.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+    ASCIIDOC git-p4.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-patch-id.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-p4.html
+    ASCIIDOC git-prune.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-prune-packed.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-prune.html
+    ASCIIDOC git-quiltimport.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-quiltimport.html
+    ASCIIDOC git-push.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-range-diff.html
@@ -547853,37 +547256,37 @@
     ASCIIDOC git-read-tree.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-receive-pack.html
+    ASCIIDOC git-pull.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-push.html
+    ASCIIDOC git-reflog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-pull.html
+    ASCIIDOC git-receive-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-reflog.html
+    ASCIIDOC git-remote-ext.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-remote-ext.html
+    ASCIIDOC git-remote-fd.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-remote-fd.html
+    ASCIIDOC git-remote.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-remote.html
+    ASCIIDOC git-repack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-replace.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-repack.html
+    ASCIIDOC git-request-pull.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-request-pull.html
+    ASCIIDOC git-replay.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-rerere.html
@@ -547895,7 +547298,7 @@
     ASCIIDOC git-reset.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-replay.html
+    ASCIIDOC git-rev-parse.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-revert.html
@@ -547904,10 +547307,10 @@
     ASCIIDOC git-rm.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-send-pack.html
+    ASCIIDOC git-sh-i18n--envsubst.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-rev-parse.html
+    ASCIIDOC git-send-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-rev-list.html
@@ -547916,16 +547319,13 @@
     ASCIIDOC git-send-email.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-sh-i18n--envsubst.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-sh-i18n.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-sh-setup.html
+    ASCIIDOC git-shell.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-shell.html
+    ASCIIDOC git-sh-setup.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-show-branch.html
@@ -547940,28 +547340,28 @@
     ASCIIDOC git-shortlog.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-sparse-checkout.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-stage.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-stash.html
+    ASCIIDOC git-sparse-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-stripspace.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-status.html
+    ASCIIDOC git-stash.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-show.html
+    ASCIIDOC git-status.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-submodule.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-svn.html
+    ASCIIDOC git-show.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+    ASCIIDOC git-symbolic-ref.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-switch.html
@@ -547970,13 +547370,13 @@
     ASCIIDOC git-unpack-file.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-symbolic-ref.html
+    ASCIIDOC git-unpack-objects.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-tag.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-unpack-objects.html
+    ASCIIDOC git-svn.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-update-ref.html
@@ -547988,10 +547388,10 @@
     ASCIIDOC git-update-server-info.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-upload-archive.html
+    ASCIIDOC git-upload-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-upload-pack.html
+    ASCIIDOC git-upload-archive.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-var.html
@@ -548009,10 +547409,10 @@
     ASCIIDOC git-version.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-web--browse.html
+    ASCIIDOC git-whatchanged.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git-whatchanged.html
+    ASCIIDOC git-web--browse.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-write-tree.html
@@ -548024,76 +547424,79 @@
     ASCIIDOC gitk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC scalar.html
+    ASCIIDOC gitweb.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitweb.html
+    ASCIIDOC scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitformat-bundle.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitformat-chunk.html
+    ASCIIDOC gitattributes.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitformat-commit-graph.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC git.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitattributes.html
+    ASCIIDOC gitformat-chunk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitformat-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitformat-pack.html
+    ASCIIDOC git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitformat-signature.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitmailmap.html
+    ASCIIDOC gitformat-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitignore.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitmodules.html
+    ASCIIDOC gitmailmap.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC githooks.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitprotocol-common.html
+    ASCIIDOC gitmodules.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitprotocol-capabilities.html
+    ASCIIDOC gitprotocol-common.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitprotocol-http.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitprotocol-pack.html
+    ASCIIDOC gitprotocol-capabilities.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitrepository-layout.html
+    ASCIIDOC gitprotocol-pack.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitprotocol-v2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+    ASCIIDOC gitrepository-layout.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitcli.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
+    ASCIIDOC gitcvs-migration.html
+make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
+make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitweb.conf.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitcredentials.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitcvs-migration.html
+    ASCIIDOC gitcore-tutorial.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitdiffcore.html
@@ -548102,40 +547505,37 @@
     ASCIIDOC giteveryday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitcore-tutorial.html
-make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
-make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitfaq.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitglossary.html
+    ASCIIDOC gitnamespaces.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitnamespaces.html
+    ASCIIDOC gitremote-helpers.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitsubmodules.html
+    ASCIIDOC gitglossary.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gitrevisions.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitremote-helpers.html
+    ASCIIDOC gitsubmodules.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC gittutorial-2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gittutorial.html
+    ASCIIDOC howto/revert-branch-rebase.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC gitworkflows.html
+    ASCIIDOC howto/new-command.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC howto/new-command.html
+    ASCIIDOC gittutorial.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC howto/revert-branch-rebase.html
+    ASCIIDOC gitworkflows.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC howto/using-merge-subtree.html
@@ -548159,34 +547559,34 @@
     ASCIIDOC howto/recover-corrupted-blob-object.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC howto/revert-a-faulty-merge.html
+    ASCIIDOC howto/recover-corrupted-object-harder.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC howto/recover-corrupted-object-harder.html
+    ASCIIDOC howto/revert-a-faulty-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC howto/rebuild-from-update-hook.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC howto/rebase-from-internal-branch.html
+    ASCIIDOC howto/keep-canonical-history-correct.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC howto/keep-canonical-history-correct.html
+    ASCIIDOC howto/rebase-from-internal-branch.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC howto/maintain-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC howto/coordinate-embargoed-releases.html
+    ASCIIDOC user-manual.xml
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/api-error-handling.html
+    ASCIIDOC howto/coordinate-embargoed-releases.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC technical/api-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC user-manual.xml
+    ASCIIDOC technical/api-error-handling.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC technical/api-simple-ipc.html
@@ -548201,28 +547601,28 @@
     ASCIIDOC MyFirstObjectWalk.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/api-trace2.html
+    ASCIIDOC SubmittingPatches.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC MyFirstContribution.html
+    ASCIIDOC ToolsForGit.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC ToolsForGit.html
+    ASCIIDOC technical/api-trace2.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC SubmittingPatches.html
+    ASCIIDOC MyFirstContribution.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC technical/bitmap-format.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/long-running-process-protocol.html
+    ASCIIDOC technical/multi-pack-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC technical/bundle-uri.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/multi-pack-index.html
+    ASCIIDOC technical/long-running-process-protocol.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC technical/hash-function-transition.html
@@ -548231,34 +547631,34 @@
     ASCIIDOC technical/pack-heuristics.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/parallel-checkout.html
+    ASCIIDOC technical/racy-git.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/racy-git.html
+    ASCIIDOC technical/parallel-checkout.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC technical/partial-clone.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/scalar.html
+    ASCIIDOC technical/reftable.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC technical/send-pack-pipeline.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/reftable.html
+    ASCIIDOC technical/shallow.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/shallow.html
+    ASCIIDOC technical/scalar.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC technical/trivial-merge.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC everyday.html
+    ASCIIDOC technical/api-index.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
-    ASCIIDOC technical/api-index.html
+    ASCIIDOC everyday.html
 make[2]: Leaving directory '/build/reproducible-path/git-2.45.2/Documentation'
 make[2]: Entering directory '/build/reproducible-path/git-2.45.2/Documentation'
     ASCIIDOC git-remote-helpers.html
@@ -548351,25 +547751,25 @@
    dh_perl
    dh_link
    dh_strip_nondeterminism
-	Normalized debian/git/usr/share/locale/es/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/el/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/ko/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/zh_CN/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/sv/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/tr/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/vi/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/fr/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/es/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/is/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/el/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/ca/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/fr/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/bg/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/id/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/ru/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/pl/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/uk/LC_MESSAGES/git.mo
-	Normalized debian/git/usr/share/locale/sv/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/bg/LC_MESSAGES/git.mo
 	Normalized debian/git/usr/share/locale/de/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/zh_TW/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/ru/LC_MESSAGES/git.mo
+	Normalized debian/git/usr/share/locale/ca/LC_MESSAGES/git.mo
    debian/rules override_dh_compress
 make[1]: Entering directory '/build/reproducible-path/git-2.45.2'
 dh_compress -X.txt -Xcontrib
@@ -548381,19 +547781,19 @@
    dh_shlibdeps
    dh_installdeb
    dh_gencontrol
-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-cvs: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git-svn: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git: substitution variable ${perl:Depends} unused, but is defined
 dpkg-gencontrol: warning: package git-mediawiki: substitution variable ${perl:Depends} unused, but is defined
    dh_md5sums
    dh_builddeb
-dpkg-deb: building package 'git-doc' in '../git-doc_2.45.2-1_all.deb'.
 dpkg-deb: building package 'git-mediawiki' in '../git-mediawiki_2.45.2-1_all.deb'.
+dpkg-deb: building package 'git-doc' in '../git-doc_2.45.2-1_all.deb'.
 dpkg-deb: building package 'git' in '../git_2.45.2-1_i386.deb'.
-dpkg-deb: building package 'gitweb' in '../gitweb_2.45.2-1_all.deb'.
 dpkg-deb: building package 'git-daemon-sysvinit' in '../git-daemon-sysvinit_2.45.2-1_all.deb'.
+dpkg-deb: building package 'gitweb' in '../gitweb_2.45.2-1_all.deb'.
 dpkg-deb: building package 'git-gui' in '../git-gui_2.45.2-1_all.deb'.
 dpkg-deb: building package 'git-email' in '../git-email_2.45.2-1_all.deb'.
 dpkg-deb: building package 'git-all' in '../git-all_2.45.2-1_all.deb'.
@@ -548410,12 +547810,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/10630/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/10630/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/3380 and its subdirectories
-I: Current time: Wed Dec 17 13:44:18 -12 2025
-I: pbuilder-time-stamp: 1766022258
+I: removing directory /srv/workspace/pbuilder/10630 and its subdirectories
+I: Current time: Fri Nov 15 09:54:00 +14 2024
+I: pbuilder-time-stamp: 1731614040